Merge branch 'main' into tm-tav-reduce-mongoose-versions

open-telemetry · Dec 14, 2023 · 9b0ac0f · 9b0ac0f
2 parents a007eac + 63520b1
commit 9b0ac0f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
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();
     });
   });