@sentry/node 10.58.0 → 10.59.0

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

@@ -1,35 +1,21 @@
-import { ATTR_DB_CONNECTION_STRING, ATTR_DB_NAME, ATTR_DB_USER, ATTR_NET_PEER_NAME, ATTR_NET_PEER_PORT } from './semconv.js';
-import { SemconvStability } from '@opentelemetry/instrumentation';
-import { ATTR_DB_NAMESPACE, ATTR_SERVER_ADDRESS, ATTR_SERVER_PORT } from '@opentelemetry/semantic-conventions';
+import { ATTR_NET_PEER_NAME, ATTR_DB_USER, ATTR_DB_NAME, ATTR_DB_CONNECTION_STRING, ATTR_NET_PEER_PORT } from './semconv.js';
 
-function getConnectionAttributes(config, dbSemconvStability, netSemconvStability) {
+function getConnectionAttributes(config) {
   const { host, port, database, user } = getConfig(config);
-  const attrs = {};
-  if (dbSemconvStability & SemconvStability.OLD) {
-    attrs[ATTR_DB_CONNECTION_STRING] = getJDBCString(host, port, database);
-    attrs[ATTR_DB_NAME] = database;
-    attrs[ATTR_DB_USER] = user;
-  }
-  if (dbSemconvStability & SemconvStability.STABLE) {
-    attrs[ATTR_DB_NAMESPACE] = database;
-  }
+  const attrs = {
+    [ATTR_DB_CONNECTION_STRING]: getJDBCString(host, port, database),
+    [ATTR_DB_NAME]: database,
+    [ATTR_DB_USER]: user,
+    [ATTR_NET_PEER_NAME]: host
+  };
   const portNumber = parseInt(port, 10);
-  if (netSemconvStability & SemconvStability.OLD) {
-    attrs[ATTR_NET_PEER_NAME] = host;
-    if (!isNaN(portNumber)) {
-      attrs[ATTR_NET_PEER_PORT] = portNumber;
-    }
-  }
-  if (netSemconvStability & SemconvStability.STABLE) {
-    attrs[ATTR_SERVER_ADDRESS] = host;
-    if (!isNaN(portNumber)) {
-      attrs[ATTR_SERVER_PORT] = portNumber;
-    }
+  if (!isNaN(portNumber)) {
+    attrs[ATTR_NET_PEER_PORT] = portNumber;
   }
   return attrs;
 }
 function getConfig(config) {
-  const { host, port, database, user } = config && config.connectionConfig || config || {};
+  const { host, port, database, user } = config?.connectionConfig || config || {};
   return { host, port, database, user };
 }
 function getJDBCString(host, port, database) {
@@ -42,23 +28,18 @@ function getJDBCString(host, port, database) {
   }
   return jdbcString;
 }
-function getQueryText(query, format, values, maskStatement = false, maskStatementHook = defaultMaskingHook) {
+function getQueryText(query, format, values) {
   const [querySql, queryValues] = typeof query === "string" ? [query, values] : [query.sql, hasValues(query) ? values || query.values : values];
   try {
-    if (maskStatement) {
-      return maskStatementHook(querySql);
-    } else if (format && queryValues) {
+    if (format && queryValues) {
       return format(querySql, queryValues);
     } else {
       return querySql;
     }
-  } catch (e) {
-    return "Could not determine the query due to an error in masking or formatting";
+  } catch {
+    return "Could not determine the query due to an error in formatting";
   }
 }
-function defaultMaskingHook(query) {
-  return query.replace(/\b\d+\b/g, "?").replace(/(["'])(?:(?=(\\?))\2.)*?\1/g, "?");
-}
 function hasValues(obj) {
   return "values" in obj;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sources":["../../../../../../src/integrations/tracing/mysql2/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-mysql2\n * - Upstream version: @opentelemetry/instrumentation-mysql2@0.64.0\n * - Types from 'mysql2' inlined as simplified interfaces\n */\n/* eslint-disable */\n\nimport { Attributes } from '@opentelemetry/api';\nimport {\n  ATTR_DB_CONNECTION_STRING,\n  ATTR_DB_NAME,\n  ATTR_DB_USER,\n  ATTR_NET_PEER_NAME,\n  ATTR_NET_PEER_PORT,\n} from './semconv';\nimport type { FormatFunction } from './mysql2-types';\nimport { MySQL2InstrumentationQueryMaskingHook } from './types';\nimport { SemconvStability } from '@opentelemetry/instrumentation';\nimport { ATTR_DB_NAMESPACE, ATTR_SERVER_ADDRESS, ATTR_SERVER_PORT } from '@opentelemetry/semantic-conventions';\n\ninterface QueryOptions {\n  sql: string;\n  values?: any | any[] | { [param: string]: any };\n}\n\ninterface Query {\n  sql: string;\n}\n\ninterface Config {\n  host?: string;\n  port?: number;\n  database?: string;\n  user?: string;\n  connectionConfig?: Config;\n}\n\nexport function getConnectionAttributes(\n  config: Config,\n  dbSemconvStability: SemconvStability,\n  netSemconvStability: SemconvStability,\n): Attributes {\n  const { host, port, database, user } = getConfig(config);\n\n  const attrs: Attributes = {};\n  if (dbSemconvStability & SemconvStability.OLD) {\n    attrs[ATTR_DB_CONNECTION_STRING] = getJDBCString(host, port, database);\n    attrs[ATTR_DB_NAME] = database;\n    attrs[ATTR_DB_USER] = user;\n  }\n  if (dbSemconvStability & SemconvStability.STABLE) {\n    attrs[ATTR_DB_NAMESPACE] = database;\n  }\n\n  const portNumber = parseInt(port, 10);\n  if (netSemconvStability & SemconvStability.OLD) {\n    attrs[ATTR_NET_PEER_NAME] = host;\n    if (!isNaN(portNumber)) {\n      attrs[ATTR_NET_PEER_PORT] = portNumber;\n    }\n  }\n  if (netSemconvStability & SemconvStability.STABLE) {\n    attrs[ATTR_SERVER_ADDRESS] = host;\n    if (!isNaN(portNumber)) {\n      attrs[ATTR_SERVER_PORT] = portNumber;\n    }\n  }\n\n  return attrs;\n}\n\nfunction getConfig(config: any) {\n  const { host, port, database, user } = (config && config.connectionConfig) || config || {};\n  return { host, port, database, user };\n}\n\nfunction getJDBCString(host: string | undefined, port: number | undefined, database: string | undefined) {\n  let jdbcString = `jdbc:mysql://${host || 'localhost'}`;\n\n  if (typeof port === 'number') {\n    jdbcString += `:${port}`;\n  }\n\n  if (typeof database === 'string') {\n    jdbcString += `/${database}`;\n  }\n\n  return jdbcString;\n}\n\nexport function getQueryText(\n  query: string | Query | QueryOptions,\n  format?: FormatFunction,\n  values?: any[],\n  maskStatement = false,\n  maskStatementHook: MySQL2InstrumentationQueryMaskingHook = defaultMaskingHook,\n): string {\n  const [querySql, queryValues] =\n    typeof query === 'string' ? [query, values] : [query.sql, hasValues(query) ? values || query.values : values];\n  try {\n    if (maskStatement) {\n      return maskStatementHook(querySql);\n    } else if (format && queryValues) {\n      return format(querySql, queryValues);\n    } else {\n      return querySql;\n    }\n  } catch (e) {\n    return 'Could not determine the query due to an error in masking or formatting';\n  }\n}\n\nfunction defaultMaskingHook(query: string): string {\n  return query.replace(/\\b\\d+\\b/g, '?').replace(/([\"'])(?:(?=(\\\\?))\\2.)*?\\1/g, '?');\n}\n\nfunction hasValues(obj: Query | QueryOptions): obj is QueryOptions {\n  return 'values' in obj;\n}\n\nexport function getSpanName(query: string | Query | QueryOptions): string {\n  const rawQuery = typeof query === 'object' ? query.sql : query;\n  const firstSpace = rawQuery?.indexOf(' ');\n  if (typeof firstSpace === 'number' && firstSpace !== -1) {\n    return rawQuery?.substring(0, firstSpace);\n  }\n  return rawQuery;\n}\n\nexport const once = (fn: Function) => {\n  let called = false;\n  return (...args: unknown[]) => {\n    if (called) return;\n    called = true;\n    return fn(...args);\n  };\n};\n\nexport function getConnectionPrototypeToInstrument(connection: any) {\n  const connectionPrototype = connection.prototype;\n  const basePrototype = Object.getPrototypeOf(connectionPrototype);\n\n  if (typeof basePrototype?.query === 'function' && typeof basePrototype?.execute === 'function') {\n    return basePrototype;\n  }\n\n  return connectionPrototype;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sources":["../../../../../../src/integrations/tracing/mysql2/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-mysql2\n * - Upstream version: @opentelemetry/instrumentation-mysql2@0.64.0\n * - Types from 'mysql2' inlined as simplified interfaces\n * - Refactored to use Sentry's span APIs instead of OpenTelemetry tracing APIs\n */\n\nimport type { SpanAttributes } from '@sentry/core';\nimport type { FormatFunction } from './mysql2-types';\nimport {\n  ATTR_DB_CONNECTION_STRING,\n  ATTR_DB_NAME,\n  ATTR_DB_USER,\n  ATTR_NET_PEER_NAME,\n  ATTR_NET_PEER_PORT,\n} from './semconv';\n\ninterface QueryOptions {\n  sql: string;\n  values?: any | any[] | { [param: string]: any };\n}\n\ninterface Query {\n  sql: string;\n}\n\ninterface Config {\n  host?: string;\n  port?: number;\n  database?: string;\n  user?: string;\n  connectionConfig?: Config;\n}\n\nexport function getConnectionAttributes(config: Config): SpanAttributes {\n  const { host, port, database, user } = getConfig(config);\n\n  const attrs: SpanAttributes = {\n    [ATTR_DB_CONNECTION_STRING]: getJDBCString(host, port, database),\n    [ATTR_DB_NAME]: database,\n    [ATTR_DB_USER]: user,\n    [ATTR_NET_PEER_NAME]: host,\n  };\n\n  const portNumber = parseInt(port, 10);\n  if (!isNaN(portNumber)) {\n    attrs[ATTR_NET_PEER_PORT] = portNumber;\n  }\n\n  return attrs;\n}\n\nfunction getConfig(config: any) {\n  const { host, port, database, user } = config?.connectionConfig || config || {};\n  return { host, port, database, user };\n}\n\nfunction getJDBCString(host: string | undefined, port: number | undefined, database: string | undefined) {\n  let jdbcString = `jdbc:mysql://${host || 'localhost'}`;\n\n  if (typeof port === 'number') {\n    jdbcString += `:${port}`;\n  }\n\n  if (typeof database === 'string') {\n    jdbcString += `/${database}`;\n  }\n\n  return jdbcString;\n}\n\nexport function getQueryText(query: string | Query | QueryOptions, format?: FormatFunction, values?: any[]): string {\n  const [querySql, queryValues] =\n    typeof query === 'string' ? [query, values] : [query.sql, hasValues(query) ? values || query.values : values];\n  try {\n    if (format && queryValues) {\n      return format(querySql, queryValues);\n    } else {\n      return querySql;\n    }\n  } catch {\n    return 'Could not determine the query due to an error in formatting';\n  }\n}\n\nfunction hasValues(obj: Query | QueryOptions): obj is QueryOptions {\n  return 'values' in obj;\n}\n\nexport function getSpanName(query: string | Query | QueryOptions): string {\n  const rawQuery = typeof query === 'object' ? query.sql : query;\n  const firstSpace = rawQuery?.indexOf(' ');\n  if (typeof firstSpace === 'number' && firstSpace !== -1) {\n    return rawQuery?.substring(0, firstSpace);\n  }\n  return rawQuery;\n}\n\nexport const once = (fn: Function) => {\n  let called = false;\n  return (...args: unknown[]) => {\n    if (called) return;\n    called = true;\n    return fn(...args);\n  };\n};\n\nexport function getConnectionPrototypeToInstrument(connection: any) {\n  const connectionPrototype = connection.prototype;\n  const basePrototype = Object.getPrototypeOf(connectionPrototype);\n\n  if (typeof basePrototype?.query === 'function' && typeof basePrototype?.execute === 'function') {\n    return basePrototype;\n  }\n\n  return connectionPrototype;\n}\n"],"names":[],"mappings":"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"}

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

@@ -1,16 +1,12 @@
 import { PgInstrumentation } from './vendored/instrumentation.js';
 import { defineIntegration } from '@sentry/core';
-import { generateInstrumentOnce, addOriginToSpan } from '@sentry/node-core';
+import { generateInstrumentOnce } from '@sentry/node-core';
 
 const INTEGRATION_NAME = "Postgres";
 const instrumentPostgres = generateInstrumentOnce(
   INTEGRATION_NAME,
   PgInstrumentation,
   (options) => ({
-    requireParentSpan: true,
-    requestHook(span) {
-      addOriginToSpan(span, "auto.db.otel.postgres");
-    },
     ignoreConnectSpans: options?.ignoreConnectSpans ?? false
   })
 );

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../src/integrations/tracing/postgres/index.ts"],"sourcesContent":["import { PgInstrumentation } from './vendored/instrumentation';\nimport type { IntegrationFn } from '@sentry/core';\nimport { defineIntegration } from '@sentry/core';\nimport { addOriginToSpan, generateInstrumentOnce } from '@sentry/node-core';\n\ninterface PostgresIntegrationOptions {\n  ignoreConnectSpans?: boolean;\n}\n\nconst INTEGRATION_NAME = 'Postgres';\n\nexport const instrumentPostgres = generateInstrumentOnce(\n  INTEGRATION_NAME,\n  PgInstrumentation,\n  (options?: PostgresIntegrationOptions) => ({\n    requireParentSpan: true,\n    requestHook(span) {\n      addOriginToSpan(span, 'auto.db.otel.postgres');\n    },\n    ignoreConnectSpans: options?.ignoreConnectSpans ?? false,\n  }),\n);\n\nconst _postgresIntegration = ((options?: PostgresIntegrationOptions) => {\n  return {\n    name: INTEGRATION_NAME,\n    setupOnce() {\n      instrumentPostgres(options);\n    },\n  };\n}) satisfies IntegrationFn;\n\n/**\n * Adds Sentry tracing instrumentation for the [pg](https://www.npmjs.com/package/pg) library.\n *\n * For more information, see the [`postgresIntegration` documentation](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/postgres/).\n *\n * @example\n * ```javascript\n * const Sentry = require('@sentry/node');\n *\n * Sentry.init({\n *  integrations: [Sentry.postgresIntegration()],\n * });\n * ```\n */\nexport const postgresIntegration = defineIntegration(_postgresIntegration);\n"],"names":[],"mappings":";;;;AASA,MAAM,gBAAA,GAAmB,UAAA;AAElB,MAAM,kBAAA,GAAqB,sBAAA;AAAA,EAChC,gBAAA;AAAA,EACA,iBAAA;AAAA,EACA,CAAC,OAAA,MAA0C;AAAA,IACzC,iBAAA,EAAmB,IAAA;AAAA,IACnB,YAAY,IAAA,EAAM;AAChB,MAAA,eAAA,CAAgB,MAAM,uBAAuB,CAAA;AAAA,IAC/C,CAAA;AAAA,IACA,kBAAA,EAAoB,SAAS,kBAAA,IAAsB;AAAA,GACrD;AACF;AAEA,MAAM,oBAAA,IAAwB,CAAC,OAAA,KAAyC;AACtE,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,gBAAA;AAAA,IACN,SAAA,GAAY;AACV,MAAA,kBAAA,CAAmB,OAAO,CAAA;AAAA,IAC5B;AAAA,GACF;AACF,CAAA,CAAA;AAgBO,MAAM,mBAAA,GAAsB,kBAAkB,oBAAoB;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../../src/integrations/tracing/postgres/index.ts"],"sourcesContent":["import { PgInstrumentation } from './vendored/instrumentation';\nimport type { IntegrationFn } from '@sentry/core';\nimport { defineIntegration } from '@sentry/core';\nimport { generateInstrumentOnce } from '@sentry/node-core';\n\ninterface PostgresIntegrationOptions {\n  ignoreConnectSpans?: boolean;\n}\n\nconst INTEGRATION_NAME = 'Postgres';\n\nexport const instrumentPostgres = generateInstrumentOnce(\n  INTEGRATION_NAME,\n  PgInstrumentation,\n  (options?: PostgresIntegrationOptions) => ({\n    ignoreConnectSpans: options?.ignoreConnectSpans ?? false,\n  }),\n);\n\nconst _postgresIntegration = ((options?: PostgresIntegrationOptions) => {\n  return {\n    name: INTEGRATION_NAME,\n    setupOnce() {\n      instrumentPostgres(options);\n    },\n  };\n}) satisfies IntegrationFn;\n\n/**\n * Adds Sentry tracing instrumentation for the [pg](https://www.npmjs.com/package/pg) library.\n *\n * For more information, see the [`postgresIntegration` documentation](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/postgres/).\n *\n * @example\n * ```javascript\n * const Sentry = require('@sentry/node');\n *\n * Sentry.init({\n *  integrations: [Sentry.postgresIntegration()],\n * });\n * ```\n */\nexport const postgresIntegration = defineIntegration(_postgresIntegration);\n"],"names":[],"mappings":";;;;AASA,MAAM,gBAAA,GAAmB,UAAA;AAElB,MAAM,kBAAA,GAAqB,sBAAA;AAAA,EAChC,gBAAA;AAAA,EACA,iBAAA;AAAA,EACA,CAAC,OAAA,MAA0C;AAAA,IACzC,kBAAA,EAAoB,SAAS,kBAAA,IAAsB;AAAA,GACrD;AACF;AAEA,MAAM,oBAAA,IAAwB,CAAC,OAAA,KAAyC;AACtE,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,gBAAA;AAAA,IACN,SAAA,GAAY;AACV,MAAA,kBAAA,CAAmB,OAAO,CAAA;AAAA,IAC5B;AAAA,GACF;AACF,CAAA,CAAA;AAgBO,MAAM,mBAAA,GAAsB,kBAAkB,oBAAoB;;;;"}

package/build/esm/integrations/tracing/postgres/vendored/enums/AttributeNames.js

@@ -1,5 +1,4 @@
 var AttributeNames = /* @__PURE__ */ ((AttributeNames2) => {
-  AttributeNames2["PG_VALUES"] = "db.postgresql.values";
   AttributeNames2["PG_PLAN"] = "db.postgresql.plan";
   AttributeNames2["IDLE_TIMEOUT_MILLIS"] = "db.postgresql.idle.timeout.millis";
   AttributeNames2["MAX_CLIENT"] = "db.postgresql.max.client";

package/build/esm/integrations/tracing/postgres/vendored/enums/AttributeNames.js.map

@@ -1 +1 @@
-{"version":3,"file":"AttributeNames.js","sources":["../../../../../../../src/integrations/tracing/postgres/vendored/enums/AttributeNames.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-pg\n * - Upstream version: @opentelemetry/instrumentation-pg@0.70.0\n */\n/* eslint-disable */\n\n// Postgresql specific attributes not covered by semantic conventions\nexport enum AttributeNames {\n  PG_VALUES = 'db.postgresql.values',\n  PG_PLAN = 'db.postgresql.plan',\n  IDLE_TIMEOUT_MILLIS = 'db.postgresql.idle.timeout.millis',\n  MAX_CLIENT = 'db.postgresql.max.client',\n}\n"],"names":["AttributeNames"],"mappings":"AAsBO,IAAK,cAAA,qBAAAA,eAAAA,KAAL;AACL,EAAAA,gBAAA,WAAA,CAAA,GAAY,sBAAA;AACZ,EAAAA,gBAAA,SAAA,CAAA,GAAU,oBAAA;AACV,EAAAA,gBAAA,qBAAA,CAAA,GAAsB,mCAAA;AACtB,EAAAA,gBAAA,YAAA,CAAA,GAAa,0BAAA;AAJH,EAAA,OAAAA,eAAAA;AAAA,CAAA,EAAA,cAAA,IAAA,EAAA;;;;"}
+{"version":3,"file":"AttributeNames.js","sources":["../../../../../../../src/integrations/tracing/postgres/vendored/enums/AttributeNames.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-pg\n * - Upstream version: @opentelemetry/instrumentation-pg@0.70.0\n */\n\n// Postgresql specific attributes not covered by semantic conventions\nexport enum AttributeNames {\n  PG_PLAN = 'db.postgresql.plan',\n  IDLE_TIMEOUT_MILLIS = 'db.postgresql.idle.timeout.millis',\n  MAX_CLIENT = 'db.postgresql.max.client',\n}\n"],"names":["AttributeNames"],"mappings":"AAUO,IAAK,cAAA,qBAAAA,eAAAA,KAAL;AACL,EAAAA,gBAAA,SAAA,CAAA,GAAU,oBAAA;AACV,EAAAA,gBAAA,qBAAA,CAAA,GAAsB,mCAAA;AACtB,EAAAA,gBAAA,YAAA,CAAA,GAAa,0BAAA;AAHH,EAAA,OAAAA,eAAAA;AAAA,CAAA,EAAA,cAAA,IAAA,EAAA;;;;"}

package/build/esm/integrations/tracing/postgres/vendored/enums/SpanNames.js.map

@@ -1 +1 @@
-{"version":3,"file":"SpanNames.js","sources":["../../../../../../../src/integrations/tracing/postgres/vendored/enums/SpanNames.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-pg\n * - Upstream version: @opentelemetry/instrumentation-pg@0.70.0\n */\n/* eslint-disable */\n\n// Contains span names produced by instrumentation\nexport enum SpanNames {\n  QUERY_PREFIX = 'pg.query',\n  CONNECT = 'pg.connect',\n  POOL_CONNECT = 'pg-pool.connect',\n}\n"],"names":["SpanNames"],"mappings":"AAsBO,IAAK,SAAA,qBAAAA,UAAAA,KAAL;AACL,EAAAA,WAAA,cAAA,CAAA,GAAe,UAAA;AACf,EAAAA,WAAA,SAAA,CAAA,GAAU,YAAA;AACV,EAAAA,WAAA,cAAA,CAAA,GAAe,iBAAA;AAHL,EAAA,OAAAA,UAAAA;AAAA,CAAA,EAAA,SAAA,IAAA,EAAA;;;;"}
+{"version":3,"file":"SpanNames.js","sources":["../../../../../../../src/integrations/tracing/postgres/vendored/enums/SpanNames.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-pg\n * - Upstream version: @opentelemetry/instrumentation-pg@0.70.0\n */\n\n// Contains span names produced by instrumentation\nexport enum SpanNames {\n  QUERY_PREFIX = 'pg.query',\n  CONNECT = 'pg.connect',\n  POOL_CONNECT = 'pg-pool.connect',\n}\n"],"names":["SpanNames"],"mappings":"AAUO,IAAK,SAAA,qBAAAA,UAAAA,KAAL;AACL,EAAAA,WAAA,cAAA,CAAA,GAAe,UAAA;AACf,EAAAA,WAAA,SAAA,CAAA,GAAU,YAAA;AACV,EAAAA,WAAA,cAAA,CAAA,GAAe,iBAAA;AAHL,EAAA,OAAAA,UAAAA;AAAA,CAAA,EAAA,SAAA,IAAA,EAAA;;;;"}

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

@@ -1,55 +1,22 @@
-import { InstrumentationBase, semconvStabilityFromStr, InstrumentationNodeModuleDefinition, isWrapped, SemconvStability, safeExecuteInTheMiddle } from '@opentelemetry/instrumentation';
+import { SpanKind } from '@opentelemetry/api';
+import { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';
+import { SDK_VERSION, startInactiveSpan, getActiveSpan, withActiveSpan, SPAN_STATUS_ERROR } from '@sentry/core';
 import { InstrumentationNodeModuleFile } from '../../InstrumentationNodeModuleFile.js';
-import { ValueType, SpanKind, trace, context, SpanStatusCode } from '@opentelemetry/api';
-import { EVENT_LISTENERS_SET } from './internal-types.js';
-import { shouldSkipInstrumentation, getSemanticAttributesFromConnection, patchClientConnectCallback, isObjectWithTextString, parseNormalizedOperationName, handleConfigQuery, patchCallback, sanitizedErrorMessage, getErrorMessage, handleExecutionResult, getPoolName, updateCounter, getSemanticAttributesFromPoolConnection, patchCallbackPGPool } from './utils.js';
-import { addSqlCommenterComment } from '../../utils/sql-common.js';
-import { SDK_VERSION, timestampInSeconds } from '@sentry/core';
 import { SpanNames } from './enums/SpanNames.js';
-import { METRIC_DB_CLIENT_OPERATION_DURATION, ATTR_DB_NAMESPACE, ATTR_ERROR_TYPE, ATTR_SERVER_PORT, ATTR_SERVER_ADDRESS, ATTR_DB_OPERATION_NAME, ATTR_DB_SYSTEM_NAME } from '@opentelemetry/semantic-conventions';
-import { METRIC_DB_CLIENT_CONNECTION_COUNT, METRIC_DB_CLIENT_CONNECTION_PENDING_REQUESTS, ATTR_DB_SYSTEM, DB_SYSTEM_VALUE_POSTGRESQL } from './semconv.js';
+import { shouldSkipInstrumentation, getSemanticAttributesFromConnection, patchClientConnectCallback, isObjectWithTextString, handleConfigQuery, patchCallback, getErrorMessage, getSemanticAttributesFromPoolConnection, patchCallbackPGPool } from './utils.js';
 
 const PACKAGE_NAME = "@sentry/instrumentation-pg";
 function extractModuleExports(module) {
   return module[Symbol.toStringTag] === "Module" ? module.default : module;
 }
+function bindCallbackToSpan(parentSpan, callback) {
+  return function(...args) {
+    return withActiveSpan(parentSpan, () => callback.apply(this, args));
+  };
+}
 class PgInstrumentation extends InstrumentationBase {
   constructor(config = {}) {
     super(PACKAGE_NAME, SDK_VERSION, config);
-    // Pool events connect, acquire, release and remove can be called
-    // multiple times without changing the values of total, idle and waiting
-    // connections. The _connectionsCounter is used to keep track of latest
-    // values and only update the metrics _connectionsCount and _connectionPendingRequests
-    // when the value change.
-    this._connectionsCounter = {
-      used: 0,
-      idle: 0,
-      pending: 0
-    };
-    this._semconvStability = semconvStabilityFromStr("database", process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
-  }
-  _updateMetricInstruments() {
-    this._operationDuration = this.meter.createHistogram(METRIC_DB_CLIENT_OPERATION_DURATION, {
-      description: "Duration of database client operations.",
-      unit: "s",
-      valueType: ValueType.DOUBLE,
-      advice: {
-        explicitBucketBoundaries: [1e-3, 5e-3, 0.01, 0.05, 0.1, 0.5, 1, 5, 10]
-      }
-    });
-    this._connectionsCounter = {
-      idle: 0,
-      pending: 0,
-      used: 0
-    };
-    this._connectionsCount = this.meter.createUpDownCounter(METRIC_DB_CLIENT_CONNECTION_COUNT, {
-      description: "The number of connections that are currently in state described by the state attribute.",
-      unit: "{connection}"
-    });
-    this._connectionPendingRequests = this.meter.createUpDownCounter(METRIC_DB_CLIENT_CONNECTION_PENDING_REQUESTS, {
-      description: "The number of current pending requests for an open connection.",
-      unit: "{connection}"
-    });
   }
   init() {
     const SUPPORTED_PG_VERSIONS = [">=8.0.3 <9"];
@@ -130,60 +97,36 @@ class PgInstrumentation extends InstrumentationBase {
     const plugin = this;
     return (original) => {
       return function connect(callback) {
-        const config = plugin.getConfig();
-        if (shouldSkipInstrumentation(config) || config.ignoreConnectSpans) {
+        if (shouldSkipInstrumentation() || plugin.getConfig().ignoreConnectSpans) {
           return original.call(this, callback);
         }
-        const span = plugin.tracer.startSpan(SpanNames.CONNECT, {
+        const span = startInactiveSpan({
+          name: SpanNames.CONNECT,
           kind: SpanKind.CLIENT,
-          attributes: getSemanticAttributesFromConnection(this, plugin._semconvStability)
+          attributes: getSemanticAttributesFromConnection(this)
         });
-        if (callback) {
-          const parentSpan = trace.getSpan(context.active());
-          callback = patchClientConnectCallback(span, callback);
+        let cb = callback;
+        if (cb) {
+          const parentSpan = getActiveSpan();
+          cb = patchClientConnectCallback(span, cb);
           if (parentSpan) {
-            callback = context.bind(context.active(), callback);
+            cb = bindCallbackToSpan(parentSpan, cb);
           }
         }
-        const connectResult = context.with(trace.setSpan(context.active(), span), () => {
-          return original.call(this, callback);
+        const connectResult = withActiveSpan(span, () => {
+          return original.call(this, cb);
         });
         return handleConnectResult(span, connectResult);
       };
     };
   }
-  recordOperationDuration(attributes, startTime) {
-    const metricsAttributes = {};
-    const keysToCopy = [
-      ATTR_DB_NAMESPACE,
-      ATTR_ERROR_TYPE,
-      ATTR_SERVER_PORT,
-      ATTR_SERVER_ADDRESS,
-      ATTR_DB_OPERATION_NAME
-    ];
-    if (this._semconvStability & SemconvStability.OLD) {
-      keysToCopy.push(ATTR_DB_SYSTEM);
-    }
-    if (this._semconvStability & SemconvStability.STABLE) {
-      keysToCopy.push(ATTR_DB_SYSTEM_NAME);
-    }
-    keysToCopy.forEach((key) => {
-      if (key in attributes) {
-        metricsAttributes[key] = attributes[key];
-      }
-    });
-    const durationSeconds = timestampInSeconds() - startTime;
-    this._operationDuration.record(durationSeconds, metricsAttributes);
-  }
   _getClientQueryPatch() {
-    const plugin = this;
     return (original) => {
       this._diag.debug("Patching pg.Client.prototype.query");
       return function query(...args) {
-        if (shouldSkipInstrumentation(plugin.getConfig())) {
+        if (shouldSkipInstrumentation()) {
           return original.apply(this, args);
         }
-        const startTime = timestampInSeconds();
         const arg0 = args[0];
         const firstArgIsString = typeof arg0 === "string";
         const firstArgIsQueryObjectWithText = isObjectWithTextString(arg0);
@@ -196,210 +139,66 @@ class PgInstrumentation extends InstrumentationBase {
           text: arg0.text,
           values: arg0.values ?? (Array.isArray(args[1]) ? args[1] : void 0)
         } : void 0;
-        const attributes = {
-          [ATTR_DB_SYSTEM]: DB_SYSTEM_VALUE_POSTGRESQL,
-          [ATTR_DB_NAMESPACE]: this.database,
-          [ATTR_SERVER_PORT]: this.connectionParameters.port,
-          [ATTR_SERVER_ADDRESS]: this.connectionParameters.host
-        };
-        if (queryConfig?.text) {
-          attributes[ATTR_DB_OPERATION_NAME] = parseNormalizedOperationName(queryConfig?.text);
-        }
-        const recordDuration = () => {
-          plugin.recordOperationDuration(attributes, startTime);
-        };
-        const instrumentationConfig = plugin.getConfig();
-        const span = handleConfigQuery.call(
-          this,
-          plugin.tracer,
-          instrumentationConfig,
-          plugin._semconvStability,
-          queryConfig
-        );
-        if (instrumentationConfig.addSqlCommenterCommentToQueries) {
-          if (firstArgIsString) {
-            args[0] = addSqlCommenterComment(span, arg0);
-          } else if (firstArgIsQueryObjectWithText && !("name" in arg0)) {
-            args[0] = {
-              ...arg0,
-              text: addSqlCommenterComment(span, arg0.text)
-            };
-          }
-        }
+        const span = handleConfigQuery.call(this, queryConfig);
         if (args.length > 0) {
-          const parentSpan = trace.getSpan(context.active());
+          const parentSpan = getActiveSpan();
           if (typeof args[args.length - 1] === "function") {
-            args[args.length - 1] = patchCallback(
-              instrumentationConfig,
-              span,
-              args[args.length - 1],
-              // nb: not type safe.
-              attributes,
-              recordDuration
-            );
+            args[args.length - 1] = patchCallback(span, args[args.length - 1]);
             if (parentSpan) {
-              args[args.length - 1] = context.bind(context.active(), args[args.length - 1]);
+              args[args.length - 1] = bindCallbackToSpan(parentSpan, args[args.length - 1]);
             }
           } else if (typeof queryConfig?.callback === "function") {
-            let callback = patchCallback(
-              plugin.getConfig(),
-              span,
-              queryConfig.callback,
-              // nb: not type safe.
-              attributes,
-              recordDuration
-            );
+            let callback = patchCallback(span, queryConfig.callback);
             if (parentSpan) {
-              callback = context.bind(context.active(), callback);
+              callback = bindCallbackToSpan(parentSpan, callback);
             }
             args[0].callback = callback;
           }
         }
-        const { requestHook } = instrumentationConfig;
-        if (typeof requestHook === "function" && queryConfig) {
-          safeExecuteInTheMiddle(
-            () => {
-              const { database, host, port, user } = this.connectionParameters;
-              const connection = { database, host, port, user };
-              requestHook(span, {
-                connection,
-                query: {
-                  text: queryConfig.text,
-                  // nb: if `client.query` is called with illegal arguments
-                  // (e.g., if `queryConfig.values` is passed explicitly, but a
-                  // non-array is given), then the type casts will be wrong. But
-                  // we leave it up to the queryHook to handle that, and we
-                  // catch and swallow any errors it throws. The other options
-                  // are all worse. E.g., we could leave `queryConfig.values`
-                  // and `queryConfig.name` as `unknown`, but then the hook body
-                  // would be forced to validate (or cast) them before using
-                  // them, which seems incredibly cumbersome given that these
-                  // casts will be correct 99.9% of the time -- and pg.query
-                  // will immediately throw during development in the other .1%
-                  // of cases. Alternatively, we could simply skip calling the
-                  // hook when `values` or `name` don't have the expected type,
-                  // but that would add unnecessary validation overhead to every
-                  // hook invocation and possibly be even more confusing/unexpected.
-                  values: queryConfig.values,
-                  name: queryConfig.name
-                }
-              });
-            },
-            (err) => {
-              if (err) {
-                plugin._diag.error("Error running query hook", err);
-              }
-            },
-            true
-          );
-        }
         let result;
         try {
           result = original.apply(this, args);
         } catch (e) {
-          if (e instanceof Error) {
-            span.recordException(sanitizedErrorMessage(e));
-          }
-          span.setStatus({
-            code: SpanStatusCode.ERROR,
-            message: getErrorMessage(e)
-          });
+          span.setStatus({ code: SPAN_STATUS_ERROR, message: getErrorMessage(e) });
           span.end();
           throw e;
         }
         if (result instanceof Promise) {
           return result.then((result2) => {
-            return new Promise((resolve) => {
-              handleExecutionResult(plugin.getConfig(), span, result2);
-              recordDuration();
-              span.end();
-              resolve(result2);
-            });
+            span.end();
+            return result2;
           }).catch((error) => {
-            return new Promise((_, reject) => {
-              if (error instanceof Error) {
-                span.recordException(sanitizedErrorMessage(error));
-              }
-              span.setStatus({
-                code: SpanStatusCode.ERROR,
-                message: error.message
-              });
-              recordDuration();
-              span.end();
-              reject(error);
-            });
+            span.setStatus({ code: SPAN_STATUS_ERROR, message: getErrorMessage(error) });
+            span.end();
+            return Promise.reject(error);
           });
         }
         return result;
       };
     };
   }
-  _setPoolConnectEventListeners(pgPool) {
-    if (pgPool[EVENT_LISTENERS_SET]) return;
-    const poolName = getPoolName(pgPool.options);
-    pgPool.on("connect", () => {
-      this._connectionsCounter = updateCounter(
-        poolName,
-        pgPool,
-        this._connectionsCount,
-        this._connectionPendingRequests,
-        this._connectionsCounter
-      );
-    });
-    pgPool.on("acquire", () => {
-      this._connectionsCounter = updateCounter(
-        poolName,
-        pgPool,
-        this._connectionsCount,
-        this._connectionPendingRequests,
-        this._connectionsCounter
-      );
-    });
-    pgPool.on("remove", () => {
-      this._connectionsCounter = updateCounter(
-        poolName,
-        pgPool,
-        this._connectionsCount,
-        this._connectionPendingRequests,
-        this._connectionsCounter
-      );
-    });
-    pgPool.on("release", () => {
-      this._connectionsCounter = updateCounter(
-        poolName,
-        pgPool,
-        this._connectionsCount,
-        this._connectionPendingRequests,
-        this._connectionsCounter
-      );
-    });
-    pgPool[EVENT_LISTENERS_SET] = true;
-  }
   _getPoolConnectPatch() {
     const plugin = this;
     return (originalConnect) => {
       return function connect(callback) {
-        const config = plugin.getConfig();
-        if (shouldSkipInstrumentation(config)) {
-          return originalConnect.call(this, callback);
-        }
-        plugin._setPoolConnectEventListeners(this);
-        if (config.ignoreConnectSpans) {
+        if (shouldSkipInstrumentation() || plugin.getConfig().ignoreConnectSpans) {
           return originalConnect.call(this, callback);
         }
-        const span = plugin.tracer.startSpan(SpanNames.POOL_CONNECT, {
+        const span = startInactiveSpan({
+          name: SpanNames.POOL_CONNECT,
           kind: SpanKind.CLIENT,
-          attributes: getSemanticAttributesFromPoolConnection(this.options, plugin._semconvStability)
+          attributes: getSemanticAttributesFromPoolConnection(this.options)
         });
-        if (callback) {
-          const parentSpan = trace.getSpan(context.active());
-          callback = patchCallbackPGPool(span, callback);
+        let cb = callback;
+        if (cb) {
+          const parentSpan = getActiveSpan();
+          cb = patchCallbackPGPool(span, cb);
           if (parentSpan) {
-            callback = context.bind(context.active(), callback);
+            cb = bindCallbackToSpan(parentSpan, cb);
           }
         }
-        const connectResult = context.with(trace.setSpan(context.active(), span), () => {
-          return originalConnect.call(this, callback);
+        const connectResult = withActiveSpan(span, () => {
+          return originalConnect.call(this, cb);
         });
         return handleConnectResult(span, connectResult);
       };
@@ -411,23 +210,14 @@ function handleConnectResult(span, connectResult) {
     return connectResult;
   }
   const connectResultPromise = connectResult;
-  return context.bind(
-    context.active(),
-    connectResultPromise.then((result) => {
-      span.end();
-      return result;
-    }).catch((error) => {
-      if (error instanceof Error) {
-        span.recordException(sanitizedErrorMessage(error));
-      }
-      span.setStatus({
-        code: SpanStatusCode.ERROR,
-        message: getErrorMessage(error)
-      });
-      span.end();
-      return Promise.reject(error);
-    })
-  );
+  return connectResultPromise.then((result) => {
+    span.end();
+    return result;
+  }).catch((error) => {
+    span.setStatus({ code: SPAN_STATUS_ERROR, message: getErrorMessage(error) });
+    span.end();
+    return Promise.reject(error);
+  });
 }
 
 export { PgInstrumentation };