feat: move to redis from ioredis per connect-redis

Author: djMax

__tests__/vitest.test-setup.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll } from 'vitest';
 
-import { shutdownGlobalTelemetry, startGlobalTelemetry } from '../src/telemetry';
+import { shutdownGlobalTelemetry, startGlobalTelemetry } from '../src/telemetry/index.js';
 
 // Even in testing, this needs to run first so that the instrumentation
 // is loaded BEFORE express is loaded.
@@ -11,5 +11,5 @@ beforeAll(async () => {
 });
 
 afterAll(async () => {
-  await shutdownGlobalTelemetry();
+  await shutdownGlobalTelemetry().catch(() => undefined);
 });

package.json

@@ -77,10 +77,10 @@
     "@opentelemetry/instrumentation-generic-pool": "^0.51.0",
     "@opentelemetry/instrumentation-graphql": "^0.55.0",
     "@opentelemetry/instrumentation-http": "^0.207.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.55.0",
     "@opentelemetry/instrumentation-net": "^0.51.0",
     "@opentelemetry/instrumentation-pg": "^0.60.0",
     "@opentelemetry/instrumentation-pino": "^0.54.0",
+    "@opentelemetry/instrumentation-redis": "^0.56.0",
     "@opentelemetry/instrumentation-undici": "^0.18.0",
     "@opentelemetry/resource-detector-container": "^0.7.10",
     "@opentelemetry/resource-detector-gcp": "^0.42.0",

src/express-app/app.ts

@@ -380,7 +380,9 @@ export async function listen<SLocals extends AnyServiceLocals = ServiceLocals<Co
       shutdownInProgress = true;
       app.locals.logger.info('Shutdown requested');
       if (app.locals.internalApp) {
-        app.locals.internalApp.locals.server?.close();
+        if (app.locals.internalApp.locals.server?.listening) {
+          app.locals.internalApp.locals.server?.close();
+        }
       }
       shutdownApp(app);
     }

src/telemetry/instrumentations.ts

@@ -7,7 +7,7 @@ import {
   HttpInstrumentation,
   IgnoreIncomingRequestFunction,
 } from '@opentelemetry/instrumentation-http';
-import { IORedisInstrumentation } from '@opentelemetry/instrumentation-ioredis';
+import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis';
 import { NetInstrumentation } from '@opentelemetry/instrumentation-net';
 import { GraphQLInstrumentation } from '@opentelemetry/instrumentation-graphql';
 import { PgInstrumentation } from '@opentelemetry/instrumentation-pg';
@@ -20,7 +20,7 @@ const InstrumentationMap = {
   '@opentelemetry/instrumentation-graphql': GraphQLInstrumentation,
   '@opentelemetry/instrumentation-undici': UndiciInstrumentation,
   '@opentelemetry/instrumentation-generic-pool': GenericPoolInstrumentation,
-  '@opentelemetry/instrumentation-ioredis': IORedisInstrumentation,
+  '@opentelemetry/instrumentation-redis': RedisInstrumentation,
   '@opentelemetry/instrumentation-net': NetInstrumentation,
   '@opentelemetry/instrumentation-pg': PgInstrumentation,
   '@opentelemetry/instrumentation-pino': PinoInstrumentation,

yarn.lock

@@ -806,10 +806,10 @@ __metadata:
     "@opentelemetry/instrumentation-generic-pool": ^0.51.0
     "@opentelemetry/instrumentation-graphql": ^0.55.0
     "@opentelemetry/instrumentation-http": ^0.207.0
-    "@opentelemetry/instrumentation-ioredis": ^0.55.0
     "@opentelemetry/instrumentation-net": ^0.51.0
     "@opentelemetry/instrumentation-pg": ^0.60.0
     "@opentelemetry/instrumentation-pino": ^0.54.0
+    "@opentelemetry/instrumentation-redis": ^0.56.0
     "@opentelemetry/instrumentation-undici": ^0.18.0
     "@opentelemetry/resource-detector-container": ^0.7.10
     "@opentelemetry/resource-detector-gcp": ^0.42.0