Merge pull request newrelic#199 from bizob2828/node-20

chore: added node 20 and drop node 14 in CI
bizob2828 · Jul 18, 2023 · f19b1d0 · f19b1d0
2 parents 10de9f8 + cf86143
commit f19b1d0
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 32 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -28,7 +28,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x, 20.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -53,7 +53,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x, 20.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -63,12 +63,8 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - name: Install Dependencies
       run: npm install
-    - name: Run Versioned Tests (npm v6 / Node 14)
-      if: ${{ matrix.node-version == '14.x' }}
-      run: npm run versioned:npm6
-    - name: Run Versioned Tests (npm v7+ / Node 16+)
-      if: ${{ matrix.node-version != '14.x' }}
-      run: npm run versioned:npm7
+    - name: Run Versioned Tests
+      run: npm run versioned
     - name: Post Versioned Test Coverage
       uses: codecov/codecov-action@v3
       with:

diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x, 20.x]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
@@ -1711,7 +1711,7 @@ This product includes source derived from [lockfile-lint](https://github.com/lir
 
 ### newrelic
 
-This product includes source derived from [newrelic](https://github.com/newrelic/node-newrelic) ([v10.0.0](https://github.com/newrelic/node-newrelic/tree/v10.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic/blob/v10.0.0/LICENSE):
+This product includes source derived from [newrelic](https://github.com/newrelic/node-newrelic) ([v10.3.2](https://github.com/newrelic/node-newrelic/tree/v10.3.2)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic/blob/v10.3.2/LICENSE):
 
 ```
                                  Apache License

diff --git a/package.json b/package.json
@@ -6,9 +6,7 @@
     "test": "npm run unit && npm run versioned",
     "third-party-updates": "oss third-party manifest && oss third-party notices && git add THIRD_PARTY_NOTICES.md third_party_manifest.json",
     "unit": "c8 -o ./coverage/unit/ tap --no-coverage --reporter classic tests/unit/**/*.tap.js",
-    "versioned": "npm run versioned:npm7",
-    "versioned:npm6": "c8 -o ./coverage/versioned versioned-tests --minor -i 2 tests/versioned/**/*.tap.js",
-    "versioned:npm7": "c8 -o ./coverage/versioned versioned-tests --minor --all -i 2 tests/versioned/**/*.tap.js",
+    "versioned": "c8 -o ./coverage/versioned versioned-tests --minor --all -i 2 tests/versioned/**/*.tap.js",
     "versioned:major": "c8 -o ./coverage/versioned versioned-tests --major -i 2 tests/versioned/**/*.tap.js",
     "smoke": "tap tests/smoke/**/*.test.js --timeout=180 --no-coverage --reporter=classic",
     "lint": "eslint *.js lib tests",

diff --git a/tests/versioned/v2/amazon-dax-client.tap.js b/tests/versioned/v2/amazon-dax-client.tap.js
@@ -83,7 +83,7 @@ tap.test('amazon-dax-client', (t) => {
         t.equal(segment.name, 'Datastore/operation/DynamoDB/getItem')
 
         const attrs = segment.attributes.get(common.SEGMENT_DESTINATION)
-        t.matches(
+        t.match(
           attrs,
           {
             host: 'unknown',

diff --git a/tests/versioned/v2/dynamodb.tap.js b/tests/versioned/v2/dynamodb.tap.js
@@ -125,7 +125,7 @@ function finish(t, tests, tx) {
     )
     const attrs = segment.attributes.get(common.SEGMENT_DESTINATION)
     attrs.port_path_or_id = parseInt(attrs.port_path_or_id, 10)
-    t.matches(
+    t.match(
       attrs,
       {
         'host': String,

diff --git a/tests/versioned/v2/http-services.tap.js b/tests/versioned/v2/http-services.tap.js
@@ -240,7 +240,7 @@ function finish(t, service, operation, tx) {
   const externals = common.checkAWSAttributes(t, tx.trace.root, common.EXTERN_PATTERN)
   if (t.equal(externals.length, 1, 'should have an aws external')) {
     const attrs = externals[0].attributes.get(common.SEGMENT_DESTINATION)
-    t.matches(
+    t.match(
       attrs,
       {
         'aws.operation': operation,

diff --git a/tests/versioned/v2/package.json b/tests/versioned/v2/package.json
@@ -22,7 +22,7 @@
       },
       "dependencies": {
         "aws-sdk": {
-          "versions": ">=2.380.0",
+          "versions": ">=2.463.0",
           "samples": 10
         }
       },
@@ -42,7 +42,7 @@
       },
       "dependencies": {
         "aws-sdk": {
-          "versions": ">=2.380.0",
+          "versions": ">=2.463.0",
           "samples": 10
         },
         "amazon-dax-client": ">=1.2.5"

diff --git a/tests/versioned/v2/s3.tap.js b/tests/versioned/v2/s3.tap.js
@@ -114,7 +114,7 @@ function finish(t, tx) {
 
 function checkAttrs(t, segment, operation) {
   const attrs = segment.attributes.get(common.SEGMENT_DESTINATION)
-  t.matches(
+  t.match(
     attrs,
     {
       'aws.operation': operation,

diff --git a/tests/versioned/v2/sns.tap.js b/tests/versioned/v2/sns.tap.js
@@ -88,7 +88,7 @@ function finish(t, tx) {
   t.equal(externalSegments.length, 0, 'should not have any External segments')
 
   const attrs = messages[0].attributes.get(common.SEGMENT_DESTINATION)
-  t.matches(
+  t.match(
     attrs,
     {
       'aws.operation': 'publish',

diff --git a/tests/versioned/v2/sqs.tap.js b/tests/versioned/v2/sqs.tap.js
@@ -193,7 +193,7 @@ tap.test('SQS API', (t) => {
 function checkName(t, name, action, queueName) {
   const specificName = `/${action}/Named/${queueName}`
 
-  t.matches(name, specificName, 'should have correct name')
+  t.match(name, specificName, 'should have correct name')
 }
 
 function checkAttributes(t, segment, operation, expectedRequestId) {
@@ -206,11 +206,7 @@ function checkAttributes(t, segment, operation, expectedRequestId) {
     'aws.region': AWS_REGION
   }
 
-  t.matches(
-    actualAttributes,
-    expectedAttributes,
-    `should have expected attributes for ${operation}`
-  )
+  t.match(actualAttributes, expectedAttributes, `should have expected attributes for ${operation}`)
 }
 
 function getRequestId(data) {

diff --git a/third_party_manifest.json b/third_party_manifest.json
@@ -1,5 +1,5 @@
 {
-  "lastUpdated": "Wed May 31 2023 17:05:20 GMT-0400 (Eastern Daylight Time)",
+  "lastUpdated": "Tue Jul 11 2023 11:50:10 GMT-0400 (Eastern Daylight Time)",
   "projectName": "New Relic AWS-SDK Instrumentation",
   "projectUrl": "https://github.com/newrelic/node-newrelic-aws-sdk",
   "includeOptDeps": false,
@@ -197,15 +197,15 @@
       "email": "liran.tal@gmail.com",
       "url": "https://github.com/lirantal"
     },
-    "newrelic@10.0.0": {
+    "newrelic@10.3.2": {
       "name": "newrelic",
-      "version": "10.0.0",
-      "range": "^10.0.0",
+      "version": "10.3.2",
+      "range": "^10.3.2",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/newrelic/node-newrelic",
-      "versionedRepoUrl": "https://github.com/newrelic/node-newrelic/tree/v10.0.0",
+      "versionedRepoUrl": "https://github.com/newrelic/node-newrelic/tree/v10.3.2",
       "licenseFile": "node_modules/newrelic/LICENSE",
-      "licenseUrl": "https://github.com/newrelic/node-newrelic/blob/v10.0.0/LICENSE",
+      "licenseUrl": "https://github.com/newrelic/node-newrelic/blob/v10.3.2/LICENSE",
       "licenseTextSource": "file",
       "publisher": "New Relic Node.js agent team",
       "email": "nodejs@newrelic.com"