Merge branch 'main' of github.com:elastic/apm-agent-nodejs into feature/support-specific-modules

* 'main' of github.com:elastic/apm-agent-nodejs: (54 commits)
  chore: fix dev-utils/ci-tav-slow-jobs.sh (elastic#3319)
  test: reduce TAV test matrix for slowest jobs (elastic#3321)
  chore: sync package-lock so 'npm ci' can work (elastic#3318)
  docs: document `useElasticTraceparentHeader` config var (elastic#3316)
  chore, test: test driver improvements (elastic#3293)
  test: drop node 14 from RC tests now that it is EOL (elastic#3315)
  test: fix running fastify.test.js with node v8 (elastic#3317)
  feat: add @apollo/server@4 support (elastic#3203)
  chore: update nvm (elastic#3309)
  tests: stop testing 'express-graphql' instrumentation (elastic#3304)
  chore: fix bitrot.js dev util for recent changes (elastic#3308)
  test: restore testing of Azure Functions on node >=18.x (elastic#3307)
  fix: support Lambda instrumentation for `contextManager: 'patch'`; refactor Lambda tests (elastic#3305)
  test: fix fastify TAV test failures (elastic#3314)
  test: fix @aws-sdk/client-s3 TAV test failures (elastic#3312)
  feat: add instrumentation for aws-sdk S3 client (elastic#3287)
  feat(fastify): add captureBody support (elastic#2681)
  feat: mysql2@3 support (elastic#3301)
  chore(deps): bump @opentelemetry/exporter-prometheus from 0.37.0 to 0.38.0 in /test/opentelemetry-metrics/fixtures (elastic#3295)
  chore(deps-dev): bump fastify from 4.16.3 to 4.17.0 (elastic#3296)
  ...

Author: v1v

.ci/docker/node-edge-container/Dockerfile

@@ -21,7 +21,7 @@ ENV NVM_NODEJS_ORG_MIRROR=${NVM_NODEJS_ORG_MIRROR}
 ENV ELASTIC_APM_CONTEXT_MANAGER=${ELASTIC_APM_CONTEXT_MANAGER}
 
 # nvm environment variables
-ENV NVM_VERSION v0.34.0
+ENV NVM_VERSION v0.39.3
 ENV NVM_DIR /usr/local/nvm
 RUN mkdir $NVM_DIR
 RUN curl --silent -o- https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh | bash

.ci/scripts/prepare-benchmarks-env.sh

@@ -15,7 +15,7 @@ if [[ -z "$NODE_VERSION" ]]; then
 fi
 
 # This particular configuration is required to be installed in the baremetal
-curl -sS -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | bash
+curl -sS -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
 export NVM_DIR="$HOME/.nvm"
 set +x  # Disable xtrace because output using nvm.sh is huge.
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"

.ci/scripts/test.sh

@@ -140,7 +140,7 @@ set -o xtrace
 
 # ---- For nightly and rc builds, determine if there is a point in testing.
 
-if [[ $BUILD_TYPE != "release" && $FORCE != "true" ]]; then
+if [[ $BUILD_TYPE != "release" ]]; then
   # If there is no nightly/rc build for this version, then skip.
   #
   # Note: We are relying on new releases being added to the top of index.tab,
@@ -165,7 +165,7 @@ if [[ $BUILD_TYPE != "release" && $FORCE != "true" ]]; then
   possible_release_version=${edge_node_version%-*}  # remove "-*" suffix
   release_version=$(curl -sS https://nodejs.org/dist/index.tab \
     | (grep -E "^${possible_release_version}\>" || true) | awk '{print $1}')
-  if [[ -n "$release_version" ]]; then
+  if [[ -n "$release_version" && $FORCE != "true" ]]; then
     skip "There is already a release build (${release_version}) of the latest v${NODE_VERSION} ${BUILD_TYPE} (${edge_node_version}). Skipping tests."
   fi
 
@@ -213,7 +213,7 @@ elif [[ -n "${TAV_MODULE}" ]]; then
     memcached)
       DOCKER_COMPOSE_FILE=docker-compose-memcached.yml
       ;;
-    aws-sdk)
+    aws-sdk|@aws-sdk/client-s3)
       DOCKER_COMPOSE_FILE=docker-compose-localstack.yml
       ;;
     *)

.ci/tav.json

@@ -1,41 +1,40 @@
 {
-  "versions": [ "19", "18", "16", "14", "12", "10", "8" ],
+  "// todo": "We want versions=['20','19','18','16','14','12','10','8'], but versions*modules needs to be <256 for the GH Actions jobs limit",
+  "versions": [ "20", "18", "16", "14", "12", "10", "8" ],
   "modules": [
+    "@apollo/server",
+    "@aws-sdk/client-s3",
     "@elastic/elasticsearch",
     "@elastic/elasticsearch-canary",
     "@hapi/hapi",
-    "@koa/router",
     "@opentelemetry/api",
+    "@opentelemetry/sdk-metrics",
     "apollo-server-express",
     "aws-sdk",
-    "bluebird",
     "cassandra-driver",
     "elasticsearch",
     "express",
-    "express-graphql",
     "express-queue",
     "fastify",
     "finalhandler",
     "generic-pool",
-    "got",
     "graphql",
-    "handlebars",
     "ioredis",
     "knex",
-    "koa-router",
     "memcached",
-    "mimic-response",
     "mongodb",
     "mongodb-core",
     "mysql",
     "mysql2",
     "next",
     "pg",
-    "pug",
     "redis",
     "restify",
     "tedious",
     "undici",
-    "ws"
+    "ws",
+    "@koa/router,koa-router",
+    "handlebars,pug",
+    "bluebird,got"
   ]
 }

.eslintrc.json

@@ -15,6 +15,7 @@
     "/.nyc_output",
     "/build",
     "node_modules",
+    "elastic-apm-node.js",
     "/examples/esbuild/dist",
     "/examples/typescript/dist",
     "/examples/nextjs",
@@ -30,6 +31,6 @@
     "/test/types/transpile/index.js",
     "/test/types/transpile-default/index.js",
     "/test_output",
-    "/tmp"
+    "tmp"
   ]
 }

.github/dependabot.yml

@@ -8,6 +8,14 @@ updates:
     reviewers:
       - "elastic/apm-agent-node-js"
 
+  - package-ecosystem: "npm"
+    directory: "/test/instrumentation/azure-functions/fixtures/AJsAzureFnApp"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    reviewers:
+      - "elastic/apm-agent-node-js"
+
   - package-ecosystem: "npm"
     directory: "/test/instrumentation/modules/next/a-nextjs-app"
     schedule:
@@ -16,6 +24,22 @@ updates:
     reviewers:
       - "elastic/apm-agent-node-js"
 
+  - package-ecosystem: "npm"
+    directory: "/test/opentelemetry-bridge"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    reviewers:
+      - "elastic/apm-agent-node-js"
+
+  - package-ecosystem: "npm"
+    directory: "/test/opentelemetry-metrics/fixtures"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    reviewers:
+      - "elastic/apm-agent-node-js"
+
   - package-ecosystem: "npm"
     directory: "/examples/opentelemetry-bridge"
     schedule:

.github/workflows/edge.yml

@@ -37,16 +37,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [ "20" ]
+        node: [ "21" ]
         contextManager: [ 'patch', '' ]
     steps:
       - uses: actions/checkout@v3
       - run: .ci/scripts/test.sh -b "nightly" "${{ matrix.node }}"
         env:
           ELASTIC_APM_CONTEXT_MANAGER: ${{ matrix.contextManager }}
 
-  # This should list all active Node.js major versions listed at:
-  # https://nodejs.org/en/about/releases/
+  # This should list all the Node.js major versions listed at
+  # https://nodejs.org/en/about/releases/, plus the next version (for which
+  # nightlies are currently being built).
   #
   # The node.js project *sometimes* produces "rc" builds leading up to a new
   # release. They get uploaded to: https://nodejs.org/download/rc/
@@ -57,10 +58,11 @@ jobs:
       fail-fast: false
       matrix:
         node:
+          - "21"
+          - "20"
           - "19"
           - "18"
           - "16"
-          - "14"
         contextManager: [ 'patch', '' ]
     steps:
       - uses: actions/checkout@v3

.github/workflows/tav.yml

@@ -54,6 +54,9 @@ jobs:
       max-parallel: 15
       fail-fast: false
       matrix:
+        # A job matrix limit is 256. We do some grouping of TAV modules to
+        # stay under that limit.
+        # https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration
         node: ${{ fromJSON(needs.prepare-matrix.outputs.versions) }}
         module: ${{ fromJSON(needs.prepare-matrix.outputs.modules) }}
     steps:

.github/workflows/test.yml

@@ -2,6 +2,7 @@ name: Test
 
 # https://github.saobby.my.eu.orgmunity/t/how-to-trigger-an-action-on-push-or-pull-request-but-not-both/16662/2
 on:
+  workflow_dispatch:
   push:
     branches:
     - main
@@ -115,6 +116,7 @@ jobs:
       fail-fast: false
       matrix:
         node:
+          - '20'
           - '19'
           - '18'
           - '18.0'

.gitignore

@@ -12,6 +12,6 @@
 /build
 node_modules
 /test/benchmarks/.tmp
-/tmp
+tmp
 /examples/*/dist
 .next