move testing of redis v2/v3 to 'npm run test-all-versions'; fix tests against earlier redis v4 versions

Also drop unused secondary redis v4 install:
    "redis-v4": "npm:[email protected]",

Author: trentm

package-lock.json

@@ -2,10 +2,10 @@ redis:
   - versions:
       include: '>=2.6.0 <4'
       mode: latest-minors
-    commands: npm run test-v2-v3-run
+    commands: npm run test-v2-v3
   - versions:
       include: '>=4 <5'
       # "4.6.9" was a bad release that accidentally broke node v14 support.
       exclude: "4.6.9"
       mode: latest-minors
-    commands: npm run test-v4-run
+    commands: npm test

plugins/node/opentelemetry-instrumentation-redis/.tav.yml

@@ -6,11 +6,8 @@
   "types": "build/src/index.d.ts",
   "repository": "open-telemetry/opentelemetry-js-contrib",
   "scripts": {
-    "test": "npm run test-v2-v3 && npm run test-v4",
-    "test-v2-v3": "tav redis 3.1.2 npm run test-v2-v3-run",
-    "test-v4": "tav redis 4.7.1 npm run test-v4-run",
-    "test-v2-v3-run": "nyc mocha --no-clean --require '@opentelemetry/contrib-test-utils' 'test/v2-v3/*.test.ts'",
-    "test-v4-run": "nyc mocha --no-clean --require '@opentelemetry/contrib-test-utils' 'test/v4/*.test.ts'",
+    "test-v2-v3": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/v2-v3/*.test.ts'",
+    "test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/v4/*.test.ts'",
     "test:debug": "cross-env RUN_REDIS_TESTS_LOCAL=true mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'",
     "test:local": "cross-env RUN_REDIS_TESTS_LOCAL=true npm run test",
     "test:docker:run": "docker run --rm -d --name otel-redis -p 63790:6379 redis:alpine",
@@ -62,8 +59,7 @@
     "@types/redis": "2.8.32",
     "cross-env": "7.0.3",
     "nyc": "17.1.0",
-    "redis": "3.1.2",
-    "redis-v4": "npm:[email protected]",
+    "redis": "^4.7.1",
     "rimraf": "5.0.10",
     "test-all-versions": "6.1.0",
     "typescript": "5.0.4"

plugins/node/opentelemetry-instrumentation-redis/package.json

@@ -64,7 +64,7 @@ const unsetStatus: SpanStatus = {
   code: SpanStatusCode.UNSET,
 };
 
-describe('redis@2.x', () => {
+describe('redis v2-v3', () => {
   let redis: typeof redisTypes;
   const shouldTestLocal = process.env.RUN_REDIS_TESTS_LOCAL;
   const shouldTest = process.env.RUN_REDIS_TESTS || shouldTestLocal;

plugins/node/opentelemetry-instrumentation-redis/test/v2-v3/redis.test.ts

@@ -55,7 +55,7 @@ import {
 import { RedisResponseCustomAttributeFunction } from '../../src/types';
 import { hrTimeToMilliseconds, suppressTracing } from '@opentelemetry/core';
 
-describe('redis@^4.0.0', () => {
+describe('redis v4', () => {
   before(function () {
     // needs to be "function" to have MochaContext "this" context
     if (!shouldTest) {
@@ -315,7 +315,13 @@ describe('redis@^4.0.0', () => {
         // Ignore. If the test Redis is not at the default port we expect this
         // to error.
       }
-      await newClient.disconnect();
+      // See https://github.com/open-telemetry/opentelemetry-js-contrib/pull/2914
+      try {
+        await newClient.disconnect();
+      } catch (_disconnectErr) {
+        // Ignore. In [email protected] and earlier this disconnect throws
+        // "The client is closed" if the connect failed.
+      }
 
       const [span] = getTestSpans();
       assert.strictEqual(span.name, 'redis-connect');