pr feedback

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: chargome

packages/node/src/integrations/tracing/redis/vendored/ioredis-instrumentation.ts

@@ -20,7 +20,7 @@ import {
   startInactiveSpan,
 } from '@sentry/core';
 import { DB_STATEMENT, DB_SYSTEM, NET_PEER_NAME, NET_PEER_PORT } from '@sentry/conventions/attributes';
-import { defaultDbStatementSerializer } from './redis-common';
+import { defaultDbStatementSerializer } from '@sentry/server-utils';
 import { ATTR_DB_CONNECTION_STRING, DB_SYSTEM_VALUE_REDIS } from './semconv';
 import type { IORedisInstrumentationConfig } from './types';
 

packages/node/src/integrations/tracing/redis/vendored/redis-common.ts

@@ -23,9 +23,9 @@ import {
   withActiveSpan,
 } from '@sentry/core';
 import { DB_STATEMENT, DB_SYSTEM, NET_PEER_NAME, NET_PEER_PORT } from '@sentry/conventions/attributes';
+import { defaultDbStatementSerializer } from '@sentry/server-utils';
 import { DEBUG_BUILD } from '../../../../debug-build';
 import { InstrumentationNodeModuleFile } from '../../InstrumentationNodeModuleFile';
-import { defaultDbStatementSerializer } from './redis-common';
 import { ATTR_DB_CONNECTION_STRING, DB_SYSTEM_VALUE_REDIS } from './semconv';
 import type { RedisInstrumentationConfig, RedisResponseCustomAttributeFunction } from './types';
 

packages/node/src/integrations/tracing/redis/vendored/redis-instrumentation.ts

@@ -47,9 +47,11 @@ export function experimentalUseDiagnosticsChannelInjection(): void {
     const replacements = [mysqlChannelIntegration(), lruMemoizerChannelIntegration()] as const;
 
     return {
-      // ioredis only supersedes the ioredis monkey-patch inside the composite OTel
-      // `Redis` integration (gated off in `redisIntegration`), so it's added here
-      // but kept out of `replacedOtelIntegrationNames` — `Redis` must stay.
+      // The OTel `Redis` integration also covers node-redis and ioredis >=5.11
+      // (native diagnostics_channel), so we keep it in the set to retain that
+      // instrumentation. Only its ioredis <5.11 monkey-patch is gated off in
+      // `redisIntegration` — hence `ioredisChannelIntegration` is added but kept
+      // out of `replacedOtelIntegrationNames`.
       integrations: [...replacements, ioredisChannelIntegration({ responseHook: cacheResponseHook })],
       replacedOtelIntegrationNames: replacements.map(i => i.name),
       register: registerDiagnosticsChannelInjection,

packages/node/src/sdk/experimentalUseDiagnosticsChannelInjection.ts

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0
  */
 
+import { defaultDbStatementSerializer } from '@sentry/server-utils';
 import { describe, expect, it } from 'vitest';
-import { defaultDbStatementSerializer } from '../../../../src/integrations/tracing/redis/vendored/redis-common';
 
 describe('defaultDbStatementSerializer()', () => {
   const testCases: Array<{

packages/node/test/integrations/tracing/redis/redis-common.test.ts

@@ -113,7 +113,6 @@ const _ioredisChannelIntegration = ((options: IORedisChannelIntegrationOptions =
             });
           },
           {
-            captureError: false,
             beforeSpanEnd(span, data) {
               if ('error' in data || !responseHook) {
                 return;
@@ -126,21 +125,17 @@ const _ioredisChannelIntegration = ((options: IORedisChannelIntegrationOptions =
           },
         );
 
-        bindTracingChannelToSpan(
-          connectChannel,
-          data => {
-            if (!getActiveSpan()) {
-              return undefined;
-            }
-            const { host, port } = getConnectionOptions(data.self);
-            return startInactiveSpan({
-              name: 'connect',
-              op: 'db',
-              attributes: { ...connectionAttributes(host, port), [DB_STATEMENT]: 'connect' },
-            });
-          },
-          { captureError: false },
-        );
+        bindTracingChannelToSpan(connectChannel, data => {
+          if (!getActiveSpan()) {
+            return undefined;
+          }
+          const { host, port } = getConnectionOptions(data.self);
+          return startInactiveSpan({
+            name: 'connect',
+            op: 'db',
+            attributes: { ...connectionAttributes(host, port), [DB_STATEMENT]: 'connect' },
+          });
+        });
       });
     },
   };