From 432d89e0408b8bdd829861720d6c894733b8a7a2 Mon Sep 17 00:00:00 2001
From: Chi Ma <chigia001@users.noreply.github.com>
Date: Sun, 16 Jul 2023 15:16:09 +0700
Subject: [PATCH] chore(restify): update restify version to 11.1.0 and
 re-enable unit test in node@18 (#1576)

* chore(restify): upgrade restify to 9.1.0

* chore(restify): upgrade restify to 10.0.0 && re-enable node@18 test

* chore(restify): upgrade restify to 11.1.0

* chore(restify): re-enable test in tav

* chore(restify): update tav with corrent node.js version range check

* chore(restify): fix missing newline

* chore(restify): update tav to version 9.1.0 instead of 9.0.0

* chore: upgrade document and tav for restify

* chore: pin restify version

---------

Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com>
---
 .github/workflows/test-all-versions.yml                  | 5 -----
 .github/workflows/unit-test.yml                          | 4 ----
 .../node/opentelemetry-instrumentation-restify/.tav.yml  | 9 +++++++--
 .../node/opentelemetry-instrumentation-restify/README.md | 2 +-
 .../opentelemetry-instrumentation-restify/package.json   | 2 +-
 .../src/constants.ts                                     | 2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml
index 20f54df5c38..9fefec31476 100644
--- 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
index 4959b4d90cd..9ffee4b82f7 100644
--- 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
index 62556552fbc..a1ef4c915ca 100644
--- 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
index 719a042ab7c..2e16ea74903 100644
--- 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
index d5d9046c455..064646126bd 100644
--- 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
index 0ba23dccf5f..ebd38f91ccb 100644
--- 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'];