Merge branch 'main' into trentm-redis-consolidation-alt

trentm · trentm · commit dc6e6fc86888 · 2025-06-27T15:06:41.000-07:00
diff --git a/plugins/node/opentelemetry-instrumentation-redis/test/v4/redis.test.ts b/plugins/node/opentelemetry-instrumentation-redis/test/v4/redis.test.ts
@@ -315,7 +315,6 @@ describe('redis v4', () => {
         // Ignore. If the test Redis is not at the default port we expect this
         // to error.
       }
-      // See https://github.com/open-telemetry/opentelemetry-js-contrib/pull/2914
       try {
         await newClient.disconnect();
       } catch (_disconnectErr) {

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,6 @@ describe('redis v4', () => {`
`315`	`315`	`// Ignore. If the test Redis is not at the default port we expect this`
`316`	`316`	`// to error.`
`317`	`317`	`}`
`318`		`- // See https://github.com/open-telemetry/opentelemetry-js-contrib/pull/2914`
`319`	`318`	`try {`
`320`	`319`	`await newClient.disconnect();`
`321`	`320`	`} catch (_disconnectErr) {`