chore(opentelemetry-node): drop instr-redis-4, it is now consolidated into instr-redis

docs/release-notes/index.md

@@ -39,6 +39,10 @@ To check for security updates, go to [Security announcements for the Elastic sta
 
 ### Fixes [edot-node-next-fixes]
 
+### Chores [edot-node-next-chores]
+
+- Support for instrumenting `redis` version 4 has moved from `@opentelemetry/instrumentation-redis-4` to `@opentelemetry/instrumentation-redis`. If you are using the `OTEL_NODE_ENABLED_INSTRUMENTATIONS` or `OTEL_NODE_DISABLED_INSTRUMENTATIONS` environment variables to control instrumentation of `redis@4` you will need to change from using "redis-4" to "redis".
+
 ## 1.1.1 [edot-node-1.1.1-release-notes]
 
 ### Fixes [edot-node-1.1.1-fixes]

packages/opentelemetry-node/lib/instrumentations.js

@@ -45,7 +45,6 @@ const {log} = require('./logging');
  *  "@opentelemetry/instrumentation-pg": import('@opentelemetry/instrumentation-pg').PgInstrumentationConfig
  *  "@opentelemetry/instrumentation-pino": import('@opentelemetry/instrumentation-pino').PinoInstrumentationConfig
  *  "@opentelemetry/instrumentation-redis": import('@opentelemetry/instrumentation-redis').RedisInstrumentationConfig,
- *  "@opentelemetry/instrumentation-redis-4": import('@opentelemetry/instrumentation-redis-4').RedisInstrumentationConfig,
  *  "@opentelemetry/instrumentation-restify": import('@opentelemetry/instrumentation-restify').RestifyInstrumentationConfig,
  *  "@opentelemetry/instrumentation-router": import('@opentelemetry/instrumentation').InstrumentationConfig,
  *  "@opentelemetry/instrumentation-runtime-node": import('@opentelemetry/instrumentation-runtime-node').RuntimeNodeInstrumentationConfig,
@@ -89,7 +88,6 @@ const {NetInstrumentation} = require('@opentelemetry/instrumentation-net');
 const {PgInstrumentation} = require('@opentelemetry/instrumentation-pg');
 const {PinoInstrumentation} = require('@opentelemetry/instrumentation-pino');
 const {RedisInstrumentation} = require('@opentelemetry/instrumentation-redis');
-const {RedisInstrumentation: RedisFourInstrumentation} = require('@opentelemetry/instrumentation-redis-4');
 const {RestifyInstrumentation} = require('@opentelemetry/instrumentation-restify');
 const {RouterInstrumentation} = require('@opentelemetry/instrumentation-router');
 const {RuntimeNodeInstrumentation} = require('@opentelemetry/instrumentation-runtime-node');
@@ -139,7 +137,6 @@ const instrumentationsMap = {
     '@opentelemetry/instrumentation-pg': (cfg) => new PgInstrumentation(cfg),
     '@opentelemetry/instrumentation-pino': (cfg) => new PinoInstrumentation(cfg),
     '@opentelemetry/instrumentation-redis': (cfg) => new RedisInstrumentation(cfg),
-    '@opentelemetry/instrumentation-redis-4': (cfg) => new RedisFourInstrumentation(cfg),
     '@opentelemetry/instrumentation-restify': (cfg) => new RestifyInstrumentation(cfg),
     '@opentelemetry/instrumentation-router': (cfg) => new RouterInstrumentation(cfg),
     '@opentelemetry/instrumentation-runtime-node': (cfg) => new RuntimeNodeInstrumentation(cfg),

packages/opentelemetry-node/package.json

@@ -113,7 +113,6 @@
     "@opentelemetry/instrumentation-pg": "^0.55.0",
     "@opentelemetry/instrumentation-pino": "^0.50.0",
     "@opentelemetry/instrumentation-redis": "^0.51.0",
-    "@opentelemetry/instrumentation-redis-4": "^0.49.0",
     "@opentelemetry/instrumentation-restify": "^0.49.0",
     "@opentelemetry/instrumentation-router": "^0.48.0",
     "@opentelemetry/instrumentation-runtime-node": "^0.17.0",

packages/opentelemetry-node/test/instr-redis-4.test.js → packages/opentelemetry-node/test/instr-redis.test.js

@@ -9,7 +9,7 @@ const {filterOutDnsNetSpans, runTestFixtures} = require('./testutils');
 const skip = process.env.REDIS_HOST === undefined;
 if (skip) {
     console.log(
-        '# SKIP redis-4 tests: REDIS_HOST is not set (try with `REDIS_HOST=localhost`)'
+        '# SKIP redis tests: REDIS_HOST is not set (try with `REDIS_HOST=localhost`)'
     );
 }
 
@@ -38,7 +38,7 @@ const testFixtures = [
                 t.equal(s.traceId, spans[0].traceId, 'traceId');
                 t.equal(s.parentSpanId, spans[0].spanId, 'parentSpanId');
                 t.equal(s.kind, 'SPAN_KIND_CLIENT', 'kind');
-                t.equal(s.scope.name, '@opentelemetry/instrumentation-redis-4');
+                t.equal(s.scope.name, '@opentelemetry/instrumentation-redis');
                 t.equal(s.attributes['db.system'], 'redis');
             });
             t.equal(spans[1].name, 'redis-connect');
@@ -72,7 +72,7 @@ const testFixtures = [
     },
 ];
 
-test('redis-4 instrumentation', {skip}, (suite) => {
+test('redis instrumentation', {skip}, (suite) => {
     runTestFixtures(suite, testFixtures);
     suite.end();
 });

packages/opentelemetry-node/types/instrumentations.d.ts

@@ -32,7 +32,6 @@ export type InstrumentaionsMap = {
     "@opentelemetry/instrumentation-pg": import('@opentelemetry/instrumentation-pg').PgInstrumentationConfig;
     "@opentelemetry/instrumentation-pino": import('@opentelemetry/instrumentation-pino').PinoInstrumentationConfig;
     "@opentelemetry/instrumentation-redis": import('@opentelemetry/instrumentation-redis').RedisInstrumentationConfig;
-    "@opentelemetry/instrumentation-redis-4": import('@opentelemetry/instrumentation-redis-4').RedisInstrumentationConfig;
     "@opentelemetry/instrumentation-restify": import('@opentelemetry/instrumentation-restify').RestifyInstrumentationConfig;
     "@opentelemetry/instrumentation-router": import('@opentelemetry/instrumentation').InstrumentationConfig;
     "@opentelemetry/instrumentation-runtime-node": import('@opentelemetry/instrumentation-runtime-node').RuntimeNodeInstrumentationConfig;