chore: add v prefix when using multiple versions

Author: blumamir

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

@@ -9,7 +9,7 @@
     "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-3/*.test.ts'",
+    "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: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",

plugins/node/opentelemetry-instrumentation-redis/src/instrumentation.ts

@@ -17,7 +17,7 @@ import { InstrumentationBase } from '@opentelemetry/instrumentation';
 import { RedisInstrumentationConfig } from './types';
 /** @knipignore */
 import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
-import { RedisInstrumentationV2_3 } from './v2-3/instrumentation';
+import { RedisInstrumentationV2_V3 } from './v2-v3/instrumentation';
 import { TracerProvider } from '@opentelemetry/api';
 import { RedisInstrumentationV4 } from './v4/instrumentation';
 
@@ -27,7 +27,7 @@ const DEFAULT_CONFIG: RedisInstrumentationConfig = {
 
 // Wrapper RedisInstrumentation that address all supported versions
 export class RedisInstrumentation extends InstrumentationBase<RedisInstrumentationConfig> {
-  private instrumentationV2_3: RedisInstrumentationV2_3;
+  private instrumentationV2_V3: RedisInstrumentationV2_V3;
   private instrumentationV4: RedisInstrumentationV4;
 
   // this is used to bypass a flaw in the base class constructor, which is calling
@@ -38,7 +38,7 @@ export class RedisInstrumentation extends InstrumentationBase<RedisInstrumentati
     const resolvedConfig = { ...DEFAULT_CONFIG, ...config };
     super(PACKAGE_NAME, PACKAGE_VERSION, resolvedConfig);
 
-    this.instrumentationV2_3 = new RedisInstrumentationV2_3(this.getConfig());
+    this.instrumentationV2_V3 = new RedisInstrumentationV2_V3(this.getConfig());
     this.instrumentationV4 = new RedisInstrumentationV4(this.getConfig());
     this.initialized = true;
   }
@@ -50,7 +50,7 @@ export class RedisInstrumentation extends InstrumentationBase<RedisInstrumentati
       return;
     }
 
-    this.instrumentationV2_3.setConfig(newConfig);
+    this.instrumentationV2_V3.setConfig(newConfig);
     this.instrumentationV4.setConfig(newConfig);
   }
 
@@ -61,7 +61,7 @@ export class RedisInstrumentation extends InstrumentationBase<RedisInstrumentati
     if (!this.initialized) {
       return;
     }
-    this.instrumentationV2_3.setTracerProvider(tracerProvider);
+    this.instrumentationV2_V3.setTracerProvider(tracerProvider);
     this.instrumentationV4.setTracerProvider(tracerProvider);
   }
 
@@ -70,7 +70,7 @@ export class RedisInstrumentation extends InstrumentationBase<RedisInstrumentati
     if (!this.initialized) {
       return;
     }
-    this.instrumentationV2_3.enable();
+    this.instrumentationV2_V3.enable();
     this.instrumentationV4.enable();
   }
 
@@ -79,7 +79,7 @@ export class RedisInstrumentation extends InstrumentationBase<RedisInstrumentati
     if (!this.initialized) {
       return;
     }
-    this.instrumentationV2_3.disable();
+    this.instrumentationV2_V3.disable();
     this.instrumentationV4.disable();
   }
 }

plugins/node/opentelemetry-instrumentation-redis/src/v2-3/instrumentation.ts renamed to plugins/node/opentelemetry-instrumentation-redis/src/v2-v3/instrumentation.ts

@@ -40,7 +40,7 @@ import {
 } from '@opentelemetry/semantic-conventions';
 import { defaultDbStatementSerializer } from '@opentelemetry/redis-common';
 
-export class RedisInstrumentationV2_3 extends InstrumentationBase<RedisInstrumentationConfig> {
+export class RedisInstrumentationV2_V3 extends InstrumentationBase<RedisInstrumentationConfig> {
   static readonly COMPONENT = 'redis';
 
   constructor(config: RedisInstrumentationConfig = {}) {
@@ -128,7 +128,7 @@ export class RedisInstrumentationV2_3 extends InstrumentationBase<RedisInstrumen
         const dbStatementSerializer =
           config?.dbStatementSerializer || defaultDbStatementSerializer;
         const span = instrumentation.tracer.startSpan(
-          `${RedisInstrumentationV2_3.COMPONENT}-${cmd.command}`,
+          `${RedisInstrumentationV2_V3.COMPONENT}-${cmd.command}`,
           {
             kind: SpanKind.CLIENT,
             attributes: {