@sentry/node 10.53.0 → 10.54.0

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

@@ -5,176 +5,122 @@ import { ATTR_DB_QUERY_TEXT, ATTR_DB_OPERATION_NAME, ATTR_DB_SYSTEM_NAME, ATTR_S
 import { defaultDbStatementSerializer } from './redis-common.js';
 import { DB_SYSTEM_VALUE_REDIS, ATTR_DB_STATEMENT, ATTR_DB_SYSTEM, DB_SYSTEM_NAME_VALUE_REDIS, ATTR_NET_PEER_PORT, ATTR_NET_PEER_NAME, ATTR_DB_CONNECTION_STRING } from './semconv.js';
 
-/*
- * Copyright The OpenTelemetry Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * NOTICE from the Sentry authors:
- * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/instrumentation-redis-v0.62.0/packages/instrumentation-redis
- * - Upstream version: @opentelemetry/instrumentation-redis@0.62.0
- * - Minor TypeScript adjustments for this repository's compiler settings
- */
-/* eslint-disable -- vendored @opentelemetry/instrumentation-redis */
-
-
-const PACKAGE_NAME = '@opentelemetry/instrumentation-redis';
-const PACKAGE_VERSION = '0.62.0';
-
-// ---- Internal types ----
-
-const OTEL_OPEN_SPANS = Symbol('opentelemetry.instrumentation.redis.open_spans');
-const MULTI_COMMAND_OPTIONS = Symbol('opentelemetry.instrumentation.redis.multi_command_options');
-
-// ---- v4-v5 utils ----
-
-function removeCredentialsFromDBConnectionStringAttribute(
-  diagLogger,
-  url,
-) {
-  if (typeof url !== 'string' || !url) {
-    return undefined;
+const PACKAGE_NAME = "@opentelemetry/instrumentation-redis";
+const PACKAGE_VERSION = "0.62.0";
+const OTEL_OPEN_SPANS = /* @__PURE__ */ Symbol("opentelemetry.instrumentation.redis.open_spans");
+const MULTI_COMMAND_OPTIONS = /* @__PURE__ */ Symbol("opentelemetry.instrumentation.redis.multi_command_options");
+function removeCredentialsFromDBConnectionStringAttribute(diagLogger, url) {
+  if (typeof url !== "string" || !url) {
+    return void 0;
   }
   try {
     const u = new URL(url);
-    u.searchParams.delete('user_pwd');
-    u.username = '';
-    u.password = '';
+    u.searchParams.delete("user_pwd");
+    u.username = "";
+    u.password = "";
     return u.href;
   } catch (err) {
-    diagLogger.error('failed to sanitize redis connection url', err);
+    diagLogger.error("failed to sanitize redis connection url", err);
   }
-  return undefined;
+  return void 0;
 }
-
-function getClientAttributes(
-  diagLogger,
-  options,
-  semconvStability,
-) {
+function getClientAttributes(diagLogger, options, semconvStability) {
   const attributes = {};
   if (semconvStability & SemconvStability.OLD) {
     Object.assign(attributes, {
       [ATTR_DB_SYSTEM]: DB_SYSTEM_VALUE_REDIS,
       [ATTR_NET_PEER_NAME]: options?.socket?.host,
       [ATTR_NET_PEER_PORT]: options?.socket?.port,
-      [ATTR_DB_CONNECTION_STRING]: removeCredentialsFromDBConnectionStringAttribute(diagLogger, options?.url),
+      [ATTR_DB_CONNECTION_STRING]: removeCredentialsFromDBConnectionStringAttribute(diagLogger, options?.url)
     });
   }
   if (semconvStability & SemconvStability.STABLE) {
     Object.assign(attributes, {
       [ATTR_DB_SYSTEM_NAME]: DB_SYSTEM_NAME_VALUE_REDIS,
       [ATTR_SERVER_ADDRESS]: options?.socket?.host,
-      [ATTR_SERVER_PORT]: options?.socket?.port,
+      [ATTR_SERVER_PORT]: options?.socket?.port
     });
   }
   return attributes;
 }
-
-// ---- v2-v3 utils ----
-
 function endSpanV2(span, err) {
   if (err) {
     span.setStatus({
       code: SpanStatusCode.ERROR,
-      message: err.message,
+      message: err.message
     });
   }
   span.end();
 }
-
 function getTracedCreateClient(original) {
   return function createClientTrace() {
     const client = original.apply(this, arguments);
     return context.bind(context.active(), client);
   };
 }
-
 function getTracedCreateStreamTrace(original) {
   return function create_stream_trace() {
-    if (!Object.prototype.hasOwnProperty.call(this, 'stream')) {
-      Object.defineProperty(this, 'stream', {
+    if (!Object.prototype.hasOwnProperty.call(this, "stream")) {
+      Object.defineProperty(this, "stream", {
         get() {
           return this._patched_redis_stream;
         },
         set(val) {
           context.bind(context.active(), val);
           this._patched_redis_stream = val;
-        },
+        }
       });
     }
     return original.apply(this, arguments);
   };
 }
-
-// ---- RedisInstrumentationV2_V3 ----
-
-class RedisInstrumentationV2_V3 extends InstrumentationBase {
-  static __initStatic() {this.COMPONENT = 'redis';}
-
+const _RedisInstrumentationV2_V3 = class _RedisInstrumentationV2_V3 extends InstrumentationBase {
   constructor(config = {}) {
     super(PACKAGE_NAME, PACKAGE_VERSION, config);
-    this._semconvStability = config.semconvStability
-      ? config.semconvStability
-      : semconvStabilityFromStr('database', process.env['OTEL_SEMCONV_STABILITY_OPT_IN']);
+    this._semconvStability = config.semconvStability ? config.semconvStability : semconvStabilityFromStr("database", process.env["OTEL_SEMCONV_STABILITY_OPT_IN"]);
   }
-
-   setConfig(config = {}) {
+  setConfig(config = {}) {
     super.setConfig(config);
-    this._semconvStability = config.semconvStability
-      ? config.semconvStability
-      : semconvStabilityFromStr('database', process.env['OTEL_SEMCONV_STABILITY_OPT_IN']);
+    this._semconvStability = config.semconvStability ? config.semconvStability : semconvStabilityFromStr("database", process.env["OTEL_SEMCONV_STABILITY_OPT_IN"]);
   }
-
   init() {
     return [
       new InstrumentationNodeModuleDefinition(
-        'redis',
-        ['>=2.6.0 <4'],
+        "redis",
+        [">=2.6.0 <4"],
         (moduleExports) => {
-          if (isWrapped(moduleExports.RedisClient.prototype['internal_send_command'])) {
-            this._unwrap(moduleExports.RedisClient.prototype, 'internal_send_command');
+          if (isWrapped(moduleExports.RedisClient.prototype["internal_send_command"])) {
+            this._unwrap(moduleExports.RedisClient.prototype, "internal_send_command");
           }
-          this._wrap(moduleExports.RedisClient.prototype, 'internal_send_command', this._getPatchInternalSendCommand());
-          if (isWrapped(moduleExports.RedisClient.prototype['create_stream'])) {
-            this._unwrap(moduleExports.RedisClient.prototype, 'create_stream');
+          this._wrap(moduleExports.RedisClient.prototype, "internal_send_command", this._getPatchInternalSendCommand());
+          if (isWrapped(moduleExports.RedisClient.prototype["create_stream"])) {
+            this._unwrap(moduleExports.RedisClient.prototype, "create_stream");
           }
-          this._wrap(moduleExports.RedisClient.prototype, 'create_stream', this._getPatchCreateStream());
+          this._wrap(moduleExports.RedisClient.prototype, "create_stream", this._getPatchCreateStream());
           if (isWrapped(moduleExports.createClient)) {
-            this._unwrap(moduleExports, 'createClient');
+            this._unwrap(moduleExports, "createClient");
           }
-          this._wrap(moduleExports, 'createClient', this._getPatchCreateClient());
+          this._wrap(moduleExports, "createClient", this._getPatchCreateClient());
           return moduleExports;
         },
         (moduleExports) => {
-          if (moduleExports === undefined) return;
-          this._unwrap(moduleExports.RedisClient.prototype, 'internal_send_command');
-          this._unwrap(moduleExports.RedisClient.prototype, 'create_stream');
-          this._unwrap(moduleExports, 'createClient');
-        },
-      ),
+          if (moduleExports === void 0) return;
+          this._unwrap(moduleExports.RedisClient.prototype, "internal_send_command");
+          this._unwrap(moduleExports.RedisClient.prototype, "create_stream");
+          this._unwrap(moduleExports, "createClient");
+        }
+      )
     ];
   }
-
-   _getPatchInternalSendCommand() {
+  _getPatchInternalSendCommand() {
     const instrumentation = this;
     return function internal_send_command(original) {
-      return function internal_send_command_trace( cmd) {
-        if (arguments.length !== 1 || typeof cmd !== 'object') {
+      return function internal_send_command_trace(cmd) {
+        if (arguments.length !== 1 || typeof cmd !== "object") {
           return original.apply(this, arguments);
         }
         const config = instrumentation.getConfig();
-        const hasNoParentSpan = trace.getSpan(context.active()) === undefined;
+        const hasNoParentSpan = trace.getSpan(context.active()) === void 0;
         if (config.requireParentSpan === true && hasNoParentSpan) {
           return original.apply(this, arguments);
         }
@@ -183,33 +129,33 @@ class RedisInstrumentationV2_V3 extends InstrumentationBase {
         if (instrumentation._semconvStability & SemconvStability.OLD) {
           Object.assign(attributes, {
             [ATTR_DB_SYSTEM]: DB_SYSTEM_VALUE_REDIS,
-            [ATTR_DB_STATEMENT]: dbStatementSerializer(cmd.command, cmd.args),
+            [ATTR_DB_STATEMENT]: dbStatementSerializer(cmd.command, cmd.args)
           });
         }
         if (instrumentation._semconvStability & SemconvStability.STABLE) {
           Object.assign(attributes, {
             [ATTR_DB_SYSTEM_NAME]: DB_SYSTEM_NAME_VALUE_REDIS,
             [ATTR_DB_OPERATION_NAME]: cmd.command,
-            [ATTR_DB_QUERY_TEXT]: dbStatementSerializer(cmd.command, cmd.args),
+            [ATTR_DB_QUERY_TEXT]: dbStatementSerializer(cmd.command, cmd.args)
           });
         }
-        attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] = 'auto.db.otel.redis';
-        const span = instrumentation.tracer.startSpan(`${RedisInstrumentationV2_V3.COMPONENT}-${cmd.command}`, {
+        attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] = "auto.db.otel.redis";
+        const span = instrumentation.tracer.startSpan(`${_RedisInstrumentationV2_V3.COMPONENT}-${cmd.command}`, {
           kind: SpanKind.CLIENT,
-          attributes,
+          attributes
         });
         if (this.connection_options) {
           const connectionAttributes = {};
           if (instrumentation._semconvStability & SemconvStability.OLD) {
             Object.assign(connectionAttributes, {
               [ATTR_NET_PEER_NAME]: this.connection_options.host,
-              [ATTR_NET_PEER_PORT]: this.connection_options.port,
+              [ATTR_NET_PEER_PORT]: this.connection_options.port
             });
           }
           if (instrumentation._semconvStability & SemconvStability.STABLE) {
             Object.assign(connectionAttributes, {
               [ATTR_SERVER_ADDRESS]: this.connection_options.host,
-              [ATTR_SERVER_PORT]: this.connection_options.port,
+              [ATTR_SERVER_PORT]: this.connection_options.port
             });
           }
           span.setAttributes(connectionAttributes);
@@ -220,7 +166,7 @@ class RedisInstrumentationV2_V3 extends InstrumentationBase {
         const originalCallback = arguments[0].callback;
         if (originalCallback) {
           const originalContext = context.active();
-          arguments[0].callback = function callback( err, reply) {
+          arguments[0].callback = function callback(err, reply) {
             if (config?.responseHook) {
               const responseHook = config.responseHook;
               safeExecuteInTheMiddle(
@@ -229,10 +175,10 @@ class RedisInstrumentationV2_V3 extends InstrumentationBase {
                 },
                 (e) => {
                   if (e) {
-                    instrumentation._diag.error('Error executing responseHook', e);
+                    instrumentation._diag.error("Error executing responseHook", e);
                   }
                 },
-                true,
+                true
               );
             }
             endSpanV2(span, err);
@@ -242,63 +188,51 @@ class RedisInstrumentationV2_V3 extends InstrumentationBase {
         try {
           return original.apply(this, arguments);
         } catch (rethrow) {
-          endSpanV2(span, rethrow );
+          endSpanV2(span, rethrow);
           throw rethrow;
         }
       };
     };
   }
-
-   _getPatchCreateClient() {
+  _getPatchCreateClient() {
     return function createClient(original) {
       return getTracedCreateClient(original);
     };
   }
-
-   _getPatchCreateStream() {
+  _getPatchCreateStream() {
     return function createReadStream(original) {
       return getTracedCreateStreamTrace(original);
     };
   }
-} RedisInstrumentationV2_V3.__initStatic();
-
-// ---- RedisInstrumentationV4_V5 ----
-
-class RedisInstrumentationV4_V5 extends InstrumentationBase {
-  static __initStatic2() {this.COMPONENT = 'redis';}
-
+};
+_RedisInstrumentationV2_V3.COMPONENT = "redis";
+let RedisInstrumentationV2_V3 = _RedisInstrumentationV2_V3;
+const _RedisInstrumentationV4_V5 = class _RedisInstrumentationV4_V5 extends InstrumentationBase {
   constructor(config = {}) {
     super(PACKAGE_NAME, PACKAGE_VERSION, config);
-    this._semconvStability = config.semconvStability
-      ? config.semconvStability
-      : semconvStabilityFromStr('database', process.env['OTEL_SEMCONV_STABILITY_OPT_IN']);
+    this._semconvStability = config.semconvStability ? config.semconvStability : semconvStabilityFromStr("database", process.env["OTEL_SEMCONV_STABILITY_OPT_IN"]);
   }
-
-   setConfig(config = {}) {
+  setConfig(config = {}) {
     super.setConfig(config);
-    this._semconvStability = config.semconvStability
-      ? config.semconvStability
-      : semconvStabilityFromStr('database', process.env['OTEL_SEMCONV_STABILITY_OPT_IN']);
+    this._semconvStability = config.semconvStability ? config.semconvStability : semconvStabilityFromStr("database", process.env["OTEL_SEMCONV_STABILITY_OPT_IN"]);
   }
-
   init() {
     return [
-      this._getInstrumentationNodeModuleDefinition('@redis/client'),
-      this._getInstrumentationNodeModuleDefinition('@node-redis/client'),
+      this._getInstrumentationNodeModuleDefinition("@redis/client"),
+      this._getInstrumentationNodeModuleDefinition("@node-redis/client")
     ];
   }
-
-   _getInstrumentationNodeModuleDefinition(basePackageName) {
+  _getInstrumentationNodeModuleDefinition(basePackageName) {
     const commanderModuleFile = new InstrumentationNodeModuleFile(
       `${basePackageName}/dist/lib/commander.js`,
-      ['^1.0.0'],
+      ["^1.0.0"],
       (moduleExports, moduleVersion) => {
         const transformCommandArguments = moduleExports.transformCommandArguments;
         if (!transformCommandArguments) {
-          this._diag.error('internal instrumentation error, missing transformCommandArguments function');
+          this._diag.error("internal instrumentation error, missing transformCommandArguments function");
           return moduleExports;
         }
-        const functionToPatch = moduleVersion?.startsWith('1.0.') ? 'extendWithCommands' : 'attachCommands';
+        const functionToPatch = moduleVersion?.startsWith("1.0.") ? "extendWithCommands" : "attachCommands";
         if (isWrapped(moduleExports?.[functionToPatch])) {
           this._unwrap(moduleExports, functionToPatch);
         }
@@ -307,109 +241,106 @@ class RedisInstrumentationV4_V5 extends InstrumentationBase {
       },
       (moduleExports) => {
         if (isWrapped(moduleExports?.extendWithCommands)) {
-          this._unwrap(moduleExports, 'extendWithCommands');
+          this._unwrap(moduleExports, "extendWithCommands");
         }
         if (isWrapped(moduleExports?.attachCommands)) {
-          this._unwrap(moduleExports, 'attachCommands');
+          this._unwrap(moduleExports, "attachCommands");
         }
-      },
+      }
     );
-
     const multiCommanderModule = new InstrumentationNodeModuleFile(
       `${basePackageName}/dist/lib/client/multi-command.js`,
-      ['^1.0.0', '>=5.0.0 <5.12.0'],
+      ["^1.0.0", ">=5.0.0 <5.12.0"],
       (moduleExports) => {
         const redisClientMultiCommandPrototype = moduleExports?.default?.prototype;
         if (isWrapped(redisClientMultiCommandPrototype?.exec)) {
-          this._unwrap(redisClientMultiCommandPrototype, 'exec');
+          this._unwrap(redisClientMultiCommandPrototype, "exec");
         }
-        this._wrap(redisClientMultiCommandPrototype, 'exec', this._getPatchMultiCommandsExec(false));
+        this._wrap(redisClientMultiCommandPrototype, "exec", this._getPatchMultiCommandsExec(false));
         if (isWrapped(redisClientMultiCommandPrototype?.execAsPipeline)) {
-          this._unwrap(redisClientMultiCommandPrototype, 'execAsPipeline');
+          this._unwrap(redisClientMultiCommandPrototype, "execAsPipeline");
         }
-        this._wrap(redisClientMultiCommandPrototype, 'execAsPipeline', this._getPatchMultiCommandsExec(true));
+        this._wrap(redisClientMultiCommandPrototype, "execAsPipeline", this._getPatchMultiCommandsExec(true));
         if (isWrapped(redisClientMultiCommandPrototype?.addCommand)) {
-          this._unwrap(redisClientMultiCommandPrototype, 'addCommand');
+          this._unwrap(redisClientMultiCommandPrototype, "addCommand");
         }
-        this._wrap(redisClientMultiCommandPrototype, 'addCommand', this._getPatchMultiCommandsAddCommand());
+        this._wrap(redisClientMultiCommandPrototype, "addCommand", this._getPatchMultiCommandsAddCommand());
         return moduleExports;
       },
       (moduleExports) => {
         const redisClientMultiCommandPrototype = moduleExports?.default?.prototype;
         if (isWrapped(redisClientMultiCommandPrototype?.exec)) {
-          this._unwrap(redisClientMultiCommandPrototype, 'exec');
+          this._unwrap(redisClientMultiCommandPrototype, "exec");
         }
         if (isWrapped(redisClientMultiCommandPrototype?.execAsPipeline)) {
-          this._unwrap(redisClientMultiCommandPrototype, 'execAsPipeline');
+          this._unwrap(redisClientMultiCommandPrototype, "execAsPipeline");
         }
         if (isWrapped(redisClientMultiCommandPrototype?.addCommand)) {
-          this._unwrap(redisClientMultiCommandPrototype, 'addCommand');
+          this._unwrap(redisClientMultiCommandPrototype, "addCommand");
         }
-      },
+      }
     );
-
     const clientIndexModule = new InstrumentationNodeModuleFile(
       `${basePackageName}/dist/lib/client/index.js`,
-      ['^1.0.0', '>=5.0.0 <5.12.0'],
+      ["^1.0.0", ">=5.0.0 <5.12.0"],
       (moduleExports) => {
         const redisClientPrototype = moduleExports?.default?.prototype;
         if (redisClientPrototype?.multi) {
           if (isWrapped(redisClientPrototype?.multi)) {
-            this._unwrap(redisClientPrototype, 'multi');
+            this._unwrap(redisClientPrototype, "multi");
           }
-          this._wrap(redisClientPrototype, 'multi', this._getPatchRedisClientMulti());
+          this._wrap(redisClientPrototype, "multi", this._getPatchRedisClientMulti());
         }
         if (redisClientPrototype?.MULTI) {
           if (isWrapped(redisClientPrototype?.MULTI)) {
-            this._unwrap(redisClientPrototype, 'MULTI');
+            this._unwrap(redisClientPrototype, "MULTI");
           }
-          this._wrap(redisClientPrototype, 'MULTI', this._getPatchRedisClientMulti());
+          this._wrap(redisClientPrototype, "MULTI", this._getPatchRedisClientMulti());
         }
         if (isWrapped(redisClientPrototype?.sendCommand)) {
-          this._unwrap(redisClientPrototype, 'sendCommand');
+          this._unwrap(redisClientPrototype, "sendCommand");
         }
-        this._wrap(redisClientPrototype, 'sendCommand', this._getPatchRedisClientSendCommand());
+        this._wrap(redisClientPrototype, "sendCommand", this._getPatchRedisClientSendCommand());
         if (isWrapped(redisClientPrototype?.connect)) {
-          this._unwrap(redisClientPrototype, 'connect');
+          this._unwrap(redisClientPrototype, "connect");
         }
-        this._wrap(redisClientPrototype, 'connect', this._getPatchedClientConnect());
+        this._wrap(redisClientPrototype, "connect", this._getPatchedClientConnect());
         return moduleExports;
       },
       (moduleExports) => {
         const redisClientPrototype = moduleExports?.default?.prototype;
         if (isWrapped(redisClientPrototype?.multi)) {
-          this._unwrap(redisClientPrototype, 'multi');
+          this._unwrap(redisClientPrototype, "multi");
         }
         if (isWrapped(redisClientPrototype?.MULTI)) {
-          this._unwrap(redisClientPrototype, 'MULTI');
+          this._unwrap(redisClientPrototype, "MULTI");
         }
         if (isWrapped(redisClientPrototype?.sendCommand)) {
-          this._unwrap(redisClientPrototype, 'sendCommand');
+          this._unwrap(redisClientPrototype, "sendCommand");
         }
         if (isWrapped(redisClientPrototype?.connect)) {
-          this._unwrap(redisClientPrototype, 'connect');
+          this._unwrap(redisClientPrototype, "connect");
         }
-      },
+      }
     );
-
     return new InstrumentationNodeModuleDefinition(
       basePackageName,
-      ['^1.0.0', '>=5.0.0 <5.12.0'],
+      ["^1.0.0", ">=5.0.0 <5.12.0"],
       (moduleExports) => moduleExports,
-      () => {},
-      [commanderModuleFile, multiCommanderModule, clientIndexModule],
+      () => {
+      },
+      [commanderModuleFile, multiCommanderModule, clientIndexModule]
     );
   }
-
-   _getPatchExtendWithCommands(transformCommandArguments) {
+  _getPatchExtendWithCommands(transformCommandArguments) {
     const plugin = this;
     return function extendWithCommandsPatchWrapper(original) {
-      return function extendWithCommandsPatch( config) {
-        if (config?.BaseClass?.name !== 'RedisClient') {
+      return function extendWithCommandsPatch(config) {
+        if (config?.BaseClass?.name !== "RedisClient") {
           return original.apply(this, arguments);
         }
         const origExecutor = config.executor;
-        config.executor = function ( command, args) {
+        config.executor = function(command, args) {
           const redisCommandArguments = transformCommandArguments(command, args).args;
           return plugin._traceClientCommand(origExecutor, this, arguments, redisCommandArguments);
         };
@@ -417,49 +348,41 @@ class RedisInstrumentationV4_V5 extends InstrumentationBase {
       };
     };
   }
-
-   _getPatchMultiCommandsExec(isPipeline) {
+  _getPatchMultiCommandsExec(isPipeline) {
     const plugin = this;
     return function execPatchWrapper(original) {
       return function execPatch() {
         const execRes = original.apply(this, arguments);
-        if (typeof execRes?.then !== 'function') {
-          plugin._diag.error('non-promise result when patching exec/execAsPipeline');
+        if (typeof execRes?.then !== "function") {
+          plugin._diag.error("non-promise result when patching exec/execAsPipeline");
           return execRes;
         }
-        return execRes
-          .then((redisRes) => {
-            const openSpans = this[OTEL_OPEN_SPANS];
-            plugin._endSpansWithRedisReplies(openSpans, redisRes, isPipeline);
-            return redisRes;
-          })
-          .catch((err) => {
-            const openSpans = this[OTEL_OPEN_SPANS];
-            if (!openSpans) {
-              plugin._diag.error('cannot find open spans to end for multi/pipeline');
-            } else {
-              const replies =
-                err.constructor.name === 'MultiErrorReply'
-                  ? (err ).replies
-                  : new Array(openSpans.length).fill(err);
-              plugin._endSpansWithRedisReplies(openSpans, replies, isPipeline);
-            }
-            return Promise.reject(err);
-          });
+        return execRes.then((redisRes) => {
+          const openSpans = this[OTEL_OPEN_SPANS];
+          plugin._endSpansWithRedisReplies(openSpans, redisRes, isPipeline);
+          return redisRes;
+        }).catch((err) => {
+          const openSpans = this[OTEL_OPEN_SPANS];
+          if (!openSpans) {
+            plugin._diag.error("cannot find open spans to end for multi/pipeline");
+          } else {
+            const replies = err.constructor.name === "MultiErrorReply" ? err.replies : new Array(openSpans.length).fill(err);
+            plugin._endSpansWithRedisReplies(openSpans, replies, isPipeline);
+          }
+          return Promise.reject(err);
+        });
       };
     };
   }
-
-   _getPatchMultiCommandsAddCommand() {
+  _getPatchMultiCommandsAddCommand() {
     const plugin = this;
     return function addCommandWrapper(original) {
-      return function addCommandPatch( args) {
+      return function addCommandPatch(args) {
         return plugin._traceClientCommand(original, this, arguments, args);
       };
     };
   }
-
-   _getPatchRedisClientMulti() {
+  _getPatchRedisClientMulti() {
     return function multiPatchWrapper(original) {
       return function multiPatch() {
         const multiRes = original.apply(this, arguments);
@@ -468,60 +391,50 @@ class RedisInstrumentationV4_V5 extends InstrumentationBase {
       };
     };
   }
-
-   _getPatchRedisClientSendCommand() {
+  _getPatchRedisClientSendCommand() {
     const plugin = this;
     return function sendCommandWrapper(original) {
-      return function sendCommandPatch( args) {
+      return function sendCommandPatch(args) {
         return plugin._traceClientCommand(original, this, arguments, args);
       };
     };
   }
-
-   _getPatchedClientConnect() {
+  _getPatchedClientConnect() {
     const plugin = this;
     return function connectWrapper(original) {
       return function patchedConnect() {
         const options = this.options;
         const attributes = getClientAttributes(plugin._diag, options, plugin._semconvStability);
-        attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] = 'auto.db.otel.redis';
-        const span = plugin.tracer.startSpan(`${RedisInstrumentationV4_V5.COMPONENT}-connect`, {
+        attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] = "auto.db.otel.redis";
+        const span = plugin.tracer.startSpan(`${_RedisInstrumentationV4_V5.COMPONENT}-connect`, {
           kind: SpanKind.CLIENT,
-          attributes,
+          attributes
         });
         const res = context.with(trace.setSpan(context.active(), span), () => {
           return original.apply(this);
         });
-        return res
-          .then((result) => {
-            span.end();
-            return result;
-          })
-          .catch((error) => {
-            span.recordException(error);
-            span.setStatus({
-              code: SpanStatusCode.ERROR,
-              message: error.message,
-            });
-            span.end();
-            return Promise.reject(error);
+        return res.then((result) => {
+          span.end();
+          return result;
+        }).catch((error) => {
+          span.recordException(error);
+          span.setStatus({
+            code: SpanStatusCode.ERROR,
+            message: error.message
           });
+          span.end();
+          return Promise.reject(error);
+        });
       };
     };
   }
-
-  _traceClientCommand(
-    origFunction,
-    origThis,
-    origArguments,
-    redisCommandArguments,
-  ) {
-    const hasNoParentSpan = trace.getSpan(context.active()) === undefined;
+  _traceClientCommand(origFunction, origThis, origArguments, redisCommandArguments) {
+    const hasNoParentSpan = trace.getSpan(context.active()) === void 0;
     if (hasNoParentSpan && this.getConfig().requireParentSpan) {
       return origFunction.apply(origThis, origArguments);
     }
     const clientOptions = origThis.options || origThis[MULTI_COMMAND_OPTIONS];
-    const commandName = redisCommandArguments[0] ;
+    const commandName = redisCommandArguments[0];
     const commandArgs = redisCommandArguments.slice(1);
     const dbStatementSerializer = this.getConfig().dbStatementSerializer || defaultDbStatementSerializer;
     const attributes = getClientAttributes(this._diag, clientOptions, this._semconvStability);
@@ -539,24 +452,24 @@ class RedisInstrumentationV4_V5 extends InstrumentationBase {
         }
       }
     } catch (e) {
-      this._diag.error('dbStatementSerializer throw an exception', e, { commandName });
+      this._diag.error("dbStatementSerializer throw an exception", e, { commandName });
     }
-    attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] = 'auto.db.otel.redis';
-    const span = this.tracer.startSpan(`${RedisInstrumentationV4_V5.COMPONENT}-${commandName}`, {
+    attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] = "auto.db.otel.redis";
+    const span = this.tracer.startSpan(`${_RedisInstrumentationV4_V5.COMPONENT}-${commandName}`, {
       kind: SpanKind.CLIENT,
-      attributes,
+      attributes
     });
     const res = context.with(trace.setSpan(context.active(), span), () => {
       return origFunction.apply(origThis, origArguments);
     });
-    if (typeof res?.then === 'function') {
+    if (typeof res?.then === "function") {
       res.then(
         (redisRes) => {
-          this._endSpanWithResponse(span, commandName, commandArgs, redisRes, undefined);
+          this._endSpanWithResponse(span, commandName, commandArgs, redisRes, void 0);
         },
         (err) => {
           this._endSpanWithResponse(span, commandName, commandArgs, null, err);
-        },
+        }
       );
     } else {
       const redisClientMultiCommand = res;
@@ -564,50 +477,38 @@ class RedisInstrumentationV4_V5 extends InstrumentationBase {
       redisClientMultiCommand[OTEL_OPEN_SPANS].push({
         span,
         commandName,
-        commandArgs,
+        commandArgs
       });
     }
     return res;
   }
-
   _endSpansWithRedisReplies(openSpans, replies, isPipeline = false) {
     if (!openSpans) {
-      return this._diag.error('cannot find open spans to end for redis multi/pipeline');
+      return this._diag.error("cannot find open spans to end for redis multi/pipeline");
     }
     if (replies.length !== openSpans.length) {
-      return this._diag.error('number of multi command spans does not match response from redis');
+      return this._diag.error("number of multi command spans does not match response from redis");
     }
-    const allCommands = openSpans.map(s => s.commandName);
-    const allSameCommand = allCommands.every(cmd => cmd === allCommands[0]);
-    const operationName = allSameCommand
-      ? (isPipeline ? 'PIPELINE ' : 'MULTI ') + allCommands[0]
-      : isPipeline
-        ? 'PIPELINE'
-        : 'MULTI';
+    const allCommands = openSpans.map((s) => s.commandName);
+    const allSameCommand = allCommands.every((cmd) => cmd === allCommands[0]);
+    const operationName = allSameCommand ? (isPipeline ? "PIPELINE " : "MULTI ") + allCommands[0] : isPipeline ? "PIPELINE" : "MULTI";
     for (let i = 0; i < openSpans.length; i++) {
       const { span, commandArgs } = openSpans[i];
       const currCommandRes = replies[i];
-      const [res, err] = currCommandRes instanceof Error ? [null, currCommandRes] : [currCommandRes, undefined];
+      const [res, err] = currCommandRes instanceof Error ? [null, currCommandRes] : [currCommandRes, void 0];
       if (this._semconvStability & SemconvStability.STABLE) {
         span.setAttribute(ATTR_DB_OPERATION_NAME, operationName);
       }
       this._endSpanWithResponse(span, allCommands[i], commandArgs, res, err);
     }
   }
-
-  _endSpanWithResponse(
-    span,
-    commandName,
-    commandArgs,
-    response,
-    error,
-  ) {
+  _endSpanWithResponse(span, commandName, commandArgs, response, error) {
     const { responseHook } = this.getConfig();
     if (!error && responseHook) {
       try {
         responseHook(span, commandName, commandArgs, response);
       } catch (err) {
-        this._diag.error('responseHook throw an exception', err);
+        this._diag.error("responseHook throw an exception", err);
       }
     }
     if (error) {
@@ -616,26 +517,22 @@ class RedisInstrumentationV4_V5 extends InstrumentationBase {
     }
     span.end();
   }
-} RedisInstrumentationV4_V5.__initStatic2();
-
-// ---- RedisInstrumentation (wrapper) ----
-
+};
+_RedisInstrumentationV4_V5.COMPONENT = "redis";
+let RedisInstrumentationV4_V5 = _RedisInstrumentationV4_V5;
 const DEFAULT_CONFIG = {
-  requireParentSpan: false,
+  requireParentSpan: false
 };
-
 class RedisInstrumentation extends InstrumentationBase {
-
-   __init() {this.initialized = false;}
-
   constructor(config = {}) {
     const resolvedConfig = { ...DEFAULT_CONFIG, ...config };
-    super(PACKAGE_NAME, PACKAGE_VERSION, resolvedConfig);RedisInstrumentation.prototype.__init.call(this);    this.instrumentationV2_V3 = new RedisInstrumentationV2_V3(this.getConfig());
+    super(PACKAGE_NAME, PACKAGE_VERSION, resolvedConfig);
+    this.initialized = false;
+    this.instrumentationV2_V3 = new RedisInstrumentationV2_V3(this.getConfig());
     this.instrumentationV4_V5 = new RedisInstrumentationV4_V5(this.getConfig());
     this.initialized = true;
   }
-
-   setConfig(config = {}) {
+  setConfig(config = {}) {
     const newConfig = { ...DEFAULT_CONFIG, ...config };
     super.setConfig(newConfig);
     if (!this.initialized) {
@@ -644,14 +541,12 @@ class RedisInstrumentation extends InstrumentationBase {
     this.instrumentationV2_V3.setConfig(newConfig);
     this.instrumentationV4_V5.setConfig(newConfig);
   }
-
-  init() {}
-
-   getModuleDefinitions() {
+  init() {
+  }
+  getModuleDefinitions() {
     return [...this.instrumentationV2_V3.getModuleDefinitions(), ...this.instrumentationV4_V5.getModuleDefinitions()];
   }
-
-   setTracerProvider(tracerProvider) {
+  setTracerProvider(tracerProvider) {
     super.setTracerProvider(tracerProvider);
     if (!this.initialized) {
       return;
@@ -659,8 +554,7 @@ class RedisInstrumentation extends InstrumentationBase {
     this.instrumentationV2_V3.setTracerProvider(tracerProvider);
     this.instrumentationV4_V5.setTracerProvider(tracerProvider);
   }
-
-   enable() {
+  enable() {
     super.enable();
     if (!this.initialized) {
       return;
@@ -668,8 +562,7 @@ class RedisInstrumentation extends InstrumentationBase {
     this.instrumentationV2_V3.enable();
     this.instrumentationV4_V5.enable();
   }
-
-   disable() {
+  disable() {
     super.disable();
     if (!this.initialized) {
       return;