@sentry/cloudflare 10.67.0 → 10.69.0

package/build/esm/durableobject.js

@@ -7,112 +7,144 @@ import { wrapRequestHandler } from './request.js';
 import { instrumentContext } from './utils/instrumentContext.js';
 import { extractRpcMeta } from './utils/rpcMeta.js';
 import { getEffectiveRpcPropagation } from './utils/rpcOptions.js';
+import { instrumentCloudflareAgent } from './instrumentations/agents/index.js';
 import { wrapMethodWithSentry } from './wrapMethodWithSentry.js';
 
-function instrumentDurableObjectWithSentry(optionsCallback, DurableObjectClass) {
-  return new Proxy(DurableObjectClass, {
-    construct(target, [ctx, env], newTarget) {
-      setAsyncLocalStorageAsyncContextStrategy();
-      const context = instrumentContext(ctx);
-      const options = getFinalOptions(optionsCallback(env), env);
-      const instrumentedEnv = instrumentEnv(env, options);
-      const obj = Reflect.construct(target, [context, instrumentedEnv], newTarget);
-      if (obj.fetch && typeof obj.fetch === "function") {
-        obj.fetch = ensureInstrumented(
-          obj.fetch.bind(obj),
-          (original) => new Proxy(original, {
-            apply(target2, thisArg, args) {
-              return wrapRequestHandler({ options, request: args[0], context }, () => {
-                return Reflect.apply(target2, thisArg, args);
-              });
-            }
-          })
-        );
-      }
-      if (obj.alarm && typeof obj.alarm === "function") {
-        obj.alarm = wrapMethodWithSentry(
-          {
-            options,
-            context,
-            spanName: "alarm",
-            spanOp: "function",
-            startNewTrace: true,
-            origin: "auto.faas.cloudflare.durable_object"
-          },
-          obj.alarm.bind(obj)
-        );
-      }
-      if (obj.webSocketMessage && typeof obj.webSocketMessage === "function") {
-        obj.webSocketMessage = wrapMethodWithSentry(
-          { options, context, spanName: "webSocketMessage", origin: "auto.faas.cloudflare.durable_object" },
-          obj.webSocketMessage.bind(obj)
-        );
+function constructInstrumentedDurableObject(target, ctx, env, newTarget, optionsCallback) {
+  setAsyncLocalStorageAsyncContextStrategy();
+  const options = getFinalOptions(optionsCallback(env), env);
+  const context = instrumentContext(ctx);
+  const instrumentedEnv = instrumentEnv(env, options);
+  const obj = Reflect.construct(target, [context, instrumentedEnv], newTarget);
+  instrumentDurableObjectHandlers(obj, options, context);
+  return { obj, options, context };
+}
+function instrumentDurableObjectHandlers(obj, options, context) {
+  if (obj.fetch && typeof obj.fetch === "function") {
+    obj.fetch = ensureInstrumented(
+      obj.fetch.bind(obj),
+      (original) => new Proxy(original, {
+        apply(target, thisArg, args) {
+          return wrapRequestHandler({ options, request: args[0], context }, () => {
+            return Reflect.apply(target, thisArg, args);
+          });
+        }
+      })
+    );
+  }
+  if (obj.alarm && typeof obj.alarm === "function") {
+    obj.alarm = wrapMethodWithSentry(
+      {
+        options,
+        context,
+        spanName: "alarm",
+        spanOp: "function",
+        startNewTrace: true,
+        origin: "auto.faas.cloudflare.durable_object"
+      },
+      obj.alarm.bind(obj)
+    );
+  }
+  if (obj.webSocketMessage && typeof obj.webSocketMessage === "function") {
+    obj.webSocketMessage = wrapMethodWithSentry(
+      { options, context, spanName: "webSocketMessage", origin: "auto.faas.cloudflare.durable_object" },
+      obj.webSocketMessage.bind(obj)
+    );
+  }
+  if (obj.webSocketClose && typeof obj.webSocketClose === "function") {
+    obj.webSocketClose = wrapMethodWithSentry(
+      { options, context, spanName: "webSocketClose", origin: "auto.faas.cloudflare.durable_object" },
+      obj.webSocketClose.bind(obj)
+    );
+  }
+  if (obj.webSocketError && typeof obj.webSocketError === "function") {
+    obj.webSocketError = wrapMethodWithSentry(
+      { options, context, spanName: "webSocketError", origin: "auto.faas.cloudflare.durable_object" },
+      obj.webSocketError.bind(obj),
+      (_, error) => captureException(error, {
+        mechanism: {
+          type: "auto.faas.cloudflare.durable_object_websocket",
+          handled: false
+        }
+      })
+    );
+  }
+}
+function finalizeWithRpcInstrumentation(obj, options, context) {
+  const rpcPropagation = getEffectiveRpcPropagation(options);
+  if (!rpcPropagation) {
+    return obj;
+  }
+  const instrumentPrototypeMethods = Array.isArray(options.instrumentPrototypeMethods) ? (
+    // eslint-disable-next-line typescript/no-deprecated
+    options.instrumentPrototypeMethods
+  ) : void 0;
+  const allowSet = instrumentPrototypeMethods ? new Set(instrumentPrototypeMethods) : null;
+  const alwaysTrace = options.enableRpcTracePropagation === void 0;
+  const methodCache = /* @__PURE__ */ new Map();
+  return new Proxy(obj, {
+    get(proxyTarget, prop, receiver) {
+      const value = Reflect.get(proxyTarget, prop, receiver);
+      if (typeof prop !== "string" || typeof value !== "function" || prop === "constructor") {
+        return value;
       }
-      if (obj.webSocketClose && typeof obj.webSocketClose === "function") {
-        obj.webSocketClose = wrapMethodWithSentry(
-          { options, context, spanName: "webSocketClose", origin: "auto.faas.cloudflare.durable_object" },
-          obj.webSocketClose.bind(obj)
-        );
+      const cached = methodCache.get(prop);
+      if (cached) {
+        return cached;
       }
-      if (obj.webSocketError && typeof obj.webSocketError === "function") {
-        obj.webSocketError = wrapMethodWithSentry(
-          { options, context, spanName: "webSocketError", origin: "auto.faas.cloudflare.durable_object" },
-          obj.webSocketError.bind(obj),
-          (_, error) => captureException(error, {
-            mechanism: {
-              type: "auto.faas.cloudflare.durable_object_websocket",
-              handled: false
-            }
-          })
-        );
+      const boundMethod = value.bind(proxyTarget);
+      if (prop in Object.prototype || Object.prototype.hasOwnProperty.call(proxyTarget, prop) || allowSet && !allowSet.has(prop)) {
+        methodCache.set(prop, boundMethod);
+        return boundMethod;
       }
-      const rpcPropagation = getEffectiveRpcPropagation(options);
-      if (!rpcPropagation) {
-        return obj;
+      const tracedMethod = wrapMethodWithSentry(
+        { options, context, spanName: prop, spanOp: "rpc", origin: "auto.faas.cloudflare.durable_object" },
+        boundMethod,
+        void 0,
+        true
+      );
+      if (alwaysTrace) {
+        methodCache.set(prop, tracedMethod);
+        return tracedMethod;
       }
-      const instrumentPrototypeMethods = Array.isArray(options.instrumentPrototypeMethods) ? (
-        // eslint-disable-next-line typescript/no-deprecated
-        options.instrumentPrototypeMethods
-      ) : void 0;
-      const allowSet = instrumentPrototypeMethods ? new Set(instrumentPrototypeMethods) : null;
-      const alwaysTrace = options.enableRpcTracePropagation === void 0;
-      const methodCache = /* @__PURE__ */ new Map();
-      return new Proxy(obj, {
-        get(proxyTarget, prop, receiver) {
-          const value = Reflect.get(proxyTarget, prop, receiver);
-          if (typeof prop !== "string" || typeof value !== "function" || prop === "constructor") {
-            return value;
-          }
-          const cached = methodCache.get(prop);
-          if (cached) {
-            return cached;
-          }
-          const boundMethod = value.bind(proxyTarget);
-          if (prop in Object.prototype || Object.prototype.hasOwnProperty.call(proxyTarget, prop) || allowSet && !allowSet.has(prop)) {
-            methodCache.set(prop, boundMethod);
-            return boundMethod;
-          }
-          const tracedMethod = wrapMethodWithSentry(
-            { options, context, spanName: prop, spanOp: "rpc", origin: "auto.faas.cloudflare.durable_object" },
-            boundMethod,
-            void 0,
-            true
-          );
-          if (alwaysTrace) {
-            methodCache.set(prop, tracedMethod);
-            return tracedMethod;
-          }
-          const wrappedMethod = ((...args) => {
-            const { rpcMeta } = extractRpcMeta(args);
-            return rpcMeta ? tracedMethod(...args) : boundMethod(...args);
-          });
-          methodCache.set(prop, wrappedMethod);
-          return wrappedMethod;
-        }
+      const wrappedMethod = ((...args) => {
+        const { rpcMeta } = extractRpcMeta(args);
+        return rpcMeta ? tracedMethod(...args) : boundMethod(...args);
       });
+      methodCache.set(prop, wrappedMethod);
+      return wrappedMethod;
+    }
+  });
+}
+function instrumentDurableObjectWithSentry(optionsCallback, DurableObjectClass) {
+  return new Proxy(DurableObjectClass, {
+    construct(target, [ctx, env], newTarget) {
+      const { obj, options, context } = constructInstrumentedDurableObject(
+        target,
+        ctx,
+        env,
+        newTarget,
+        optionsCallback
+      );
+      return finalizeWithRpcInstrumentation(obj, options, context);
+    }
+  });
+}
+function instrumentAgentWithSentry(optionsCallback, AgentClass) {
+  return new Proxy(AgentClass, {
+    construct(target, [ctx, env], newTarget) {
+      const { obj, options, context } = constructInstrumentedDurableObject(
+        target,
+        ctx,
+        env,
+        newTarget,
+        optionsCallback
+      );
+      instrumentCloudflareAgent(obj);
+      return finalizeWithRpcInstrumentation(obj, options, context);
     }
   });
 }
 
-export { instrumentDurableObjectWithSentry };
+export { constructInstrumentedDurableObject, finalizeWithRpcInstrumentation, instrumentAgentWithSentry, instrumentDurableObjectWithSentry };
 //# sourceMappingURL=durableobject.js.map

package/build/esm/durableobject.js.map

@@ -1 +1 @@
-{"version":3,"file":"durableobject.js","sources":["../../src/durableobject.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/unbound-method */\nimport { captureException } from '@sentry/core';\nimport type { DurableObject } from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { ensureInstrumented } from './instrument';\nimport { instrumentEnv } from './instrumentations/worker/instrumentEnv';\nimport { getFinalOptions } from './options';\nimport { wrapRequestHandler } from './request';\nimport { instrumentContext } from './utils/instrumentContext';\nimport { extractRpcMeta } from './utils/rpcMeta';\nimport { getEffectiveRpcPropagation } from './utils/rpcOptions';\nimport { type UncheckedMethod, wrapMethodWithSentry } from './wrapMethodWithSentry';\n\n/**\n * Instruments a Durable Object class to capture errors and performance data.\n *\n * Instruments the following methods by default:\n * - fetch\n * - alarm\n * - webSocketMessage\n * - webSocketClose\n * - webSocketError\n *\n * To instrument RPC methods (prototype methods), enable the `enableRpcTracePropagation` option.\n *\n * @param optionsCallback Function that returns the options for the SDK initialization.\n * @param DurableObjectClass The Durable Object class to instrument.\n * @returns The instrumented Durable Object class.\n *\n * @example\n * ```ts\n * class MyDurableObjectBase extends DurableObject {\n *   constructor(ctx: DurableObjectState, env: Env) {\n *     super(ctx, env);\n *   }\n * }\n *\n * export const MyDurableObject = instrumentDurableObjectWithSentry(\n *   env => ({\n *     dsn: env.SENTRY_DSN,\n *     tracesSampleRate: 1.0,\n *   }),\n *   MyDurableObjectBase,\n * );\n * ```\n */\nexport function instrumentDurableObjectWithSentry<\n  E,\n  T extends DurableObject<E>,\n  C extends new (state: DurableObjectState, env: E) => T,\n>(optionsCallback: (env: E) => CloudflareOptions, DurableObjectClass: C): C {\n  return new Proxy(DurableObjectClass, {\n    construct(target, [ctx, env], newTarget) {\n      setAsyncLocalStorageAsyncContextStrategy();\n      const context = instrumentContext(ctx);\n      const options = getFinalOptions(optionsCallback(env), env);\n      const instrumentedEnv = instrumentEnv(env, options);\n\n      // Pass `newTarget` so that subclasses of the instrumented class (e.g. the wrapper classes\n      // created by wrangler's local dev tooling or `@cloudflare/vitest-pool-workers`) keep their\n      // own prototype — otherwise subclass methods disappear and `instanceof` checks break.\n      const obj = Reflect.construct(target, [context, instrumentedEnv], newTarget) as T;\n\n      // These are the methods that are available on a Durable Object\n      // ref: https://developers.cloudflare.com/durable-objects/api/base/\n      // obj.alarm\n      // obj.fetch\n      // obj.webSocketError\n      // obj.webSocketClose\n      // obj.webSocketMessage\n\n      // Any other public methods on the Durable Object instance are RPC calls.\n\n      // Bind each built-in handler to this instance before wrapping.\n      // See https://github.com/getsentry/sentry-javascript/issues/22328\n      if (obj.fetch && typeof obj.fetch === 'function') {\n        obj.fetch = ensureInstrumented(\n          obj.fetch.bind(obj),\n          original =>\n            new Proxy(original, {\n              apply(target, thisArg, args) {\n                return wrapRequestHandler({ options, request: args[0], context }, () => {\n                  return Reflect.apply(target, thisArg, args);\n                });\n              },\n            }),\n        );\n      }\n\n      if (obj.alarm && typeof obj.alarm === 'function') {\n        // Alarms are independent invocations, so we start a new trace and link to the previous alarm\n        obj.alarm = wrapMethodWithSentry(\n          {\n            options,\n            context,\n            spanName: 'alarm',\n            spanOp: 'function',\n            startNewTrace: true,\n            origin: 'auto.faas.cloudflare.durable_object',\n          },\n          obj.alarm.bind(obj),\n        );\n      }\n\n      if (obj.webSocketMessage && typeof obj.webSocketMessage === 'function') {\n        obj.webSocketMessage = wrapMethodWithSentry(\n          { options, context, spanName: 'webSocketMessage', origin: 'auto.faas.cloudflare.durable_object' },\n          obj.webSocketMessage.bind(obj),\n        );\n      }\n\n      if (obj.webSocketClose && typeof obj.webSocketClose === 'function') {\n        obj.webSocketClose = wrapMethodWithSentry(\n          { options, context, spanName: 'webSocketClose', origin: 'auto.faas.cloudflare.durable_object' },\n          obj.webSocketClose.bind(obj),\n        );\n      }\n\n      if (obj.webSocketError && typeof obj.webSocketError === 'function') {\n        obj.webSocketError = wrapMethodWithSentry(\n          { options, context, spanName: 'webSocketError', origin: 'auto.faas.cloudflare.durable_object' },\n          obj.webSocketError.bind(obj),\n          (_, error) =>\n            captureException(error, {\n              mechanism: {\n                type: 'auto.faas.cloudflare.durable_object_websocket',\n                handled: false,\n              },\n            }),\n        );\n      }\n\n      // Get effective RPC propagation setting (handles deprecation of instrumentPrototypeMethods)\n      const rpcPropagation = getEffectiveRpcPropagation(options);\n\n      // Skip RPC instrumentation if not enabled\n      if (!rpcPropagation) {\n        return obj;\n      }\n\n      // If `instrumentPrototypeMethods` was passed as an array (deprecated),\n      // only the listed method names should be instrumented.\n      // eslint-disable-next-line typescript/no-deprecated\n      const instrumentPrototypeMethods = Array.isArray(options.instrumentPrototypeMethods)\n        ? // eslint-disable-next-line typescript/no-deprecated\n          options.instrumentPrototypeMethods\n        : undefined;\n      const allowSet = instrumentPrototypeMethods ? new Set(instrumentPrototypeMethods) : null;\n\n      // When using the deprecated `instrumentPrototypeMethods` option, always create spans.\n      // When using the new `enableRpcTracePropagation`, only create spans when RPC metadata is present.\n      const alwaysTrace = options.enableRpcTracePropagation === undefined;\n\n      // Return a Proxy that binds all methods to the original object and creates spans\n      // for RPC calls that have Sentry trace context propagated.\n      // Binding is required because frameworks may use private fields (babel WeakMap pattern),\n      // which fail if `this` is the Proxy instead of the original object.\n      const methodCache = new Map<string, UncheckedMethod>();\n\n      return new Proxy(obj, {\n        get(proxyTarget, prop, receiver) {\n          const value = Reflect.get(proxyTarget, prop, receiver);\n\n          if (typeof prop !== 'string' || typeof value !== 'function' || prop === 'constructor') {\n            return value;\n          }\n\n          const cached = methodCache.get(prop);\n\n          if (cached) {\n            return cached;\n          }\n\n          const boundMethod = (value as UncheckedMethod).bind(proxyTarget);\n\n          if (\n            prop in Object.prototype ||\n            Object.prototype.hasOwnProperty.call(proxyTarget, prop) ||\n            (allowSet && !allowSet.has(prop))\n          ) {\n            methodCache.set(prop, boundMethod);\n\n            return boundMethod;\n          }\n\n          // Pre-create the traced version\n          const tracedMethod = wrapMethodWithSentry(\n            { options, context, spanName: prop, spanOp: 'rpc', origin: 'auto.faas.cloudflare.durable_object' },\n            boundMethod,\n            undefined,\n            true,\n          );\n\n          // For deprecated `instrumentPrototypeMethods`, always trace.\n          // For new `enableRpcTracePropagation`, only trace when RPC metadata is present.\n          if (alwaysTrace) {\n            methodCache.set(prop, tracedMethod);\n\n            return tracedMethod;\n          }\n\n          // Wrapper that checks for Sentry RPC metadata at call time\n          const wrappedMethod = ((...args: unknown[]) => {\n            const { rpcMeta } = extractRpcMeta(args);\n\n            // If Sentry RPC metadata is present, use the traced version (creates span)\n            // Otherwise, call the bound method directly (no span)\n            return rpcMeta ? tracedMethod(...args) : boundMethod(...args);\n          }) as UncheckedMethod;\n\n          methodCache.set(prop, wrappedMethod);\n\n          return wrappedMethod;\n        },\n      });\n    },\n  });\n}\n"],"names":["target"],"mappings":"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"}
+{"version":3,"file":"durableobject.js","sources":["../../src/durableobject.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/unbound-method */\nimport { captureException } from '@sentry/core';\nimport type { DurableObject } from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { ensureInstrumented } from './instrument';\nimport { instrumentEnv } from './instrumentations/worker/instrumentEnv';\nimport { getFinalOptions } from './options';\nimport { wrapRequestHandler } from './request';\nimport { instrumentContext } from './utils/instrumentContext';\nimport { extractRpcMeta } from './utils/rpcMeta';\nimport { getEffectiveRpcPropagation } from './utils/rpcOptions';\nimport { instrumentCloudflareAgent } from './instrumentations/agents';\nimport { type UncheckedMethod, wrapMethodWithSentry } from './wrapMethodWithSentry';\n\n/**\n * The instrumented context passed between the shared construction helpers.\n *\n * This is intentionally `any` rather than `ReturnType<typeof instrumentContext<DurableObjectState>>`.\n * A concrete `DurableObjectState` here forces `tsc` to structurally relate its `storage: SqlStorage`\n * graph against the `ExecutionContext | InstrumentedDurableObjectState` parameter of\n * `wrapMethodWithSentry`, while the RPC-branded `DurableObject` from `cloudflare:workers` is also in\n * scope. That union comparison explodes (1296×1296) and hangs the type build. The original inline\n * implementation avoided this only incidentally, because `ctx` reached it as `any` through the Proxy\n * `construct` trap. Keeping the shared context `any` preserves that behavior.\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype InstrumentedDurableObjectContext = any;\n\n/**\n * Constructs a Durable Object instance and instruments its built-in handler methods\n * (`fetch`, `alarm`, `webSocketMessage`, `webSocketClose`, `webSocketError`).\n *\n * This is the shared construction path used by both {@link instrumentDurableObjectWithSentry}\n * and {@link instrumentAgentWithSentry}. It intentionally does NOT apply the RPC prototype-method\n * proxy — callers apply that last via {@link finalizeWithRpcInstrumentation}, after any additional\n * per-instance instrumentation has been layered onto the returned object.\n *\n * @internal\n */\nexport function constructInstrumentedDurableObject<E, T extends DurableObject<E>>(\n  target: new (state: DurableObjectState, env: E) => T,\n  ctx: DurableObjectState,\n  env: E,\n  newTarget: NewableFunction,\n  optionsCallback: (env: E) => CloudflareOptions,\n): { obj: T; options: CloudflareOptions; context: InstrumentedDurableObjectContext } {\n  setAsyncLocalStorageAsyncContextStrategy();\n  const options = getFinalOptions(optionsCallback(env), env);\n  // See InstrumentedDurableObjectContext — `ctx` is widened to `any` so the concrete\n  // `DurableObjectState` type never enters the checker's relation graph in this module.\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const context = instrumentContext(ctx as any);\n  const instrumentedEnv = instrumentEnv(env as Record<string, unknown>, options);\n\n  // Pass `newTarget` so that subclasses of the instrumented class (e.g. the wrapper classes\n  // created by wrangler's local dev tooling or `@cloudflare/vitest-pool-workers`) keep their\n  // own prototype — otherwise subclass methods disappear and `instanceof` checks break.\n  const obj = Reflect.construct(target, [context, instrumentedEnv], newTarget) as T;\n\n  instrumentDurableObjectHandlers(obj, options, context);\n\n  return { obj, options, context };\n}\n\n/**\n * Instruments the built-in Durable Object handler methods on a constructed instance.\n *\n * These are the methods that are available on a Durable Object\n * ref: https://developers.cloudflare.com/durable-objects/api/base/\n * - obj.alarm\n * - obj.fetch\n * - obj.webSocketError\n * - obj.webSocketClose\n * - obj.webSocketMessage\n *\n * Any other public methods on the Durable Object instance are RPC calls.\n */\nfunction instrumentDurableObjectHandlers<E, T extends DurableObject<E>>(\n  obj: T,\n  options: CloudflareOptions,\n  context: InstrumentedDurableObjectContext,\n): void {\n  // Bind each built-in handler to this instance before wrapping.\n  // See https://github.com/getsentry/sentry-javascript/issues/22328\n  if (obj.fetch && typeof obj.fetch === 'function') {\n    obj.fetch = ensureInstrumented(\n      obj.fetch.bind(obj),\n      original =>\n        new Proxy(original, {\n          apply(target, thisArg, args) {\n            return wrapRequestHandler({ options, request: args[0], context }, () => {\n              return Reflect.apply(target, thisArg, args);\n            });\n          },\n        }),\n    );\n  }\n\n  if (obj.alarm && typeof obj.alarm === 'function') {\n    // Alarms are independent invocations, so we start a new trace and link to the previous alarm\n    obj.alarm = wrapMethodWithSentry(\n      {\n        options,\n        context,\n        spanName: 'alarm',\n        spanOp: 'function',\n        startNewTrace: true,\n        origin: 'auto.faas.cloudflare.durable_object',\n      },\n      obj.alarm.bind(obj),\n    );\n  }\n\n  if (obj.webSocketMessage && typeof obj.webSocketMessage === 'function') {\n    obj.webSocketMessage = wrapMethodWithSentry(\n      { options, context, spanName: 'webSocketMessage', origin: 'auto.faas.cloudflare.durable_object' },\n      obj.webSocketMessage.bind(obj),\n    );\n  }\n\n  if (obj.webSocketClose && typeof obj.webSocketClose === 'function') {\n    obj.webSocketClose = wrapMethodWithSentry(\n      { options, context, spanName: 'webSocketClose', origin: 'auto.faas.cloudflare.durable_object' },\n      obj.webSocketClose.bind(obj),\n    );\n  }\n\n  if (obj.webSocketError && typeof obj.webSocketError === 'function') {\n    obj.webSocketError = wrapMethodWithSentry(\n      { options, context, spanName: 'webSocketError', origin: 'auto.faas.cloudflare.durable_object' },\n      obj.webSocketError.bind(obj),\n      (_, error) =>\n        captureException(error, {\n          mechanism: {\n            type: 'auto.faas.cloudflare.durable_object_websocket',\n            handled: false,\n          },\n        }),\n    );\n  }\n}\n\n/**\n * Wraps a constructed (and already handler-instrumented) Durable Object instance with the RPC\n * prototype-method proxy, when RPC trace propagation is enabled. Returns the object unchanged when\n * RPC instrumentation is disabled.\n *\n * This must be applied last, so that any per-instance instrumentation (own properties such as\n * `fetch`, `alarm`, or Agent-specific handlers) is excluded from RPC method tracing.\n *\n * @internal\n */\nexport function finalizeWithRpcInstrumentation<T extends object>(\n  obj: T,\n  options: CloudflareOptions,\n  context: InstrumentedDurableObjectContext,\n): T {\n  // Get effective RPC propagation setting (handles deprecation of instrumentPrototypeMethods)\n  const rpcPropagation = getEffectiveRpcPropagation(options);\n\n  // Skip RPC instrumentation if not enabled\n  if (!rpcPropagation) {\n    return obj;\n  }\n\n  // If `instrumentPrototypeMethods` was passed as an array (deprecated),\n  // only the listed method names should be instrumented.\n  // eslint-disable-next-line typescript/no-deprecated\n  const instrumentPrototypeMethods = Array.isArray(options.instrumentPrototypeMethods)\n    ? // eslint-disable-next-line typescript/no-deprecated\n      options.instrumentPrototypeMethods\n    : undefined;\n  const allowSet = instrumentPrototypeMethods ? new Set(instrumentPrototypeMethods) : null;\n\n  // When using the deprecated `instrumentPrototypeMethods` option, always create spans.\n  // When using the new `enableRpcTracePropagation`, only create spans when RPC metadata is present.\n  const alwaysTrace = options.enableRpcTracePropagation === undefined;\n\n  // Return a Proxy that binds all methods to the original object and creates spans\n  // for RPC calls that have Sentry trace context propagated.\n  // Binding is required because frameworks may use private fields (babel WeakMap pattern),\n  // which fail if `this` is the Proxy instead of the original object.\n  const methodCache = new Map<string, UncheckedMethod>();\n\n  return new Proxy(obj, {\n    get(proxyTarget, prop, receiver) {\n      const value = Reflect.get(proxyTarget, prop, receiver);\n\n      if (typeof prop !== 'string' || typeof value !== 'function' || prop === 'constructor') {\n        return value;\n      }\n\n      const cached = methodCache.get(prop);\n\n      if (cached) {\n        return cached;\n      }\n\n      const boundMethod = (value as UncheckedMethod).bind(proxyTarget);\n\n      if (\n        prop in Object.prototype ||\n        Object.prototype.hasOwnProperty.call(proxyTarget, prop) ||\n        (allowSet && !allowSet.has(prop))\n      ) {\n        methodCache.set(prop, boundMethod);\n\n        return boundMethod;\n      }\n\n      // Pre-create the traced version\n      const tracedMethod = wrapMethodWithSentry(\n        { options, context, spanName: prop, spanOp: 'rpc', origin: 'auto.faas.cloudflare.durable_object' },\n        boundMethod,\n        undefined,\n        true,\n      );\n\n      // For deprecated `instrumentPrototypeMethods`, always trace.\n      // For new `enableRpcTracePropagation`, only trace when RPC metadata is present.\n      if (alwaysTrace) {\n        methodCache.set(prop, tracedMethod);\n\n        return tracedMethod;\n      }\n\n      // Wrapper that checks for Sentry RPC metadata at call time\n      const wrappedMethod = ((...args: unknown[]) => {\n        const { rpcMeta } = extractRpcMeta(args);\n\n        // If Sentry RPC metadata is present, use the traced version (creates span)\n        // Otherwise, call the bound method directly (no span)\n        return rpcMeta ? tracedMethod(...args) : boundMethod(...args);\n      }) as UncheckedMethod;\n\n      methodCache.set(prop, wrappedMethod);\n\n      return wrappedMethod;\n    },\n  });\n}\n\n/**\n * Instruments a Durable Object class to capture errors and performance data.\n *\n * Instruments the following methods by default:\n * - fetch\n * - alarm\n * - webSocketMessage\n * - webSocketClose\n * - webSocketError\n *\n * To instrument RPC methods (prototype methods), enable the `enableRpcTracePropagation` option.\n *\n * @param optionsCallback Function that returns the options for the SDK initialization.\n * @param DurableObjectClass The Durable Object class to instrument.\n * @returns The instrumented Durable Object class.\n *\n * @example\n * ```ts\n * class MyDurableObjectBase extends DurableObject {\n *   constructor(ctx: DurableObjectState, env: Env) {\n *     super(ctx, env);\n *   }\n * }\n *\n * export const MyDurableObject = instrumentDurableObjectWithSentry(\n *   env => ({\n *     dsn: env.SENTRY_DSN,\n *     tracesSampleRate: 1.0,\n *   }),\n *   MyDurableObjectBase,\n * );\n * ```\n */\nexport function instrumentDurableObjectWithSentry<\n  E,\n  T extends DurableObject<E>,\n  C extends new (state: DurableObjectState, env: E) => T,\n>(optionsCallback: (env: E) => CloudflareOptions, DurableObjectClass: C): C {\n  return new Proxy(DurableObjectClass, {\n    construct(target, [ctx, env], newTarget) {\n      const { obj, options, context } = constructInstrumentedDurableObject(\n        target,\n        ctx,\n        env,\n        newTarget,\n        optionsCallback,\n      );\n\n      return finalizeWithRpcInstrumentation(obj, options, context);\n    },\n  });\n}\n\n/**\n * Instruments a Cloudflare [`agents`](https://www.npmjs.com/package/agents) Agent class with Sentry.\n *\n * An `Agent` is a Durable Object under the hood, so this applies the same instrumentation as\n * {@link instrumentDurableObjectWithSentry} (request transactions, `alarm`, WebSocket handlers, RPC\n * trace propagation, SQL spans) and additionally captures Agent-specific telemetry via\n * `instrumentCloudflareAgent`:\n *\n * - **Callable RPC spans** — a span (op `rpc`) for each `@callable()` method invoked over WebSocket.\n * - **Breadcrumbs** — for every Agent observability event (`rpc`, `state:update`, `connect`,\n *   `disconnect`, `schedule:*`, `queue:*`, `workflow:*`, `email:*`, `mcp:*`, ...).\n *\n * Cloudflare Workers cannot auto-instrument, so the Agent class must be wrapped manually.\n *\n * @param optionsCallback Function that returns the options for the SDK initialization.\n * @param AgentClass The Agent class to instrument.\n * @returns The instrumented Agent class.\n *\n * @example\n * ```ts\n * import { Agent, callable, routeAgentRequest } from 'agents';\n * import * as Sentry from '@sentry/cloudflare';\n *\n * class MyAgentBase extends Agent<Env> {\n *   @callable()\n *   async greet(name: string): Promise<string> {\n *     return `Hello, ${name}!`;\n *   }\n * }\n *\n * export const MyAgent = Sentry.instrumentAgentWithSentry(\n *   env => ({\n *     dsn: env.SENTRY_DSN,\n *     tracesSampleRate: 1.0,\n *     enableRpcTracePropagation: true,\n *   }),\n *   MyAgentBase,\n * );\n * ```\n */\nexport function instrumentAgentWithSentry<\n  E,\n  T extends DurableObject<E>,\n  C extends new (state: DurableObjectState, env: E) => T,\n>(optionsCallback: (env: E) => CloudflareOptions, AgentClass: C): C {\n  return new Proxy(AgentClass, {\n    construct(target, [ctx, env], newTarget) {\n      const { obj, options, context } = constructInstrumentedDurableObject(\n        target,\n        ctx,\n        env,\n        newTarget,\n        optionsCallback,\n      );\n\n      instrumentCloudflareAgent(obj);\n\n      // Apply RPC prototype-method instrumentation last, so the Agent-specific own-property\n      // handlers we just installed are excluded from RPC method tracing.\n      return finalizeWithRpcInstrumentation(obj, options, context);\n    },\n  });\n}\n"],"names":[],"mappings":"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"}

package/build/esm/index.js

@@ -1,12 +1,14 @@
-export { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, Scope, addBreadcrumb, addEventProcessor, addIntegration, bindScopeToEmitter, captureCheckIn, captureConsoleIntegration, captureEvent, captureException, captureFeedback, captureMessage, close, consoleIntegration, consoleLoggingIntegration, continueTrace, createConsolaReporter, createLangChainCallbackHandler, createTransport, dedupeIntegration, eventFiltersIntegration, extraErrorDataIntegration, featureFlagsIntegration, flush, functionToStringIntegration, getActiveSpan, getClient, getCurrentScope, getGlobalScope, getIsolationScope, getRootSpan, getSpanDescendants, getSpanStatusFromHttpCode, getTraceData, getTraceMetaTags, growthbookIntegration, inboundFiltersIntegration, instrumentAnthropicAiClient, instrumentCreateReactAgent, instrumentGoogleGenAIClient, instrumentLangChainEmbeddings, instrumentLangGraph, instrumentOpenAiClient, instrumentPostgresJsSql, instrumentSupabaseClient, isEnabled, isInitialized, lastEventId, linkedErrorsIntegration, logger, metrics, moduleMetadataIntegration, requestDataIntegration, rewriteFramesIntegration, setAttribute, setAttributes, setContext, setConversationId, setCurrentClient, setExtra, setExtras, setHttpStatus, setMeasurement, setTag, setTags, setUser, spanStreamingIntegration, spanToBaggageHeader, spanToJSON, spanToTraceHeader, startInactiveSpan, startNewTrace, startSpan, startSpanManual, supabaseIntegration, suppressTracing, trpcMiddleware, updateSpanName, withActiveSpan, withIsolationScope, withMonitor, withScope, withStreamedSpan, wrapMcpServerWithSentry, zodErrorsIntegration } from '@sentry/core';
+export { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, Scope, addBreadcrumb, addEventProcessor, addIntegration, bindScopeToEmitter, captureCheckIn, captureConsoleIntegration, captureEvent, captureException, captureFeedback, captureMessage, close, consoleIntegration, consoleLoggingIntegration, continueTrace, createConsolaReporter, createLangChainCallbackHandler, createTransport, dedupeIntegration, eventFiltersIntegration, extraErrorDataIntegration, featureFlagsIntegration, flush, functionToStringIntegration, getActiveSpan, getClient, getCurrentScope, getGlobalScope, getIsolationScope, getRootSpan, getSpanDescendants, getSpanStatusFromHttpCode, getTraceData, getTraceMetaTags, growthbookIntegration, inboundFiltersIntegration, instrumentAnthropicAiClient, instrumentCreateReactAgent, instrumentGoogleGenAIClient, instrumentLangChainEmbeddings, instrumentLangGraph, instrumentOpenAiClient, instrumentPostgresJsSql, instrumentStateGraph, instrumentSupabaseClient, isEnabled, isInitialized, lastEventId, linkedErrorsIntegration, logger, metrics, moduleMetadataIntegration, requestDataIntegration, rewriteFramesIntegration, setAttribute, setAttributes, setContext, setConversationId, setCurrentClient, setExtra, setExtras, setHttpStatus, setMeasurement, setTag, setTags, setUser, spanStreamingIntegration, spanToBaggageHeader, spanToJSON, spanToTraceHeader, startInactiveSpan, startNewTrace, startSpan, startSpanManual, supabaseIntegration, suppressTracing, trpcMiddleware, updateSpanName, withActiveSpan, withIsolationScope, withMonitor, withScope, withStreamedSpan, wrapMcpServerWithSentry, zodErrorsIntegration } from '@sentry/core';
 export { withSentry } from './withSentry.js';
-export { instrumentDurableObjectWithSentry } from './durableobject.js';
+export { defineCloudflareOptions } from './defineCloudflareOptions.js';
+export { instrumentAgentWithSentry, instrumentDurableObjectWithSentry } from './durableobject.js';
 export { sentryPagesPlugin } from './pages-plugin.js';
 export { wrapRequestHandler } from './request.js';
 export { CloudflareClient } from './client.js';
 export { getDefaultIntegrations } from './sdk.js';
 export { httpServerIntegration } from './integrations/httpServer.js';
 export { fetchIntegration } from './integrations/fetch.js';
+export { spotlightIntegration } from './integrations/spotlight.js';
 export { vercelAIIntegration } from './integrations/tracing/vercelai.js';
 export { honoIntegration } from './integrations/hono.js';
 export { instrumentD1WithSentry } from './instrumentations/worker/instrumentD1.js';

package/build/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;"}

package/build/esm/instrumentations/agents/index.js

@@ -0,0 +1,12 @@
+import { instrumentAgentCallableRpc } from './instrumentAgentCallableRpc.js';
+import { instrumentChatAgentConversation } from './instrumentChatAgentConversation.js';
+
+function instrumentCloudflareAgent(agent) {
+  const internals = agent;
+  instrumentAgentCallableRpc(internals);
+  instrumentChatAgentConversation(internals);
+  return agent;
+}
+
+export { instrumentCloudflareAgent };
+//# sourceMappingURL=index.js.map

package/build/esm/instrumentations/agents/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sources":["../../../../src/instrumentations/agents/index.ts"],"sourcesContent":["import { instrumentAgentCallableRpc } from './instrumentAgentCallableRpc';\nimport { instrumentChatAgentConversation } from './instrumentChatAgentConversation';\nimport type { AgentInternals } from './types';\n\n/**\n * Instruments an instance of a Cloudflare [`agents`](https://www.npmjs.com/package/agents) `Agent`\n * with Sentry, adding telemetry that is specific to the Agent's runtime behavior:\n *\n * - **Callable RPC spans** — a span (op `rpc`) for each `@callable()` method invoked over WebSocket.\n * - **Conversation correlation** — sets the conversation id on the scope for each unit of agent\n *   work — chat turn or callable RPC call — so `gen_ai` spans created within it are correlated, for\n *   chat and plain agents alike. Defaults to the instance `name` and is rotated when the chat is\n *   cleared (the `message:clear` observability event).\n *\n * It only hooks the `agents` package internals and uses Sentry's tracing primitives. On Cloudflare\n * Workers, prefer `instrumentAgentWithSentry`, which additionally instruments the Durable Object\n * handlers and initializes the SDK; that function calls this one internally.\n *\n * The hooks replace own-properties on the instance and defer to the original implementation, so\n * they compose with any other instrumentation applied to the same instance.\n *\n * @param agent The `agents` `Agent` instance to instrument.\n * @returns The same instance, instrumented.\n *\n * @internal Use `instrumentAgentWithSentry` instead — this is called internally by it.\n */\nexport function instrumentCloudflareAgent<T extends object>(agent: T): T {\n  const internals = agent as T & AgentInternals;\n\n  instrumentAgentCallableRpc(internals);\n  instrumentChatAgentConversation(internals);\n\n  return agent;\n}\n"],"names":[],"mappings":";;;AA0BO,SAAS,0BAA4C,KAAA,EAAa;AACvE,EAAA,MAAM,SAAA,GAAY,KAAA;AAElB,EAAA,0BAAA,CAA2B,SAAS,CAAA;AACpC,EAAA,+BAAA,CAAgC,SAAS,CAAA;AAEzC,EAAA,OAAO,KAAA;AACT;;;;"}

package/build/esm/instrumentations/agents/instrumentAgentCallableRpc.js

@@ -0,0 +1,50 @@
+import { debug, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_OP } from '@sentry/core';
+import { DEBUG_BUILD } from '../../debug-build.js';
+import { AGENT_SPAN_ORIGIN, getAgentAttributes, setAgentConversationId } from './types.js';
+
+function instrumentAgentCallableRpc(obj) {
+  const original = obj.onMessage;
+  if (typeof original !== "function") {
+    DEBUG_BUILD && debug.log("[Sentry] Agent `onMessage` not found \u2014 callable RPC span instrumentation skipped.");
+    return;
+  }
+  obj.onMessage = new Proxy(original, {
+    apply(target, thisArg, args) {
+      const method = extractCallableMethod(args[1]);
+      if (!method) {
+        return Reflect.apply(target, thisArg, args);
+      }
+      return startSpan(
+        {
+          name: method,
+          attributes: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: "rpc",
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: AGENT_SPAN_ORIGIN,
+            ...getAgentAttributes(thisArg)
+          }
+        },
+        () => {
+          setAgentConversationId(thisArg);
+          return Reflect.apply(target, thisArg, args);
+        }
+      );
+    }
+  });
+}
+function extractCallableMethod(message) {
+  const text = typeof message === "string" ? message : message instanceof ArrayBuffer ? new TextDecoder().decode(message) : void 0;
+  if (!text) {
+    return void 0;
+  }
+  try {
+    const parsed = JSON.parse(text);
+    if (parsed.type === "rpc" && typeof parsed.method === "string" && Array.isArray(parsed.args)) {
+      return parsed.method;
+    }
+  } catch {
+  }
+  return void 0;
+}
+
+export { instrumentAgentCallableRpc };
+//# sourceMappingURL=instrumentAgentCallableRpc.js.map

package/build/esm/instrumentations/agents/instrumentAgentCallableRpc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instrumentAgentCallableRpc.js","sources":["../../../../src/instrumentations/agents/instrumentAgentCallableRpc.ts"],"sourcesContent":["import { debug, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/core';\nimport { DEBUG_BUILD } from '../../debug-build';\nimport { AGENT_SPAN_ORIGIN, type AgentInternals, getAgentAttributes, setAgentConversationId } from './types';\n\n/**\n * Wraps the Agent's `onMessage` handler to create a span for each `@callable()` RPC invocation.\n * RPC requests arrive as WebSocket messages, so this span nests under the active transaction for\n * the WebSocket message (on Cloudflare, the instrumented Durable Object `webSocketMessage` hook).\n *\n * Also sets the conversation id on the scope for the duration of the call: callable methods are the\n * unit of work for plain (non-chat) agents, which run LLM calls just like chat turns do.\n */\nexport function instrumentAgentCallableRpc(obj: AgentInternals): void {\n  const original = obj.onMessage;\n  if (typeof original !== 'function') {\n    DEBUG_BUILD && debug.log('[Sentry] Agent `onMessage` not found — callable RPC span instrumentation skipped.');\n    return;\n  }\n\n  obj.onMessage = new Proxy(original, {\n    apply(target, thisArg: AgentInternals, args: unknown[]): unknown {\n      const method = extractCallableMethod(args[1]);\n\n      if (!method) {\n        return Reflect.apply(target, thisArg, args);\n      }\n\n      return startSpan(\n        {\n          name: method,\n          attributes: {\n            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'rpc',\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: AGENT_SPAN_ORIGIN,\n            ...getAgentAttributes(thisArg),\n          },\n        },\n        () => {\n          setAgentConversationId(thisArg);\n          return Reflect.apply(target, thisArg, args);\n        },\n      );\n    },\n  });\n}\n\n/** Extracts the RPC method name from a WebSocket message, mirroring the SDK's `isRPCRequest`. */\nfunction extractCallableMethod(message: unknown): string | undefined {\n  const text =\n    typeof message === 'string'\n      ? message\n      : message instanceof ArrayBuffer\n        ? new TextDecoder().decode(message)\n        : undefined;\n\n  if (!text) {\n    return undefined;\n  }\n\n  try {\n    const parsed = JSON.parse(text) as { type?: unknown; method?: unknown; args?: unknown };\n    if (parsed.type === 'rpc' && typeof parsed.method === 'string' && Array.isArray(parsed.args)) {\n      return parsed.method;\n    }\n  } catch {\n    // Not JSON, or not an RPC request — no span.\n  }\n\n  return undefined;\n}\n"],"names":[],"mappings":";;;;AAYO,SAAS,2BAA2B,GAAA,EAA2B;AACpE,EAAA,MAAM,WAAW,GAAA,CAAI,SAAA;AACrB,EAAA,IAAI,OAAO,aAAa,UAAA,EAAY;AAClC,IAAA,WAAA,IAAe,KAAA,CAAM,IAAI,wFAAmF,CAAA;AAC5G,IAAA;AAAA,EACF;AAEA,EAAA,GAAA,CAAI,SAAA,GAAY,IAAI,KAAA,CAAM,QAAA,EAAU;AAAA,IAClC,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAyB,IAAA,EAA0B;AAC/D,MAAA,MAAM,MAAA,GAAS,qBAAA,CAAsB,IAAA,CAAK,CAAC,CAAC,CAAA;AAE5C,MAAA,IAAI,CAAC,MAAA,EAAQ;AACX,QAAA,OAAO,OAAA,CAAQ,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAI,CAAA;AAAA,MAC5C;AAEA,MAAA,OAAO,SAAA;AAAA,QACL;AAAA,UACE,IAAA,EAAM,MAAA;AAAA,UACN,UAAA,EAAY;AAAA,YACV,CAAC,4BAA4B,GAAG,KAAA;AAAA,YAChC,CAAC,gCAAgC,GAAG,iBAAA;AAAA,YACpC,GAAG,mBAAmB,OAAO;AAAA;AAC/B,SACF;AAAA,QACA,MAAM;AACJ,UAAA,sBAAA,CAAuB,OAAO,CAAA;AAC9B,UAAA,OAAO,OAAA,CAAQ,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAI,CAAA;AAAA,QAC5C;AAAA,OACF;AAAA,IACF;AAAA,GACD,CAAA;AACH;AAGA,SAAS,sBAAsB,OAAA,EAAsC;AACnE,EAAA,MAAM,IAAA,GACJ,OAAO,OAAA,KAAY,QAAA,GACf,OAAA,GACA,OAAA,YAAmB,WAAA,GACjB,IAAI,WAAA,EAAY,CAAE,MAAA,CAAO,OAAO,CAAA,GAChC,MAAA;AAER,EAAA,IAAI,CAAC,IAAA,EAAM;AACT,IAAA,OAAO,MAAA;AAAA,EACT;AAEA,EAAA,IAAI;AACF,IAAA,MAAM,MAAA,GAAS,IAAA,CAAK,KAAA,CAAM,IAAI,CAAA;AAC9B,IAAA,IAAI,MAAA,CAAO,IAAA,KAAS,KAAA,IAAS,OAAO,MAAA,CAAO,MAAA,KAAW,QAAA,IAAY,KAAA,CAAM,OAAA,CAAQ,MAAA,CAAO,IAAI,CAAA,EAAG;AAC5F,MAAA,OAAO,MAAA,CAAO,MAAA;AAAA,IAChB;AAAA,EACF,CAAA,CAAA,MAAQ;AAAA,EAER;AAEA,EAAA,OAAO,MAAA;AACT;;;;"}

package/build/esm/instrumentations/agents/instrumentChatAgentConversation.js

@@ -0,0 +1,29 @@
+import { uuid4 } from '@sentry/core';
+import { setAgentConversationId } from './types.js';
+
+function instrumentChatAgentConversation(obj) {
+  const originalEmit = obj._emit;
+  if (typeof originalEmit === "function") {
+    obj._emit = new Proxy(originalEmit, {
+      apply(target, thisArg, args) {
+        if (args[0] === "message:clear") {
+          thisArg.__sentryConversationId = uuid4();
+        }
+        return Reflect.apply(target, thisArg, args);
+      }
+    });
+  }
+  const original = obj.onChatMessage;
+  if (typeof original !== "function") {
+    return;
+  }
+  obj.onChatMessage = new Proxy(original, {
+    apply(target, thisArg, args) {
+      setAgentConversationId(thisArg);
+      return Reflect.apply(target, thisArg, args);
+    }
+  });
+}
+
+export { instrumentChatAgentConversation };
+//# sourceMappingURL=instrumentChatAgentConversation.js.map

package/build/esm/instrumentations/agents/instrumentChatAgentConversation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instrumentChatAgentConversation.js","sources":["../../../../src/instrumentations/agents/instrumentChatAgentConversation.ts"],"sourcesContent":["import { uuid4 } from '@sentry/core';\nimport { type AgentInternals, setAgentConversationId } from './types';\n\n/**\n * For chat agents (`AIChatAgent` from `@cloudflare/ai-chat`), correlates each chat turn's AI spans\n * with a conversation id on the active scope.\n *\n * In the Agents model one agent instance is one long-lived conversation, so the instance `name` is\n * the base conversation id. When the user clears the chat, they expect a fresh conversation — but\n * recreating the Durable Object for that would also drop the MCP/OAuth state stored per instance\n * (GitHub/Sentry sign-in). To get a fresh conversation id *without* losing that state, we rotate an\n * in-memory id on the instance when the SDK reports a cleared chat, and stamp that (falling back to\n * the instance `name` before the first clear).\n *\n * The id itself is not attached to spans here — the SDK's `conversationIdIntegration` reads it off\n * the scope at `spanStart` and stamps `gen_ai.conversation.id` onto the AI spans created inside the\n * turn (e.g. by the Workers AI instrumentation), which correlates a turn's model and tool calls.\n *\n * Plain (non-chat) `Agent`s do not define `onChatMessage`, so they are skipped here — their unit\n * of work is the callable RPC method, where `instrumentAgentCallableRpc` sets the conversation id\n * instead.\n */\nexport function instrumentChatAgentConversation(obj: AgentInternals): void {\n  // Rotate the conversation id when the chat is cleared. `_emit` is the central choke-point through\n  // which all `agents:*` observability events are published, and it already exists on the base\n  // `Agent` class — so this hook composes with the RPC instrumentation, which keys off the same\n  // surface. We shadow it with an own property so the original stays reachable on the prototype.\n  const originalEmit = obj._emit;\n\n  if (typeof originalEmit === 'function') {\n    obj._emit = new Proxy(originalEmit, {\n      apply(target, thisArg: AgentInternals, args: [string, Record<string, unknown>?]) {\n        if (args[0] === 'message:clear') {\n          thisArg.__sentryConversationId = uuid4();\n        }\n\n        return Reflect.apply(target, thisArg, args);\n      },\n    });\n  }\n\n  const original = obj.onChatMessage;\n\n  if (typeof original !== 'function') {\n    return;\n  }\n\n  obj.onChatMessage = new Proxy(original, {\n    apply(target, thisArg: AgentInternals, args: unknown[]): unknown {\n      setAgentConversationId(thisArg);\n\n      return Reflect.apply(target, thisArg, args);\n    },\n  });\n}\n"],"names":[],"mappings":";;;AAsBO,SAAS,gCAAgC,GAAA,EAA2B;AAKzE,EAAA,MAAM,eAAe,GAAA,CAAI,KAAA;AAEzB,EAAA,IAAI,OAAO,iBAAiB,UAAA,EAAY;AACtC,IAAA,GAAA,CAAI,KAAA,GAAQ,IAAI,KAAA,CAAM,YAAA,EAAc;AAAA,MAClC,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAyB,IAAA,EAA0C;AAC/E,QAAA,IAAI,IAAA,CAAK,CAAC,CAAA,KAAM,eAAA,EAAiB;AAC/B,UAAA,OAAA,CAAQ,yBAAyB,KAAA,EAAM;AAAA,QACzC;AAEA,QAAA,OAAO,OAAA,CAAQ,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAI,CAAA;AAAA,MAC5C;AAAA,KACD,CAAA;AAAA,EACH;AAEA,EAAA,MAAM,WAAW,GAAA,CAAI,aAAA;AAErB,EAAA,IAAI,OAAO,aAAa,UAAA,EAAY;AAClC,IAAA;AAAA,EACF;AAEA,EAAA,GAAA,CAAI,aAAA,GAAgB,IAAI,KAAA,CAAM,QAAA,EAAU;AAAA,IACtC,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAyB,IAAA,EAA0B;AAC/D,MAAA,sBAAA,CAAuB,OAAO,CAAA;AAE9B,MAAA,OAAO,OAAA,CAAQ,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAI,CAAA;AAAA,IAC5C;AAAA,GACD,CAAA;AACH;;;;"}

package/build/esm/instrumentations/agents/types.js

@@ -0,0 +1,26 @@
+import { getCurrentScope } from '@sentry/core';
+
+const AGENT_SPAN_ORIGIN = "auto.faas.cloudflare.agents";
+const AGENT_CLASS_ATTRIBUTE = "cloudflare.agent.class";
+const AGENT_NAME_ATTRIBUTE = "cloudflare.agent.name";
+function getAgentAttributes(instance) {
+  const attributes = {};
+  const agentClass = instance._ParentClass?.name;
+  if (typeof agentClass === "string" && agentClass) {
+    attributes[AGENT_CLASS_ATTRIBUTE] = agentClass;
+  }
+  const agentName = instance.name;
+  if (typeof agentName === "string" && agentName) {
+    attributes[AGENT_NAME_ATTRIBUTE] = agentName;
+  }
+  return attributes;
+}
+function setAgentConversationId(instance) {
+  const conversationId = instance.__sentryConversationId ?? instance.name;
+  if (typeof conversationId === "string" && conversationId) {
+    getCurrentScope().setConversationId(conversationId);
+  }
+}
+
+export { AGENT_CLASS_ATTRIBUTE, AGENT_NAME_ATTRIBUTE, AGENT_SPAN_ORIGIN, getAgentAttributes, setAgentConversationId };
+//# sourceMappingURL=types.js.map

package/build/esm/instrumentations/agents/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sources":["../../../../src/instrumentations/agents/types.ts"],"sourcesContent":["import { getCurrentScope } from '@sentry/core';\n\nexport const AGENT_SPAN_ORIGIN = 'auto.faas.cloudflare.agents';\nexport const AGENT_CLASS_ATTRIBUTE = 'cloudflare.agent.class';\nexport const AGENT_NAME_ATTRIBUTE = 'cloudflare.agent.name';\n\n/**\n * The subset of the `agents` `Agent` instance internals that we instrument. These are runtime\n * implementation details of the `agents` package (v0.13.x) rather than part of its public type\n * surface, so every access is guarded and wrapping degrades gracefully if a name changes upstream.\n */\nexport interface AgentInternals {\n  /** Central choke-point through which all `agents:*` observability events are published. */\n  _emit?: (type: string, payload?: Record<string, unknown>) => void;\n  /** WebSocket message handler; dispatches `@callable()` RPC requests. */\n  onMessage?: (...args: unknown[]) => unknown;\n  /**\n   * Chat-turn handler. Only `AIChatAgent` (from `@cloudflare/ai-chat`) defines this; a plain `Agent`\n   * does not, so its presence discriminates a chat agent.\n   */\n  onChatMessage?: (...args: unknown[]) => unknown;\n  /** The user's Agent class (used by the SDK for the observability event `agent` field). */\n  _ParentClass?: { name?: string };\n  /** The Agent instance name, which in the Agents model identifies the conversation/thread. */\n  name?: string;\n  /**\n   * Internal: the active conversation id, rotated when the chat is cleared (the `message:clear`\n   * observability event) so a reset chat groups as a fresh conversation while the instance (and its\n   * MCP/OAuth state) stays put. Set by `instrumentChatAgentConversation`; falls back to `name`\n   * before the first clear.\n   */\n  __sentryConversationId?: string;\n}\n\n/** Reads best-effort agent identity attributes from the instance, tolerating missing internals. */\nexport function getAgentAttributes(instance: AgentInternals): Record<string, string> {\n  const attributes: Record<string, string> = {};\n\n  const agentClass = instance._ParentClass?.name;\n  if (typeof agentClass === 'string' && agentClass) {\n    attributes[AGENT_CLASS_ATTRIBUTE] = agentClass;\n  }\n\n  const agentName = instance.name;\n  if (typeof agentName === 'string' && agentName) {\n    attributes[AGENT_NAME_ATTRIBUTE] = agentName;\n  }\n\n  return attributes;\n}\n\n/**\n * Sets the agent instance's conversation id on the current scope for the duration of the\n * surrounding unit of work (chat turn, callable RPC call). In the Agents model one instance is one\n * conversation, so the instance `name` is the natural conversation id — for chat and plain agents\n * alike, since plain agents run LLM calls too (e.g. inside `@callable()` methods). Once the chat\n * has been cleared, the rotated `__sentryConversationId` takes precedence so LLM calls from any\n * unit of work group under the fresh conversation.\n *\n * `conversationIdIntegration` reads the id off the scope at `spanStart` and stamps\n * `gen_ai.conversation.id` onto AI spans created within the unit of work, correlating its model\n * and tool calls. Callers run inside a per-event forked scope (`wrapMethodWithSentry`), so the id\n * does not leak into unrelated events.\n */\nexport function setAgentConversationId(instance: AgentInternals): void {\n  const conversationId = instance.__sentryConversationId ?? instance.name;\n\n  if (typeof conversationId === 'string' && conversationId) {\n    getCurrentScope().setConversationId(conversationId);\n  }\n}\n"],"names":[],"mappings":";;AAEO,MAAM,iBAAA,GAAoB;AAC1B,MAAM,qBAAA,GAAwB;AAC9B,MAAM,oBAAA,GAAuB;AA+B7B,SAAS,mBAAmB,QAAA,EAAkD;AACnF,EAAA,MAAM,aAAqC,EAAC;AAE5C,EAAA,MAAM,UAAA,GAAa,SAAS,YAAA,EAAc,IAAA;AAC1C,EAAA,IAAI,OAAO,UAAA,KAAe,QAAA,IAAY,UAAA,EAAY;AAChD,IAAA,UAAA,CAAW,qBAAqB,CAAA,GAAI,UAAA;AAAA,EACtC;AAEA,EAAA,MAAM,YAAY,QAAA,CAAS,IAAA;AAC3B,EAAA,IAAI,OAAO,SAAA,KAAc,QAAA,IAAY,SAAA,EAAW;AAC9C,IAAA,UAAA,CAAW,oBAAoB,CAAA,GAAI,SAAA;AAAA,EACrC;AAEA,EAAA,OAAO,UAAA;AACT;AAeO,SAAS,uBAAuB,QAAA,EAAgC;AACrE,EAAA,MAAM,cAAA,GAAiB,QAAA,CAAS,sBAAA,IAA0B,QAAA,CAAS,IAAA;AAEnE,EAAA,IAAI,OAAO,cAAA,KAAmB,QAAA,IAAY,cAAA,EAAgB;AACxD,IAAA,eAAA,EAAgB,CAAE,kBAAkB,cAAc,CAAA;AAAA,EACpD;AACF;;;;"}

package/build/esm/instrumentations/instrumentDurableObjectStorage.js

@@ -1,4 +1,5 @@
-import { startSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, isThenable } from '@sentry/core';
+import { getClient, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, isThenable } from '@sentry/core';
+import { getStorageKeys, targetsCloudflareInternalKey } from '../utils/internalStorageKey.js';
 import { storeSpanContext } from '../utils/traceLinks.js';
 import { instrumentDurableObjectSyncKvStorage } from './instrumentDurableObjectSyncKvStorage.js';
 import { instrumentSqlStorage } from './instrumentSqlStorage.js';
@@ -22,6 +23,11 @@ function instrumentDurableObjectStorage(storage, waitUntil) {
         return original.bind(target);
       }
       return function(...args) {
+        const allowlist = getClient()?.getOptions()?.durableObjectStorageSpanAllowlist;
+        const keys = getStorageKeys(methodName, args);
+        if (keys && keys.length > 0 && keys.every((key) => targetsCloudflareInternalKey(key, allowlist))) {
+          return original.apply(target, args);
+        }
         return startSpan(
           {
             // Use underscore naming to match Cloudflare's native instrumentation (e.g., "durable_object_storage_get")

package/build/esm/instrumentations/instrumentDurableObjectStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentDurableObjectStorage.js","sources":["../../../src/instrumentations/instrumentDurableObjectStorage.ts"],"sourcesContent":["import type { DurableObjectStorage, SyncKvStorage, SqlStorage } from '@cloudflare/workers-types';\nimport { isThenable, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/core';\nimport { storeSpanContext } from '../utils/traceLinks';\nimport { instrumentDurableObjectSyncKvStorage } from './instrumentDurableObjectSyncKvStorage';\nimport { instrumentSqlStorage } from './instrumentSqlStorage';\n\nconst STORAGE_METHODS_TO_INSTRUMENT = ['get', 'put', 'delete', 'list', 'setAlarm', 'getAlarm', 'deleteAlarm'] as const;\n\ntype StorageMethod = (typeof STORAGE_METHODS_TO_INSTRUMENT)[number];\n\ntype WaitUntil = (promise: Promise<unknown>) => void;\n\n/**\n * Instruments DurableObjectStorage methods with Sentry spans.\n *\n * Wraps the following async methods:\n * - get, put, delete, list (KV API)\n * - setAlarm, getAlarm, deleteAlarm (Alarm API)\n *\n * When setAlarm is called, it also stores the current span context so that when\n * the alarm fires later, it can link back to the trace that called setAlarm.\n *\n * @param storage - The DurableObjectStorage instance to instrument\n * @param waitUntil - Optional waitUntil function to defer span context storage\n * @returns An instrumented DurableObjectStorage instance\n */\nexport function instrumentDurableObjectStorage(\n  storage: DurableObjectStorage,\n  waitUntil?: WaitUntil,\n): DurableObjectStorage {\n  return new Proxy(storage, {\n    get(target, prop, _receiver) {\n      // Use `target` as the receiver instead of the proxy (`_receiver`).\n      // Native workerd getters (e.g., `storage.sql`) validate `this` via\n      // internal slots. Passing the proxy as receiver breaks that check,\n      // causing \"Illegal invocation: function called with incorrect `this`\n      // reference\" errors.\n      const original = Reflect.get(target, prop, target);\n\n      if (prop === 'kv' && original != null && 'get' in original && 'put' in original) {\n        return instrumentDurableObjectSyncKvStorage(original as SyncKvStorage);\n      }\n\n      if (prop === 'sql' && original != null && 'databaseSize' in original && 'exec' in original) {\n        return instrumentSqlStorage(original as SqlStorage);\n      }\n\n      if (typeof original !== 'function') {\n        return original;\n      }\n\n      const methodName = prop as string;\n      if (!STORAGE_METHODS_TO_INSTRUMENT.includes(methodName as StorageMethod)) {\n        return (original as (...args: unknown[]) => unknown).bind(target);\n      }\n\n      return function (this: unknown, ...args: unknown[]) {\n        return startSpan(\n          {\n            // Use underscore naming to match Cloudflare's native instrumentation (e.g., \"durable_object_storage_get\")\n            name: `durable_object_storage_${methodName}`,\n            op: 'db',\n            attributes: {\n              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.cloudflare.durable_object',\n              'db.system.name': 'cloudflare.durable_object.storage',\n              'db.operation.name': methodName,\n            },\n          },\n          () => {\n            const teardown = async (): Promise<void> => {\n              // When setAlarm is called, store the current span context so that when the alarm\n              // fires later, it can link back to the trace that called setAlarm.\n              // We use the original (uninstrumented) storage (target) to avoid creating a span\n              // for this internal operation. The storage is deferred via waitUntil to not block.\n              if (methodName === 'setAlarm') {\n                storeSpanContext(target, 'alarm');\n              }\n            };\n\n            const result = (original as (...args: unknown[]) => unknown).apply(target, args);\n\n            if (!isThenable(result)) {\n              waitUntil?.(teardown());\n\n              return result;\n            }\n\n            return result.then(\n              res => {\n                waitUntil?.(teardown());\n                return res;\n              },\n              e => {\n                throw e;\n              },\n            );\n          },\n        );\n      };\n    },\n  });\n}\n"],"names":[],"mappings":";;;;;AAMA,MAAM,6BAAA,GAAgC,CAAC,KAAA,EAAO,KAAA,EAAO,UAAU,MAAA,EAAQ,UAAA,EAAY,YAAY,aAAa,CAAA;AAoBrG,SAAS,8BAAA,CACd,SACA,SAAA,EACsB;AACtB,EAAA,OAAO,IAAI,MAAM,OAAA,EAAS;AAAA,IACxB,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAM3B,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,MAAM,CAAA;AAEjD,MAAA,IAAI,SAAS,IAAA,IAAQ,QAAA,IAAY,QAAQ,KAAA,IAAS,QAAA,IAAY,SAAS,QAAA,EAAU;AAC/E,QAAA,OAAO,qCAAqC,QAAyB,CAAA;AAAA,MACvE;AAEA,MAAA,IAAI,SAAS,KAAA,IAAS,QAAA,IAAY,QAAQ,cAAA,IAAkB,QAAA,IAAY,UAAU,QAAA,EAAU;AAC1F,QAAA,OAAO,qBAAqB,QAAsB,CAAA;AAAA,MACpD;AAEA,MAAA,IAAI,OAAO,aAAa,UAAA,EAAY;AAClC,QAAA,OAAO,QAAA;AAAA,MACT;AAEA,MAAA,MAAM,UAAA,GAAa,IAAA;AACnB,MAAA,IAAI,CAAC,6BAAA,CAA8B,QAAA,CAAS,UAA2B,CAAA,EAAG;AACxE,QAAA,OAAQ,QAAA,CAA6C,KAAK,MAAM,CAAA;AAAA,MAClE;AAEA,MAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,QAAA,OAAO,SAAA;AAAA,UACL;AAAA;AAAA,YAEE,IAAA,EAAM,0BAA0B,UAAU,CAAA,CAAA;AAAA,YAC1C,EAAA,EAAI,IAAA;AAAA,YACJ,UAAA,EAAY;AAAA,cACV,CAAC,gCAAgC,GAAG,mCAAA;AAAA,cACpC,gBAAA,EAAkB,mCAAA;AAAA,cAClB,mBAAA,EAAqB;AAAA;AACvB,WACF;AAAA,UACA,MAAM;AACJ,YAAA,MAAM,WAAW,YAA2B;AAK1C,cAAA,IAAI,eAAe,UAAA,EAAY;AAC7B,gBAAA,gBAAA,CAAiB,QAAQ,OAAO,CAAA;AAAA,cAClC;AAAA,YACF,CAAA;AAEA,YAAA,MAAM,MAAA,GAAU,QAAA,CAA6C,KAAA,CAAM,MAAA,EAAQ,IAAI,CAAA;AAE/E,YAAA,IAAI,CAAC,UAAA,CAAW,MAAM,CAAA,EAAG;AACvB,cAAA,SAAA,GAAY,UAAU,CAAA;AAEtB,cAAA,OAAO,MAAA;AAAA,YACT;AAEA,YAAA,OAAO,MAAA,CAAO,IAAA;AAAA,cACZ,CAAA,GAAA,KAAO;AACL,gBAAA,SAAA,GAAY,UAAU,CAAA;AACtB,gBAAA,OAAO,GAAA;AAAA,cACT,CAAA;AAAA,cACA,CAAA,CAAA,KAAK;AACH,gBAAA,MAAM,CAAA;AAAA,cACR;AAAA,aACF;AAAA,UACF;AAAA,SACF;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;"}
+{"version":3,"file":"instrumentDurableObjectStorage.js","sources":["../../../src/instrumentations/instrumentDurableObjectStorage.ts"],"sourcesContent":["import type { DurableObjectStorage, SyncKvStorage, SqlStorage } from '@cloudflare/workers-types';\nimport { getClient, isThenable, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/core';\nimport type { CloudflareClientOptions } from '../client';\nimport { getStorageKeys, targetsCloudflareInternalKey } from '../utils/internalStorageKey';\nimport { storeSpanContext } from '../utils/traceLinks';\nimport { instrumentDurableObjectSyncKvStorage } from './instrumentDurableObjectSyncKvStorage';\nimport { instrumentSqlStorage } from './instrumentSqlStorage';\n\nconst STORAGE_METHODS_TO_INSTRUMENT = ['get', 'put', 'delete', 'list', 'setAlarm', 'getAlarm', 'deleteAlarm'] as const;\n\ntype StorageMethod = (typeof STORAGE_METHODS_TO_INSTRUMENT)[number];\n\ntype WaitUntil = (promise: Promise<unknown>) => void;\n\n/**\n * Instruments DurableObjectStorage methods with Sentry spans.\n *\n * Wraps the following async methods:\n * - get, put, delete, list (KV API)\n * - setAlarm, getAlarm, deleteAlarm (Alarm API)\n *\n * When setAlarm is called, it also stores the current span context so that when\n * the alarm fires later, it can link back to the trace that called setAlarm.\n *\n * @param storage - The DurableObjectStorage instance to instrument\n * @param waitUntil - Optional waitUntil function to defer span context storage\n * @returns An instrumented DurableObjectStorage instance\n */\nexport function instrumentDurableObjectStorage(\n  storage: DurableObjectStorage,\n  waitUntil?: WaitUntil,\n): DurableObjectStorage {\n  return new Proxy(storage, {\n    get(target, prop, _receiver) {\n      // Use `target` as the receiver instead of the proxy (`_receiver`).\n      // Native workerd getters (e.g., `storage.sql`) validate `this` via\n      // internal slots. Passing the proxy as receiver breaks that check,\n      // causing \"Illegal invocation: function called with incorrect `this`\n      // reference\" errors.\n      const original = Reflect.get(target, prop, target);\n\n      if (prop === 'kv' && original != null && 'get' in original && 'put' in original) {\n        return instrumentDurableObjectSyncKvStorage(original as SyncKvStorage);\n      }\n\n      if (prop === 'sql' && original != null && 'databaseSize' in original && 'exec' in original) {\n        return instrumentSqlStorage(original as SqlStorage);\n      }\n\n      if (typeof original !== 'function') {\n        return original;\n      }\n\n      const methodName = prop as string;\n      if (!STORAGE_METHODS_TO_INSTRUMENT.includes(methodName as StorageMethod)) {\n        return (original as (...args: unknown[]) => unknown).bind(target);\n      }\n\n      return function (this: unknown, ...args: unknown[]) {\n        // KV entries managed by the DO framework itself (agents/partyserver state) are bookkeeping\n        // rather than user work — skip the span, mirroring how `cf_` SQL tables are treated.\n        const allowlist = (getClient()?.getOptions() as CloudflareClientOptions | undefined)\n          ?.durableObjectStorageSpanAllowlist;\n        const keys = getStorageKeys(methodName, args);\n        if (keys && keys.length > 0 && keys.every(key => targetsCloudflareInternalKey(key, allowlist))) {\n          return (original as (...a: unknown[]) => unknown).apply(target, args);\n        }\n\n        return startSpan(\n          {\n            // Use underscore naming to match Cloudflare's native instrumentation (e.g., \"durable_object_storage_get\")\n            name: `durable_object_storage_${methodName}`,\n            op: 'db',\n            attributes: {\n              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.cloudflare.durable_object',\n              'db.system.name': 'cloudflare.durable_object.storage',\n              'db.operation.name': methodName,\n            },\n          },\n          () => {\n            const teardown = async (): Promise<void> => {\n              // When setAlarm is called, store the current span context so that when the alarm\n              // fires later, it can link back to the trace that called setAlarm.\n              // We use the original (uninstrumented) storage (target) to avoid creating a span\n              // for this internal operation. The storage is deferred via waitUntil to not block.\n              if (methodName === 'setAlarm') {\n                storeSpanContext(target, 'alarm');\n              }\n            };\n\n            const result = (original as (...args: unknown[]) => unknown).apply(target, args);\n\n            if (!isThenable(result)) {\n              waitUntil?.(teardown());\n\n              return result;\n            }\n\n            return result.then(\n              res => {\n                waitUntil?.(teardown());\n                return res;\n              },\n              e => {\n                throw e;\n              },\n            );\n          },\n        );\n      };\n    },\n  });\n}\n"],"names":[],"mappings":";;;;;;AAQA,MAAM,6BAAA,GAAgC,CAAC,KAAA,EAAO,KAAA,EAAO,UAAU,MAAA,EAAQ,UAAA,EAAY,YAAY,aAAa,CAAA;AAoBrG,SAAS,8BAAA,CACd,SACA,SAAA,EACsB;AACtB,EAAA,OAAO,IAAI,MAAM,OAAA,EAAS;AAAA,IACxB,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAM3B,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,MAAM,CAAA;AAEjD,MAAA,IAAI,SAAS,IAAA,IAAQ,QAAA,IAAY,QAAQ,KAAA,IAAS,QAAA,IAAY,SAAS,QAAA,EAAU;AAC/E,QAAA,OAAO,qCAAqC,QAAyB,CAAA;AAAA,MACvE;AAEA,MAAA,IAAI,SAAS,KAAA,IAAS,QAAA,IAAY,QAAQ,cAAA,IAAkB,QAAA,IAAY,UAAU,QAAA,EAAU;AAC1F,QAAA,OAAO,qBAAqB,QAAsB,CAAA;AAAA,MACpD;AAEA,MAAA,IAAI,OAAO,aAAa,UAAA,EAAY;AAClC,QAAA,OAAO,QAAA;AAAA,MACT;AAEA,MAAA,MAAM,UAAA,GAAa,IAAA;AACnB,MAAA,IAAI,CAAC,6BAAA,CAA8B,QAAA,CAAS,UAA2B,CAAA,EAAG;AACxE,QAAA,OAAQ,QAAA,CAA6C,KAAK,MAAM,CAAA;AAAA,MAClE;AAEA,MAAA,OAAO,YAA4B,IAAA,EAAiB;AAGlD,QAAA,MAAM,SAAA,GAAa,SAAA,EAAU,EAAG,UAAA,EAAW,EACvC,iCAAA;AACJ,QAAA,MAAM,IAAA,GAAO,cAAA,CAAe,UAAA,EAAY,IAAI,CAAA;AAC5C,QAAA,IAAI,IAAA,IAAQ,IAAA,CAAK,MAAA,GAAS,CAAA,IAAK,IAAA,CAAK,KAAA,CAAM,CAAA,GAAA,KAAO,4BAAA,CAA6B,GAAA,EAAK,SAAS,CAAC,CAAA,EAAG;AAC9F,UAAA,OAAQ,QAAA,CAA0C,KAAA,CAAM,MAAA,EAAQ,IAAI,CAAA;AAAA,QACtE;AAEA,QAAA,OAAO,SAAA;AAAA,UACL;AAAA;AAAA,YAEE,IAAA,EAAM,0BAA0B,UAAU,CAAA,CAAA;AAAA,YAC1C,EAAA,EAAI,IAAA;AAAA,YACJ,UAAA,EAAY;AAAA,cACV,CAAC,gCAAgC,GAAG,mCAAA;AAAA,cACpC,gBAAA,EAAkB,mCAAA;AAAA,cAClB,mBAAA,EAAqB;AAAA;AACvB,WACF;AAAA,UACA,MAAM;AACJ,YAAA,MAAM,WAAW,YAA2B;AAK1C,cAAA,IAAI,eAAe,UAAA,EAAY;AAC7B,gBAAA,gBAAA,CAAiB,QAAQ,OAAO,CAAA;AAAA,cAClC;AAAA,YACF,CAAA;AAEA,YAAA,MAAM,MAAA,GAAU,QAAA,CAA6C,KAAA,CAAM,MAAA,EAAQ,IAAI,CAAA;AAE/E,YAAA,IAAI,CAAC,UAAA,CAAW,MAAM,CAAA,EAAG;AACvB,cAAA,SAAA,GAAY,UAAU,CAAA;AAEtB,cAAA,OAAO,MAAA;AAAA,YACT;AAEA,YAAA,OAAO,MAAA,CAAO,IAAA;AAAA,cACZ,CAAA,GAAA,KAAO;AACL,gBAAA,SAAA,GAAY,UAAU,CAAA;AACtB,gBAAA,OAAO,GAAA;AAAA,cACT,CAAA;AAAA,cACA,CAAA,CAAA,KAAK;AACH,gBAAA,MAAM,CAAA;AAAA,cACR;AAAA,aACF;AAAA,UACF;AAAA,SACF;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;"}

package/build/esm/instrumentations/instrumentSqlStorage.js

@@ -13,7 +13,7 @@ function instrumentSqlStorage(sql) {
         const sanitizedQuery = _INTERNAL_sanitizeSqlQuery(query);
         const querySummary = _INTERNAL_getSqlQuerySummary(sanitizedQuery);
         const allowlist = getClient()?.getOptions()?.durableObjectSqlSpanAllowlist;
-        if (targetsCloudflareInternalTable(querySummary, allowlist)) {
+        if (targetsCloudflareInternalTable(querySummary, allowlist, sanitizedQuery)) {
           return original.apply(target, args);
         }
         return startSpan(

package/build/esm/instrumentations/instrumentSqlStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentSqlStorage.js","sources":["../../../src/instrumentations/instrumentSqlStorage.ts"],"sourcesContent":["import type { SqlStorage } from '@cloudflare/workers-types';\nimport {\n  _INTERNAL_getSqlQuerySummary,\n  _INTERNAL_sanitizeSqlQuery,\n  getClient,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  startSpan,\n} from '@sentry/core';\nimport type { CloudflareClientOptions } from '../client';\nimport { targetsCloudflareInternalTable } from '../utils/internalSqlQuery';\n\n/**\n * Instruments the Durable Object SqlStorage `exec` method with Sentry spans.\n *\n * @param sql - The SqlStorage instance to instrument\n * @returns An instrumented SqlStorage instance\n */\nexport function instrumentSqlStorage(sql: SqlStorage): SqlStorage {\n  return new Proxy(sql, {\n    get(target, prop, _receiver) {\n      const original = Reflect.get(target, prop, target);\n\n      if (prop !== 'exec' || typeof original !== 'function') {\n        return original;\n      }\n\n      return function (this: unknown, ...args: unknown[]) {\n        const [query, ...bindings] = args as [string, ...unknown[]];\n\n        const sanitizedQuery = _INTERNAL_sanitizeSqlQuery(query);\n        const querySummary = _INTERNAL_getSqlQuerySummary(sanitizedQuery);\n\n        const allowlist = (getClient()?.getOptions() as CloudflareClientOptions | undefined)\n          ?.durableObjectSqlSpanAllowlist;\n\n        if (targetsCloudflareInternalTable(querySummary, allowlist)) {\n          return (original as (...a: unknown[]) => ReturnType<SqlStorage['exec']>).apply(target, args);\n        }\n\n        return startSpan(\n          {\n            op: 'db.query',\n            name: querySummary || sanitizedQuery,\n            attributes: {\n              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.cloudflare.durable_object.sql',\n              'db.system.name': 'cloudflare-durable-object-sql',\n              'db.operation.name': 'exec',\n              'db.query.text': sanitizedQuery,\n              'db.query.summary': querySummary,\n              'cloudflare.durable_object.query.bindings': bindings.length,\n            },\n          },\n          () => (original as (...a: unknown[]) => ReturnType<SqlStorage['exec']>).apply(target, args),\n        );\n      };\n    },\n  });\n}\n"],"names":[],"mappings":";;;AAiBO,SAAS,qBAAqB,GAAA,EAA6B;AAChE,EAAA,OAAO,IAAI,MAAM,GAAA,EAAK;AAAA,IACpB,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAC3B,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,MAAM,CAAA;AAEjD,MAAA,IAAI,IAAA,KAAS,MAAA,IAAU,OAAO,QAAA,KAAa,UAAA,EAAY;AACrD,QAAA,OAAO,QAAA;AAAA,MACT;AAEA,MAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,QAAA,MAAM,CAAC,KAAA,EAAO,GAAG,QAAQ,CAAA,GAAI,IAAA;AAE7B,QAAA,MAAM,cAAA,GAAiB,2BAA2B,KAAK,CAAA;AACvD,QAAA,MAAM,YAAA,GAAe,6BAA6B,cAAc,CAAA;AAEhE,QAAA,MAAM,SAAA,GAAa,SAAA,EAAU,EAAG,UAAA,EAAW,EACvC,6BAAA;AAEJ,QAAA,IAAI,8BAAA,CAA+B,YAAA,EAAc,SAAS,CAAA,EAAG;AAC3D,UAAA,OAAQ,QAAA,CAAiE,KAAA,CAAM,MAAA,EAAQ,IAAI,CAAA;AAAA,QAC7F;AAEA,QAAA,OAAO,SAAA;AAAA,UACL;AAAA,YACE,EAAA,EAAI,UAAA;AAAA,YACJ,MAAM,YAAA,IAAgB,cAAA;AAAA,YACtB,UAAA,EAAY;AAAA,cACV,CAAC,gCAAgC,GAAG,uCAAA;AAAA,cACpC,gBAAA,EAAkB,+BAAA;AAAA,cAClB,mBAAA,EAAqB,MAAA;AAAA,cACrB,eAAA,EAAiB,cAAA;AAAA,cACjB,kBAAA,EAAoB,YAAA;AAAA,cACpB,4CAA4C,QAAA,CAAS;AAAA;AACvD,WACF;AAAA,UACA,MAAO,QAAA,CAAiE,KAAA,CAAM,MAAA,EAAQ,IAAI;AAAA,SAC5F;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;"}
+{"version":3,"file":"instrumentSqlStorage.js","sources":["../../../src/instrumentations/instrumentSqlStorage.ts"],"sourcesContent":["import type { SqlStorage } from '@cloudflare/workers-types';\nimport {\n  _INTERNAL_getSqlQuerySummary,\n  _INTERNAL_sanitizeSqlQuery,\n  getClient,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  startSpan,\n} from '@sentry/core';\nimport type { CloudflareClientOptions } from '../client';\nimport { targetsCloudflareInternalTable } from '../utils/internalSqlQuery';\n\n/**\n * Instruments the Durable Object SqlStorage `exec` method with Sentry spans.\n *\n * @param sql - The SqlStorage instance to instrument\n * @returns An instrumented SqlStorage instance\n */\nexport function instrumentSqlStorage(sql: SqlStorage): SqlStorage {\n  return new Proxy(sql, {\n    get(target, prop, _receiver) {\n      const original = Reflect.get(target, prop, target);\n\n      if (prop !== 'exec' || typeof original !== 'function') {\n        return original;\n      }\n\n      return function (this: unknown, ...args: unknown[]) {\n        const [query, ...bindings] = args as [string, ...unknown[]];\n\n        const sanitizedQuery = _INTERNAL_sanitizeSqlQuery(query);\n        const querySummary = _INTERNAL_getSqlQuerySummary(sanitizedQuery);\n\n        const allowlist = (getClient()?.getOptions() as CloudflareClientOptions | undefined)\n          ?.durableObjectSqlSpanAllowlist;\n\n        if (targetsCloudflareInternalTable(querySummary, allowlist, sanitizedQuery)) {\n          return (original as (...a: unknown[]) => ReturnType<SqlStorage['exec']>).apply(target, args);\n        }\n\n        return startSpan(\n          {\n            op: 'db.query',\n            name: querySummary || sanitizedQuery,\n            attributes: {\n              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.cloudflare.durable_object.sql',\n              'db.system.name': 'cloudflare-durable-object-sql',\n              'db.operation.name': 'exec',\n              'db.query.text': sanitizedQuery,\n              'db.query.summary': querySummary,\n              'cloudflare.durable_object.query.bindings': bindings.length,\n            },\n          },\n          () => (original as (...a: unknown[]) => ReturnType<SqlStorage['exec']>).apply(target, args),\n        );\n      };\n    },\n  });\n}\n"],"names":[],"mappings":";;;AAiBO,SAAS,qBAAqB,GAAA,EAA6B;AAChE,EAAA,OAAO,IAAI,MAAM,GAAA,EAAK;AAAA,IACpB,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAC3B,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,MAAM,CAAA;AAEjD,MAAA,IAAI,IAAA,KAAS,MAAA,IAAU,OAAO,QAAA,KAAa,UAAA,EAAY;AACrD,QAAA,OAAO,QAAA;AAAA,MACT;AAEA,MAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,QAAA,MAAM,CAAC,KAAA,EAAO,GAAG,QAAQ,CAAA,GAAI,IAAA;AAE7B,QAAA,MAAM,cAAA,GAAiB,2BAA2B,KAAK,CAAA;AACvD,QAAA,MAAM,YAAA,GAAe,6BAA6B,cAAc,CAAA;AAEhE,QAAA,MAAM,SAAA,GAAa,SAAA,EAAU,EAAG,UAAA,EAAW,EACvC,6BAAA;AAEJ,QAAA,IAAI,8BAAA,CAA+B,YAAA,EAAc,SAAA,EAAW,cAAc,CAAA,EAAG;AAC3E,UAAA,OAAQ,QAAA,CAAiE,KAAA,CAAM,MAAA,EAAQ,IAAI,CAAA;AAAA,QAC7F;AAEA,QAAA,OAAO,SAAA;AAAA,UACL;AAAA,YACE,EAAA,EAAI,UAAA;AAAA,YACJ,MAAM,YAAA,IAAgB,cAAA;AAAA,YACtB,UAAA,EAAY;AAAA,cACV,CAAC,gCAAgC,GAAG,uCAAA;AAAA,cACpC,gBAAA,EAAkB,+BAAA;AAAA,cAClB,mBAAA,EAAqB,MAAA;AAAA,cACrB,eAAA,EAAiB,cAAA;AAAA,cACjB,kBAAA,EAAoB,YAAA;AAAA,cACpB,4CAA4C,QAAA,CAAS;AAAA;AACvD,WACF;AAAA,UACA,MAAO,QAAA,CAAiE,KAAA,CAAM,MAAA,EAAQ,IAAI;AAAA,SAC5F;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;"}