feat(instrumentation-redis)!: consolidate redis v2,3 and redis v4 instrumentation to one package (#2915)

Co-authored-by: Amir Blum <[email protected]>

Author: trentm

.github/component-label-map.yml

@@ -210,12 +210,6 @@ pkg:instrumentation-redis:
           - plugins/node/opentelemetry-instrumentation-redis/**
           - packages/opentelemetry-test-utils/**
           - packages/opentelemetry-redis-common/**
-pkg:instrumentation-redis-4:
-  - changed-files:
-      - any-glob-to-any-file:
-          - plugins/node/opentelemetry-instrumentation-redis-4/**
-          - packages/opentelemetry-test-utils/**
-          - packages/opentelemetry-redis-common/**
 pkg:instrumentation-restify:
   - changed-files:
       - any-glob-to-any-file:

.github/component_owners.yml

@@ -132,8 +132,6 @@ components:
     - maryliag
   plugins/node/opentelemetry-instrumentation-pino:
     - seemk
-  plugins/node/opentelemetry-instrumentation-redis-4:
-    - blumamir
   plugins/node/opentelemetry-instrumentation-redis:
     - blumamir
   plugins/node/opentelemetry-instrumentation-restify: []

.release-please-manifest.json

@@ -54,7 +54,6 @@
   "plugins/node/opentelemetry-instrumentation-pg": "0.54.0",
   "plugins/node/opentelemetry-instrumentation-pino": "0.49.0",
   "plugins/node/opentelemetry-instrumentation-redis": "0.49.1",
-  "plugins/node/opentelemetry-instrumentation-redis-4": "0.49.0",
   "plugins/node/opentelemetry-instrumentation-restify": "0.48.1",
   "plugins/node/opentelemetry-instrumentation-router": "0.47.0",
   "plugins/node/opentelemetry-instrumentation-winston": "0.47.0",

metapackages/auto-instrumentations-node/package.json

@@ -82,7 +82,6 @@
     "@opentelemetry/instrumentation-pg": "^0.54.0",
     "@opentelemetry/instrumentation-pino": "^0.49.0",
     "@opentelemetry/instrumentation-redis": "^0.49.1",
-    "@opentelemetry/instrumentation-redis-4": "^0.49.0",
     "@opentelemetry/instrumentation-restify": "^0.48.1",
     "@opentelemetry/instrumentation-router": "^0.47.0",
     "@opentelemetry/instrumentation-runtime-node": "^0.16.0",

metapackages/auto-instrumentations-node/src/utils.ts

@@ -49,8 +49,7 @@ import { NetInstrumentation } from '@opentelemetry/instrumentation-net';
 import { OracleInstrumentation } from '@opentelemetry/instrumentation-oracledb';
 import { PgInstrumentation } from '@opentelemetry/instrumentation-pg';
 import { PinoInstrumentation } from '@opentelemetry/instrumentation-pino';
-import { RedisInstrumentation as RedisInstrumentationV2 } from '@opentelemetry/instrumentation-redis';
-import { RedisInstrumentation as RedisInstrumentationV4 } from '@opentelemetry/instrumentation-redis-4';
+import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis';
 import { RestifyInstrumentation } from '@opentelemetry/instrumentation-restify';
 import { RouterInstrumentation } from '@opentelemetry/instrumentation-router';
 import { RuntimeNodeInstrumentation } from '@opentelemetry/instrumentation-runtime-node';
@@ -128,8 +127,7 @@ const InstrumentationMap = {
   '@opentelemetry/instrumentation-oracledb': OracleInstrumentation,
   '@opentelemetry/instrumentation-pg': PgInstrumentation,
   '@opentelemetry/instrumentation-pino': PinoInstrumentation,
-  '@opentelemetry/instrumentation-redis': RedisInstrumentationV2,
-  '@opentelemetry/instrumentation-redis-4': RedisInstrumentationV4,
+  '@opentelemetry/instrumentation-redis': RedisInstrumentation,
   '@opentelemetry/instrumentation-restify': RestifyInstrumentation,
   '@opentelemetry/instrumentation-router': RouterInstrumentation,
   '@opentelemetry/instrumentation-runtime-node': RuntimeNodeInstrumentation,