Merge branch 'main' into renovate/node-18.x

open-telemetry · Jul 16, 2023 · ea7a293 · ea7a293
2 parents 3e23c98 + 432d89e
commit ea7a293
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml
@@ -19,11 +19,6 @@ jobs:
       fail-fast: false
       matrix:
         node: ["14", "16", "18"]
-        include:
-          - node: "18"
-            lerna-extra-args: >-
-              --ignore @opentelemetry/instrumentation-fastify
-              --ignore @opentelemetry/instrumentation-restify
     runs-on: ubuntu-latest
     services:
       mongo:

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -10,10 +10,6 @@ jobs:
       fail-fast: false
       matrix:
         node: ["14", "16", "18"]
-        include:
-          - node: "18"
-            lerna-extra-args: >-
-              --ignore @opentelemetry/instrumentation-restify
     runs-on: ubuntu-latest
     services:
       memcached:

diff --git a/plugins/node/opentelemetry-instrumentation-restify/.tav.yml b/plugins/node/opentelemetry-instrumentation-restify/.tav.yml
@@ -1,3 +1,8 @@
 restify:
-  versions: "4.3.4 || 5.2.0 || 6.4.0 || 7.7.0 || ^8.4.0"
-  commands: npm run test
+  - versions: "^10.0.0 || ^11.1.0"
+    node: ">=18"
+    commands: npm run test
+
+  - versions: "4.3.4 || 5.2.0 || 6.4.0 || 7.7.0 || ^8.4.0 || 9.1.0 || ^10.0.0 || ^11.1.0"
+    node: "<18"
+    commands: npm run test
diff --git a/plugins/node/opentelemetry-instrumentation-restify/README.md b/plugins/node/opentelemetry-instrumentation-restify/README.md
@@ -17,7 +17,7 @@ npm install --save @opentelemetry/instrumentation-restify
 
 ### Supported Versions
 
-- `>=4.0.0 <9`
+- `>=4.0.0 <12`
 
 ## Usage
 

diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json
@@ -56,7 +56,7 @@
     "@types/semver": "^7.3.12",
     "mocha": "7.2.0",
     "nyc": "15.1.0",
-    "restify": "8.6.1",
+    "restify": "11.1.0",
     "rimraf": "5.0.0",
     "semver": "^7.3.7",
     "test-all-versions": "^5.0.1",

diff --git a/plugins/node/opentelemetry-instrumentation-restify/src/constants.ts b/plugins/node/opentelemetry-instrumentation-restify/src/constants.ts
@@ -24,4 +24,4 @@ export const RESTIFY_METHODS = [
   'patch',
 ];
 export const MODULE_NAME = 'restify';
-export const SUPPORTED_VERSIONS = ['>=4.0.0 <9'];
+export const SUPPORTED_VERSIONS = ['>=4.0.0 <12'];