@sentry/cloudflare 10.74.0 → 10.75.1

package/build/cjs/durableobject.js

@@ -114,30 +114,40 @@ function instrumentPrototypeRpcMethods(obj, excludedMethods, allowedMethods) {
     prototype = Object.getPrototypeOf(prototype);
   }
 }
+function getInstrumentedRpcMethod(state, methodName, originalMethod) {
+  const instrumentedMethods = state.instrumentedMethods ?? (state.instrumentedMethods = /* @__PURE__ */ new Map());
+  let instrumented = instrumentedMethods.get(methodName);
+  if (!instrumented) {
+    instrumented = wrapMethodWithSentry.wrapMethodWithSentry(
+      {
+        options: state.options,
+        context: state.context,
+        spanName: state.alwaysTrace ? methodName : (rpcMeta) => rpcMeta ? methodName : void 0,
+        spanOp: "rpc",
+        origin: "auto.faas.cloudflare.durable_object"
+      },
+      originalMethod,
+      void 0,
+      true
+    );
+    instrumentedMethods.set(methodName, instrumented);
+  }
+  return instrumented;
+}
 function createRpcPrototypeWrapper(methodName, originalMethod) {
   const wrapper = function(...args) {
     const state = core.isObjectLike(this) ? rpcInstanceStates.get(this) : void 0;
-    if (!state || !state.alwaysTrace && !rpcMeta.hasRpcMeta(args)) {
+    if (!state) {
       return Reflect.apply(originalMethod, this, args);
     }
-    const tracedMethods = state.tracedMethods ?? (state.tracedMethods = /* @__PURE__ */ new Map());
-    let traced = tracedMethods.get(methodName);
-    if (!traced) {
-      traced = wrapMethodWithSentry.wrapMethodWithSentry(
-        {
-          options: state.options,
-          context: state.context,
-          spanName: methodName,
-          spanOp: "rpc",
-          origin: "auto.faas.cloudflare.durable_object"
-        },
-        originalMethod,
-        void 0,
-        true
-      );
-      tracedMethods.set(methodName, traced);
+    if (state.alwaysTrace || rpcMeta.hasRpcMeta(args)) {
+      return Reflect.apply(getInstrumentedRpcMethod(state, methodName, originalMethod), this, args);
+    }
+    if (core.getIsolationScope() !== core.getDefaultIsolationScope()) {
+      return Reflect.apply(originalMethod, this, args);
     }
-    return Reflect.apply(traced, this, args);
+    const instrumented = getInstrumentedRpcMethod(state, methodName, originalMethod);
+    return core.startNewTrace(() => Reflect.apply(instrumented, this, args));
   };
   Object.defineProperties(wrapper, {
     name: { value: originalMethod.name, configurable: true },

package/build/cjs/durableobject.js.map

@@ -1 +1 @@
-{"version":3,"file":"durableobject.js","sources":["../../src/durableobject.ts"],"sourcesContent":["/* eslint-disable max-lines */\n/* eslint-disable @typescript-eslint/unbound-method */\nimport { isObjectLike } from '@sentry/core';\nimport type { DurableObject } from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { getInstrumented, markAsInstrumented } from './instrument';\nimport { instrumentDurableObjectHandlers } from './instrumentations/instrumentDurableObjectHandlers';\nimport { instrumentEnv } from './instrumentations/worker/instrumentEnv';\nimport { getFinalOptions } from './options';\nimport { instrumentContext } from './utils/instrumentContext';\nimport { hasRpcMeta } 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 * instrumentation — callers apply that last via {@link finalizeWithRpcInstrumentation}, after any\n * additional 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): {\n  obj: T;\n  options: CloudflareOptions;\n  context: InstrumentedDurableObjectContext;\n  frameworkManagedMethods: ReadonlySet<string>;\n} {\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  const prototype = (newTarget as unknown as { prototype?: object }).prototype ?? target.prototype;\n  const cachedFrameworkManagedMethods = frameworkManagedMethodsCache.get(prototype);\n  const methodsBeforeConstruction = cachedFrameworkManagedMethods ? undefined : resolvePrototypeMethods(prototype);\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  const frameworkManagedMethods = resolveFrameworkManagedMethods(\n    prototype,\n    obj,\n    methodsBeforeConstruction,\n    cachedFrameworkManagedMethods,\n  );\n\n  instrumentDurableObjectHandlers(obj, options, context);\n\n  return { obj, options, context, frameworkManagedMethods };\n}\n\nconst frameworkManagedMethodsCache = new WeakMap<object, ReadonlySet<string>>();\n\n/**\n * Collects the methods visible from a prototype, using normal property lookup precedence.\n * Methods inherited from `Object.prototype` are excluded because they cannot be Durable Object RPC methods.\n */\nfunction resolvePrototypeMethods(prototype: object | null): Map<string, unknown> {\n  const methods = new Map<string, unknown>();\n\n  for (let current = prototype; current && current !== Object.prototype; current = Object.getPrototypeOf(current)) {\n    for (const name of Object.getOwnPropertyNames(current)) {\n      // The first occurrence wins, mirroring what a property lookup on the instance would find\n      if (name === 'constructor' || methods.has(name)) {\n        continue;\n      }\n\n      const descriptor = Object.getOwnPropertyDescriptor(current, name);\n\n      if (descriptor && typeof descriptor.value === 'function') {\n        methods.set(name, descriptor.value);\n      }\n    }\n  }\n\n  return methods;\n}\n\n/**\n * Finds methods that a framework replaced while constructing the first instance.\n *\n * Some frameworks register methods by function identity, so replacing one of their wrappers would\n * break dispatch. The result is cached because frameworks commonly install their wrappers only\n * once; later constructions would no longer reveal which methods they manage.\n */\nfunction resolveFrameworkManagedMethods(\n  prototype: object,\n  obj: object,\n  methodsBeforeConstruction: Map<string, unknown> | undefined,\n  cached: ReadonlySet<string> | undefined,\n): ReadonlySet<string> {\n  if (cached) {\n    return cached;\n  }\n\n  const methodsAfterConstruction = resolvePrototypeMethods(Object.getPrototypeOf(obj) as object);\n  const managed = new Set<string>();\n\n  for (const [name, method] of methodsAfterConstruction) {\n    const before = methodsBeforeConstruction?.get(name);\n\n    if (before && before !== method) {\n      managed.add(name);\n    }\n  }\n\n  frameworkManagedMethodsCache.set(prototype, managed);\n\n  return managed;\n}\n\ntype RpcInstanceState = {\n  options: CloudflareOptions;\n  context: InstrumentedDurableObjectContext;\n  /**\n   * Whether to trace calls that carry no RPC metadata. Only the deprecated\n   * `instrumentPrototypeMethods` option does, because it predates metadata propagation.\n   */\n  alwaysTrace: boolean;\n  /** Per-instance cache of the traced method wrappers, keyed by method name. Created on first use. */\n  tracedMethods?: Map<string, UncheckedMethod>;\n};\n\n/**\n * Method names the runtime never dispatches over RPC, so wrapping them buys no tracing.\n *\n * Mirrors `isReservedName` in workerd (`src/workerd/api/worker-rpc.c++`): the runtime rejects these\n * before any property lookup happens. `fetch`, `alarm` and the `webSocket*` handlers are also\n * instrumented per-instance as own properties, and `constructor` is on every prototype.\n */\nconst RESERVED_RPC_METHOD_NAMES: ReadonlySet<string> = new Set([\n  'constructor',\n  'fetch',\n  'connect',\n  'alarm',\n  'webSocketMessage',\n  'webSocketClose',\n  'webSocketError',\n  'dup',\n]);\n\n// Prototype wrappers are shared by all instances, while SDK options and traced method caches are not.\nconst rpcInstanceStates = new WeakMap<object, RpcInstanceState>();\n\n/**\n * Adds trace propagation to a constructed Durable Object's RPC methods.\n *\n * RPC methods are wrapped on the prototype because Cloudflare dispatches them with the Durable\n * Object instance as the receiver. This preserves native private-field access and keeps the methods\n * visible to Cloudflare's RPC dispatcher. Built-in handlers, Agent handlers, and methods managed by\n * another framework are left untouched.\n *\n * Call this after all per-instance instrumentation has been applied. If RPC trace propagation is\n * disabled, the object is returned unchanged.\n *\n * @param obj The constructed Durable Object instance.\n * @param options The resolved SDK options for this instance.\n * @param context The instrumented execution context for this instance.\n * @param excludedMethods Method names owned by another framework and therefore not safe to wrap.\n * @returns The same Durable Object instance, with eligible prototype methods instrumented.\n * @internal\n */\nexport function finalizeWithRpcInstrumentation<T extends object>(\n  obj: T,\n  options: CloudflareOptions,\n  context: InstrumentedDurableObjectContext,\n  excludedMethods?: ReadonlySet<string>,\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 allowedMethods = Array.isArray(options.instrumentPrototypeMethods)\n    ? // eslint-disable-next-line typescript/no-deprecated\n      new Set(options.instrumentPrototypeMethods)\n    : undefined;\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  // eslint-disable-next-line typescript/no-deprecated\n  const alwaysTrace = options.enableRpcTracePropagation === undefined;\n\n  rpcInstanceStates.set(obj, { options, context, alwaysTrace });\n\n  instrumentPrototypeRpcMethods(obj, excludedMethods, allowedMethods);\n\n  return obj;\n}\n\n/**\n * Returns a prototype method when it is eligible for RPC instrumentation.\n */\nfunction getRpcMethodDescriptor(\n  obj: object,\n  prototype: object,\n  methodName: string,\n  excludedMethods?: ReadonlySet<string>,\n  allowedMethods?: ReadonlySet<string>,\n): PropertyDescriptor | undefined {\n  if (\n    RESERVED_RPC_METHOD_NAMES.has(methodName) ||\n    Object.prototype.hasOwnProperty.call(obj, methodName) ||\n    excludedMethods?.has(methodName) ||\n    (allowedMethods && !allowedMethods.has(methodName))\n  ) {\n    return undefined;\n  }\n\n  const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);\n\n  if (!descriptor || typeof descriptor.value !== 'function' || getInstrumented(descriptor.value)) {\n    return undefined;\n  }\n\n  return descriptor;\n}\n\n/**\n * Wraps eligible methods on the instance's prototype chain once per class.\n *\n * Because the wrappers live on the prototype, the allow-list of the first constructed instance\n * decides which methods carry a wrapper for every later instance of that class. This only affects\n * the deprecated array form of `instrumentPrototypeMethods`, where differing options per instance\n * of the same class were never a supported configuration.\n */\nfunction instrumentPrototypeRpcMethods(\n  obj: object,\n  excludedMethods?: ReadonlySet<string>,\n  allowedMethods?: ReadonlySet<string>,\n): void {\n  let prototype: object | null = Object.getPrototypeOf(obj);\n\n  while (prototype && prototype !== Object.prototype) {\n    for (const methodName of Object.getOwnPropertyNames(prototype)) {\n      const descriptor = getRpcMethodDescriptor(obj, prototype, methodName, excludedMethods, allowedMethods);\n\n      if (!descriptor) {\n        continue;\n      }\n\n      const wrapped = createRpcPrototypeWrapper(methodName, descriptor.value as UncheckedMethod);\n\n      try {\n        Object.defineProperty(prototype, methodName, { ...descriptor, value: wrapped });\n      } catch {}\n\n      // Only the wrapper is marked, not the original method: `wrapMethodWithSentry` resolves\n      // through the same global map and must not resolve the original to this wrapper,\n      // which would recurse.\n      markAsInstrumented(wrapped);\n    }\n\n    prototype = Object.getPrototypeOf(prototype);\n  }\n}\n\n/**\n * Creates a prototype wrapper that traces RPC calls carrying Sentry metadata.\n *\n * The wrapper looks up SDK state from its receiver, allowing one prototype function to serve every\n * instance. Calls without instance state use the original method directly, as do calls without RPC\n * metadata unless the instance opted into unconditional tracing. The original function name and\n * arity are preserved because frameworks may inspect them for dispatch.\n */\nfunction createRpcPrototypeWrapper(methodName: string, originalMethod: UncheckedMethod): UncheckedMethod {\n  const wrapper = function (this: unknown, ...args: unknown[]): unknown {\n    const state = isObjectLike(this) ? rpcInstanceStates.get(this) : undefined;\n\n    // Untraced calls are the common case — every internal call the instance makes to one of its\n    // own methods lands here too, and those never carry RPC metadata.\n    if (!state || (!state.alwaysTrace && !hasRpcMeta(args))) {\n      return Reflect.apply(originalMethod, this, args);\n    }\n\n    const tracedMethods = (state.tracedMethods ??= new Map());\n    let traced = tracedMethods.get(methodName);\n\n    if (!traced) {\n      traced = wrapMethodWithSentry(\n        {\n          options: state.options,\n          context: state.context,\n          spanName: methodName,\n          spanOp: 'rpc',\n          origin: 'auto.faas.cloudflare.durable_object',\n        },\n        originalMethod,\n        undefined,\n        true,\n      );\n      tracedMethods.set(methodName, traced);\n    }\n\n    return Reflect.apply(traced, this, args);\n  };\n\n  Object.defineProperties(wrapper, {\n    name: { value: originalMethod.name, configurable: true },\n    length: { value: originalMethod.length, configurable: true },\n  });\n\n  return wrapper as UncheckedMethod;\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  const InstrumentedClass = new Proxy(DurableObjectClass, {\n    construct(target, [ctx, env], newTarget) {\n      const { obj, options, context, frameworkManagedMethods } = constructInstrumentedDurableObject(\n        target,\n        ctx,\n        env,\n        newTarget,\n        optionsCallback,\n      );\n\n      return finalizeWithRpcInstrumentation(obj, options, context, frameworkManagedMethods);\n    },\n  });\n  // Recognizable for `_INTERNAL_wrapUnlessInstrumented`, so auto-instrumentation never nests wrappers.\n  markAsInstrumented(InstrumentedClass);\n  return InstrumentedClass;\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  const InstrumentedClass = new Proxy(AgentClass, {\n    construct(target, [ctx, env], newTarget) {\n      const { obj, options, context, frameworkManagedMethods } = 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. Methods the Agent\n      // framework installed itself are excluded too — `instrumentCloudflareAgent` traces those by\n      // wrapping the dispatch instead of the method.\n      return finalizeWithRpcInstrumentation(obj, options, context, frameworkManagedMethods);\n    },\n  });\n  markAsInstrumented(InstrumentedClass);\n  return InstrumentedClass;\n}\n"],"names":["setAsyncLocalStorageAsyncContextStrategy","options","getFinalOptions","instrumentContext","instrumentEnv","instrumentDurableObjectHandlers","getEffectiveRpcPropagation","getInstrumented","markAsInstrumented","isObjectLike","hasRpcMeta","wrapMethodWithSentry","instrumentCloudflareAgent"],"mappings":"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"}
+{"version":3,"file":"durableobject.js","sources":["../../src/durableobject.ts"],"sourcesContent":["/* eslint-disable max-lines */\n/* eslint-disable @typescript-eslint/unbound-method */\nimport { getDefaultIsolationScope, getIsolationScope, isObjectLike, startNewTrace } from '@sentry/core';\nimport type { DurableObject } from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { getInstrumented, markAsInstrumented } from './instrument';\nimport { instrumentDurableObjectHandlers } from './instrumentations/instrumentDurableObjectHandlers';\nimport { instrumentEnv } from './instrumentations/worker/instrumentEnv';\nimport { getFinalOptions } from './options';\nimport { instrumentContext } from './utils/instrumentContext';\nimport { hasRpcMeta } 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 * instrumentation — callers apply that last via {@link finalizeWithRpcInstrumentation}, after any\n * additional 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): {\n  obj: T;\n  options: CloudflareOptions;\n  context: InstrumentedDurableObjectContext;\n  frameworkManagedMethods: ReadonlySet<string>;\n} {\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  const prototype = (newTarget as unknown as { prototype?: object }).prototype ?? target.prototype;\n  const cachedFrameworkManagedMethods = frameworkManagedMethodsCache.get(prototype);\n  const methodsBeforeConstruction = cachedFrameworkManagedMethods ? undefined : resolvePrototypeMethods(prototype);\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  const frameworkManagedMethods = resolveFrameworkManagedMethods(\n    prototype,\n    obj,\n    methodsBeforeConstruction,\n    cachedFrameworkManagedMethods,\n  );\n\n  instrumentDurableObjectHandlers(obj, options, context);\n\n  return { obj, options, context, frameworkManagedMethods };\n}\n\nconst frameworkManagedMethodsCache = new WeakMap<object, ReadonlySet<string>>();\n\n/**\n * Collects the methods visible from a prototype, using normal property lookup precedence.\n * Methods inherited from `Object.prototype` are excluded because they cannot be Durable Object RPC methods.\n */\nfunction resolvePrototypeMethods(prototype: object | null): Map<string, unknown> {\n  const methods = new Map<string, unknown>();\n\n  for (let current = prototype; current && current !== Object.prototype; current = Object.getPrototypeOf(current)) {\n    for (const name of Object.getOwnPropertyNames(current)) {\n      // The first occurrence wins, mirroring what a property lookup on the instance would find\n      if (name === 'constructor' || methods.has(name)) {\n        continue;\n      }\n\n      const descriptor = Object.getOwnPropertyDescriptor(current, name);\n\n      if (descriptor && typeof descriptor.value === 'function') {\n        methods.set(name, descriptor.value);\n      }\n    }\n  }\n\n  return methods;\n}\n\n/**\n * Finds methods that a framework replaced while constructing the first instance.\n *\n * Some frameworks register methods by function identity, so replacing one of their wrappers would\n * break dispatch. The result is cached because frameworks commonly install their wrappers only\n * once; later constructions would no longer reveal which methods they manage.\n */\nfunction resolveFrameworkManagedMethods(\n  prototype: object,\n  obj: object,\n  methodsBeforeConstruction: Map<string, unknown> | undefined,\n  cached: ReadonlySet<string> | undefined,\n): ReadonlySet<string> {\n  if (cached) {\n    return cached;\n  }\n\n  const methodsAfterConstruction = resolvePrototypeMethods(Object.getPrototypeOf(obj) as object);\n  const managed = new Set<string>();\n\n  for (const [name, method] of methodsAfterConstruction) {\n    const before = methodsBeforeConstruction?.get(name);\n\n    if (before && before !== method) {\n      managed.add(name);\n    }\n  }\n\n  frameworkManagedMethodsCache.set(prototype, managed);\n\n  return managed;\n}\n\ntype RpcInstanceState = {\n  options: CloudflareOptions;\n  context: InstrumentedDurableObjectContext;\n  /**\n   * Whether to trace calls that carry no RPC metadata. Only the deprecated\n   * `instrumentPrototypeMethods` option does, because it predates metadata propagation.\n   */\n  alwaysTrace: boolean;\n  /** Per-instance cache of the instrumented method wrappers, keyed by method name. Created on first use. */\n  instrumentedMethods?: Map<string, UncheckedMethod>;\n};\n\n/**\n * Method names the runtime never dispatches over RPC, so wrapping them buys no tracing.\n *\n * Mirrors `isReservedName` in workerd (`src/workerd/api/worker-rpc.c++`): the runtime rejects these\n * before any property lookup happens. `fetch`, `alarm` and the `webSocket*` handlers are also\n * instrumented per-instance as own properties, and `constructor` is on every prototype.\n */\nconst RESERVED_RPC_METHOD_NAMES: ReadonlySet<string> = new Set([\n  'constructor',\n  'fetch',\n  'connect',\n  'alarm',\n  'webSocketMessage',\n  'webSocketClose',\n  'webSocketError',\n  'dup',\n]);\n\n// Prototype wrappers are shared by all instances, while SDK options and traced method caches are not.\nconst rpcInstanceStates = new WeakMap<object, RpcInstanceState>();\n\n/**\n * Instruments a constructed Durable Object's RPC methods.\n *\n * RPC methods are wrapped on the prototype because Cloudflare dispatches them with the Durable\n * Object instance as the receiver. This preserves native private-field access and keeps the methods\n * visible to Cloudflare's RPC dispatcher. Built-in handlers, Agent handlers, and methods managed by\n * another framework are left untouched.\n *\n * Call this after all per-instance instrumentation has been applied. If RPC trace propagation is\n * disabled, the object is returned unchanged.\n *\n * @param obj The constructed Durable Object instance.\n * @param options The resolved SDK options for this instance.\n * @param context The instrumented execution context for this instance.\n * @param excludedMethods Method names owned by another framework and therefore not safe to wrap.\n * @returns The same Durable Object instance, with eligible prototype methods instrumented.\n * @internal\n */\nexport function finalizeWithRpcInstrumentation<T extends object>(\n  obj: T,\n  options: CloudflareOptions,\n  context: InstrumentedDurableObjectContext,\n  excludedMethods?: ReadonlySet<string>,\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 allowedMethods = Array.isArray(options.instrumentPrototypeMethods)\n    ? // eslint-disable-next-line typescript/no-deprecated\n      new Set(options.instrumentPrototypeMethods)\n    : undefined;\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  // eslint-disable-next-line typescript/no-deprecated\n  const alwaysTrace = options.enableRpcTracePropagation === undefined;\n\n  rpcInstanceStates.set(obj, { options, context, alwaysTrace });\n\n  instrumentPrototypeRpcMethods(obj, excludedMethods, allowedMethods);\n\n  return obj;\n}\n\n/**\n * Returns a prototype method when it is eligible for RPC instrumentation.\n */\nfunction getRpcMethodDescriptor(\n  obj: object,\n  prototype: object,\n  methodName: string,\n  excludedMethods?: ReadonlySet<string>,\n  allowedMethods?: ReadonlySet<string>,\n): PropertyDescriptor | undefined {\n  if (\n    RESERVED_RPC_METHOD_NAMES.has(methodName) ||\n    Object.prototype.hasOwnProperty.call(obj, methodName) ||\n    excludedMethods?.has(methodName) ||\n    (allowedMethods && !allowedMethods.has(methodName))\n  ) {\n    return undefined;\n  }\n\n  const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);\n\n  if (!descriptor || typeof descriptor.value !== 'function' || getInstrumented(descriptor.value)) {\n    return undefined;\n  }\n\n  return descriptor;\n}\n\n/**\n * Wraps eligible methods on the instance's prototype chain once per class.\n *\n * Because the wrappers live on the prototype, the allow-list of the first constructed instance\n * decides which methods carry a wrapper for every later instance of that class. This only affects\n * the deprecated array form of `instrumentPrototypeMethods`, where differing options per instance\n * of the same class were never a supported configuration.\n */\nfunction instrumentPrototypeRpcMethods(\n  obj: object,\n  excludedMethods?: ReadonlySet<string>,\n  allowedMethods?: ReadonlySet<string>,\n): void {\n  let prototype: object | null = Object.getPrototypeOf(obj);\n\n  while (prototype && prototype !== Object.prototype) {\n    for (const methodName of Object.getOwnPropertyNames(prototype)) {\n      const descriptor = getRpcMethodDescriptor(obj, prototype, methodName, excludedMethods, allowedMethods);\n\n      if (!descriptor) {\n        continue;\n      }\n\n      const wrapped = createRpcPrototypeWrapper(methodName, descriptor.value as UncheckedMethod);\n\n      try {\n        Object.defineProperty(prototype, methodName, { ...descriptor, value: wrapped });\n      } catch {}\n\n      // Only the wrapper is marked, not the original method: `wrapMethodWithSentry` resolves\n      // through the same global map and must not resolve the original to this wrapper,\n      // which would recurse.\n      markAsInstrumented(wrapped);\n    }\n\n    prototype = Object.getPrototypeOf(prototype);\n  }\n}\n\n/**\n * Returns the instance's instrumented wrapper for an RPC method, creating it on first use.\n */\nfunction getInstrumentedRpcMethod(\n  state: RpcInstanceState,\n  methodName: string,\n  originalMethod: UncheckedMethod,\n): UncheckedMethod {\n  const instrumentedMethods = (state.instrumentedMethods ??= new Map());\n  let instrumented = instrumentedMethods.get(methodName);\n\n  if (!instrumented) {\n    instrumented = wrapMethodWithSentry(\n      {\n        options: state.options,\n        context: state.context,\n        spanName: state.alwaysTrace ? methodName : rpcMeta => (rpcMeta ? methodName : undefined),\n        spanOp: 'rpc',\n        origin: 'auto.faas.cloudflare.durable_object',\n      },\n      originalMethod,\n      undefined,\n      true,\n    );\n    instrumentedMethods.set(methodName, instrumented);\n  }\n\n  return instrumented;\n}\n\n/**\n * Creates a prototype wrapper that instruments external RPC calls.\n *\n * The wrapper looks up SDK state from its receiver, allowing one prototype function to serve every\n * instance. A call carrying Sentry metadata continues that trace in an `rpc` span. A call without it\n * still gets a client, so its errors, logs and metrics are captured, but no span. Calls the instance\n * makes to its own methods run the original method directly. With the deprecated\n * `instrumentPrototypeMethods` option, every call gets an `rpc` span instead. The original function\n * name and arity are preserved because frameworks may inspect them for dispatch.\n */\nfunction createRpcPrototypeWrapper(methodName: string, originalMethod: UncheckedMethod): UncheckedMethod {\n  const wrapper = function (this: unknown, ...args: unknown[]): unknown {\n    const state = isObjectLike(this) ? rpcInstanceStates.get(this) : undefined;\n\n    if (!state) {\n      return Reflect.apply(originalMethod, this, args);\n    }\n\n    if (state.alwaysTrace || hasRpcMeta(args)) {\n      return Reflect.apply(getInstrumentedRpcMethod(state, methodName, originalMethod), this, args);\n    }\n\n    // workerd dispatches an incoming RPC call outside any async context, so a call made while an\n    // invocation is already in flight comes from the instance itself (`this.helper()` inside\n    // `fetch`, `alarm` or another RPC method).\n    if (getIsolationScope() !== getDefaultIsolationScope()) {\n      return Reflect.apply(originalMethod, this, args);\n    }\n\n    const instrumented = getInstrumentedRpcMethod(state, methodName, originalMethod);\n\n    // Unlike a WorkerEntrypoint, a Durable Object instance is long-lived and serves overlapping\n    // calls. Without a new trace, every untraced call would share the trace of the default scope.\n    return startNewTrace(() => Reflect.apply(instrumented, this, args));\n  };\n\n  Object.defineProperties(wrapper, {\n    name: { value: originalMethod.name, configurable: true },\n    length: { value: originalMethod.length, configurable: true },\n  });\n\n  return wrapper as UncheckedMethod;\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. An\n * incoming trace then continues into them, and errors, logs and metrics are captured whether or not\n * the caller propagates a trace.\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  const InstrumentedClass = new Proxy(DurableObjectClass, {\n    construct(target, [ctx, env], newTarget) {\n      const { obj, options, context, frameworkManagedMethods } = constructInstrumentedDurableObject(\n        target,\n        ctx,\n        env,\n        newTarget,\n        optionsCallback,\n      );\n\n      return finalizeWithRpcInstrumentation(obj, options, context, frameworkManagedMethods);\n    },\n  });\n  // Recognizable for `_INTERNAL_wrapUnlessInstrumented`, so auto-instrumentation never nests wrappers.\n  markAsInstrumented(InstrumentedClass);\n  return InstrumentedClass;\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  const InstrumentedClass = new Proxy(AgentClass, {\n    construct(target, [ctx, env], newTarget) {\n      const { obj, options, context, frameworkManagedMethods } = 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. Methods the Agent\n      // framework installed itself are excluded too — `instrumentCloudflareAgent` traces those by\n      // wrapping the dispatch instead of the method.\n      return finalizeWithRpcInstrumentation(obj, options, context, frameworkManagedMethods);\n    },\n  });\n  markAsInstrumented(InstrumentedClass);\n  return InstrumentedClass;\n}\n"],"names":["setAsyncLocalStorageAsyncContextStrategy","options","getFinalOptions","instrumentContext","instrumentEnv","instrumentDurableObjectHandlers","getEffectiveRpcPropagation","getInstrumented","markAsInstrumented","wrapMethodWithSentry","isObjectLike","hasRpcMeta","getIsolationScope","getDefaultIsolationScope","startNewTrace","instrumentCloudflareAgent"],"mappings":"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"}

package/build/cjs/instrumentations/instrumentDurableObjectNamespace.js

@@ -17,6 +17,12 @@ function instrumentDurableObjectNamespace(namespace, propagateRpcTrace = false)
           return instrumentDurableObjectStub(stub, propagateRpcTrace);
         };
       }
+      if (prop === "jurisdiction") {
+        return function(...args) {
+          const subnamespace = Reflect.apply(value, target, args);
+          return instrumentDurableObjectNamespace(subnamespace, propagateRpcTrace);
+        };
+      }
       return value.bind(target);
     }
   });

package/build/cjs/instrumentations/instrumentDurableObjectNamespace.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentDurableObjectNamespace.js","sources":["../../../src/instrumentations/instrumentDurableObjectNamespace.ts"],"sourcesContent":["import type { DurableObjectNamespace, DurableObjectStub } from '@cloudflare/workers-types';\nimport { appendRpcMeta } from '../utils/rpcMeta';\nimport { instrumentFetcher } from './worker/instrumentFetcher';\n\n// Built-in DurableObjectStub methods that are not RPC calls.\nexport const STUB_NON_RPC_METHODS = new Set(['fetch', 'connect', 'dup']);\n\n/**\n * Instruments a DurableObjectNamespace binding to create spans for DO interactions.\n *\n * Wraps:\n * - `namespace.get(id)` / `namespace.getByName(name)` with a span + instruments returned stub\n * - `namespace.idFromName(name)` / `namespace.idFromString(id)` / `namespace.newUniqueId()` with breadcrumbs\n *\n * @param namespace - The DurableObjectNamespace to instrument\n * @param propagateRpcTrace - Whether RPC method calls on the returned stubs carry trace context\n */\nexport function instrumentDurableObjectNamespace(\n  namespace: DurableObjectNamespace,\n  propagateRpcTrace = false,\n): DurableObjectNamespace {\n  return new Proxy(namespace, {\n    get(target, prop, _receiver) {\n      const value = Reflect.get(target, prop) as unknown;\n\n      if (typeof value !== 'function') {\n        return value;\n      }\n\n      if (prop === 'get' || prop === 'getByName') {\n        return function (this: unknown, ...args: unknown[]) {\n          const stub = Reflect.apply(value, target, args);\n\n          return instrumentDurableObjectStub(stub, propagateRpcTrace);\n        };\n      }\n\n      return value.bind(target);\n    },\n  });\n}\n\n/**\n * Instruments a DurableObjectStub to create spans for outgoing fetch calls\n * and propagate trace context across RPC calls.\n *\n * @param stub - The DurableObjectStub to instrument\n * @param propagateRpcTrace - Whether RPC method calls carry trace context\n */\nfunction instrumentDurableObjectStub(stub: DurableObjectStub, propagateRpcTrace: boolean): DurableObjectStub {\n  return new Proxy(stub, {\n    get(target, prop) {\n      const value = Reflect.get(target, prop);\n\n      if (prop === 'fetch' && typeof value === 'function') {\n        return instrumentFetcher((...args) => Reflect.apply(value, target, args));\n      }\n\n      if (\n        propagateRpcTrace &&\n        typeof value === 'function' &&\n        typeof prop === 'string' &&\n        !STUB_NON_RPC_METHODS.has(prop)\n      ) {\n        return (...args: unknown[]) => Reflect.apply(value, target, appendRpcMeta(args));\n      }\n\n      return value;\n    },\n  });\n}\n"],"names":["instrumentFetcher","appendRpcMeta"],"mappings":";;;;;AAKO,MAAM,uCAAuB,IAAI,GAAA,CAAI,CAAC,OAAA,EAAS,SAAA,EAAW,KAAK,CAAC;AAYhE,SAAS,gCAAA,CACd,SAAA,EACA,iBAAA,GAAoB,KAAA,EACI;AACxB,EAAA,OAAO,IAAI,MAAM,SAAA,EAAW;AAAA,IAC1B,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAC3B,MAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,IAAI,CAAA;AAEtC,MAAA,IAAI,OAAO,UAAU,UAAA,EAAY;AAC/B,QAAA,OAAO,KAAA;AAAA,MACT;AAEA,MAAA,IAAI,IAAA,KAAS,KAAA,IAAS,IAAA,KAAS,WAAA,EAAa;AAC1C,QAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,UAAA,MAAM,IAAA,GAAO,OAAA,CAAQ,KAAA,CAAM,KAAA,EAAO,QAAQ,IAAI,CAAA;AAE9C,UAAA,OAAO,2BAAA,CAA4B,MAAM,iBAAiB,CAAA;AAAA,QAC5D,CAAA;AAAA,MACF;AAEA,MAAA,OAAO,KAAA,CAAM,KAAK,MAAM,CAAA;AAAA,IAC1B;AAAA,GACD,CAAA;AACH;AASA,SAAS,2BAAA,CAA4B,MAAyB,iBAAA,EAA+C;AAC3G,EAAA,OAAO,IAAI,MAAM,IAAA,EAAM;AAAA,IACrB,GAAA,CAAI,QAAQ,IAAA,EAAM;AAChB,MAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,IAAI,CAAA;AAEtC,MAAA,IAAI,IAAA,KAAS,OAAA,IAAW,OAAO,KAAA,KAAU,UAAA,EAAY;AACnD,QAAA,OAAOA,mCAAA,CAAkB,IAAI,IAAA,KAAS,OAAA,CAAQ,MAAM,KAAA,EAAO,MAAA,EAAQ,IAAI,CAAC,CAAA;AAAA,MAC1E;AAEA,MAAA,IACE,iBAAA,IACA,OAAO,KAAA,KAAU,UAAA,IACjB,OAAO,IAAA,KAAS,QAAA,IAChB,CAAC,oBAAA,CAAqB,GAAA,CAAI,IAAI,CAAA,EAC9B;AACA,QAAA,OAAO,CAAA,GAAI,SAAoB,OAAA,CAAQ,KAAA,CAAM,OAAO,MAAA,EAAQC,qBAAA,CAAc,IAAI,CAAC,CAAA;AAAA,MACjF;AAEA,MAAA,OAAO,KAAA;AAAA,IACT;AAAA,GACD,CAAA;AACH;;;;;"}
+{"version":3,"file":"instrumentDurableObjectNamespace.js","sources":["../../../src/instrumentations/instrumentDurableObjectNamespace.ts"],"sourcesContent":["import type { DurableObjectNamespace, DurableObjectStub } from '@cloudflare/workers-types';\nimport { appendRpcMeta } from '../utils/rpcMeta';\nimport { instrumentFetcher } from './worker/instrumentFetcher';\n\n// Built-in DurableObjectStub methods that are not RPC calls.\nexport const STUB_NON_RPC_METHODS = new Set(['fetch', 'connect', 'dup']);\n\n/**\n * Instruments a DurableObjectNamespace binding to create spans for DO interactions.\n *\n * Wraps:\n * - `namespace.get(id)` / `namespace.getByName(name)` with a span + instruments returned stub\n * - `namespace.jurisdiction(name)` by instrumenting the returned namespace the same way\n * - `namespace.idFromName(name)` / `namespace.idFromString(id)` / `namespace.newUniqueId()` with breadcrumbs\n *\n * @param namespace - The DurableObjectNamespace to instrument\n * @param propagateRpcTrace - Whether RPC method calls on the returned stubs carry trace context\n */\nexport function instrumentDurableObjectNamespace(\n  namespace: DurableObjectNamespace,\n  propagateRpcTrace = false,\n): DurableObjectNamespace {\n  return new Proxy(namespace, {\n    get(target, prop, _receiver) {\n      const value = Reflect.get(target, prop) as unknown;\n\n      if (typeof value !== 'function') {\n        return value;\n      }\n\n      if (prop === 'get' || prop === 'getByName') {\n        return function (this: unknown, ...args: unknown[]) {\n          const stub = Reflect.apply(value, target, args);\n\n          return instrumentDurableObjectStub(stub, propagateRpcTrace);\n        };\n      }\n\n      if (prop === 'jurisdiction') {\n        return function (this: unknown, ...args: unknown[]) {\n          const subnamespace = Reflect.apply(value, target, args);\n\n          return instrumentDurableObjectNamespace(subnamespace, propagateRpcTrace);\n        };\n      }\n\n      return value.bind(target);\n    },\n  });\n}\n\n/**\n * Instruments a DurableObjectStub to create spans for outgoing fetch calls\n * and propagate trace context across RPC calls.\n *\n * @param stub - The DurableObjectStub to instrument\n * @param propagateRpcTrace - Whether RPC method calls carry trace context\n */\nfunction instrumentDurableObjectStub(stub: DurableObjectStub, propagateRpcTrace: boolean): DurableObjectStub {\n  return new Proxy(stub, {\n    get(target, prop) {\n      const value = Reflect.get(target, prop);\n\n      if (prop === 'fetch' && typeof value === 'function') {\n        return instrumentFetcher((...args) => Reflect.apply(value, target, args));\n      }\n\n      if (\n        propagateRpcTrace &&\n        typeof value === 'function' &&\n        typeof prop === 'string' &&\n        !STUB_NON_RPC_METHODS.has(prop)\n      ) {\n        return (...args: unknown[]) => Reflect.apply(value, target, appendRpcMeta(args));\n      }\n\n      return value;\n    },\n  });\n}\n"],"names":["instrumentFetcher","appendRpcMeta"],"mappings":";;;;;AAKO,MAAM,uCAAuB,IAAI,GAAA,CAAI,CAAC,OAAA,EAAS,SAAA,EAAW,KAAK,CAAC;AAahE,SAAS,gCAAA,CACd,SAAA,EACA,iBAAA,GAAoB,KAAA,EACI;AACxB,EAAA,OAAO,IAAI,MAAM,SAAA,EAAW;AAAA,IAC1B,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAC3B,MAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,IAAI,CAAA;AAEtC,MAAA,IAAI,OAAO,UAAU,UAAA,EAAY;AAC/B,QAAA,OAAO,KAAA;AAAA,MACT;AAEA,MAAA,IAAI,IAAA,KAAS,KAAA,IAAS,IAAA,KAAS,WAAA,EAAa;AAC1C,QAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,UAAA,MAAM,IAAA,GAAO,OAAA,CAAQ,KAAA,CAAM,KAAA,EAAO,QAAQ,IAAI,CAAA;AAE9C,UAAA,OAAO,2BAAA,CAA4B,MAAM,iBAAiB,CAAA;AAAA,QAC5D,CAAA;AAAA,MACF;AAEA,MAAA,IAAI,SAAS,cAAA,EAAgB;AAC3B,QAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,UAAA,MAAM,YAAA,GAAe,OAAA,CAAQ,KAAA,CAAM,KAAA,EAAO,QAAQ,IAAI,CAAA;AAEtD,UAAA,OAAO,gCAAA,CAAiC,cAAc,iBAAiB,CAAA;AAAA,QACzE,CAAA;AAAA,MACF;AAEA,MAAA,OAAO,KAAA,CAAM,KAAK,MAAM,CAAA;AAAA,IAC1B;AAAA,GACD,CAAA;AACH;AASA,SAAS,2BAAA,CAA4B,MAAyB,iBAAA,EAA+C;AAC3G,EAAA,OAAO,IAAI,MAAM,IAAA,EAAM;AAAA,IACrB,GAAA,CAAI,QAAQ,IAAA,EAAM;AAChB,MAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,IAAI,CAAA;AAEtC,MAAA,IAAI,IAAA,KAAS,OAAA,IAAW,OAAO,KAAA,KAAU,UAAA,EAAY;AACnD,QAAA,OAAOA,mCAAA,CAAkB,IAAI,IAAA,KAAS,OAAA,CAAQ,MAAM,KAAA,EAAO,MAAA,EAAQ,IAAI,CAAC,CAAA;AAAA,MAC1E;AAEA,MAAA,IACE,iBAAA,IACA,OAAO,KAAA,KAAU,UAAA,IACjB,OAAO,IAAA,KAAS,QAAA,IAChB,CAAC,oBAAA,CAAqB,GAAA,CAAI,IAAI,CAAA,EAC9B;AACA,QAAA,OAAO,CAAA,GAAI,SAAoB,OAAA,CAAQ,KAAA,CAAM,OAAO,MAAA,EAAQC,qBAAA,CAAc,IAAI,CAAC,CAAA;AAAA,MACjF;AAEA,MAAA,OAAO,KAAA;AAAA,IACT;AAAA,GACD,CAAA;AACH;;;;;"}

package/build/cjs/wrapMethodWithSentry.js

@@ -33,6 +33,7 @@ function wrapMethodWithSentry(wrapperOptions, handler, callback, noMark) {
           args = extracted.args;
           rpcMeta$1 = extracted.rpcMeta;
         }
+        const spanName = typeof wrapperOptions.spanName === "function" ? wrapperOptions.spanName(rpcMeta$1) : wrapperOptions.spanName;
         const wrappedFunction = (scope) => {
           const context = wrapperOptions.context;
           const waitUntil = context ? flush.getOriginalWaitUntil(context)?.bind(context) : void 0;
@@ -47,7 +48,7 @@ function wrapMethodWithSentry(wrapperOptions, handler, callback, noMark) {
             scopeClient = client;
           }
           const clientToDispose = scopeClient;
-          const methodName = wrapperOptions.spanName || "unknown";
+          const methodName = spanName || "unknown";
           const teardown = async () => {
             if (startNewTrace && storage) {
               traceLinks.storeSpanContext(storage, methodName);
@@ -68,7 +69,7 @@ function wrapMethodWithSentry(wrapperOptions, handler, callback, noMark) {
             waitUntil?.(teardown());
             throw e;
           };
-          if (!wrapperOptions.spanName) {
+          if (!spanName) {
             try {
               if (callback) {
                 callback(...args);

package/build/cjs/wrapMethodWithSentry.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapMethodWithSentry.js","sources":["../../src/wrapMethodWithSentry.ts"],"sourcesContent":["import type { DurableObjectStorage } from '@cloudflare/workers-types';\nimport type { SerializedTraceData } from '@sentry/core';\nimport {\n  isObjectLike,\n  captureException,\n  continueTrace,\n  isThenable,\n  type Scope,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  startNewTrace as startNewTraceCore,\n  startSpan,\n} from '@sentry/core';\nimport type { CloudflareOptions } from './client';\nimport type { ExecutionContextCompat } from './executionContext';\nimport { flushAndDispose, getOriginalWaitUntil } from './flush';\nimport { ensureInstrumented } from './instrument';\nimport { init } from './sdk';\nimport { withInvocationIsolationScope } from './utils/invocationScope';\nimport { extractRpcMeta } from './utils/rpcMeta';\nimport { buildSpanLinks, getStoredSpanContext, storeSpanContext } from './utils/traceLinks';\n\n/** Extended DurableObjectState with originalStorage exposed by instrumentContext */\nexport interface InstrumentedDurableObjectState extends DurableObjectState {\n  originalStorage?: DurableObjectStorage;\n}\n\n/**\n * Resolves uninstrumented DO storage for the current invocation.\n * Prefer `thisArg.ctx` (the live Durable Object instance) over the context captured at\n * construction time to avoid cross-DO I/O errors in the same isolate.\n */\nfunction resolveOriginalStorage(\n  context: ExecutionContext | InstrumentedDurableObjectState | undefined,\n  thisArg: unknown,\n): DurableObjectStorage | undefined {\n  if (isObjectLike(thisArg) && 'ctx' in thisArg) {\n    const doCtx = (thisArg as { ctx: InstrumentedDurableObjectState }).ctx;\n    if (doCtx?.originalStorage) {\n      return doCtx.originalStorage;\n    }\n  }\n\n  if (context && 'originalStorage' in context && context.originalStorage) {\n    return context.originalStorage;\n  }\n\n  return undefined;\n}\n\ntype MethodWrapperOptions = {\n  spanName?: string;\n  spanOp?: string;\n  options: CloudflareOptions;\n  context: ExecutionContext | InstrumentedDurableObjectState;\n  /**\n   * If true, starts a fresh trace instead of inheriting from a parent trace.\n   * Useful for scheduled/independent invocations like alarms.\n   *\n   * If true, it also stores the current span context and links to the previous invocation's span.\n   * Uses Durable Object storage to persist the link. The link is set asynchronously via `span.addLinks()`\n   * in a `waitUntil` to avoid blocking.\n   *\n   * @default false\n   */\n  startNewTrace?: boolean;\n  /**\n   * The trace origin identifying which instrumentation created the span, e.g. `auto.faas.cloudflare.durable_object`.\n   * Used both as the span's `sentry.origin` attribute and as the `mechanism.type` for captured exceptions.\n   */\n  origin: string;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type UncheckedMethod = (...args: any[]) => any;\ntype OriginalMethod = UncheckedMethod;\n\n/**\n * Wraps a method with Sentry error tracking and optional tracing.\n * Supports starting new traces and linking to previous invocations via Durable Object storage.\n *\n * @param wrapperOptions - The options for the wrapper.\n * @param handler - The method to wrap.\n * @param callback - The callback to call.\n * @param noMark - Whether to mark the method as instrumented.\n * @returns The wrapped method.\n */\nexport function wrapMethodWithSentry<T extends OriginalMethod>(\n  wrapperOptions: MethodWrapperOptions,\n  handler: T,\n  callback?: (...args: Parameters<T>) => void,\n  noMark?: true,\n): T {\n  return ensureInstrumented(\n    handler,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, rawArgs: Parameters<T>) {\n          const { startNewTrace, origin } = wrapperOptions;\n\n          // For RPC methods, extract Sentry trace context from the trailing argument.\n          // The caller side (instrumentDurableObjectStub / JSRPC proxy) appends it;\n          // we strip it here so the user's method never sees it.\n          let args = rawArgs;\n          let rpcMeta: SerializedTraceData | undefined;\n\n          if (wrapperOptions.spanOp === 'rpc') {\n            const extracted = extractRpcMeta(rawArgs);\n            args = extracted.args;\n            rpcMeta = extracted.rpcMeta;\n          }\n\n          const wrappedFunction = (scope: Scope): unknown | Promise<unknown> => {\n            // In certain situations, the passed context can become undefined.\n            // For example, for Astro while prerendering pages at build time.\n            // see: https://github.com/getsentry/sentry-javascript/issues/13217\n            const context: typeof wrapperOptions.context | undefined = wrapperOptions.context;\n\n            // see: https://github.com/getsentry/sentry-javascript/issues/22328\n            const waitUntil = context\n              ? getOriginalWaitUntil(context as ExecutionContextCompat)?.bind(context)\n              : undefined;\n            const storage = resolveOriginalStorage(context, thisArg);\n\n            let scopeClient = scope.getClient();\n            // Check if client exists AND is still usable (transport not disposed)\n            // This handles the case where a previous handler disposed the client\n            // but the scope still holds a reference to it (e.g., alarm handlers in Durable Objects)\n            // For startNewTrace, always create a fresh client\n            if (startNewTrace || !scopeClient?.getTransport()) {\n              const client = init({\n                ...wrapperOptions.options,\n                ctx: context as unknown as ExecutionContext | undefined,\n              });\n              scope.setClient(client);\n              scopeClient = client;\n            }\n\n            const clientToDispose = scopeClient;\n            const methodName = wrapperOptions.spanName || 'unknown';\n\n            const teardown = async (): Promise<void> => {\n              if (startNewTrace && storage) {\n                storeSpanContext(storage, methodName);\n              }\n              await flushAndDispose(clientToDispose);\n            };\n\n            const onFulfilled = (res: unknown) => {\n              waitUntil?.(teardown());\n              return res;\n            };\n\n            const onRejected = (e: unknown) => {\n              captureException(e, {\n                mechanism: {\n                  type: origin,\n                  handled: false,\n                },\n              });\n              waitUntil?.(teardown());\n              throw e;\n            };\n\n            if (!wrapperOptions.spanName) {\n              try {\n                if (callback) {\n                  callback(...args);\n                }\n\n                const result = Reflect.apply(target, thisArg, args);\n\n                if (isThenable(result)) {\n                  return result.then(onFulfilled, onRejected);\n                } else {\n                  return onFulfilled(result);\n                }\n              } catch (e) {\n                return onRejected(e);\n              }\n            }\n\n            const attributes = wrapperOptions.spanOp\n              ? {\n                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: origin,\n                }\n              : {};\n\n            const executeSpan = (): unknown => {\n              return startSpan({ name: methodName, attributes }, span => {\n                if (startNewTrace && storage) {\n                  const storedContext = getStoredSpanContext(storage, methodName);\n\n                  if (storedContext) {\n                    span.addLinks(buildSpanLinks(storedContext));\n                    // TODO: Remove this once EAP can store span links. We currently only set this attribute so that we\n                    // can obtain the previous trace information from the EAP store. Long-term, EAP will handle\n                    // span links and then we should remove this again. Also throwing in a TODO(v11), to remind us\n                    // to check this at v11 time :)\n                    const sampledFlag = storedContext.sampled ? '1' : '0';\n                    span.setAttribute(\n                      'sentry.previous_trace',\n                      `${storedContext.traceId}-${storedContext.spanId}-${sampledFlag}`,\n                    );\n                  }\n                }\n\n                try {\n                  const result = Reflect.apply(target, thisArg, args);\n\n                  if (isThenable(result)) {\n                    return result.then(onFulfilled, onRejected);\n                  } else {\n                    return onFulfilled(result);\n                  }\n                } catch (e) {\n                  return onRejected(e);\n                }\n              });\n            };\n\n            if (rpcMeta) {\n              return continueTrace(\n                { sentryTrace: rpcMeta['sentry-trace'] || '', baggage: rpcMeta.baggage || '' },\n                executeSpan,\n              );\n            }\n\n            if (startNewTrace) {\n              return startNewTraceCore(() => executeSpan());\n            }\n\n            return executeSpan();\n          };\n\n          return withInvocationIsolationScope(wrappedFunction);\n        },\n      }),\n    noMark,\n  );\n}\n"],"names":["isObjectLike","ensureInstrumented","rpcMeta","extractRpcMeta","getOriginalWaitUntil","init","storeSpanContext","flushAndDispose","captureException","isThenable","SEMANTIC_ATTRIBUTE_SENTRY_OP","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","startSpan","getStoredSpanContext","buildSpanLinks","continueTrace","startNewTraceCore","withInvocationIsolationScope"],"mappings":"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"}
+{"version":3,"file":"wrapMethodWithSentry.js","sources":["../../src/wrapMethodWithSentry.ts"],"sourcesContent":["import type { DurableObjectStorage } from '@cloudflare/workers-types';\nimport type { SerializedTraceData } from '@sentry/core';\nimport {\n  isObjectLike,\n  captureException,\n  continueTrace,\n  isThenable,\n  type Scope,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  startNewTrace as startNewTraceCore,\n  startSpan,\n} from '@sentry/core';\nimport type { CloudflareOptions } from './client';\nimport type { ExecutionContextCompat } from './executionContext';\nimport { flushAndDispose, getOriginalWaitUntil } from './flush';\nimport { ensureInstrumented } from './instrument';\nimport { init } from './sdk';\nimport { withInvocationIsolationScope } from './utils/invocationScope';\nimport { extractRpcMeta } from './utils/rpcMeta';\nimport { buildSpanLinks, getStoredSpanContext, storeSpanContext } from './utils/traceLinks';\n\n/** Extended DurableObjectState with originalStorage exposed by instrumentContext */\nexport interface InstrumentedDurableObjectState extends DurableObjectState {\n  originalStorage?: DurableObjectStorage;\n}\n\n/**\n * Resolves uninstrumented DO storage for the current invocation.\n * Prefer `thisArg.ctx` (the live Durable Object instance) over the context captured at\n * construction time to avoid cross-DO I/O errors in the same isolate.\n */\nfunction resolveOriginalStorage(\n  context: ExecutionContext | InstrumentedDurableObjectState | undefined,\n  thisArg: unknown,\n): DurableObjectStorage | undefined {\n  if (isObjectLike(thisArg) && 'ctx' in thisArg) {\n    const doCtx = (thisArg as { ctx: InstrumentedDurableObjectState }).ctx;\n    if (doCtx?.originalStorage) {\n      return doCtx.originalStorage;\n    }\n  }\n\n  if (context && 'originalStorage' in context && context.originalStorage) {\n    return context.originalStorage;\n  }\n\n  return undefined;\n}\n\ntype MethodWrapperOptions = {\n  /**\n   * The span name, or a resolver called with the RPC metadata of the current call.\n   * Returning `undefined` skips the span and only captures errors.\n   */\n  spanName?: string | ((rpcMeta: SerializedTraceData | undefined) => string | undefined);\n  spanOp?: string;\n  options: CloudflareOptions;\n  context: ExecutionContext | InstrumentedDurableObjectState;\n  /**\n   * If true, starts a fresh trace instead of inheriting from a parent trace.\n   * Useful for scheduled/independent invocations like alarms.\n   *\n   * If true, it also stores the current span context and links to the previous invocation's span.\n   * Uses Durable Object storage to persist the link. The link is set asynchronously via `span.addLinks()`\n   * in a `waitUntil` to avoid blocking.\n   *\n   * @default false\n   */\n  startNewTrace?: boolean;\n  /**\n   * The trace origin identifying which instrumentation created the span, e.g. `auto.faas.cloudflare.durable_object`.\n   * Used both as the span's `sentry.origin` attribute and as the `mechanism.type` for captured exceptions.\n   */\n  origin: string;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type UncheckedMethod = (...args: any[]) => any;\ntype OriginalMethod = UncheckedMethod;\n\n/**\n * Wraps a method with Sentry error tracking and optional tracing.\n * Supports starting new traces and linking to previous invocations via Durable Object storage.\n *\n * @param wrapperOptions - The options for the wrapper.\n * @param handler - The method to wrap.\n * @param callback - The callback to call.\n * @param noMark - Whether to mark the method as instrumented.\n * @returns The wrapped method.\n */\nexport function wrapMethodWithSentry<T extends OriginalMethod>(\n  wrapperOptions: MethodWrapperOptions,\n  handler: T,\n  callback?: (...args: Parameters<T>) => void,\n  noMark?: true,\n): T {\n  return ensureInstrumented(\n    handler,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, rawArgs: Parameters<T>) {\n          const { startNewTrace, origin } = wrapperOptions;\n\n          // For RPC methods, extract Sentry trace context from the trailing argument.\n          // The caller side (instrumentDurableObjectStub / JSRPC proxy) appends it;\n          // we strip it here so the user's method never sees it.\n          let args = rawArgs;\n          let rpcMeta: SerializedTraceData | undefined;\n\n          if (wrapperOptions.spanOp === 'rpc') {\n            const extracted = extractRpcMeta(rawArgs);\n            args = extracted.args;\n            rpcMeta = extracted.rpcMeta;\n          }\n\n          const spanName =\n            typeof wrapperOptions.spanName === 'function' ? wrapperOptions.spanName(rpcMeta) : wrapperOptions.spanName;\n\n          const wrappedFunction = (scope: Scope): unknown | Promise<unknown> => {\n            // In certain situations, the passed context can become undefined.\n            // For example, for Astro while prerendering pages at build time.\n            // see: https://github.com/getsentry/sentry-javascript/issues/13217\n            const context: typeof wrapperOptions.context | undefined = wrapperOptions.context;\n\n            // see: https://github.com/getsentry/sentry-javascript/issues/22328\n            const waitUntil = context\n              ? getOriginalWaitUntil(context as ExecutionContextCompat)?.bind(context)\n              : undefined;\n            const storage = resolveOriginalStorage(context, thisArg);\n\n            let scopeClient = scope.getClient();\n            // Check if client exists AND is still usable (transport not disposed)\n            // This handles the case where a previous handler disposed the client\n            // but the scope still holds a reference to it (e.g., alarm handlers in Durable Objects)\n            // For startNewTrace, always create a fresh client\n            if (startNewTrace || !scopeClient?.getTransport()) {\n              const client = init({\n                ...wrapperOptions.options,\n                ctx: context as unknown as ExecutionContext | undefined,\n              });\n              scope.setClient(client);\n              scopeClient = client;\n            }\n\n            const clientToDispose = scopeClient;\n            const methodName = spanName || 'unknown';\n\n            const teardown = async (): Promise<void> => {\n              if (startNewTrace && storage) {\n                storeSpanContext(storage, methodName);\n              }\n              await flushAndDispose(clientToDispose);\n            };\n\n            const onFulfilled = (res: unknown) => {\n              waitUntil?.(teardown());\n              return res;\n            };\n\n            const onRejected = (e: unknown) => {\n              captureException(e, {\n                mechanism: {\n                  type: origin,\n                  handled: false,\n                },\n              });\n              waitUntil?.(teardown());\n              throw e;\n            };\n\n            if (!spanName) {\n              try {\n                if (callback) {\n                  callback(...args);\n                }\n\n                const result = Reflect.apply(target, thisArg, args);\n\n                if (isThenable(result)) {\n                  return result.then(onFulfilled, onRejected);\n                } else {\n                  return onFulfilled(result);\n                }\n              } catch (e) {\n                return onRejected(e);\n              }\n            }\n\n            const attributes = wrapperOptions.spanOp\n              ? {\n                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: origin,\n                }\n              : {};\n\n            const executeSpan = (): unknown => {\n              return startSpan({ name: methodName, attributes }, span => {\n                if (startNewTrace && storage) {\n                  const storedContext = getStoredSpanContext(storage, methodName);\n\n                  if (storedContext) {\n                    span.addLinks(buildSpanLinks(storedContext));\n                    // TODO: Remove this once EAP can store span links. We currently only set this attribute so that we\n                    // can obtain the previous trace information from the EAP store. Long-term, EAP will handle\n                    // span links and then we should remove this again. Also throwing in a TODO(v11), to remind us\n                    // to check this at v11 time :)\n                    const sampledFlag = storedContext.sampled ? '1' : '0';\n                    span.setAttribute(\n                      'sentry.previous_trace',\n                      `${storedContext.traceId}-${storedContext.spanId}-${sampledFlag}`,\n                    );\n                  }\n                }\n\n                try {\n                  const result = Reflect.apply(target, thisArg, args);\n\n                  if (isThenable(result)) {\n                    return result.then(onFulfilled, onRejected);\n                  } else {\n                    return onFulfilled(result);\n                  }\n                } catch (e) {\n                  return onRejected(e);\n                }\n              });\n            };\n\n            if (rpcMeta) {\n              return continueTrace(\n                { sentryTrace: rpcMeta['sentry-trace'] || '', baggage: rpcMeta.baggage || '' },\n                executeSpan,\n              );\n            }\n\n            if (startNewTrace) {\n              return startNewTraceCore(() => executeSpan());\n            }\n\n            return executeSpan();\n          };\n\n          return withInvocationIsolationScope(wrappedFunction);\n        },\n      }),\n    noMark,\n  );\n}\n"],"names":["isObjectLike","ensureInstrumented","rpcMeta","extractRpcMeta","getOriginalWaitUntil","init","storeSpanContext","flushAndDispose","captureException","isThenable","SEMANTIC_ATTRIBUTE_SENTRY_OP","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","startSpan","getStoredSpanContext","buildSpanLinks","continueTrace","startNewTraceCore","withInvocationIsolationScope"],"mappings":"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"}

package/build/esm/durableobject.js

@@ -1,4 +1,4 @@
-import { isObjectLike } from '@sentry/core';
+import { isObjectLike, getIsolationScope, getDefaultIsolationScope, startNewTrace } from '@sentry/core';
 import { setAsyncLocalStorageAsyncContextStrategy } from './async.js';
 import { markAsInstrumented, getInstrumented } from './instrument.js';
 import { instrumentDurableObjectHandlers } from './instrumentations/instrumentDurableObjectHandlers.js';
@@ -112,30 +112,40 @@ function instrumentPrototypeRpcMethods(obj, excludedMethods, allowedMethods) {
     prototype = Object.getPrototypeOf(prototype);
   }
 }
+function getInstrumentedRpcMethod(state, methodName, originalMethod) {
+  const instrumentedMethods = state.instrumentedMethods ?? (state.instrumentedMethods = /* @__PURE__ */ new Map());
+  let instrumented = instrumentedMethods.get(methodName);
+  if (!instrumented) {
+    instrumented = wrapMethodWithSentry(
+      {
+        options: state.options,
+        context: state.context,
+        spanName: state.alwaysTrace ? methodName : (rpcMeta) => rpcMeta ? methodName : void 0,
+        spanOp: "rpc",
+        origin: "auto.faas.cloudflare.durable_object"
+      },
+      originalMethod,
+      void 0,
+      true
+    );
+    instrumentedMethods.set(methodName, instrumented);
+  }
+  return instrumented;
+}
 function createRpcPrototypeWrapper(methodName, originalMethod) {
   const wrapper = function(...args) {
     const state = isObjectLike(this) ? rpcInstanceStates.get(this) : void 0;
-    if (!state || !state.alwaysTrace && !hasRpcMeta(args)) {
+    if (!state) {
       return Reflect.apply(originalMethod, this, args);
     }
-    const tracedMethods = state.tracedMethods ?? (state.tracedMethods = /* @__PURE__ */ new Map());
-    let traced = tracedMethods.get(methodName);
-    if (!traced) {
-      traced = wrapMethodWithSentry(
-        {
-          options: state.options,
-          context: state.context,
-          spanName: methodName,
-          spanOp: "rpc",
-          origin: "auto.faas.cloudflare.durable_object"
-        },
-        originalMethod,
-        void 0,
-        true
-      );
-      tracedMethods.set(methodName, traced);
+    if (state.alwaysTrace || hasRpcMeta(args)) {
+      return Reflect.apply(getInstrumentedRpcMethod(state, methodName, originalMethod), this, args);
+    }
+    if (getIsolationScope() !== getDefaultIsolationScope()) {
+      return Reflect.apply(originalMethod, this, args);
     }
-    return Reflect.apply(traced, this, args);
+    const instrumented = getInstrumentedRpcMethod(state, methodName, originalMethod);
+    return startNewTrace(() => Reflect.apply(instrumented, this, args));
   };
   Object.defineProperties(wrapper, {
     name: { value: originalMethod.name, configurable: true },

package/build/esm/durableobject.js.map

@@ -1 +1 @@
-{"version":3,"file":"durableobject.js","sources":["../../src/durableobject.ts"],"sourcesContent":["/* eslint-disable max-lines */\n/* eslint-disable @typescript-eslint/unbound-method */\nimport { isObjectLike } from '@sentry/core';\nimport type { DurableObject } from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { getInstrumented, markAsInstrumented } from './instrument';\nimport { instrumentDurableObjectHandlers } from './instrumentations/instrumentDurableObjectHandlers';\nimport { instrumentEnv } from './instrumentations/worker/instrumentEnv';\nimport { getFinalOptions } from './options';\nimport { instrumentContext } from './utils/instrumentContext';\nimport { hasRpcMeta } 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 * instrumentation — callers apply that last via {@link finalizeWithRpcInstrumentation}, after any\n * additional 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): {\n  obj: T;\n  options: CloudflareOptions;\n  context: InstrumentedDurableObjectContext;\n  frameworkManagedMethods: ReadonlySet<string>;\n} {\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  const prototype = (newTarget as unknown as { prototype?: object }).prototype ?? target.prototype;\n  const cachedFrameworkManagedMethods = frameworkManagedMethodsCache.get(prototype);\n  const methodsBeforeConstruction = cachedFrameworkManagedMethods ? undefined : resolvePrototypeMethods(prototype);\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  const frameworkManagedMethods = resolveFrameworkManagedMethods(\n    prototype,\n    obj,\n    methodsBeforeConstruction,\n    cachedFrameworkManagedMethods,\n  );\n\n  instrumentDurableObjectHandlers(obj, options, context);\n\n  return { obj, options, context, frameworkManagedMethods };\n}\n\nconst frameworkManagedMethodsCache = new WeakMap<object, ReadonlySet<string>>();\n\n/**\n * Collects the methods visible from a prototype, using normal property lookup precedence.\n * Methods inherited from `Object.prototype` are excluded because they cannot be Durable Object RPC methods.\n */\nfunction resolvePrototypeMethods(prototype: object | null): Map<string, unknown> {\n  const methods = new Map<string, unknown>();\n\n  for (let current = prototype; current && current !== Object.prototype; current = Object.getPrototypeOf(current)) {\n    for (const name of Object.getOwnPropertyNames(current)) {\n      // The first occurrence wins, mirroring what a property lookup on the instance would find\n      if (name === 'constructor' || methods.has(name)) {\n        continue;\n      }\n\n      const descriptor = Object.getOwnPropertyDescriptor(current, name);\n\n      if (descriptor && typeof descriptor.value === 'function') {\n        methods.set(name, descriptor.value);\n      }\n    }\n  }\n\n  return methods;\n}\n\n/**\n * Finds methods that a framework replaced while constructing the first instance.\n *\n * Some frameworks register methods by function identity, so replacing one of their wrappers would\n * break dispatch. The result is cached because frameworks commonly install their wrappers only\n * once; later constructions would no longer reveal which methods they manage.\n */\nfunction resolveFrameworkManagedMethods(\n  prototype: object,\n  obj: object,\n  methodsBeforeConstruction: Map<string, unknown> | undefined,\n  cached: ReadonlySet<string> | undefined,\n): ReadonlySet<string> {\n  if (cached) {\n    return cached;\n  }\n\n  const methodsAfterConstruction = resolvePrototypeMethods(Object.getPrototypeOf(obj) as object);\n  const managed = new Set<string>();\n\n  for (const [name, method] of methodsAfterConstruction) {\n    const before = methodsBeforeConstruction?.get(name);\n\n    if (before && before !== method) {\n      managed.add(name);\n    }\n  }\n\n  frameworkManagedMethodsCache.set(prototype, managed);\n\n  return managed;\n}\n\ntype RpcInstanceState = {\n  options: CloudflareOptions;\n  context: InstrumentedDurableObjectContext;\n  /**\n   * Whether to trace calls that carry no RPC metadata. Only the deprecated\n   * `instrumentPrototypeMethods` option does, because it predates metadata propagation.\n   */\n  alwaysTrace: boolean;\n  /** Per-instance cache of the traced method wrappers, keyed by method name. Created on first use. */\n  tracedMethods?: Map<string, UncheckedMethod>;\n};\n\n/**\n * Method names the runtime never dispatches over RPC, so wrapping them buys no tracing.\n *\n * Mirrors `isReservedName` in workerd (`src/workerd/api/worker-rpc.c++`): the runtime rejects these\n * before any property lookup happens. `fetch`, `alarm` and the `webSocket*` handlers are also\n * instrumented per-instance as own properties, and `constructor` is on every prototype.\n */\nconst RESERVED_RPC_METHOD_NAMES: ReadonlySet<string> = new Set([\n  'constructor',\n  'fetch',\n  'connect',\n  'alarm',\n  'webSocketMessage',\n  'webSocketClose',\n  'webSocketError',\n  'dup',\n]);\n\n// Prototype wrappers are shared by all instances, while SDK options and traced method caches are not.\nconst rpcInstanceStates = new WeakMap<object, RpcInstanceState>();\n\n/**\n * Adds trace propagation to a constructed Durable Object's RPC methods.\n *\n * RPC methods are wrapped on the prototype because Cloudflare dispatches them with the Durable\n * Object instance as the receiver. This preserves native private-field access and keeps the methods\n * visible to Cloudflare's RPC dispatcher. Built-in handlers, Agent handlers, and methods managed by\n * another framework are left untouched.\n *\n * Call this after all per-instance instrumentation has been applied. If RPC trace propagation is\n * disabled, the object is returned unchanged.\n *\n * @param obj The constructed Durable Object instance.\n * @param options The resolved SDK options for this instance.\n * @param context The instrumented execution context for this instance.\n * @param excludedMethods Method names owned by another framework and therefore not safe to wrap.\n * @returns The same Durable Object instance, with eligible prototype methods instrumented.\n * @internal\n */\nexport function finalizeWithRpcInstrumentation<T extends object>(\n  obj: T,\n  options: CloudflareOptions,\n  context: InstrumentedDurableObjectContext,\n  excludedMethods?: ReadonlySet<string>,\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 allowedMethods = Array.isArray(options.instrumentPrototypeMethods)\n    ? // eslint-disable-next-line typescript/no-deprecated\n      new Set(options.instrumentPrototypeMethods)\n    : undefined;\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  // eslint-disable-next-line typescript/no-deprecated\n  const alwaysTrace = options.enableRpcTracePropagation === undefined;\n\n  rpcInstanceStates.set(obj, { options, context, alwaysTrace });\n\n  instrumentPrototypeRpcMethods(obj, excludedMethods, allowedMethods);\n\n  return obj;\n}\n\n/**\n * Returns a prototype method when it is eligible for RPC instrumentation.\n */\nfunction getRpcMethodDescriptor(\n  obj: object,\n  prototype: object,\n  methodName: string,\n  excludedMethods?: ReadonlySet<string>,\n  allowedMethods?: ReadonlySet<string>,\n): PropertyDescriptor | undefined {\n  if (\n    RESERVED_RPC_METHOD_NAMES.has(methodName) ||\n    Object.prototype.hasOwnProperty.call(obj, methodName) ||\n    excludedMethods?.has(methodName) ||\n    (allowedMethods && !allowedMethods.has(methodName))\n  ) {\n    return undefined;\n  }\n\n  const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);\n\n  if (!descriptor || typeof descriptor.value !== 'function' || getInstrumented(descriptor.value)) {\n    return undefined;\n  }\n\n  return descriptor;\n}\n\n/**\n * Wraps eligible methods on the instance's prototype chain once per class.\n *\n * Because the wrappers live on the prototype, the allow-list of the first constructed instance\n * decides which methods carry a wrapper for every later instance of that class. This only affects\n * the deprecated array form of `instrumentPrototypeMethods`, where differing options per instance\n * of the same class were never a supported configuration.\n */\nfunction instrumentPrototypeRpcMethods(\n  obj: object,\n  excludedMethods?: ReadonlySet<string>,\n  allowedMethods?: ReadonlySet<string>,\n): void {\n  let prototype: object | null = Object.getPrototypeOf(obj);\n\n  while (prototype && prototype !== Object.prototype) {\n    for (const methodName of Object.getOwnPropertyNames(prototype)) {\n      const descriptor = getRpcMethodDescriptor(obj, prototype, methodName, excludedMethods, allowedMethods);\n\n      if (!descriptor) {\n        continue;\n      }\n\n      const wrapped = createRpcPrototypeWrapper(methodName, descriptor.value as UncheckedMethod);\n\n      try {\n        Object.defineProperty(prototype, methodName, { ...descriptor, value: wrapped });\n      } catch {}\n\n      // Only the wrapper is marked, not the original method: `wrapMethodWithSentry` resolves\n      // through the same global map and must not resolve the original to this wrapper,\n      // which would recurse.\n      markAsInstrumented(wrapped);\n    }\n\n    prototype = Object.getPrototypeOf(prototype);\n  }\n}\n\n/**\n * Creates a prototype wrapper that traces RPC calls carrying Sentry metadata.\n *\n * The wrapper looks up SDK state from its receiver, allowing one prototype function to serve every\n * instance. Calls without instance state use the original method directly, as do calls without RPC\n * metadata unless the instance opted into unconditional tracing. The original function name and\n * arity are preserved because frameworks may inspect them for dispatch.\n */\nfunction createRpcPrototypeWrapper(methodName: string, originalMethod: UncheckedMethod): UncheckedMethod {\n  const wrapper = function (this: unknown, ...args: unknown[]): unknown {\n    const state = isObjectLike(this) ? rpcInstanceStates.get(this) : undefined;\n\n    // Untraced calls are the common case — every internal call the instance makes to one of its\n    // own methods lands here too, and those never carry RPC metadata.\n    if (!state || (!state.alwaysTrace && !hasRpcMeta(args))) {\n      return Reflect.apply(originalMethod, this, args);\n    }\n\n    const tracedMethods = (state.tracedMethods ??= new Map());\n    let traced = tracedMethods.get(methodName);\n\n    if (!traced) {\n      traced = wrapMethodWithSentry(\n        {\n          options: state.options,\n          context: state.context,\n          spanName: methodName,\n          spanOp: 'rpc',\n          origin: 'auto.faas.cloudflare.durable_object',\n        },\n        originalMethod,\n        undefined,\n        true,\n      );\n      tracedMethods.set(methodName, traced);\n    }\n\n    return Reflect.apply(traced, this, args);\n  };\n\n  Object.defineProperties(wrapper, {\n    name: { value: originalMethod.name, configurable: true },\n    length: { value: originalMethod.length, configurable: true },\n  });\n\n  return wrapper as UncheckedMethod;\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  const InstrumentedClass = new Proxy(DurableObjectClass, {\n    construct(target, [ctx, env], newTarget) {\n      const { obj, options, context, frameworkManagedMethods } = constructInstrumentedDurableObject(\n        target,\n        ctx,\n        env,\n        newTarget,\n        optionsCallback,\n      );\n\n      return finalizeWithRpcInstrumentation(obj, options, context, frameworkManagedMethods);\n    },\n  });\n  // Recognizable for `_INTERNAL_wrapUnlessInstrumented`, so auto-instrumentation never nests wrappers.\n  markAsInstrumented(InstrumentedClass);\n  return InstrumentedClass;\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  const InstrumentedClass = new Proxy(AgentClass, {\n    construct(target, [ctx, env], newTarget) {\n      const { obj, options, context, frameworkManagedMethods } = 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. Methods the Agent\n      // framework installed itself are excluded too — `instrumentCloudflareAgent` traces those by\n      // wrapping the dispatch instead of the method.\n      return finalizeWithRpcInstrumentation(obj, options, context, frameworkManagedMethods);\n    },\n  });\n  markAsInstrumented(InstrumentedClass);\n  return InstrumentedClass;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"durableobject.js","sources":["../../src/durableobject.ts"],"sourcesContent":["/* eslint-disable max-lines */\n/* eslint-disable @typescript-eslint/unbound-method */\nimport { getDefaultIsolationScope, getIsolationScope, isObjectLike, startNewTrace } from '@sentry/core';\nimport type { DurableObject } from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { getInstrumented, markAsInstrumented } from './instrument';\nimport { instrumentDurableObjectHandlers } from './instrumentations/instrumentDurableObjectHandlers';\nimport { instrumentEnv } from './instrumentations/worker/instrumentEnv';\nimport { getFinalOptions } from './options';\nimport { instrumentContext } from './utils/instrumentContext';\nimport { hasRpcMeta } 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 * instrumentation — callers apply that last via {@link finalizeWithRpcInstrumentation}, after any\n * additional 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): {\n  obj: T;\n  options: CloudflareOptions;\n  context: InstrumentedDurableObjectContext;\n  frameworkManagedMethods: ReadonlySet<string>;\n} {\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  const prototype = (newTarget as unknown as { prototype?: object }).prototype ?? target.prototype;\n  const cachedFrameworkManagedMethods = frameworkManagedMethodsCache.get(prototype);\n  const methodsBeforeConstruction = cachedFrameworkManagedMethods ? undefined : resolvePrototypeMethods(prototype);\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  const frameworkManagedMethods = resolveFrameworkManagedMethods(\n    prototype,\n    obj,\n    methodsBeforeConstruction,\n    cachedFrameworkManagedMethods,\n  );\n\n  instrumentDurableObjectHandlers(obj, options, context);\n\n  return { obj, options, context, frameworkManagedMethods };\n}\n\nconst frameworkManagedMethodsCache = new WeakMap<object, ReadonlySet<string>>();\n\n/**\n * Collects the methods visible from a prototype, using normal property lookup precedence.\n * Methods inherited from `Object.prototype` are excluded because they cannot be Durable Object RPC methods.\n */\nfunction resolvePrototypeMethods(prototype: object | null): Map<string, unknown> {\n  const methods = new Map<string, unknown>();\n\n  for (let current = prototype; current && current !== Object.prototype; current = Object.getPrototypeOf(current)) {\n    for (const name of Object.getOwnPropertyNames(current)) {\n      // The first occurrence wins, mirroring what a property lookup on the instance would find\n      if (name === 'constructor' || methods.has(name)) {\n        continue;\n      }\n\n      const descriptor = Object.getOwnPropertyDescriptor(current, name);\n\n      if (descriptor && typeof descriptor.value === 'function') {\n        methods.set(name, descriptor.value);\n      }\n    }\n  }\n\n  return methods;\n}\n\n/**\n * Finds methods that a framework replaced while constructing the first instance.\n *\n * Some frameworks register methods by function identity, so replacing one of their wrappers would\n * break dispatch. The result is cached because frameworks commonly install their wrappers only\n * once; later constructions would no longer reveal which methods they manage.\n */\nfunction resolveFrameworkManagedMethods(\n  prototype: object,\n  obj: object,\n  methodsBeforeConstruction: Map<string, unknown> | undefined,\n  cached: ReadonlySet<string> | undefined,\n): ReadonlySet<string> {\n  if (cached) {\n    return cached;\n  }\n\n  const methodsAfterConstruction = resolvePrototypeMethods(Object.getPrototypeOf(obj) as object);\n  const managed = new Set<string>();\n\n  for (const [name, method] of methodsAfterConstruction) {\n    const before = methodsBeforeConstruction?.get(name);\n\n    if (before && before !== method) {\n      managed.add(name);\n    }\n  }\n\n  frameworkManagedMethodsCache.set(prototype, managed);\n\n  return managed;\n}\n\ntype RpcInstanceState = {\n  options: CloudflareOptions;\n  context: InstrumentedDurableObjectContext;\n  /**\n   * Whether to trace calls that carry no RPC metadata. Only the deprecated\n   * `instrumentPrototypeMethods` option does, because it predates metadata propagation.\n   */\n  alwaysTrace: boolean;\n  /** Per-instance cache of the instrumented method wrappers, keyed by method name. Created on first use. */\n  instrumentedMethods?: Map<string, UncheckedMethod>;\n};\n\n/**\n * Method names the runtime never dispatches over RPC, so wrapping them buys no tracing.\n *\n * Mirrors `isReservedName` in workerd (`src/workerd/api/worker-rpc.c++`): the runtime rejects these\n * before any property lookup happens. `fetch`, `alarm` and the `webSocket*` handlers are also\n * instrumented per-instance as own properties, and `constructor` is on every prototype.\n */\nconst RESERVED_RPC_METHOD_NAMES: ReadonlySet<string> = new Set([\n  'constructor',\n  'fetch',\n  'connect',\n  'alarm',\n  'webSocketMessage',\n  'webSocketClose',\n  'webSocketError',\n  'dup',\n]);\n\n// Prototype wrappers are shared by all instances, while SDK options and traced method caches are not.\nconst rpcInstanceStates = new WeakMap<object, RpcInstanceState>();\n\n/**\n * Instruments a constructed Durable Object's RPC methods.\n *\n * RPC methods are wrapped on the prototype because Cloudflare dispatches them with the Durable\n * Object instance as the receiver. This preserves native private-field access and keeps the methods\n * visible to Cloudflare's RPC dispatcher. Built-in handlers, Agent handlers, and methods managed by\n * another framework are left untouched.\n *\n * Call this after all per-instance instrumentation has been applied. If RPC trace propagation is\n * disabled, the object is returned unchanged.\n *\n * @param obj The constructed Durable Object instance.\n * @param options The resolved SDK options for this instance.\n * @param context The instrumented execution context for this instance.\n * @param excludedMethods Method names owned by another framework and therefore not safe to wrap.\n * @returns The same Durable Object instance, with eligible prototype methods instrumented.\n * @internal\n */\nexport function finalizeWithRpcInstrumentation<T extends object>(\n  obj: T,\n  options: CloudflareOptions,\n  context: InstrumentedDurableObjectContext,\n  excludedMethods?: ReadonlySet<string>,\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 allowedMethods = Array.isArray(options.instrumentPrototypeMethods)\n    ? // eslint-disable-next-line typescript/no-deprecated\n      new Set(options.instrumentPrototypeMethods)\n    : undefined;\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  // eslint-disable-next-line typescript/no-deprecated\n  const alwaysTrace = options.enableRpcTracePropagation === undefined;\n\n  rpcInstanceStates.set(obj, { options, context, alwaysTrace });\n\n  instrumentPrototypeRpcMethods(obj, excludedMethods, allowedMethods);\n\n  return obj;\n}\n\n/**\n * Returns a prototype method when it is eligible for RPC instrumentation.\n */\nfunction getRpcMethodDescriptor(\n  obj: object,\n  prototype: object,\n  methodName: string,\n  excludedMethods?: ReadonlySet<string>,\n  allowedMethods?: ReadonlySet<string>,\n): PropertyDescriptor | undefined {\n  if (\n    RESERVED_RPC_METHOD_NAMES.has(methodName) ||\n    Object.prototype.hasOwnProperty.call(obj, methodName) ||\n    excludedMethods?.has(methodName) ||\n    (allowedMethods && !allowedMethods.has(methodName))\n  ) {\n    return undefined;\n  }\n\n  const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);\n\n  if (!descriptor || typeof descriptor.value !== 'function' || getInstrumented(descriptor.value)) {\n    return undefined;\n  }\n\n  return descriptor;\n}\n\n/**\n * Wraps eligible methods on the instance's prototype chain once per class.\n *\n * Because the wrappers live on the prototype, the allow-list of the first constructed instance\n * decides which methods carry a wrapper for every later instance of that class. This only affects\n * the deprecated array form of `instrumentPrototypeMethods`, where differing options per instance\n * of the same class were never a supported configuration.\n */\nfunction instrumentPrototypeRpcMethods(\n  obj: object,\n  excludedMethods?: ReadonlySet<string>,\n  allowedMethods?: ReadonlySet<string>,\n): void {\n  let prototype: object | null = Object.getPrototypeOf(obj);\n\n  while (prototype && prototype !== Object.prototype) {\n    for (const methodName of Object.getOwnPropertyNames(prototype)) {\n      const descriptor = getRpcMethodDescriptor(obj, prototype, methodName, excludedMethods, allowedMethods);\n\n      if (!descriptor) {\n        continue;\n      }\n\n      const wrapped = createRpcPrototypeWrapper(methodName, descriptor.value as UncheckedMethod);\n\n      try {\n        Object.defineProperty(prototype, methodName, { ...descriptor, value: wrapped });\n      } catch {}\n\n      // Only the wrapper is marked, not the original method: `wrapMethodWithSentry` resolves\n      // through the same global map and must not resolve the original to this wrapper,\n      // which would recurse.\n      markAsInstrumented(wrapped);\n    }\n\n    prototype = Object.getPrototypeOf(prototype);\n  }\n}\n\n/**\n * Returns the instance's instrumented wrapper for an RPC method, creating it on first use.\n */\nfunction getInstrumentedRpcMethod(\n  state: RpcInstanceState,\n  methodName: string,\n  originalMethod: UncheckedMethod,\n): UncheckedMethod {\n  const instrumentedMethods = (state.instrumentedMethods ??= new Map());\n  let instrumented = instrumentedMethods.get(methodName);\n\n  if (!instrumented) {\n    instrumented = wrapMethodWithSentry(\n      {\n        options: state.options,\n        context: state.context,\n        spanName: state.alwaysTrace ? methodName : rpcMeta => (rpcMeta ? methodName : undefined),\n        spanOp: 'rpc',\n        origin: 'auto.faas.cloudflare.durable_object',\n      },\n      originalMethod,\n      undefined,\n      true,\n    );\n    instrumentedMethods.set(methodName, instrumented);\n  }\n\n  return instrumented;\n}\n\n/**\n * Creates a prototype wrapper that instruments external RPC calls.\n *\n * The wrapper looks up SDK state from its receiver, allowing one prototype function to serve every\n * instance. A call carrying Sentry metadata continues that trace in an `rpc` span. A call without it\n * still gets a client, so its errors, logs and metrics are captured, but no span. Calls the instance\n * makes to its own methods run the original method directly. With the deprecated\n * `instrumentPrototypeMethods` option, every call gets an `rpc` span instead. The original function\n * name and arity are preserved because frameworks may inspect them for dispatch.\n */\nfunction createRpcPrototypeWrapper(methodName: string, originalMethod: UncheckedMethod): UncheckedMethod {\n  const wrapper = function (this: unknown, ...args: unknown[]): unknown {\n    const state = isObjectLike(this) ? rpcInstanceStates.get(this) : undefined;\n\n    if (!state) {\n      return Reflect.apply(originalMethod, this, args);\n    }\n\n    if (state.alwaysTrace || hasRpcMeta(args)) {\n      return Reflect.apply(getInstrumentedRpcMethod(state, methodName, originalMethod), this, args);\n    }\n\n    // workerd dispatches an incoming RPC call outside any async context, so a call made while an\n    // invocation is already in flight comes from the instance itself (`this.helper()` inside\n    // `fetch`, `alarm` or another RPC method).\n    if (getIsolationScope() !== getDefaultIsolationScope()) {\n      return Reflect.apply(originalMethod, this, args);\n    }\n\n    const instrumented = getInstrumentedRpcMethod(state, methodName, originalMethod);\n\n    // Unlike a WorkerEntrypoint, a Durable Object instance is long-lived and serves overlapping\n    // calls. Without a new trace, every untraced call would share the trace of the default scope.\n    return startNewTrace(() => Reflect.apply(instrumented, this, args));\n  };\n\n  Object.defineProperties(wrapper, {\n    name: { value: originalMethod.name, configurable: true },\n    length: { value: originalMethod.length, configurable: true },\n  });\n\n  return wrapper as UncheckedMethod;\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. An\n * incoming trace then continues into them, and errors, logs and metrics are captured whether or not\n * the caller propagates a trace.\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  const InstrumentedClass = new Proxy(DurableObjectClass, {\n    construct(target, [ctx, env], newTarget) {\n      const { obj, options, context, frameworkManagedMethods } = constructInstrumentedDurableObject(\n        target,\n        ctx,\n        env,\n        newTarget,\n        optionsCallback,\n      );\n\n      return finalizeWithRpcInstrumentation(obj, options, context, frameworkManagedMethods);\n    },\n  });\n  // Recognizable for `_INTERNAL_wrapUnlessInstrumented`, so auto-instrumentation never nests wrappers.\n  markAsInstrumented(InstrumentedClass);\n  return InstrumentedClass;\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  const InstrumentedClass = new Proxy(AgentClass, {\n    construct(target, [ctx, env], newTarget) {\n      const { obj, options, context, frameworkManagedMethods } = 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. Methods the Agent\n      // framework installed itself are excluded too — `instrumentCloudflareAgent` traces those by\n      // wrapping the dispatch instead of the method.\n      return finalizeWithRpcInstrumentation(obj, options, context, frameworkManagedMethods);\n    },\n  });\n  markAsInstrumented(InstrumentedClass);\n  return InstrumentedClass;\n}\n"],"names":[],"mappings":"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"}

package/build/esm/instrumentations/instrumentDurableObjectNamespace.js

@@ -15,6 +15,12 @@ function instrumentDurableObjectNamespace(namespace, propagateRpcTrace = false)
           return instrumentDurableObjectStub(stub, propagateRpcTrace);
         };
       }
+      if (prop === "jurisdiction") {
+        return function(...args) {
+          const subnamespace = Reflect.apply(value, target, args);
+          return instrumentDurableObjectNamespace(subnamespace, propagateRpcTrace);
+        };
+      }
       return value.bind(target);
     }
   });

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

@@ -1 +1 @@
-{"version":3,"file":"instrumentDurableObjectNamespace.js","sources":["../../../src/instrumentations/instrumentDurableObjectNamespace.ts"],"sourcesContent":["import type { DurableObjectNamespace, DurableObjectStub } from '@cloudflare/workers-types';\nimport { appendRpcMeta } from '../utils/rpcMeta';\nimport { instrumentFetcher } from './worker/instrumentFetcher';\n\n// Built-in DurableObjectStub methods that are not RPC calls.\nexport const STUB_NON_RPC_METHODS = new Set(['fetch', 'connect', 'dup']);\n\n/**\n * Instruments a DurableObjectNamespace binding to create spans for DO interactions.\n *\n * Wraps:\n * - `namespace.get(id)` / `namespace.getByName(name)` with a span + instruments returned stub\n * - `namespace.idFromName(name)` / `namespace.idFromString(id)` / `namespace.newUniqueId()` with breadcrumbs\n *\n * @param namespace - The DurableObjectNamespace to instrument\n * @param propagateRpcTrace - Whether RPC method calls on the returned stubs carry trace context\n */\nexport function instrumentDurableObjectNamespace(\n  namespace: DurableObjectNamespace,\n  propagateRpcTrace = false,\n): DurableObjectNamespace {\n  return new Proxy(namespace, {\n    get(target, prop, _receiver) {\n      const value = Reflect.get(target, prop) as unknown;\n\n      if (typeof value !== 'function') {\n        return value;\n      }\n\n      if (prop === 'get' || prop === 'getByName') {\n        return function (this: unknown, ...args: unknown[]) {\n          const stub = Reflect.apply(value, target, args);\n\n          return instrumentDurableObjectStub(stub, propagateRpcTrace);\n        };\n      }\n\n      return value.bind(target);\n    },\n  });\n}\n\n/**\n * Instruments a DurableObjectStub to create spans for outgoing fetch calls\n * and propagate trace context across RPC calls.\n *\n * @param stub - The DurableObjectStub to instrument\n * @param propagateRpcTrace - Whether RPC method calls carry trace context\n */\nfunction instrumentDurableObjectStub(stub: DurableObjectStub, propagateRpcTrace: boolean): DurableObjectStub {\n  return new Proxy(stub, {\n    get(target, prop) {\n      const value = Reflect.get(target, prop);\n\n      if (prop === 'fetch' && typeof value === 'function') {\n        return instrumentFetcher((...args) => Reflect.apply(value, target, args));\n      }\n\n      if (\n        propagateRpcTrace &&\n        typeof value === 'function' &&\n        typeof prop === 'string' &&\n        !STUB_NON_RPC_METHODS.has(prop)\n      ) {\n        return (...args: unknown[]) => Reflect.apply(value, target, appendRpcMeta(args));\n      }\n\n      return value;\n    },\n  });\n}\n"],"names":[],"mappings":";;;AAKO,MAAM,uCAAuB,IAAI,GAAA,CAAI,CAAC,OAAA,EAAS,SAAA,EAAW,KAAK,CAAC;AAYhE,SAAS,gCAAA,CACd,SAAA,EACA,iBAAA,GAAoB,KAAA,EACI;AACxB,EAAA,OAAO,IAAI,MAAM,SAAA,EAAW;AAAA,IAC1B,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAC3B,MAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,IAAI,CAAA;AAEtC,MAAA,IAAI,OAAO,UAAU,UAAA,EAAY;AAC/B,QAAA,OAAO,KAAA;AAAA,MACT;AAEA,MAAA,IAAI,IAAA,KAAS,KAAA,IAAS,IAAA,KAAS,WAAA,EAAa;AAC1C,QAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,UAAA,MAAM,IAAA,GAAO,OAAA,CAAQ,KAAA,CAAM,KAAA,EAAO,QAAQ,IAAI,CAAA;AAE9C,UAAA,OAAO,2BAAA,CAA4B,MAAM,iBAAiB,CAAA;AAAA,QAC5D,CAAA;AAAA,MACF;AAEA,MAAA,OAAO,KAAA,CAAM,KAAK,MAAM,CAAA;AAAA,IAC1B;AAAA,GACD,CAAA;AACH;AASA,SAAS,2BAAA,CAA4B,MAAyB,iBAAA,EAA+C;AAC3G,EAAA,OAAO,IAAI,MAAM,IAAA,EAAM;AAAA,IACrB,GAAA,CAAI,QAAQ,IAAA,EAAM;AAChB,MAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,IAAI,CAAA;AAEtC,MAAA,IAAI,IAAA,KAAS,OAAA,IAAW,OAAO,KAAA,KAAU,UAAA,EAAY;AACnD,QAAA,OAAO,iBAAA,CAAkB,IAAI,IAAA,KAAS,OAAA,CAAQ,MAAM,KAAA,EAAO,MAAA,EAAQ,IAAI,CAAC,CAAA;AAAA,MAC1E;AAEA,MAAA,IACE,iBAAA,IACA,OAAO,KAAA,KAAU,UAAA,IACjB,OAAO,IAAA,KAAS,QAAA,IAChB,CAAC,oBAAA,CAAqB,GAAA,CAAI,IAAI,CAAA,EAC9B;AACA,QAAA,OAAO,CAAA,GAAI,SAAoB,OAAA,CAAQ,KAAA,CAAM,OAAO,MAAA,EAAQ,aAAA,CAAc,IAAI,CAAC,CAAA;AAAA,MACjF;AAEA,MAAA,OAAO,KAAA;AAAA,IACT;AAAA,GACD,CAAA;AACH;;;;"}
+{"version":3,"file":"instrumentDurableObjectNamespace.js","sources":["../../../src/instrumentations/instrumentDurableObjectNamespace.ts"],"sourcesContent":["import type { DurableObjectNamespace, DurableObjectStub } from '@cloudflare/workers-types';\nimport { appendRpcMeta } from '../utils/rpcMeta';\nimport { instrumentFetcher } from './worker/instrumentFetcher';\n\n// Built-in DurableObjectStub methods that are not RPC calls.\nexport const STUB_NON_RPC_METHODS = new Set(['fetch', 'connect', 'dup']);\n\n/**\n * Instruments a DurableObjectNamespace binding to create spans for DO interactions.\n *\n * Wraps:\n * - `namespace.get(id)` / `namespace.getByName(name)` with a span + instruments returned stub\n * - `namespace.jurisdiction(name)` by instrumenting the returned namespace the same way\n * - `namespace.idFromName(name)` / `namespace.idFromString(id)` / `namespace.newUniqueId()` with breadcrumbs\n *\n * @param namespace - The DurableObjectNamespace to instrument\n * @param propagateRpcTrace - Whether RPC method calls on the returned stubs carry trace context\n */\nexport function instrumentDurableObjectNamespace(\n  namespace: DurableObjectNamespace,\n  propagateRpcTrace = false,\n): DurableObjectNamespace {\n  return new Proxy(namespace, {\n    get(target, prop, _receiver) {\n      const value = Reflect.get(target, prop) as unknown;\n\n      if (typeof value !== 'function') {\n        return value;\n      }\n\n      if (prop === 'get' || prop === 'getByName') {\n        return function (this: unknown, ...args: unknown[]) {\n          const stub = Reflect.apply(value, target, args);\n\n          return instrumentDurableObjectStub(stub, propagateRpcTrace);\n        };\n      }\n\n      if (prop === 'jurisdiction') {\n        return function (this: unknown, ...args: unknown[]) {\n          const subnamespace = Reflect.apply(value, target, args);\n\n          return instrumentDurableObjectNamespace(subnamespace, propagateRpcTrace);\n        };\n      }\n\n      return value.bind(target);\n    },\n  });\n}\n\n/**\n * Instruments a DurableObjectStub to create spans for outgoing fetch calls\n * and propagate trace context across RPC calls.\n *\n * @param stub - The DurableObjectStub to instrument\n * @param propagateRpcTrace - Whether RPC method calls carry trace context\n */\nfunction instrumentDurableObjectStub(stub: DurableObjectStub, propagateRpcTrace: boolean): DurableObjectStub {\n  return new Proxy(stub, {\n    get(target, prop) {\n      const value = Reflect.get(target, prop);\n\n      if (prop === 'fetch' && typeof value === 'function') {\n        return instrumentFetcher((...args) => Reflect.apply(value, target, args));\n      }\n\n      if (\n        propagateRpcTrace &&\n        typeof value === 'function' &&\n        typeof prop === 'string' &&\n        !STUB_NON_RPC_METHODS.has(prop)\n      ) {\n        return (...args: unknown[]) => Reflect.apply(value, target, appendRpcMeta(args));\n      }\n\n      return value;\n    },\n  });\n}\n"],"names":[],"mappings":";;;AAKO,MAAM,uCAAuB,IAAI,GAAA,CAAI,CAAC,OAAA,EAAS,SAAA,EAAW,KAAK,CAAC;AAahE,SAAS,gCAAA,CACd,SAAA,EACA,iBAAA,GAAoB,KAAA,EACI;AACxB,EAAA,OAAO,IAAI,MAAM,SAAA,EAAW;AAAA,IAC1B,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAC3B,MAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,IAAI,CAAA;AAEtC,MAAA,IAAI,OAAO,UAAU,UAAA,EAAY;AAC/B,QAAA,OAAO,KAAA;AAAA,MACT;AAEA,MAAA,IAAI,IAAA,KAAS,KAAA,IAAS,IAAA,KAAS,WAAA,EAAa;AAC1C,QAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,UAAA,MAAM,IAAA,GAAO,OAAA,CAAQ,KAAA,CAAM,KAAA,EAAO,QAAQ,IAAI,CAAA;AAE9C,UAAA,OAAO,2BAAA,CAA4B,MAAM,iBAAiB,CAAA;AAAA,QAC5D,CAAA;AAAA,MACF;AAEA,MAAA,IAAI,SAAS,cAAA,EAAgB;AAC3B,QAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,UAAA,MAAM,YAAA,GAAe,OAAA,CAAQ,KAAA,CAAM,KAAA,EAAO,QAAQ,IAAI,CAAA;AAEtD,UAAA,OAAO,gCAAA,CAAiC,cAAc,iBAAiB,CAAA;AAAA,QACzE,CAAA;AAAA,MACF;AAEA,MAAA,OAAO,KAAA,CAAM,KAAK,MAAM,CAAA;AAAA,IAC1B;AAAA,GACD,CAAA;AACH;AASA,SAAS,2BAAA,CAA4B,MAAyB,iBAAA,EAA+C;AAC3G,EAAA,OAAO,IAAI,MAAM,IAAA,EAAM;AAAA,IACrB,GAAA,CAAI,QAAQ,IAAA,EAAM;AAChB,MAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,IAAI,CAAA;AAEtC,MAAA,IAAI,IAAA,KAAS,OAAA,IAAW,OAAO,KAAA,KAAU,UAAA,EAAY;AACnD,QAAA,OAAO,iBAAA,CAAkB,IAAI,IAAA,KAAS,OAAA,CAAQ,MAAM,KAAA,EAAO,MAAA,EAAQ,IAAI,CAAC,CAAA;AAAA,MAC1E;AAEA,MAAA,IACE,iBAAA,IACA,OAAO,KAAA,KAAU,UAAA,IACjB,OAAO,IAAA,KAAS,QAAA,IAChB,CAAC,oBAAA,CAAqB,GAAA,CAAI,IAAI,CAAA,EAC9B;AACA,QAAA,OAAO,CAAA,GAAI,SAAoB,OAAA,CAAQ,KAAA,CAAM,OAAO,MAAA,EAAQ,aAAA,CAAc,IAAI,CAAC,CAAA;AAAA,MACjF;AAEA,MAAA,OAAO,KAAA;AAAA,IACT;AAAA,GACD,CAAA;AACH;;;;"}

package/build/esm/package.json

@@ -1 +1 @@
-{"type":"module","version":"10.74.0","sideEffects":false}
+{"type":"module","version":"10.75.1","sideEffects":false}

package/build/esm/wrapMethodWithSentry.js

@@ -31,6 +31,7 @@ function wrapMethodWithSentry(wrapperOptions, handler, callback, noMark) {
           args = extracted.args;
           rpcMeta = extracted.rpcMeta;
         }
+        const spanName = typeof wrapperOptions.spanName === "function" ? wrapperOptions.spanName(rpcMeta) : wrapperOptions.spanName;
         const wrappedFunction = (scope) => {
           const context = wrapperOptions.context;
           const waitUntil = context ? getOriginalWaitUntil(context)?.bind(context) : void 0;
@@ -45,7 +46,7 @@ function wrapMethodWithSentry(wrapperOptions, handler, callback, noMark) {
             scopeClient = client;
           }
           const clientToDispose = scopeClient;
-          const methodName = wrapperOptions.spanName || "unknown";
+          const methodName = spanName || "unknown";
           const teardown = async () => {
             if (startNewTrace$1 && storage) {
               storeSpanContext(storage, methodName);
@@ -66,7 +67,7 @@ function wrapMethodWithSentry(wrapperOptions, handler, callback, noMark) {
             waitUntil?.(teardown());
             throw e;
           };
-          if (!wrapperOptions.spanName) {
+          if (!spanName) {
             try {
               if (callback) {
                 callback(...args);

package/build/esm/wrapMethodWithSentry.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapMethodWithSentry.js","sources":["../../src/wrapMethodWithSentry.ts"],"sourcesContent":["import type { DurableObjectStorage } from '@cloudflare/workers-types';\nimport type { SerializedTraceData } from '@sentry/core';\nimport {\n  isObjectLike,\n  captureException,\n  continueTrace,\n  isThenable,\n  type Scope,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  startNewTrace as startNewTraceCore,\n  startSpan,\n} from '@sentry/core';\nimport type { CloudflareOptions } from './client';\nimport type { ExecutionContextCompat } from './executionContext';\nimport { flushAndDispose, getOriginalWaitUntil } from './flush';\nimport { ensureInstrumented } from './instrument';\nimport { init } from './sdk';\nimport { withInvocationIsolationScope } from './utils/invocationScope';\nimport { extractRpcMeta } from './utils/rpcMeta';\nimport { buildSpanLinks, getStoredSpanContext, storeSpanContext } from './utils/traceLinks';\n\n/** Extended DurableObjectState with originalStorage exposed by instrumentContext */\nexport interface InstrumentedDurableObjectState extends DurableObjectState {\n  originalStorage?: DurableObjectStorage;\n}\n\n/**\n * Resolves uninstrumented DO storage for the current invocation.\n * Prefer `thisArg.ctx` (the live Durable Object instance) over the context captured at\n * construction time to avoid cross-DO I/O errors in the same isolate.\n */\nfunction resolveOriginalStorage(\n  context: ExecutionContext | InstrumentedDurableObjectState | undefined,\n  thisArg: unknown,\n): DurableObjectStorage | undefined {\n  if (isObjectLike(thisArg) && 'ctx' in thisArg) {\n    const doCtx = (thisArg as { ctx: InstrumentedDurableObjectState }).ctx;\n    if (doCtx?.originalStorage) {\n      return doCtx.originalStorage;\n    }\n  }\n\n  if (context && 'originalStorage' in context && context.originalStorage) {\n    return context.originalStorage;\n  }\n\n  return undefined;\n}\n\ntype MethodWrapperOptions = {\n  spanName?: string;\n  spanOp?: string;\n  options: CloudflareOptions;\n  context: ExecutionContext | InstrumentedDurableObjectState;\n  /**\n   * If true, starts a fresh trace instead of inheriting from a parent trace.\n   * Useful for scheduled/independent invocations like alarms.\n   *\n   * If true, it also stores the current span context and links to the previous invocation's span.\n   * Uses Durable Object storage to persist the link. The link is set asynchronously via `span.addLinks()`\n   * in a `waitUntil` to avoid blocking.\n   *\n   * @default false\n   */\n  startNewTrace?: boolean;\n  /**\n   * The trace origin identifying which instrumentation created the span, e.g. `auto.faas.cloudflare.durable_object`.\n   * Used both as the span's `sentry.origin` attribute and as the `mechanism.type` for captured exceptions.\n   */\n  origin: string;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type UncheckedMethod = (...args: any[]) => any;\ntype OriginalMethod = UncheckedMethod;\n\n/**\n * Wraps a method with Sentry error tracking and optional tracing.\n * Supports starting new traces and linking to previous invocations via Durable Object storage.\n *\n * @param wrapperOptions - The options for the wrapper.\n * @param handler - The method to wrap.\n * @param callback - The callback to call.\n * @param noMark - Whether to mark the method as instrumented.\n * @returns The wrapped method.\n */\nexport function wrapMethodWithSentry<T extends OriginalMethod>(\n  wrapperOptions: MethodWrapperOptions,\n  handler: T,\n  callback?: (...args: Parameters<T>) => void,\n  noMark?: true,\n): T {\n  return ensureInstrumented(\n    handler,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, rawArgs: Parameters<T>) {\n          const { startNewTrace, origin } = wrapperOptions;\n\n          // For RPC methods, extract Sentry trace context from the trailing argument.\n          // The caller side (instrumentDurableObjectStub / JSRPC proxy) appends it;\n          // we strip it here so the user's method never sees it.\n          let args = rawArgs;\n          let rpcMeta: SerializedTraceData | undefined;\n\n          if (wrapperOptions.spanOp === 'rpc') {\n            const extracted = extractRpcMeta(rawArgs);\n            args = extracted.args;\n            rpcMeta = extracted.rpcMeta;\n          }\n\n          const wrappedFunction = (scope: Scope): unknown | Promise<unknown> => {\n            // In certain situations, the passed context can become undefined.\n            // For example, for Astro while prerendering pages at build time.\n            // see: https://github.com/getsentry/sentry-javascript/issues/13217\n            const context: typeof wrapperOptions.context | undefined = wrapperOptions.context;\n\n            // see: https://github.com/getsentry/sentry-javascript/issues/22328\n            const waitUntil = context\n              ? getOriginalWaitUntil(context as ExecutionContextCompat)?.bind(context)\n              : undefined;\n            const storage = resolveOriginalStorage(context, thisArg);\n\n            let scopeClient = scope.getClient();\n            // Check if client exists AND is still usable (transport not disposed)\n            // This handles the case where a previous handler disposed the client\n            // but the scope still holds a reference to it (e.g., alarm handlers in Durable Objects)\n            // For startNewTrace, always create a fresh client\n            if (startNewTrace || !scopeClient?.getTransport()) {\n              const client = init({\n                ...wrapperOptions.options,\n                ctx: context as unknown as ExecutionContext | undefined,\n              });\n              scope.setClient(client);\n              scopeClient = client;\n            }\n\n            const clientToDispose = scopeClient;\n            const methodName = wrapperOptions.spanName || 'unknown';\n\n            const teardown = async (): Promise<void> => {\n              if (startNewTrace && storage) {\n                storeSpanContext(storage, methodName);\n              }\n              await flushAndDispose(clientToDispose);\n            };\n\n            const onFulfilled = (res: unknown) => {\n              waitUntil?.(teardown());\n              return res;\n            };\n\n            const onRejected = (e: unknown) => {\n              captureException(e, {\n                mechanism: {\n                  type: origin,\n                  handled: false,\n                },\n              });\n              waitUntil?.(teardown());\n              throw e;\n            };\n\n            if (!wrapperOptions.spanName) {\n              try {\n                if (callback) {\n                  callback(...args);\n                }\n\n                const result = Reflect.apply(target, thisArg, args);\n\n                if (isThenable(result)) {\n                  return result.then(onFulfilled, onRejected);\n                } else {\n                  return onFulfilled(result);\n                }\n              } catch (e) {\n                return onRejected(e);\n              }\n            }\n\n            const attributes = wrapperOptions.spanOp\n              ? {\n                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: origin,\n                }\n              : {};\n\n            const executeSpan = (): unknown => {\n              return startSpan({ name: methodName, attributes }, span => {\n                if (startNewTrace && storage) {\n                  const storedContext = getStoredSpanContext(storage, methodName);\n\n                  if (storedContext) {\n                    span.addLinks(buildSpanLinks(storedContext));\n                    // TODO: Remove this once EAP can store span links. We currently only set this attribute so that we\n                    // can obtain the previous trace information from the EAP store. Long-term, EAP will handle\n                    // span links and then we should remove this again. Also throwing in a TODO(v11), to remind us\n                    // to check this at v11 time :)\n                    const sampledFlag = storedContext.sampled ? '1' : '0';\n                    span.setAttribute(\n                      'sentry.previous_trace',\n                      `${storedContext.traceId}-${storedContext.spanId}-${sampledFlag}`,\n                    );\n                  }\n                }\n\n                try {\n                  const result = Reflect.apply(target, thisArg, args);\n\n                  if (isThenable(result)) {\n                    return result.then(onFulfilled, onRejected);\n                  } else {\n                    return onFulfilled(result);\n                  }\n                } catch (e) {\n                  return onRejected(e);\n                }\n              });\n            };\n\n            if (rpcMeta) {\n              return continueTrace(\n                { sentryTrace: rpcMeta['sentry-trace'] || '', baggage: rpcMeta.baggage || '' },\n                executeSpan,\n              );\n            }\n\n            if (startNewTrace) {\n              return startNewTraceCore(() => executeSpan());\n            }\n\n            return executeSpan();\n          };\n\n          return withInvocationIsolationScope(wrappedFunction);\n        },\n      }),\n    noMark,\n  );\n}\n"],"names":["startNewTrace","startNewTraceCore"],"mappings":"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"}
+{"version":3,"file":"wrapMethodWithSentry.js","sources":["../../src/wrapMethodWithSentry.ts"],"sourcesContent":["import type { DurableObjectStorage } from '@cloudflare/workers-types';\nimport type { SerializedTraceData } from '@sentry/core';\nimport {\n  isObjectLike,\n  captureException,\n  continueTrace,\n  isThenable,\n  type Scope,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  startNewTrace as startNewTraceCore,\n  startSpan,\n} from '@sentry/core';\nimport type { CloudflareOptions } from './client';\nimport type { ExecutionContextCompat } from './executionContext';\nimport { flushAndDispose, getOriginalWaitUntil } from './flush';\nimport { ensureInstrumented } from './instrument';\nimport { init } from './sdk';\nimport { withInvocationIsolationScope } from './utils/invocationScope';\nimport { extractRpcMeta } from './utils/rpcMeta';\nimport { buildSpanLinks, getStoredSpanContext, storeSpanContext } from './utils/traceLinks';\n\n/** Extended DurableObjectState with originalStorage exposed by instrumentContext */\nexport interface InstrumentedDurableObjectState extends DurableObjectState {\n  originalStorage?: DurableObjectStorage;\n}\n\n/**\n * Resolves uninstrumented DO storage for the current invocation.\n * Prefer `thisArg.ctx` (the live Durable Object instance) over the context captured at\n * construction time to avoid cross-DO I/O errors in the same isolate.\n */\nfunction resolveOriginalStorage(\n  context: ExecutionContext | InstrumentedDurableObjectState | undefined,\n  thisArg: unknown,\n): DurableObjectStorage | undefined {\n  if (isObjectLike(thisArg) && 'ctx' in thisArg) {\n    const doCtx = (thisArg as { ctx: InstrumentedDurableObjectState }).ctx;\n    if (doCtx?.originalStorage) {\n      return doCtx.originalStorage;\n    }\n  }\n\n  if (context && 'originalStorage' in context && context.originalStorage) {\n    return context.originalStorage;\n  }\n\n  return undefined;\n}\n\ntype MethodWrapperOptions = {\n  /**\n   * The span name, or a resolver called with the RPC metadata of the current call.\n   * Returning `undefined` skips the span and only captures errors.\n   */\n  spanName?: string | ((rpcMeta: SerializedTraceData | undefined) => string | undefined);\n  spanOp?: string;\n  options: CloudflareOptions;\n  context: ExecutionContext | InstrumentedDurableObjectState;\n  /**\n   * If true, starts a fresh trace instead of inheriting from a parent trace.\n   * Useful for scheduled/independent invocations like alarms.\n   *\n   * If true, it also stores the current span context and links to the previous invocation's span.\n   * Uses Durable Object storage to persist the link. The link is set asynchronously via `span.addLinks()`\n   * in a `waitUntil` to avoid blocking.\n   *\n   * @default false\n   */\n  startNewTrace?: boolean;\n  /**\n   * The trace origin identifying which instrumentation created the span, e.g. `auto.faas.cloudflare.durable_object`.\n   * Used both as the span's `sentry.origin` attribute and as the `mechanism.type` for captured exceptions.\n   */\n  origin: string;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type UncheckedMethod = (...args: any[]) => any;\ntype OriginalMethod = UncheckedMethod;\n\n/**\n * Wraps a method with Sentry error tracking and optional tracing.\n * Supports starting new traces and linking to previous invocations via Durable Object storage.\n *\n * @param wrapperOptions - The options for the wrapper.\n * @param handler - The method to wrap.\n * @param callback - The callback to call.\n * @param noMark - Whether to mark the method as instrumented.\n * @returns The wrapped method.\n */\nexport function wrapMethodWithSentry<T extends OriginalMethod>(\n  wrapperOptions: MethodWrapperOptions,\n  handler: T,\n  callback?: (...args: Parameters<T>) => void,\n  noMark?: true,\n): T {\n  return ensureInstrumented(\n    handler,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, rawArgs: Parameters<T>) {\n          const { startNewTrace, origin } = wrapperOptions;\n\n          // For RPC methods, extract Sentry trace context from the trailing argument.\n          // The caller side (instrumentDurableObjectStub / JSRPC proxy) appends it;\n          // we strip it here so the user's method never sees it.\n          let args = rawArgs;\n          let rpcMeta: SerializedTraceData | undefined;\n\n          if (wrapperOptions.spanOp === 'rpc') {\n            const extracted = extractRpcMeta(rawArgs);\n            args = extracted.args;\n            rpcMeta = extracted.rpcMeta;\n          }\n\n          const spanName =\n            typeof wrapperOptions.spanName === 'function' ? wrapperOptions.spanName(rpcMeta) : wrapperOptions.spanName;\n\n          const wrappedFunction = (scope: Scope): unknown | Promise<unknown> => {\n            // In certain situations, the passed context can become undefined.\n            // For example, for Astro while prerendering pages at build time.\n            // see: https://github.com/getsentry/sentry-javascript/issues/13217\n            const context: typeof wrapperOptions.context | undefined = wrapperOptions.context;\n\n            // see: https://github.com/getsentry/sentry-javascript/issues/22328\n            const waitUntil = context\n              ? getOriginalWaitUntil(context as ExecutionContextCompat)?.bind(context)\n              : undefined;\n            const storage = resolveOriginalStorage(context, thisArg);\n\n            let scopeClient = scope.getClient();\n            // Check if client exists AND is still usable (transport not disposed)\n            // This handles the case where a previous handler disposed the client\n            // but the scope still holds a reference to it (e.g., alarm handlers in Durable Objects)\n            // For startNewTrace, always create a fresh client\n            if (startNewTrace || !scopeClient?.getTransport()) {\n              const client = init({\n                ...wrapperOptions.options,\n                ctx: context as unknown as ExecutionContext | undefined,\n              });\n              scope.setClient(client);\n              scopeClient = client;\n            }\n\n            const clientToDispose = scopeClient;\n            const methodName = spanName || 'unknown';\n\n            const teardown = async (): Promise<void> => {\n              if (startNewTrace && storage) {\n                storeSpanContext(storage, methodName);\n              }\n              await flushAndDispose(clientToDispose);\n            };\n\n            const onFulfilled = (res: unknown) => {\n              waitUntil?.(teardown());\n              return res;\n            };\n\n            const onRejected = (e: unknown) => {\n              captureException(e, {\n                mechanism: {\n                  type: origin,\n                  handled: false,\n                },\n              });\n              waitUntil?.(teardown());\n              throw e;\n            };\n\n            if (!spanName) {\n              try {\n                if (callback) {\n                  callback(...args);\n                }\n\n                const result = Reflect.apply(target, thisArg, args);\n\n                if (isThenable(result)) {\n                  return result.then(onFulfilled, onRejected);\n                } else {\n                  return onFulfilled(result);\n                }\n              } catch (e) {\n                return onRejected(e);\n              }\n            }\n\n            const attributes = wrapperOptions.spanOp\n              ? {\n                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: origin,\n                }\n              : {};\n\n            const executeSpan = (): unknown => {\n              return startSpan({ name: methodName, attributes }, span => {\n                if (startNewTrace && storage) {\n                  const storedContext = getStoredSpanContext(storage, methodName);\n\n                  if (storedContext) {\n                    span.addLinks(buildSpanLinks(storedContext));\n                    // TODO: Remove this once EAP can store span links. We currently only set this attribute so that we\n                    // can obtain the previous trace information from the EAP store. Long-term, EAP will handle\n                    // span links and then we should remove this again. Also throwing in a TODO(v11), to remind us\n                    // to check this at v11 time :)\n                    const sampledFlag = storedContext.sampled ? '1' : '0';\n                    span.setAttribute(\n                      'sentry.previous_trace',\n                      `${storedContext.traceId}-${storedContext.spanId}-${sampledFlag}`,\n                    );\n                  }\n                }\n\n                try {\n                  const result = Reflect.apply(target, thisArg, args);\n\n                  if (isThenable(result)) {\n                    return result.then(onFulfilled, onRejected);\n                  } else {\n                    return onFulfilled(result);\n                  }\n                } catch (e) {\n                  return onRejected(e);\n                }\n              });\n            };\n\n            if (rpcMeta) {\n              return continueTrace(\n                { sentryTrace: rpcMeta['sentry-trace'] || '', baggage: rpcMeta.baggage || '' },\n                executeSpan,\n              );\n            }\n\n            if (startNewTrace) {\n              return startNewTraceCore(() => executeSpan());\n            }\n\n            return executeSpan();\n          };\n\n          return withInvocationIsolationScope(wrappedFunction);\n        },\n      }),\n    noMark,\n  );\n}\n"],"names":["startNewTrace","startNewTraceCore"],"mappings":"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"}

package/build/types/durableobject.d.ts

@@ -30,7 +30,7 @@ export declare function constructInstrumentedDurableObject<E, T extends DurableO
     frameworkManagedMethods: ReadonlySet<string>;
 };
 /**
- * Adds trace propagation to a constructed Durable Object's RPC methods.
+ * Instruments a constructed Durable Object's RPC methods.
  *
  * RPC methods are wrapped on the prototype because Cloudflare dispatches them with the Durable
  * Object instance as the receiver. This preserves native private-field access and keeps the methods
@@ -58,7 +58,9 @@ export declare function finalizeWithRpcInstrumentation<T extends object>(obj: T,
  * - webSocketClose
  * - webSocketError
  *
- * To instrument RPC methods (prototype methods), enable the `enableRpcTracePropagation` option.
+ * To instrument RPC methods (prototype methods), enable the `enableRpcTracePropagation` option. An
+ * incoming trace then continues into them, and errors, logs and metrics are captured whether or not
+ * the caller propagates a trace.
  *
  * @param optionsCallback Function that returns the options for the SDK initialization.
  * @param DurableObjectClass The Durable Object class to instrument.

package/build/types/durableobject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"durableobject.d.ts","sourceRoot":"","sources":["../../src/durableobject.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAWlD;;;;;;;;;;GAUG;AAEH,KAAK,gCAAgC,GAAG,GAAG,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,wBAAgB,kCAAkC,CAAC,CAAC,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAC9E,MAAM,EAAE,KAAK,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EACpD,GAAG,EAAE,kBAAkB,EACvB,GAAG,EAAE,CAAC,EACN,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,GAC7C;IACD,GAAG,EAAE,CAAC,CAAC;IACP,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,gCAAgC,CAAC;IAC1C,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC9C,CA4BA;AA+FD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,8BAA8B,CAAC,CAAC,SAAS,MAAM,EAC7D,GAAG,EAAE,CAAC,EACN,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,gCAAgC,EACzC,eAAe,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GACpC,CAAC,CA2BH;AAqHD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,iCAAiC,CAC/C,CAAC,EACD,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAC1B,CAAC,SAAS,KAAK,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EACtD,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,EAAE,kBAAkB,EAAE,CAAC,GAAG,CAAC,CAiB1E;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,wBAAgB,yBAAyB,CACvC,CAAC,EACD,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAC1B,CAAC,SAAS,KAAK,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EACtD,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAsBlE"}
+{"version":3,"file":"durableobject.d.ts","sourceRoot":"","sources":["../../src/durableobject.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAWlD;;;;;;;;;;GAUG;AAEH,KAAK,gCAAgC,GAAG,GAAG,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,wBAAgB,kCAAkC,CAAC,CAAC,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAC9E,MAAM,EAAE,KAAK,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EACpD,GAAG,EAAE,kBAAkB,EACvB,GAAG,EAAE,CAAC,EACN,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,GAC7C;IACD,GAAG,EAAE,CAAC,CAAC;IACP,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,gCAAgC,CAAC;IAC1C,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC9C,CA4BA;AA+FD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,8BAA8B,CAAC,CAAC,SAAS,MAAM,EAC7D,GAAG,EAAE,CAAC,EACN,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,gCAAgC,EACzC,eAAe,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GACpC,CAAC,CA2BH;AA+ID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAgB,iCAAiC,CAC/C,CAAC,EACD,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAC1B,CAAC,SAAS,KAAK,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EACtD,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,EAAE,kBAAkB,EAAE,CAAC,GAAG,CAAC,CAiB1E;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,wBAAgB,yBAAyB,CACvC,CAAC,EACD,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAC1B,CAAC,SAAS,KAAK,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EACtD,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAsBlE"}

package/build/types/instrumentations/instrumentDurableObjectNamespace.d.ts

@@ -5,6 +5,7 @@ export declare const STUB_NON_RPC_METHODS: Set<string>;
  *
  * Wraps:
  * - `namespace.get(id)` / `namespace.getByName(name)` with a span + instruments returned stub
+ * - `namespace.jurisdiction(name)` by instrumenting the returned namespace the same way
  * - `namespace.idFromName(name)` / `namespace.idFromString(id)` / `namespace.newUniqueId()` with breadcrumbs
  *
  * @param namespace - The DurableObjectNamespace to instrument

package/build/types/instrumentations/instrumentDurableObjectNamespace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentDurableObjectNamespace.d.ts","sourceRoot":"","sources":["../../../src/instrumentations/instrumentDurableObjectNamespace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAqB,MAAM,2BAA2B,CAAC;AAK3F,eAAO,MAAM,oBAAoB,aAAuC,CAAC;AAEzE;;;;;;;;;GASG;AACH,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,sBAAsB,EACjC,iBAAiB,UAAQ,GACxB,sBAAsB,CAoBxB"}
+{"version":3,"file":"instrumentDurableObjectNamespace.d.ts","sourceRoot":"","sources":["../../../src/instrumentations/instrumentDurableObjectNamespace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAqB,MAAM,2BAA2B,CAAC;AAK3F,eAAO,MAAM,oBAAoB,aAAuC,CAAC;AAEzE;;;;;;;;;;GAUG;AACH,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,sBAAsB,EACjC,iBAAiB,UAAQ,GACxB,sBAAsB,CA4BxB"}

package/build/types/wrapMethodWithSentry.d.ts

@@ -1,11 +1,16 @@
 import type { DurableObjectStorage } from '@cloudflare/workers-types';
+import type { SerializedTraceData } from '@sentry/core';
 import type { CloudflareOptions } from './client';
 /** Extended DurableObjectState with originalStorage exposed by instrumentContext */
 export interface InstrumentedDurableObjectState extends DurableObjectState {
     originalStorage?: DurableObjectStorage;
 }
 type MethodWrapperOptions = {
-    spanName?: string;
+    /**
+     * The span name, or a resolver called with the RPC metadata of the current call.
+     * Returning `undefined` skips the span and only captures errors.
+     */
+    spanName?: string | ((rpcMeta: SerializedTraceData | undefined) => string | undefined);
     spanOp?: string;
     options: CloudflareOptions;
     context: ExecutionContext | InstrumentedDurableObjectState;

package/build/types/wrapMethodWithSentry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapMethodWithSentry.d.ts","sourceRoot":"","sources":["../../src/wrapMethodWithSentry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAatE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AASlD,oFAAoF;AACpF,MAAM,WAAW,8BAA+B,SAAQ,kBAAkB;IACxE,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACxC;AAyBD,KAAK,oBAAoB,GAAG;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,gBAAgB,GAAG,8BAA8B,CAAC;IAC3D;;;;;;;;;OASG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AACtD,KAAK,cAAc,GAAG,eAAe,CAAC;AAEtC;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,cAAc,EAC3D,cAAc,EAAE,oBAAoB,EACpC,OAAO,EAAE,CAAC,EACV,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,EAC3C,MAAM,CAAC,EAAE,IAAI,GACZ,CAAC,CAqJH"}
+{"version":3,"file":"wrapMethodWithSentry.d.ts","sourceRoot":"","sources":["../../src/wrapMethodWithSentry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAYxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AASlD,oFAAoF;AACpF,MAAM,WAAW,8BAA+B,SAAQ,kBAAkB;IACxE,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACxC;AAyBD,KAAK,oBAAoB,GAAG;IAC1B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,KAAK,MAAM,GAAG,SAAS,CAAC,CAAC;IACvF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,gBAAgB,GAAG,8BAA8B,CAAC;IAC3D;;;;;;;;;OASG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AACtD,KAAK,cAAc,GAAG,eAAe,CAAC;AAEtC;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,cAAc,EAC3D,cAAc,EAAE,oBAAoB,EACpC,OAAO,EAAE,CAAC,EACV,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,EAC3C,MAAM,CAAC,EAAE,IAAI,GACZ,CAAC,CAwJH"}

package/build/types-ts3.8/durableobject.d.ts

@@ -30,7 +30,7 @@ export declare function constructInstrumentedDurableObject<E, T extends DurableO
     frameworkManagedMethods: ReadonlySet<string>;
 };
 /**
- * Adds trace propagation to a constructed Durable Object's RPC methods.
+ * Instruments a constructed Durable Object's RPC methods.
  *
  * RPC methods are wrapped on the prototype because Cloudflare dispatches them with the Durable
  * Object instance as the receiver. This preserves native private-field access and keeps the methods
@@ -58,7 +58,9 @@ export declare function finalizeWithRpcInstrumentation<T extends object>(obj: T,
  * - webSocketClose
  * - webSocketError
  *
- * To instrument RPC methods (prototype methods), enable the `enableRpcTracePropagation` option.
+ * To instrument RPC methods (prototype methods), enable the `enableRpcTracePropagation` option. An
+ * incoming trace then continues into them, and errors, logs and metrics are captured whether or not
+ * the caller propagates a trace.
  *
  * @param optionsCallback Function that returns the options for the SDK initialization.
  * @param DurableObjectClass The Durable Object class to instrument.

package/build/types-ts3.8/instrumentations/instrumentDurableObjectNamespace.d.ts

@@ -5,6 +5,7 @@ export declare const STUB_NON_RPC_METHODS: Set<string>;
  *
  * Wraps:
  * - `namespace.get(id)` / `namespace.getByName(name)` with a span + instruments returned stub
+ * - `namespace.jurisdiction(name)` by instrumenting the returned namespace the same way
  * - `namespace.idFromName(name)` / `namespace.idFromString(id)` / `namespace.newUniqueId()` with breadcrumbs
  *
  * @param namespace - The DurableObjectNamespace to instrument

package/build/types-ts3.8/wrapMethodWithSentry.d.ts

@@ -1,11 +1,16 @@
 import { DurableObjectStorage } from '@cloudflare/workers-types';
+import { SerializedTraceData } from '@sentry/core';
 import { CloudflareOptions } from './client';
 /** Extended DurableObjectState with originalStorage exposed by instrumentContext */
 export interface InstrumentedDurableObjectState extends DurableObjectState {
     originalStorage?: DurableObjectStorage;
 }
 type MethodWrapperOptions = {
-    spanName?: string;
+    /**
+     * The span name, or a resolver called with the RPC metadata of the current call.
+     * Returning `undefined` skips the span and only captures errors.
+     */
+    spanName?: string | ((rpcMeta: SerializedTraceData | undefined) => string | undefined);
     spanOp?: string;
     options: CloudflareOptions;
     context: ExecutionContext | InstrumentedDurableObjectState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cloudflare",
-  "version": "10.74.0",
+  "version": "10.75.1",
   "description": "Official Sentry SDK for Cloudflare Workers and Pages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
@@ -70,8 +70,8 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
-    "@sentry/core": "10.74.0",
-    "@sentry/server-utils": "10.74.0",
+    "@sentry/core": "10.75.1",
+    "@sentry/server-utils": "10.75.1",
     "magic-string": "~0.30.21"
   },
   "peerDependencies": {