From 4af142e2609ea32b3b74f53058b2356948750480 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 15:20:42 -0500
Subject: [PATCH 01/32] drop support for node 16 in preparation for v5 release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a54eab1239b..7bfad7f3cd8 100644
--- a/package.json
+++ b/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",

From c436f8a6e7e4118eff892e82cb7a2b6e996b7b83 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 15:25:29 -0500
Subject: [PATCH 02/32] update github actions

---
 .github/actions/node/oldest/action.yml | 4 ++--
 .github/actions/node/setup/action.yml  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/actions/node/oldest/action.yml b/.github/actions/node/oldest/action.yml
index 0dbaafccab8..a679a468d29 100644
--- a/.github/actions/node/oldest/action.yml
+++ b/.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'
diff --git a/.github/actions/node/setup/action.yml b/.github/actions/node/setup/action.yml
index 46e5c70e944..c00c299f594 100644
--- a/.github/actions/node/setup/action.yml
+++ b/.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'

From 1f4ab8cb1b3dfa2b43cd285aacf553b41d4177fb Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 16:14:02 -0500
Subject: [PATCH 03/32] update a few github actions

---
 .github/workflows/appsec.yml                      | 10 ++--------
 .github/workflows/lambda.yml                      |  2 --
 .github/workflows/package-size.yml                |  2 +-
 .github/workflows/plugins.yml                     |  7 ++-----
 .github/workflows/project.yml                     |  6 +++---
 .github/workflows/serverless-integration-test.yml |  2 +-
 6 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml
index 2a1e2440b56..13df2d1d7ff 100644
--- a/.github/workflows/appsec.yml
+++ b/.github/workflows/appsec.yml
@@ -27,9 +27,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/16
-      - run: yarn test:appsec:ci
-      - uses: ./.github/actions/node/18
+      - uses: ./.github/actions/node/oldest
       - run: yarn test:appsec:ci
       - uses: ./.github/actions/node/latest
       - run: yarn test:appsec:ci
@@ -88,8 +86,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
@@ -197,9 +193,7 @@ 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
+      - uses: ./.github/actions/node/oldest
       - run: yarn test:appsec:plugins:ci
       - uses: ./.github/actions/node/20
       - run: yarn test:appsec:plugins:ci
diff --git a/.github/workflows/lambda.yml b/.github/workflows/lambda.yml
index f98b74914e5..1e64a4cf8b6 100644
--- a/.github/workflows/lambda.yml
+++ b/.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
diff --git a/.github/workflows/package-size.yml b/.github/workflows/package-size.yml
index 4b2934a20d1..b96163fe2a7 100644
--- a/.github/workflows/package-size.yml
+++ b/.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
diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index d76e3f55a3f..409ddd6e403 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -900,11 +900,8 @@ jobs:
   next:
     strategy:
       matrix:
-        node-version: [16]
-        range: ['>=9.5 <11.1', '>=11.1 <13.2']
-        include:
-          - node-version: 18
-            range: '>=13.2'
+        node-version: [18]
+        range: ['>=13.2']
     runs-on: ubuntu-latest
     env:
       PLUGINS: next
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 34793f3e111..1969ffc119d 100644
--- a/.github/workflows/project.yml
+++ b/.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, 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:
@@ -53,7 +53,7 @@ jobs:
   integration-cypress:
     strategy:
       matrix:
-        version: [16, latest]
+        version: [18, latest]
         # 6.7.0 is the minimum version we support
         cypress-version: [6.7.0, latest]
     runs-on: ubuntu-latest
diff --git a/.github/workflows/serverless-integration-test.yml b/.github/workflows/serverless-integration-test.yml
index be3eeede960..4e204b1a390 100644
--- a/.github/workflows/serverless-integration-test.yml
+++ b/.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

From 4cd65d58ef5c5b53c1e4fe130a7a16afc039643b Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 16:18:55 -0500
Subject: [PATCH 04/32] push

---
 .github/workflows/plugins.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 409ddd6e403..dac9a4229df 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -901,7 +901,10 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        range: ['>=13.2']
+        range: ['>=9.5 <11.1', '>=11.1 <13.2']
+        include:
+          - node-version: 18
+            range: '>=13.2'
     runs-on: ubuntu-latest
     env:
       PLUGINS: next

From d225a6bad1d466944c30cefc67094065369ed468 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 16:20:22 -0500
Subject: [PATCH 05/32] push

---
 .github/workflows/appsec.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml
index 13df2d1d7ff..651c112c605 100644
--- a/.github/workflows/appsec.yml
+++ b/.github/workflows/appsec.yml
@@ -109,8 +109,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
@@ -204,7 +202,7 @@ jobs:
   next:
     strategy:
       matrix:
-        node-version: [16]
+        node-version: [18]
         range: ['>=9.5 <11.1', '>=11.1 <13.2']
         include:
           - node-version: 18

From d04a06ef4c6b5c45f77507960d339c84fcfa77fa Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 17:02:29 -0500
Subject: [PATCH 06/32] try

---
 .github/workflows/appsec.yml    |  6 +++---
 .github/workflows/plugins.yml   | 14 +++-----------
 .github/workflows/profiling.yml |  2 --
 .github/workflows/tracing.yml   |  2 --
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml
index 651c112c605..55d12593da3 100644
--- a/.github/workflows/appsec.yml
+++ b/.github/workflows/appsec.yml
@@ -202,7 +202,7 @@ jobs:
   next:
     strategy:
       matrix:
-        node-version: [18]
+        node-version: [16]
         range: ['>=9.5 <11.1', '>=11.1 <13.2']
         include:
           - node-version: 18
@@ -218,8 +218,8 @@ 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 test:appsec:plugins:ci --ignore-engines
       - if: always()
         uses: ./.github/actions/testagent/logs
       - uses: codecov/codecov-action@v3
diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index dac9a4229df..20447f1414a 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -399,8 +399,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 +585,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 +604,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 +878,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
@@ -900,7 +892,7 @@ jobs:
   next:
     strategy:
       matrix:
-        node-version: [18]
+        node-version: [16]
         range: ['>=9.5 <11.1', '>=11.1 <13.2']
         include:
           - node-version: 18
@@ -916,8 +908,8 @@ 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 test:plugins:ci --ignore-engines
       - if: always()
         uses: ./.github/actions/testagent/logs
       - uses: codecov/codecov-action@v3
diff --git a/.github/workflows/profiling.yml b/.github/workflows/profiling.yml
index 90731d062cf..aca3a332399 100644
--- a/.github/workflows/profiling.yml
+++ b/.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
diff --git a/.github/workflows/tracing.yml b/.github/workflows/tracing.yml
index 3062df0166a..cd54e25eb7e 100644
--- a/.github/workflows/tracing.yml
+++ b/.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

From 10ae903231ce386ba31b82f9e3a29e5008d24cb8 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 17:07:31 -0500
Subject: [PATCH 07/32] try

---
 .github/workflows/appsec.yml  | 1 +
 .github/workflows/plugins.yml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml
index 55d12593da3..6ecc4f1dec3 100644
--- a/.github/workflows/appsec.yml
+++ b/.github/workflows/appsec.yml
@@ -219,6 +219,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - 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
diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 20447f1414a..42dc7620406 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -909,7 +909,8 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --ignore-engines
-      - run: yarn test:plugins:ci --ignore-engines
+      - run: yarn config set ignore-engines true
+      - run: yarn test:plugins:ci
       - if: always()
         uses: ./.github/actions/testagent/logs
       - uses: codecov/codecov-action@v3

From 22a870eb803d4400d64d1215a3172603d09ba82c Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 17:12:51 -0500
Subject: [PATCH 08/32] try

---
 .github/workflows/project.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 1969ffc119d..be8d1d6289a 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -53,7 +53,7 @@ jobs:
   integration-cypress:
     strategy:
       matrix:
-        version: [18, latest]
+        version: [16, latest]
         # 6.7.0 is the minimum version we support
         cypress-version: [6.7.0, latest]
     runs-on: ubuntu-latest
@@ -64,10 +64,11 @@ 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 config set ignore-engines true
       - run: yarn test:integration:cypress
         env:
           CYPRESS_VERSION: ${{ matrix.cypress-version }}

From fffd4daa50b8a54ef569e1eafdbea287f377ccbf Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 17:19:43 -0500
Subject: [PATCH 09/32] update

---
 .github/workflows/plugins.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 42dc7620406..59fd2ed33be 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -910,7 +910,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --ignore-engines
       - run: yarn config set ignore-engines true
-      - run: yarn test:plugins:ci
+      - run: yarn test:plugins:ci --ignore-engines
       - if: always()
         uses: ./.github/actions/testagent/logs
       - uses: codecov/codecov-action@v3
@@ -1140,7 +1140,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

From f5403e8ed37817f56434fb94c675d02b5e0e2bd4 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 17:28:24 -0500
Subject: [PATCH 10/32] try

---
 .github/workflows/plugins.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 59fd2ed33be..3b5a299b234 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -985,9 +985,11 @@ 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

From 41dc62d154cf3cf6b5044269cf93bea224b95428 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 17:32:44 -0500
Subject: [PATCH 11/32] try

---
 .github/workflows/project.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index be8d1d6289a..3d8ef611e59 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -69,7 +69,7 @@ jobs:
         with:
           node-version: ${{ matrix.version }}
       - run: yarn config set ignore-engines true
-      - run: yarn test:integration:cypress
+      - run: yarn test:integration:cypress --ignore-engines
         env:
           CYPRESS_VERSION: ${{ matrix.cypress-version }}
           NODE_OPTIONS: '-r ./ci/init'

From 8a4065a5a79ba0b1f3fa7a7e8236054f0fb4b3a8 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 17:48:17 -0500
Subject: [PATCH 12/32] change

---
 .github/workflows/serverless-performance.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/serverless-performance.yml b/.github/workflows/serverless-performance.yml
index a23b18a9bf2..e124c0f1df9 100644
--- a/.github/workflows/serverless-performance.yml
+++ b/.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:

From 02ebe84a4f17b76c44570694c2c27a0ae5dea1bb Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Wed, 27 Dec 2023 18:06:40 -0500
Subject: [PATCH 13/32] fix aerospike tests

---
 .github/workflows/plugins.yml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 3b5a299b234..dd37132363f 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -89,9 +89,22 @@ 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 "::set-output name=json::$content"
+      - 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
@@ -99,8 +112,8 @@ jobs:
   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

From 92864fd86bf1bda0b8efa3a1743384ba9218d327 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Thu, 28 Dec 2023 10:23:56 -0500
Subject: [PATCH 14/32] update lib injection dockerfile

---
 lib-injection/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-injection/Dockerfile b/lib-injection/Dockerfile
index e062c325399..60670e4dcb7 100644
--- a/lib-injection/Dockerfile
+++ b/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

From 6b4165dfc3e68c53c20e9fa42e45f3de47d5ae81 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Thu, 28 Dec 2023 10:28:12 -0500
Subject: [PATCH 15/32] fix oracledb github action

---
 .github/workflows/plugins.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index dd37132363f..be50edf3885 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -1004,8 +1004,9 @@ jobs:
           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:

From d8b911a7fc04d0b6047791770f166031ca3e8c29 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Thu, 28 Dec 2023 10:39:43 -0500
Subject: [PATCH 16/32] change

---
 .github/workflows/appsec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml
index 6ecc4f1dec3..06f04596c9a 100644
--- a/.github/workflows/appsec.yml
+++ b/.github/workflows/appsec.yml
@@ -191,7 +191,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/node/setup
       - run: yarn install
-      - uses: ./.github/actions/node/oldest
+      - uses: ./.github/actions/node/18
       - run: yarn test:appsec:plugins:ci
       - uses: ./.github/actions/node/20
       - run: yarn test:appsec:plugins:ci

From 0aad23ec5b6e8fe2d1423e1a465da950ad0911be Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Thu, 28 Dec 2023 11:10:20 -0500
Subject: [PATCH 17/32] address feedback

---
 .github/workflows/appsec.yml  | 2 ++
 .github/workflows/plugins.yml | 2 +-
 .github/workflows/project.yml | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml
index 06f04596c9a..f7716d0c9c0 100644
--- a/.github/workflows/appsec.yml
+++ b/.github/workflows/appsec.yml
@@ -29,6 +29,8 @@ jobs:
       - run: yarn install
       - uses: ./.github/actions/node/oldest
       - run: yarn test:appsec:ci
+      - uses: ./.github/actions/node/20
+      - run: yarn test:appsec:ci
       - uses: ./.github/actions/node/latest
       - run: yarn test:appsec:ci
       - uses: codecov/codecov-action@v3
diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index be50edf3885..0f6e10bd2e1 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -92,7 +92,7 @@ jobs:
       - id: pkg
         run: |
           content=`cat ./package.json | tr '\n' ' '`
-          echo "::set-output name=json::$content"
+          echo "json=$content" >> $GITHUB_OUTPUT
       - id: extract
         run: |
           version="${{fromJson(steps.pkg.outputs.json).version}}"
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 3d8ef611e59..74820a6c09a 100644
--- a/.github/workflows/project.yml
+++ b/.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: [18, latest]
+        version: [18, 20, latest]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

From a1452b1f16fe4743539e61bc5975fcffaf7594cb Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 09:29:09 -0500
Subject: [PATCH 18/32] combine aerospike ci build steps

---
 .github/workflows/plugins.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 0f6e10bd2e1..4812d809aac 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -50,12 +50,10 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '14'
-      - id: pkg
+      - id: extract_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"
@@ -89,12 +87,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
-      - id: pkg
+      - id: extract_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"
@@ -131,12 +127,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
-      - id: pkg
+      - id: extract_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"

From 5bdf6f7ab0b141f5014c012ba37234a5afc5e6be Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 09:32:31 -0500
Subject: [PATCH 19/32] fix

---
 .github/workflows/plugins.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 4812d809aac..dcfefa77610 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -54,7 +54,7 @@ jobs:
         run: |
           content=`cat ./package.json | tr '\n' ' '`
           echo "json=$content" >> $GITHUB_OUTPUT
-          version="${{fromJson(steps.pkg.outputs.json).version}}"
+          version="${{fromJson(env.GITHUB_OUTPUT.json).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV
@@ -91,7 +91,7 @@ jobs:
         run: |
           content=`cat ./package.json | tr '\n' ' '`
           echo "json=$content" >> $GITHUB_OUTPUT
-          version="${{fromJson(steps.pkg.outputs.json).version}}"
+          version="${{fromJson(env.GITHUB_OUTPUT.json).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV
@@ -131,7 +131,7 @@ jobs:
         run: |
           content=`cat ./package.json | tr '\n' ' '`
           echo "json=$content" >> $GITHUB_OUTPUT
-          version="${{fromJson(steps.pkg.outputs.json).version}}"
+          version="${{fromJson(env.GITHUB_OUTPUT.json).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV

From abf8f0254d518c0f1982bdd8f4caed90e562839c Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 09:42:55 -0500
Subject: [PATCH 20/32] try

---
 .github/workflows/plugins.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index dcfefa77610..b793a5de383 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -50,11 +50,13 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '14'
-      - id: extract_pkg
+      - id: pkg
         run: |
           content=`cat ./package.json | tr '\n' ' '`
           echo "json=$content" >> $GITHUB_OUTPUT
-          version="${{fromJson(env.GITHUB_OUTPUT.json).version}}"
+      - 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
@@ -87,11 +89,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
-      - id: extract_pkg
+      - id: pkg
         run: |
           content=`cat ./package.json | tr '\n' ' '`
           echo "json=$content" >> $GITHUB_OUTPUT
-          version="${{fromJson(env.GITHUB_OUTPUT.json).version}}"
+      - 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
@@ -131,7 +135,8 @@ jobs:
         run: |
           content=`cat ./package.json | tr '\n' ' '`
           echo "json=$content" >> $GITHUB_OUTPUT
-          version="${{fromJson(env.GITHUB_OUTPUT.json).version}}"
+        run: |
+          version="${{fromJson(steps.extract_pkg.outputs.json).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV

From b3beb5e99eb677334307b36b6bd99226aa5bc93b Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 09:50:07 -0500
Subject: [PATCH 21/32] try

---
 .github/workflows/plugins.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index b793a5de383..a7e3ccb76c5 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -89,13 +89,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
-      - id: pkg
-        run: |
-          content=`cat ./package.json | tr '\n' ' '`
-          echo "json=$content" >> $GITHUB_OUTPUT
-      - id: extract
+      - id: extract_pkg
         run: |
-          version="${{fromJson(steps.pkg.outputs.json).version}}"
+          echo "PACKAGE_JSON=$(jq -c < package.json)" >> $GITHUB_ENV
+          version="${{fromJson(env.PACKAGE_JSON).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV
@@ -133,10 +130,8 @@ jobs:
       - uses: ./.github/actions/node/setup
       - id: extract_pkg
         run: |
-          content=`cat ./package.json | tr '\n' ' '`
-          echo "json=$content" >> $GITHUB_OUTPUT
-        run: |
-          version="${{fromJson(steps.extract_pkg.outputs.json).version}}"
+          echo "PACKAGE_JSON=$(jq -c < package.json)" >> $GITHUB_ENV
+          version="${{fromJson(env.PACKAGE_JSON).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV

From 1fa8e2d0d020d443c2107cd119cbb85ac80b2e5b Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 10:05:31 -0500
Subject: [PATCH 22/32] revert

---
 .github/workflows/plugins.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index a7e3ccb76c5..a600b1d0644 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -91,8 +91,9 @@ jobs:
       - uses: ./.github/actions/node/setup
       - id: extract_pkg
         run: |
-          echo "PACKAGE_JSON=$(jq -c < package.json)" >> $GITHUB_ENV
-          version="${{fromJson(env.PACKAGE_JSON).version}}"
+          content=`cat ./package.json | tr '\n' ' '`
+          echo "json=$content" >> $GITHUB_OUTPUT
+          version="${{fromJson(env.GITHUB_OUTPUT).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV
@@ -130,8 +131,9 @@ jobs:
       - uses: ./.github/actions/node/setup
       - id: extract_pkg
         run: |
-          echo "PACKAGE_JSON=$(jq -c < package.json)" >> $GITHUB_ENV
-          version="${{fromJson(env.PACKAGE_JSON).version}}"
+          content=`cat ./package.json | tr '\n' ' '`
+          echo "json=$content" >> $GITHUB_OUTPUT
+          version="${{fromJson(env.GITHUB_OUTPUT).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV

From 33cfc426e8228202ce1f91a6794a0c4c76c7c99d Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 10:11:00 -0500
Subject: [PATCH 23/32] try

---
 .github/workflows/plugins.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index a600b1d0644..a4aacb994f0 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -133,7 +133,7 @@ jobs:
         run: |
           content=`cat ./package.json | tr '\n' ' '`
           echo "json=$content" >> $GITHUB_OUTPUT
-          version="${{fromJson(env.GITHUB_OUTPUT).version}}"
+          version="${{fromJson(steps.extract_pkg.outputs.json).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV

From 7e0cf44b618850060393c23e91262fa741f889d7 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 10:15:05 -0500
Subject: [PATCH 24/32] try

---
 .github/workflows/plugins.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index a4aacb994f0..d90fa6a20b0 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -131,9 +131,8 @@ jobs:
       - uses: ./.github/actions/node/setup
       - id: extract_pkg
         run: |
-          content=`cat ./package.json | tr '\n' ' '`
-          echo "json=$content" >> $GITHUB_OUTPUT
-          version="${{fromJson(steps.extract_pkg.outputs.json).version}}"
+          content=$(cat ./package.json | tr '\n' ' ')
+          version=$(echo "$content" | jq -r .version)
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV

From c5ef6ad4bfe7a8d5f24b7b1398b9293af46a96f2 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 10:18:10 -0500
Subject: [PATCH 25/32] try

---
 .github/workflows/plugins.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index d90fa6a20b0..c57344d5245 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -56,7 +56,8 @@ jobs:
           echo "json=$content" >> $GITHUB_OUTPUT
       - id: extract
         run: |
-          version="${{fromJson(steps.pkg.outputs.json).version}}"
+          content=$(cat ./package.json | tr '\n' ' ')
+          version=$(echo "$content" | jq -r .version)
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV
@@ -91,9 +92,8 @@ jobs:
       - uses: ./.github/actions/node/setup
       - id: extract_pkg
         run: |
-          content=`cat ./package.json | tr '\n' ' '`
-          echo "json=$content" >> $GITHUB_OUTPUT
-          version="${{fromJson(env.GITHUB_OUTPUT).version}}"
+          content=$(cat ./package.json | tr '\n' ' ')
+          version=$(echo "$content" | jq -r .version)
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV

From 14d9744136680b37789323e80c983b67659dfb30 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 10:24:50 -0500
Subject: [PATCH 26/32] try

---
 .github/workflows/plugins.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index c57344d5245..9ed971b949f 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -50,14 +50,14 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '14'
+      # jq -r is not available on v3
       - id: pkg
         run: |
           content=`cat ./package.json | tr '\n' ' '`
           echo "json=$content" >> $GITHUB_OUTPUT
       - id: extract
         run: |
-          content=$(cat ./package.json | tr '\n' ' ')
-          version=$(echo "$content" | jq -r .version)
+          version="${{fromJson(steps.pkg.outputs.json).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV

From 63620ce3ab1607576ca729d8b956d18f9368574a Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 10:28:46 -0500
Subject: [PATCH 27/32] rename steps

---
 .github/workflows/plugins.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 9ed971b949f..603b042e855 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -90,7 +90,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
-      - id: extract_pkg
+      - name: Extract tracer version
         run: |
           content=$(cat ./package.json | tr '\n' ' ')
           version=$(echo "$content" | jq -r .version)
@@ -129,7 +129,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
-      - id: extract_pkg
+      - name: Extract tracer version
         run: |
           content=$(cat ./package.json | tr '\n' ' ')
           version=$(echo "$content" | jq -r .version)

From 91f02768f5172b6fe1c2a72781c6ffa719aa3066 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 10:30:35 -0500
Subject: [PATCH 28/32] try

---
 .github/workflows/plugins.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 603b042e855..543caafd779 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -51,13 +51,11 @@ jobs:
         with:
           node-version: '14'
       # jq -r is not available on v3
-      - id: pkg
+      - name: Extract tracer version
         run: |
           content=`cat ./package.json | tr '\n' ' '`
-          echo "json=$content" >> $GITHUB_OUTPUT
-      - id: extract
-        run: |
-          version="${{fromJson(steps.pkg.outputs.json).version}}"
+          echo "JSON_OUTPUT=$content" >> $GITHUB_ENV
+          version="${{fromJson(env.JSON_OUTPUT).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV

From a55e3f3bf35e2851807730feb40148170d7f27ac Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 10:34:57 -0500
Subject: [PATCH 29/32] revert changes

---
 .github/workflows/plugins.yml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 543caafd779..0f6e10bd2e1 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -50,12 +50,13 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '14'
-      # jq -r is not available on v3
-      - name: Extract tracer version
+      - id: pkg
         run: |
           content=`cat ./package.json | tr '\n' ' '`
-          echo "JSON_OUTPUT=$content" >> $GITHUB_ENV
-          version="${{fromJson(env.JSON_OUTPUT).version}}"
+          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
@@ -88,10 +89,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
-      - name: Extract tracer version
+      - id: pkg
+        run: |
+          content=`cat ./package.json | tr '\n' ' '`
+          echo "json=$content" >> $GITHUB_OUTPUT
+      - id: extract
         run: |
-          content=$(cat ./package.json | tr '\n' ' ')
-          version=$(echo "$content" | jq -r .version)
+          version="${{fromJson(steps.pkg.outputs.json).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV
@@ -127,10 +131,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
-      - name: Extract tracer version
+      - id: pkg
+        run: |
+          content=`cat ./package.json | tr '\n' ' '`
+          echo "json=$content" >> $GITHUB_OUTPUT
+      - id: extract
         run: |
-          content=$(cat ./package.json | tr '\n' ' ')
-          version=$(echo "$content" | jq -r .version)
+          version="${{fromJson(steps.pkg.outputs.json).version}}"
           majorVersion=$(echo "$version" | cut -d '.' -f 1)
           echo "Major Version: $majorVersion"
           echo "MAJOR_VERSION=$majorVersion" >> $GITHUB_ENV

From f4358630b738667e5e5a052ed43b3cee207e059a Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 11:00:38 -0500
Subject: [PATCH 30/32] update node 16 to node 18 in a few other places

---
 .gitlab/benchmarks.yml                            |  6 ------
 .nvmrc                                            |  2 +-
 benchmark/sirun/Dockerfile                        |  1 -
 package.json                                      |  2 +-
 .../datadog-plugin-aws-sdk/test/lambda.spec.js    |  2 +-
 yarn.lock                                         | 15 +++++++++++----
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.gitlab/benchmarks.yml b/.gitlab/benchmarks.yml
index 864d76cb877..58d4ca89a0a 100644
--- a/.gitlab/benchmarks.yml
+++ b/.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
diff --git a/.nvmrc b/.nvmrc
index b6a7d89c68e..3c032078a4a 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-16
+18
diff --git a/benchmark/sirun/Dockerfile b/benchmark/sirun/Dockerfile
index f212bfd662c..6ce6d8557fe 100644
--- a/benchmark/sirun/Dockerfile
+++ b/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 \
diff --git a/package.json b/package.json
index 7bfad7f3cd8..6fbdf8cf420 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/packages/datadog-plugin-aws-sdk/test/lambda.spec.js b/packages/datadog-plugin-aws-sdk/test/lambda.spec.js
index 4ccf3b8b46e..4092e933af7 100644
--- a/packages/datadog-plugin-aws-sdk/test/lambda.spec.js
+++ b/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)
 
diff --git a/yarn.lock b/yarn.lock
index 9ecfe4833eb..ebb28921157 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -841,10 +841,12 @@
   resolved "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz"
   integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
 
-"@types/node@>=16":
-  version "18.7.23"
-  resolved "https://registry.npmjs.org/@types/node/-/node-18.7.23.tgz"
-  integrity sha512-DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg==
+"@types/node@>=18":
+  version "20.10.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.6.tgz#a3ec84c22965802bf763da55b2394424f22bfbb5"
+  integrity sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==
+  dependencies:
+    undici-types "~5.26.4"
 
 "@types/prop-types@*":
   version "15.7.5"
@@ -5095,6 +5097,11 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 unicode-length@^2.0.2:
   version "2.1.0"
   resolved "https://registry.npmjs.org/unicode-length/-/unicode-length-2.1.0.tgz"

From a8340a300ebff3f197cbe090f64dfdaeae1cae65 Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 12:01:49 -0500
Subject: [PATCH 31/32] update esbuild tests

---
 README.md                                                 | 2 +-
 integration-tests/esbuild/build-and-test-aws-sdk.js       | 2 +-
 integration-tests/esbuild/build-and-test-skip-external.js | 2 +-
 integration-tests/esbuild/build.js                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8a3d9372125..341283a71ca 100644
--- a/README.md
+++ b/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)
diff --git a/integration-tests/esbuild/build-and-test-aws-sdk.js b/integration-tests/esbuild/build-and-test-aws-sdk.js
index c9d46a5da78..116615f9f63 100755
--- a/integration-tests/esbuild/build-and-test-aws-sdk.js
+++ b/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])
diff --git a/integration-tests/esbuild/build-and-test-skip-external.js b/integration-tests/esbuild/build-and-test-skip-external.js
index 51da8597ff4..b7a35d6026b 100755
--- a/integration-tests/esbuild/build-and-test-skip-external.js
+++ b/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'
   ]
diff --git a/integration-tests/esbuild/build.js b/integration-tests/esbuild/build.js
index fa862f279ad..60ba653548f 100755
--- a/integration-tests/esbuild/build.js
+++ b/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',

From b57ae28025a31c2d0d406a7269658588e4c8d9ff Mon Sep 17 00:00:00 2001
From: Ayan Khan <khanayan_123@hotmail.com>
Date: Tue, 2 Jan 2024 12:43:33 -0500
Subject: [PATCH 32/32] update typescript version to work with @types/node
 version upgrade

---
 docs/package.json | 2 +-
 docs/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/package.json b/docs/package.json
index 3f58f83cbda..f435f473302 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -11,6 +11,6 @@
   "private": true,
   "devDependencies": {
     "typedoc": "^0.17.3",
-    "typescript": "^3.8.3"
+    "typescript": "^4.6"
   }
 }
diff --git a/docs/yarn.lock b/docs/yarn.lock
index 1f1ffeef806..e4cf671e773 100644
--- a/docs/yarn.lock
+++ b/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"