ref(server-utils): Streamline redisIntegration

dev-packages/e2e-tests/test-applications/deno-redis/src/app.ts

@@ -15,7 +15,7 @@ const redisUrl = Deno.env.get('REDIS_URL') ?? 'redis://127.0.0.1:6379';
 
 // One shared client per process. node-redis publishes to the
 // `node-redis:command` / `:batch` / `:connect` diagnostics channels for every
-// operation on this client; denoRedisIntegration is already subscribed to
+// operation on this client; redisIntegration is already subscribed to
 // those.
 const redis = createClient({ url: redisUrl });
 function onRedisError(err: unknown) {
@@ -26,7 +26,7 @@ redis.on('error', onRedisError);
 await redis.connect();
 
 // Separate ioredis client. ioredis >= 5.11 publishes to the `ioredis:command`
-// and `ioredis:connect` channels, which denoRedisIntegration also subscribes
+// and `ioredis:connect` channels, which redisIntegration also subscribes
 // to. lazyConnect so we can yield a microtick before connecting and ensure
 // the DC subscriber is registered before ioredis creates its tracing channels.
 await Promise.resolve();

packages/deno/src/index.ts

@@ -111,8 +111,7 @@ export { denoServeIntegration } from './integrations/deno-serve';
 export type { DenoServeIntegrationOptions } from './integrations/deno-serve';
 export { denoHttpIntegration } from './integrations/http';
 export type { DenoHttpIntegrationOptions } from './integrations/http';
-export { denoRedisIntegration } from './integrations/redis';
-export type { DenoRedisIntegrationOptions } from './integrations/redis';
+
 // The orchestrion channel integrations, re-exported from `@sentry/server-utils`.
 // Most are in the default set; `dataloader` and `knex` are opt-in (add them to
 // `integrations` to enable), matching Node. Re-export every one that `sdk.ts`
@@ -122,6 +121,7 @@ export {
  anthropicIntegration,
  awsIntegration,
  dataloaderIntegration,
+ redisIntegration,
  expressIntegration,
  firebaseIntegration,
  genericPoolIntegration,
@@ -157,6 +157,7 @@ export { denoMongoIntegration } from './integrations/mongo';
 export { denoMongooseIntegration } from './integrations/mongoose';
 export { denoDataloaderIntegration } from './integrations/dataloader';
 export { denoKnexIntegration } from './integrations/knex';
+export { denoRedisIntegration } from './integrations/redis';
 /* eslint-enable typescript/no-deprecated */
 export { denoContextIntegration } from './integrations/context';
 export { globalHandlersIntegration } from './integrations/globalhandlers';

packages/deno/src/integrations/redis.ts

@@ -1,34 +1,6 @@
-import type { RedisDiagnosticChannelResponseHook } from '@sentry/server-utils';
-import { redisIntegration as redisChannelIntegration } from '@sentry/server-utils';
-import type { Integration, IntegrationFn } from '@sentry/core';
-import { defineIntegration, extendIntegration } from '@sentry/core';
-
-const INTEGRATION_NAME = 'DenoRedis' as const;
-
-export interface DenoRedisIntegrationOptions {
- /**
- * Optional hook invoked once the redis command response arrives. Useful for
- * attaching response-derived attributes (e.g. cache hit/miss, payload size).
- */
- responseHook?: RedisDiagnosticChannelResponseHook;
-}
-
-const _denoRedisIntegration = ((options: DenoRedisIntegrationOptions = {}) => {
- // The diagnostics_channel subscription lives in server-utils so it is shared
- // across runtimes. The AsyncLocalStorage async-context strategy the channel
- // binding depends on is installed once in `init()`, so this wrapper only
- // renames the shared integration.
- return extendIntegration(redisChannelIntegration({ responseHook: options.responseHook }), {
- name: INTEGRATION_NAME,
- });
-}) satisfies IntegrationFn;
+import { redisIntegration } from '@sentry/server-utils/orchestrion';
 
 /**
- * Creates spans for redis commands, batches, and connects under Deno via
- * `node:diagnostics_channel`. Subscribes to both node-redis (>= 5.12.0) and
- * ioredis (>= 5.11.0) channels — both libraries publish to dedicated channels
- * once they're new enough; on older releases the subscribers are inert.
+ * @deprecated Use `redisIntegration` instead.
  */
-export const denoRedisIntegration = defineIntegration(_denoRedisIntegration) as (
- options?: DenoRedisIntegrationOptions,
-) => Integration & { name: 'DenoRedis'; setupOnce: () => void };
+export const denoRedisIntegration: typeof redisIntegration = redisIntegration;

packages/deno/src/sdk.ts

@@ -35,14 +35,14 @@ import {
  postgresJsIntegration,
  tediousIntegration,
  vercelAiIntegration,
+ redisIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { DenoClient } from './client';
 import { breadcrumbsIntegration } from './integrations/breadcrumbs';
 import { denoContextIntegration } from './integrations/context';
 import { contextLinesIntegration } from './integrations/contextlines';
 import { denoServeIntegration } from './integrations/deno-serve';
 import { denoHttpIntegration } from './integrations/http';
-import { denoRedisIntegration } from './integrations/redis';
 import { globalHandlersIntegration } from './integrations/globalhandlers';
 import { normalizePathsIntegration } from './integrations/normalizepaths';
 import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
@@ -64,7 +64,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
  denoContextIntegration(),
  denoServeIntegration(),
  denoHttpIntegration(),
-denoRedisIntegration(),
+redisIntegration(),
  graphqlDiagnosticsIntegration(),
  vercelAiIntegration(),
  // orchestrion-based instrumentations. We add a deliberate list here rather

packages/deno/test/__snapshots__/mod.test.ts.snap

@@ -56,7 +56,7 @@ snapshot[`captureMessage 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -161,7 +161,7 @@ snapshot[`captureMessage twice 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -273,7 +273,7 @@ snapshot[`captureMessage twice 2`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",

packages/deno/test/deno-redis.test.ts

@@ -52,14 +52,14 @@ function withTimeout<T>(p: Promise<T>, ms: number, what: string): Promise<T> {
  });
 }
 
-Deno.test('denoRedisIntegration: included in default integrations', () => {
+Deno.test('redisIntegration: included in default integrations', () => {
  resetGlobals();
  const client = init({ dsn: 'https://username@domain/123' }) as DenoClient;
  const names = client.getOptions().integrations.map(i => i.name);
- assert(names.includes('DenoRedis'), `DenoRedis should be in defaults, got ${names.join(', ')}`);
+ assert(names.includes('Redis'), `Redis should be in defaults, got ${names.join(', ')}`);
 });
 
-Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: node-redis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -98,7 +98,7 @@ Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query
  assertEquals(redisSpan!.data?.['server.port'], 6379);
 });
 
-Deno.test('denoRedisIntegration: errors on the command channel set span status', async () => {
+Deno.test('redisIntegration: errors on the command channel set span status', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -135,7 +135,7 @@ Deno.test('denoRedisIntegration: errors on the command channel set span status',
  assertEquals(redisSpan!.status, 'internal_error');
 });
 
-Deno.test('denoRedisIntegration: ioredis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: ioredis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({

packages/node/src/index.ts

@@ -26,10 +26,10 @@ export {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration as vercelAIIntegration,
 } from '@sentry/server-utils/orchestrion';
-export { redisIntegration } from './integrations/tracing/redis';
 export {
  otlpIntegration,
  getOtlpTracesEndpoint,

packages/node/src/integrations/tracing/index.ts

@@ -21,11 +21,11 @@ import {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { fastifyIntegration } from './fastify';
-import { redisIntegration } from './redis';
 
 export function getAutoPerformanceIntegrations(): Integration[] {
  return [
@@ -36,8 +36,6 @@ export function getAutoPerformanceIntegrations(): Integration[] {
  mongooseIntegration(),
  mysqlIntegration(),
  mysql2Integration(),
- // Redis keeps the node wrapper: it wires the cache `responseHook` into the channel subscribers
- // and covers all redis client versions (native diagnostics_channel + orchestrion fallbacks).
  redisIntegration(),
  postgresIntegration(),
  prismaIntegration(),

dev-packages/e2e-tests/test-applications/deno-redis/src/app.ts

@@ -15,7 +15,7 @@ const redisUrl = Deno.env.get('REDIS_URL') ?? 'redis://127.0.0.1:6379';
 
 // One shared client per process. node-redis publishes to the
 // `node-redis:command` / `:batch` / `:connect` diagnostics channels for every
-// operation on this client; denoRedisIntegration is already subscribed to
+// operation on this client; redisIntegration is already subscribed to
 // those.
 const redis = createClient({ url: redisUrl });
 function onRedisError(err: unknown) {
@@ -26,7 +26,7 @@ redis.on('error', onRedisError);
 await redis.connect();
 
 // Separate ioredis client. ioredis >= 5.11 publishes to the `ioredis:command`
-// and `ioredis:connect` channels, which denoRedisIntegration also subscribes
+// and `ioredis:connect` channels, which redisIntegration also subscribes
 // to. lazyConnect so we can yield a microtick before connecting and ensure
 // the DC subscriber is registered before ioredis creates its tracing channels.
 await Promise.resolve();

packages/deno/src/index.ts

@@ -111,8 +111,7 @@ export { denoServeIntegration } from './integrations/deno-serve';
 export type { DenoServeIntegrationOptions } from './integrations/deno-serve';
 export { denoHttpIntegration } from './integrations/http';
 export type { DenoHttpIntegrationOptions } from './integrations/http';
-export { denoRedisIntegration } from './integrations/redis';
-export type { DenoRedisIntegrationOptions } from './integrations/redis';
+
 // The orchestrion channel integrations, re-exported from `@sentry/server-utils`.
 // Most are in the default set; `dataloader` and `knex` are opt-in (add them to
 // `integrations` to enable), matching Node. Re-export every one that `sdk.ts`
@@ -122,6 +121,7 @@ export {
  anthropicIntegration,
  awsIntegration,
  dataloaderIntegration,
+ redisIntegration,
  expressIntegration,
  firebaseIntegration,
  genericPoolIntegration,
@@ -157,6 +157,7 @@ export { denoMongoIntegration } from './integrations/mongo';
 export { denoMongooseIntegration } from './integrations/mongoose';
 export { denoDataloaderIntegration } from './integrations/dataloader';
 export { denoKnexIntegration } from './integrations/knex';
+export { denoRedisIntegration } from './integrations/redis';
 /* eslint-enable typescript/no-deprecated */
 export { denoContextIntegration } from './integrations/context';
 export { globalHandlersIntegration } from './integrations/globalhandlers';

packages/deno/src/integrations/redis.ts

@@ -1,34 +1,6 @@
-import type { RedisDiagnosticChannelResponseHook } from '@sentry/server-utils';
-import { redisIntegration as redisChannelIntegration } from '@sentry/server-utils';
-import type { Integration, IntegrationFn } from '@sentry/core';
-import { defineIntegration, extendIntegration } from '@sentry/core';
-
-const INTEGRATION_NAME = 'DenoRedis' as const;
-
-export interface DenoRedisIntegrationOptions {
- /**
- * Optional hook invoked once the redis command response arrives. Useful for
- * attaching response-derived attributes (e.g. cache hit/miss, payload size).
- */
- responseHook?: RedisDiagnosticChannelResponseHook;
-}
-
-const _denoRedisIntegration = ((options: DenoRedisIntegrationOptions = {}) => {
- // The diagnostics_channel subscription lives in server-utils so it is shared
- // across runtimes. The AsyncLocalStorage async-context strategy the channel
- // binding depends on is installed once in `init()`, so this wrapper only
- // renames the shared integration.
- return extendIntegration(redisChannelIntegration({ responseHook: options.responseHook }), {
- name: INTEGRATION_NAME,
- });
-}) satisfies IntegrationFn;
+import { redisIntegration } from '@sentry/server-utils/orchestrion';
 
 /**
- * Creates spans for redis commands, batches, and connects under Deno via
- * `node:diagnostics_channel`. Subscribes to both node-redis (>= 5.12.0) and
- * ioredis (>= 5.11.0) channels — both libraries publish to dedicated channels
- * once they're new enough; on older releases the subscribers are inert.
+ * @deprecated Use `redisIntegration` instead.
  */
-export const denoRedisIntegration = defineIntegration(_denoRedisIntegration) as (
- options?: DenoRedisIntegrationOptions,
-) => Integration & { name: 'DenoRedis'; setupOnce: () => void };
+export const denoRedisIntegration: typeof redisIntegration = redisIntegration;

packages/deno/src/sdk.ts

@@ -35,14 +35,14 @@ import {
  postgresJsIntegration,
  tediousIntegration,
  vercelAiIntegration,
+ redisIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { DenoClient } from './client';
 import { breadcrumbsIntegration } from './integrations/breadcrumbs';
 import { denoContextIntegration } from './integrations/context';
 import { contextLinesIntegration } from './integrations/contextlines';
 import { denoServeIntegration } from './integrations/deno-serve';
 import { denoHttpIntegration } from './integrations/http';
-import { denoRedisIntegration } from './integrations/redis';
 import { globalHandlersIntegration } from './integrations/globalhandlers';
 import { normalizePathsIntegration } from './integrations/normalizepaths';
 import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
@@ -64,7 +64,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
  denoContextIntegration(),
  denoServeIntegration(),
  denoHttpIntegration(),
-denoRedisIntegration(),
+redisIntegration(),
  graphqlDiagnosticsIntegration(),
  vercelAiIntegration(),
  // orchestrion-based instrumentations. We add a deliberate list here rather

packages/deno/test/__snapshots__/mod.test.ts.snap

@@ -56,7 +56,7 @@ snapshot[`captureMessage 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -161,7 +161,7 @@ snapshot[`captureMessage twice 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -273,7 +273,7 @@ snapshot[`captureMessage twice 2`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",

packages/deno/test/deno-redis.test.ts

@@ -52,14 +52,14 @@ function withTimeout<T>(p: Promise<T>, ms: number, what: string): Promise<T> {
  });
 }
 
-Deno.test('denoRedisIntegration: included in default integrations', () => {
+Deno.test('redisIntegration: included in default integrations', () => {
  resetGlobals();
  const client = init({ dsn: 'https://username@domain/123' }) as DenoClient;
  const names = client.getOptions().integrations.map(i => i.name);
- assert(names.includes('DenoRedis'), `DenoRedis should be in defaults, got ${names.join(', ')}`);
+ assert(names.includes('Redis'), `Redis should be in defaults, got ${names.join(', ')}`);
 });
 
-Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: node-redis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -98,7 +98,7 @@ Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query
  assertEquals(redisSpan!.data?.['server.port'], 6379);
 });
 
-Deno.test('denoRedisIntegration: errors on the command channel set span status', async () => {
+Deno.test('redisIntegration: errors on the command channel set span status', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -135,7 +135,7 @@ Deno.test('denoRedisIntegration: errors on the command channel set span status',
  assertEquals(redisSpan!.status, 'internal_error');
 });
 
-Deno.test('denoRedisIntegration: ioredis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: ioredis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({

packages/node/src/index.ts

@@ -26,10 +26,10 @@ export {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration as vercelAIIntegration,
 } from '@sentry/server-utils/orchestrion';
-export { redisIntegration } from './integrations/tracing/redis';
 export {
  otlpIntegration,
  getOtlpTracesEndpoint,

packages/node/src/integrations/tracing/index.ts

@@ -21,11 +21,11 @@ import {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { fastifyIntegration } from './fastify';
-import { redisIntegration } from './redis';
 
 export function getAutoPerformanceIntegrations(): Integration[] {
  return [
@@ -36,8 +36,6 @@ export function getAutoPerformanceIntegrations(): Integration[] {
  mongooseIntegration(),
  mysqlIntegration(),
  mysql2Integration(),
- // Redis keeps the node wrapper: it wires the cache `responseHook` into the channel subscribers
- // and covers all redis client versions (native diagnostics_channel + orchestrion fallbacks).
  redisIntegration(),
  postgresIntegration(),
  prismaIntegration(),

dev-packages/e2e-tests/test-applications/deno-redis/src/app.ts

@@ -15,7 +15,7 @@ const redisUrl = Deno.env.get('REDIS_URL') ?? 'redis://127.0.0.1:6379';
 
 // One shared client per process. node-redis publishes to the
 // `node-redis:command` / `:batch` / `:connect` diagnostics channels for every
-// operation on this client; denoRedisIntegration is already subscribed to
+// operation on this client; redisIntegration is already subscribed to
 // those.
 const redis = createClient({ url: redisUrl });
 function onRedisError(err: unknown) {
@@ -26,7 +26,7 @@ redis.on('error', onRedisError);
 await redis.connect();
 
 // Separate ioredis client. ioredis >= 5.11 publishes to the `ioredis:command`
-// and `ioredis:connect` channels, which denoRedisIntegration also subscribes
+// and `ioredis:connect` channels, which redisIntegration also subscribes
 // to. lazyConnect so we can yield a microtick before connecting and ensure
 // the DC subscriber is registered before ioredis creates its tracing channels.
 await Promise.resolve();

packages/deno/src/index.ts

@@ -111,8 +111,7 @@ export { denoServeIntegration } from './integrations/deno-serve';
 export type { DenoServeIntegrationOptions } from './integrations/deno-serve';
 export { denoHttpIntegration } from './integrations/http';
 export type { DenoHttpIntegrationOptions } from './integrations/http';
-export { denoRedisIntegration } from './integrations/redis';
-export type { DenoRedisIntegrationOptions } from './integrations/redis';
+
 // The orchestrion channel integrations, re-exported from `@sentry/server-utils`.
 // Most are in the default set; `dataloader` and `knex` are opt-in (add them to
 // `integrations` to enable), matching Node. Re-export every one that `sdk.ts`
@@ -122,6 +121,7 @@ export {
  anthropicIntegration,
  awsIntegration,
  dataloaderIntegration,
+ redisIntegration,
  expressIntegration,
  firebaseIntegration,
  genericPoolIntegration,
@@ -157,6 +157,7 @@ export { denoMongoIntegration } from './integrations/mongo';
 export { denoMongooseIntegration } from './integrations/mongoose';
 export { denoDataloaderIntegration } from './integrations/dataloader';
 export { denoKnexIntegration } from './integrations/knex';
+export { denoRedisIntegration } from './integrations/redis';
 /* eslint-enable typescript/no-deprecated */
 export { denoContextIntegration } from './integrations/context';
 export { globalHandlersIntegration } from './integrations/globalhandlers';

packages/deno/src/integrations/redis.ts

@@ -1,34 +1,6 @@
-import type { RedisDiagnosticChannelResponseHook } from '@sentry/server-utils';
-import { redisIntegration as redisChannelIntegration } from '@sentry/server-utils';
-import type { Integration, IntegrationFn } from '@sentry/core';
-import { defineIntegration, extendIntegration } from '@sentry/core';
-
-const INTEGRATION_NAME = 'DenoRedis' as const;
-
-export interface DenoRedisIntegrationOptions {
- /**
- * Optional hook invoked once the redis command response arrives. Useful for
- * attaching response-derived attributes (e.g. cache hit/miss, payload size).
- */
- responseHook?: RedisDiagnosticChannelResponseHook;
-}
-
-const _denoRedisIntegration = ((options: DenoRedisIntegrationOptions = {}) => {
- // The diagnostics_channel subscription lives in server-utils so it is shared
- // across runtimes. The AsyncLocalStorage async-context strategy the channel
- // binding depends on is installed once in `init()`, so this wrapper only
- // renames the shared integration.
- return extendIntegration(redisChannelIntegration({ responseHook: options.responseHook }), {
- name: INTEGRATION_NAME,
- });
-}) satisfies IntegrationFn;
+import { redisIntegration } from '@sentry/server-utils/orchestrion';
 
 /**
- * Creates spans for redis commands, batches, and connects under Deno via
- * `node:diagnostics_channel`. Subscribes to both node-redis (>= 5.12.0) and
- * ioredis (>= 5.11.0) channels — both libraries publish to dedicated channels
- * once they're new enough; on older releases the subscribers are inert.
+ * @deprecated Use `redisIntegration` instead.
  */
-export const denoRedisIntegration = defineIntegration(_denoRedisIntegration) as (
- options?: DenoRedisIntegrationOptions,
-) => Integration & { name: 'DenoRedis'; setupOnce: () => void };
+export const denoRedisIntegration: typeof redisIntegration = redisIntegration;

packages/deno/src/sdk.ts

@@ -35,14 +35,14 @@ import {
  postgresJsIntegration,
  tediousIntegration,
  vercelAiIntegration,
+ redisIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { DenoClient } from './client';
 import { breadcrumbsIntegration } from './integrations/breadcrumbs';
 import { denoContextIntegration } from './integrations/context';
 import { contextLinesIntegration } from './integrations/contextlines';
 import { denoServeIntegration } from './integrations/deno-serve';
 import { denoHttpIntegration } from './integrations/http';
-import { denoRedisIntegration } from './integrations/redis';
 import { globalHandlersIntegration } from './integrations/globalhandlers';
 import { normalizePathsIntegration } from './integrations/normalizepaths';
 import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
@@ -64,7 +64,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
  denoContextIntegration(),
  denoServeIntegration(),
  denoHttpIntegration(),
-denoRedisIntegration(),
+redisIntegration(),
  graphqlDiagnosticsIntegration(),
  vercelAiIntegration(),
  // orchestrion-based instrumentations. We add a deliberate list here rather

packages/deno/test/__snapshots__/mod.test.ts.snap

@@ -56,7 +56,7 @@ snapshot[`captureMessage 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -161,7 +161,7 @@ snapshot[`captureMessage twice 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -273,7 +273,7 @@ snapshot[`captureMessage twice 2`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",

packages/deno/test/deno-redis.test.ts

@@ -52,14 +52,14 @@ function withTimeout<T>(p: Promise<T>, ms: number, what: string): Promise<T> {
  });
 }
 
-Deno.test('denoRedisIntegration: included in default integrations', () => {
+Deno.test('redisIntegration: included in default integrations', () => {
  resetGlobals();
  const client = init({ dsn: 'https://username@domain/123' }) as DenoClient;
  const names = client.getOptions().integrations.map(i => i.name);
- assert(names.includes('DenoRedis'), `DenoRedis should be in defaults, got ${names.join(', ')}`);
+ assert(names.includes('Redis'), `Redis should be in defaults, got ${names.join(', ')}`);
 });
 
-Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: node-redis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -98,7 +98,7 @@ Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query
  assertEquals(redisSpan!.data?.['server.port'], 6379);
 });
 
-Deno.test('denoRedisIntegration: errors on the command channel set span status', async () => {
+Deno.test('redisIntegration: errors on the command channel set span status', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -135,7 +135,7 @@ Deno.test('denoRedisIntegration: errors on the command channel set span status',
  assertEquals(redisSpan!.status, 'internal_error');
 });
 
-Deno.test('denoRedisIntegration: ioredis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: ioredis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({

packages/node/src/index.ts

@@ -26,10 +26,10 @@ export {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration as vercelAIIntegration,
 } from '@sentry/server-utils/orchestrion';
-export { redisIntegration } from './integrations/tracing/redis';
 export {
  otlpIntegration,
  getOtlpTracesEndpoint,

packages/node/src/integrations/tracing/index.ts

@@ -21,11 +21,11 @@ import {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { fastifyIntegration } from './fastify';
-import { redisIntegration } from './redis';
 
 export function getAutoPerformanceIntegrations(): Integration[] {
  return [
@@ -36,8 +36,6 @@ export function getAutoPerformanceIntegrations(): Integration[] {
  mongooseIntegration(),
  mysqlIntegration(),
  mysql2Integration(),
- // Redis keeps the node wrapper: it wires the cache `responseHook` into the channel subscribers
- // and covers all redis client versions (native diagnostics_channel + orchestrion fallbacks).
  redisIntegration(),
  postgresIntegration(),
  prismaIntegration(),

dev-packages/e2e-tests/test-applications/deno-redis/src/app.ts

@@ -15,7 +15,7 @@ const redisUrl = Deno.env.get('REDIS_URL') ?? 'redis://127.0.0.1:6379';
 
 // One shared client per process. node-redis publishes to the
 // `node-redis:command` / `:batch` / `:connect` diagnostics channels for every
-// operation on this client; denoRedisIntegration is already subscribed to
+// operation on this client; redisIntegration is already subscribed to
 // those.
 const redis = createClient({ url: redisUrl });
 function onRedisError(err: unknown) {
@@ -26,7 +26,7 @@ redis.on('error', onRedisError);
 await redis.connect();
 
 // Separate ioredis client. ioredis >= 5.11 publishes to the `ioredis:command`
-// and `ioredis:connect` channels, which denoRedisIntegration also subscribes
+// and `ioredis:connect` channels, which redisIntegration also subscribes
 // to. lazyConnect so we can yield a microtick before connecting and ensure
 // the DC subscriber is registered before ioredis creates its tracing channels.
 await Promise.resolve();

packages/deno/src/index.ts

@@ -111,8 +111,7 @@ export { denoServeIntegration } from './integrations/deno-serve';
 export type { DenoServeIntegrationOptions } from './integrations/deno-serve';
 export { denoHttpIntegration } from './integrations/http';
 export type { DenoHttpIntegrationOptions } from './integrations/http';
-export { denoRedisIntegration } from './integrations/redis';
-export type { DenoRedisIntegrationOptions } from './integrations/redis';
+
 // The orchestrion channel integrations, re-exported from `@sentry/server-utils`.
 // Most are in the default set; `dataloader` and `knex` are opt-in (add them to
 // `integrations` to enable), matching Node. Re-export every one that `sdk.ts`
@@ -122,6 +121,7 @@ export {
  anthropicIntegration,
  awsIntegration,
  dataloaderIntegration,
+ redisIntegration,
  expressIntegration,
  firebaseIntegration,
  genericPoolIntegration,
@@ -157,6 +157,7 @@ export { denoMongoIntegration } from './integrations/mongo';
 export { denoMongooseIntegration } from './integrations/mongoose';
 export { denoDataloaderIntegration } from './integrations/dataloader';
 export { denoKnexIntegration } from './integrations/knex';
+export { denoRedisIntegration } from './integrations/redis';
 /* eslint-enable typescript/no-deprecated */
 export { denoContextIntegration } from './integrations/context';
 export { globalHandlersIntegration } from './integrations/globalhandlers';

packages/deno/src/integrations/redis.ts

@@ -1,34 +1,6 @@
-import type { RedisDiagnosticChannelResponseHook } from '@sentry/server-utils';
-import { redisIntegration as redisChannelIntegration } from '@sentry/server-utils';
-import type { Integration, IntegrationFn } from '@sentry/core';
-import { defineIntegration, extendIntegration } from '@sentry/core';
-
-const INTEGRATION_NAME = 'DenoRedis' as const;
-
-export interface DenoRedisIntegrationOptions {
- /**
- * Optional hook invoked once the redis command response arrives. Useful for
- * attaching response-derived attributes (e.g. cache hit/miss, payload size).
- */
- responseHook?: RedisDiagnosticChannelResponseHook;
-}
-
-const _denoRedisIntegration = ((options: DenoRedisIntegrationOptions = {}) => {
- // The diagnostics_channel subscription lives in server-utils so it is shared
- // across runtimes. The AsyncLocalStorage async-context strategy the channel
- // binding depends on is installed once in `init()`, so this wrapper only
- // renames the shared integration.
- return extendIntegration(redisChannelIntegration({ responseHook: options.responseHook }), {
- name: INTEGRATION_NAME,
- });
-}) satisfies IntegrationFn;
+import { redisIntegration } from '@sentry/server-utils/orchestrion';
 
 /**
- * Creates spans for redis commands, batches, and connects under Deno via
- * `node:diagnostics_channel`. Subscribes to both node-redis (>= 5.12.0) and
- * ioredis (>= 5.11.0) channels — both libraries publish to dedicated channels
- * once they're new enough; on older releases the subscribers are inert.
+ * @deprecated Use `redisIntegration` instead.
  */
-export const denoRedisIntegration = defineIntegration(_denoRedisIntegration) as (
- options?: DenoRedisIntegrationOptions,
-) => Integration & { name: 'DenoRedis'; setupOnce: () => void };
+export const denoRedisIntegration: typeof redisIntegration = redisIntegration;

packages/deno/src/sdk.ts

@@ -35,14 +35,14 @@ import {
  postgresJsIntegration,
  tediousIntegration,
  vercelAiIntegration,
+ redisIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { DenoClient } from './client';
 import { breadcrumbsIntegration } from './integrations/breadcrumbs';
 import { denoContextIntegration } from './integrations/context';
 import { contextLinesIntegration } from './integrations/contextlines';
 import { denoServeIntegration } from './integrations/deno-serve';
 import { denoHttpIntegration } from './integrations/http';
-import { denoRedisIntegration } from './integrations/redis';
 import { globalHandlersIntegration } from './integrations/globalhandlers';
 import { normalizePathsIntegration } from './integrations/normalizepaths';
 import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
@@ -64,7 +64,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
  denoContextIntegration(),
  denoServeIntegration(),
  denoHttpIntegration(),
-denoRedisIntegration(),
+redisIntegration(),
  graphqlDiagnosticsIntegration(),
  vercelAiIntegration(),
  // orchestrion-based instrumentations. We add a deliberate list here rather

packages/deno/test/__snapshots__/mod.test.ts.snap

@@ -56,7 +56,7 @@ snapshot[`captureMessage 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -161,7 +161,7 @@ snapshot[`captureMessage twice 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -273,7 +273,7 @@ snapshot[`captureMessage twice 2`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",

packages/deno/test/deno-redis.test.ts

@@ -52,14 +52,14 @@ function withTimeout<T>(p: Promise<T>, ms: number, what: string): Promise<T> {
  });
 }
 
-Deno.test('denoRedisIntegration: included in default integrations', () => {
+Deno.test('redisIntegration: included in default integrations', () => {
  resetGlobals();
  const client = init({ dsn: 'https://username@domain/123' }) as DenoClient;
  const names = client.getOptions().integrations.map(i => i.name);
- assert(names.includes('DenoRedis'), `DenoRedis should be in defaults, got ${names.join(', ')}`);
+ assert(names.includes('Redis'), `Redis should be in defaults, got ${names.join(', ')}`);
 });
 
-Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: node-redis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -98,7 +98,7 @@ Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query
  assertEquals(redisSpan!.data?.['server.port'], 6379);
 });
 
-Deno.test('denoRedisIntegration: errors on the command channel set span status', async () => {
+Deno.test('redisIntegration: errors on the command channel set span status', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -135,7 +135,7 @@ Deno.test('denoRedisIntegration: errors on the command channel set span status',
  assertEquals(redisSpan!.status, 'internal_error');
 });
 
-Deno.test('denoRedisIntegration: ioredis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: ioredis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({

packages/node/src/index.ts

@@ -26,10 +26,10 @@ export {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration as vercelAIIntegration,
 } from '@sentry/server-utils/orchestrion';
-export { redisIntegration } from './integrations/tracing/redis';
 export {
  otlpIntegration,
  getOtlpTracesEndpoint,

packages/node/src/integrations/tracing/index.ts

@@ -21,11 +21,11 @@ import {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { fastifyIntegration } from './fastify';
-import { redisIntegration } from './redis';
 
 export function getAutoPerformanceIntegrations(): Integration[] {
  return [
@@ -36,8 +36,6 @@ export function getAutoPerformanceIntegrations(): Integration[] {
  mongooseIntegration(),
  mysqlIntegration(),
  mysql2Integration(),
- // Redis keeps the node wrapper: it wires the cache `responseHook` into the channel subscribers
- // and covers all redis client versions (native diagnostics_channel + orchestrion fallbacks).
  redisIntegration(),
  postgresIntegration(),
  prismaIntegration(),

dev-packages/e2e-tests/test-applications/deno-redis/src/app.ts

@@ -15,7 +15,7 @@ const redisUrl = Deno.env.get('REDIS_URL') ?? 'redis://127.0.0.1:6379';
 
 // One shared client per process. node-redis publishes to the
 // `node-redis:command` / `:batch` / `:connect` diagnostics channels for every
-// operation on this client; denoRedisIntegration is already subscribed to
+// operation on this client; redisIntegration is already subscribed to
 // those.
 const redis = createClient({ url: redisUrl });
 function onRedisError(err: unknown) {
@@ -26,7 +26,7 @@ redis.on('error', onRedisError);
 await redis.connect();
 
 // Separate ioredis client. ioredis >= 5.11 publishes to the `ioredis:command`
-// and `ioredis:connect` channels, which denoRedisIntegration also subscribes
+// and `ioredis:connect` channels, which redisIntegration also subscribes
 // to. lazyConnect so we can yield a microtick before connecting and ensure
 // the DC subscriber is registered before ioredis creates its tracing channels.
 await Promise.resolve();

packages/deno/src/index.ts

@@ -111,8 +111,7 @@ export { denoServeIntegration } from './integrations/deno-serve';
 export type { DenoServeIntegrationOptions } from './integrations/deno-serve';
 export { denoHttpIntegration } from './integrations/http';
 export type { DenoHttpIntegrationOptions } from './integrations/http';
-export { denoRedisIntegration } from './integrations/redis';
-export type { DenoRedisIntegrationOptions } from './integrations/redis';
+
 // The orchestrion channel integrations, re-exported from `@sentry/server-utils`.
 // Most are in the default set; `dataloader` and `knex` are opt-in (add them to
 // `integrations` to enable), matching Node. Re-export every one that `sdk.ts`
@@ -122,6 +121,7 @@ export {
  anthropicIntegration,
  awsIntegration,
  dataloaderIntegration,
+ redisIntegration,
  expressIntegration,
  firebaseIntegration,
  genericPoolIntegration,
@@ -157,6 +157,7 @@ export { denoMongoIntegration } from './integrations/mongo';
 export { denoMongooseIntegration } from './integrations/mongoose';
 export { denoDataloaderIntegration } from './integrations/dataloader';
 export { denoKnexIntegration } from './integrations/knex';
+export { denoRedisIntegration } from './integrations/redis';
 /* eslint-enable typescript/no-deprecated */
 export { denoContextIntegration } from './integrations/context';
 export { globalHandlersIntegration } from './integrations/globalhandlers';

packages/deno/src/integrations/redis.ts

@@ -1,34 +1,6 @@
-import type { RedisDiagnosticChannelResponseHook } from '@sentry/server-utils';
-import { redisIntegration as redisChannelIntegration } from '@sentry/server-utils';
-import type { Integration, IntegrationFn } from '@sentry/core';
-import { defineIntegration, extendIntegration } from '@sentry/core';
-
-const INTEGRATION_NAME = 'DenoRedis' as const;
-
-export interface DenoRedisIntegrationOptions {
- /**
- * Optional hook invoked once the redis command response arrives. Useful for
- * attaching response-derived attributes (e.g. cache hit/miss, payload size).
- */
- responseHook?: RedisDiagnosticChannelResponseHook;
-}
-
-const _denoRedisIntegration = ((options: DenoRedisIntegrationOptions = {}) => {
- // The diagnostics_channel subscription lives in server-utils so it is shared
- // across runtimes. The AsyncLocalStorage async-context strategy the channel
- // binding depends on is installed once in `init()`, so this wrapper only
- // renames the shared integration.
- return extendIntegration(redisChannelIntegration({ responseHook: options.responseHook }), {
- name: INTEGRATION_NAME,
- });
-}) satisfies IntegrationFn;
+import { redisIntegration } from '@sentry/server-utils/orchestrion';
 
 /**
- * Creates spans for redis commands, batches, and connects under Deno via
- * `node:diagnostics_channel`. Subscribes to both node-redis (>= 5.12.0) and
- * ioredis (>= 5.11.0) channels — both libraries publish to dedicated channels
- * once they're new enough; on older releases the subscribers are inert.
+ * @deprecated Use `redisIntegration` instead.
  */
-export const denoRedisIntegration = defineIntegration(_denoRedisIntegration) as (
- options?: DenoRedisIntegrationOptions,
-) => Integration & { name: 'DenoRedis'; setupOnce: () => void };
+export const denoRedisIntegration: typeof redisIntegration = redisIntegration;

packages/deno/src/sdk.ts

@@ -35,14 +35,14 @@ import {
  postgresJsIntegration,
  tediousIntegration,
  vercelAiIntegration,
+ redisIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { DenoClient } from './client';
 import { breadcrumbsIntegration } from './integrations/breadcrumbs';
 import { denoContextIntegration } from './integrations/context';
 import { contextLinesIntegration } from './integrations/contextlines';
 import { denoServeIntegration } from './integrations/deno-serve';
 import { denoHttpIntegration } from './integrations/http';
-import { denoRedisIntegration } from './integrations/redis';
 import { globalHandlersIntegration } from './integrations/globalhandlers';
 import { normalizePathsIntegration } from './integrations/normalizepaths';
 import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
@@ -64,7 +64,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
  denoContextIntegration(),
  denoServeIntegration(),
  denoHttpIntegration(),
-denoRedisIntegration(),
+redisIntegration(),
  graphqlDiagnosticsIntegration(),
  vercelAiIntegration(),
  // orchestrion-based instrumentations. We add a deliberate list here rather

packages/deno/test/__snapshots__/mod.test.ts.snap

@@ -56,7 +56,7 @@ snapshot[`captureMessage 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -161,7 +161,7 @@ snapshot[`captureMessage twice 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -273,7 +273,7 @@ snapshot[`captureMessage twice 2`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",

packages/deno/test/deno-redis.test.ts

@@ -52,14 +52,14 @@ function withTimeout<T>(p: Promise<T>, ms: number, what: string): Promise<T> {
  });
 }
 
-Deno.test('denoRedisIntegration: included in default integrations', () => {
+Deno.test('redisIntegration: included in default integrations', () => {
  resetGlobals();
  const client = init({ dsn: 'https://username@domain/123' }) as DenoClient;
  const names = client.getOptions().integrations.map(i => i.name);
- assert(names.includes('DenoRedis'), `DenoRedis should be in defaults, got ${names.join(', ')}`);
+ assert(names.includes('Redis'), `Redis should be in defaults, got ${names.join(', ')}`);
 });
 
-Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: node-redis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -98,7 +98,7 @@ Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query
  assertEquals(redisSpan!.data?.['server.port'], 6379);
 });
 
-Deno.test('denoRedisIntegration: errors on the command channel set span status', async () => {
+Deno.test('redisIntegration: errors on the command channel set span status', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -135,7 +135,7 @@ Deno.test('denoRedisIntegration: errors on the command channel set span status',
  assertEquals(redisSpan!.status, 'internal_error');
 });
 
-Deno.test('denoRedisIntegration: ioredis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: ioredis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({

packages/node/src/index.ts

@@ -26,10 +26,10 @@ export {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration as vercelAIIntegration,
 } from '@sentry/server-utils/orchestrion';
-export { redisIntegration } from './integrations/tracing/redis';
 export {
  otlpIntegration,
  getOtlpTracesEndpoint,

packages/node/src/integrations/tracing/index.ts

@@ -21,11 +21,11 @@ import {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { fastifyIntegration } from './fastify';
-import { redisIntegration } from './redis';
 
 export function getAutoPerformanceIntegrations(): Integration[] {
  return [
@@ -36,8 +36,6 @@ export function getAutoPerformanceIntegrations(): Integration[] {
  mongooseIntegration(),
  mysqlIntegration(),
  mysql2Integration(),
- // Redis keeps the node wrapper: it wires the cache `responseHook` into the channel subscribers
- // and covers all redis client versions (native diagnostics_channel + orchestrion fallbacks).
  redisIntegration(),
  postgresIntegration(),
  prismaIntegration(),

dev-packages/e2e-tests/test-applications/deno-redis/src/app.ts

@@ -15,7 +15,7 @@ const redisUrl = Deno.env.get('REDIS_URL') ?? 'redis://127.0.0.1:6379';
 
 // One shared client per process. node-redis publishes to the
 // `node-redis:command` / `:batch` / `:connect` diagnostics channels for every
-// operation on this client; denoRedisIntegration is already subscribed to
+// operation on this client; redisIntegration is already subscribed to
 // those.
 const redis = createClient({ url: redisUrl });
 function onRedisError(err: unknown) {
@@ -26,7 +26,7 @@ redis.on('error', onRedisError);
 await redis.connect();
 
 // Separate ioredis client. ioredis >= 5.11 publishes to the `ioredis:command`
-// and `ioredis:connect` channels, which denoRedisIntegration also subscribes
+// and `ioredis:connect` channels, which redisIntegration also subscribes
 // to. lazyConnect so we can yield a microtick before connecting and ensure
 // the DC subscriber is registered before ioredis creates its tracing channels.
 await Promise.resolve();

packages/deno/src/index.ts

@@ -111,8 +111,7 @@ export { denoServeIntegration } from './integrations/deno-serve';
 export type { DenoServeIntegrationOptions } from './integrations/deno-serve';
 export { denoHttpIntegration } from './integrations/http';
 export type { DenoHttpIntegrationOptions } from './integrations/http';
-export { denoRedisIntegration } from './integrations/redis';
-export type { DenoRedisIntegrationOptions } from './integrations/redis';
+
 // The orchestrion channel integrations, re-exported from `@sentry/server-utils`.
 // Most are in the default set; `dataloader` and `knex` are opt-in (add them to
 // `integrations` to enable), matching Node. Re-export every one that `sdk.ts`
@@ -122,6 +121,7 @@ export {
  anthropicIntegration,
  awsIntegration,
  dataloaderIntegration,
+ redisIntegration,
  expressIntegration,
  firebaseIntegration,
  genericPoolIntegration,
@@ -157,6 +157,7 @@ export { denoMongoIntegration } from './integrations/mongo';
 export { denoMongooseIntegration } from './integrations/mongoose';
 export { denoDataloaderIntegration } from './integrations/dataloader';
 export { denoKnexIntegration } from './integrations/knex';
+export { denoRedisIntegration } from './integrations/redis';
 /* eslint-enable typescript/no-deprecated */
 export { denoContextIntegration } from './integrations/context';
 export { globalHandlersIntegration } from './integrations/globalhandlers';

packages/deno/src/integrations/redis.ts

@@ -1,34 +1,6 @@
-import type { RedisDiagnosticChannelResponseHook } from '@sentry/server-utils';
-import { redisIntegration as redisChannelIntegration } from '@sentry/server-utils';
-import type { Integration, IntegrationFn } from '@sentry/core';
-import { defineIntegration, extendIntegration } from '@sentry/core';
-
-const INTEGRATION_NAME = 'DenoRedis' as const;
-
-export interface DenoRedisIntegrationOptions {
- /**
- * Optional hook invoked once the redis command response arrives. Useful for
- * attaching response-derived attributes (e.g. cache hit/miss, payload size).
- */
- responseHook?: RedisDiagnosticChannelResponseHook;
-}
-
-const _denoRedisIntegration = ((options: DenoRedisIntegrationOptions = {}) => {
- // The diagnostics_channel subscription lives in server-utils so it is shared
- // across runtimes. The AsyncLocalStorage async-context strategy the channel
- // binding depends on is installed once in `init()`, so this wrapper only
- // renames the shared integration.
- return extendIntegration(redisChannelIntegration({ responseHook: options.responseHook }), {
- name: INTEGRATION_NAME,
- });
-}) satisfies IntegrationFn;
+import { redisIntegration } from '@sentry/server-utils/orchestrion';
 
 /**
- * Creates spans for redis commands, batches, and connects under Deno via
- * `node:diagnostics_channel`. Subscribes to both node-redis (>= 5.12.0) and
- * ioredis (>= 5.11.0) channels — both libraries publish to dedicated channels
- * once they're new enough; on older releases the subscribers are inert.
+ * @deprecated Use `redisIntegration` instead.
  */
-export const denoRedisIntegration = defineIntegration(_denoRedisIntegration) as (
- options?: DenoRedisIntegrationOptions,
-) => Integration & { name: 'DenoRedis'; setupOnce: () => void };
+export const denoRedisIntegration: typeof redisIntegration = redisIntegration;

packages/deno/src/sdk.ts

@@ -35,14 +35,14 @@ import {
  postgresJsIntegration,
  tediousIntegration,
  vercelAiIntegration,
+ redisIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { DenoClient } from './client';
 import { breadcrumbsIntegration } from './integrations/breadcrumbs';
 import { denoContextIntegration } from './integrations/context';
 import { contextLinesIntegration } from './integrations/contextlines';
 import { denoServeIntegration } from './integrations/deno-serve';
 import { denoHttpIntegration } from './integrations/http';
-import { denoRedisIntegration } from './integrations/redis';
 import { globalHandlersIntegration } from './integrations/globalhandlers';
 import { normalizePathsIntegration } from './integrations/normalizepaths';
 import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
@@ -64,7 +64,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
  denoContextIntegration(),
  denoServeIntegration(),
  denoHttpIntegration(),
-denoRedisIntegration(),
+redisIntegration(),
  graphqlDiagnosticsIntegration(),
  vercelAiIntegration(),
  // orchestrion-based instrumentations. We add a deliberate list here rather

packages/deno/test/__snapshots__/mod.test.ts.snap

@@ -56,7 +56,7 @@ snapshot[`captureMessage 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -161,7 +161,7 @@ snapshot[`captureMessage twice 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -273,7 +273,7 @@ snapshot[`captureMessage twice 2`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",

packages/deno/test/deno-redis.test.ts

@@ -52,14 +52,14 @@ function withTimeout<T>(p: Promise<T>, ms: number, what: string): Promise<T> {
  });
 }
 
-Deno.test('denoRedisIntegration: included in default integrations', () => {
+Deno.test('redisIntegration: included in default integrations', () => {
  resetGlobals();
  const client = init({ dsn: 'https://username@domain/123' }) as DenoClient;
  const names = client.getOptions().integrations.map(i => i.name);
- assert(names.includes('DenoRedis'), `DenoRedis should be in defaults, got ${names.join(', ')}`);
+ assert(names.includes('Redis'), `Redis should be in defaults, got ${names.join(', ')}`);
 });
 
-Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: node-redis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -98,7 +98,7 @@ Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query
  assertEquals(redisSpan!.data?.['server.port'], 6379);
 });
 
-Deno.test('denoRedisIntegration: errors on the command channel set span status', async () => {
+Deno.test('redisIntegration: errors on the command channel set span status', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -135,7 +135,7 @@ Deno.test('denoRedisIntegration: errors on the command channel set span status',
  assertEquals(redisSpan!.status, 'internal_error');
 });
 
-Deno.test('denoRedisIntegration: ioredis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: ioredis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({

packages/node/src/index.ts

@@ -26,10 +26,10 @@ export {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration as vercelAIIntegration,
 } from '@sentry/server-utils/orchestrion';
-export { redisIntegration } from './integrations/tracing/redis';
 export {
  otlpIntegration,
  getOtlpTracesEndpoint,

packages/node/src/integrations/tracing/index.ts

@@ -21,11 +21,11 @@ import {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { fastifyIntegration } from './fastify';
-import { redisIntegration } from './redis';
 
 export function getAutoPerformanceIntegrations(): Integration[] {
  return [
@@ -36,8 +36,6 @@ export function getAutoPerformanceIntegrations(): Integration[] {
  mongooseIntegration(),
  mysqlIntegration(),
  mysql2Integration(),
- // Redis keeps the node wrapper: it wires the cache `responseHook` into the channel subscribers
- // and covers all redis client versions (native diagnostics_channel + orchestrion fallbacks).
  redisIntegration(),
  postgresIntegration(),
  prismaIntegration(),

dev-packages/e2e-tests/test-applications/deno-redis/src/app.ts

@@ -15,7 +15,7 @@ const redisUrl = Deno.env.get('REDIS_URL') ?? 'redis://127.0.0.1:6379';
 
 // One shared client per process. node-redis publishes to the
 // `node-redis:command` / `:batch` / `:connect` diagnostics channels for every
-// operation on this client; denoRedisIntegration is already subscribed to
+// operation on this client; redisIntegration is already subscribed to
 // those.
 const redis = createClient({ url: redisUrl });
 function onRedisError(err: unknown) {
@@ -26,7 +26,7 @@ redis.on('error', onRedisError);
 await redis.connect();
 
 // Separate ioredis client. ioredis >= 5.11 publishes to the `ioredis:command`
-// and `ioredis:connect` channels, which denoRedisIntegration also subscribes
+// and `ioredis:connect` channels, which redisIntegration also subscribes
 // to. lazyConnect so we can yield a microtick before connecting and ensure
 // the DC subscriber is registered before ioredis creates its tracing channels.
 await Promise.resolve();

packages/deno/src/index.ts

@@ -111,8 +111,7 @@ export { denoServeIntegration } from './integrations/deno-serve';
 export type { DenoServeIntegrationOptions } from './integrations/deno-serve';
 export { denoHttpIntegration } from './integrations/http';
 export type { DenoHttpIntegrationOptions } from './integrations/http';
-export { denoRedisIntegration } from './integrations/redis';
-export type { DenoRedisIntegrationOptions } from './integrations/redis';
+
 // The orchestrion channel integrations, re-exported from `@sentry/server-utils`.
 // Most are in the default set; `dataloader` and `knex` are opt-in (add them to
 // `integrations` to enable), matching Node. Re-export every one that `sdk.ts`
@@ -122,6 +121,7 @@ export {
  anthropicIntegration,
  awsIntegration,
  dataloaderIntegration,
+ redisIntegration,
  expressIntegration,
  firebaseIntegration,
  genericPoolIntegration,
@@ -157,6 +157,7 @@ export { denoMongoIntegration } from './integrations/mongo';
 export { denoMongooseIntegration } from './integrations/mongoose';
 export { denoDataloaderIntegration } from './integrations/dataloader';
 export { denoKnexIntegration } from './integrations/knex';
+export { denoRedisIntegration } from './integrations/redis';
 /* eslint-enable typescript/no-deprecated */
 export { denoContextIntegration } from './integrations/context';
 export { globalHandlersIntegration } from './integrations/globalhandlers';

packages/deno/src/integrations/redis.ts

@@ -1,34 +1,6 @@
-import type { RedisDiagnosticChannelResponseHook } from '@sentry/server-utils';
-import { redisIntegration as redisChannelIntegration } from '@sentry/server-utils';
-import type { Integration, IntegrationFn } from '@sentry/core';
-import { defineIntegration, extendIntegration } from '@sentry/core';
-
-const INTEGRATION_NAME = 'DenoRedis' as const;
-
-export interface DenoRedisIntegrationOptions {
- /**
- * Optional hook invoked once the redis command response arrives. Useful for
- * attaching response-derived attributes (e.g. cache hit/miss, payload size).
- */
- responseHook?: RedisDiagnosticChannelResponseHook;
-}
-
-const _denoRedisIntegration = ((options: DenoRedisIntegrationOptions = {}) => {
- // The diagnostics_channel subscription lives in server-utils so it is shared
- // across runtimes. The AsyncLocalStorage async-context strategy the channel
- // binding depends on is installed once in `init()`, so this wrapper only
- // renames the shared integration.
- return extendIntegration(redisChannelIntegration({ responseHook: options.responseHook }), {
- name: INTEGRATION_NAME,
- });
-}) satisfies IntegrationFn;
+import { redisIntegration } from '@sentry/server-utils/orchestrion';
 
 /**
- * Creates spans for redis commands, batches, and connects under Deno via
- * `node:diagnostics_channel`. Subscribes to both node-redis (>= 5.12.0) and
- * ioredis (>= 5.11.0) channels — both libraries publish to dedicated channels
- * once they're new enough; on older releases the subscribers are inert.
+ * @deprecated Use `redisIntegration` instead.
  */
-export const denoRedisIntegration = defineIntegration(_denoRedisIntegration) as (
- options?: DenoRedisIntegrationOptions,
-) => Integration & { name: 'DenoRedis'; setupOnce: () => void };
+export const denoRedisIntegration: typeof redisIntegration = redisIntegration;

packages/deno/src/sdk.ts

@@ -35,14 +35,14 @@ import {
  postgresJsIntegration,
  tediousIntegration,
  vercelAiIntegration,
+ redisIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { DenoClient } from './client';
 import { breadcrumbsIntegration } from './integrations/breadcrumbs';
 import { denoContextIntegration } from './integrations/context';
 import { contextLinesIntegration } from './integrations/contextlines';
 import { denoServeIntegration } from './integrations/deno-serve';
 import { denoHttpIntegration } from './integrations/http';
-import { denoRedisIntegration } from './integrations/redis';
 import { globalHandlersIntegration } from './integrations/globalhandlers';
 import { normalizePathsIntegration } from './integrations/normalizepaths';
 import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
@@ -64,7 +64,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
  denoContextIntegration(),
  denoServeIntegration(),
  denoHttpIntegration(),
-denoRedisIntegration(),
+redisIntegration(),
  graphqlDiagnosticsIntegration(),
  vercelAiIntegration(),
  // orchestrion-based instrumentations. We add a deliberate list here rather

packages/deno/test/__snapshots__/mod.test.ts.snap

@@ -56,7 +56,7 @@ snapshot[`captureMessage 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -161,7 +161,7 @@ snapshot[`captureMessage twice 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -273,7 +273,7 @@ snapshot[`captureMessage twice 2`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",

packages/deno/test/deno-redis.test.ts

@@ -52,14 +52,14 @@ function withTimeout<T>(p: Promise<T>, ms: number, what: string): Promise<T> {
  });
 }
 
-Deno.test('denoRedisIntegration: included in default integrations', () => {
+Deno.test('redisIntegration: included in default integrations', () => {
  resetGlobals();
  const client = init({ dsn: 'https://username@domain/123' }) as DenoClient;
  const names = client.getOptions().integrations.map(i => i.name);
- assert(names.includes('DenoRedis'), `DenoRedis should be in defaults, got ${names.join(', ')}`);
+ assert(names.includes('Redis'), `Redis should be in defaults, got ${names.join(', ')}`);
 });
 
-Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: node-redis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -98,7 +98,7 @@ Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query
  assertEquals(redisSpan!.data?.['server.port'], 6379);
 });
 
-Deno.test('denoRedisIntegration: errors on the command channel set span status', async () => {
+Deno.test('redisIntegration: errors on the command channel set span status', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -135,7 +135,7 @@ Deno.test('denoRedisIntegration: errors on the command channel set span status',
  assertEquals(redisSpan!.status, 'internal_error');
 });
 
-Deno.test('denoRedisIntegration: ioredis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: ioredis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({

packages/node/src/index.ts

@@ -26,10 +26,10 @@ export {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration as vercelAIIntegration,
 } from '@sentry/server-utils/orchestrion';
-export { redisIntegration } from './integrations/tracing/redis';
 export {
  otlpIntegration,
  getOtlpTracesEndpoint,

packages/node/src/integrations/tracing/index.ts

@@ -21,11 +21,11 @@ import {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { fastifyIntegration } from './fastify';
-import { redisIntegration } from './redis';
 
 export function getAutoPerformanceIntegrations(): Integration[] {
  return [
@@ -36,8 +36,6 @@ export function getAutoPerformanceIntegrations(): Integration[] {
  mongooseIntegration(),
  mysqlIntegration(),
  mysql2Integration(),
- // Redis keeps the node wrapper: it wires the cache `responseHook` into the channel subscribers
- // and covers all redis client versions (native diagnostics_channel + orchestrion fallbacks).
  redisIntegration(),
  postgresIntegration(),
  prismaIntegration(),

dev-packages/e2e-tests/test-applications/deno-redis/src/app.ts

@@ -15,7 +15,7 @@ const redisUrl = Deno.env.get('REDIS_URL') ?? 'redis://127.0.0.1:6379';
 
 // One shared client per process. node-redis publishes to the
 // `node-redis:command` / `:batch` / `:connect` diagnostics channels for every
-// operation on this client; denoRedisIntegration is already subscribed to
+// operation on this client; redisIntegration is already subscribed to
 // those.
 const redis = createClient({ url: redisUrl });
 function onRedisError(err: unknown) {
@@ -26,7 +26,7 @@ redis.on('error', onRedisError);
 await redis.connect();
 
 // Separate ioredis client. ioredis >= 5.11 publishes to the `ioredis:command`
-// and `ioredis:connect` channels, which denoRedisIntegration also subscribes
+// and `ioredis:connect` channels, which redisIntegration also subscribes
 // to. lazyConnect so we can yield a microtick before connecting and ensure
 // the DC subscriber is registered before ioredis creates its tracing channels.
 await Promise.resolve();

packages/deno/src/index.ts

@@ -111,8 +111,7 @@ export { denoServeIntegration } from './integrations/deno-serve';
 export type { DenoServeIntegrationOptions } from './integrations/deno-serve';
 export { denoHttpIntegration } from './integrations/http';
 export type { DenoHttpIntegrationOptions } from './integrations/http';
-export { denoRedisIntegration } from './integrations/redis';
-export type { DenoRedisIntegrationOptions } from './integrations/redis';
+
 // The orchestrion channel integrations, re-exported from `@sentry/server-utils`.
 // Most are in the default set; `dataloader` and `knex` are opt-in (add them to
 // `integrations` to enable), matching Node. Re-export every one that `sdk.ts`
@@ -122,6 +121,7 @@ export {
  anthropicIntegration,
  awsIntegration,
  dataloaderIntegration,
+ redisIntegration,
  expressIntegration,
  firebaseIntegration,
  genericPoolIntegration,
@@ -157,6 +157,7 @@ export { denoMongoIntegration } from './integrations/mongo';
 export { denoMongooseIntegration } from './integrations/mongoose';
 export { denoDataloaderIntegration } from './integrations/dataloader';
 export { denoKnexIntegration } from './integrations/knex';
+export { denoRedisIntegration } from './integrations/redis';
 /* eslint-enable typescript/no-deprecated */
 export { denoContextIntegration } from './integrations/context';
 export { globalHandlersIntegration } from './integrations/globalhandlers';

packages/deno/src/integrations/redis.ts

@@ -1,34 +1,6 @@
-import type { RedisDiagnosticChannelResponseHook } from '@sentry/server-utils';
-import { redisIntegration as redisChannelIntegration } from '@sentry/server-utils';
-import type { Integration, IntegrationFn } from '@sentry/core';
-import { defineIntegration, extendIntegration } from '@sentry/core';
-
-const INTEGRATION_NAME = 'DenoRedis' as const;
-
-export interface DenoRedisIntegrationOptions {
- /**
- * Optional hook invoked once the redis command response arrives. Useful for
- * attaching response-derived attributes (e.g. cache hit/miss, payload size).
- */
- responseHook?: RedisDiagnosticChannelResponseHook;
-}
-
-const _denoRedisIntegration = ((options: DenoRedisIntegrationOptions = {}) => {
- // The diagnostics_channel subscription lives in server-utils so it is shared
- // across runtimes. The AsyncLocalStorage async-context strategy the channel
- // binding depends on is installed once in `init()`, so this wrapper only
- // renames the shared integration.
- return extendIntegration(redisChannelIntegration({ responseHook: options.responseHook }), {
- name: INTEGRATION_NAME,
- });
-}) satisfies IntegrationFn;
+import { redisIntegration } from '@sentry/server-utils/orchestrion';
 
 /**
- * Creates spans for redis commands, batches, and connects under Deno via
- * `node:diagnostics_channel`. Subscribes to both node-redis (>= 5.12.0) and
- * ioredis (>= 5.11.0) channels — both libraries publish to dedicated channels
- * once they're new enough; on older releases the subscribers are inert.
+ * @deprecated Use `redisIntegration` instead.
  */
-export const denoRedisIntegration = defineIntegration(_denoRedisIntegration) as (
- options?: DenoRedisIntegrationOptions,
-) => Integration & { name: 'DenoRedis'; setupOnce: () => void };
+export const denoRedisIntegration: typeof redisIntegration = redisIntegration;

packages/deno/src/sdk.ts

@@ -35,14 +35,14 @@ import {
  postgresJsIntegration,
  tediousIntegration,
  vercelAiIntegration,
+ redisIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { DenoClient } from './client';
 import { breadcrumbsIntegration } from './integrations/breadcrumbs';
 import { denoContextIntegration } from './integrations/context';
 import { contextLinesIntegration } from './integrations/contextlines';
 import { denoServeIntegration } from './integrations/deno-serve';
 import { denoHttpIntegration } from './integrations/http';
-import { denoRedisIntegration } from './integrations/redis';
 import { globalHandlersIntegration } from './integrations/globalhandlers';
 import { normalizePathsIntegration } from './integrations/normalizepaths';
 import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
@@ -64,7 +64,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
  denoContextIntegration(),
  denoServeIntegration(),
  denoHttpIntegration(),
-denoRedisIntegration(),
+redisIntegration(),
  graphqlDiagnosticsIntegration(),
  vercelAiIntegration(),
  // orchestrion-based instrumentations. We add a deliberate list here rather

packages/deno/test/__snapshots__/mod.test.ts.snap

@@ -56,7 +56,7 @@ snapshot[`captureMessage 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -161,7 +161,7 @@ snapshot[`captureMessage twice 1`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",
@@ -273,7 +273,7 @@ snapshot[`captureMessage twice 2`] = `
  "DenoContext",
  "DenoServe",
  "DenoHttp",
- "DenoRedis",
+ "Redis",
  "Graphql",
  "VercelAI",
  "Amqplib",

packages/deno/test/deno-redis.test.ts

@@ -52,14 +52,14 @@ function withTimeout<T>(p: Promise<T>, ms: number, what: string): Promise<T> {
  });
 }
 
-Deno.test('denoRedisIntegration: included in default integrations', () => {
+Deno.test('redisIntegration: included in default integrations', () => {
  resetGlobals();
  const client = init({ dsn: 'https://username@domain/123' }) as DenoClient;
  const names = client.getOptions().integrations.map(i => i.name);
- assert(names.includes('DenoRedis'), `DenoRedis should be in defaults, got ${names.join(', ')}`);
+ assert(names.includes('Redis'), `Redis should be in defaults, got ${names.join(', ')}`);
 });
 
-Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: node-redis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -98,7 +98,7 @@ Deno.test('denoRedisIntegration: node-redis:command channel produces a db.query
  assertEquals(redisSpan!.data?.['server.port'], 6379);
 });
 
-Deno.test('denoRedisIntegration: errors on the command channel set span status', async () => {
+Deno.test('redisIntegration: errors on the command channel set span status', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({
@@ -135,7 +135,7 @@ Deno.test('denoRedisIntegration: errors on the command channel set span status',
  assertEquals(redisSpan!.status, 'internal_error');
 });
 
-Deno.test('denoRedisIntegration: ioredis:command channel produces a db.query child span', async () => {
+Deno.test('redisIntegration: ioredis:command channel produces a db.query child span', async () => {
  resetGlobals();
  const sink = transactionSink();
  init({

packages/node/src/index.ts

@@ -26,10 +26,10 @@ export {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration as vercelAIIntegration,
 } from '@sentry/server-utils/orchestrion';
-export { redisIntegration } from './integrations/tracing/redis';
 export {
  otlpIntegration,
  getOtlpTracesEndpoint,

packages/node/src/integrations/tracing/index.ts

@@ -21,11 +21,11 @@ import {
  openAIIntegration,
  postgresIntegration,
  postgresJsIntegration,
+ redisIntegration,
  tediousIntegration,
  vercelAiIntegration,
 } from '@sentry/server-utils/orchestrion';
 import { fastifyIntegration } from './fastify';
-import { redisIntegration } from './redis';
 
 export function getAutoPerformanceIntegrations(): Integration[] {
  return [
@@ -36,8 +36,6 @@ export function getAutoPerformanceIntegrations(): Integration[] {
  mongooseIntegration(),
  mysqlIntegration(),
  mysql2Integration(),
- // Redis keeps the node wrapper: it wires the cache `responseHook` into the channel subscribers
- // and covers all redis client versions (native diagnostics_channel + orchestrion fallbacks).
  redisIntegration(),
  postgresIntegration(),
  prismaIntegration(),