update 4.x from main for v4.5.1 docs build #3967

trentm · 2024-04-11T18:07:51Z

No description provided.

- use more reliable 'elastic' org membership test for triage, etc. labels - bypass 'action-add-labels' action to avoid another dep - drop agent-nodejs label that we no longer require for use in GH projects Fixes: #3884

This adds the require zookeeper volume refs. Closes: #3922

…14 (#3927) This was necessitated by a transitive dep of tedious (`@azure/core-rest-pipeline`) breaking support for Node.js versions earlier than 16. Closes: #3926

…outside of CI (#3928) Running 'npm test' outside of CI will start all test services in docker *then wait for them to all be healthy*. Without a healthcheck for zk the 'wait_for_healthy' in test/script/run_tests.sh would never pass.

Specifying the mssql image platform is necessary on *arm* Macs because the mssql Docker image only provides binaries for the amd64 architecture. My understanding is that Rosetta emulation on recent macOS supports running the amd binary just fine.

Updates `eslint-plugin-license-header` from 0.6.0 to 0.6.1

…3946)

…v-dep, transitive from @elastic/transport (#3949) The elasticsearch-canary version was very old. In practice we weren't updated it, hence there was no value in testing these. Refs: #3948

…ranch (#3950)

…etrics/fixtures (#3952)

…3963)

…nt flat file config (#3954) In eslint@9 there is a new suggested config file format ("flat") https://github.com/eslint/rfcs/tree/main/designs/2019-config-simplification https://eslint.org/docs/latest/use/configure/configuration-files Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: David Luna <luna.bistuer@gmail.com> Co-authored-by: Trent Mick <trent.mick@elastic.co>

…ented HTTP requests (#3965) ... because Elasticsearch borks on these requests. This case should only be possible in a weird case like having two APM agents active. Fixes: #3964

trentm · 2024-04-11T18:09:02Z

This is a first attempt at this, rather than the force-push update we used to use.

Commands used to create this:

git checkout 4.x
git checkout -b trentm/docs-4x-update-from-main
git rebase main
gh pr create --fill -w -B 4.x

trentm · 2024-04-11T18:13:25Z

Sanity test that this branch is the same state as "main":

mkdir /tmp/check-it
cd /tmp/check-it
git clone git@github.com:elastic/apm-agent-nodejs.git
git clone git@github.com:elastic/apm-agent-nodejs.git apm-agent-nodejs-4x
cd apm-agent-nodejs-4x
git checkout trentm/docs-4x-update-from-main
cd ..
diff -ur -x .git apm-agent-nodejs apm-agent-nodejs-4.x

That diff should have no output.

% diff -ur -x .git apm-agent-nodejs apm-agent-nodejs-4.x
%

trentm · 2024-04-11T18:14:35Z

Failing workflows:

issue labeler
release

Unfortunate added workflow runs to the release process:

A re-run of a TAV workflows

trentm · 2024-04-11T18:27:28Z

The process here should be that I wait for the "buildkite/docs-build-pr" check to pass before merging.

However, I thought that would have been a "required check" to be allowed to merge. hrm.

dependabot bot and others added 30 commits March 17, 2024 22:19

chore(deps-dev): bump follow-redirects from 1.15.4 to 1.15.6 (#3912)

6bafa00

chore(deps-dev): bump mongodb from 6.4.0 to 6.5.0 (#3916)

b57a65b

chore(deps-dev): bump @hapi/hapi from 21.3.3 to 21.3.6 (#3913)

2bf80e9

chore(deps): bump require-in-the-middle from 7.2.0 to 7.2.1 (#3914)

453f345

chore(deps-dev): bump undici from 6.7.1 to 6.9.0 (#3915)

54e5bb0

chore(deps-dev): bump koa from 2.15.0 to 2.15.1 (#3917)

dfc221b

chore(deps-dev): bump azure-functions-core-tools (#3918)

f0b6a09

ci: fix/refactor labeler workflow (#3921)

41c8dcf

- use more reliable 'elastic' org membership test for triage, etc. labels - bypass 'action-add-labels' action to avoid another dep - drop agent-nodejs label that we no longer require for use in GH projects Fixes: #3884

fix(mongodb): resolve collection name for getMore command (#3919)

990442a

ci: fix 'test-nightly' job in 'edge' CI workflow (#3924)

ca0e5b6

This adds the require zookeeper volume refs. Closes: #3922

fix: handle invalid chars in host header (#3923)

0ff46e4

fix(ci): fix labeler.yml syntax (#3925)

539c315

test(tedious): stop testing some older tedious versions with Node.js …

a7c9201

…14 (#3927) This was necessitated by a transitive dep of tedious (`@azure/core-rest-pipeline`) breaking support for Node.js versions earlier than 16. Closes: #3926

chore(deps-dev): bump the babel group with 1 update (#3929)

d7d0e42

chore(deps-dev): bump the apollo group with 1 update (#3930)

f746bd8

chore(deps-dev): bump typescript from 5.4.2 to 5.4.3 (#3931)

7ee4acf

chore(deps-dev): bump @hapi/hapi from 21.3.6 to 21.3.7 (#3932)

c8faa2e

chore(deps-dev): bump undici from 6.9.0 to 6.10.1 (#3934)

7ffffe4

chore(deps-dev): bump koa from 2.15.1 to 2.15.2 (#3935)

4c89dc8

chore(deps-dev): bump express from 4.18.3 to 4.19.1 (#3933)

b49c460

chore: add contributors to package.json (#3936)

adb9528

chore(deps): bump require-in-the-middle from 7.2.1 to 7.3.0 (#3943)

d92184b

chore(deps-dev): bump express from 4.19.1 to 4.19.2 (#3940)

e6d7a27

chore(deps-dev): bump the eslint group with 1 update (#3941)

af7e9d4

Updates `eslint-plugin-license-header` from 0.6.0 to 0.6.1

chore(deps-dev): bump undici from 6.10.1 to 6.10.2 (#3942)

f1d1828

chore(deps-dev): bump @types/node from 20.11.0 to 20.12.2 (#3944)

05a4f3d

chore(deps-dev): bump azure-functions-core-tools (#3945)

0ebe9da

chore(deps-dev): bump @elastic/elasticsearch from 8.12.2 to 8.13.0 (#…

22890df

…3946)

dependabot bot and others added 14 commits April 1, 2024 10:36

chore(deps-dev): bump pg from 8.11.3 to 8.11.4 (#3947)

4fb65ad

chore(deps-dev): bump undici from 6.10.2 to 6.11.1 (#3948)

65ed23d

test: drop testing of @elastic/elasticsearch-canary; update undici de…

1bbf5b2

…v-dep, transitive from @elastic/transport (#3949) The elasticsearch-canary version was very old. In practice we weren't updated it, hence there was no value in testing these. Refs: #3948

doc: update release process to use a PR for updating the docs-build b…

c1389aa

…ranch (#3950)

chore(deps): bump @opentelemetry/core from 1.22.0 to 1.23.0 (#3955)

04b2040

chore(deps-dev): bump @hapi/hapi from 21.3.7 to 21.3.8 (#3959)

07ee195

chore(deps-dev): bump typescript from 5.4.3 to 5.4.4 (#3958)

39dec4d

chore(deps): bump @opentelemetry/sdk-metrics in /test/opentelemetry-m…

7d0ad25

…etrics/fixtures (#3952)

chore(deps-dev): bump pg from 8.11.4 to 8.11.5 (#3957)

f782572

chore: update otel deps (#3962)

9e6e5af

fix(undici): copy with undici@6.11.0 bug that removed req.addHeader (#…

c0ed986

…3963)

fix(undici): avoid possible duplicate 'traceparent' header on instrum…

526486f

…ented HTTP requests (#3965) ... because Elasticsearch borks on these requests. This case should only be possible in a weird case like having two APM agents active. Fixes: #3964

release 4.5.1 (#3966)

3f25358

trentm requested a review from david-luna April 11, 2024 18:07

trentm self-assigned this Apr 11, 2024

david-luna approved these changes Apr 11, 2024

View reviewed changes

trentm merged commit bdc1f50 into 4.x Apr 11, 2024
204 of 208 checks passed

trentm deleted the trentm/docs-4x-update-from-main branch April 11, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update 4.x from main for v4.5.1 docs build #3967

update 4.x from main for v4.5.1 docs build #3967

trentm commented Apr 11, 2024

trentm commented Apr 11, 2024

trentm commented Apr 11, 2024

trentm commented Apr 11, 2024

trentm commented Apr 11, 2024

update 4.x from main for v4.5.1 docs build #3967

update 4.x from main for v4.5.1 docs build #3967

Conversation

trentm commented Apr 11, 2024

trentm commented Apr 11, 2024

trentm commented Apr 11, 2024

trentm commented Apr 11, 2024

trentm commented Apr 11, 2024