Merge branch 'main' into graphql-ignore-resolvers

open-telemetry · Dec 20, 2023 · 6905d51 · 6905d51
2 parents addac46 + c59e666
commit 6905d51
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 58 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@opentelemetry/sdk-metrics": "^1.8.0",
-    "systeminformation": "^5.0.0"
+    "systeminformation": "^5.21.20"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-host-metrics#readme"
 }
diff --git a/plugins/node/instrumentation-mongoose/.tav.yml b/plugins/node/instrumentation-mongoose/.tav.yml
@@ -1,4 +1,5 @@
 'mongoose':
-  versions: ">=5.9.7 <7"
+  # Test all the latest minor versions in the range ">=5.9.7 <7".
+  versions: "5.9.7 || 5.9.29 || 5.10.19 || 5.11.20 || 5.12.15 || 5.13.21 || 6.0.15 || 6.1.10 || 6.2.11 || 6.3.9 || 6.4.7 || 6.5.5 || 6.6.7 || 6.7.5 || 6.8.4 || 6.9.3 || 6.10.5 || 6.11.6 || ^6.12.3"
   commands:
     - npm run test
diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json
@@ -52,7 +52,7 @@
     "@types/node": "18.6.5",
     "expect": "29.2.0",
     "mocha": "7.2.0",
-    "mongoose": "6.11.5",
+    "mongoose": "6.12.3",
     "nyc": "15.1.0",
     "rimraf": "5.0.5",
     "test-all-versions": "5.0.1",

diff --git a/plugins/node/opentelemetry-instrumentation-express/examples/package.json b/plugins/node/opentelemetry-instrumentation-express/examples/package.json
@@ -39,7 +39,7 @@
     "@opentelemetry/sdk-trace-base": "^1.0.0",
     "@opentelemetry/sdk-trace-node": "^1.0.0",
     "@opentelemetry/semantic-conventions": "^1.0.0",
-    "axios": "^0.21.1",
+    "axios": "^1.6.0",
     "cross-env": "^7.0.3",
     "express": "^4.17.1"
   },

diff --git a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json
@@ -39,7 +39,7 @@
     "@opentelemetry/instrumentation-koa": "^0.31.0",
     "@opentelemetry/sdk-trace-node": "^1.0.0",
     "@opentelemetry/sdk-trace-base": "^1.0.0",
-    "axios": "^0.21.1",
+    "axios": "^1.6.0",
     "koa": "^2.13.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",

diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/.tav.yml b/plugins/node/opentelemetry-instrumentation-redis-4/.tav.yml
@@ -1,8 +1,7 @@
 redis:
-
   jobs:
-    - versions: "^4.0.0"
+    # The latest minor releases in the range "^4.0.0", excluding
+    # "4.6.9", which was a bad release that accidentally broke
+    # node v14 support.
+    - versions: "4.0.0 || 4.0.6 || 4.1.1 || 4.2.0 || 4.3.1 || 4.4.0 || 4.5.1 || ^4.6.11"
       commands: npm run test
-
-  # Fix missing `contrib-test-utils` package
-  pretest: npm run --prefix ../../../ lerna:link
diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts b/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts
@@ -71,7 +71,7 @@ describe('redis@^4.0.0', () => {
     client = createClient({
       url: redisTestUrl,
     });
-    context.with(suppressTracing(context.active()), async () => {
+    await context.with(suppressTracing(context.active()), async () => {
       await client.connect();
     });
   });

diff --git a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json
@@ -39,7 +39,7 @@
     "@opentelemetry/instrumentation-redis": "^0.32.0",
     "@opentelemetry/sdk-trace-base": "^1.0.0",
     "@opentelemetry/sdk-trace-node": "^1.0.0",
-    "axios": "^0.21.1",
+    "axios": "^1.6.0",
     "express": "^4.17.1",
     "redis": "^3.1.1"
   },