@sentry/node 10.58.0 → 10.59.0

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

@@ -1,28 +1,14 @@
 import { GenericPoolInstrumentation } 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 = "GenericPool";
 const instrumentGenericPool = generateInstrumentOnce(INTEGRATION_NAME, () => new GenericPoolInstrumentation({}));
 const _genericPoolIntegration = (() => {
-  let instrumentationWrappedCallback;
   return {
     name: INTEGRATION_NAME,
     setupOnce() {
-      const instrumentation = instrumentGenericPool();
-      instrumentationWrappedCallback = instrumentWhenWrapped(instrumentation);
-    },
-    setup(client) {
-      instrumentationWrappedCallback?.(
-        () => client.on("spanStart", (span) => {
-          const spanJSON = spanToJSON(span);
-          const spanDescription = spanJSON.description;
-          const isGenericPoolSpan = spanDescription === "generic-pool.acquire";
-          if (isGenericPoolSpan) {
-            span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, "auto.db.otel.generic_pool");
-          }
-        })
-      );
+      instrumentGenericPool();
     }
   };
 });

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../src/integrations/tracing/genericPool/index.ts"],"sourcesContent":["import { GenericPoolInstrumentation } 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 = 'GenericPool';\n\nexport const instrumentGenericPool = generateInstrumentOnce(INTEGRATION_NAME, () => new GenericPoolInstrumentation({}));\n\nconst _genericPoolIntegration = (() => {\n  let instrumentationWrappedCallback: undefined | ((callback: () => void) => void);\n\n  return {\n    name: INTEGRATION_NAME,\n    setupOnce() {\n      const instrumentation = instrumentGenericPool();\n      instrumentationWrappedCallback = instrumentWhenWrapped(instrumentation);\n    },\n\n    setup(client) {\n      instrumentationWrappedCallback?.(() =>\n        client.on('spanStart', span => {\n          const spanJSON = spanToJSON(span);\n          const spanDescription = spanJSON.description;\n          const isGenericPoolSpan = spanDescription === 'generic-pool.acquire';\n\n          if (isGenericPoolSpan) {\n            span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.db.otel.generic_pool');\n          }\n        }),\n      );\n    },\n  };\n}) satisfies IntegrationFn;\n\n/**\n * Adds Sentry tracing instrumentation for the [generic-pool](https://www.npmjs.com/package/generic-pool) library.\n *\n * For more information, see the [`genericPoolIntegration` documentation](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/genericpool/).\n *\n * @example\n * ```javascript\n * const Sentry = require('@sentry/node');\n *\n * Sentry.init({\n *  integrations: [Sentry.genericPoolIntegration()],\n * });\n * ```\n */\nexport const genericPoolIntegration = defineIntegration(_genericPoolIntegration);\n"],"names":[],"mappings":";;;;AAKA,MAAM,gBAAA,GAAmB,aAAA;AAElB,MAAM,qBAAA,GAAwB,uBAAuB,gBAAA,EAAkB,MAAM,IAAI,0BAAA,CAA2B,EAAE,CAAC;AAEtH,MAAM,2BAA2B,MAAM;AACrC,EAAA,IAAI,8BAAA;AAEJ,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,gBAAA;AAAA,IACN,SAAA,GAAY;AACV,MAAA,MAAM,kBAAkB,qBAAA,EAAsB;AAC9C,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,QAAA,GAAW,WAAW,IAAI,CAAA;AAChC,UAAA,MAAM,kBAAkB,QAAA,CAAS,WAAA;AACjC,UAAA,MAAM,oBAAoB,eAAA,KAAoB,sBAAA;AAE9C,UAAA,IAAI,iBAAA,EAAmB;AACrB,YAAA,IAAA,CAAK,YAAA,CAAa,kCAAkC,2BAA2B,CAAA;AAAA,UACjF;AAAA,QACF,CAAC;AAAA,OACH;AAAA,IACF;AAAA,GACF;AACF,CAAA,CAAA;AAgBO,MAAM,sBAAA,GAAyB,kBAAkB,uBAAuB;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../../src/integrations/tracing/genericPool/index.ts"],"sourcesContent":["import { GenericPoolInstrumentation } from './vendored/instrumentation';\nimport type { IntegrationFn } from '@sentry/core';\nimport { defineIntegration } from '@sentry/core';\nimport { generateInstrumentOnce } from '@sentry/node-core';\n\nconst INTEGRATION_NAME = 'GenericPool';\n\nexport const instrumentGenericPool = generateInstrumentOnce(INTEGRATION_NAME, () => new GenericPoolInstrumentation({}));\n\nconst _genericPoolIntegration = (() => {\n  return {\n    name: INTEGRATION_NAME,\n    setupOnce() {\n      instrumentGenericPool();\n    },\n  };\n}) satisfies IntegrationFn;\n\n/**\n * Adds Sentry tracing instrumentation for the [generic-pool](https://www.npmjs.com/package/generic-pool) library.\n *\n * For more information, see the [`genericPoolIntegration` documentation](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/genericpool/).\n *\n * @example\n * ```javascript\n * const Sentry = require('@sentry/node');\n *\n * Sentry.init({\n *  integrations: [Sentry.genericPoolIntegration()],\n * });\n * ```\n */\nexport const genericPoolIntegration = defineIntegration(_genericPoolIntegration);\n"],"names":[],"mappings":";;;;AAKA,MAAM,gBAAA,GAAmB,aAAA;AAElB,MAAM,qBAAA,GAAwB,uBAAuB,gBAAA,EAAkB,MAAM,IAAI,0BAAA,CAA2B,EAAE,CAAC;AAEtH,MAAM,2BAA2B,MAAM;AACrC,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,gBAAA;AAAA,IACN,SAAA,GAAY;AACV,MAAA,qBAAA,EAAsB;AAAA,IACxB;AAAA,GACF;AACF,CAAA,CAAA;AAgBO,MAAM,sBAAA,GAAyB,kBAAkB,uBAAuB;;;;"}

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

@@ -1,5 +1,5 @@
 import { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';
-import { SDK_VERSION, startSpan, startSpanManual, SPAN_STATUS_ERROR } from '@sentry/core';
+import { SDK_VERSION, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpanManual, SPAN_STATUS_ERROR } from '@sentry/core';
 
 const MODULE_NAME = "generic-pool";
 const PACKAGE_NAME = "@sentry/instrumentation-generic-pool";
@@ -65,9 +65,15 @@ class GenericPoolInstrumentation extends InstrumentationBase {
   }
   _acquirePatcher(original) {
     return function wrapped_acquire(...args) {
-      return startSpan({ name: "generic-pool.acquire" }, () => {
-        return original.call(this, ...args);
-      });
+      return startSpan(
+        {
+          name: "generic-pool.acquire",
+          attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.db.otel.generic_pool" }
+        },
+        () => {
+          return original.call(this, ...args);
+        }
+      );
     };
   }
   _poolWrapper(original) {
@@ -85,21 +91,27 @@ class GenericPoolInstrumentation extends InstrumentationBase {
       if (isDisabled()) {
         return original.call(this, cb, priority);
       }
-      return startSpanManual({ name: "generic-pool.acquire" }, (span) => {
-        original.call(
-          this,
-          (err, client) => {
-            if (err) {
-              span.setStatus({ code: SPAN_STATUS_ERROR, message: "internal_error" });
-            }
-            span.end();
-            if (cb) {
-              cb(err, client);
-            }
-          },
-          priority
-        );
-      });
+      return startSpanManual(
+        {
+          name: "generic-pool.acquire",
+          attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.db.otel.generic_pool" }
+        },
+        (span) => {
+          original.call(
+            this,
+            (err, client) => {
+              if (err) {
+                span.setStatus({ code: SPAN_STATUS_ERROR, message: "internal_error" });
+              }
+              span.end();
+              if (cb) {
+                cb(err, client);
+              }
+            },
+            priority
+          );
+        }
+      );
     };
   }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.js","sources":["../../../../../../src/integrations/tracing/genericPool/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-generic-pool\n * - Upstream version: @opentelemetry/instrumentation-generic-pool@0.61.0\n * - Minor TypeScript strictness adjustments for this repository's compiler settings\n */\n\nimport type { InstrumentationConfig } from '@opentelemetry/instrumentation';\nimport { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';\nimport { SDK_VERSION, SPAN_STATUS_ERROR, startSpan, startSpanManual } from '@sentry/core';\nimport type * as genericPool from './generic-pool-types';\n\nconst MODULE_NAME = 'generic-pool';\nconst PACKAGE_NAME = '@sentry/instrumentation-generic-pool';\n\ntype AcquireFn = (this: unknown, ...args: unknown[]) => unknown;\ninterface PoolConstructor {\n  prototype: { acquire: AcquireFn };\n}\ninterface GenericPoolModule {\n  Pool: PoolConstructor;\n}\n\nexport class GenericPoolInstrumentation extends InstrumentationBase {\n  // only used for v2 - v2.3)\n  private _isDisabled = false;\n\n  constructor(config: InstrumentationConfig = {}) {\n    super(PACKAGE_NAME, SDK_VERSION, config);\n  }\n\n  init() {\n    return [\n      new InstrumentationNodeModuleDefinition(\n        MODULE_NAME,\n        ['>=3.0.0 <4'],\n        (moduleExports: GenericPoolModule) => {\n          const Pool = moduleExports.Pool;\n          if (isWrapped(Pool.prototype.acquire)) {\n            this._unwrap(Pool.prototype, 'acquire');\n          }\n          this._wrap(Pool.prototype, 'acquire', this._acquirePatcher.bind(this));\n          return moduleExports;\n        },\n        (moduleExports: GenericPoolModule) => {\n          const Pool = moduleExports.Pool;\n          this._unwrap(Pool.prototype, 'acquire');\n          return moduleExports;\n        },\n      ),\n      new InstrumentationNodeModuleDefinition(\n        MODULE_NAME,\n        ['>=2.4.0 <3'],\n        (moduleExports: GenericPoolModule) => {\n          const Pool = moduleExports.Pool;\n          if (isWrapped(Pool.prototype.acquire)) {\n            this._unwrap(Pool.prototype, 'acquire');\n          }\n          this._wrap(Pool.prototype, 'acquire', this._acquireWithCallbacksPatcher.bind(this));\n          return moduleExports;\n        },\n        (moduleExports: GenericPoolModule) => {\n          const Pool = moduleExports.Pool;\n          this._unwrap(Pool.prototype, 'acquire');\n          return moduleExports;\n        },\n      ),\n      new InstrumentationNodeModuleDefinition(\n        MODULE_NAME,\n        ['>=2.0.0 <2.4'],\n        (moduleExports: GenericPoolModule) => {\n          this._isDisabled = false;\n          if (isWrapped(moduleExports.Pool)) {\n            this._unwrap(moduleExports, 'Pool');\n          }\n          this._wrap(moduleExports, 'Pool', this._poolWrapper.bind(this));\n          return moduleExports;\n        },\n        (moduleExports: GenericPoolModule) => {\n          // since the object is created on the fly every time, we need to use\n          // a boolean switch here to disable the instrumentation\n          this._isDisabled = true;\n          return moduleExports;\n        },\n      ),\n    ];\n  }\n\n  private _acquirePatcher(original: AcquireFn) {\n    return function wrapped_acquire(this: genericPool.Pool<unknown>, ...args: unknown[]) {\n      return startSpan({ name: 'generic-pool.acquire' }, () => {\n        return original.call(this, ...args) as PromiseLike<unknown>;\n      });\n    };\n  }\n\n  private _poolWrapper(original: (this: unknown, ...args: unknown[]) => { acquire: AcquireFn }) {\n    const wrap = this._wrap.bind(this);\n    const acquireWithCallbacksPatcher = this._acquireWithCallbacksPatcher.bind(this);\n    return function wrapped_pool(this: unknown, ...args: unknown[]) {\n      const pool = original.apply(this, args);\n      wrap(pool, 'acquire', acquireWithCallbacksPatcher);\n      return pool;\n    };\n  }\n\n  private _acquireWithCallbacksPatcher(original: AcquireFn) {\n    const isDisabled = (): boolean => this._isDisabled;\n    return function wrapped_acquire(\n      this: genericPool.Pool<unknown>,\n      cb: (err: unknown, client: unknown) => unknown,\n      priority: number,\n    ) {\n      // only used for v2 - v2.3\n      if (isDisabled()) {\n        return original.call(this, cb, priority);\n      }\n\n      return startSpanManual({ name: 'generic-pool.acquire' }, span => {\n        original.call(\n          this,\n          (err: unknown, client: unknown) => {\n            if (err) {\n              span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });\n            }\n            span.end();\n            // Not checking whether cb is a function because\n            // the original code doesn't do that either.\n            // The callback's return value is unused by generic-pool, so we don't return it.\n            if (cb) {\n              cb(err, client);\n            }\n          },\n          priority,\n        );\n      });\n    };\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"instrumentation.js","sources":["../../../../../../src/integrations/tracing/genericPool/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-generic-pool\n * - Upstream version: @opentelemetry/instrumentation-generic-pool@0.61.0\n * - Minor TypeScript strictness adjustments for this repository's compiler settings\n */\n\nimport type { InstrumentationConfig } from '@opentelemetry/instrumentation';\nimport { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped } from '@opentelemetry/instrumentation';\nimport {\n  SDK_VERSION,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SPAN_STATUS_ERROR,\n  startSpan,\n  startSpanManual,\n} from '@sentry/core';\nimport type * as genericPool from './generic-pool-types';\n\nconst MODULE_NAME = 'generic-pool';\nconst PACKAGE_NAME = '@sentry/instrumentation-generic-pool';\n\ntype AcquireFn = (this: unknown, ...args: unknown[]) => unknown;\ninterface PoolConstructor {\n  prototype: { acquire: AcquireFn };\n}\ninterface GenericPoolModule {\n  Pool: PoolConstructor;\n}\n\nexport class GenericPoolInstrumentation extends InstrumentationBase {\n  // only used for v2 - v2.3)\n  private _isDisabled = false;\n\n  constructor(config: InstrumentationConfig = {}) {\n    super(PACKAGE_NAME, SDK_VERSION, config);\n  }\n\n  init() {\n    return [\n      new InstrumentationNodeModuleDefinition(\n        MODULE_NAME,\n        ['>=3.0.0 <4'],\n        (moduleExports: GenericPoolModule) => {\n          const Pool = moduleExports.Pool;\n          if (isWrapped(Pool.prototype.acquire)) {\n            this._unwrap(Pool.prototype, 'acquire');\n          }\n          this._wrap(Pool.prototype, 'acquire', this._acquirePatcher.bind(this));\n          return moduleExports;\n        },\n        (moduleExports: GenericPoolModule) => {\n          const Pool = moduleExports.Pool;\n          this._unwrap(Pool.prototype, 'acquire');\n          return moduleExports;\n        },\n      ),\n      new InstrumentationNodeModuleDefinition(\n        MODULE_NAME,\n        ['>=2.4.0 <3'],\n        (moduleExports: GenericPoolModule) => {\n          const Pool = moduleExports.Pool;\n          if (isWrapped(Pool.prototype.acquire)) {\n            this._unwrap(Pool.prototype, 'acquire');\n          }\n          this._wrap(Pool.prototype, 'acquire', this._acquireWithCallbacksPatcher.bind(this));\n          return moduleExports;\n        },\n        (moduleExports: GenericPoolModule) => {\n          const Pool = moduleExports.Pool;\n          this._unwrap(Pool.prototype, 'acquire');\n          return moduleExports;\n        },\n      ),\n      new InstrumentationNodeModuleDefinition(\n        MODULE_NAME,\n        ['>=2.0.0 <2.4'],\n        (moduleExports: GenericPoolModule) => {\n          this._isDisabled = false;\n          if (isWrapped(moduleExports.Pool)) {\n            this._unwrap(moduleExports, 'Pool');\n          }\n          this._wrap(moduleExports, 'Pool', this._poolWrapper.bind(this));\n          return moduleExports;\n        },\n        (moduleExports: GenericPoolModule) => {\n          // since the object is created on the fly every time, we need to use\n          // a boolean switch here to disable the instrumentation\n          this._isDisabled = true;\n          return moduleExports;\n        },\n      ),\n    ];\n  }\n\n  private _acquirePatcher(original: AcquireFn) {\n    return function wrapped_acquire(this: genericPool.Pool<unknown>, ...args: unknown[]) {\n      return startSpan(\n        {\n          name: 'generic-pool.acquire',\n          attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.otel.generic_pool' },\n        },\n        () => {\n          return original.call(this, ...args) as PromiseLike<unknown>;\n        },\n      );\n    };\n  }\n\n  private _poolWrapper(original: (this: unknown, ...args: unknown[]) => { acquire: AcquireFn }) {\n    const wrap = this._wrap.bind(this);\n    const acquireWithCallbacksPatcher = this._acquireWithCallbacksPatcher.bind(this);\n    return function wrapped_pool(this: unknown, ...args: unknown[]) {\n      const pool = original.apply(this, args);\n      wrap(pool, 'acquire', acquireWithCallbacksPatcher);\n      return pool;\n    };\n  }\n\n  private _acquireWithCallbacksPatcher(original: AcquireFn) {\n    const isDisabled = (): boolean => this._isDisabled;\n    return function wrapped_acquire(\n      this: genericPool.Pool<unknown>,\n      cb: (err: unknown, client: unknown) => unknown,\n      priority: number,\n    ) {\n      // only used for v2 - v2.3\n      if (isDisabled()) {\n        return original.call(this, cb, priority);\n      }\n\n      return startSpanManual(\n        {\n          name: 'generic-pool.acquire',\n          attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.otel.generic_pool' },\n        },\n        span => {\n          original.call(\n            this,\n            (err: unknown, client: unknown) => {\n              if (err) {\n                span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });\n              }\n              span.end();\n              // Not checking whether cb is a function because\n              // the original code doesn't do that either.\n              // The callback's return value is unused by generic-pool, so we don't return it.\n              if (cb) {\n                cb(err, client);\n              }\n            },\n            priority,\n          );\n        },\n      );\n    };\n  }\n}\n"],"names":[],"mappings":"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"}

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

@@ -1,51 +1,12 @@
-import { SpanStatusCode } from '@opentelemetry/api';
 import { GraphQLInstrumentation } from './vendored/instrumentation.js';
-import { spanToJSON, getRootSpan, defineIntegration } from '@sentry/core';
-import { generateInstrumentOnce, addOriginToSpan } from '@sentry/node-core';
-import { SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION } from '@sentry/opentelemetry';
+import { defineIntegration } from '@sentry/core';
+import { generateInstrumentOnce } from '@sentry/node-core';
 
 const INTEGRATION_NAME = "Graphql";
 const instrumentGraphql = generateInstrumentOnce(
   INTEGRATION_NAME,
   GraphQLInstrumentation,
-  (_options) => {
-    const options = getOptionsWithDefaults(_options);
-    return {
-      ...options,
-      responseHook(span, result) {
-        addOriginToSpan(span, "auto.graphql.otel.graphql");
-        const resultWithMaybeError = result;
-        if (resultWithMaybeError.errors?.length && !spanToJSON(span).status) {
-          span.setStatus({ code: SpanStatusCode.ERROR });
-        }
-        const attributes = spanToJSON(span).data;
-        const operationType = attributes["graphql.operation.type"];
-        const operationName = attributes["graphql.operation.name"];
-        if (options.useOperationNameForRootSpan && operationType) {
-          const rootSpan = getRootSpan(span);
-          const rootSpanAttributes = spanToJSON(rootSpan).data;
-          const existingOperations = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION] || [];
-          const newOperation = operationName ? `${operationType} ${operationName}` : `${operationType}`;
-          if (Array.isArray(existingOperations)) {
-            existingOperations.push(newOperation);
-            rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION, existingOperations);
-          } else if (typeof existingOperations === "string") {
-            rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION, [existingOperations, newOperation]);
-          } else {
-            rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION, newOperation);
-          }
-          if (!spanToJSON(rootSpan).data["original-description"]) {
-            rootSpan.setAttribute("original-description", spanToJSON(rootSpan).description);
-          }
-          rootSpan.updateName(
-            `${spanToJSON(rootSpan).data["original-description"]} (${getGraphqlOperationNamesFromAttribute(
-              existingOperations
-            )})`
-          );
-        }
-      }
-    };
-  }
+  (_options) => getOptionsWithDefaults(_options)
 );
 const _graphqlIntegration = ((options = {}) => {
   return {
@@ -64,17 +25,6 @@ function getOptionsWithDefaults(options) {
     ...options
   };
 }
-function getGraphqlOperationNamesFromAttribute(attr) {
-  if (Array.isArray(attr)) {
-    const sorted = attr.slice().sort();
-    if (sorted.length <= 5) {
-      return sorted.join(", ");
-    } else {
-      return `${sorted.slice(0, 5).join(", ")}, +${sorted.length - 5}`;
-    }
-  }
-  return `${attr}`;
-}
 
 export { graphqlIntegration, instrumentGraphql };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../src/integrations/tracing/graphql/index.ts"],"sourcesContent":["import type { AttributeValue } from '@opentelemetry/api';\nimport { SpanStatusCode } from '@opentelemetry/api';\nimport { GraphQLInstrumentation } from './vendored/instrumentation';\nimport type { IntegrationFn } from '@sentry/core';\nimport { defineIntegration, getRootSpan, spanToJSON } from '@sentry/core';\nimport { addOriginToSpan, generateInstrumentOnce } from '@sentry/node-core';\nimport { SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION } from '@sentry/opentelemetry';\n\ninterface GraphqlOptions {\n  /**\n   * Do not create spans for resolvers.\n   *\n   * Defaults to true.\n   */\n  ignoreResolveSpans?: boolean;\n\n  /**\n   * Don't create spans for the execution of the default resolver on object properties.\n   *\n   * When a resolver function is not defined on the schema for a field, graphql will\n   * use the default resolver which just looks for a property with that name on the object.\n   * If the property is not a function, it's not very interesting to trace.\n   * This option can reduce noise and number of spans created.\n   *\n   * Defaults to true.\n   */\n  ignoreTrivialResolveSpans?: boolean;\n\n  /**\n   * If this is enabled, a http.server root span containing this span will automatically be renamed to include the operation name.\n   * Set this to `false` if you do not want this behavior, and want to keep the default http.server span name.\n   *\n   * Defaults to true.\n   */\n  useOperationNameForRootSpan?: boolean;\n}\n\nconst INTEGRATION_NAME = 'Graphql';\n\nexport const instrumentGraphql = generateInstrumentOnce(\n  INTEGRATION_NAME,\n  GraphQLInstrumentation,\n  (_options: GraphqlOptions) => {\n    const options = getOptionsWithDefaults(_options);\n\n    return {\n      ...options,\n      responseHook(span, result) {\n        addOriginToSpan(span, 'auto.graphql.otel.graphql');\n\n        // We want to ensure spans are marked as errored if there are errors in the result\n        // We only do that if the span is not already marked with a status\n        const resultWithMaybeError = result as { errors?: { message: string }[] };\n        if (resultWithMaybeError.errors?.length && !spanToJSON(span).status) {\n          span.setStatus({ code: SpanStatusCode.ERROR });\n        }\n\n        const attributes = spanToJSON(span).data;\n\n        // If operation.name is not set, we fall back to use operation.type only\n        const operationType = attributes['graphql.operation.type'];\n        const operationName = attributes['graphql.operation.name'];\n\n        if (options.useOperationNameForRootSpan && operationType) {\n          const rootSpan = getRootSpan(span);\n          const rootSpanAttributes = spanToJSON(rootSpan).data;\n\n          const existingOperations = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION] || [];\n\n          const newOperation = operationName ? `${operationType} ${operationName}` : `${operationType}`;\n\n          // We keep track of each operation on the root span\n          // This can either be a string, or an array of strings (if there are multiple operations)\n          if (Array.isArray(existingOperations)) {\n            (existingOperations as string[]).push(newOperation);\n            rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION, existingOperations);\n          } else if (typeof existingOperations === 'string') {\n            rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION, [existingOperations, newOperation]);\n          } else {\n            rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION, newOperation);\n          }\n\n          if (!spanToJSON(rootSpan).data['original-description']) {\n            rootSpan.setAttribute('original-description', spanToJSON(rootSpan).description);\n          }\n          // Important for e.g. @sentry/aws-serverless because this would otherwise overwrite the name again\n          rootSpan.updateName(\n            `${spanToJSON(rootSpan).data['original-description']} (${getGraphqlOperationNamesFromAttribute(\n              existingOperations,\n            )})`,\n          );\n        }\n      },\n    };\n  },\n);\n\nconst _graphqlIntegration = ((options: GraphqlOptions = {}) => {\n  return {\n    name: INTEGRATION_NAME,\n    setupOnce() {\n      // We set defaults here, too, because otherwise we'd update the instrumentation config\n      // to the config without defaults, as `generateInstrumentOnce` automatically calls `setConfig(options)`\n      // when being called the second time\n      instrumentGraphql(getOptionsWithDefaults(options));\n    },\n  };\n}) satisfies IntegrationFn;\n\n/**\n * Adds Sentry tracing instrumentation for the [graphql](https://www.npmjs.com/package/graphql) library.\n *\n * For more information, see the [`graphqlIntegration` documentation](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/graphql/).\n *\n * @param {GraphqlOptions} options Configuration options for the GraphQL integration.\n *\n * @example\n * ```javascript\n * const Sentry = require('@sentry/node');\n *\n * Sentry.init({\n *  integrations: [Sentry.graphqlIntegration()],\n * });\n */\nexport const graphqlIntegration = defineIntegration(_graphqlIntegration);\n\nfunction getOptionsWithDefaults(options?: GraphqlOptions): GraphqlOptions {\n  return {\n    ignoreResolveSpans: true,\n    ignoreTrivialResolveSpans: true,\n    useOperationNameForRootSpan: true,\n    ...options,\n  };\n}\n\n// copy from packages/opentelemetry/utils\nfunction getGraphqlOperationNamesFromAttribute(attr: AttributeValue): string {\n  if (Array.isArray(attr)) {\n    // oxlint-disable-next-line typescript/require-array-sort-compare\n    const sorted = attr.slice().sort();\n\n    // Up to 5 items, we just add all of them\n    if (sorted.length <= 5) {\n      return sorted.join(', ');\n    } else {\n      // Else, we add the first 5 and the diff of other operations\n      return `${sorted.slice(0, 5).join(', ')}, +${sorted.length - 5}`;\n    }\n  }\n\n  return `${attr}`;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../../../src/integrations/tracing/graphql/index.ts"],"sourcesContent":["import { GraphQLInstrumentation } from './vendored/instrumentation';\nimport type { IntegrationFn } from '@sentry/core';\nimport { defineIntegration } from '@sentry/core';\nimport { generateInstrumentOnce } from '@sentry/node-core';\n\ninterface GraphqlOptions {\n  /**\n   * Do not create spans for resolvers.\n   *\n   * Defaults to true.\n   */\n  ignoreResolveSpans?: boolean;\n\n  /**\n   * Don't create spans for the execution of the default resolver on object properties.\n   *\n   * When a resolver function is not defined on the schema for a field, graphql will\n   * use the default resolver which just looks for a property with that name on the object.\n   * If the property is not a function, it's not very interesting to trace.\n   * This option can reduce noise and number of spans created.\n   *\n   * Defaults to true.\n   */\n  ignoreTrivialResolveSpans?: boolean;\n\n  /**\n   * If this is enabled, a http.server root span containing this span will automatically be renamed to include the operation name.\n   * Set this to `false` if you do not want this behavior, and want to keep the default http.server span name.\n   *\n   * Defaults to true.\n   */\n  useOperationNameForRootSpan?: boolean;\n}\n\nconst INTEGRATION_NAME = 'Graphql';\n\nexport const instrumentGraphql = generateInstrumentOnce(\n  INTEGRATION_NAME,\n  GraphQLInstrumentation,\n  (_options: GraphqlOptions) => getOptionsWithDefaults(_options),\n);\n\nconst _graphqlIntegration = ((options: GraphqlOptions = {}) => {\n  return {\n    name: INTEGRATION_NAME,\n    setupOnce() {\n      // We set defaults here, too, because otherwise we'd update the instrumentation config\n      // to the config without defaults, as `generateInstrumentOnce` automatically calls `setConfig(options)`\n      // when being called the second time\n      instrumentGraphql(getOptionsWithDefaults(options));\n    },\n  };\n}) satisfies IntegrationFn;\n\n/**\n * Adds Sentry tracing instrumentation for the [graphql](https://www.npmjs.com/package/graphql) library.\n *\n * For more information, see the [`graphqlIntegration` documentation](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/graphql/).\n *\n * @param {GraphqlOptions} options Configuration options for the GraphQL integration.\n *\n * @example\n * ```javascript\n * const Sentry = require('@sentry/node');\n *\n * Sentry.init({\n *  integrations: [Sentry.graphqlIntegration()],\n * });\n */\nexport const graphqlIntegration = defineIntegration(_graphqlIntegration);\n\nfunction getOptionsWithDefaults(options?: GraphqlOptions): GraphqlOptions {\n  return {\n    ignoreResolveSpans: true,\n    ignoreTrivialResolveSpans: true,\n    useOperationNameForRootSpan: true,\n    ...options,\n  };\n}\n"],"names":[],"mappings":";;;;AAkCA,MAAM,gBAAA,GAAmB,SAAA;AAElB,MAAM,iBAAA,GAAoB,sBAAA;AAAA,EAC/B,gBAAA;AAAA,EACA,sBAAA;AAAA,EACA,CAAC,QAAA,KAA6B,sBAAA,CAAuB,QAAQ;AAC/D;AAEA,MAAM,mBAAA,IAAuB,CAAC,OAAA,GAA0B,EAAC,KAAM;AAC7D,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,gBAAA;AAAA,IACN,SAAA,GAAY;AAIV,MAAA,iBAAA,CAAkB,sBAAA,CAAuB,OAAO,CAAC,CAAA;AAAA,IACnD;AAAA,GACF;AACF,CAAA,CAAA;AAiBO,MAAM,kBAAA,GAAqB,kBAAkB,mBAAmB;AAEvE,SAAS,uBAAuB,OAAA,EAA0C;AACxE,EAAA,OAAO;AAAA,IACL,kBAAA,EAAoB,IAAA;AAAA,IACpB,yBAAA,EAA2B,IAAA;AAAA,IAC3B,2BAAA,EAA6B,IAAA;AAAA,IAC7B,GAAG;AAAA,GACL;AACF;;;;"}

package/build/esm/integrations/tracing/graphql/vendored/enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"enum.js","sources":["../../../../../../src/integrations/tracing/graphql/vendored/enum.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-graphql\n * - Upstream version: @opentelemetry/instrumentation-graphql@0.66.0\n */\n/* eslint-disable */\n\nexport enum AllowedOperationTypes {\n  QUERY = 'query',\n  MUTATION = 'mutation',\n  SUBSCRIPTION = 'subscription',\n}\n\nexport enum TokenKind {\n  SOF = '<SOF>',\n  EOF = '<EOF>',\n  BANG = '!',\n  DOLLAR = '$',\n  AMP = '&',\n  PAREN_L = '(',\n  PAREN_R = ')',\n  SPREAD = '...',\n  COLON = ':',\n  EQUALS = '=',\n  AT = '@',\n  BRACKET_L = '[',\n  BRACKET_R = ']',\n  BRACE_L = '{',\n  PIPE = '|',\n  BRACE_R = '}',\n  NAME = 'Name',\n  INT = 'Int',\n  FLOAT = 'Float',\n  STRING = 'String',\n  BLOCK_STRING = 'BlockString',\n  COMMENT = 'Comment',\n}\n\nexport enum SpanNames {\n  EXECUTE = 'graphql.execute',\n  PARSE = 'graphql.parse',\n  RESOLVE = 'graphql.resolve',\n  VALIDATE = 'graphql.validate',\n  SCHEMA_VALIDATE = 'graphql.validateSchema',\n  SCHEMA_PARSE = 'graphql.parseSchema',\n}\n"],"names":["AllowedOperationTypes","TokenKind","SpanNames"],"mappings":"AAqBO,IAAK,qBAAA,qBAAAA,sBAAAA,KAAL;AACL,EAAAA,uBAAA,OAAA,CAAA,GAAQ,OAAA;AACR,EAAAA,uBAAA,UAAA,CAAA,GAAW,UAAA;AACX,EAAAA,uBAAA,cAAA,CAAA,GAAe,cAAA;AAHL,EAAA,OAAAA,sBAAAA;AAAA,CAAA,EAAA,qBAAA,IAAA,EAAA;AAML,IAAK,SAAA,qBAAAC,UAAAA,KAAL;AACL,EAAAA,WAAA,KAAA,CAAA,GAAM,OAAA;AACN,EAAAA,WAAA,KAAA,CAAA,GAAM,OAAA;AACN,EAAAA,WAAA,MAAA,CAAA,GAAO,GAAA;AACP,EAAAA,WAAA,QAAA,CAAA,GAAS,GAAA;AACT,EAAAA,WAAA,KAAA,CAAA,GAAM,GAAA;AACN,EAAAA,WAAA,SAAA,CAAA,GAAU,GAAA;AACV,EAAAA,WAAA,SAAA,CAAA,GAAU,GAAA;AACV,EAAAA,WAAA,QAAA,CAAA,GAAS,KAAA;AACT,EAAAA,WAAA,OAAA,CAAA,GAAQ,GAAA;AACR,EAAAA,WAAA,QAAA,CAAA,GAAS,GAAA;AACT,EAAAA,WAAA,IAAA,CAAA,GAAK,GAAA;AACL,EAAAA,WAAA,WAAA,CAAA,GAAY,GAAA;AACZ,EAAAA,WAAA,WAAA,CAAA,GAAY,GAAA;AACZ,EAAAA,WAAA,SAAA,CAAA,GAAU,GAAA;AACV,EAAAA,WAAA,MAAA,CAAA,GAAO,GAAA;AACP,EAAAA,WAAA,SAAA,CAAA,GAAU,GAAA;AACV,EAAAA,WAAA,MAAA,CAAA,GAAO,MAAA;AACP,EAAAA,WAAA,KAAA,CAAA,GAAM,KAAA;AACN,EAAAA,WAAA,OAAA,CAAA,GAAQ,OAAA;AACR,EAAAA,WAAA,QAAA,CAAA,GAAS,QAAA;AACT,EAAAA,WAAA,cAAA,CAAA,GAAe,aAAA;AACf,EAAAA,WAAA,SAAA,CAAA,GAAU,SAAA;AAtBA,EAAA,OAAAA,UAAAA;AAAA,CAAA,EAAA,SAAA,IAAA,EAAA;AAyBL,IAAK,SAAA,qBAAAC,UAAAA,KAAL;AACL,EAAAA,WAAA,SAAA,CAAA,GAAU,iBAAA;AACV,EAAAA,WAAA,OAAA,CAAA,GAAQ,eAAA;AACR,EAAAA,WAAA,SAAA,CAAA,GAAU,iBAAA;AACV,EAAAA,WAAA,UAAA,CAAA,GAAW,kBAAA;AACX,EAAAA,WAAA,iBAAA,CAAA,GAAkB,wBAAA;AAClB,EAAAA,WAAA,cAAA,CAAA,GAAe,qBAAA;AANL,EAAA,OAAAA,UAAAA;AAAA,CAAA,EAAA,SAAA,IAAA,EAAA;;;;"}
+{"version":3,"file":"enum.js","sources":["../../../../../../src/integrations/tracing/graphql/vendored/enum.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-graphql\n * - Upstream version: @opentelemetry/instrumentation-graphql@0.66.0\n */\n\nexport enum AllowedOperationTypes {\n  QUERY = 'query',\n  MUTATION = 'mutation',\n  SUBSCRIPTION = 'subscription',\n}\n\nexport enum TokenKind {\n  SOF = '<SOF>',\n  EOF = '<EOF>',\n  BANG = '!',\n  DOLLAR = '$',\n  AMP = '&',\n  PAREN_L = '(',\n  PAREN_R = ')',\n  SPREAD = '...',\n  COLON = ':',\n  EQUALS = '=',\n  AT = '@',\n  BRACKET_L = '[',\n  BRACKET_R = ']',\n  BRACE_L = '{',\n  PIPE = '|',\n  BRACE_R = '}',\n  NAME = 'Name',\n  INT = 'Int',\n  FLOAT = 'Float',\n  STRING = 'String',\n  BLOCK_STRING = 'BlockString',\n  COMMENT = 'Comment',\n}\n\nexport enum SpanNames {\n  EXECUTE = 'graphql.execute',\n  PARSE = 'graphql.parse',\n  RESOLVE = 'graphql.resolve',\n  VALIDATE = 'graphql.validate',\n  SCHEMA_VALIDATE = 'graphql.validateSchema',\n  SCHEMA_PARSE = 'graphql.parseSchema',\n}\n"],"names":["AllowedOperationTypes","TokenKind","SpanNames"],"mappings":"AASO,IAAK,qBAAA,qBAAAA,sBAAAA,KAAL;AACL,EAAAA,uBAAA,OAAA,CAAA,GAAQ,OAAA;AACR,EAAAA,uBAAA,UAAA,CAAA,GAAW,UAAA;AACX,EAAAA,uBAAA,cAAA,CAAA,GAAe,cAAA;AAHL,EAAA,OAAAA,sBAAAA;AAAA,CAAA,EAAA,qBAAA,IAAA,EAAA;AAML,IAAK,SAAA,qBAAAC,UAAAA,KAAL;AACL,EAAAA,WAAA,KAAA,CAAA,GAAM,OAAA;AACN,EAAAA,WAAA,KAAA,CAAA,GAAM,OAAA;AACN,EAAAA,WAAA,MAAA,CAAA,GAAO,GAAA;AACP,EAAAA,WAAA,QAAA,CAAA,GAAS,GAAA;AACT,EAAAA,WAAA,KAAA,CAAA,GAAM,GAAA;AACN,EAAAA,WAAA,SAAA,CAAA,GAAU,GAAA;AACV,EAAAA,WAAA,SAAA,CAAA,GAAU,GAAA;AACV,EAAAA,WAAA,QAAA,CAAA,GAAS,KAAA;AACT,EAAAA,WAAA,OAAA,CAAA,GAAQ,GAAA;AACR,EAAAA,WAAA,QAAA,CAAA,GAAS,GAAA;AACT,EAAAA,WAAA,IAAA,CAAA,GAAK,GAAA;AACL,EAAAA,WAAA,WAAA,CAAA,GAAY,GAAA;AACZ,EAAAA,WAAA,WAAA,CAAA,GAAY,GAAA;AACZ,EAAAA,WAAA,SAAA,CAAA,GAAU,GAAA;AACV,EAAAA,WAAA,MAAA,CAAA,GAAO,GAAA;AACP,EAAAA,WAAA,SAAA,CAAA,GAAU,GAAA;AACV,EAAAA,WAAA,MAAA,CAAA,GAAO,MAAA;AACP,EAAAA,WAAA,KAAA,CAAA,GAAM,KAAA;AACN,EAAAA,WAAA,OAAA,CAAA,GAAQ,OAAA;AACR,EAAAA,WAAA,QAAA,CAAA,GAAS,QAAA;AACT,EAAAA,WAAA,cAAA,CAAA,GAAe,aAAA;AACf,EAAAA,WAAA,SAAA,CAAA,GAAU,SAAA;AAtBA,EAAA,OAAAA,UAAAA;AAAA,CAAA,EAAA,SAAA,IAAA,EAAA;AAyBL,IAAK,SAAA,qBAAAC,UAAAA,KAAL;AACL,EAAAA,WAAA,SAAA,CAAA,GAAU,iBAAA;AACV,EAAAA,WAAA,OAAA,CAAA,GAAQ,eAAA;AACR,EAAAA,WAAA,SAAA,CAAA,GAAU,iBAAA;AACV,EAAAA,WAAA,UAAA,CAAA,GAAW,kBAAA;AACX,EAAAA,WAAA,iBAAA,CAAA,GAAkB,wBAAA;AAClB,EAAAA,WAAA,cAAA,CAAA,GAAe,qBAAA;AANL,EAAA,OAAAA,UAAAA;AAAA,CAAA,EAAA,SAAA,IAAA,EAAA;;;;"}

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

@@ -6,8 +6,6 @@ var AttributeNames = /* @__PURE__ */ ((AttributeNames2) => {
   AttributeNames2["PARENT_NAME"] = "graphql.parent.name";
   AttributeNames2["OPERATION_TYPE"] = "graphql.operation.type";
   AttributeNames2["OPERATION_NAME"] = "graphql.operation.name";
-  AttributeNames2["VARIABLES"] = "graphql.variables.";
-  AttributeNames2["ERROR_VALIDATION_NAME"] = "graphql.validation.error";
   return AttributeNames2;
 })(AttributeNames || {});
 

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

@@ -1 +1 @@
-{"version":3,"file":"AttributeNames.js","sources":["../../../../../../../src/integrations/tracing/graphql/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-graphql\n * - Upstream version: @opentelemetry/instrumentation-graphql@0.66.0\n */\n/* eslint-disable */\n\nexport enum AttributeNames {\n  SOURCE = 'graphql.source',\n  FIELD_NAME = 'graphql.field.name',\n  FIELD_PATH = 'graphql.field.path',\n  FIELD_TYPE = 'graphql.field.type',\n  PARENT_NAME = 'graphql.parent.name',\n  OPERATION_TYPE = 'graphql.operation.type',\n  OPERATION_NAME = 'graphql.operation.name',\n  VARIABLES = 'graphql.variables.',\n  ERROR_VALIDATION_NAME = 'graphql.validation.error',\n}\n"],"names":["AttributeNames"],"mappings":"AAqBO,IAAK,cAAA,qBAAAA,eAAAA,KAAL;AACL,EAAAA,gBAAA,QAAA,CAAA,GAAS,gBAAA;AACT,EAAAA,gBAAA,YAAA,CAAA,GAAa,oBAAA;AACb,EAAAA,gBAAA,YAAA,CAAA,GAAa,oBAAA;AACb,EAAAA,gBAAA,YAAA,CAAA,GAAa,oBAAA;AACb,EAAAA,gBAAA,aAAA,CAAA,GAAc,qBAAA;AACd,EAAAA,gBAAA,gBAAA,CAAA,GAAiB,wBAAA;AACjB,EAAAA,gBAAA,gBAAA,CAAA,GAAiB,wBAAA;AACjB,EAAAA,gBAAA,WAAA,CAAA,GAAY,oBAAA;AACZ,EAAAA,gBAAA,uBAAA,CAAA,GAAwB,0BAAA;AATd,EAAA,OAAAA,eAAAA;AAAA,CAAA,EAAA,cAAA,IAAA,EAAA;;;;"}
+{"version":3,"file":"AttributeNames.js","sources":["../../../../../../../src/integrations/tracing/graphql/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-graphql\n * - Upstream version: @opentelemetry/instrumentation-graphql@0.66.0\n */\n\nexport enum AttributeNames {\n  SOURCE = 'graphql.source',\n  FIELD_NAME = 'graphql.field.name',\n  FIELD_PATH = 'graphql.field.path',\n  FIELD_TYPE = 'graphql.field.type',\n  PARENT_NAME = 'graphql.parent.name',\n  OPERATION_TYPE = 'graphql.operation.type',\n  OPERATION_NAME = 'graphql.operation.name',\n}\n"],"names":["AttributeNames"],"mappings":"AASO,IAAK,cAAA,qBAAAA,eAAAA,KAAL;AACL,EAAAA,gBAAA,QAAA,CAAA,GAAS,gBAAA;AACT,EAAAA,gBAAA,YAAA,CAAA,GAAa,oBAAA;AACb,EAAAA,gBAAA,YAAA,CAAA,GAAa,oBAAA;AACb,EAAAA,gBAAA,YAAA,CAAA,GAAa,oBAAA;AACb,EAAAA,gBAAA,aAAA,CAAA,GAAc,qBAAA;AACd,EAAAA,gBAAA,gBAAA,CAAA,GAAiB,wBAAA;AACjB,EAAAA,gBAAA,gBAAA,CAAA,GAAiB,wBAAA;AAPP,EAAA,OAAAA,eAAAA;AAAA,CAAA,EAAA,cAAA,IAAA,EAAA;;;;"}

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

@@ -1,18 +1,16 @@
-import { context, trace } from '@opentelemetry/api';
 import { InstrumentationBase, InstrumentationNodeModuleDefinition, isWrapped, safeExecuteInTheMiddle } from '@opentelemetry/instrumentation';
 import { InstrumentationNodeModuleFile } from '../../InstrumentationNodeModuleFile.js';
 import { SpanNames } from './enum.js';
 import { AttributeNames } from './enums/AttributeNames.js';
 import { OTEL_GRAPHQL_DATA_SYMBOL } from './symbols.js';
 import { OPERATION_NOT_SUPPORTED } from './internal-types.js';
-import { getOperation, endSpan, isPromise, addSpanSource, addInputVariableAttributes, wrapFieldResolver, wrapFields } from './utils.js';
-import { SDK_VERSION } from '@sentry/core';
+import { getOperation, endSpan, isPromise, addSpanSource, wrapFieldResolver, wrapFields } from './utils.js';
+import { SDK_VERSION, withActiveSpan, spanToJSON, SPAN_STATUS_ERROR, getRootSpan, startInactiveSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION } from '@sentry/opentelemetry';
 
 const PACKAGE_NAME = "@sentry/instrumentation-graphql";
+const ORIGIN = "auto.graphql.otel.graphql";
 const DEFAULT_CONFIG = {
-  mergeItems: false,
-  depth: -1,
-  allowValues: false,
   ignoreResolveSpans: false
 };
 const supportedVersions = [">=14.0.0 <17"];
@@ -125,7 +123,7 @@ class GraphQLInstrumentation extends InstrumentationBase {
           span,
           fields: {}
         };
-        return context.with(trace.setSpan(context.active(), span), () => {
+        return withActiveSpan(span, () => {
           return safeExecuteInTheMiddle(
             () => {
               return original.apply(this, [processedArgs]);
@@ -139,7 +137,6 @@ class GraphQLInstrumentation extends InstrumentationBase {
     };
   }
   _handleExecutionResult(span, err, result) {
-    const config = this.getConfig();
     if (result === void 0 || err) {
       endSpan(span, err);
       return;
@@ -147,40 +144,55 @@ class GraphQLInstrumentation extends InstrumentationBase {
     if (isPromise(result)) {
       result.then(
         (resultData) => {
-          if (typeof config.responseHook !== "function") {
-            endSpan(span);
-            return;
-          }
-          this._executeResponseHook(span, resultData);
+          this._updateSpanFromResult(span, resultData);
+          endSpan(span);
         },
         (error) => {
           endSpan(span, error);
         }
       );
     } else {
-      if (typeof config.responseHook !== "function") {
-        endSpan(span);
-        return;
-      }
-      this._executeResponseHook(span, result);
+      this._updateSpanFromResult(span, result);
+      endSpan(span);
     }
   }
-  _executeResponseHook(span, result) {
-    const { responseHook } = this.getConfig();
-    if (!responseHook) {
+  /**
+   * Applies Sentry-specific span mutations based on the GraphQL execution result:
+   * - Marks the execute span as errored if the result contains errors (and no status was set yet)
+   * - Optionally renames the containing root span to include the GraphQL operation name(s)
+   */
+  _updateSpanFromResult(span, result) {
+    if (result.errors?.length && !spanToJSON(span).status) {
+      span.setStatus({ code: SPAN_STATUS_ERROR });
+    }
+    if (!this.getConfig().useOperationNameForRootSpan) {
       return;
     }
-    safeExecuteInTheMiddle(
-      () => {
-        responseHook(span, result);
-      },
-      (err) => {
-        if (err) {
-          this._diag.error("Error running response hook", err);
-        }
-        endSpan(span, void 0);
-      },
-      true
+    const attributes = spanToJSON(span).data;
+    const operationType = attributes[AttributeNames.OPERATION_TYPE];
+    const operationName = attributes[AttributeNames.OPERATION_NAME];
+    if (!operationType) {
+      return;
+    }
+    const rootSpan = getRootSpan(span);
+    const rootSpanAttributes = spanToJSON(rootSpan).data;
+    const existingOperations = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION] || [];
+    const newOperation = operationName ? `${operationType} ${operationName}` : `${operationType}`;
+    if (Array.isArray(existingOperations)) {
+      existingOperations.push(newOperation);
+      rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION, existingOperations);
+    } else if (typeof existingOperations === "string") {
+      rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION, [existingOperations, newOperation]);
+    } else {
+      rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION, newOperation);
+    }
+    if (!spanToJSON(rootSpan).data["original-description"]) {
+      rootSpan.setAttribute("original-description", spanToJSON(rootSpan).description);
+    }
+    rootSpan.updateName(
+      `${spanToJSON(rootSpan).data["original-description"]} (${getGraphqlOperationNamesFromAttribute(
+        existingOperations
+      )})`
     );
   }
   _patchParse() {
@@ -200,9 +212,8 @@ class GraphQLInstrumentation extends InstrumentationBase {
     };
   }
   _parse(obj, original, source, options) {
-    const config = this.getConfig();
-    const span = this.tracer.startSpan(SpanNames.PARSE);
-    return context.with(trace.setSpan(context.active(), span), () => {
+    const span = startInactiveSpan({ name: SpanNames.PARSE });
+    return withActiveSpan(span, () => {
       return safeExecuteInTheMiddle(
         () => {
           return original.call(obj, source, options);
@@ -213,7 +224,7 @@ class GraphQLInstrumentation extends InstrumentationBase {
             if (!operation) {
               span.updateName(SpanNames.SCHEMA_PARSE);
             } else if (result.loc) {
-              addSpanSource(span, result.loc, config.allowValues);
+              addSpanSource(span, result.loc);
             }
           }
           endSpan(span, err);
@@ -222,30 +233,26 @@ class GraphQLInstrumentation extends InstrumentationBase {
     });
   }
   _validate(obj, original, schema, documentAST, rules, typeInfo, options) {
-    const span = this.tracer.startSpan(SpanNames.VALIDATE, {});
-    return context.with(trace.setSpan(context.active(), span), () => {
+    const span = startInactiveSpan({ name: SpanNames.VALIDATE });
+    return withActiveSpan(span, () => {
       return safeExecuteInTheMiddle(
         () => {
           return original.call(obj, schema, documentAST, rules, options, typeInfo);
         },
-        (err, errors) => {
+        (err, _errors) => {
           if (!documentAST.loc) {
             span.updateName(SpanNames.SCHEMA_VALIDATE);
           }
-          if (errors && errors.length) {
-            span.recordException({
-              name: AttributeNames.ERROR_VALIDATION_NAME,
-              message: JSON.stringify(errors)
-            });
-          }
           endSpan(span, err);
         }
       );
     });
   }
   _createExecuteSpan(operation, processedArgs) {
-    const config = this.getConfig();
-    const span = this.tracer.startSpan(SpanNames.EXECUTE, {});
+    const span = startInactiveSpan({
+      name: SpanNames.EXECUTE,
+      attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN }
+    });
     if (operation) {
       const { operation: operationType, name: nameNode } = operation;
       span.setAttribute(AttributeNames.OPERATION_TYPE, operationType);
@@ -265,10 +272,7 @@ class GraphQLInstrumentation extends InstrumentationBase {
       span.setAttribute(AttributeNames.OPERATION_NAME, operationName);
     }
     if (processedArgs.document?.loc) {
-      addSpanSource(span, processedArgs.document.loc, config.allowValues);
-    }
-    if (processedArgs.variableValues && config.allowValues) {
-      addInputVariableAttributes(span, processedArgs.variableValues);
+      addSpanSource(span, processedArgs.document.loc);
     }
     return span;
   }
@@ -290,15 +294,10 @@ class GraphQLInstrumentation extends InstrumentationBase {
     }
     const isUsingDefaultResolver = fieldResolver == null;
     const fieldResolverForExecute = fieldResolver ?? defaultFieldResolved;
-    fieldResolver = wrapFieldResolver(
-      this.tracer,
-      () => this.getConfig(),
-      fieldResolverForExecute,
-      isUsingDefaultResolver
-    );
+    fieldResolver = wrapFieldResolver(() => this.getConfig(), fieldResolverForExecute, isUsingDefaultResolver);
     if (schema) {
-      wrapFields(schema.getQueryType(), this.tracer, () => this.getConfig());
-      wrapFields(schema.getMutationType(), this.tracer, () => this.getConfig());
+      wrapFields(schema.getQueryType(), () => this.getConfig());
+      wrapFields(schema.getMutationType(), () => this.getConfig());
     }
     return {
       schema,
@@ -312,6 +311,17 @@ class GraphQLInstrumentation extends InstrumentationBase {
     };
   }
 }
+function getGraphqlOperationNamesFromAttribute(attr) {
+  if (Array.isArray(attr)) {
+    const sorted = attr.slice().sort();
+    if (sorted.length <= 5) {
+      return sorted.join(", ");
+    } else {
+      return `${sorted.slice(0, 5).join(", ")}, +${sorted.length - 5}`;
+    }
+  }
+  return `${attr}`;
+}
 
 export { GraphQLInstrumentation };
 //# sourceMappingURL=instrumentation.js.map