Skip to content

Commit a34d589

Browse files
authored
3.33.0 (#2676)
1 parent fb9d69f commit a34d589

File tree

4 files changed

+19
-33
lines changed

4 files changed

+19
-33
lines changed

CHANGELOG.asciidoc

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@ Notes:
2828
[[release-notes-3.x]]
2929
=== Node.js Agent version 3.x
3030
31-
==== Unreleased
3231
33-
[float]
34-
===== Breaking changes
32+
[[release-notes-3.33.0]]
33+
==== 3.33.0 2022/05/05
3534
3635
[float]
3736
===== Features
@@ -57,6 +56,16 @@ types, because it is only expected to be useful for coming OTel Bridge work.
5756
proxy, which can throw `ERR_HTTP2_SOCKET_UNBOUND` after the session is
5857
destroyed. ({issues}2670[#2670])
5958
59+
[float]
60+
===== Chores
61+
62+
- The release process is slightly changed. CI (Jenkins) now handles `npm
63+
publish ...` when a tag is pushed. ({pull}2667[#2667])
64+
65+
- Pulled the `traceparent` NPM module into a local module and replaced the
66+
`random-poly-fill` module with the built in `require('crypto').randomFillSync`
67+
function call ({pull}2669[#2669])
68+
6069
6170
[[release-notes-3.32.0]]
6271
==== 3.32.0 2022/04/27

CONTRIBUTING.md

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -184,41 +184,17 @@ If you have access to make releases, the process is as follows:
184184
- the EOL table in `docs/upgrading.asciidoc`, if this is a major or minor
185185
release. EOL is 18 months after release date.
186186
1. Ensure PR checks pass, then merge to main.
187-
1. Publish to npm with `npm publish`.
188-
This must be done *before* the release tag is pushed, because the automated
189-
release process is triggered by the tag push and (the opbeans
190-
bump-version.sh release step) depends on the new version having been
191-
published to npm.
192187
1. Working on the elastic repo now (not a fork), tag the merged-to-main commit
193188
with `git tag vx.y.x && git push origin vx.y.z`. For example: `git tag
194189
v1.2.3 && git push origin v1.2.3`.
190+
(The Jenkins CI "Release" stage will handle `npm publish ...`ing the new
191+
package version. See the appropriate [apm-ci tag build for this repo](https://apm-ci.elastic.co/job/apm-agent-nodejs/job/apm-agent-nodejs-mbp/view/tags/).)
195192
1. Reset the latest major branch (currently `3.x`) to point to the current
196193
main, e.g. `git branch -f 3.x main && git push origin 3.x`
197194
198195
### Past major
199196
200-
1. Be sure you have checked out the branch associated with the major you wish
201-
to release and have pulled latest changes, e.g. `2.x`.
202-
1. Make a PR titled "x.y.z" (the new version) which updates:
203-
- the version in `package.json`,
204-
- "CHANGELOG.asciidoc": Add missing changelog entries, if any. Then change
205-
the "Unreleased" section title to:
206-
```
207-
[[release-notes-x.y.z]]
208-
==== x.y.z - YYYY/MM/DD
209-
```
210-
- the EOL table in `docs/upgrading.asciidoc`, if this is a major or minor
211-
release. EOL is 18 months after release date.
212-
1. Ensure PR checks pass, then merge to main.
213-
1. Publish to npm with `npm publish --tag=2x`.
214-
**It is important to include that `--tag=2x`.**
215-
This must be done *before* the release tag is pushed, because the automated
216-
release process is triggered by the tag push and (the opbeans
217-
bump-version.sh release step) depends on the new version having been
218-
published to npm.
219-
1. Working on the elastic repo now (not a fork), tag the merged-to-main commit
220-
with `git tag vx.y.x && git push origin vx.y.z`. For example: `git tag
221-
v1.2.3 && git push origin v1.2.3`.
222-
1. Make a PR against `main` containing the updates to `CHANGELOG.asciidoc` so
223-
that `main` always contain information about all releases
197+
This is not currently supported. Until [this issue](#2668) is resolved one
198+
**must not** push a "vX.Y.Z" version tag to the repository on GitHub that is
199+
for a version other than the current major.
224200

docs/upgrading.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ The table below is a simplified description of this policy.
3636
[options="header"]
3737
|====
3838
|Agent version |EOL Date |Maintained until
39+
|3.33.x |2023-11-05 |3.34.0
3940
|3.32.x |2023-10-27 |3.33.0
4041
|3.31.x |2023-09-23 |3.32.0
4142
|3.30.x |2023-09-10 |3.31.0

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "elastic-apm-node",
3-
"version": "3.32.0",
3+
"version": "3.33.0",
44
"description": "The official Elastic APM agent for Node.js",
55
"main": "index.js",
66
"types": "index.d.ts",

0 commit comments

Comments
 (0)