@sentry/node 10.62.0 → 10.64.0

package/build/cjs/integrations/tracing/prisma/vendored/instrumentation.js

@@ -1,18 +1,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const api = require('@opentelemetry/api');
 const instrumentation = require('@opentelemetry/instrumentation');
-const global = require('./global.js');
 const activeTracingHelper = require('./active-tracing-helper.js');
 const constants = require('./constants.js');
+const global = require('./global.js');
 
 class PrismaInstrumentation extends instrumentation.InstrumentationBase {
   constructor(config = {}) {
     super(constants.NAME, constants.VERSION, config);
   }
-  setTracerProvider(tracerProvider) {
-    this.tracerProvider = tracerProvider;
-  }
   init() {
     const module = new instrumentation.InstrumentationNodeModuleDefinition(constants.MODULE_NAME, constants.SUPPORTED_MODULE_VERSIONS);
     return [module];
@@ -21,7 +17,6 @@ class PrismaInstrumentation extends instrumentation.InstrumentationBase {
     const config = this._config;
     global.setGlobalTracingHelper(
       new activeTracingHelper.ActiveTracingHelper({
-        tracerProvider: this.tracerProvider ?? api.trace.getTracerProvider(),
         ignoreSpanTypes: config.ignoreSpanTypes ?? []
       })
     );

package/build/cjs/integrations/tracing/prisma/vendored/instrumentation.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.js","sources":["../../../../../../src/integrations/tracing/prisma/vendored/instrumentation.ts"],"sourcesContent":["/*\n * Copyright Prisma\n * SPDX-License-Identifier: Apache-2.0\n *\n * NOTICE from the Sentry authors:\n * - Vendored from: https://github.com/prisma/prisma/tree/b6feea5565ec577545a79547d24273ccdd11b4c7/packages/instrumentation\n * - Upstream version: @prisma/instrumentation@7.8.0\n * - Replaced `@prisma/instrumentation-contract` imports with local vendored equivalents\n * - Replaced `import { VERSION, NAME, MODULE_NAME } from './constants'` with local vendored constants\n */\n/* eslint-disable */\n\nimport { trace, TracerProvider } from '@opentelemetry/api';\nimport {\n  InstrumentationBase,\n  InstrumentationConfig,\n  InstrumentationNodeModuleDefinition,\n} from '@opentelemetry/instrumentation';\nimport { clearGlobalTracingHelper, getGlobalTracingHelper, setGlobalTracingHelper } from './global';\n\nimport { ActiveTracingHelper } from './active-tracing-helper';\nimport { MODULE_NAME, NAME, SUPPORTED_MODULE_VERSIONS, VERSION } from './constants';\n\nexport interface PrismaInstrumentationConfig {\n  ignoreSpanTypes?: (string | RegExp)[];\n}\n\ntype Config = PrismaInstrumentationConfig & InstrumentationConfig;\n\nexport class PrismaInstrumentation extends InstrumentationBase {\n  private tracerProvider: TracerProvider | undefined;\n\n  constructor(config: Config = {}) {\n    super(NAME, VERSION, config);\n  }\n\n  setTracerProvider(tracerProvider: TracerProvider): void {\n    this.tracerProvider = tracerProvider;\n  }\n\n  init() {\n    const module = new InstrumentationNodeModuleDefinition(MODULE_NAME, SUPPORTED_MODULE_VERSIONS);\n\n    return [module];\n  }\n\n  enable() {\n    const config = this._config as Config;\n\n    setGlobalTracingHelper(\n      new ActiveTracingHelper({\n        tracerProvider: this.tracerProvider ?? trace.getTracerProvider(),\n        ignoreSpanTypes: config.ignoreSpanTypes ?? [],\n      }),\n    );\n  }\n\n  disable() {\n    clearGlobalTracingHelper();\n  }\n\n  isEnabled() {\n    return getGlobalTracingHelper() !== undefined;\n  }\n}\n"],"names":["InstrumentationBase","NAME","VERSION","InstrumentationNodeModuleDefinition","MODULE_NAME","SUPPORTED_MODULE_VERSIONS","setGlobalTracingHelper","ActiveTracingHelper","trace","clearGlobalTracingHelper","getGlobalTracingHelper"],"mappings":";;;;;;;;AA6BO,MAAM,8BAA8BA,mCAAA,CAAoB;AAAA,EAG7D,WAAA,CAAY,MAAA,GAAiB,EAAC,EAAG;AAC/B,IAAA,KAAA,CAAMC,cAAA,EAAMC,mBAAS,MAAM,CAAA;AAAA,EAC7B;AAAA,EAEA,kBAAkB,cAAA,EAAsC;AACtD,IAAA,IAAA,CAAK,cAAA,GAAiB,cAAA;AAAA,EACxB;AAAA,EAEA,IAAA,GAAO;AACL,IAAA,MAAM,MAAA,GAAS,IAAIC,mDAAA,CAAoCC,qBAAA,EAAaC,mCAAyB,CAAA;AAE7F,IAAA,OAAO,CAAC,MAAM,CAAA;AAAA,EAChB;AAAA,EAEA,MAAA,GAAS;AACP,IAAA,MAAM,SAAS,IAAA,CAAK,OAAA;AAEpB,IAAAC,6BAAA;AAAA,MACE,IAAIC,uCAAA,CAAoB;AAAA,QACtB,cAAA,EAAgB,IAAA,CAAK,cAAA,IAAkBC,SAAA,CAAM,iBAAA,EAAkB;AAAA,QAC/D,eAAA,EAAiB,MAAA,CAAO,eAAA,IAAmB;AAAC,OAC7C;AAAA,KACH;AAAA,EACF;AAAA,EAEA,OAAA,GAAU;AACR,IAAAC,+BAAA,EAAyB;AAAA,EAC3B;AAAA,EAEA,SAAA,GAAY;AACV,IAAA,OAAOC,+BAAuB,KAAM,MAAA;AAAA,EACtC;AACF;;;;"}
+{"version":3,"file":"instrumentation.js","sources":["../../../../../../src/integrations/tracing/prisma/vendored/instrumentation.ts"],"sourcesContent":["/*\n * Copyright Prisma\n * SPDX-License-Identifier: Apache-2.0\n *\n * NOTICE from the Sentry authors:\n * - Vendored from: https://github.com/prisma/prisma/tree/b6feea5565ec577545a79547d24273ccdd11b4c7/packages/instrumentation\n * - Upstream version: @prisma/instrumentation@7.8.0\n * - Replaced `@prisma/instrumentation-contract` imports with local vendored equivalents\n * - Replaced `import { VERSION, NAME, MODULE_NAME } from './constants'` with local vendored constants\n * - Removed the unused `setTracerProvider`/`tracerProvider` members; spans are created through Sentry's\n *   span APIs, which resolve the active client themselves\n */\n\nimport type { InstrumentationConfig } from '@opentelemetry/instrumentation';\nimport { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';\nimport { ActiveTracingHelper } from './active-tracing-helper';\nimport { MODULE_NAME, NAME, SUPPORTED_MODULE_VERSIONS, VERSION } from './constants';\nimport { clearGlobalTracingHelper, getGlobalTracingHelper, setGlobalTracingHelper } from './global';\n\nexport interface PrismaInstrumentationConfig {\n  ignoreSpanTypes?: (string | RegExp)[];\n}\n\ntype Config = PrismaInstrumentationConfig & InstrumentationConfig;\n\nexport class PrismaInstrumentation extends InstrumentationBase {\n  public constructor(config: Config = {}) {\n    super(NAME, VERSION, config);\n  }\n\n  public init(): InstrumentationNodeModuleDefinition[] {\n    const module = new InstrumentationNodeModuleDefinition(MODULE_NAME, SUPPORTED_MODULE_VERSIONS);\n\n    return [module];\n  }\n\n  public enable(): void {\n    const config = this._config as Config;\n\n    setGlobalTracingHelper(\n      new ActiveTracingHelper({\n        ignoreSpanTypes: config.ignoreSpanTypes ?? [],\n      }),\n    );\n  }\n\n  public disable(): void {\n    clearGlobalTracingHelper();\n  }\n\n  public isEnabled(): boolean {\n    return getGlobalTracingHelper() !== undefined;\n  }\n}\n"],"names":["InstrumentationBase","NAME","VERSION","InstrumentationNodeModuleDefinition","MODULE_NAME","SUPPORTED_MODULE_VERSIONS","setGlobalTracingHelper","ActiveTracingHelper","clearGlobalTracingHelper","getGlobalTracingHelper"],"mappings":";;;;;;;AAyBO,MAAM,8BAA8BA,mCAAA,CAAoB;AAAA,EACtD,WAAA,CAAY,MAAA,GAAiB,EAAC,EAAG;AACtC,IAAA,KAAA,CAAMC,cAAA,EAAMC,mBAAS,MAAM,CAAA;AAAA,EAC7B;AAAA,EAEO,IAAA,GAA8C;AACnD,IAAA,MAAM,MAAA,GAAS,IAAIC,mDAAA,CAAoCC,qBAAA,EAAaC,mCAAyB,CAAA;AAE7F,IAAA,OAAO,CAAC,MAAM,CAAA;AAAA,EAChB;AAAA,EAEO,MAAA,GAAe;AACpB,IAAA,MAAM,SAAS,IAAA,CAAK,OAAA;AAEpB,IAAAC,6BAAA;AAAA,MACE,IAAIC,uCAAA,CAAoB;AAAA,QACtB,eAAA,EAAiB,MAAA,CAAO,eAAA,IAAmB;AAAC,OAC7C;AAAA,KACH;AAAA,EACF;AAAA,EAEO,OAAA,GAAgB;AACrB,IAAAC,+BAAA,EAAyB;AAAA,EAC3B;AAAA,EAEO,SAAA,GAAqB;AAC1B,IAAA,OAAOC,+BAAuB,KAAM,MAAA;AAAA,EACtC;AACF;;;;"}

package/build/cjs/integrations/tracing/redis/cache.js

@@ -0,0 +1,41 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+
+const core = require('@sentry/core');
+const redisCache = require('../../../utils/redisCache.js');
+
+exports._redisOptions = {};
+function setRedisOptions(options) {
+  exports._redisOptions = options;
+}
+const cacheResponseHook = (span, redisCommand, cmdArgs, response) => {
+  const safeKey = redisCache.getCacheKeySafely(redisCommand, cmdArgs);
+  const cacheOperation = redisCache.getCacheOperation(redisCommand);
+  if (!safeKey || !cacheOperation || !exports._redisOptions.cachePrefixes || !redisCache.shouldConsiderForCache(redisCommand, safeKey, exports._redisOptions.cachePrefixes)) {
+    return;
+  }
+  const spanData = core.spanToJSON(span).data;
+  const networkPeerAddress = spanData["net.peer.name"] ?? spanData["server.address"];
+  const networkPeerPort = spanData["net.peer.port"] ?? spanData["server.port"];
+  if (networkPeerPort && networkPeerAddress) {
+    span.setAttributes({ "network.peer.address": networkPeerAddress, "network.peer.port": networkPeerPort });
+  }
+  const cacheItemSize = redisCache.calculateCacheItemSize(response);
+  if (cacheItemSize) {
+    span.setAttribute(core.SEMANTIC_ATTRIBUTE_CACHE_ITEM_SIZE, cacheItemSize);
+  }
+  if (redisCache.isInCommands(redisCache.GET_COMMANDS, redisCommand) && cacheItemSize !== void 0) {
+    span.setAttribute(core.SEMANTIC_ATTRIBUTE_CACHE_HIT, cacheItemSize > 0);
+  }
+  span.setAttributes({
+    [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: cacheOperation,
+    [core.SEMANTIC_ATTRIBUTE_CACHE_KEY]: safeKey
+  });
+  const spanDescription = safeKey.join(", ");
+  span.updateName(
+    exports._redisOptions.maxCacheKeyLength ? core.truncate(spanDescription, exports._redisOptions.maxCacheKeyLength) : spanDescription
+  );
+};
+
+exports.cacheResponseHook = cacheResponseHook;
+exports.setRedisOptions = setRedisOptions;
+//# sourceMappingURL=cache.js.map

package/build/cjs/integrations/tracing/redis/cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache.js","sources":["../../../../../src/integrations/tracing/redis/cache.ts"],"sourcesContent":["import type { Span } from '@sentry/core';\nimport {\n  SEMANTIC_ATTRIBUTE_CACHE_HIT,\n  SEMANTIC_ATTRIBUTE_CACHE_ITEM_SIZE,\n  SEMANTIC_ATTRIBUTE_CACHE_KEY,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  spanToJSON,\n  truncate,\n} from '@sentry/core';\nimport type { IORedisCommandArgs } from '../../../utils/redisCache';\nimport {\n  calculateCacheItemSize,\n  GET_COMMANDS,\n  getCacheKeySafely,\n  getCacheOperation,\n  isInCommands,\n  shouldConsiderForCache,\n} from '../../../utils/redisCache';\nimport type { IORedisResponseCustomAttributeFunction } from './vendored/types';\n\n// This module deliberately does NOT import the vendored OTel `IORedisInstrumentation`/\n// `RedisInstrumentation`, so the orchestrion opt-in can pull `cacheResponseHook`\n// without dragging the OTel redis instrumentation into its module graph.\n\nexport interface RedisOptions {\n  /**\n   * Define cache prefixes for cache keys that should be captured as a cache span.\n   *\n   * Setting this to, for example, `['user:']` will capture cache keys that start with `user:`.\n   */\n  cachePrefixes?: string[];\n  /**\n   * Maximum length of the cache key added to the span description. If the key exceeds this length, it will be truncated.\n   *\n   * Passing `0` will use the full cache key without truncation.\n   *\n   * By default, the full cache key is used.\n   */\n  maxCacheKeyLength?: number;\n}\n\n/* Only exported for testing purposes */\nexport let _redisOptions: RedisOptions = {};\n\n/** Set the options consumed by {@link cacheResponseHook}. */\nexport function setRedisOptions(options: RedisOptions): void {\n  _redisOptions = options;\n}\n\n/* Only exported for testing purposes */\nexport const cacheResponseHook: IORedisResponseCustomAttributeFunction = (\n  span: Span,\n  redisCommand: string,\n  cmdArgs: IORedisCommandArgs,\n  response: unknown,\n) => {\n  const safeKey = getCacheKeySafely(redisCommand, cmdArgs);\n  const cacheOperation = getCacheOperation(redisCommand);\n\n  if (\n    !safeKey ||\n    !cacheOperation ||\n    !_redisOptions.cachePrefixes ||\n    !shouldConsiderForCache(redisCommand, safeKey, _redisOptions.cachePrefixes)\n  ) {\n    // not relevant for cache\n    return;\n  }\n\n  // otel/ioredis seems to be using the old standard, as there was a change to those params: https://github.com/open-telemetry/opentelemetry-specification/issues/3199\n  // We are using params based on the docs: https://opentelemetry.io/docs/specs/semconv/attributes-registry/network/\n  // Fall back to stable semconv attributes (server.address/server.port) when\n  // old-semconv ones are absent, eg OTEL_SEMCONV_STABILITY_OPT_IN=database\n  // set for node-redis v4/v5.\n  const spanData = spanToJSON(span).data;\n  const networkPeerAddress = spanData['net.peer.name'] ?? spanData['server.address'];\n  const networkPeerPort = spanData['net.peer.port'] ?? spanData['server.port'];\n  if (networkPeerPort && networkPeerAddress) {\n    span.setAttributes({ 'network.peer.address': networkPeerAddress, 'network.peer.port': networkPeerPort });\n  }\n\n  const cacheItemSize = calculateCacheItemSize(response);\n\n  if (cacheItemSize) {\n    span.setAttribute(SEMANTIC_ATTRIBUTE_CACHE_ITEM_SIZE, cacheItemSize);\n  }\n\n  if (isInCommands(GET_COMMANDS, redisCommand) && cacheItemSize !== undefined) {\n    span.setAttribute(SEMANTIC_ATTRIBUTE_CACHE_HIT, cacheItemSize > 0);\n  }\n\n  span.setAttributes({\n    [SEMANTIC_ATTRIBUTE_SENTRY_OP]: cacheOperation,\n    [SEMANTIC_ATTRIBUTE_CACHE_KEY]: safeKey,\n  });\n\n  // todo: change to string[] once EAP supports it\n  const spanDescription = safeKey.join(', ');\n\n  span.updateName(\n    _redisOptions.maxCacheKeyLength ? truncate(spanDescription, _redisOptions.maxCacheKeyLength) : spanDescription,\n  );\n};\n"],"names":["_redisOptions","getCacheKeySafely","getCacheOperation","shouldConsiderForCache","spanToJSON","calculateCacheItemSize","SEMANTIC_ATTRIBUTE_CACHE_ITEM_SIZE","isInCommands","GET_COMMANDS","SEMANTIC_ATTRIBUTE_CACHE_HIT","SEMANTIC_ATTRIBUTE_SENTRY_OP","SEMANTIC_ATTRIBUTE_CACHE_KEY","truncate"],"mappings":";;;;;AA0CWA,wBAA8B;AAGlC,SAAS,gBAAgB,OAAA,EAA6B;AAC3D,EAAAA,qBAAA,GAAgB,OAAA;AAClB;AAGO,MAAM,iBAAA,GAA4D,CACvE,IAAA,EACA,YAAA,EACA,SACA,QAAA,KACG;AACH,EAAA,MAAM,OAAA,GAAUC,4BAAA,CAAkB,YAAA,EAAc,OAAO,CAAA;AACvD,EAAA,MAAM,cAAA,GAAiBC,6BAAkB,YAAY,CAAA;AAErD,EAAA,IACE,CAAC,OAAA,IACD,CAAC,cAAA,IACD,CAACF,qBAAA,CAAc,aAAA,IACf,CAACG,iCAAA,CAAuB,YAAA,EAAc,OAAA,EAASH,qBAAA,CAAc,aAAa,CAAA,EAC1E;AAEA,IAAA;AAAA,EACF;AAOA,EAAA,MAAM,QAAA,GAAWI,eAAA,CAAW,IAAI,CAAA,CAAE,IAAA;AAClC,EAAA,MAAM,kBAAA,GAAqB,QAAA,CAAS,eAAe,CAAA,IAAK,SAAS,gBAAgB,CAAA;AACjF,EAAA,MAAM,eAAA,GAAkB,QAAA,CAAS,eAAe,CAAA,IAAK,SAAS,aAAa,CAAA;AAC3E,EAAA,IAAI,mBAAmB,kBAAA,EAAoB;AACzC,IAAA,IAAA,CAAK,cAAc,EAAE,sBAAA,EAAwB,kBAAA,EAAoB,mBAAA,EAAqB,iBAAiB,CAAA;AAAA,EACzG;AAEA,EAAA,MAAM,aAAA,GAAgBC,kCAAuB,QAAQ,CAAA;AAErD,EAAA,IAAI,aAAA,EAAe;AACjB,IAAA,IAAA,CAAK,YAAA,CAAaC,yCAAoC,aAAa,CAAA;AAAA,EACrE;AAEA,EAAA,IAAIC,uBAAA,CAAaC,uBAAA,EAAc,YAAY,CAAA,IAAK,kBAAkB,MAAA,EAAW;AAC3E,IAAA,IAAA,CAAK,YAAA,CAAaC,iCAAA,EAA8B,aAAA,GAAgB,CAAC,CAAA;AAAA,EACnE;AAEA,EAAA,IAAA,CAAK,aAAA,CAAc;AAAA,IACjB,CAACC,iCAA4B,GAAG,cAAA;AAAA,IAChC,CAACC,iCAA4B,GAAG;AAAA,GACjC,CAAA;AAGD,EAAA,MAAM,eAAA,GAAkB,OAAA,CAAQ,IAAA,CAAK,IAAI,CAAA;AAEzC,EAAA,IAAA,CAAK,UAAA;AAAA,IACHX,sBAAc,iBAAA,GAAoBY,aAAA,CAAS,eAAA,EAAiBZ,qBAAA,CAAc,iBAAiB,CAAA,GAAI;AAAA,GACjG;AACF;;;;;"}

package/build/cjs/integrations/tracing/redis/index.js

@@ -4,58 +4,32 @@ const core = require('@sentry/core');
 const dc = require('node:diagnostics_channel');
 const serverUtils = require('@sentry/server-utils');
 const nodeCore = require('@sentry/node-core');
-const redisCache = require('../../../utils/redisCache.js');
+const diagnosticsChannelInjection = require('../../../sdk/diagnosticsChannelInjection.js');
+const cache = require('./cache.js');
 const ioredisInstrumentation = require('./vendored/ioredis-instrumentation.js');
 const redisInstrumentation = require('./vendored/redis-instrumentation.js');
 
 const INTEGRATION_NAME = "Redis";
-exports._redisOptions = {};
-const cacheResponseHook = (span, redisCommand, cmdArgs, response) => {
-  const safeKey = redisCache.getCacheKeySafely(redisCommand, cmdArgs);
-  const cacheOperation = redisCache.getCacheOperation(redisCommand);
-  if (!safeKey || !cacheOperation || !exports._redisOptions.cachePrefixes || !redisCache.shouldConsiderForCache(redisCommand, safeKey, exports._redisOptions.cachePrefixes)) {
-    return;
-  }
-  const spanData = core.spanToJSON(span).data;
-  const networkPeerAddress = spanData["net.peer.name"] ?? spanData["server.address"];
-  const networkPeerPort = spanData["net.peer.port"] ?? spanData["server.port"];
-  if (networkPeerPort && networkPeerAddress) {
-    span.setAttributes({ "network.peer.address": networkPeerAddress, "network.peer.port": networkPeerPort });
-  }
-  const cacheItemSize = redisCache.calculateCacheItemSize(response);
-  if (cacheItemSize) {
-    span.setAttribute(core.SEMANTIC_ATTRIBUTE_CACHE_ITEM_SIZE, cacheItemSize);
-  }
-  if (redisCache.isInCommands(redisCache.GET_COMMANDS, redisCommand) && cacheItemSize !== void 0) {
-    span.setAttribute(core.SEMANTIC_ATTRIBUTE_CACHE_HIT, cacheItemSize > 0);
-  }
-  span.setAttributes({
-    [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: cacheOperation,
-    [core.SEMANTIC_ATTRIBUTE_CACHE_KEY]: safeKey
-  });
-  const spanDescription = safeKey.join(", ");
-  span.updateName(
-    exports._redisOptions.maxCacheKeyLength ? core.truncate(spanDescription, exports._redisOptions.maxCacheKeyLength) : spanDescription
-  );
-};
 const instrumentIORedis = nodeCore.generateInstrumentOnce(`${INTEGRATION_NAME}.IORedis`, () => {
   return new ioredisInstrumentation.IORedisInstrumentation({
-    responseHook: cacheResponseHook
+    responseHook: cache.cacheResponseHook
   });
 });
 const instrumentRedisModule = nodeCore.generateInstrumentOnce(`${INTEGRATION_NAME}.Redis`, () => {
   return new redisInstrumentation.RedisInstrumentation({
-    responseHook: cacheResponseHook
+    responseHook: cache.cacheResponseHook
   });
 });
 const instrumentRedis = Object.assign(
   () => {
-    instrumentIORedis();
+    if (!diagnosticsChannelInjection.isDiagnosticsChannelInjectionEnabled() || !dc.tracingChannel) {
+      instrumentIORedis();
+    }
     instrumentRedisModule();
     if (dc.tracingChannel) {
-      void Promise.resolve().then(
-        () => serverUtils.subscribeRedisDiagnosticChannels(dc.tracingChannel, cacheResponseHook)
-      );
+      core.waitForTracingChannelBinding(() => {
+        serverUtils.subscribeRedisDiagnosticChannels(dc.tracingChannel, cache.cacheResponseHook);
+      });
     }
   },
   { id: INTEGRATION_NAME }
@@ -64,14 +38,18 @@ const _redisIntegration = ((options = {}) => {
   return {
     name: INTEGRATION_NAME,
     setupOnce() {
-      exports._redisOptions = options;
+      cache.setRedisOptions(options);
       instrumentRedis();
     }
   };
 });
 const redisIntegration = core.defineIntegration(_redisIntegration);
 
-exports.cacheResponseHook = cacheResponseHook;
+Object.defineProperty(exports, "_redisOptions", {
+  enumerable: true,
+  get: () => cache._redisOptions
+});
+exports.cacheResponseHook = cache.cacheResponseHook;
 exports.instrumentRedis = instrumentRedis;
 exports.redisIntegration = redisIntegration;
 //# sourceMappingURL=index.js.map

package/build/cjs/integrations/tracing/redis/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../src/integrations/tracing/redis/index.ts"],"sourcesContent":["import type { IntegrationFn, Span } from '@sentry/core';\nimport {\n  defineIntegration,\n  SEMANTIC_ATTRIBUTE_CACHE_HIT,\n  SEMANTIC_ATTRIBUTE_CACHE_ITEM_SIZE,\n  SEMANTIC_ATTRIBUTE_CACHE_KEY,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  spanToJSON,\n  truncate,\n} from '@sentry/core';\nimport * as dc from 'node:diagnostics_channel';\nimport { subscribeRedisDiagnosticChannels, type RedisTracingChannelFactory } from '@sentry/server-utils';\nimport { generateInstrumentOnce } from '@sentry/node-core';\nimport type { IORedisCommandArgs } from '../../../utils/redisCache';\nimport {\n  calculateCacheItemSize,\n  GET_COMMANDS,\n  getCacheKeySafely,\n  getCacheOperation,\n  isInCommands,\n  shouldConsiderForCache,\n} from '../../../utils/redisCache';\nimport type { IORedisResponseCustomAttributeFunction } from './vendored/types';\nimport { IORedisInstrumentation } from './vendored/ioredis-instrumentation';\nimport { RedisInstrumentation } from './vendored/redis-instrumentation';\n\ninterface RedisOptions {\n  /**\n   * Define cache prefixes for cache keys that should be captured as a cache span.\n   *\n   * Setting this to, for example, `['user:']` will capture cache keys that start with `user:`.\n   */\n  cachePrefixes?: string[];\n  /**\n   * Maximum length of the cache key added to the span description. If the key exceeds this length, it will be truncated.\n   *\n   * Passing `0` will use the full cache key without truncation.\n   *\n   * By default, the full cache key is used.\n   */\n  maxCacheKeyLength?: number;\n}\n\nconst INTEGRATION_NAME = 'Redis';\n\n/* Only exported for testing purposes */\nexport let _redisOptions: RedisOptions = {};\n\n/* Only exported for testing purposes */\nexport const cacheResponseHook: IORedisResponseCustomAttributeFunction = (\n  span: Span,\n  redisCommand: string,\n  cmdArgs: IORedisCommandArgs,\n  response: unknown,\n) => {\n  const safeKey = getCacheKeySafely(redisCommand, cmdArgs);\n  const cacheOperation = getCacheOperation(redisCommand);\n\n  if (\n    !safeKey ||\n    !cacheOperation ||\n    !_redisOptions.cachePrefixes ||\n    !shouldConsiderForCache(redisCommand, safeKey, _redisOptions.cachePrefixes)\n  ) {\n    // not relevant for cache\n    return;\n  }\n\n  // otel/ioredis seems to be using the old standard, as there was a change to those params: https://github.com/open-telemetry/opentelemetry-specification/issues/3199\n  // We are using params based on the docs: https://opentelemetry.io/docs/specs/semconv/attributes-registry/network/\n  // Fall back to stable semconv attributes (server.address/server.port) when\n  // old-semconv ones are absent, eg OTEL_SEMCONV_STABILITY_OPT_IN=database\n  // set for node-redis v4/v5.\n  const spanData = spanToJSON(span).data;\n  const networkPeerAddress = spanData['net.peer.name'] ?? spanData['server.address'];\n  const networkPeerPort = spanData['net.peer.port'] ?? spanData['server.port'];\n  if (networkPeerPort && networkPeerAddress) {\n    span.setAttributes({ 'network.peer.address': networkPeerAddress, 'network.peer.port': networkPeerPort });\n  }\n\n  const cacheItemSize = calculateCacheItemSize(response);\n\n  if (cacheItemSize) {\n    span.setAttribute(SEMANTIC_ATTRIBUTE_CACHE_ITEM_SIZE, cacheItemSize);\n  }\n\n  if (isInCommands(GET_COMMANDS, redisCommand) && cacheItemSize !== undefined) {\n    span.setAttribute(SEMANTIC_ATTRIBUTE_CACHE_HIT, cacheItemSize > 0);\n  }\n\n  span.setAttributes({\n    [SEMANTIC_ATTRIBUTE_SENTRY_OP]: cacheOperation,\n    [SEMANTIC_ATTRIBUTE_CACHE_KEY]: safeKey,\n  });\n\n  // todo: change to string[] once EAP supports it\n  const spanDescription = safeKey.join(', ');\n\n  span.updateName(\n    _redisOptions.maxCacheKeyLength ? truncate(spanDescription, _redisOptions.maxCacheKeyLength) : spanDescription,\n  );\n};\n\nconst instrumentIORedis = generateInstrumentOnce(`${INTEGRATION_NAME}.IORedis`, () => {\n  return new IORedisInstrumentation({\n    responseHook: cacheResponseHook,\n  });\n});\n\nconst instrumentRedisModule = generateInstrumentOnce(`${INTEGRATION_NAME}.Redis`, () => {\n  return new RedisInstrumentation({\n    responseHook: cacheResponseHook,\n  });\n});\n\n/**\n * To be able to preload all Redis OTel instrumentations with just one ID\n * (\"Redis\"), all the instrumentations are generated in this one function\n */\nexport const instrumentRedis = Object.assign(\n  (): void => {\n    instrumentIORedis();\n    instrumentRedisModule();\n    // node-redis >= 5.12.0 and ioredis >= 5.11.0 publish via diagnostics_channel.\n    // `bindTracingChannelToSpan` (inside the subscriber) makes the span the active\n    // OTel context via `bindStore`, which needs the Sentry OTel context manager to\n    // be registered — `initOpenTelemetry()` does that after integration `setupOnce`,\n    // so defer to the next tick.\n    // Check this here to ensure this does not fail at runtime for Node <= 18.18.0\n    if (dc.tracingChannel) {\n      void Promise.resolve().then(() =>\n        subscribeRedisDiagnosticChannels(dc.tracingChannel as RedisTracingChannelFactory, cacheResponseHook),\n      );\n    }\n\n    // todo: implement them gradually\n    // new LegacyRedisInstrumentation({}),\n  },\n  { id: INTEGRATION_NAME },\n);\n\nconst _redisIntegration = ((options: RedisOptions = {}) => {\n  return {\n    name: INTEGRATION_NAME,\n    setupOnce() {\n      _redisOptions = options;\n      instrumentRedis();\n    },\n  };\n}) satisfies IntegrationFn;\n\n/**\n * Adds Sentry tracing instrumentation for the [redis](https://www.npmjs.com/package/redis) and\n * [ioredis](https://www.npmjs.com/package/ioredis) libraries.\n *\n * For more information, see the [`redisIntegration` documentation](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/redis/).\n *\n * @example\n * ```javascript\n * const Sentry = require('@sentry/node');\n *\n * Sentry.init({\n *  integrations: [Sentry.redisIntegration()],\n * });\n * ```\n */\nexport const redisIntegration = defineIntegration(_redisIntegration);\n"],"names":["_redisOptions","getCacheKeySafely","getCacheOperation","shouldConsiderForCache","spanToJSON","calculateCacheItemSize","SEMANTIC_ATTRIBUTE_CACHE_ITEM_SIZE","isInCommands","GET_COMMANDS","SEMANTIC_ATTRIBUTE_CACHE_HIT","SEMANTIC_ATTRIBUTE_SENTRY_OP","SEMANTIC_ATTRIBUTE_CACHE_KEY","truncate","generateInstrumentOnce","IORedisInstrumentation","RedisInstrumentation","subscribeRedisDiagnosticChannels","defineIntegration"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../../../src/integrations/tracing/redis/index.ts"],"sourcesContent":["import type { IntegrationFn } from '@sentry/core';\nimport { defineIntegration, waitForTracingChannelBinding } from '@sentry/core';\nimport * as dc from 'node:diagnostics_channel';\nimport { subscribeRedisDiagnosticChannels, type RedisTracingChannelFactory } from '@sentry/server-utils';\nimport { generateInstrumentOnce } from '@sentry/node-core';\nimport { isDiagnosticsChannelInjectionEnabled } from '../../../sdk/diagnosticsChannelInjection';\nimport { cacheResponseHook, type RedisOptions, setRedisOptions } from './cache';\nimport { IORedisInstrumentation } from './vendored/ioredis-instrumentation';\nimport { RedisInstrumentation } from './vendored/redis-instrumentation';\n\n// `cacheResponseHook`/`_redisOptions` live in `./cache` (which has no OTel\n// instrumentation imports) so the orchestrion opt-in can pull the hook without\n// dragging the OTel redis instrumentation in. Re-exported here for tests.\nexport { _redisOptions, cacheResponseHook } from './cache';\n\nconst INTEGRATION_NAME = 'Redis' as const;\n\nconst instrumentIORedis = generateInstrumentOnce(`${INTEGRATION_NAME}.IORedis`, () => {\n  return new IORedisInstrumentation({\n    responseHook: cacheResponseHook,\n  });\n});\n\nconst instrumentRedisModule = generateInstrumentOnce(`${INTEGRATION_NAME}.Redis`, () => {\n  return new RedisInstrumentation({\n    responseHook: cacheResponseHook,\n  });\n});\n\n/**\n * To be able to preload all Redis OTel instrumentations with just one ID\n * (\"Redis\"), all the instrumentations are generated in this one function\n */\nexport const instrumentRedis = Object.assign(\n  (): void => {\n    // When diagnostics-channel injection is opted in, orchestrion owns ioredis\n    // `<5.11.0`, so skip the OTel ioredis monkey-patch to avoid double instrumentation.\n    // On Node without `tracingChannel` (<18.19) orchestrion can't run, so keep the\n    // OTel patch there — otherwise ioredis `<5.11.0` would not be traced at all.\n    if (!isDiagnosticsChannelInjectionEnabled() || !dc.tracingChannel) {\n      instrumentIORedis();\n    }\n    instrumentRedisModule();\n    // node-redis >= 5.12.0 and ioredis >= 5.11.0 publish via diagnostics_channel.\n    // `bindTracingChannelToSpan` (inside the subscriber) makes the span the active\n    // OTel context via `bindStore`, which needs the Sentry OTel context manager to\n    // be registered — `initOpenTelemetry()` does that after integration `setupOnce`,\n    // so defer to the next tick.\n    // Check this here to ensure this does not fail at runtime for Node <= 18.18.0\n    if (dc.tracingChannel) {\n      waitForTracingChannelBinding(() => {\n        subscribeRedisDiagnosticChannels(dc.tracingChannel as RedisTracingChannelFactory, cacheResponseHook);\n      });\n    }\n\n    // todo: implement them gradually\n    // new LegacyRedisInstrumentation({}),\n  },\n  { id: INTEGRATION_NAME },\n);\n\nconst _redisIntegration = ((options: RedisOptions = {}) => {\n  return {\n    name: INTEGRATION_NAME,\n    setupOnce() {\n      setRedisOptions(options);\n      instrumentRedis();\n    },\n  };\n}) satisfies IntegrationFn;\n\n/**\n * Adds Sentry tracing instrumentation for the [redis](https://www.npmjs.com/package/redis) and\n * [ioredis](https://www.npmjs.com/package/ioredis) libraries.\n *\n * For more information, see the [`redisIntegration` documentation](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/redis/).\n *\n * @example\n * ```javascript\n * const Sentry = require('@sentry/node');\n *\n * Sentry.init({\n *  integrations: [Sentry.redisIntegration()],\n * });\n * ```\n */\nexport const redisIntegration = defineIntegration(_redisIntegration);\n"],"names":["generateInstrumentOnce","IORedisInstrumentation","cacheResponseHook","RedisInstrumentation","isDiagnosticsChannelInjectionEnabled","waitForTracingChannelBinding","subscribeRedisDiagnosticChannels","setRedisOptions","defineIntegration"],"mappings":";;;;;;;;;;;AAeA,MAAM,gBAAA,GAAmB,OAAA;AAEzB,MAAM,iBAAA,GAAoBA,+BAAA,CAAuB,CAAA,EAAG,gBAAgB,YAAY,MAAM;AACpF,EAAA,OAAO,IAAIC,6CAAA,CAAuB;AAAA,IAChC,YAAA,EAAcC;AAAA,GACf,CAAA;AACH,CAAC,CAAA;AAED,MAAM,qBAAA,GAAwBF,+BAAA,CAAuB,CAAA,EAAG,gBAAgB,UAAU,MAAM;AACtF,EAAA,OAAO,IAAIG,yCAAA,CAAqB;AAAA,IAC9B,YAAA,EAAcD;AAAA,GACf,CAAA;AACH,CAAC,CAAA;AAMM,MAAM,kBAAkB,MAAA,CAAO,MAAA;AAAA,EACpC,MAAY;AAKV,IAAA,IAAI,CAACE,gEAAA,EAAqC,IAAK,CAAC,GAAG,cAAA,EAAgB;AACjE,MAAA,iBAAA,EAAkB;AAAA,IACpB;AACA,IAAA,qBAAA,EAAsB;AAOtB,IAAA,IAAI,GAAG,cAAA,EAAgB;AACrB,MAAAC,iCAAA,CAA6B,MAAM;AACjC,QAAAC,4CAAA,CAAiC,EAAA,CAAG,gBAA8CJ,uBAAiB,CAAA;AAAA,MACrG,CAAC,CAAA;AAAA,IACH;AAAA,EAIF,CAAA;AAAA,EACA,EAAE,IAAI,gBAAA;AACR;AAEA,MAAM,iBAAA,IAAqB,CAAC,OAAA,GAAwB,EAAC,KAAM;AACzD,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,gBAAA;AAAA,IACN,SAAA,GAAY;AACV,MAAAK,qBAAA,CAAgB,OAAO,CAAA;AACvB,MAAA,eAAA,EAAgB;AAAA,IAClB;AAAA,GACF;AACF,CAAA,CAAA;AAiBO,MAAM,gBAAA,GAAmBC,uBAAkB,iBAAiB;;;;;;;;;;"}

package/build/cjs/integrations/tracing/redis/vendored/ioredis-instrumentation.js

@@ -2,7 +2,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const instrumentation = require('@opentelemetry/instrumentation');
 const core = require('@sentry/core');
-const redisCommon = require('./redis-common.js');
+const attributes = require('@sentry/conventions/attributes');
+const serverUtils = require('@sentry/server-utils');
 const semconv = require('./semconv.js');
 
 const PACKAGE_NAME = "@sentry/instrumentation-ioredis";
@@ -53,15 +54,19 @@ class IORedisInstrumentation extends instrumentation.InstrumentationBase {
           return original.apply(this, args);
         }
         const { host, port } = this.options;
-        const attributes = {
-          [semconv.ATTR_DB_SYSTEM]: semconv.DB_SYSTEM_VALUE_REDIS,
-          [semconv.ATTR_DB_STATEMENT]: redisCommon.defaultDbStatementSerializer(cmd.name, cmd.args),
+        const attributes$1 = {
+          // oxlint-disable-next-line typescript/no-deprecated
+          [attributes.DB_SYSTEM]: semconv.DB_SYSTEM_VALUE_REDIS,
+          // oxlint-disable-next-line typescript/no-deprecated
+          [attributes.DB_STATEMENT]: serverUtils.defaultDbStatementSerializer(cmd.name, cmd.args),
           [semconv.ATTR_DB_CONNECTION_STRING]: `redis://${host}:${port}`,
-          [semconv.ATTR_NET_PEER_NAME]: host,
-          [semconv.ATTR_NET_PEER_PORT]: port,
+          // oxlint-disable-next-line typescript/no-deprecated
+          [attributes.NET_PEER_NAME]: host,
+          // oxlint-disable-next-line typescript/no-deprecated
+          [attributes.NET_PEER_PORT]: port,
           [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN
         };
-        const span = core.startInactiveSpan({ name: cmd.name, kind: core.SPAN_KIND.CLIENT, attributes });
+        const span = core.startInactiveSpan({ name: cmd.name, kind: core.SPAN_KIND.CLIENT, attributes: attributes$1 });
         try {
           const result = original.apply(this, args);
           const origResolve = cmd.resolve;
@@ -90,15 +95,19 @@ class IORedisInstrumentation extends instrumentation.InstrumentationBase {
           return original.apply(this, args);
         }
         const { host, port } = this.options;
-        const attributes = {
-          [semconv.ATTR_DB_SYSTEM]: semconv.DB_SYSTEM_VALUE_REDIS,
-          [semconv.ATTR_DB_STATEMENT]: "connect",
+        const attributes$1 = {
+          // oxlint-disable-next-line typescript/no-deprecated
+          [attributes.DB_SYSTEM]: semconv.DB_SYSTEM_VALUE_REDIS,
+          // oxlint-disable-next-line typescript/no-deprecated
+          [attributes.DB_STATEMENT]: "connect",
           [semconv.ATTR_DB_CONNECTION_STRING]: `redis://${host}:${port}`,
-          [semconv.ATTR_NET_PEER_NAME]: host,
-          [semconv.ATTR_NET_PEER_PORT]: port,
+          // oxlint-disable-next-line typescript/no-deprecated
+          [attributes.NET_PEER_NAME]: host,
+          // oxlint-disable-next-line typescript/no-deprecated
+          [attributes.NET_PEER_PORT]: port,
           [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN
         };
-        const span = core.startInactiveSpan({ name: "connect", kind: core.SPAN_KIND.CLIENT, attributes });
+        const span = core.startInactiveSpan({ name: "connect", kind: core.SPAN_KIND.CLIENT, attributes: attributes$1 });
         try {
           const result = original.apply(this, args);
           if (result instanceof Promise) {

package/build/cjs/integrations/tracing/redis/vendored/ioredis-instrumentation.js.map

@@ -1 +1 @@
-{"version":3,"file":"ioredis-instrumentation.js","sources":["../../../../../../src/integrations/tracing/redis/vendored/ioredis-instrumentation.ts"],"sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n * SPDX-License-Identifier: Apache-2.0\n *\n * NOTICE from the Sentry authors:\n * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/instrumentation-ioredis-v0.62.0/packages/instrumentation-ioredis\n * - Upstream version: @opentelemetry/instrumentation-ioredis@0.62.0\n * - Minor TypeScript adjustments for this repository's compiler settings\n * - Refactored to use Sentry's span APIs instead of OpenTelemetry tracing APIs\n */\n\nimport { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';\nimport type { Span, SpanAttributes } from '@sentry/core';\nimport {\n  getActiveSpan,\n  SDK_VERSION,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SPAN_KIND,\n  SPAN_STATUS_ERROR,\n  startInactiveSpan,\n} from '@sentry/core';\nimport { defaultDbStatementSerializer } from './redis-common';\nimport {\n  ATTR_DB_CONNECTION_STRING,\n  ATTR_DB_STATEMENT,\n  ATTR_DB_SYSTEM,\n  ATTR_NET_PEER_NAME,\n  ATTR_NET_PEER_PORT,\n  DB_SYSTEM_VALUE_REDIS,\n} from './semconv';\nimport type { IORedisInstrumentationConfig } from './types';\n\nconst PACKAGE_NAME = '@sentry/instrumentation-ioredis';\nconst ORIGIN = 'auto.db.otel.redis';\n\n// ioredis >= 5.11.0 publishes via diagnostics_channel, which Sentry subscribes\n// to separately, so this monkey-patching instrumentation only covers < 5.11.0.\nconst SUPPORTED_VERSIONS = ['>=2.0.0 <5.11.0'];\n\n// The raw imported `ioredis` module is either the CommonJS export or an ESM\n// namespace wrapping it on `.default`. Typed shallowly since it is only used\n// internally to reach the `Redis` prototype that holds the methods we patch.\ntype IORedisModule = {\n  default?: { prototype: RedisPrototype };\n  prototype: RedisPrototype;\n  [Symbol.toStringTag]?: string;\n};\n\ninterface RedisPrototype {\n  sendCommand: (...args: unknown[]) => unknown;\n  connect: (...args: unknown[]) => unknown;\n}\n\n// The `this` of the patched methods is a Redis client instance exposing its\n// connection options.\ninterface RedisClient {\n  options: { host?: string; port?: number };\n}\n\n// The in-flight command object ioredis passes to `sendCommand`. We swap its\n// `resolve`/`reject` so the span ends when the command settles.\ninterface RedisCommand {\n  name: string;\n  args: Array<string | Buffer>;\n  resolve: (result: unknown) => void;\n  reject: (err: Error) => void;\n}\n\nfunction endSpan(span: Span, err: Error | null | undefined): void {\n  if (err) {\n    span.setStatus({ code: SPAN_STATUS_ERROR, message: err.message });\n  }\n  span.end();\n}\n\nexport class IORedisInstrumentation extends InstrumentationBase<IORedisInstrumentationConfig> {\n  public constructor(config: IORedisInstrumentationConfig = {}) {\n    super(PACKAGE_NAME, SDK_VERSION, config);\n  }\n\n  protected init(): InstrumentationNodeModuleDefinition[] {\n    return [\n      new InstrumentationNodeModuleDefinition(\n        'ioredis',\n        SUPPORTED_VERSIONS,\n        (module: IORedisModule) => {\n          const moduleExports = module[Symbol.toStringTag] === 'Module' && module.default ? module.default : module;\n          if (isWrapped(moduleExports.prototype.sendCommand)) {\n            this._unwrap(moduleExports.prototype, 'sendCommand');\n          }\n          this._wrap(moduleExports.prototype, 'sendCommand', this._patchSendCommand());\n          if (isWrapped(moduleExports.prototype.connect)) {\n            this._unwrap(moduleExports.prototype, 'connect');\n          }\n          this._wrap(moduleExports.prototype, 'connect', this._patchConnection());\n          return module;\n        },\n        (module: IORedisModule | undefined) => {\n          if (module === undefined) return;\n          const moduleExports = module[Symbol.toStringTag] === 'Module' && module.default ? module.default : module;\n          this._unwrap(moduleExports.prototype, 'sendCommand');\n          this._unwrap(moduleExports.prototype, 'connect');\n        },\n      ),\n    ];\n  }\n\n  private _patchSendCommand() {\n    const instrumentation = this;\n    return (original: (...args: unknown[]) => unknown) => {\n      return function (this: RedisClient, ...args: unknown[]): unknown {\n        const cmd = args[0] as RedisCommand | undefined;\n        // ioredis only creates a span when there is an active parent span\n        // (the upstream `requireParentSpan` default, which Sentry never overrides).\n        if (args.length < 1 || typeof cmd !== 'object' || !getActiveSpan()) {\n          return original.apply(this, args);\n        }\n\n        const { host, port } = this.options;\n        const attributes: SpanAttributes = {\n          [ATTR_DB_SYSTEM]: DB_SYSTEM_VALUE_REDIS,\n          [ATTR_DB_STATEMENT]: defaultDbStatementSerializer(cmd.name, cmd.args),\n          [ATTR_DB_CONNECTION_STRING]: `redis://${host}:${port}`,\n          [ATTR_NET_PEER_NAME]: host,\n          [ATTR_NET_PEER_PORT]: port,\n          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,\n        };\n\n        const span = startInactiveSpan({ name: cmd.name, kind: SPAN_KIND.CLIENT, attributes });\n\n        try {\n          const result = original.apply(this, args);\n          const origResolve = cmd.resolve;\n          cmd.resolve = function (response: unknown): void {\n            instrumentation._callResponseHook(span, cmd, response);\n            endSpan(span, null);\n            origResolve(response);\n          };\n          const origReject = cmd.reject;\n          cmd.reject = function (err: Error): void {\n            endSpan(span, err);\n            origReject(err);\n          };\n          return result;\n        } catch (error) {\n          endSpan(span, error as Error);\n          throw error;\n        }\n      };\n    };\n  }\n\n  private _patchConnection() {\n    return (original: (...args: unknown[]) => unknown) => {\n      return function (this: RedisClient, ...args: unknown[]): unknown {\n        if (!getActiveSpan()) {\n          return original.apply(this, args);\n        }\n\n        const { host, port } = this.options;\n        const attributes: SpanAttributes = {\n          [ATTR_DB_SYSTEM]: DB_SYSTEM_VALUE_REDIS,\n          [ATTR_DB_STATEMENT]: 'connect',\n          [ATTR_DB_CONNECTION_STRING]: `redis://${host}:${port}`,\n          [ATTR_NET_PEER_NAME]: host,\n          [ATTR_NET_PEER_PORT]: port,\n          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,\n        };\n\n        const span = startInactiveSpan({ name: 'connect', kind: SPAN_KIND.CLIENT, attributes });\n\n        try {\n          const result = original.apply(this, args) as Promise<unknown> | undefined;\n          if (result instanceof Promise) {\n            return result.then(\n              (value: unknown) => {\n                endSpan(span, null);\n                return value;\n              },\n              (error: Error) => {\n                endSpan(span, error);\n                return Promise.reject(error);\n              },\n            );\n          }\n          endSpan(span, null);\n          return result;\n        } catch (error) {\n          endSpan(span, error as Error);\n          throw error;\n        }\n      };\n    };\n  }\n\n  private _callResponseHook(span: Span, cmd: RedisCommand, response: unknown): void {\n    const { responseHook } = this.getConfig();\n    if (!responseHook) {\n      return;\n    }\n    try {\n      responseHook(span, cmd.name, cmd.args, response);\n    } catch {\n      // ignore errors thrown from the user-provided response hook\n    }\n  }\n}\n"],"names":["SPAN_STATUS_ERROR","InstrumentationBase","SDK_VERSION","InstrumentationNodeModuleDefinition","isWrapped","getActiveSpan","ATTR_DB_SYSTEM","DB_SYSTEM_VALUE_REDIS","ATTR_DB_STATEMENT","defaultDbStatementSerializer","ATTR_DB_CONNECTION_STRING","ATTR_NET_PEER_NAME","ATTR_NET_PEER_PORT","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","startInactiveSpan","SPAN_KIND"],"mappings":";;;;;;;AAgCA,MAAM,YAAA,GAAe,iCAAA;AACrB,MAAM,MAAA,GAAS,oBAAA;AAIf,MAAM,kBAAA,GAAqB,CAAC,iBAAiB,CAAA;AA+B7C,SAAS,OAAA,CAAQ,MAAY,GAAA,EAAqC;AAChE,EAAA,IAAI,GAAA,EAAK;AACP,IAAA,IAAA,CAAK,UAAU,EAAE,IAAA,EAAMA,wBAAmB,OAAA,EAAS,GAAA,CAAI,SAAS,CAAA;AAAA,EAClE;AACA,EAAA,IAAA,CAAK,GAAA,EAAI;AACX;AAEO,MAAM,+BAA+BC,mCAAA,CAAkD;AAAA,EACrF,WAAA,CAAY,MAAA,GAAuC,EAAC,EAAG;AAC5D,IAAA,KAAA,CAAM,YAAA,EAAcC,kBAAa,MAAM,CAAA;AAAA,EACzC;AAAA,EAEU,IAAA,GAA8C;AACtD,IAAA,OAAO;AAAA,MACL,IAAIC,mDAAA;AAAA,QACF,SAAA;AAAA,QACA,kBAAA;AAAA,QACA,CAAC,MAAA,KAA0B;AACzB,UAAA,MAAM,aAAA,GAAgB,OAAO,MAAA,CAAO,WAAW,MAAM,QAAA,IAAY,MAAA,CAAO,OAAA,GAAU,MAAA,CAAO,OAAA,GAAU,MAAA;AACnG,UAAA,IAAIC,yBAAA,CAAU,aAAA,CAAc,SAAA,CAAU,WAAW,CAAA,EAAG;AAClD,YAAA,IAAA,CAAK,OAAA,CAAQ,aAAA,CAAc,SAAA,EAAW,aAAa,CAAA;AAAA,UACrD;AACA,UAAA,IAAA,CAAK,MAAM,aAAA,CAAc,SAAA,EAAW,aAAA,EAAe,IAAA,CAAK,mBAAmB,CAAA;AAC3E,UAAA,IAAIA,yBAAA,CAAU,aAAA,CAAc,SAAA,CAAU,OAAO,CAAA,EAAG;AAC9C,YAAA,IAAA,CAAK,OAAA,CAAQ,aAAA,CAAc,SAAA,EAAW,SAAS,CAAA;AAAA,UACjD;AACA,UAAA,IAAA,CAAK,MAAM,aAAA,CAAc,SAAA,EAAW,SAAA,EAAW,IAAA,CAAK,kBAAkB,CAAA;AACtE,UAAA,OAAO,MAAA;AAAA,QACT,CAAA;AAAA,QACA,CAAC,MAAA,KAAsC;AACrC,UAAA,IAAI,WAAW,MAAA,EAAW;AAC1B,UAAA,MAAM,aAAA,GAAgB,OAAO,MAAA,CAAO,WAAW,MAAM,QAAA,IAAY,MAAA,CAAO,OAAA,GAAU,MAAA,CAAO,OAAA,GAAU,MAAA;AACnG,UAAA,IAAA,CAAK,OAAA,CAAQ,aAAA,CAAc,SAAA,EAAW,aAAa,CAAA;AACnD,UAAA,IAAA,CAAK,OAAA,CAAQ,aAAA,CAAc,SAAA,EAAW,SAAS,CAAA;AAAA,QACjD;AAAA;AACF,KACF;AAAA,EACF;AAAA,EAEQ,iBAAA,GAAoB;AAC1B,IAAA,MAAM,eAAA,GAAkB,IAAA;AACxB,IAAA,OAAO,CAAC,QAAA,KAA8C;AACpD,MAAA,OAAO,YAAgC,IAAA,EAA0B;AAC/D,QAAA,MAAM,GAAA,GAAM,KAAK,CAAC,CAAA;AAGlB,QAAA,IAAI,IAAA,CAAK,SAAS,CAAA,IAAK,OAAO,QAAQ,QAAA,IAAY,CAACC,oBAAc,EAAG;AAClE,UAAA,OAAO,QAAA,CAAS,KAAA,CAAM,IAAA,EAAM,IAAI,CAAA;AAAA,QAClC;AAEA,QAAA,MAAM,EAAE,IAAA,EAAM,IAAA,EAAK,GAAI,IAAA,CAAK,OAAA;AAC5B,QAAA,MAAM,UAAA,GAA6B;AAAA,UACjC,CAACC,sBAAc,GAAGC,6BAAA;AAAA,UAClB,CAACC,yBAAiB,GAAGC,yCAA6B,GAAA,CAAI,IAAA,EAAM,IAAI,IAAI,CAAA;AAAA,UACpE,CAACC,iCAAyB,GAAG,CAAA,QAAA,EAAW,IAAI,IAAI,IAAI,CAAA,CAAA;AAAA,UACpD,CAACC,0BAAkB,GAAG,IAAA;AAAA,UACtB,CAACC,0BAAkB,GAAG,IAAA;AAAA,UACtB,CAACC,qCAAgC,GAAG;AAAA,SACtC;AAEA,QAAA,MAAM,IAAA,GAAOC,sBAAA,CAAkB,EAAE,IAAA,EAAM,GAAA,CAAI,MAAM,IAAA,EAAMC,cAAA,CAAU,MAAA,EAAQ,UAAA,EAAY,CAAA;AAErF,QAAA,IAAI;AACF,UAAA,MAAM,MAAA,GAAS,QAAA,CAAS,KAAA,CAAM,IAAA,EAAM,IAAI,CAAA;AACxC,UAAA,MAAM,cAAc,GAAA,CAAI,OAAA;AACxB,UAAA,GAAA,CAAI,OAAA,GAAU,SAAU,QAAA,EAAyB;AAC/C,YAAA,eAAA,CAAgB,iBAAA,CAAkB,IAAA,EAAM,GAAA,EAAK,QAAQ,CAAA;AACrD,YAAA,OAAA,CAAQ,MAAM,IAAI,CAAA;AAClB,YAAA,WAAA,CAAY,QAAQ,CAAA;AAAA,UACtB,CAAA;AACA,UAAA,MAAM,aAAa,GAAA,CAAI,MAAA;AACvB,UAAA,GAAA,CAAI,MAAA,GAAS,SAAU,GAAA,EAAkB;AACvC,YAAA,OAAA,CAAQ,MAAM,GAAG,CAAA;AACjB,YAAA,UAAA,CAAW,GAAG,CAAA;AAAA,UAChB,CAAA;AACA,UAAA,OAAO,MAAA;AAAA,QACT,SAAS,KAAA,EAAO;AACd,UAAA,OAAA,CAAQ,MAAM,KAAc,CAAA;AAC5B,UAAA,MAAM,KAAA;AAAA,QACR;AAAA,MACF,CAAA;AAAA,IACF,CAAA;AAAA,EACF;AAAA,EAEQ,gBAAA,GAAmB;AACzB,IAAA,OAAO,CAAC,QAAA,KAA8C;AACpD,MAAA,OAAO,YAAgC,IAAA,EAA0B;AAC/D,QAAA,IAAI,CAACV,oBAAc,EAAG;AACpB,UAAA,OAAO,QAAA,CAAS,KAAA,CAAM,IAAA,EAAM,IAAI,CAAA;AAAA,QAClC;AAEA,QAAA,MAAM,EAAE,IAAA,EAAM,IAAA,EAAK,GAAI,IAAA,CAAK,OAAA;AAC5B,QAAA,MAAM,UAAA,GAA6B;AAAA,UACjC,CAACC,sBAAc,GAAGC,6BAAA;AAAA,UAClB,CAACC,yBAAiB,GAAG,SAAA;AAAA,UACrB,CAACE,iCAAyB,GAAG,CAAA,QAAA,EAAW,IAAI,IAAI,IAAI,CAAA,CAAA;AAAA,UACpD,CAACC,0BAAkB,GAAG,IAAA;AAAA,UACtB,CAACC,0BAAkB,GAAG,IAAA;AAAA,UACtB,CAACC,qCAAgC,GAAG;AAAA,SACtC;AAEA,QAAA,MAAM,IAAA,GAAOC,uBAAkB,EAAE,IAAA,EAAM,WAAW,IAAA,EAAMC,cAAA,CAAU,MAAA,EAAQ,UAAA,EAAY,CAAA;AAEtF,QAAA,IAAI;AACF,UAAA,MAAM,MAAA,GAAS,QAAA,CAAS,KAAA,CAAM,IAAA,EAAM,IAAI,CAAA;AACxC,UAAA,IAAI,kBAAkB,OAAA,EAAS;AAC7B,YAAA,OAAO,MAAA,CAAO,IAAA;AAAA,cACZ,CAAC,KAAA,KAAmB;AAClB,gBAAA,OAAA,CAAQ,MAAM,IAAI,CAAA;AAClB,gBAAA,OAAO,KAAA;AAAA,cACT,CAAA;AAAA,cACA,CAAC,KAAA,KAAiB;AAChB,gBAAA,OAAA,CAAQ,MAAM,KAAK,CAAA;AACnB,gBAAA,OAAO,OAAA,CAAQ,OAAO,KAAK,CAAA;AAAA,cAC7B;AAAA,aACF;AAAA,UACF;AACA,UAAA,OAAA,CAAQ,MAAM,IAAI,CAAA;AAClB,UAAA,OAAO,MAAA;AAAA,QACT,SAAS,KAAA,EAAO;AACd,UAAA,OAAA,CAAQ,MAAM,KAAc,CAAA;AAC5B,UAAA,MAAM,KAAA;AAAA,QACR;AAAA,MACF,CAAA;AAAA,IACF,CAAA;AAAA,EACF;AAAA,EAEQ,iBAAA,CAAkB,IAAA,EAAY,GAAA,EAAmB,QAAA,EAAyB;AAChF,IAAA,MAAM,EAAE,YAAA,EAAa,GAAI,IAAA,CAAK,SAAA,EAAU;AACxC,IAAA,IAAI,CAAC,YAAA,EAAc;AACjB,MAAA;AAAA,IACF;AACA,IAAA,IAAI;AACF,MAAA,YAAA,CAAa,IAAA,EAAM,GAAA,CAAI,IAAA,EAAM,GAAA,CAAI,MAAM,QAAQ,CAAA;AAAA,IACjD,CAAA,CAAA,MAAQ;AAAA,IAER;AAAA,EACF;AACF;;;;"}
+{"version":3,"file":"ioredis-instrumentation.js","sources":["../../../../../../src/integrations/tracing/redis/vendored/ioredis-instrumentation.ts"],"sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n * SPDX-License-Identifier: Apache-2.0\n *\n * NOTICE from the Sentry authors:\n * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/instrumentation-ioredis-v0.62.0/packages/instrumentation-ioredis\n * - Upstream version: @opentelemetry/instrumentation-ioredis@0.62.0\n * - Minor TypeScript adjustments for this repository's compiler settings\n * - Refactored to use Sentry's span APIs instead of OpenTelemetry tracing APIs\n */\n\nimport { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';\nimport type { Span, SpanAttributes } from '@sentry/core';\nimport {\n  getActiveSpan,\n  SDK_VERSION,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SPAN_KIND,\n  SPAN_STATUS_ERROR,\n  startInactiveSpan,\n} from '@sentry/core';\nimport { DB_STATEMENT, DB_SYSTEM, NET_PEER_NAME, NET_PEER_PORT } from '@sentry/conventions/attributes';\nimport { defaultDbStatementSerializer } from '@sentry/server-utils';\nimport { ATTR_DB_CONNECTION_STRING, DB_SYSTEM_VALUE_REDIS } from './semconv';\nimport type { IORedisInstrumentationConfig } from './types';\n\nconst PACKAGE_NAME = '@sentry/instrumentation-ioredis';\nconst ORIGIN = 'auto.db.otel.redis';\n\n// ioredis >= 5.11.0 publishes via diagnostics_channel, which Sentry subscribes\n// to separately, so this monkey-patching instrumentation only covers < 5.11.0.\nconst SUPPORTED_VERSIONS = ['>=2.0.0 <5.11.0'];\n\n// The raw imported `ioredis` module is either the CommonJS export or an ESM\n// namespace wrapping it on `.default`. Typed shallowly since it is only used\n// internally to reach the `Redis` prototype that holds the methods we patch.\ntype IORedisModule = {\n  default?: { prototype: RedisPrototype };\n  prototype: RedisPrototype;\n  [Symbol.toStringTag]?: string;\n};\n\ninterface RedisPrototype {\n  sendCommand: (...args: unknown[]) => unknown;\n  connect: (...args: unknown[]) => unknown;\n}\n\n// The `this` of the patched methods is a Redis client instance exposing its\n// connection options.\ninterface RedisClient {\n  options: { host?: string; port?: number };\n}\n\n// The in-flight command object ioredis passes to `sendCommand`. We swap its\n// `resolve`/`reject` so the span ends when the command settles.\ninterface RedisCommand {\n  name: string;\n  args: Array<string | Buffer>;\n  resolve: (result: unknown) => void;\n  reject: (err: Error) => void;\n}\n\nfunction endSpan(span: Span, err: Error | null | undefined): void {\n  if (err) {\n    span.setStatus({ code: SPAN_STATUS_ERROR, message: err.message });\n  }\n  span.end();\n}\n\nexport class IORedisInstrumentation extends InstrumentationBase<IORedisInstrumentationConfig> {\n  public constructor(config: IORedisInstrumentationConfig = {}) {\n    super(PACKAGE_NAME, SDK_VERSION, config);\n  }\n\n  protected init(): InstrumentationNodeModuleDefinition[] {\n    return [\n      new InstrumentationNodeModuleDefinition(\n        'ioredis',\n        SUPPORTED_VERSIONS,\n        (module: IORedisModule) => {\n          const moduleExports = module[Symbol.toStringTag] === 'Module' && module.default ? module.default : module;\n          if (isWrapped(moduleExports.prototype.sendCommand)) {\n            this._unwrap(moduleExports.prototype, 'sendCommand');\n          }\n          this._wrap(moduleExports.prototype, 'sendCommand', this._patchSendCommand());\n          if (isWrapped(moduleExports.prototype.connect)) {\n            this._unwrap(moduleExports.prototype, 'connect');\n          }\n          this._wrap(moduleExports.prototype, 'connect', this._patchConnection());\n          return module;\n        },\n        (module: IORedisModule | undefined) => {\n          if (module === undefined) return;\n          const moduleExports = module[Symbol.toStringTag] === 'Module' && module.default ? module.default : module;\n          this._unwrap(moduleExports.prototype, 'sendCommand');\n          this._unwrap(moduleExports.prototype, 'connect');\n        },\n      ),\n    ];\n  }\n\n  private _patchSendCommand() {\n    const instrumentation = this;\n    return (original: (...args: unknown[]) => unknown) => {\n      return function (this: RedisClient, ...args: unknown[]): unknown {\n        const cmd = args[0] as RedisCommand | undefined;\n        // ioredis only creates a span when there is an active parent span\n        // (the upstream `requireParentSpan` default, which Sentry never overrides).\n        if (args.length < 1 || typeof cmd !== 'object' || !getActiveSpan()) {\n          return original.apply(this, args);\n        }\n\n        const { host, port } = this.options;\n        const attributes: SpanAttributes = {\n          // oxlint-disable-next-line typescript/no-deprecated\n          [DB_SYSTEM]: DB_SYSTEM_VALUE_REDIS,\n          // oxlint-disable-next-line typescript/no-deprecated\n          [DB_STATEMENT]: defaultDbStatementSerializer(cmd.name, cmd.args),\n          [ATTR_DB_CONNECTION_STRING]: `redis://${host}:${port}`,\n          // oxlint-disable-next-line typescript/no-deprecated\n          [NET_PEER_NAME]: host,\n          // oxlint-disable-next-line typescript/no-deprecated\n          [NET_PEER_PORT]: port,\n          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,\n        };\n\n        const span = startInactiveSpan({ name: cmd.name, kind: SPAN_KIND.CLIENT, attributes });\n\n        try {\n          const result = original.apply(this, args);\n          const origResolve = cmd.resolve;\n          cmd.resolve = function (response: unknown): void {\n            instrumentation._callResponseHook(span, cmd, response);\n            endSpan(span, null);\n            origResolve(response);\n          };\n          const origReject = cmd.reject;\n          cmd.reject = function (err: Error): void {\n            endSpan(span, err);\n            origReject(err);\n          };\n          return result;\n        } catch (error) {\n          endSpan(span, error as Error);\n          throw error;\n        }\n      };\n    };\n  }\n\n  private _patchConnection() {\n    return (original: (...args: unknown[]) => unknown) => {\n      return function (this: RedisClient, ...args: unknown[]): unknown {\n        if (!getActiveSpan()) {\n          return original.apply(this, args);\n        }\n\n        const { host, port } = this.options;\n        const attributes: SpanAttributes = {\n          // oxlint-disable-next-line typescript/no-deprecated\n          [DB_SYSTEM]: DB_SYSTEM_VALUE_REDIS,\n          // oxlint-disable-next-line typescript/no-deprecated\n          [DB_STATEMENT]: 'connect',\n          [ATTR_DB_CONNECTION_STRING]: `redis://${host}:${port}`,\n          // oxlint-disable-next-line typescript/no-deprecated\n          [NET_PEER_NAME]: host,\n          // oxlint-disable-next-line typescript/no-deprecated\n          [NET_PEER_PORT]: port,\n          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,\n        };\n\n        const span = startInactiveSpan({ name: 'connect', kind: SPAN_KIND.CLIENT, attributes });\n\n        try {\n          const result = original.apply(this, args) as Promise<unknown> | undefined;\n          if (result instanceof Promise) {\n            return result.then(\n              (value: unknown) => {\n                endSpan(span, null);\n                return value;\n              },\n              (error: Error) => {\n                endSpan(span, error);\n                return Promise.reject(error);\n              },\n            );\n          }\n          endSpan(span, null);\n          return result;\n        } catch (error) {\n          endSpan(span, error as Error);\n          throw error;\n        }\n      };\n    };\n  }\n\n  private _callResponseHook(span: Span, cmd: RedisCommand, response: unknown): void {\n    const { responseHook } = this.getConfig();\n    if (!responseHook) {\n      return;\n    }\n    try {\n      responseHook(span, cmd.name, cmd.args, response);\n    } catch {\n      // ignore errors thrown from the user-provided response hook\n    }\n  }\n}\n"],"names":["SPAN_STATUS_ERROR","InstrumentationBase","SDK_VERSION","InstrumentationNodeModuleDefinition","isWrapped","getActiveSpan","attributes","DB_SYSTEM","DB_SYSTEM_VALUE_REDIS","DB_STATEMENT","defaultDbStatementSerializer","ATTR_DB_CONNECTION_STRING","NET_PEER_NAME","NET_PEER_PORT","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","startInactiveSpan","SPAN_KIND"],"mappings":"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"}

package/build/cjs/integrations/tracing/redis/vendored/redis-instrumentation.js

@@ -2,9 +2,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const instrumentation = require('@opentelemetry/instrumentation');
 const core = require('@sentry/core');
+const attributes = require('@sentry/conventions/attributes');
+const serverUtils = require('@sentry/server-utils');
 const debugBuild = require('../../../../debug-build.js');
 const InstrumentationNodeModuleFile = require('../../InstrumentationNodeModuleFile.js');
-const redisCommon = require('./redis-common.js');
 const semconv = require('./semconv.js');
 
 const PACKAGE_NAME = "@sentry/instrumentation-redis";
@@ -43,9 +44,12 @@ function removeCredentialsFromDBConnectionStringAttribute(url) {
 }
 function getClientAttributes(options) {
   return {
-    [semconv.ATTR_DB_SYSTEM]: semconv.DB_SYSTEM_VALUE_REDIS,
-    [semconv.ATTR_NET_PEER_NAME]: options?.socket?.host,
-    [semconv.ATTR_NET_PEER_PORT]: options?.socket?.port,
+    // oxlint-disable-next-line typescript/no-deprecated
+    [attributes.DB_SYSTEM]: semconv.DB_SYSTEM_VALUE_REDIS,
+    // oxlint-disable-next-line typescript/no-deprecated
+    [attributes.NET_PEER_NAME]: options?.socket?.host,
+    // oxlint-disable-next-line typescript/no-deprecated
+    [attributes.NET_PEER_PORT]: options?.socket?.port,
     [semconv.ATTR_DB_CONNECTION_STRING]: removeCredentialsFromDBConnectionStringAttribute(options?.url),
     [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN
   };
@@ -80,22 +84,24 @@ const _RedisInstrumentationV2_V3 = class _RedisInstrumentationV2_V3 extends inst
         if (arguments.length !== 1 || typeof cmd !== "object") {
           return original.apply(this, arguments);
         }
-        const attributes = {
-          [semconv.ATTR_DB_SYSTEM]: semconv.DB_SYSTEM_VALUE_REDIS,
-          [semconv.ATTR_DB_STATEMENT]: redisCommon.defaultDbStatementSerializer(cmd.command, cmd.args),
+        const attributes$1 = {
+          // oxlint-disable-next-line typescript/no-deprecated
+          [attributes.DB_SYSTEM]: semconv.DB_SYSTEM_VALUE_REDIS,
+          // oxlint-disable-next-line typescript/no-deprecated
+          [attributes.DB_STATEMENT]: serverUtils.defaultDbStatementSerializer(cmd.command, cmd.args),
           [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN
         };
         if (this.connection_options) {
-          attributes[semconv.ATTR_NET_PEER_NAME] = this.connection_options.host;
-          attributes[semconv.ATTR_NET_PEER_PORT] = this.connection_options.port;
+          attributes$1[attributes.NET_PEER_NAME] = this.connection_options.host;
+          attributes$1[attributes.NET_PEER_PORT] = this.connection_options.port;
         }
         if (this.address) {
-          attributes[semconv.ATTR_DB_CONNECTION_STRING] = `redis://${this.address}`;
+          attributes$1[semconv.ATTR_DB_CONNECTION_STRING] = `redis://${this.address}`;
         }
         const span = core.startInactiveSpan({
           name: `${_RedisInstrumentationV2_V3.COMPONENT}-${cmd.command}`,
           kind: core.SPAN_KIND.CLIENT,
-          attributes
+          attributes: attributes$1
         });
         const originalCallback = arguments[0].callback;
         if (originalCallback) {
@@ -332,15 +338,15 @@ const _RedisInstrumentationV4_V5 = class _RedisInstrumentationV4_V5 extends inst
     const clientOptions = origThis.options || origThis[MULTI_COMMAND_OPTIONS];
     const commandName = redisCommandArguments[0];
     const commandArgs = redisCommandArguments.slice(1);
-    const attributes = getClientAttributes(clientOptions);
-    const dbStatement = redisCommon.defaultDbStatementSerializer(commandName, commandArgs);
+    const attributes$1 = getClientAttributes(clientOptions);
+    const dbStatement = serverUtils.defaultDbStatementSerializer(commandName, commandArgs);
     if (dbStatement != null) {
-      attributes[semconv.ATTR_DB_STATEMENT] = dbStatement;
+      attributes$1[attributes.DB_STATEMENT] = dbStatement;
     }
     const span = core.startInactiveSpan({
       name: `${_RedisInstrumentationV4_V5.COMPONENT}-${commandName}`,
       kind: core.SPAN_KIND.CLIENT,
-      attributes
+      attributes: attributes$1
     });
     const res = core.withActiveSpan(span, () => origFunction.apply(origThis, origArguments));
     if (res instanceof Promise) {