drop support for node 16 in preparation for v5 release

.github/actions/node/oldest/action.yml

@@ -1,7 +1,7 @@
-name: Node 16
+name: Node 18
 runs:
   using: composite
   steps:
     - uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: '18'

.github/actions/node/setup/action.yml

@@ -5,4 +5,4 @@ runs:
     - uses: actions/setup-node@v3
       with:
         cache: yarn
-        node-version: '16'
+        node-version: '18'

.github/workflows/appsec.yml

@@ -27,9 +27,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/16
+      - uses: ./.github/actions/node/oldest
       - run: yarn test:appsec:ci
-      - uses: ./.github/actions/node/18
+      - uses: ./.github/actions/node/20
       - run: yarn test:appsec:ci
       - uses: ./.github/actions/node/latest
       - run: yarn test:appsec:ci
@@ -88,8 +88,6 @@ jobs:
       - run: yarn install
       - uses: ./.github/actions/node/oldest
       - run: yarn test:appsec:plugins:ci
-      - uses: ./.github/actions/node/16
-      - run: yarn test:appsec:plugins:ci
       - uses: ./.github/actions/node/18
       - run: yarn test:appsec:plugins:ci
       - uses: ./.github/actions/node/20
@@ -113,8 +111,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/16
-      - run: yarn test:appsec:plugins:ci
       - uses: ./.github/actions/node/18
       - run: yarn test:appsec:plugins:ci
       - uses: ./.github/actions/node/20
@@ -197,8 +193,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/16
-      - run: yarn test:appsec:plugins:ci
       - uses: ./.github/actions/node/18
       - run: yarn test:appsec:plugins:ci
       - uses: ./.github/actions/node/20
@@ -226,8 +220,9 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-      - run: yarn install
-      - run: yarn test:appsec:plugins:ci
+      - run: yarn install --ignore-engines
+      - run: yarn config set ignore-engines true
+      - run: yarn test:appsec:plugins:ci --ignore-engines
       - if: always()
         uses: ./.github/actions/testagent/logs
       - uses: codecov/codecov-action@v3

.github/workflows/lambda.yml

@@ -19,8 +19,6 @@ jobs:
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/16
-      - run: yarn test:lambda:ci
       - uses: ./.github/actions/node/18
       - run: yarn test:lambda:ci
       - uses: ./.github/actions/node/20

.github/workflows/package-size.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
       - run: yarn
       - name: Compute module size tree and report
         uses: qard/heaviest-objects-in-the-universe@v1

.github/workflows/plugins.yml

@@ -89,18 +89,31 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
-      - run: yarn install --ignore-engines
+      - id: pkg
+        run: |
+          content=`cat ./package.json | tr '\n' ' '`
+          echo "json=$content" >> $GITHUB_OUTPUT
+      - id: extract
+        run: |
+          version="${{fromJson(steps.pkg.outputs.json).version}}"
+          majorVersion=$(echo "$version" | cut -d '.' -f 1)
+          echo "Major Version: $majorVersion"
+          echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV
       - uses: ./.github/actions/node/oldest
-      - run: yarn test:plugins:ci
+      - name: Install dependencies and run tests 
+        if: env.MAJOR_VERSION != '5'
+        run: |
+          yarn install --ignore-engines
+          yarn test:plugins:ci
       - if: always()
         uses: ./.github/actions/testagent/logs
       - uses: codecov/codecov-action@v3
 
   aerospike-5:
     strategy:
       matrix:
-        node-version: [16]
-        range: ['5.5.0 - 5.7.0']
+        node-version: [18]
+        range: ['5.2.0 - 5.7.0']
         include:
           - node-version: 20
             range: '>=5.8.0'
@@ -132,7 +145,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install dependencies and run tests 
-        if: env.MAJOR_VERSION != '3'
+        if: env.MAJOR_VERSION == '5'
         run: |
           yarn install --ignore-engines
           yarn test:plugins:ci
@@ -399,8 +412,6 @@ jobs:
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/16
-      - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/18
       - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/20
@@ -587,8 +598,6 @@ jobs:
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/16
-      - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/18
       - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/20
@@ -608,8 +617,6 @@ jobs:
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/16
-      - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/18
       - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/20
@@ -884,8 +891,6 @@ jobs:
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/16
-      - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/18
       - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/20
@@ -916,8 +921,9 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-      - run: yarn install
-      - run: yarn test:plugins:ci
+      - run: yarn install --ignore-engines
+      - run: yarn config set ignore-engines true
+      - run: yarn test:plugins:ci --ignore-engines
       - if: always()
         uses: ./.github/actions/testagent/logs
       - uses: codecov/codecov-action@v3
@@ -992,12 +998,15 @@ jobs:
       SERVICES: oracledb
       DD_TEST_AGENT_URL: http://testagent:9126
     steps:
-      # Needs to remain on v3 for now due to GLIBC version
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/node/setup
+      - uses: actions/setup-node@v3
+        with:
+          cache: yarn
+          node-version: '16'
       - run: yarn install --ignore-engines
-      - run: yarn services
-      - run: yarn test:plugins
+      - run: yarn config set ignore-engines true
+      - run: yarn services --ignore-engines
+      - run: yarn test:plugins --ignore-engines
       - uses: codecov/codecov-action@v3
 
   paperplane:
@@ -1147,7 +1156,7 @@ jobs:
       - run: yarn install
       - uses: ./.github/actions/node/oldest
       - run: yarn test:plugins:ci
-      - uses: ./.github/actions/node/16
+      - uses: ./.github/actions/node/latest
       - run: yarn test:plugins:ci
       - if: always()
         uses: ./.github/actions/testagent/logs

.github/workflows/profiling.yml

@@ -27,8 +27,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/16
-      - run: yarn test:profiler:ci
       - uses: ./.github/actions/node/18
       - run: yarn test:profiler:ci
       - uses: ./.github/actions/node/20

.github/workflows/project.yml

@@ -18,7 +18,7 @@ jobs:
       # setting fail-fast to false in an attempt to prevent this from happening
       fail-fast: false
       matrix:
-        version: [16, 18, latest]
+        version: [18, 20, latest]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -33,7 +33,7 @@ jobs:
   integration-ci:
     strategy:
       matrix:
-        version: [16, latest]
+        version: [18, latest]
         framework: [cucumber, playwright]
     runs-on: ubuntu-latest
     env:
@@ -64,11 +64,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/node/setup
-      - run: yarn install
+      - run: yarn install --ignore-engines
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.version }}
-      - run: yarn test:integration:cypress
+      - run: yarn config set ignore-engines true
+      - run: yarn test:integration:cypress --ignore-engines
         env:
           CYPRESS_VERSION: ${{ matrix.cypress-version }}
           NODE_OPTIONS: '-r ./ci/init'

.github/workflows/serverless-integration-test.yml

@@ -13,7 +13,7 @@ jobs:
       id-token: 'write'
     strategy:
       matrix:
-        version: [16, latest]
+        version: [18, latest]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/serverless-performance.yml

@@ -10,8 +10,6 @@ jobs:
       max-parallel: 4
       matrix:
         include:
-          - node-version: 16.14
-            aws-runtime-name: "nodejs16.x"
           - node-version: 18.12
             aws-runtime-name: "nodejs18.x"
     steps:

.github/workflows/tracing.yml

@@ -27,8 +27,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/16
-      - run: yarn test:trace:core:ci
       - uses: ./.github/actions/node/18
       - run: yarn test:trace:core:ci
       - uses: ./.github/actions/node/20

.gitlab/benchmarks.yml

@@ -55,12 +55,6 @@ benchmark:
   extends: .benchmarks
   parallel:
     matrix:
-      - MAJOR_VERSION: 16
-        GROUP: 1
-      - MAJOR_VERSION: 16
-        GROUP: 2
-      - MAJOR_VERSION: 16
-        GROUP: 3
       - MAJOR_VERSION: 18
         GROUP: 1
       - MAJOR_VERSION: 18

.nvmrc

@@ -1 +1 @@
-16
+18

README.md

@@ -218,7 +218,7 @@ esbuild.build({
   outfile: 'out.js',
   plugins: [ddPlugin],
   platform: 'node', // allows built-in modules to be required
-  target: ['node16']
+  target: ['node18']
 }).catch((err) => {
   console.error(err)
   process.exit(1)

benchmark/sirun/Dockerfile

@@ -30,7 +30,6 @@ RUN wget -O sirun.tar.gz https://github.com/DataDog/sirun/releases/download/v0.1
 RUN mkdir -p /usr/local/nvm \
 	&& wget -q -O - https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash \
 	&& . $NVM_DIR/nvm.sh \
-	&& nvm install --no-progress 12.22.12 \
 	&& nvm install --no-progress 14.21.3 \
 	&& nvm install --no-progress 16.20.1 \
 	&& nvm install --no-progress 18.16.1 \

docs/package.json

@@ -11,6 +11,6 @@
   "private": true,
   "devDependencies": {
     "typedoc": "^0.17.3",
-    "typescript": "^3.8.3"
+    "typescript": "^4.6"
   }
 }

docs/yarn.lock

@@ -218,10 +218,10 @@ typedoc@^0.17.3:
     shelljs "^0.8.4"
     typedoc-default-themes "^0.10.2"
 
-typescript@^3.8.3:
-  version "3.9.10"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8"
-  integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==
+typescript@^4.6:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 uglify-js@^3.1.4:
   version "3.14.5"

integration-tests/esbuild/build-and-test-aws-sdk.js

@@ -13,7 +13,7 @@ esbuild.build({
   outfile: SCRIPT,
   plugins: [ddPlugin],
   platform: 'node',
-  target: ['node16'],
+  target: ['node18'],
   external: [ ]
 }).then(() => {
   const { status, stdout, stderr } = spawnSync('node', [SCRIPT])

integration-tests/esbuild/build-and-test-skip-external.js

@@ -11,7 +11,7 @@ esbuild.build({
   outfile: 'skip-external-out.js',
   plugins: [ddPlugin],
   platform: 'node',
-  target: ['node16'],
+  target: ['node18'],
   external: [
     'knex'
   ]

integration-tests/esbuild/build.js

@@ -9,7 +9,7 @@ esbuild.build({
   outfile: 'out.js',
   plugins: [ddPlugin],
   platform: 'node',
-  target: ['node16'],
+  target: ['node18'],
   external: [
     // dead code paths introduced by knex
     'pg',

lib-injection/Dockerfile

@@ -2,7 +2,7 @@ FROM scratch AS nodejs_agent
 COPY . /
 
 
-FROM node:16-alpine AS build
+FROM node:18-alpine AS build
 
 ARG npm_pkg
 ARG UID=10000

package.json

@@ -65,7 +65,7 @@
   },
   "homepage": "https://github.com/DataDog/dd-trace-js#readme",
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "dependencies": {
     "@datadog/native-appsec": "6.0.0",
@@ -104,7 +104,7 @@
     "semver": "^7.5.4"
   },
   "devDependencies": {
-    "@types/node": ">=16",
+    "@types/node": ">=18",
     "autocannon": "^4.5.2",
     "aws-sdk": "^2.1446.0",
     "axios": "^0.21.2",

packages/datadog-plugin-aws-sdk/test/lambda.spec.js

@@ -46,7 +46,7 @@ describe('Plugin', () => {
             Code: { ZipFile },
             Handler: 'handler.handle',
             Role: 'arn:aws:iam::123456:role/test',
-            Runtime: 'nodejs16.x'
+            Runtime: 'nodejs18.x'
           }, (err, res) => {
             if (err) return done(err)