@sentry/node 10.58.0 → 10.60.0

package/build/esm/integrations/tracing/kafka/vendored/utils.js

@@ -0,0 +1,107 @@
+import { SpanKind, TraceFlags } from '@opentelemetry/api';
+import { startInactiveSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR, propagationContextFromHeaders, getTraceData } from '@sentry/core';
+import { MESSAGING_SYSTEM_VALUE_KAFKA, ATTR_MESSAGING_KAFKA_OFFSET, ATTR_MESSAGING_KAFKA_MESSAGE_TOMBSTONE, ATTR_MESSAGING_KAFKA_MESSAGE_KEY, ATTR_MESSAGING_OPERATION_NAME, ATTR_MESSAGING_OPERATION_TYPE, ATTR_MESSAGING_DESTINATION_NAME, ATTR_MESSAGING_SYSTEM, MESSAGING_OPERATION_TYPE_VALUE_RECEIVE, ATTR_ERROR_TYPE, ERROR_TYPE_VALUE_OTHER, MESSAGING_OPERATION_TYPE_VALUE_SEND, ATTR_MESSAGING_DESTINATION_PARTITION_ID } from './semconv.js';
+
+const PRODUCER_ORIGIN = "auto.kafkajs.otel.producer";
+const CONSUMER_ORIGIN = "auto.kafkajs.otel.consumer";
+function getHeaderAsString(headers, key) {
+  const value = headers?.[key];
+  if (value == null) {
+    return void 0;
+  }
+  return Array.isArray(value) ? value[0]?.toString() : value.toString();
+}
+function getLinksFromHeaders(headers) {
+  const sentryTrace = getHeaderAsString(headers, "sentry-trace");
+  if (!sentryTrace) {
+    return void 0;
+  }
+  const { traceId, parentSpanId, sampled } = propagationContextFromHeaders(
+    sentryTrace,
+    getHeaderAsString(headers, "baggage")
+  );
+  if (!parentSpanId) {
+    return void 0;
+  }
+  return [
+    {
+      context: {
+        traceId,
+        spanId: parentSpanId,
+        isRemote: true,
+        traceFlags: sampled ? TraceFlags.SAMPLED : TraceFlags.NONE
+      }
+    }
+  ];
+}
+function startConsumerSpan({ topic, message, operationType, links, attributes }) {
+  const operationName = operationType === MESSAGING_OPERATION_TYPE_VALUE_RECEIVE ? "poll" : operationType;
+  return startInactiveSpan({
+    name: `${operationName} ${topic}`,
+    kind: operationType === MESSAGING_OPERATION_TYPE_VALUE_RECEIVE ? SpanKind.CLIENT : SpanKind.CONSUMER,
+    links,
+    attributes: {
+      ...attributes,
+      [ATTR_MESSAGING_SYSTEM]: MESSAGING_SYSTEM_VALUE_KAFKA,
+      [ATTR_MESSAGING_DESTINATION_NAME]: topic,
+      [ATTR_MESSAGING_OPERATION_TYPE]: operationType,
+      [ATTR_MESSAGING_OPERATION_NAME]: operationName,
+      [ATTR_MESSAGING_KAFKA_MESSAGE_KEY]: message?.key ? String(message.key) : void 0,
+      [ATTR_MESSAGING_KAFKA_MESSAGE_TOMBSTONE]: message?.key && message.value === null ? true : void 0,
+      [ATTR_MESSAGING_KAFKA_OFFSET]: message?.offset,
+      // Mirror the upstream behavior of only tagging per-message processing spans (not the batch
+      // receiving span, which carries no message) with the auto origin.
+      ...message ? { [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: CONSUMER_ORIGIN } : {}
+    }
+  });
+}
+function startProducerSpan(topic, message) {
+  const span = startInactiveSpan({
+    name: `send ${topic}`,
+    kind: SpanKind.PRODUCER,
+    attributes: {
+      [ATTR_MESSAGING_SYSTEM]: MESSAGING_SYSTEM_VALUE_KAFKA,
+      [ATTR_MESSAGING_DESTINATION_NAME]: topic,
+      [ATTR_MESSAGING_KAFKA_MESSAGE_KEY]: message.key ? String(message.key) : void 0,
+      [ATTR_MESSAGING_KAFKA_MESSAGE_TOMBSTONE]: message.key && message.value === null ? true : void 0,
+      [ATTR_MESSAGING_DESTINATION_PARTITION_ID]: message.partition !== void 0 ? String(message.partition) : void 0,
+      [ATTR_MESSAGING_OPERATION_NAME]: "send",
+      [ATTR_MESSAGING_OPERATION_TYPE]: MESSAGING_OPERATION_TYPE_VALUE_SEND,
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: PRODUCER_ORIGIN
+    }
+  });
+  message.headers = message.headers ?? {};
+  const traceData = getTraceData({ span });
+  if (traceData["sentry-trace"]) {
+    message.headers["sentry-trace"] = traceData["sentry-trace"];
+  }
+  if (traceData.baggage) {
+    message.headers["baggage"] = traceData.baggage;
+  }
+  return span;
+}
+function endSpansOnPromise(spans, sendPromise) {
+  return Promise.resolve(sendPromise).catch((reason) => {
+    let errorMessage;
+    let errorType = ERROR_TYPE_VALUE_OTHER;
+    if (typeof reason === "string" || reason === void 0) {
+      errorMessage = reason;
+    } else if (typeof reason === "object" && Object.prototype.hasOwnProperty.call(reason, "message")) {
+      errorMessage = reason.message;
+      errorType = reason.constructor.name;
+    }
+    spans.forEach((span) => {
+      span.setAttribute(ATTR_ERROR_TYPE, errorType);
+      span.setStatus({
+        code: SPAN_STATUS_ERROR,
+        message: errorMessage
+      });
+    });
+    throw reason;
+  }).finally(() => {
+    spans.forEach((span) => span.end());
+  });
+}
+
+export { endSpansOnPromise, getHeaderAsString, getLinksFromHeaders, startConsumerSpan, startProducerSpan };
+//# sourceMappingURL=utils.js.map

package/build/esm/integrations/tracing/kafka/vendored/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sources":["../../../../../../src/integrations/tracing/kafka/vendored/utils.ts"],"sourcesContent":["/*\n * Copyright The OpenTelemetry Authors, Aspecto\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/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-kafkajs\n * - Upstream version: @opentelemetry/instrumentation-kafkajs@0.27.0\n * - Span creation extracted here and migrated to the @sentry/core API; origin folded into span creation\n */\n\nimport { SpanKind, TraceFlags } from '@opentelemetry/api';\nimport type { Span, SpanAttributes, SpanLink } from '@sentry/core';\nimport {\n  getTraceData,\n  propagationContextFromHeaders,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SPAN_STATUS_ERROR,\n  startInactiveSpan,\n} from '@sentry/core';\nimport type { KafkaMessage, Message } from './kafkajs-types';\nimport {\n  ATTR_ERROR_TYPE,\n  ATTR_MESSAGING_DESTINATION_NAME,\n  ATTR_MESSAGING_DESTINATION_PARTITION_ID,\n  ATTR_MESSAGING_KAFKA_MESSAGE_KEY,\n  ATTR_MESSAGING_KAFKA_MESSAGE_TOMBSTONE,\n  ATTR_MESSAGING_KAFKA_OFFSET,\n  ATTR_MESSAGING_OPERATION_NAME,\n  ATTR_MESSAGING_OPERATION_TYPE,\n  ATTR_MESSAGING_SYSTEM,\n  ERROR_TYPE_VALUE_OTHER,\n  MESSAGING_OPERATION_TYPE_VALUE_RECEIVE,\n  MESSAGING_OPERATION_TYPE_VALUE_SEND,\n  MESSAGING_SYSTEM_VALUE_KAFKA,\n} from './semconv';\n\nconst PRODUCER_ORIGIN = 'auto.kafkajs.otel.producer';\nconst CONSUMER_ORIGIN = 'auto.kafkajs.otel.consumer';\n\nexport interface ConsumerSpanOptions {\n  topic: string;\n  message: KafkaMessage | undefined;\n  operationType: string;\n  attributes: SpanAttributes;\n  links?: SpanLink[];\n}\n\n/**\n * Reads a header value off a kafkajs message as a string. kafkajs delivers headers as `Buffer`s (or\n * arrays of them), so we normalize to a string before handing them to Sentry's trace helpers.\n */\nexport function getHeaderAsString(headers: KafkaMessage['headers'], key: string): string | undefined {\n  const value = headers?.[key];\n  if (value == null) {\n    return undefined;\n  }\n  return Array.isArray(value) ? value[0]?.toString() : value.toString();\n}\n\n/**\n * Builds a span link to the producer span carried in the message headers, mirroring the upstream\n * behavior of linking each batch-processed message to its originating producer span.\n */\nexport function getLinksFromHeaders(headers: KafkaMessage['headers']): SpanLink[] | undefined {\n  const sentryTrace = getHeaderAsString(headers, 'sentry-trace');\n  if (!sentryTrace) {\n    return undefined;\n  }\n\n  const { traceId, parentSpanId, sampled } = propagationContextFromHeaders(\n    sentryTrace,\n    getHeaderAsString(headers, 'baggage'),\n  );\n  if (!parentSpanId) {\n    return undefined;\n  }\n\n  return [\n    {\n      context: {\n        traceId,\n        spanId: parentSpanId,\n        isRemote: true,\n        traceFlags: sampled ? TraceFlags.SAMPLED : TraceFlags.NONE,\n      },\n    },\n  ];\n}\n\n/** Starts an inactive consumer (process/receive) span carrying the kafkajs messaging attributes. */\nexport function startConsumerSpan({ topic, message, operationType, links, attributes }: ConsumerSpanOptions): Span {\n  const operationName =\n    operationType === MESSAGING_OPERATION_TYPE_VALUE_RECEIVE\n      ? 'poll' // for batch processing spans\n      : operationType; // for individual message processing spans\n\n  return startInactiveSpan({\n    name: `${operationName} ${topic}`,\n    kind: operationType === MESSAGING_OPERATION_TYPE_VALUE_RECEIVE ? SpanKind.CLIENT : SpanKind.CONSUMER,\n    links,\n    attributes: {\n      ...attributes,\n      [ATTR_MESSAGING_SYSTEM]: MESSAGING_SYSTEM_VALUE_KAFKA,\n      [ATTR_MESSAGING_DESTINATION_NAME]: topic,\n      [ATTR_MESSAGING_OPERATION_TYPE]: operationType,\n      [ATTR_MESSAGING_OPERATION_NAME]: operationName,\n      [ATTR_MESSAGING_KAFKA_MESSAGE_KEY]: message?.key ? String(message.key) : undefined,\n      [ATTR_MESSAGING_KAFKA_MESSAGE_TOMBSTONE]: message?.key && message.value === null ? true : undefined,\n      [ATTR_MESSAGING_KAFKA_OFFSET]: message?.offset,\n      // Mirror the upstream behavior of only tagging per-message processing spans (not the batch\n      // receiving span, which carries no message) with the auto origin.\n      ...(message ? { [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: CONSUMER_ORIGIN } : {}),\n    },\n  });\n}\n\n/** Starts an inactive producer span and propagates its trace into the message headers. */\nexport function startProducerSpan(topic: string, message: Message): Span {\n  const span = startInactiveSpan({\n    name: `send ${topic}`,\n    kind: SpanKind.PRODUCER,\n    attributes: {\n      [ATTR_MESSAGING_SYSTEM]: MESSAGING_SYSTEM_VALUE_KAFKA,\n      [ATTR_MESSAGING_DESTINATION_NAME]: topic,\n      [ATTR_MESSAGING_KAFKA_MESSAGE_KEY]: message.key ? String(message.key) : undefined,\n      [ATTR_MESSAGING_KAFKA_MESSAGE_TOMBSTONE]: message.key && message.value === null ? true : undefined,\n      [ATTR_MESSAGING_DESTINATION_PARTITION_ID]:\n        message.partition !== undefined ? String(message.partition) : undefined,\n      [ATTR_MESSAGING_OPERATION_NAME]: 'send',\n      [ATTR_MESSAGING_OPERATION_TYPE]: MESSAGING_OPERATION_TYPE_VALUE_SEND,\n      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: PRODUCER_ORIGIN,\n    },\n  });\n\n  // Propagate the producer span's trace to consumers via the message headers.\n  message.headers = message.headers ?? {};\n  const traceData = getTraceData({ span });\n  if (traceData['sentry-trace']) {\n    message.headers['sentry-trace'] = traceData['sentry-trace'];\n  }\n  if (traceData.baggage) {\n    message.headers['baggage'] = traceData.baggage;\n  }\n\n  return span;\n}\n\n/**\n * Resolves once `sendPromise` settles, ending all `spans` and, on failure, marking them with the\n * error status and `error.type` before re-throwing.\n */\nexport function endSpansOnPromise<T>(spans: Span[], sendPromise: Promise<T>): Promise<T> {\n  return Promise.resolve(sendPromise)\n    .catch(reason => {\n      let errorMessage: string | undefined;\n      let errorType: string = ERROR_TYPE_VALUE_OTHER;\n      if (typeof reason === 'string' || reason === undefined) {\n        errorMessage = reason;\n      } else if (typeof reason === 'object' && Object.prototype.hasOwnProperty.call(reason, 'message')) {\n        errorMessage = reason.message;\n        errorType = reason.constructor.name;\n      }\n\n      spans.forEach(span => {\n        span.setAttribute(ATTR_ERROR_TYPE, errorType);\n        span.setStatus({\n          code: SPAN_STATUS_ERROR,\n          message: errorMessage,\n        });\n      });\n\n      throw reason;\n    })\n    .finally(() => {\n      spans.forEach(span => span.end());\n    });\n}\n"],"names":[],"mappings":"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"}

package/build/esm/integrations/tracing/knex/index.js

@@ -1,29 +1,14 @@
 import { KnexInstrumentation } from './vendored/instrumentation.js';
-import { defineIntegration, spanToJSON, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
-import { generateInstrumentOnce, instrumentWhenWrapped } from '@sentry/node-core';
+import { defineIntegration } from '@sentry/core';
+import { generateInstrumentOnce } from '@sentry/node-core';
 
 const INTEGRATION_NAME = "Knex";
-const instrumentKnex = generateInstrumentOnce(
-  INTEGRATION_NAME,
-  () => new KnexInstrumentation({ requireParentSpan: true })
-);
+const instrumentKnex = generateInstrumentOnce(INTEGRATION_NAME, () => new KnexInstrumentation());
 const _knexIntegration = (() => {
-  let instrumentationWrappedCallback;
   return {
     name: INTEGRATION_NAME,
     setupOnce() {
-      const instrumentation = instrumentKnex();
-      instrumentationWrappedCallback = instrumentWhenWrapped(instrumentation);
-    },
-    setup(client) {
-      instrumentationWrappedCallback?.(
-        () => client.on("spanStart", (span) => {
-          const { data } = spanToJSON(span);
-          if ("knex.version" in data) {
-            span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, "auto.db.otel.knex");
-          }
-        })
-      );
+      instrumentKnex();
     }
   };
 });

package/build/esm/integrations/tracing/knex/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../src/integrations/tracing/knex/index.ts"],"sourcesContent":["import { KnexInstrumentation } from './vendored/instrumentation';\nimport type { IntegrationFn } from '@sentry/core';\nimport { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';\nimport { generateInstrumentOnce, instrumentWhenWrapped } from '@sentry/node-core';\n\nconst INTEGRATION_NAME = 'Knex';\n\nexport const instrumentKnex = generateInstrumentOnce(\n  INTEGRATION_NAME,\n  () => new KnexInstrumentation({ requireParentSpan: true }),\n);\n\nconst _knexIntegration = (() => {\n  let instrumentationWrappedCallback: undefined | ((callback: () => void) => void);\n\n  return {\n    name: INTEGRATION_NAME,\n    setupOnce() {\n      const instrumentation = instrumentKnex();\n      instrumentationWrappedCallback = instrumentWhenWrapped(instrumentation);\n    },\n\n    setup(client) {\n      instrumentationWrappedCallback?.(() =>\n        client.on('spanStart', span => {\n          const { data } = spanToJSON(span);\n          // knex.version is always set in the span data\n          // https://github.com/open-telemetry/opentelemetry-js-contrib/blob/0309caeafc44ac9cb13a3345b790b01b76d0497d/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts#L138\n          if ('knex.version' in data) {\n            span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.db.otel.knex');\n          }\n        }),\n      );\n    },\n  };\n}) satisfies IntegrationFn;\n\n/**\n * Knex integration\n *\n * Capture tracing data for [Knex](https://knexjs.org/).\n *\n * @example\n * ```javascript\n * import * as Sentry from '@sentry/node';\n *\n * Sentry.init({\n *  integrations: [Sentry.knexIntegration()],\n * });\n * ```\n */\nexport const knexIntegration = defineIntegration(_knexIntegration);\n"],"names":[],"mappings":";;;;AAKA,MAAM,gBAAA,GAAmB,MAAA;AAElB,MAAM,cAAA,GAAiB,sBAAA;AAAA,EAC5B,gBAAA;AAAA,EACA,MAAM,IAAI,mBAAA,CAAoB,EAAE,iBAAA,EAAmB,MAAM;AAC3D;AAEA,MAAM,oBAAoB,MAAM;AAC9B,EAAA,IAAI,8BAAA;AAEJ,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,gBAAA;AAAA,IACN,SAAA,GAAY;AACV,MAAA,MAAM,kBAAkB,cAAA,EAAe;AACvC,MAAA,8BAAA,GAAiC,sBAAsB,eAAe,CAAA;AAAA,IACxE,CAAA;AAAA,IAEA,MAAM,MAAA,EAAQ;AACZ,MAAA,8BAAA;AAAA,QAAiC,MAC/B,MAAA,CAAO,EAAA,CAAG,WAAA,EAAa,CAAA,IAAA,KAAQ;AAC7B,UAAA,MAAM,EAAE,IAAA,EAAK,GAAI,UAAA,CAAW,IAAI,CAAA;AAGhC,UAAA,IAAI,kBAAkB,IAAA,EAAM;AAC1B,YAAA,IAAA,CAAK,YAAA,CAAa,kCAAkC,mBAAmB,CAAA;AAAA,UACzE;AAAA,QACF,CAAC;AAAA,OACH;AAAA,IACF;AAAA,GACF;AACF,CAAA,CAAA;AAgBO,MAAM,eAAA,GAAkB,kBAAkB,gBAAgB;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../../src/integrations/tracing/knex/index.ts"],"sourcesContent":["import { KnexInstrumentation } from './vendored/instrumentation';\nimport type { IntegrationFn } from '@sentry/core';\nimport { defineIntegration } from '@sentry/core';\nimport { generateInstrumentOnce } from '@sentry/node-core';\n\nconst INTEGRATION_NAME = 'Knex';\n\nexport const instrumentKnex = generateInstrumentOnce(INTEGRATION_NAME, () => new KnexInstrumentation());\n\nconst _knexIntegration = (() => {\n  return {\n    name: INTEGRATION_NAME,\n    setupOnce() {\n      instrumentKnex();\n    },\n  };\n}) satisfies IntegrationFn;\n\n/**\n * Knex integration\n *\n * Capture tracing data for [Knex](https://knexjs.org/).\n *\n * @example\n * ```javascript\n * import * as Sentry from '@sentry/node';\n *\n * Sentry.init({\n *  integrations: [Sentry.knexIntegration()],\n * });\n * ```\n */\nexport const knexIntegration = defineIntegration(_knexIntegration);\n"],"names":[],"mappings":";;;;AAKA,MAAM,gBAAA,GAAmB,MAAA;AAElB,MAAM,iBAAiB,sBAAA,CAAuB,gBAAA,EAAkB,MAAM,IAAI,qBAAqB;AAEtG,MAAM,oBAAoB,MAAM;AAC9B,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,gBAAA;AAAA,IACN,SAAA,GAAY;AACV,MAAA,cAAA,EAAe;AAAA,IACjB;AAAA,GACF;AACF,CAAA,CAAA;AAgBO,MAAM,eAAA,GAAkB,kBAAkB,gBAAgB;;;;"}

package/build/esm/integrations/tracing/knex/vendored/instrumentation.js

@@ -1,59 +1,61 @@
-import * as api from '@opentelemetry/api';
-import { SDK_VERSION } from '@sentry/core';
-import { MODULE_NAME, SUPPORTED_VERSIONS } from './constants.js';
-import { InstrumentationBase, semconvStabilityFromStr, InstrumentationNodeModuleDefinition, SemconvStability, isWrapped } from '@opentelemetry/instrumentation';
+import { SpanKind } from '@opentelemetry/api';
+import { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';
+import { SDK_VERSION, getActiveSpan, startSpan, SPAN_STATUS_ERROR, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import { InstrumentationNodeModuleFile } from '../../InstrumentationNodeModuleFile.js';
-import { extractTableName, extractDatabaseFromConnectionString, extractPortFromConnectionString, extractHostFromConnectionString, mapSystem, limitLength, getName, getFormatter, otelExceptionFromKnexError } from './utils.js';
-import { ATTR_SERVER_PORT, ATTR_SERVER_ADDRESS, ATTR_DB_NAMESPACE, ATTR_DB_OPERATION_NAME, ATTR_DB_COLLECTION_NAME, ATTR_DB_SYSTEM_NAME, ATTR_DB_QUERY_TEXT } from '@opentelemetry/semantic-conventions';
-import { ATTR_NET_TRANSPORT, ATTR_NET_PEER_PORT, ATTR_NET_PEER_NAME, ATTR_DB_NAME, ATTR_DB_USER, ATTR_DB_OPERATION, ATTR_DB_SQL_TABLE, ATTR_DB_SYSTEM, ATTR_DB_STATEMENT } from './semconv.js';
+import { ATTR_DB_STATEMENT, ATTR_NET_TRANSPORT, ATTR_NET_PEER_PORT, ATTR_NET_PEER_NAME, ATTR_DB_USER, ATTR_DB_SYSTEM, ATTR_DB_NAME, ATTR_DB_OPERATION, ATTR_DB_SQL_TABLE } from './semconv.js';
+import { extractTableName, extractDatabaseFromConnectionString, limitLength, extractPortFromConnectionString, extractHostFromConnectionString, mapSystem, getName, getFormatter } from './utils.js';
 
 const PACKAGE_NAME = "@sentry/instrumentation-knex";
-const contextSymbol = /* @__PURE__ */ Symbol("opentelemetry.instrumentation-knex.context");
-const DEFAULT_CONFIG = {
-  maxQueryLength: 1022,
-  requireParentSpan: false
-};
+const ORIGIN = "auto.db.otel.knex";
+const MODULE_NAME = "knex";
+const SUPPORTED_VERSIONS = [
+  // use "lib/execution" for runner.js, "lib" for client.js as basepath, latest tested 0.95.6
+  ">=0.22.0 <4",
+  // use "lib" as basepath
+  ">=0.10.0 <0.18.0",
+  ">=0.19.0 <0.22.0",
+  // use "src" as basepath
+  ">=0.18.0 <0.19.0"
+];
+const MAX_QUERY_LENGTH = 1022;
+const parentSpanSymbol = /* @__PURE__ */ Symbol("sentry.instrumentation-knex.parent-span");
 class KnexInstrumentation extends InstrumentationBase {
   constructor(config = {}) {
-    super(PACKAGE_NAME, SDK_VERSION, { ...DEFAULT_CONFIG, ...config });
-    this._semconvStability = semconvStabilityFromStr("database", process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
-  }
-  setConfig(config = {}) {
-    super.setConfig({ ...DEFAULT_CONFIG, ...config });
+    super(PACKAGE_NAME, SDK_VERSION, config);
   }
   init() {
     const module = new InstrumentationNodeModuleDefinition(MODULE_NAME, SUPPORTED_VERSIONS);
     module.files.push(
-      this.getClientNodeModuleFileInstrumentation("src"),
-      this.getClientNodeModuleFileInstrumentation("lib"),
-      this.getRunnerNodeModuleFileInstrumentation("src"),
-      this.getRunnerNodeModuleFileInstrumentation("lib"),
-      this.getRunnerNodeModuleFileInstrumentation("lib/execution")
+      this._getClientNodeModuleFileInstrumentation("src"),
+      this._getClientNodeModuleFileInstrumentation("lib"),
+      this._getRunnerNodeModuleFileInstrumentation("src"),
+      this._getRunnerNodeModuleFileInstrumentation("lib"),
+      this._getRunnerNodeModuleFileInstrumentation("lib/execution")
     );
     return module;
   }
-  getRunnerNodeModuleFileInstrumentation(basePath) {
+  _getRunnerNodeModuleFileInstrumentation(basePath) {
     return new InstrumentationNodeModuleFile(
       `knex/${basePath}/runner.js`,
       SUPPORTED_VERSIONS,
       (Runner, moduleVersion) => {
-        this.ensureWrapped(Runner.prototype, "query", this.createQueryWrapper(moduleVersion));
+        this._ensureWrapped(Runner.prototype, "query", this._createQueryWrapper(moduleVersion));
         return Runner;
       },
-      (Runner, _moduleVersion) => {
+      (Runner) => {
         this._unwrap(Runner.prototype, "query");
         return Runner;
       }
     );
   }
-  getClientNodeModuleFileInstrumentation(basePath) {
+  _getClientNodeModuleFileInstrumentation(basePath) {
     return new InstrumentationNodeModuleFile(
       `knex/${basePath}/client.js`,
       SUPPORTED_VERSIONS,
       (Client) => {
-        this.ensureWrapped(Client.prototype, "queryBuilder", this.storeContext.bind(this));
-        this.ensureWrapped(Client.prototype, "schemaBuilder", this.storeContext.bind(this));
-        this.ensureWrapped(Client.prototype, "raw", this.storeContext.bind(this));
+        this._ensureWrapped(Client.prototype, "queryBuilder", this._storeContext.bind(this));
+        this._ensureWrapped(Client.prototype, "schemaBuilder", this._storeContext.bind(this));
+        this._ensureWrapped(Client.prototype, "raw", this._storeContext.bind(this));
         return Client;
       },
       (Client) => {
@@ -64,8 +66,7 @@ class KnexInstrumentation extends InstrumentationBase {
       }
     );
   }
-  createQueryWrapper(moduleVersion) {
-    const instrumentation = this;
+  _createQueryWrapper(moduleVersion) {
     return function wrapQuery(original) {
       return function wrapped_logging_method(query) {
         const config = this.client.config;
@@ -73,83 +74,54 @@ class KnexInstrumentation extends InstrumentationBase {
         const operation = query?.method;
         const connectionString = config?.connection?.connectionString;
         const name = config?.connection?.filename || config?.connection?.database || extractDatabaseFromConnectionString(connectionString);
-        const { maxQueryLength } = instrumentation.getConfig();
         const attributes = {
-          "knex.version": moduleVersion
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,
+          "knex.version": moduleVersion,
+          [ATTR_DB_SYSTEM]: mapSystem(this.client.driverName),
+          [ATTR_DB_SQL_TABLE]: table,
+          [ATTR_DB_OPERATION]: operation,
+          [ATTR_DB_USER]: config?.connection?.user,
+          [ATTR_DB_NAME]: name,
+          [ATTR_NET_PEER_NAME]: config?.connection?.host ?? extractHostFromConnectionString(connectionString),
+          [ATTR_NET_PEER_PORT]: config?.connection?.port ?? extractPortFromConnectionString(connectionString),
+          [ATTR_NET_TRANSPORT]: config?.connection?.filename === ":memory:" ? "inproc" : void 0,
+          [ATTR_DB_STATEMENT]: limitLength(query?.sql, MAX_QUERY_LENGTH)
         };
-        const transport = config?.connection?.filename === ":memory:" ? "inproc" : void 0;
-        if (instrumentation._semconvStability & SemconvStability.OLD) {
-          Object.assign(attributes, {
-            [ATTR_DB_SYSTEM]: mapSystem(this.client.driverName),
-            [ATTR_DB_SQL_TABLE]: table,
-            [ATTR_DB_OPERATION]: operation,
-            [ATTR_DB_USER]: config?.connection?.user,
-            [ATTR_DB_NAME]: name,
-            [ATTR_NET_PEER_NAME]: config?.connection?.host ?? extractHostFromConnectionString(connectionString),
-            [ATTR_NET_PEER_PORT]: config?.connection?.port ?? extractPortFromConnectionString(connectionString),
-            [ATTR_NET_TRANSPORT]: transport
-          });
-        }
-        if (instrumentation._semconvStability & SemconvStability.STABLE) {
-          Object.assign(attributes, {
-            [ATTR_DB_SYSTEM_NAME]: mapSystem(this.client.driverName),
-            [ATTR_DB_COLLECTION_NAME]: table,
-            [ATTR_DB_OPERATION_NAME]: operation,
-            [ATTR_DB_NAMESPACE]: name,
-            [ATTR_SERVER_ADDRESS]: config?.connection?.host ?? extractHostFromConnectionString(connectionString),
-            [ATTR_SERVER_PORT]: config?.connection?.port ?? extractPortFromConnectionString(connectionString)
-          });
-        }
-        if (maxQueryLength) {
-          const queryText = limitLength(query?.sql, maxQueryLength);
-          if (instrumentation._semconvStability & SemconvStability.STABLE) {
-            attributes[ATTR_DB_QUERY_TEXT] = queryText;
-          }
-          if (instrumentation._semconvStability & SemconvStability.OLD) {
-            attributes[ATTR_DB_STATEMENT] = queryText;
-          }
-        }
-        const parentContext = this.builder[contextSymbol] || api.context.active();
-        const parentSpan = api.trace.getSpan(parentContext);
-        const hasActiveParent = parentSpan && api.trace.isSpanContextValid(parentSpan.spanContext());
-        if (instrumentation._config.requireParentSpan && !hasActiveParent) {
-          return original.bind(this)(...arguments);
-        }
-        const span = instrumentation.tracer.startSpan(
-          getName(name, operation, table),
+        const parentSpan = this.builder[parentSpanSymbol] || getActiveSpan();
+        const args = arguments;
+        return startSpan(
           {
-            kind: api.SpanKind.CLIENT,
-            attributes
+            name: getName(name, operation, table),
+            kind: SpanKind.CLIENT,
+            attributes,
+            parentSpan,
+            onlyIfParent: true
           },
-          parentContext
+          (span) => (
+            // `Runner.query` returns a real, already-executing Promise, so it is safe to let
+            // `startSpan` await it and auto-end the span.
+            original.apply(this, args).catch((err) => {
+              const formatter = getFormatter(this);
+              const fullQuery = formatter(query.sql, query.bindings || []);
+              const message = err.message.replace(`${fullQuery} - `, "");
+              span.setStatus({ code: SPAN_STATUS_ERROR, message });
+              throw err;
+            })
+          )
         );
-        const spanContext = api.trace.setSpan(api.context.active(), span);
-        return api.context.with(spanContext, original, this, ...arguments).then((result) => {
-          span.end();
-          return result;
-        }).catch((err) => {
-          const formatter = getFormatter(this);
-          const fullQuery = formatter(query.sql, query.bindings || []);
-          const message = err.message.replace(fullQuery + " - ", "");
-          const exc = otelExceptionFromKnexError(err, message);
-          span.recordException(exc);
-          span.setStatus({ code: api.SpanStatusCode.ERROR, message });
-          span.end();
-          throw err;
-        });
       };
     };
   }
-  storeContext(original) {
+  _storeContext(original) {
     return function wrapped_logging_method() {
       const builder = original.apply(this, arguments);
-      Object.defineProperty(builder, contextSymbol, {
-        value: api.context.active()
+      Object.defineProperty(builder, parentSpanSymbol, {
+        value: getActiveSpan()
       });
       return builder;
     };
   }
-  ensureWrapped(obj, methodName, wrapper) {
+  _ensureWrapped(obj, methodName, wrapper) {
     if (isWrapped(obj[methodName])) {
       this._unwrap(obj, methodName);
     }

package/build/esm/integrations/tracing/knex/vendored/instrumentation.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.js","sources":["../../../../../../src/integrations/tracing/knex/vendored/instrumentation.ts"],"sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * NOTICE from the Sentry authors:\n * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-knex\n * - Upstream version: @opentelemetry/instrumentation-knex@0.62.0\n * - Minor TypeScript strictness adjustments for this repository's compiler settings\n */\n/* eslint-disable */\n\nimport * as api from '@opentelemetry/api';\nimport { SDK_VERSION } from '@sentry/core';\nimport * as constants from './constants';\nimport {\n  InstrumentationBase,\n  InstrumentationNodeModuleDefinition,\n  isWrapped,\n  SemconvStability,\n  semconvStabilityFromStr,\n} from '@opentelemetry/instrumentation';\nimport { InstrumentationNodeModuleFile } from '../../InstrumentationNodeModuleFile';\nimport * as utils from './utils';\nimport { KnexInstrumentationConfig } from './types';\nimport {\n  ATTR_DB_COLLECTION_NAME,\n  ATTR_DB_NAMESPACE,\n  ATTR_DB_OPERATION_NAME,\n  ATTR_DB_QUERY_TEXT,\n  ATTR_DB_SYSTEM_NAME,\n  ATTR_SERVER_ADDRESS,\n  ATTR_SERVER_PORT,\n} from '@opentelemetry/semantic-conventions';\nimport {\n  ATTR_DB_NAME,\n  ATTR_DB_OPERATION,\n  ATTR_DB_SQL_TABLE,\n  ATTR_DB_STATEMENT,\n  ATTR_DB_SYSTEM,\n  ATTR_DB_USER,\n  ATTR_NET_PEER_NAME,\n  ATTR_NET_PEER_PORT,\n  ATTR_NET_TRANSPORT,\n} from './semconv';\n\nconst PACKAGE_NAME = '@sentry/instrumentation-knex';\n\nconst contextSymbol = Symbol('opentelemetry.instrumentation-knex.context');\nconst DEFAULT_CONFIG: KnexInstrumentationConfig = {\n  maxQueryLength: 1022,\n  requireParentSpan: false,\n};\n\nexport class KnexInstrumentation extends InstrumentationBase<KnexInstrumentationConfig> {\n  private _semconvStability: SemconvStability;\n\n  constructor(config: KnexInstrumentationConfig = {}) {\n    super(PACKAGE_NAME, SDK_VERSION, { ...DEFAULT_CONFIG, ...config });\n\n    this._semconvStability = semconvStabilityFromStr('database', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);\n  }\n\n  override setConfig(config: KnexInstrumentationConfig = {}) {\n    super.setConfig({ ...DEFAULT_CONFIG, ...config });\n  }\n\n  init() {\n    const module = new InstrumentationNodeModuleDefinition(constants.MODULE_NAME, constants.SUPPORTED_VERSIONS);\n\n    module.files.push(\n      this.getClientNodeModuleFileInstrumentation('src'),\n      this.getClientNodeModuleFileInstrumentation('lib'),\n      this.getRunnerNodeModuleFileInstrumentation('src'),\n      this.getRunnerNodeModuleFileInstrumentation('lib'),\n      this.getRunnerNodeModuleFileInstrumentation('lib/execution'),\n    );\n\n    return module;\n  }\n\n  private getRunnerNodeModuleFileInstrumentation(basePath: string) {\n    return new InstrumentationNodeModuleFile(\n      `knex/${basePath}/runner.js`,\n      constants.SUPPORTED_VERSIONS,\n      (Runner: any, moduleVersion?: string) => {\n        this.ensureWrapped(Runner.prototype, 'query', this.createQueryWrapper(moduleVersion));\n        return Runner;\n      },\n      (Runner: any, _moduleVersion?: string) => {\n        this._unwrap(Runner.prototype, 'query');\n        return Runner;\n      },\n    );\n  }\n\n  private getClientNodeModuleFileInstrumentation(basePath: string) {\n    return new InstrumentationNodeModuleFile(\n      `knex/${basePath}/client.js`,\n      constants.SUPPORTED_VERSIONS,\n      (Client: any) => {\n        this.ensureWrapped(Client.prototype, 'queryBuilder', this.storeContext.bind(this));\n        this.ensureWrapped(Client.prototype, 'schemaBuilder', this.storeContext.bind(this));\n        this.ensureWrapped(Client.prototype, 'raw', this.storeContext.bind(this));\n        return Client;\n      },\n      (Client: any) => {\n        this._unwrap(Client.prototype, 'queryBuilder');\n        this._unwrap(Client.prototype, 'schemaBuilder');\n        this._unwrap(Client.prototype, 'raw');\n        return Client;\n      },\n    );\n  }\n\n  private createQueryWrapper(moduleVersion?: string) {\n    const instrumentation = this;\n\n    return function wrapQuery(original: (...args: any[]) => any) {\n      return function wrapped_logging_method(this: any, query: any) {\n        const config = this.client.config;\n\n        const table = utils.extractTableName(this.builder);\n        const operation = query?.method;\n        const connectionString = config?.connection?.connectionString;\n        const name =\n          config?.connection?.filename ||\n          config?.connection?.database ||\n          utils.extractDatabaseFromConnectionString(connectionString);\n        const { maxQueryLength } = instrumentation.getConfig();\n\n        const attributes: api.Attributes = {\n          'knex.version': moduleVersion,\n        };\n        const transport = config?.connection?.filename === ':memory:' ? 'inproc' : undefined;\n\n        if (instrumentation._semconvStability & SemconvStability.OLD) {\n          Object.assign(attributes, {\n            [ATTR_DB_SYSTEM]: utils.mapSystem(this.client.driverName),\n            [ATTR_DB_SQL_TABLE]: table,\n            [ATTR_DB_OPERATION]: operation,\n            [ATTR_DB_USER]: config?.connection?.user,\n            [ATTR_DB_NAME]: name,\n            [ATTR_NET_PEER_NAME]: config?.connection?.host ?? utils.extractHostFromConnectionString(connectionString),\n            [ATTR_NET_PEER_PORT]: config?.connection?.port ?? utils.extractPortFromConnectionString(connectionString),\n            [ATTR_NET_TRANSPORT]: transport,\n          });\n        }\n        if (instrumentation._semconvStability & SemconvStability.STABLE) {\n          Object.assign(attributes, {\n            [ATTR_DB_SYSTEM_NAME]: utils.mapSystem(this.client.driverName),\n            [ATTR_DB_COLLECTION_NAME]: table,\n            [ATTR_DB_OPERATION_NAME]: operation,\n            [ATTR_DB_NAMESPACE]: name,\n            [ATTR_SERVER_ADDRESS]: config?.connection?.host ?? utils.extractHostFromConnectionString(connectionString),\n            [ATTR_SERVER_PORT]: config?.connection?.port ?? utils.extractPortFromConnectionString(connectionString),\n          });\n        }\n        if (maxQueryLength) {\n          const queryText = utils.limitLength(query?.sql, maxQueryLength);\n          if (instrumentation._semconvStability & SemconvStability.STABLE) {\n            attributes[ATTR_DB_QUERY_TEXT] = queryText;\n          }\n          if (instrumentation._semconvStability & SemconvStability.OLD) {\n            attributes[ATTR_DB_STATEMENT] = queryText;\n          }\n        }\n\n        const parentContext = this.builder[contextSymbol] || api.context.active();\n        const parentSpan = api.trace.getSpan(parentContext);\n        const hasActiveParent = parentSpan && api.trace.isSpanContextValid(parentSpan.spanContext());\n        if (instrumentation._config.requireParentSpan && !hasActiveParent) {\n          return original.bind(this)(...arguments);\n        }\n\n        const span = instrumentation.tracer.startSpan(\n          utils.getName(name, operation, table),\n          {\n            kind: api.SpanKind.CLIENT,\n            attributes,\n          },\n          parentContext,\n        );\n        const spanContext = api.trace.setSpan(api.context.active(), span);\n\n        return api.context\n          .with(spanContext, original, this, ...arguments)\n          .then((result: unknown) => {\n            span.end();\n            return result;\n          })\n          .catch((err: any) => {\n            const formatter = utils.getFormatter(this);\n            const fullQuery = formatter(query.sql, query.bindings || []);\n            const message = err.message.replace(fullQuery + ' - ', '');\n            const exc = utils.otelExceptionFromKnexError(err, message);\n            span.recordException(exc);\n            span.setStatus({ code: api.SpanStatusCode.ERROR, message });\n            span.end();\n            throw err;\n          });\n      };\n    };\n  }\n\n  private storeContext(original: Function) {\n    return function wrapped_logging_method(this: any) {\n      const builder = original.apply(this, arguments);\n      Object.defineProperty(builder, contextSymbol, {\n        value: api.context.active(),\n      });\n      return builder;\n    };\n  }\n\n  ensureWrapped(obj: any, methodName: string, wrapper: (original: any) => any) {\n    if (isWrapped(obj[methodName])) {\n      this._unwrap(obj, methodName);\n    }\n    this._wrap(obj, methodName, wrapper);\n  }\n}\n"],"names":["constants.MODULE_NAME","constants.SUPPORTED_VERSIONS","utils.extractTableName","utils.extractDatabaseFromConnectionString","utils.mapSystem","utils.extractHostFromConnectionString","utils.extractPortFromConnectionString","utils.limitLength","utils.getName","utils.getFormatter","utils.otelExceptionFromKnexError"],"mappings":"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"}
+{"version":3,"file":"instrumentation.js","sources":["../../../../../../src/integrations/tracing/knex/vendored/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/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-knex\n * - Upstream version: @opentelemetry/instrumentation-knex@0.62.0\n * - Minor TypeScript strictness adjustments for this repository's compiler settings\n * - Refactored to use Sentry's span APIs instead of OpenTelemetry tracing APIs\n */\n\n/* oxlint-disable typescript/no-deprecated */\n\nimport { SpanKind } from '@opentelemetry/api';\nimport type { InstrumentationConfig } from '@opentelemetry/instrumentation';\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_STATUS_ERROR,\n  startSpan,\n} from '@sentry/core';\nimport { InstrumentationNodeModuleFile } from '../../InstrumentationNodeModuleFile';\nimport {\n  ATTR_DB_NAME,\n  ATTR_DB_OPERATION,\n  ATTR_DB_SQL_TABLE,\n  ATTR_DB_STATEMENT,\n  ATTR_DB_SYSTEM,\n  ATTR_DB_USER,\n  ATTR_NET_PEER_NAME,\n  ATTR_NET_PEER_PORT,\n  ATTR_NET_TRANSPORT,\n} from './semconv';\nimport * as utils from './utils';\n\nconst PACKAGE_NAME = '@sentry/instrumentation-knex';\nconst ORIGIN = 'auto.db.otel.knex';\n\nconst MODULE_NAME = 'knex';\nconst SUPPORTED_VERSIONS = [\n  // use \"lib/execution\" for runner.js, \"lib\" for client.js as basepath, latest tested 0.95.6\n  '>=0.22.0 <4',\n  // use \"lib\" as basepath\n  '>=0.10.0 <0.18.0',\n  '>=0.19.0 <0.22.0',\n  // use \"src\" as basepath\n  '>=0.18.0 <0.19.0',\n];\n\n// Max length of the query text captured in the `db.statement` attribute; \"..\" is appended when truncated.\nconst MAX_QUERY_LENGTH = 1022;\n\nconst parentSpanSymbol = Symbol('sentry.instrumentation-knex.parent-span');\n\nexport class KnexInstrumentation extends InstrumentationBase<InstrumentationConfig> {\n  public constructor(config: InstrumentationConfig = {}) {\n    super(PACKAGE_NAME, SDK_VERSION, config);\n  }\n\n  public init(): InstrumentationNodeModuleDefinition {\n    const module = new InstrumentationNodeModuleDefinition(MODULE_NAME, SUPPORTED_VERSIONS);\n\n    module.files.push(\n      this._getClientNodeModuleFileInstrumentation('src'),\n      this._getClientNodeModuleFileInstrumentation('lib'),\n      this._getRunnerNodeModuleFileInstrumentation('src'),\n      this._getRunnerNodeModuleFileInstrumentation('lib'),\n      this._getRunnerNodeModuleFileInstrumentation('lib/execution'),\n    );\n\n    return module;\n  }\n\n  private _getRunnerNodeModuleFileInstrumentation(basePath: string): InstrumentationNodeModuleFile {\n    return new InstrumentationNodeModuleFile(\n      `knex/${basePath}/runner.js`,\n      SUPPORTED_VERSIONS,\n      (Runner: any, moduleVersion?: string) => {\n        this._ensureWrapped(Runner.prototype, 'query', this._createQueryWrapper(moduleVersion));\n        return Runner;\n      },\n      (Runner: any) => {\n        this._unwrap(Runner.prototype, 'query');\n        return Runner;\n      },\n    );\n  }\n\n  private _getClientNodeModuleFileInstrumentation(basePath: string): InstrumentationNodeModuleFile {\n    return new InstrumentationNodeModuleFile(\n      `knex/${basePath}/client.js`,\n      SUPPORTED_VERSIONS,\n      (Client: any) => {\n        this._ensureWrapped(Client.prototype, 'queryBuilder', this._storeContext.bind(this));\n        this._ensureWrapped(Client.prototype, 'schemaBuilder', this._storeContext.bind(this));\n        this._ensureWrapped(Client.prototype, 'raw', this._storeContext.bind(this));\n        return Client;\n      },\n      (Client: any) => {\n        this._unwrap(Client.prototype, 'queryBuilder');\n        this._unwrap(Client.prototype, 'schemaBuilder');\n        this._unwrap(Client.prototype, 'raw');\n        return Client;\n      },\n    );\n  }\n\n  private _createQueryWrapper(moduleVersion?: string) {\n    return function wrapQuery(original: (...args: any[]) => any) {\n      return function wrapped_logging_method(this: any, query: any) {\n        const config = this.client.config;\n\n        const table = utils.extractTableName(this.builder);\n        const operation = query?.method;\n        const connectionString = config?.connection?.connectionString;\n        const name =\n          config?.connection?.filename ||\n          config?.connection?.database ||\n          utils.extractDatabaseFromConnectionString(connectionString);\n\n        const attributes: SpanAttributes = {\n          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,\n          'knex.version': moduleVersion,\n          [ATTR_DB_SYSTEM]: utils.mapSystem(this.client.driverName),\n          [ATTR_DB_SQL_TABLE]: table,\n          [ATTR_DB_OPERATION]: operation,\n          [ATTR_DB_USER]: config?.connection?.user,\n          [ATTR_DB_NAME]: name,\n          [ATTR_NET_PEER_NAME]: config?.connection?.host ?? utils.extractHostFromConnectionString(connectionString),\n          [ATTR_NET_PEER_PORT]: config?.connection?.port ?? utils.extractPortFromConnectionString(connectionString),\n          [ATTR_NET_TRANSPORT]: config?.connection?.filename === ':memory:' ? 'inproc' : undefined,\n          [ATTR_DB_STATEMENT]: utils.limitLength(query?.sql, MAX_QUERY_LENGTH),\n        };\n\n        // The query builder captures the span active when it was created (see `_storeContext`).\n        // `onlyIfParent` ensures we only instrument queries that run as part of an existing trace.\n        const parentSpan: Span | undefined = this.builder[parentSpanSymbol] || getActiveSpan();\n\n        const args = arguments;\n        return startSpan(\n          {\n            name: utils.getName(name, operation, table),\n            kind: SpanKind.CLIENT,\n            attributes,\n            parentSpan,\n            onlyIfParent: true,\n          },\n          span =>\n            // `Runner.query` returns a real, already-executing Promise, so it is safe to let\n            // `startSpan` await it and auto-end the span.\n            original.apply(this, args).catch((err: any) => {\n              const formatter = utils.getFormatter(this);\n              const fullQuery = formatter(query.sql, query.bindings || []);\n              const message = err.message.replace(`${fullQuery} - `, '');\n              span.setStatus({ code: SPAN_STATUS_ERROR, message });\n              throw err;\n            }),\n        );\n      };\n    };\n  }\n\n  private _storeContext(original: (...args: any[]) => any) {\n    return function wrapped_logging_method(this: any) {\n      const builder = original.apply(this, arguments);\n      // Capture the span that is active when the query builder is created. The query often executes\n      // in a different async context, so we reuse this span as the parent when the query runs.\n      Object.defineProperty(builder, parentSpanSymbol, {\n        value: getActiveSpan(),\n      });\n      return builder;\n    };\n  }\n\n  private _ensureWrapped(obj: any, methodName: string, wrapper: (original: any) => any): void {\n    if (isWrapped(obj[methodName])) {\n      this._unwrap(obj, methodName);\n    }\n    this._wrap(obj, methodName, wrapper);\n  }\n}\n"],"names":["utils.extractTableName","utils.extractDatabaseFromConnectionString","utils.mapSystem","utils.extractHostFromConnectionString","utils.extractPortFromConnectionString","utils.limitLength","utils.getName","utils.getFormatter"],"mappings":"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"}

package/build/esm/integrations/tracing/knex/vendored/semconv.js

@@ -8,6 +8,7 @@ const ATTR_NET_PEER_NAME = "net.peer.name";
 const ATTR_NET_PEER_PORT = "net.peer.port";
 const ATTR_NET_TRANSPORT = "net.transport";
 const DB_SYSTEM_NAME_VALUE_SQLITE = "sqlite";
+const DB_SYSTEM_NAME_VALUE_POSTGRESQL = "postgresql";
 
-export { ATTR_DB_NAME, ATTR_DB_OPERATION, ATTR_DB_SQL_TABLE, ATTR_DB_STATEMENT, ATTR_DB_SYSTEM, ATTR_DB_USER, ATTR_NET_PEER_NAME, ATTR_NET_PEER_PORT, ATTR_NET_TRANSPORT, DB_SYSTEM_NAME_VALUE_SQLITE };
+export { ATTR_DB_NAME, ATTR_DB_OPERATION, ATTR_DB_SQL_TABLE, ATTR_DB_STATEMENT, ATTR_DB_SYSTEM, ATTR_DB_USER, ATTR_NET_PEER_NAME, ATTR_NET_PEER_PORT, ATTR_NET_TRANSPORT, DB_SYSTEM_NAME_VALUE_POSTGRESQL, DB_SYSTEM_NAME_VALUE_SQLITE };
 //# sourceMappingURL=semconv.js.map

package/build/esm/integrations/tracing/knex/vendored/semconv.js.map

@@ -1 +1 @@
-{"version":3,"file":"semconv.js","sources":["../../../../../../src/integrations/tracing/knex/vendored/semconv.ts"],"sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * NOTICE from the Sentry authors:\n * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-knex\n * - Upstream version: @opentelemetry/instrumentation-knex@0.62.0\n */\n/* eslint-disable */\n\n/**\n * @deprecated Replaced by `db.namespace`.\n */\nexport const ATTR_DB_NAME = 'db.name' as const;\n\n/**\n * @deprecated Replaced by `db.operation.name`.\n */\nexport const ATTR_DB_OPERATION = 'db.operation' as const;\n\n/**\n * @deprecated Replaced by `db.collection.name`.\n */\nexport const ATTR_DB_SQL_TABLE = 'db.sql.table' as const;\n\n/**\n * @deprecated Replaced by `db.query.text`.\n */\nexport const ATTR_DB_STATEMENT = 'db.statement' as const;\n\n/**\n * @deprecated Replaced by `db.system.name`.\n */\nexport const ATTR_DB_SYSTEM = 'db.system' as const;\n\n/**\n * @deprecated Removed, no replacement at this time.\n */\nexport const ATTR_DB_USER = 'db.user' as const;\n\n/**\n * @deprecated Replaced by `server.address` on client spans and `client.address` on server spans.\n */\nexport const ATTR_NET_PEER_NAME = 'net.peer.name' as const;\n\n/**\n * @deprecated Replaced by `server.port` on client spans and `client.port` on server spans.\n */\nexport const ATTR_NET_PEER_PORT = 'net.peer.port' as const;\n\n/**\n * @deprecated Replaced by `network.transport`.\n */\nexport const ATTR_NET_TRANSPORT = 'net.transport' as const;\n\nexport const DB_SYSTEM_NAME_VALUE_SQLITE = 'sqlite' as const;\n"],"names":[],"mappings":"AAwBO,MAAM,YAAA,GAAe;AAKrB,MAAM,iBAAA,GAAoB;AAK1B,MAAM,iBAAA,GAAoB;AAK1B,MAAM,iBAAA,GAAoB;AAK1B,MAAM,cAAA,GAAiB;AAKvB,MAAM,YAAA,GAAe;AAKrB,MAAM,kBAAA,GAAqB;AAK3B,MAAM,kBAAA,GAAqB;AAK3B,MAAM,kBAAA,GAAqB;AAE3B,MAAM,2BAAA,GAA8B;;;;"}
+{"version":3,"file":"semconv.js","sources":["../../../../../../src/integrations/tracing/knex/vendored/semconv.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/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-knex\n * - Upstream version: @opentelemetry/instrumentation-knex@0.62.0\n */\n\n/**\n * @deprecated Replaced by `db.namespace`.\n */\nexport const ATTR_DB_NAME = 'db.name' as const;\n\n/**\n * @deprecated Replaced by `db.operation.name`.\n */\nexport const ATTR_DB_OPERATION = 'db.operation' as const;\n\n/**\n * @deprecated Replaced by `db.collection.name`.\n */\nexport const ATTR_DB_SQL_TABLE = 'db.sql.table' as const;\n\n/**\n * @deprecated Replaced by `db.query.text`.\n */\nexport const ATTR_DB_STATEMENT = 'db.statement' as const;\n\n/**\n * @deprecated Replaced by `db.system.name`.\n */\nexport const ATTR_DB_SYSTEM = 'db.system' as const;\n\n/**\n * @deprecated Removed, no replacement at this time.\n */\nexport const ATTR_DB_USER = 'db.user' as const;\n\n/**\n * @deprecated Replaced by `server.address` on client spans and `client.address` on server spans.\n */\nexport const ATTR_NET_PEER_NAME = 'net.peer.name' as const;\n\n/**\n * @deprecated Replaced by `server.port` on client spans and `client.port` on server spans.\n */\nexport const ATTR_NET_PEER_PORT = 'net.peer.port' as const;\n\n/**\n * @deprecated Replaced by `network.transport`.\n */\nexport const ATTR_NET_TRANSPORT = 'net.transport' as const;\n\nexport const DB_SYSTEM_NAME_VALUE_SQLITE = 'sqlite' as const;\n\nexport const DB_SYSTEM_NAME_VALUE_POSTGRESQL = 'postgresql' as const;\n"],"names":[],"mappings":"AAYO,MAAM,YAAA,GAAe;AAKrB,MAAM,iBAAA,GAAoB;AAK1B,MAAM,iBAAA,GAAoB;AAK1B,MAAM,iBAAA,GAAoB;AAK1B,MAAM,cAAA,GAAiB;AAKvB,MAAM,YAAA,GAAe;AAKrB,MAAM,kBAAA,GAAqB;AAK3B,MAAM,kBAAA,GAAqB;AAK3B,MAAM,kBAAA,GAAqB;AAE3B,MAAM,2BAAA,GAA8B;AAEpC,MAAM,+BAAA,GAAkC;;;;"}

package/build/esm/integrations/tracing/knex/vendored/utils.js

@@ -1,5 +1,4 @@
-import { DB_SYSTEM_NAME_VALUE_POSTGRESQL } from '@opentelemetry/semantic-conventions';
-import { DB_SYSTEM_NAME_VALUE_SQLITE } from './semconv.js';
+import { DB_SYSTEM_NAME_VALUE_SQLITE, DB_SYSTEM_NAME_VALUE_POSTGRESQL } from './semconv.js';
 
 const getFormatter = (runner) => {
   if (runner) {
@@ -16,17 +15,6 @@ const getFormatter = (runner) => {
   }
   return () => "<noop formatter>";
 };
-function otelExceptionFromKnexError(err, message) {
-  if (!(err && err instanceof Error)) {
-    return err;
-  }
-  return {
-    message,
-    code: err.code,
-    stack: err.stack,
-    name: err.name
-  };
-}
 const systemMap = /* @__PURE__ */ new Map([
   ["sqlite3", DB_SYSTEM_NAME_VALUE_SQLITE],
   ["pg", DB_SYSTEM_NAME_VALUE_POSTGRESQL]
@@ -45,7 +33,7 @@ const getName = (db, operation, table) => {
 };
 const limitLength = (str, maxLength) => {
   if (typeof str === "string" && typeof maxLength === "number" && 0 < maxLength && maxLength < str.length) {
-    return str.substring(0, maxLength) + "..";
+    return `${str.substring(0, maxLength)}..`;
   }
   return str;
 };
@@ -83,5 +71,5 @@ const extractTableName = (builder) => {
   return table;
 };
 
-export { extractDatabaseFromConnectionString, extractHostFromConnectionString, extractPortFromConnectionString, extractTableName, getFormatter, getName, limitLength, mapSystem, otelExceptionFromKnexError };
+export { extractDatabaseFromConnectionString, extractHostFromConnectionString, extractPortFromConnectionString, extractTableName, getFormatter, getName, limitLength, mapSystem };
 //# sourceMappingURL=utils.js.map

package/build/esm/integrations/tracing/knex/vendored/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sources":["../../../../../../src/integrations/tracing/knex/vendored/utils.ts"],"sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * NOTICE from the Sentry authors:\n * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-knex\n * - Upstream version: @opentelemetry/instrumentation-knex@0.62.0\n */\n/* eslint-disable */\n\nimport { Exception } from '@opentelemetry/api';\nimport { DB_SYSTEM_NAME_VALUE_POSTGRESQL } from '@opentelemetry/semantic-conventions';\nimport { DB_SYSTEM_NAME_VALUE_SQLITE } from './semconv';\n\ntype KnexError = Error & {\n  code?: string;\n};\n\nexport const getFormatter = (runner: any) => {\n  if (runner) {\n    if (runner.client) {\n      if (runner.client._formatQuery) {\n        return runner.client._formatQuery.bind(runner.client);\n      } else if (runner.client.SqlString) {\n        return runner.client.SqlString.format.bind(runner.client.SqlString);\n      }\n    }\n    if (runner.builder) {\n      return runner.builder.toString.bind(runner.builder);\n    }\n  }\n  return () => '<noop formatter>';\n};\n\nexport function otelExceptionFromKnexError(err: KnexError, message: string): Exception {\n  if (!(err && err instanceof Error)) {\n    return err;\n  }\n\n  return {\n    message,\n    code: err.code,\n    stack: err.stack,\n    name: err.name,\n  };\n}\n\nconst systemMap = new Map([\n  ['sqlite3', DB_SYSTEM_NAME_VALUE_SQLITE],\n  ['pg', DB_SYSTEM_NAME_VALUE_POSTGRESQL],\n]);\n\nexport const mapSystem = (knexSystem: string) => {\n  return systemMap.get(knexSystem) || knexSystem;\n};\n\nexport const getName = (db: string, operation?: string, table?: string) => {\n  if (operation) {\n    if (table) {\n      return `${operation} ${db}.${table}`;\n    }\n    return `${operation} ${db}`;\n  }\n  return db;\n};\n\nexport const limitLength = (str: string, maxLength: number) => {\n  if (typeof str === 'string' && typeof maxLength === 'number' && 0 < maxLength && maxLength < str.length) {\n    return str.substring(0, maxLength) + '..';\n  }\n  return str;\n};\n\nexport const extractDatabaseFromConnectionString = (connectionString?: string): string | undefined => {\n  if (!connectionString) return undefined;\n  try {\n    const db = new URL(connectionString).pathname?.replace(/^\\//, '');\n    return db || undefined;\n  } catch {\n    return undefined;\n  }\n};\n\nexport const extractHostFromConnectionString = (connectionString?: string): string | undefined => {\n  if (!connectionString) return undefined;\n  try {\n    return new URL(connectionString).hostname || undefined;\n  } catch {\n    return undefined;\n  }\n};\n\nexport const extractPortFromConnectionString = (connectionString?: string): number | undefined => {\n  if (!connectionString) return undefined;\n  try {\n    const port = new URL(connectionString).port;\n    return port ? parseInt(port, 10) : undefined;\n  } catch {\n    return undefined;\n  }\n};\n\nexport const extractTableName = (builder: any): string => {\n  const table = builder?._single?.table;\n  if (typeof table === 'object') {\n    return extractTableName(table);\n  }\n  return table;\n};\n"],"names":[],"mappings":";;;AA6BO,MAAM,YAAA,GAAe,CAAC,MAAA,KAAgB;AAC3C,EAAA,IAAI,MAAA,EAAQ;AACV,IAAA,IAAI,OAAO,MAAA,EAAQ;AACjB,MAAA,IAAI,MAAA,CAAO,OAAO,YAAA,EAAc;AAC9B,QAAA,OAAO,MAAA,CAAO,MAAA,CAAO,YAAA,CAAa,IAAA,CAAK,OAAO,MAAM,CAAA;AAAA,MACtD,CAAA,MAAA,IAAW,MAAA,CAAO,MAAA,CAAO,SAAA,EAAW;AAClC,QAAA,OAAO,OAAO,MAAA,CAAO,SAAA,CAAU,OAAO,IAAA,CAAK,MAAA,CAAO,OAAO,SAAS,CAAA;AAAA,MACpE;AAAA,IACF;AACA,IAAA,IAAI,OAAO,OAAA,EAAS;AAClB,MAAA,OAAO,MAAA,CAAO,OAAA,CAAQ,QAAA,CAAS,IAAA,CAAK,OAAO,OAAO,CAAA;AAAA,IACpD;AAAA,EACF;AACA,EAAA,OAAO,MAAM,kBAAA;AACf;AAEO,SAAS,0BAAA,CAA2B,KAAgB,OAAA,EAA4B;AACrF,EAAA,IAAI,EAAE,GAAA,IAAO,GAAA,YAAe,KAAA,CAAA,EAAQ;AAClC,IAAA,OAAO,GAAA;AAAA,EACT;AAEA,EAAA,OAAO;AAAA,IACL,OAAA;AAAA,IACA,MAAM,GAAA,CAAI,IAAA;AAAA,IACV,OAAO,GAAA,CAAI,KAAA;AAAA,IACX,MAAM,GAAA,CAAI;AAAA,GACZ;AACF;AAEA,MAAM,SAAA,uBAAgB,GAAA,CAAI;AAAA,EACxB,CAAC,WAAW,2BAA2B,CAAA;AAAA,EACvC,CAAC,MAAM,+BAA+B;AACxC,CAAC,CAAA;AAEM,MAAM,SAAA,GAAY,CAAC,UAAA,KAAuB;AAC/C,EAAA,OAAO,SAAA,CAAU,GAAA,CAAI,UAAU,CAAA,IAAK,UAAA;AACtC;AAEO,MAAM,OAAA,GAAU,CAAC,EAAA,EAAY,SAAA,EAAoB,KAAA,KAAmB;AACzE,EAAA,IAAI,SAAA,EAAW;AACb,IAAA,IAAI,KAAA,EAAO;AACT,MAAA,OAAO,CAAA,EAAG,SAAS,CAAA,CAAA,EAAI,EAAE,IAAI,KAAK,CAAA,CAAA;AAAA,IACpC;AACA,IAAA,OAAO,CAAA,EAAG,SAAS,CAAA,CAAA,EAAI,EAAE,CAAA,CAAA;AAAA,EAC3B;AACA,EAAA,OAAO,EAAA;AACT;AAEO,MAAM,WAAA,GAAc,CAAC,GAAA,EAAa,SAAA,KAAsB;AAC7D,EAAA,IAAI,OAAO,GAAA,KAAQ,QAAA,IAAY,OAAO,SAAA,KAAc,YAAY,CAAA,GAAI,SAAA,IAAa,SAAA,GAAY,GAAA,CAAI,MAAA,EAAQ;AACvG,IAAA,OAAO,GAAA,CAAI,SAAA,CAAU,CAAA,EAAG,SAAS,CAAA,GAAI,IAAA;AAAA,EACvC;AACA,EAAA,OAAO,GAAA;AACT;AAEO,MAAM,mCAAA,GAAsC,CAAC,gBAAA,KAAkD;AACpG,EAAA,IAAI,CAAC,kBAAkB,OAAO,MAAA;AAC9B,EAAA,IAAI;AACF,IAAA,MAAM,EAAA,GAAK,IAAI,GAAA,CAAI,gBAAgB,EAAE,QAAA,EAAU,OAAA,CAAQ,OAAO,EAAE,CAAA;AAChE,IAAA,OAAO,EAAA,IAAM,KAAA,CAAA;AAAA,EACf,CAAA,CAAA,MAAQ;AACN,IAAA,OAAO,MAAA;AAAA,EACT;AACF;AAEO,MAAM,+BAAA,GAAkC,CAAC,gBAAA,KAAkD;AAChG,EAAA,IAAI,CAAC,kBAAkB,OAAO,MAAA;AAC9B,EAAA,IAAI;AACF,IAAA,OAAO,IAAI,GAAA,CAAI,gBAAgB,CAAA,CAAE,QAAA,IAAY,KAAA,CAAA;AAAA,EAC/C,CAAA,CAAA,MAAQ;AACN,IAAA,OAAO,MAAA;AAAA,EACT;AACF;AAEO,MAAM,+BAAA,GAAkC,CAAC,gBAAA,KAAkD;AAChG,EAAA,IAAI,CAAC,kBAAkB,OAAO,MAAA;AAC9B,EAAA,IAAI;AACF,IAAA,MAAM,IAAA,GAAO,IAAI,GAAA,CAAI,gBAAgB,CAAA,CAAE,IAAA;AACvC,IAAA,OAAO,IAAA,GAAO,QAAA,CAAS,IAAA,EAAM,EAAE,CAAA,GAAI,KAAA,CAAA;AAAA,EACrC,CAAA,CAAA,MAAQ;AACN,IAAA,OAAO,MAAA;AAAA,EACT;AACF;AAEO,MAAM,gBAAA,GAAmB,CAAC,OAAA,KAAyB;AACxD,EAAA,MAAM,KAAA,GAAQ,SAAS,OAAA,EAAS,KAAA;AAChC,EAAA,IAAI,OAAO,UAAU,QAAA,EAAU;AAC7B,IAAA,OAAO,iBAAiB,KAAK,CAAA;AAAA,EAC/B;AACA,EAAA,OAAO,KAAA;AACT;;;;"}
+{"version":3,"file":"utils.js","sources":["../../../../../../src/integrations/tracing/knex/vendored/utils.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/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-knex\n * - Upstream version: @opentelemetry/instrumentation-knex@0.62.0\n * - Refactored to use Sentry's span APIs instead of OpenTelemetry tracing APIs\n */\n\nimport { DB_SYSTEM_NAME_VALUE_POSTGRESQL, DB_SYSTEM_NAME_VALUE_SQLITE } from './semconv';\n\nexport const getFormatter = (runner: any) => {\n  if (runner) {\n    if (runner.client) {\n      if (runner.client._formatQuery) {\n        return runner.client._formatQuery.bind(runner.client);\n      } else if (runner.client.SqlString) {\n        return runner.client.SqlString.format.bind(runner.client.SqlString);\n      }\n    }\n    if (runner.builder) {\n      return runner.builder.toString.bind(runner.builder);\n    }\n  }\n  return () => '<noop formatter>';\n};\n\nconst systemMap = new Map([\n  ['sqlite3', DB_SYSTEM_NAME_VALUE_SQLITE],\n  ['pg', DB_SYSTEM_NAME_VALUE_POSTGRESQL],\n]);\n\nexport const mapSystem = (knexSystem: string) => {\n  return systemMap.get(knexSystem) || knexSystem;\n};\n\nexport const getName = (db: string, operation?: string, table?: string) => {\n  if (operation) {\n    if (table) {\n      return `${operation} ${db}.${table}`;\n    }\n    return `${operation} ${db}`;\n  }\n  return db;\n};\n\nexport const limitLength = (str: string, maxLength: number) => {\n  if (typeof str === 'string' && typeof maxLength === 'number' && 0 < maxLength && maxLength < str.length) {\n    return `${str.substring(0, maxLength)}..`;\n  }\n  return str;\n};\n\nexport const extractDatabaseFromConnectionString = (connectionString?: string): string | undefined => {\n  if (!connectionString) return undefined;\n  try {\n    const db = new URL(connectionString).pathname?.replace(/^\\//, '');\n    return db || undefined;\n  } catch {\n    return undefined;\n  }\n};\n\nexport const extractHostFromConnectionString = (connectionString?: string): string | undefined => {\n  if (!connectionString) return undefined;\n  try {\n    return new URL(connectionString).hostname || undefined;\n  } catch {\n    return undefined;\n  }\n};\n\nexport const extractPortFromConnectionString = (connectionString?: string): number | undefined => {\n  if (!connectionString) return undefined;\n  try {\n    const port = new URL(connectionString).port;\n    return port ? parseInt(port, 10) : undefined;\n  } catch {\n    return undefined;\n  }\n};\n\nexport const extractTableName = (builder: any): string => {\n  const table = builder?._single?.table;\n  if (typeof table === 'object') {\n    return extractTableName(table);\n  }\n  return table;\n};\n"],"names":[],"mappings":"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"}

package/build/esm/integrations/tracing/koa/index.js

@@ -1,8 +1,6 @@
 import { KoaInstrumentation } from './vendored/instrumentation.js';
-import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
-import { spanToJSON, SEMANTIC_ATTRIBUTE_SENTRY_OP, getIsolationScope, getDefaultIsolationScope, debug, defineIntegration, captureException } from '@sentry/core';
-import { generateInstrumentOnce, addOriginToSpan, ensureIsWrapped } from '@sentry/node-core';
-import { DEBUG_BUILD } from '../../../debug-build.js';
+import { defineIntegration, captureException } from '@sentry/core';
+import { generateInstrumentOnce, ensureIsWrapped } from '@sentry/node-core';
 
 const INTEGRATION_NAME = "Koa";
 const instrumentKoa = generateInstrumentOnce(
@@ -10,28 +8,7 @@ const instrumentKoa = generateInstrumentOnce(
   KoaInstrumentation,
   (options = {}) => {
     return {
-      ignoreLayersType: options.ignoreLayersType,
-      requestHook(span, info) {
-        addOriginToSpan(span, "auto.http.otel.koa");
-        const attributes = spanToJSON(span).data;
-        const type = attributes["koa.type"];
-        if (type) {
-          span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, `${type}.koa`);
-        }
-        const name = attributes["koa.name"];
-        if (typeof name === "string") {
-          span.updateName(name || "< unknown >");
-        }
-        if (getIsolationScope() === getDefaultIsolationScope()) {
-          DEBUG_BUILD && debug.warn("Isolation scope is default isolation scope - skipping setting transactionName");
-          return;
-        }
-        const route = attributes[ATTR_HTTP_ROUTE];
-        const method = info.context?.request?.method?.toUpperCase() || "GET";
-        if (route) {
-          getIsolationScope().setTransactionName(`${method} ${route}`);
-        }
-      }
+      ignoreLayersType: options.ignoreLayersType
     };
   }
 );