@sentry/cloudflare 11.0.0-alpha.0 → 11.0.0-alpha.2

package/build/cjs/prod/instrumentations/instrumentWorkerEntrypoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentWorkerEntrypoint.js","sources":["../../../../src/instrumentations/instrumentWorkerEntrypoint.ts"],"sourcesContent":["import type { RpcStub, WorkerEntrypoint } from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from '@sentry/server-utils/no-diagnostic-channels';\nimport type { CloudflareOptions } from '../client';\nimport { getFinalOptions } from '../options';\nimport type { DefaultEnv, ResolveEnv } from '../types';\nimport { instrumentContext } from '../utils/instrumentContext';\nimport { extractRpcMeta } from '../utils/rpcMeta';\nimport { type UncheckedMethod, wrapMethodWithSentry } from '../wrapMethodWithSentry';\nimport { instrumentEnv } from './worker/instrumentEnv';\nimport { instrumentWorkerEntrypointFetch } from './worker/instrumentFetch';\nimport { instrumentWorkerEntrypointQueue } from './worker/instrumentQueue';\nimport { instrumentWorkerEntrypointScheduled } from './worker/instrumentScheduled';\nimport { instrumentWorkerEntrypointTail } from './worker/instrumentTail';\n\nconst WORKER_ENTRYPOINT_ORIGIN = 'auto.faas.cloudflare.worker_entrypoint';\n\ntype ReservedMethod =\n  | Exclude<Extract<keyof WorkerEntrypoint, string>, '__WORKER_ENTRYPOINT_BRAND'>\n  | Extract<keyof ExportedHandler, string>\n  | Exclude<Extract<keyof RpcStub<(...args: unknown[]) => unknown>, string>, '__RPC_STUB_BRAND'>\n  | 'constructor';\n\nconst RESERVED_METHODS = new Set<string>([\n  'connect',\n  'constructor',\n  'dup',\n  'email',\n  'fetch',\n  'queue',\n  'scheduled',\n  'tail',\n  'tailStream',\n  'test',\n  'trace',\n] satisfies ReservedMethod[]);\n\ninterface CachedMethod {\n  source: UncheckedMethod;\n  wrapped: UncheckedMethod;\n}\n\nexport type WorkerEntrypointConstructor<Env = unknown, Props = {}> = new (\n  ctx: ExecutionContext,\n  // WorkerEntrypoint subclasses can define different `env` shapes, so this constructor must accept all of them.\n  // oxlint-disable-next-line typescript/no-explicit-any\n  env: any,\n) => InstanceType<typeof WorkerEntrypoint<Env, Props>>;\n\nfunction isPrototypeMethod(instance: object, prop: string, method: UncheckedMethod): boolean {\n  let prototype = Object.getPrototypeOf(instance);\n\n  while (prototype && prototype !== Object.prototype) {\n    const descriptor = Object.getOwnPropertyDescriptor(prototype, prop);\n    if (descriptor) {\n      return descriptor.value === method;\n    }\n    prototype = Object.getPrototypeOf(prototype);\n  }\n\n  return false;\n}\n\nfunction bindToInstance(instance: object, proxy: object, method: UncheckedMethod): UncheckedMethod {\n  return new Proxy(method, {\n    apply(target, thisArg, args) {\n      return Reflect.apply(target, thisArg === proxy ? instance : thisArg, args);\n    },\n  });\n}\n\nfunction instrumentMethod(\n  instance: object,\n  proxy: object,\n  prop: PropertyKey,\n  method: UncheckedMethod,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n): UncheckedMethod {\n  const ownDescriptor = Object.getOwnPropertyDescriptor(instance, prop);\n  if (ownDescriptor && 'value' in ownDescriptor && !ownDescriptor.configurable && !ownDescriptor.writable) {\n    return method;\n  }\n\n  const boundMethod = bindToInstance(instance, proxy, method);\n\n  if (typeof prop !== 'string' || RESERVED_METHODS.has(prop) || !isPrototypeMethod(instance, prop, method)) {\n    return boundMethod;\n  }\n\n  const captureMethod = wrapMethodWithSentry(\n    { options, context, spanOp: 'rpc', origin: WORKER_ENTRYPOINT_ORIGIN },\n    boundMethod,\n    undefined,\n    true,\n  );\n\n  if (options.enableRpcTracePropagation === false) {\n    return captureMethod;\n  }\n\n  const tracedMethod = wrapMethodWithSentry(\n    { options, context, spanName: prop, spanOp: 'rpc', origin: WORKER_ENTRYPOINT_ORIGIN },\n    boundMethod,\n    undefined,\n    true,\n  );\n\n  return (...args: unknown[]) => {\n    const { rpcMeta } = extractRpcMeta(args);\n    return rpcMeta ? tracedMethod.call(proxy, ...args) : captureMethod.call(proxy, ...args);\n  };\n}\n\n/**\n * Instruments a WorkerEntrypoint class to capture errors and performance data.\n *\n * Instruments the following methods (same as `withSentry` for ExportedHandler):\n * - fetch (HTTP requests)\n * - scheduled (cron triggers)\n * - queue (queue consumers)\n * - email (email handlers)\n * - tail (tail workers)\n *\n * as well as any other public RPC methods on the WorkerEntrypoint instance.\n *\n * @param optionsCallback Function that returns the options for the SDK initialization.\n * @param WorkerEntrypointClass The WorkerEntrypoint class to instrument.\n * @returns The instrumented WorkerEntrypoint class.\n *\n * @example\n * ```ts\n * class MyWorkerBase extends WorkerEntrypoint<Env> {\n *   async fetch(request: Request): Promise<Response> {\n *     return new Response('Hello World!');\n *   }\n *\n *   async myRpcMethod(arg: string): Promise<string> {\n *     return `Hello ${arg}!`;\n *   }\n * }\n *\n * export default instrumentWorkerEntrypoint(\n *   env => ({\n *     dsn: env.SENTRY_DSN,\n *     tracesSampleRate: 1.0,\n *   }),\n *   MyWorkerBase,\n * );\n * ```\n */\nexport function instrumentWorkerEntrypoint<\n  Env = DefaultEnv,\n  Props = {},\n  // oxlint-disable-next-line typescript/no-explicit-any\n  T extends WorkerEntrypoint<any, any> = WorkerEntrypoint<Env, Props>,\n  // oxlint-disable-next-line typescript/no-explicit-any\n  C extends new (ctx: ExecutionContext, env: any) => T = new (ctx: ExecutionContext, env: any) => T,\n>(optionsCallback: (env: ResolveEnv<C, Env>) => CloudflareOptions | undefined, WorkerEntrypointClass: C): C {\n  // Set up AsyncLocalStorage strategy ONCE at instrumentation time, not per-request\n  // This is critical - calling this per-request would create a new AsyncLocalStorage\n  // each time, breaking scope isolation for concurrent requests\n  setAsyncLocalStorageAsyncContextStrategy();\n\n  return new Proxy(WorkerEntrypointClass, {\n    construct(target, [ctx, env]) {\n      const context = instrumentContext(ctx);\n      const options = getFinalOptions(optionsCallback(env), env);\n      const instrumentedEnv = instrumentEnv(env, options);\n      const obj = new target(context, instrumentedEnv);\n\n      // Override this.ctx to ensure the instrumented context is used\n      // This is necessary because the base WorkerEntrypoint class sets this.ctx\n      // from the constructor parameter, but we want users accessing this.ctx\n      // to get the instrumented version\n      if ('ctx' in obj) {\n        Object.defineProperty(obj, 'ctx', {\n          value: context,\n          writable: true,\n          enumerable: true,\n          configurable: true,\n        });\n      }\n\n      if ('env' in obj) {\n        Object.defineProperty(obj, 'env', {\n          value: instrumentedEnv,\n          writable: true,\n          enumerable: true,\n          configurable: true,\n        });\n      }\n\n      Object.defineProperty(obj, '__SENTRY_CONTEXT__', {\n        value: context,\n        enumerable: false,\n        writable: false,\n        configurable: false,\n      });\n\n      Object.defineProperty(obj, '__SENTRY_OPTIONS__', {\n        value: options,\n        enumerable: false,\n        writable: false,\n        configurable: false,\n      });\n\n      const entrypoint = obj as WorkerEntrypoint;\n      instrumentWorkerEntrypointFetch(entrypoint, options, context);\n      instrumentWorkerEntrypointScheduled(entrypoint, options, context);\n      instrumentWorkerEntrypointQueue(entrypoint, options, context);\n      instrumentWorkerEntrypointTail(entrypoint, options, context);\n\n      // workerd resolves RPC methods through property access.\n      const methodCache = new Map<PropertyKey, CachedMethod>();\n\n      const proxy: typeof obj = new Proxy(obj, {\n        get(instance, prop) {\n          const value = Reflect.get(instance, prop, instance);\n\n          if (typeof value !== 'function') {\n            return value;\n          }\n\n          const method = value as UncheckedMethod;\n\n          const cached = methodCache.get(prop);\n          if (cached?.source === method) {\n            return cached.wrapped;\n          }\n\n          const wrapped = instrumentMethod(instance, proxy, prop, method, options, context);\n          methodCache.set(prop, { source: method, wrapped });\n          return wrapped;\n        },\n      });\n\n      return proxy;\n    },\n  });\n}\n"],"names":["wrapMethodWithSentry","rpcMeta","extractRpcMeta","setAsyncLocalStorageAsyncContextStrategy","instrumentContext","options","getFinalOptions","instrumentEnv","instrumentWorkerEntrypointFetch","instrumentWorkerEntrypointScheduled","instrumentWorkerEntrypointQueue","instrumentWorkerEntrypointTail"],"mappings":"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"}
+{"version":3,"file":"instrumentWorkerEntrypoint.js","sources":["../../../../src/instrumentations/instrumentWorkerEntrypoint.ts"],"sourcesContent":["import type { RpcStub, WorkerEntrypoint } from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from '@sentry/server-utils/no-diagnostic-channels';\nimport type { CloudflareOptions } from '../client';\nimport { getFinalOptions } from '../options';\nimport type { DefaultEnv, ResolveEnv, StrictCloudflareOptions } from '../types';\nimport { instrumentContext } from '../utils/instrumentContext';\nimport { type UncheckedMethod, wrapMethodWithSentry } from '../wrapMethodWithSentry';\nimport { instrumentEnv } from './worker/instrumentEnv';\nimport { instrumentWorkerEntrypointFetch } from './worker/instrumentFetch';\nimport { instrumentWorkerEntrypointQueue } from './worker/instrumentQueue';\nimport { instrumentWorkerEntrypointScheduled } from './worker/instrumentScheduled';\nimport { instrumentWorkerEntrypointTail } from './worker/instrumentTail';\n\nconst WORKER_ENTRYPOINT_ORIGIN = 'auto.faas.cloudflare.worker_entrypoint';\n\ntype ReservedMethod =\n  | Exclude<Extract<keyof WorkerEntrypoint, string>, '__WORKER_ENTRYPOINT_BRAND'>\n  | Extract<keyof ExportedHandler, string>\n  | Exclude<Extract<keyof RpcStub<(...args: unknown[]) => unknown>, string>, '__RPC_STUB_BRAND'>\n  | 'constructor';\n\nconst RESERVED_METHODS = new Set<string>([\n  'connect',\n  'constructor',\n  'dup',\n  'email',\n  'fetch',\n  'queue',\n  'scheduled',\n  'tail',\n  'tailStream',\n  'test',\n  'trace',\n] satisfies ReservedMethod[]);\n\ninterface CachedMethod {\n  source: UncheckedMethod;\n  wrapped: UncheckedMethod;\n}\n\nexport type WorkerEntrypointConstructor<Env = unknown, Props = {}> = new (\n  ctx: ExecutionContext,\n  // WorkerEntrypoint subclasses can define different `env` shapes, so this constructor must accept all of them.\n  // oxlint-disable-next-line typescript/no-explicit-any\n  env: any,\n) => InstanceType<typeof WorkerEntrypoint<Env, Props>>;\n\nfunction isPrototypeMethod(instance: object, prop: string, method: UncheckedMethod): boolean {\n  let prototype = Object.getPrototypeOf(instance);\n\n  while (prototype && prototype !== Object.prototype) {\n    const descriptor = Object.getOwnPropertyDescriptor(prototype, prop);\n    if (descriptor) {\n      return descriptor.value === method;\n    }\n    prototype = Object.getPrototypeOf(prototype);\n  }\n\n  return false;\n}\n\nfunction bindToInstance(instance: object, proxy: object, method: UncheckedMethod): UncheckedMethod {\n  return new Proxy(method, {\n    apply(target, thisArg, args) {\n      return Reflect.apply(target, thisArg === proxy ? instance : thisArg, args);\n    },\n  });\n}\n\nfunction instrumentMethod(\n  instance: object,\n  proxy: object,\n  prop: PropertyKey,\n  method: UncheckedMethod,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n): UncheckedMethod {\n  const ownDescriptor = Object.getOwnPropertyDescriptor(instance, prop);\n  if (ownDescriptor && 'value' in ownDescriptor && !ownDescriptor.configurable && !ownDescriptor.writable) {\n    return method;\n  }\n\n  const boundMethod = bindToInstance(instance, proxy, method);\n\n  if (typeof prop !== 'string' || RESERVED_METHODS.has(prop) || !isPrototypeMethod(instance, prop, method)) {\n    return boundMethod;\n  }\n\n  return wrapMethodWithSentry(\n    {\n      options,\n      context,\n      spanName: rpcMeta => (rpcMeta ? prop : undefined),\n      spanOp: 'rpc',\n      origin: WORKER_ENTRYPOINT_ORIGIN,\n    },\n    boundMethod,\n    undefined,\n    true,\n  );\n}\n\n/**\n * Instruments a WorkerEntrypoint class to capture errors and performance data.\n *\n * Instruments the following methods (same as `withSentry` for ExportedHandler):\n * - fetch (HTTP requests)\n * - scheduled (cron triggers)\n * - queue (queue consumers)\n * - email (email handlers)\n * - tail (tail workers)\n *\n * as well as any other public RPC methods on the WorkerEntrypoint instance.\n *\n * @param optionsCallback Function that returns the options for the SDK initialization.\n * @param WorkerEntrypointClass The WorkerEntrypoint class to instrument.\n * @returns The instrumented WorkerEntrypoint class.\n *\n * @example\n * ```ts\n * class MyWorkerBase extends WorkerEntrypoint<Env> {\n *   async fetch(request: Request): Promise<Response> {\n *     return new Response('Hello World!');\n *   }\n *\n *   async myRpcMethod(arg: string): Promise<string> {\n *     return `Hello ${arg}!`;\n *   }\n * }\n *\n * export default instrumentWorkerEntrypoint(\n *   env => ({\n *     dsn: env.SENTRY_DSN,\n *     tracesSampleRate: 1.0,\n *   }),\n *   MyWorkerBase,\n * );\n * ```\n */\nexport function instrumentWorkerEntrypoint<\n  Env = DefaultEnv,\n  Props = {},\n  // oxlint-disable-next-line typescript/no-explicit-any\n  T extends WorkerEntrypoint<any, any> = WorkerEntrypoint<Env, Props>,\n  // oxlint-disable-next-line typescript/no-explicit-any\n  C extends new (ctx: ExecutionContext, env: any) => T = new (ctx: ExecutionContext, env: any) => T,\n  O = unknown,\n>(optionsCallback: (env: ResolveEnv<C, Env>) => StrictCloudflareOptions<O> | undefined, WorkerEntrypointClass: C): C {\n  // Set up AsyncLocalStorage strategy ONCE at instrumentation time, not per-request\n  // This is critical - calling this per-request would create a new AsyncLocalStorage\n  // each time, breaking scope isolation for concurrent requests\n  setAsyncLocalStorageAsyncContextStrategy();\n\n  return new Proxy(WorkerEntrypointClass, {\n    construct(target, [ctx, env]) {\n      const context = instrumentContext(ctx);\n      const options = getFinalOptions(optionsCallback(env), env);\n      const instrumentedEnv = instrumentEnv(env, options);\n      const obj = new target(context, instrumentedEnv);\n\n      // Override this.ctx to ensure the instrumented context is used\n      // This is necessary because the base WorkerEntrypoint class sets this.ctx\n      // from the constructor parameter, but we want users accessing this.ctx\n      // to get the instrumented version\n      if ('ctx' in obj) {\n        Object.defineProperty(obj, 'ctx', {\n          value: context,\n          writable: true,\n          enumerable: true,\n          configurable: true,\n        });\n      }\n\n      if ('env' in obj) {\n        Object.defineProperty(obj, 'env', {\n          value: instrumentedEnv,\n          writable: true,\n          enumerable: true,\n          configurable: true,\n        });\n      }\n\n      Object.defineProperty(obj, '__SENTRY_CONTEXT__', {\n        value: context,\n        enumerable: false,\n        writable: false,\n        configurable: false,\n      });\n\n      Object.defineProperty(obj, '__SENTRY_OPTIONS__', {\n        value: options,\n        enumerable: false,\n        writable: false,\n        configurable: false,\n      });\n\n      const entrypoint = obj as WorkerEntrypoint;\n      instrumentWorkerEntrypointFetch(entrypoint, options, context);\n      instrumentWorkerEntrypointScheduled(entrypoint, options, context);\n      instrumentWorkerEntrypointQueue(entrypoint, options, context);\n      instrumentWorkerEntrypointTail(entrypoint, options, context);\n\n      // workerd resolves RPC methods through property access.\n      const methodCache = new Map<PropertyKey, CachedMethod>();\n\n      const proxy: typeof obj = new Proxy(obj, {\n        get(instance, prop) {\n          const value = Reflect.get(instance, prop, instance);\n\n          if (typeof value !== 'function') {\n            return value;\n          }\n\n          const method = value as UncheckedMethod;\n\n          const cached = methodCache.get(prop);\n          if (cached?.source === method) {\n            return cached.wrapped;\n          }\n\n          const wrapped = instrumentMethod(instance, proxy, prop, method, options, context);\n          methodCache.set(prop, { source: method, wrapped });\n          return wrapped;\n        },\n      });\n\n      return proxy;\n    },\n  });\n}\n"],"names":["wrapMethodWithSentry","setAsyncLocalStorageAsyncContextStrategy","instrumentContext","options","getFinalOptions","instrumentEnv","instrumentWorkerEntrypointFetch","instrumentWorkerEntrypointScheduled","instrumentWorkerEntrypointQueue","instrumentWorkerEntrypointTail"],"mappings":";;;;;;;;;;;;AAaA,MAAM,wBAAA,GAA2B,wCAAA;AAQjC,MAAM,gBAAA,uBAAuB,GAAA,CAAY;AAAA,EACvC,SAAA;AAAA,EACA,aAAA;AAAA,EACA,KAAA;AAAA,EACA,OAAA;AAAA,EACA,OAAA;AAAA,EACA,OAAA;AAAA,EACA,WAAA;AAAA,EACA,MAAA;AAAA,EACA,YAAA;AAAA,EACA,MAAA;AAAA,EACA;AACF,CAA4B,CAAA;AAc5B,SAAS,iBAAA,CAAkB,QAAA,EAAkB,IAAA,EAAc,MAAA,EAAkC;AAC3F,EAAA,IAAI,SAAA,GAAY,MAAA,CAAO,cAAA,CAAe,QAAQ,CAAA;AAE9C,EAAA,OAAO,SAAA,IAAa,SAAA,KAAc,MAAA,CAAO,SAAA,EAAW;AAClD,IAAA,MAAM,UAAA,GAAa,MAAA,CAAO,wBAAA,CAAyB,SAAA,EAAW,IAAI,CAAA;AAClE,IAAA,IAAI,UAAA,EAAY;AACd,MAAA,OAAO,WAAW,KAAA,KAAU,MAAA;AAAA,IAC9B;AACA,IAAA,SAAA,GAAY,MAAA,CAAO,eAAe,SAAS,CAAA;AAAA,EAC7C;AAEA,EAAA,OAAO,KAAA;AACT;AAEA,SAAS,cAAA,CAAe,QAAA,EAAkB,KAAA,EAAe,MAAA,EAA0C;AACjG,EAAA,OAAO,IAAI,MAAM,MAAA,EAAQ;AAAA,IACvB,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAA,EAAM;AAC3B,MAAA,OAAO,QAAQ,KAAA,CAAM,MAAA,EAAQ,YAAY,KAAA,GAAQ,QAAA,GAAW,SAAS,IAAI,CAAA;AAAA,IAC3E;AAAA,GACD,CAAA;AACH;AAEA,SAAS,iBACP,QAAA,EACA,KAAA,EACA,IAAA,EACA,MAAA,EACA,SACA,OAAA,EACiB;AACjB,EAAA,MAAM,aAAA,GAAgB,MAAA,CAAO,wBAAA,CAAyB,QAAA,EAAU,IAAI,CAAA;AACpE,EAAA,IAAI,aAAA,IAAiB,WAAW,aAAA,IAAiB,CAAC,cAAc,YAAA,IAAgB,CAAC,cAAc,QAAA,EAAU;AACvG,IAAA,OAAO,MAAA;AAAA,EACT;AAEA,EAAA,MAAM,WAAA,GAAc,cAAA,CAAe,QAAA,EAAU,KAAA,EAAO,MAAM,CAAA;AAE1D,EAAA,IAAI,OAAO,IAAA,KAAS,QAAA,IAAY,gBAAA,CAAiB,GAAA,CAAI,IAAI,CAAA,IAAK,CAAC,iBAAA,CAAkB,QAAA,EAAU,IAAA,EAAM,MAAM,CAAA,EAAG;AACxG,IAAA,OAAO,WAAA;AAAA,EACT;AAEA,EAAA,OAAOA,yCAAA;AAAA,IACL;AAAA,MACE,OAAA;AAAA,MACA,OAAA;AAAA,MACA,QAAA,EAAU,CAAA,OAAA,KAAY,OAAA,GAAU,IAAA,GAAO,MAAA;AAAA,MACvC,MAAA,EAAQ,KAAA;AAAA,MACR,MAAA,EAAQ;AAAA,KACV;AAAA,IACA,WAAA;AAAA,IACA,KAAA,CAAA;AAAA,IACA;AAAA,GACF;AACF;AAuCO,SAAS,0BAAA,CAQd,iBAAsF,qBAAA,EAA6B;AAInH,EAAAC,6DAAA,EAAyC;AAEzC,EAAA,OAAO,IAAI,MAAM,qBAAA,EAAuB;AAAA,IACtC,SAAA,CAAU,MAAA,EAAQ,CAAC,GAAA,EAAK,GAAG,CAAA,EAAG;AAC5B,MAAA,MAAM,OAAA,GAAUC,oCAAkB,GAAG,CAAA;AACrC,MAAA,MAAMC,SAAA,GAAUC,uBAAA,CAAgB,eAAA,CAAgB,GAAG,GAAG,GAAG,CAAA;AACzD,MAAA,MAAM,eAAA,GAAkBC,2BAAA,CAAc,GAAA,EAAKF,SAAO,CAAA;AAClD,MAAA,MAAM,GAAA,GAAM,IAAI,MAAA,CAAO,OAAA,EAAS,eAAe,CAAA;AAM/C,MAAA,IAAI,SAAS,GAAA,EAAK;AAChB,QAAA,MAAA,CAAO,cAAA,CAAe,KAAK,KAAA,EAAO;AAAA,UAChC,KAAA,EAAO,OAAA;AAAA,UACP,QAAA,EAAU,IAAA;AAAA,UACV,UAAA,EAAY,IAAA;AAAA,UACZ,YAAA,EAAc;AAAA,SACf,CAAA;AAAA,MACH;AAEA,MAAA,IAAI,SAAS,GAAA,EAAK;AAChB,QAAA,MAAA,CAAO,cAAA,CAAe,KAAK,KAAA,EAAO;AAAA,UAChC,KAAA,EAAO,eAAA;AAAA,UACP,QAAA,EAAU,IAAA;AAAA,UACV,UAAA,EAAY,IAAA;AAAA,UACZ,YAAA,EAAc;AAAA,SACf,CAAA;AAAA,MACH;AAEA,MAAA,MAAA,CAAO,cAAA,CAAe,KAAK,oBAAA,EAAsB;AAAA,QAC/C,KAAA,EAAO,OAAA;AAAA,QACP,UAAA,EAAY,KAAA;AAAA,QACZ,QAAA,EAAU,KAAA;AAAA,QACV,YAAA,EAAc;AAAA,OACf,CAAA;AAED,MAAA,MAAA,CAAO,cAAA,CAAe,KAAK,oBAAA,EAAsB;AAAA,QAC/C,KAAA,EAAOA,SAAA;AAAA,QACP,UAAA,EAAY,KAAA;AAAA,QACZ,QAAA,EAAU,KAAA;AAAA,QACV,YAAA,EAAc;AAAA,OACf,CAAA;AAED,MAAA,MAAM,UAAA,GAAa,GAAA;AACnB,MAAAG,+CAAA,CAAgC,UAAA,EAAYH,WAAS,OAAO,CAAA;AAC5D,MAAAI,uDAAA,CAAoC,UAAA,EAAYJ,WAAS,OAAO,CAAA;AAChE,MAAAK,+CAAA,CAAgC,UAAA,EAAYL,WAAS,OAAO,CAAA;AAC5D,MAAAM,6CAAA,CAA+B,UAAA,EAAYN,WAAS,OAAO,CAAA;AAG3D,MAAA,MAAM,WAAA,uBAAkB,GAAA,EAA+B;AAEvD,MAAA,MAAM,KAAA,GAAoB,IAAI,KAAA,CAAM,GAAA,EAAK;AAAA,QACvC,GAAA,CAAI,UAAU,IAAA,EAAM;AAClB,UAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,GAAA,CAAI,QAAA,EAAU,MAAM,QAAQ,CAAA;AAElD,UAAA,IAAI,OAAO,UAAU,UAAA,EAAY;AAC/B,YAAA,OAAO,KAAA;AAAA,UACT;AAEA,UAAA,MAAM,MAAA,GAAS,KAAA;AAEf,UAAA,MAAM,MAAA,GAAS,WAAA,CAAY,GAAA,CAAI,IAAI,CAAA;AACnC,UAAA,IAAI,MAAA,EAAQ,WAAW,MAAA,EAAQ;AAC7B,YAAA,OAAO,MAAA,CAAO,OAAA;AAAA,UAChB;AAEA,UAAA,MAAM,UAAU,gBAAA,CAAiB,QAAA,EAAU,OAAO,IAAA,EAAM,MAAA,EAAQA,WAAS,OAAO,CAAA;AAChF,UAAA,WAAA,CAAY,IAAI,IAAA,EAAM,EAAE,MAAA,EAAQ,MAAA,EAAQ,SAAS,CAAA;AACjD,UAAA,OAAO,OAAA;AAAA,QACT;AAAA,OACD,CAAA;AAED,MAAA,OAAO,KAAA;AAAA,IACT;AAAA,GACD,CAAA;AACH;;;;"}

package/build/cjs/prod/instrumentations/worker/instrumentD1.js

@@ -81,13 +81,17 @@ function createD1Breadcrumb(query, type, d1Result) {
   });
 }
 function createStartSpanOptions(query, type) {
+  const querySummary = query ? core._INTERNAL_getSqlQuerySummary(core._INTERNAL_sanitizeSqlQuery(query)) : void 0;
+  const client = core.getClient();
+  const name = client && core.hasSpanStreamingEnabled(client) ? querySummary || "cloudflare-d1" : query;
   return {
     op: "db.query",
-    name: query,
+    name,
     attributes: {
       "db.system.name": "cloudflare-d1",
       "db.operation.name": type,
       "db.query.text": query,
+      "db.query.summary": querySummary,
       [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.db.cloudflare.d1"
     }
   };

package/build/cjs/prod/instrumentations/worker/instrumentD1.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentD1.js","sources":["../../../../../src/instrumentations/worker/instrumentD1.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/unbound-method */\nimport type { D1Database, D1DatabaseSession, D1PreparedStatement, D1Response } from '@cloudflare/workers-types';\nimport type { Span, SpanAttributes, StartSpanOptions } from '@sentry/core';\nimport { addBreadcrumb, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR, startSpan } from '@sentry/core';\nimport { ensureInstrumented } from '../../instrument';\n\n// Patching is based on internal Cloudflare D1 API\n// https://github.com/cloudflare/workerd/blob/cd5279e7b305003f1d9c851e73efa9d67e4b68b2/src/cloudflare/internal/d1-api.ts\n\nconst patchedStatement = new WeakSet<D1PreparedStatement>();\n\n/**\n * Patches the query methods of a Cloudflare D1 prepared statement with Sentry.\n */\nfunction instrumentD1PreparedStatementQueries(statement: D1PreparedStatement, query: string): D1PreparedStatement {\n  if (patchedStatement.has(statement)) {\n    return statement;\n  }\n\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  statement.first = new Proxy(statement.first, {\n    apply(target, thisArg, args: Parameters<typeof statement.first>) {\n      return startSpan(createStartSpanOptions(query, 'first'), async () => {\n        const res = await Reflect.apply(target, thisArg, args);\n        createD1Breadcrumb(query, 'first');\n        return res;\n      });\n    },\n  });\n\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  statement.run = new Proxy(statement.run, {\n    apply(target, thisArg, args: Parameters<typeof statement.run>) {\n      return startSpan(createStartSpanOptions(query, 'run'), async span => {\n        const d1Response = await Reflect.apply(target, thisArg, args);\n        applyD1ReturnObjectToSpan(span, d1Response);\n        createD1Breadcrumb(query, 'run', d1Response);\n        return d1Response;\n      });\n    },\n  });\n\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  statement.all = new Proxy(statement.all, {\n    apply(target, thisArg, args: Parameters<typeof statement.all>) {\n      return startSpan(createStartSpanOptions(query, 'all'), async span => {\n        const d1Result = await Reflect.apply(target, thisArg, args);\n        applyD1ReturnObjectToSpan(span, d1Result);\n        createD1Breadcrumb(query, 'all', d1Result);\n        return d1Result;\n      });\n    },\n  });\n\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  statement.raw = new Proxy(statement.raw, {\n    apply(target, thisArg, args: Parameters<typeof statement.raw>) {\n      return startSpan(createStartSpanOptions(query, 'raw'), async () => {\n        const res = await Reflect.apply(target, thisArg, args);\n        createD1Breadcrumb(query, 'raw');\n        return res;\n      });\n    },\n  });\n\n  patchedStatement.add(statement);\n\n  return statement;\n}\n\n/**\n * Instruments a Cloudflare D1 prepared statement with Sentry.\n *\n * This is meant to be used as a top-level call, under the hood it calls `instrumentD1PreparedStatementQueries`\n * to patch the query methods. The reason for this abstraction is to ensure that the `bind` method is also patched.\n */\nfunction instrumentD1PreparedStatement(statement: D1PreparedStatement, query: string): D1PreparedStatement {\n  // statement.bind() returns a new instance of D1PreparedStatement, so we have to patch it as well.\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  statement.bind = new Proxy(statement.bind, {\n    apply(target, thisArg, args: Parameters<typeof statement.bind>) {\n      return instrumentD1PreparedStatementQueries(Reflect.apply(target, thisArg, args), query);\n    },\n  });\n\n  return instrumentD1PreparedStatementQueries(statement, query);\n}\n\n/**\n * Add D1Response meta information to a span.\n *\n * See: https://developers.cloudflare.com/d1/build-with-d1/d1-client-api/#return-object\n */\nfunction applyD1ReturnObjectToSpan(span: Span, d1Result: D1Response): void {\n  if (!d1Result.success) {\n    span.setStatus({ code: SPAN_STATUS_ERROR });\n  }\n\n  span.setAttributes(getAttributesFromD1Response(d1Result));\n}\n\nfunction getAttributesFromD1Response(d1Result: D1Response): SpanAttributes {\n  return {\n    'cloudflare.d1.duration': d1Result.meta.duration,\n    'cloudflare.d1.rows_read': d1Result.meta.rows_read,\n    'cloudflare.d1.rows_written': d1Result.meta.rows_written,\n  };\n}\n\ntype D1QueryType = 'first' | 'run' | 'all' | 'raw' | 'batch' | 'exec';\n\nfunction createD1Breadcrumb(query: string, type: D1QueryType, d1Result?: D1Response): void {\n  addBreadcrumb({\n    category: 'query',\n    message: query,\n    data: {\n      ...(d1Result ? getAttributesFromD1Response(d1Result) : {}),\n      'db.operation.name': type,\n    },\n  });\n}\n\nfunction createStartSpanOptions(query: string, type: D1QueryType): StartSpanOptions {\n  return {\n    op: 'db.query',\n    name: query,\n    attributes: {\n      'db.system.name': 'cloudflare-d1',\n      'db.operation.name': type,\n      'db.query.text': query,\n      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.cloudflare.d1',\n    },\n  };\n}\n\nfunction instrumentPrepare(\n  prepare: D1Database['prepare'] | D1DatabaseSession['prepare'],\n): D1Database['prepare'] | D1DatabaseSession['prepare'] {\n  return new Proxy(prepare, {\n    apply(target, thisArg, args: Parameters<typeof prepare>) {\n      const [query] = args;\n      return instrumentD1PreparedStatement(Reflect.apply(target, thisArg, args), query);\n    },\n  });\n}\n\nfunction instrumentBatch(\n  batch: D1Database['batch'] | D1DatabaseSession['batch'],\n): D1Database['batch'] | D1DatabaseSession['batch'] {\n  return new Proxy(batch, {\n    apply(target, thisArg, args: Parameters<typeof batch>) {\n      const statements = args[0];\n      // D1PreparedStatement exposes a `statement` property at runtime, but it's not in @cloudflare/workers-types.\n      // https://github.com/cloudflare/workerd/blob/dc12d7650b4f5d4f9ba6a47aa45fad769cdf8db4/src/cloudflare/internal/d1-api.ts#L210\n      const queryText = statements\n        .map(statement => (statement as unknown as { statement?: string }).statement ?? '')\n        .filter(Boolean)\n        .join('\\n');\n\n      return startSpan(\n        {\n          op: 'db.query',\n          name: 'D1 batch',\n          attributes: {\n            'db.system.name': 'cloudflare-d1',\n            'db.operation.name': 'batch',\n            'db.query.text': queryText || undefined,\n            'db.operation.batch.size': statements.length,\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.cloudflare.d1',\n          },\n        },\n        async () => {\n          const res = await Reflect.apply(target, thisArg, args);\n          createD1Breadcrumb('D1 batch', 'batch');\n          return res;\n        },\n      );\n    },\n  });\n}\n\nfunction instrumentD1Session(session: D1DatabaseSession): D1DatabaseSession {\n  session.prepare = instrumentPrepare(session.prepare);\n  session.batch = instrumentBatch(session.batch);\n  return session;\n}\n\nfunction _instrumentD1(db: D1Database): D1Database {\n  db.prepare = instrumentPrepare(db.prepare);\n  db.batch = instrumentBatch(db.batch);\n\n  db.exec = new Proxy(db.exec, {\n    apply(target, thisArg, args: Parameters<typeof db.exec>) {\n      const [query] = args;\n      return startSpan(createStartSpanOptions(query, 'exec'), async () => {\n        const res = await Reflect.apply(target, thisArg, args);\n        createD1Breadcrumb(query, 'exec');\n        return res;\n      });\n    },\n  });\n\n  if ('withSession' in db && typeof db.withSession === 'function') {\n    db.withSession = new Proxy(db.withSession, {\n      apply(target, thisArg, args: [unknown]) {\n        return instrumentD1Session(Reflect.apply(target, thisArg, args) as D1DatabaseSession);\n      },\n    });\n  }\n\n  return db;\n}\n\nexport function instrumentD1(db: D1Database): D1Database {\n  return ensureInstrumented(db, _instrumentD1);\n}\n"],"names":["startSpan","SPAN_STATUS_ERROR","addBreadcrumb","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","ensureInstrumented"],"mappings":"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"}
+{"version":3,"file":"instrumentD1.js","sources":["../../../../../src/instrumentations/worker/instrumentD1.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/unbound-method */\nimport type { D1Database, D1DatabaseSession, D1PreparedStatement, D1Response } from '@cloudflare/workers-types';\nimport type { Span, SpanAttributes, StartSpanOptions } from '@sentry/core';\nimport {\n  _INTERNAL_getSqlQuerySummary,\n  _INTERNAL_sanitizeSqlQuery,\n  addBreadcrumb,\n  getClient,\n  hasSpanStreamingEnabled,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SPAN_STATUS_ERROR,\n  startSpan,\n} from '@sentry/core';\nimport { ensureInstrumented } from '../../instrument';\n\n// Patching is based on internal Cloudflare D1 API\n// https://github.com/cloudflare/workerd/blob/cd5279e7b305003f1d9c851e73efa9d67e4b68b2/src/cloudflare/internal/d1-api.ts\n\nconst patchedStatement = new WeakSet<D1PreparedStatement>();\n\n/**\n * Patches the query methods of a Cloudflare D1 prepared statement with Sentry.\n */\nfunction instrumentD1PreparedStatementQueries(statement: D1PreparedStatement, query: string): D1PreparedStatement {\n  if (patchedStatement.has(statement)) {\n    return statement;\n  }\n\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  statement.first = new Proxy(statement.first, {\n    apply(target, thisArg, args: Parameters<typeof statement.first>) {\n      return startSpan(createStartSpanOptions(query, 'first'), async () => {\n        const res = await Reflect.apply(target, thisArg, args);\n        createD1Breadcrumb(query, 'first');\n        return res;\n      });\n    },\n  });\n\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  statement.run = new Proxy(statement.run, {\n    apply(target, thisArg, args: Parameters<typeof statement.run>) {\n      return startSpan(createStartSpanOptions(query, 'run'), async span => {\n        const d1Response = await Reflect.apply(target, thisArg, args);\n        applyD1ReturnObjectToSpan(span, d1Response);\n        createD1Breadcrumb(query, 'run', d1Response);\n        return d1Response;\n      });\n    },\n  });\n\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  statement.all = new Proxy(statement.all, {\n    apply(target, thisArg, args: Parameters<typeof statement.all>) {\n      return startSpan(createStartSpanOptions(query, 'all'), async span => {\n        const d1Result = await Reflect.apply(target, thisArg, args);\n        applyD1ReturnObjectToSpan(span, d1Result);\n        createD1Breadcrumb(query, 'all', d1Result);\n        return d1Result;\n      });\n    },\n  });\n\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  statement.raw = new Proxy(statement.raw, {\n    apply(target, thisArg, args: Parameters<typeof statement.raw>) {\n      return startSpan(createStartSpanOptions(query, 'raw'), async () => {\n        const res = await Reflect.apply(target, thisArg, args);\n        createD1Breadcrumb(query, 'raw');\n        return res;\n      });\n    },\n  });\n\n  patchedStatement.add(statement);\n\n  return statement;\n}\n\n/**\n * Instruments a Cloudflare D1 prepared statement with Sentry.\n *\n * This is meant to be used as a top-level call, under the hood it calls `instrumentD1PreparedStatementQueries`\n * to patch the query methods. The reason for this abstraction is to ensure that the `bind` method is also patched.\n */\nfunction instrumentD1PreparedStatement(statement: D1PreparedStatement, query: string): D1PreparedStatement {\n  // statement.bind() returns a new instance of D1PreparedStatement, so we have to patch it as well.\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  statement.bind = new Proxy(statement.bind, {\n    apply(target, thisArg, args: Parameters<typeof statement.bind>) {\n      return instrumentD1PreparedStatementQueries(Reflect.apply(target, thisArg, args), query);\n    },\n  });\n\n  return instrumentD1PreparedStatementQueries(statement, query);\n}\n\n/**\n * Add D1Response meta information to a span.\n *\n * See: https://developers.cloudflare.com/d1/build-with-d1/d1-client-api/#return-object\n */\nfunction applyD1ReturnObjectToSpan(span: Span, d1Result: D1Response): void {\n  if (!d1Result.success) {\n    span.setStatus({ code: SPAN_STATUS_ERROR });\n  }\n\n  span.setAttributes(getAttributesFromD1Response(d1Result));\n}\n\nfunction getAttributesFromD1Response(d1Result: D1Response): SpanAttributes {\n  return {\n    'cloudflare.d1.duration': d1Result.meta.duration,\n    'cloudflare.d1.rows_read': d1Result.meta.rows_read,\n    'cloudflare.d1.rows_written': d1Result.meta.rows_written,\n  };\n}\n\ntype D1QueryType = 'first' | 'run' | 'all' | 'raw' | 'batch' | 'exec';\n\nfunction createD1Breadcrumb(query: string, type: D1QueryType, d1Result?: D1Response): void {\n  addBreadcrumb({\n    category: 'query',\n    message: query,\n    data: {\n      ...(d1Result ? getAttributesFromD1Response(d1Result) : {}),\n      'db.operation.name': type,\n    },\n  });\n}\n\nfunction createStartSpanOptions(query: string, type: D1QueryType): StartSpanOptions {\n  const querySummary = query ? _INTERNAL_getSqlQuerySummary(_INTERNAL_sanitizeSqlQuery(query)) : undefined;\n\n  const client = getClient();\n  const name = client && hasSpanStreamingEnabled(client) ? querySummary || 'cloudflare-d1' : query;\n\n  return {\n    op: 'db.query',\n    name,\n    attributes: {\n      'db.system.name': 'cloudflare-d1',\n      'db.operation.name': type,\n      'db.query.text': query,\n      'db.query.summary': querySummary,\n      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.cloudflare.d1',\n    },\n  };\n}\n\nfunction instrumentPrepare(\n  prepare: D1Database['prepare'] | D1DatabaseSession['prepare'],\n): D1Database['prepare'] | D1DatabaseSession['prepare'] {\n  return new Proxy(prepare, {\n    apply(target, thisArg, args: Parameters<typeof prepare>) {\n      const [query] = args;\n      return instrumentD1PreparedStatement(Reflect.apply(target, thisArg, args), query);\n    },\n  });\n}\n\nfunction instrumentBatch(\n  batch: D1Database['batch'] | D1DatabaseSession['batch'],\n): D1Database['batch'] | D1DatabaseSession['batch'] {\n  return new Proxy(batch, {\n    apply(target, thisArg, args: Parameters<typeof batch>) {\n      const statements = args[0];\n      // D1PreparedStatement exposes a `statement` property at runtime, but it's not in @cloudflare/workers-types.\n      // https://github.com/cloudflare/workerd/blob/dc12d7650b4f5d4f9ba6a47aa45fad769cdf8db4/src/cloudflare/internal/d1-api.ts#L210\n      const queryText = statements\n        .map(statement => (statement as unknown as { statement?: string }).statement ?? '')\n        .filter(Boolean)\n        .join('\\n');\n\n      return startSpan(\n        {\n          op: 'db.query',\n          name: 'D1 batch',\n          attributes: {\n            'db.system.name': 'cloudflare-d1',\n            'db.operation.name': 'batch',\n            'db.query.text': queryText || undefined,\n            'db.operation.batch.size': statements.length,\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.cloudflare.d1',\n          },\n        },\n        async () => {\n          const res = await Reflect.apply(target, thisArg, args);\n          createD1Breadcrumb('D1 batch', 'batch');\n          return res;\n        },\n      );\n    },\n  });\n}\n\nfunction instrumentD1Session(session: D1DatabaseSession): D1DatabaseSession {\n  session.prepare = instrumentPrepare(session.prepare);\n  session.batch = instrumentBatch(session.batch);\n  return session;\n}\n\nfunction _instrumentD1(db: D1Database): D1Database {\n  db.prepare = instrumentPrepare(db.prepare);\n  db.batch = instrumentBatch(db.batch);\n\n  db.exec = new Proxy(db.exec, {\n    apply(target, thisArg, args: Parameters<typeof db.exec>) {\n      const [query] = args;\n      return startSpan(createStartSpanOptions(query, 'exec'), async () => {\n        const res = await Reflect.apply(target, thisArg, args);\n        createD1Breadcrumb(query, 'exec');\n        return res;\n      });\n    },\n  });\n\n  if ('withSession' in db && typeof db.withSession === 'function') {\n    db.withSession = new Proxy(db.withSession, {\n      apply(target, thisArg, args: [unknown]) {\n        return instrumentD1Session(Reflect.apply(target, thisArg, args) as D1DatabaseSession);\n      },\n    });\n  }\n\n  return db;\n}\n\nexport function instrumentD1(db: D1Database): D1Database {\n  return ensureInstrumented(db, _instrumentD1);\n}\n"],"names":["startSpan","SPAN_STATUS_ERROR","addBreadcrumb","_INTERNAL_getSqlQuerySummary","_INTERNAL_sanitizeSqlQuery","getClient","hasSpanStreamingEnabled","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","ensureInstrumented"],"mappings":"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"}

package/build/cjs/prod/instrumentations/worker/instrumentEmail.js

@@ -9,11 +9,13 @@ const options = require('../../options.js');
 const scopeUtils = require('../../scope-utils.js');
 const sdk = require('../../sdk.js');
 const instrumentContext = require('../../utils/instrumentContext.js');
+const invocationContext = require('../../utils/invocationContext.js');
 const instrumentEnv = require('./instrumentEnv.js');
 
 function wrapEmailHandler(emailMessage, options, context, fn) {
   return core.withIsolationScope((isolationScope) => {
     const waitUntil = context.waitUntil.bind(context);
+    invocationContext.setInvocationState(isolationScope, { ctx: context });
     const client = sdk.init({ ...options, ctx: context });
     isolationScope.setClient(client);
     scopeUtils.addCloudResourceContext(isolationScope);
@@ -21,10 +23,10 @@ function wrapEmailHandler(emailMessage, options, context, fn) {
       {
         name: `Handle Email ${emailMessage.to}`,
         attributes: {
-          [attributes.SENTRY_OP]: op.GENERAL_FUNCTION_SPAN_OP,
+          [attributes.SENTRY_OP]: op.FUNCTION,
           "faas.trigger": "email",
           [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.faas.cloudflare.email",
-          [core.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: "task"
+          [attributes.SENTRY_SEGMENT_NAME_SOURCE]: "task"
         }
       },
       async () => {

package/build/cjs/prod/instrumentations/worker/instrumentEmail.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentEmail.js","sources":["../../../../../src/instrumentations/worker/instrumentEmail.ts"],"sourcesContent":["import type { EmailMessage } from '@cloudflare/workers-types';\nimport type { AnyExportedHandler } from '../../types';\nimport type { env as cloudflareEnv } from 'cloudflare:workers';\nimport { SENTRY_OP } from '@sentry/conventions/attributes';\nimport { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';\nimport {\n  captureException,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  startSpan,\n  withIsolationScope,\n} from '@sentry/core';\nimport type { CloudflareOptions } from '../../client';\nimport { flushAndDispose } from '../../flush';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { addCloudResourceContext } from '../../scope-utils';\nimport { init } from '../../sdk';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { instrumentEnv } from './instrumentEnv';\n\n/**\n * Core email handler logic - wraps execution with Sentry instrumentation.\n */\nfunction wrapEmailHandler(\n  emailMessage: EmailMessage,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n  fn: () => unknown,\n): unknown {\n  return withIsolationScope(isolationScope => {\n    const waitUntil = context.waitUntil.bind(context);\n\n    const client = init({ ...options, ctx: context });\n    isolationScope.setClient(client);\n\n    addCloudResourceContext(isolationScope);\n\n    return startSpan(\n      {\n        name: `Handle Email ${emailMessage.to}`,\n        attributes: {\n          [SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,\n          'faas.trigger': 'email',\n          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.email',\n          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n        },\n      },\n      async () => {\n        try {\n          return await fn();\n        } catch (e) {\n          captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.email' } });\n          throw e;\n        } finally {\n          waitUntil(flushAndDispose(client));\n        }\n      },\n    );\n  });\n}\n\n/**\n * Instruments an email handler for ExportedHandler (env/ctx come from args).\n */\nexport function instrumentExportedHandlerEmail<T extends AnyExportedHandler>(\n  handler: T,\n  optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n  if (!('email' in handler) || typeof handler.email !== 'function') {\n    return;\n  }\n\n  handler.email = ensureInstrumented(\n    handler.email,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, args: Parameters<NonNullable<T['email']>>) {\n          const [emailMessage, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          const options = getFinalOptions(optionsCallback(env), env);\n          args[1] = instrumentEnv(env, options);\n          args[2] = context;\n\n          return wrapEmailHandler(emailMessage, options, context, () => target.apply(thisArg, args));\n        },\n      }),\n  );\n}\n"],"names":["withIsolationScope","init","addCloudResourceContext","startSpan","SENTRY_OP","GENERAL_FUNCTION_SPAN_OP","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","captureException","flushAndDispose","ensureInstrumented","instrumentContext","options","getFinalOptions","instrumentEnv"],"mappings":";;;;;;;;;;;;;AAwBA,SAAS,gBAAA,CACP,YAAA,EACA,OAAA,EACA,OAAA,EACA,EAAA,EACS;AACT,EAAA,OAAOA,wBAAmB,CAAA,cAAA,KAAkB;AAC1C,IAAA,MAAM,SAAA,GAAY,OAAA,CAAQ,SAAA,CAAU,IAAA,CAAK,OAAO,CAAA;AAEhD,IAAA,MAAM,SAASC,QAAA,CAAK,EAAE,GAAG,OAAA,EAAS,GAAA,EAAK,SAAS,CAAA;AAChD,IAAA,cAAA,CAAe,UAAU,MAAM,CAAA;AAE/B,IAAAC,kCAAA,CAAwB,cAAc,CAAA;AAEtC,IAAA,OAAOC,cAAA;AAAA,MACL;AAAA,QACE,IAAA,EAAM,CAAA,aAAA,EAAgB,YAAA,CAAa,EAAE,CAAA,CAAA;AAAA,QACrC,UAAA,EAAY;AAAA,UACV,CAACC,oBAAS,GAAGC,2BAAA;AAAA,UACb,cAAA,EAAgB,OAAA;AAAA,UAChB,CAACC,qCAAgC,GAAG,4BAAA;AAAA,UACpC,CAACC,qCAAgC,GAAG;AAAA;AACtC,OACF;AAAA,MACA,YAAY;AACV,QAAA,IAAI;AACF,UAAA,OAAO,MAAM,EAAA,EAAG;AAAA,QAClB,SAAS,CAAA,EAAG;AACV,UAAAC,qBAAA,CAAiB,CAAA,EAAG,EAAE,SAAA,EAAW,EAAE,SAAS,KAAA,EAAO,IAAA,EAAM,4BAAA,EAA6B,EAAG,CAAA;AACzF,UAAA,MAAM,CAAA;AAAA,QACR,CAAA,SAAE;AACA,UAAA,SAAA,CAAUC,qBAAA,CAAgB,MAAM,CAAC,CAAA;AAAA,QACnC;AAAA,MACF;AAAA,KACF;AAAA,EACF,CAAC,CAAA;AACH;AAKO,SAAS,8BAAA,CACd,SACA,eAAA,EACM;AACN,EAAA,IAAI,EAAE,OAAA,IAAW,OAAA,CAAA,IAAY,OAAO,OAAA,CAAQ,UAAU,UAAA,EAAY;AAChE,IAAA;AAAA,EACF;AAEA,EAAA,OAAA,CAAQ,KAAA,GAAQC,6BAAA;AAAA,IACd,OAAA,CAAQ,KAAA;AAAA,IACR,CAAA,QAAA,KACE,IAAI,KAAA,CAAM,QAAA,EAAU;AAAA,MAClB,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAA,EAA2C;AAChE,QAAA,MAAM,CAAC,YAAA,EAAc,GAAA,EAAK,GAAG,CAAA,GAAI,IAAA;AACjC,QAAA,MAAM,OAAA,GAAUC,oCAAkB,GAAG,CAAA;AACrC,QAAA,MAAMC,SAAA,GAAUC,uBAAA,CAAgB,eAAA,CAAgB,GAAG,GAAG,GAAG,CAAA;AACzD,QAAA,IAAA,CAAK,CAAC,CAAA,GAAIC,2BAAA,CAAc,GAAA,EAAKF,SAAO,CAAA;AACpC,QAAA,IAAA,CAAK,CAAC,CAAA,GAAI,OAAA;AAEV,QAAA,OAAO,gBAAA,CAAiB,cAAcA,SAAA,EAAS,OAAA,EAAS,MAAM,MAAA,CAAO,KAAA,CAAM,OAAA,EAAS,IAAI,CAAC,CAAA;AAAA,MAC3F;AAAA,KACD;AAAA,GACL;AACF;;;;"}
+{"version":3,"file":"instrumentEmail.js","sources":["../../../../../src/instrumentations/worker/instrumentEmail.ts"],"sourcesContent":["import type { EmailMessage } from '@cloudflare/workers-types';\nimport type { AnyExportedHandler } from '../../types';\nimport type { env as cloudflareEnv } from 'cloudflare:workers';\nimport { SENTRY_SEGMENT_NAME_SOURCE, SENTRY_OP } from '@sentry/conventions/attributes';\nimport { FUNCTION } from '@sentry/conventions/op';\nimport { captureException, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan, withIsolationScope } from '@sentry/core';\nimport type { CloudflareOptions } from '../../client';\nimport { flushAndDispose } from '../../flush';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { addCloudResourceContext } from '../../scope-utils';\nimport { init } from '../../sdk';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { setInvocationState } from '../../utils/invocationContext';\nimport { instrumentEnv } from './instrumentEnv';\n\n/**\n * Core email handler logic - wraps execution with Sentry instrumentation.\n */\nfunction wrapEmailHandler(\n  emailMessage: EmailMessage,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n  fn: () => unknown,\n): unknown {\n  return withIsolationScope(isolationScope => {\n    const waitUntil = context.waitUntil.bind(context);\n\n    setInvocationState(isolationScope, { ctx: context });\n\n    const client = init({ ...options, ctx: context });\n    isolationScope.setClient(client);\n\n    addCloudResourceContext(isolationScope);\n\n    return startSpan(\n      {\n        name: `Handle Email ${emailMessage.to}`,\n        attributes: {\n          [SENTRY_OP]: FUNCTION,\n          'faas.trigger': 'email',\n          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.email',\n          [SENTRY_SEGMENT_NAME_SOURCE]: 'task',\n        },\n      },\n      async () => {\n        try {\n          return await fn();\n        } catch (e) {\n          captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.email' } });\n          throw e;\n        } finally {\n          waitUntil(flushAndDispose(client));\n        }\n      },\n    );\n  });\n}\n\n/**\n * Instruments an email handler for ExportedHandler (env/ctx come from args).\n */\nexport function instrumentExportedHandlerEmail<T extends AnyExportedHandler>(\n  handler: T,\n  optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n  if (!('email' in handler) || typeof handler.email !== 'function') {\n    return;\n  }\n\n  handler.email = ensureInstrumented(\n    handler.email,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, args: Parameters<NonNullable<T['email']>>) {\n          const [emailMessage, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          const options = getFinalOptions(optionsCallback(env), env);\n          args[1] = instrumentEnv(env, options);\n          args[2] = context;\n\n          return wrapEmailHandler(emailMessage, options, context, () => target.apply(thisArg, args));\n        },\n      }),\n  );\n}\n"],"names":["withIsolationScope","setInvocationState","init","addCloudResourceContext","startSpan","SENTRY_OP","FUNCTION","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","SENTRY_SEGMENT_NAME_SOURCE","captureException","flushAndDispose","ensureInstrumented","instrumentContext","options","getFinalOptions","instrumentEnv"],"mappings":";;;;;;;;;;;;;;AAmBA,SAAS,gBAAA,CACP,YAAA,EACA,OAAA,EACA,OAAA,EACA,EAAA,EACS;AACT,EAAA,OAAOA,wBAAmB,CAAA,cAAA,KAAkB;AAC1C,IAAA,MAAM,SAAA,GAAY,OAAA,CAAQ,SAAA,CAAU,IAAA,CAAK,OAAO,CAAA;AAEhD,IAAAC,oCAAA,CAAmB,cAAA,EAAgB,EAAE,GAAA,EAAK,OAAA,EAAS,CAAA;AAEnD,IAAA,MAAM,SAASC,QAAA,CAAK,EAAE,GAAG,OAAA,EAAS,GAAA,EAAK,SAAS,CAAA;AAChD,IAAA,cAAA,CAAe,UAAU,MAAM,CAAA;AAE/B,IAAAC,kCAAA,CAAwB,cAAc,CAAA;AAEtC,IAAA,OAAOC,cAAA;AAAA,MACL;AAAA,QACE,IAAA,EAAM,CAAA,aAAA,EAAgB,YAAA,CAAa,EAAE,CAAA,CAAA;AAAA,QACrC,UAAA,EAAY;AAAA,UACV,CAACC,oBAAS,GAAGC,WAAA;AAAA,UACb,cAAA,EAAgB,OAAA;AAAA,UAChB,CAACC,qCAAgC,GAAG,4BAAA;AAAA,UACpC,CAACC,qCAA0B,GAAG;AAAA;AAChC,OACF;AAAA,MACA,YAAY;AACV,QAAA,IAAI;AACF,UAAA,OAAO,MAAM,EAAA,EAAG;AAAA,QAClB,SAAS,CAAA,EAAG;AACV,UAAAC,qBAAA,CAAiB,CAAA,EAAG,EAAE,SAAA,EAAW,EAAE,SAAS,KAAA,EAAO,IAAA,EAAM,4BAAA,EAA6B,EAAG,CAAA;AACzF,UAAA,MAAM,CAAA;AAAA,QACR,CAAA,SAAE;AACA,UAAA,SAAA,CAAUC,qBAAA,CAAgB,MAAM,CAAC,CAAA;AAAA,QACnC;AAAA,MACF;AAAA,KACF;AAAA,EACF,CAAC,CAAA;AACH;AAKO,SAAS,8BAAA,CACd,SACA,eAAA,EACM;AACN,EAAA,IAAI,EAAE,OAAA,IAAW,OAAA,CAAA,IAAY,OAAO,OAAA,CAAQ,UAAU,UAAA,EAAY;AAChE,IAAA;AAAA,EACF;AAEA,EAAA,OAAA,CAAQ,KAAA,GAAQC,6BAAA;AAAA,IACd,OAAA,CAAQ,KAAA;AAAA,IACR,CAAA,QAAA,KACE,IAAI,KAAA,CAAM,QAAA,EAAU;AAAA,MAClB,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAA,EAA2C;AAChE,QAAA,MAAM,CAAC,YAAA,EAAc,GAAA,EAAK,GAAG,CAAA,GAAI,IAAA;AACjC,QAAA,MAAM,OAAA,GAAUC,oCAAkB,GAAG,CAAA;AACrC,QAAA,MAAMC,SAAA,GAAUC,uBAAA,CAAgB,eAAA,CAAgB,GAAG,GAAG,GAAG,CAAA;AACzD,QAAA,IAAA,CAAK,CAAC,CAAA,GAAIC,2BAAA,CAAc,GAAA,EAAKF,SAAO,CAAA;AACpC,QAAA,IAAA,CAAK,CAAC,CAAA,GAAI,OAAA;AAEV,QAAA,OAAO,gBAAA,CAAiB,cAAcA,SAAA,EAAS,OAAA,EAAS,MAAM,MAAA,CAAO,KAAA,CAAM,OAAA,EAAS,IAAI,CAAC,CAAA;AAAA,MAC3F;AAAA,KACD;AAAA,GACL;AACF;;;;"}

package/build/cjs/prod/instrumentations/worker/instrumentEnv.js

@@ -5,6 +5,7 @@ const serverUtils = require('@sentry/server-utils');
 const isBinding = require('../../utils/isBinding.js');
 const instrumentD1 = require('./instrumentD1.js');
 const rpcMeta = require('../../utils/rpcMeta.js');
+const rpcPropagation = require('../../utils/rpcPropagation.js');
 const instrumentDurableObjectNamespace = require('../instrumentDurableObjectNamespace.js');
 const instrumentFetcher = require('./instrumentFetcher.js');
 const instrumentQueueProducer = require('./instrumentQueueProducer.js');
@@ -19,6 +20,7 @@ function instrumentEnv(env, options) {
   if (!env || typeof env !== "object") {
     return env;
   }
+  const shouldPropagateRpcTrace = rpcPropagation.createRpcPropagationResolver(options);
   return new Proxy(env, {
     get(target, prop, receiver) {
       const item = Reflect.get(target, prop, receiver);
@@ -57,11 +59,9 @@ function instrumentEnv(env, options) {
         instrumentedBindings.set(item, instrumented);
         return instrumented;
       }
-      if (options?.enableRpcTracePropagation === false) {
-        return item;
-      }
+      const propagateRpcTrace = shouldPropagateRpcTrace(String(prop));
       if (isBinding.isDurableObjectNamespace(item)) {
-        const instrumented = instrumentDurableObjectNamespace.instrumentDurableObjectNamespace(item);
+        const instrumented = instrumentDurableObjectNamespace.instrumentDurableObjectNamespace(item, propagateRpcTrace);
         instrumentedBindings.set(item, instrumented);
         return instrumented;
       }
@@ -72,7 +72,7 @@ function instrumentEnv(env, options) {
             if (p === "fetch" && typeof value === "function") {
               return instrumentFetcher.instrumentFetcher((...args) => Reflect.apply(value, target2, args));
             }
-            if (typeof value === "function" && typeof p === "string" && !instrumentDurableObjectNamespace.STUB_NON_RPC_METHODS.has(p)) {
+            if (propagateRpcTrace && typeof value === "function" && typeof p === "string" && !instrumentDurableObjectNamespace.STUB_NON_RPC_METHODS.has(p)) {
               return (...args) => Reflect.apply(value, target2, rpcMeta.appendRpcMeta(args));
             }
             return value;

package/build/cjs/prod/instrumentations/worker/instrumentEnv.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentEnv.js","sources":["../../../../../src/instrumentations/worker/instrumentEnv.ts"],"sourcesContent":["import { isObjectLike } from '@sentry/core';\nimport { instrumentWorkersAiClient } from '@sentry/server-utils';\nimport type { CloudflareOptions } from '../../client';\nimport {\n  isAiBinding,\n  isD1Database,\n  isDurableObjectNamespace,\n  isJSRPC,\n  isQueue,\n  isR2Bucket,\n  isRateLimit,\n} from '../../utils/isBinding';\nimport { instrumentD1 } from './instrumentD1';\nimport { appendRpcMeta } from '../../utils/rpcMeta';\nimport { instrumentDurableObjectNamespace, STUB_NON_RPC_METHODS } from '../instrumentDurableObjectNamespace';\nimport { instrumentFetcher } from './instrumentFetcher';\nimport { instrumentQueueProducer } from './instrumentQueueProducer';\nimport { instrumentR2Bucket } from './instrumentR2';\nimport { instrumentRateLimit } from './instrumentRateLimit';\n\nfunction isProxyable(item: unknown): item is object {\n  return isObjectLike(item) || typeof item === 'function';\n}\n\nconst instrumentedBindings = new WeakMap<object, unknown>();\n\n/**\n * Wraps the Cloudflare `env` object in a Proxy that detects binding types\n * on property access and returns instrumented versions.\n *\n * Currently detects:\n * - DurableObjectNamespace (via `idFromName` duck-typing)\n * - Service bindings / JSRPC proxies\n * - Queue producers (via `send` + `sendBatch` duck-typing)\n * - R2 Buckets (via `head` + `put` + `createMultipartUpload` duck-typing)\n * - Rate limiters (via `limit` duck-typing)\n * - Workers AI (via `run` + `gateway` + `toMarkdown` duck-typing)\n *\n * @param env - The Cloudflare env object to instrument\n * @param options - Optional CloudflareOptions to control RPC trace propagation\n */\nexport function instrumentEnv<Env extends Record<string, unknown>>(env: Env, options?: CloudflareOptions): Env {\n  if (!env || typeof env !== 'object') {\n    return env;\n  }\n\n  return new Proxy(env, {\n    get(target, prop, receiver) {\n      const item = Reflect.get(target, prop, receiver);\n\n      if (!isProxyable(item)) {\n        return item;\n      }\n\n      const cached = instrumentedBindings.get(item);\n\n      if (cached) {\n        return cached;\n      }\n\n      if (isD1Database(item)) {\n        const instrumented = instrumentD1(item);\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      if (isQueue(item)) {\n        const bindingName = typeof prop === 'string' ? prop : String(prop);\n        const instrumented = instrumentQueueProducer(item, bindingName);\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      if (isR2Bucket(item)) {\n        const bindingName = typeof prop === 'string' ? prop : String(prop);\n        const instrumented = instrumentR2Bucket(item, bindingName);\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      if (isRateLimit(item)) {\n        const bindingName = typeof prop === 'string' ? prop : String(prop);\n        const instrumented = instrumentRateLimit(item, bindingName);\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      if (isAiBinding(item)) {\n        const instrumented = instrumentWorkersAiClient(item);\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      if (options?.enableRpcTracePropagation === false) {\n        return item;\n      }\n\n      if (isDurableObjectNamespace(item)) {\n        const instrumented = instrumentDurableObjectNamespace(item);\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      if (isJSRPC(item)) {\n        const instrumented = new Proxy(item, {\n          get(target, p) {\n            const value = Reflect.get(target, p);\n\n            if (p === 'fetch' && typeof value === 'function') {\n              return instrumentFetcher((...args) => Reflect.apply(value, target, args));\n            }\n\n            if (typeof value === 'function' && typeof p === 'string' && !STUB_NON_RPC_METHODS.has(p)) {\n              return (...args: unknown[]) => Reflect.apply(value, target, appendRpcMeta(args));\n            }\n\n            return value;\n          },\n        });\n\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      return item;\n    },\n  });\n}\n"],"names":["isObjectLike","isD1Database","instrumentD1","isQueue","instrumentQueueProducer","isR2Bucket","instrumentR2Bucket","isRateLimit","instrumentRateLimit","isAiBinding","instrumentWorkersAiClient","isDurableObjectNamespace","instrumentDurableObjectNamespace","isJSRPC","target","instrumentFetcher","STUB_NON_RPC_METHODS","appendRpcMeta"],"mappings":"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"}
+{"version":3,"file":"instrumentEnv.js","sources":["../../../../../src/instrumentations/worker/instrumentEnv.ts"],"sourcesContent":["import { isObjectLike } from '@sentry/core';\nimport { instrumentWorkersAiClient } from '@sentry/server-utils';\nimport type { CloudflareOptions } from '../../client';\nimport {\n  isAiBinding,\n  isD1Database,\n  isDurableObjectNamespace,\n  isJSRPC,\n  isQueue,\n  isR2Bucket,\n  isRateLimit,\n} from '../../utils/isBinding';\nimport { instrumentD1 } from './instrumentD1';\nimport { appendRpcMeta } from '../../utils/rpcMeta';\nimport { createRpcPropagationResolver } from '../../utils/rpcPropagation';\nimport { instrumentDurableObjectNamespace, STUB_NON_RPC_METHODS } from '../instrumentDurableObjectNamespace';\nimport { instrumentFetcher } from './instrumentFetcher';\nimport { instrumentQueueProducer } from './instrumentQueueProducer';\nimport { instrumentR2Bucket } from './instrumentR2';\nimport { instrumentRateLimit } from './instrumentRateLimit';\n\nfunction isProxyable(item: unknown): item is object {\n  return isObjectLike(item) || typeof item === 'function';\n}\n\nconst instrumentedBindings = new WeakMap<object, unknown>();\n\n/**\n * Wraps the Cloudflare `env` object in a Proxy that detects binding types\n * on property access and returns instrumented versions.\n *\n * Currently detects:\n * - DurableObjectNamespace (via `idFromName` duck-typing)\n * - Service bindings / JSRPC proxies\n * - Queue producers (via `send` + `sendBatch` duck-typing)\n * - R2 Buckets (via `head` + `put` + `createMultipartUpload` duck-typing)\n * - Rate limiters (via `limit` duck-typing)\n * - Workers AI (via `run` + `gateway` + `toMarkdown` duck-typing)\n *\n * @param env - The Cloudflare env object to instrument\n * @param options - Optional CloudflareOptions to control RPC trace propagation\n */\nexport function instrumentEnv<Env extends Record<string, unknown>>(env: Env, options?: CloudflareOptions): Env {\n  if (!env || typeof env !== 'object') {\n    return env;\n  }\n\n  const shouldPropagateRpcTrace = createRpcPropagationResolver(options);\n\n  return new Proxy(env, {\n    get(target, prop, receiver) {\n      const item = Reflect.get(target, prop, receiver);\n\n      if (!isProxyable(item)) {\n        return item;\n      }\n\n      const cached = instrumentedBindings.get(item);\n\n      if (cached) {\n        return cached;\n      }\n\n      if (isD1Database(item)) {\n        const instrumented = instrumentD1(item);\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      if (isQueue(item)) {\n        const bindingName = typeof prop === 'string' ? prop : String(prop);\n        const instrumented = instrumentQueueProducer(item, bindingName);\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      if (isR2Bucket(item)) {\n        const bindingName = typeof prop === 'string' ? prop : String(prop);\n        const instrumented = instrumentR2Bucket(item, bindingName);\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      if (isRateLimit(item)) {\n        const bindingName = typeof prop === 'string' ? prop : String(prop);\n        const instrumented = instrumentRateLimit(item, bindingName);\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      if (isAiBinding(item)) {\n        const instrumented = instrumentWorkersAiClient(item);\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      const propagateRpcTrace = shouldPropagateRpcTrace(String(prop));\n\n      if (isDurableObjectNamespace(item)) {\n        const instrumented = instrumentDurableObjectNamespace(item, propagateRpcTrace);\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      if (isJSRPC(item)) {\n        const instrumented = new Proxy(item, {\n          get(target, p) {\n            const value = Reflect.get(target, p);\n\n            if (p === '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 p === 'string' &&\n              !STUB_NON_RPC_METHODS.has(p)\n            ) {\n              return (...args: unknown[]) => Reflect.apply(value, target, appendRpcMeta(args));\n            }\n\n            return value;\n          },\n        });\n\n        instrumentedBindings.set(item, instrumented);\n        return instrumented;\n      }\n\n      return item;\n    },\n  });\n}\n"],"names":["isObjectLike","createRpcPropagationResolver","isD1Database","instrumentD1","isQueue","instrumentQueueProducer","isR2Bucket","instrumentR2Bucket","isRateLimit","instrumentRateLimit","isAiBinding","instrumentWorkersAiClient","isDurableObjectNamespace","instrumentDurableObjectNamespace","isJSRPC","target","instrumentFetcher","STUB_NON_RPC_METHODS","appendRpcMeta"],"mappings":"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"}

package/build/cjs/prod/instrumentations/worker/instrumentFetch.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const instrument = require('../../instrument.js');
 const options = require('../../options.js');
-const request = require('../../request.js');
+const wrapRequestHandlerWithInit = require('../../wrapRequestHandlerWithInit.js');
 const sdk = require('../../sdk.js');
 const instrumentContext = require('../../utils/instrumentContext.js');
 const instrumentEnv = require('./instrumentEnv.js');
@@ -16,15 +16,15 @@ function instrumentExportedHandlerFetch(handler, optionsCallback) {
     (original) => new Proxy(original, {
       apply(target, thisArg, args) {
         const [rawRequest, env, ctx] = args;
-        const request$1 = rawRequest;
-        if (request$1.method === "OPTIONS" || request$1.method === "HEAD") {
+        const request = rawRequest;
+        if (request.method === "OPTIONS" || request.method === "HEAD") {
           return target.apply(thisArg, args);
         }
         const context = instrumentContext.instrumentContext(ctx);
         const options$1 = options.getFinalOptions(optionsCallback(env), env);
         args[1] = instrumentEnv.instrumentEnv(env, options$1);
         args[2] = context;
-        return request.wrapRequestHandlerWithInit({ options: options$1, request: request$1, context }, () => target.apply(thisArg, args), sdk.init);
+        return wrapRequestHandlerWithInit.wrapRequestHandlerWithInit({ options: options$1, request, context }, () => target.apply(thisArg, args), sdk.init);
       }
     })
   );
@@ -36,12 +36,12 @@ function instrumentWorkerEntrypointFetch(instance, options, context) {
   const original = instance.fetch.bind(instance);
   instance.fetch = new Proxy(original, {
     apply(target, thisArg, args) {
-      const [request$1] = args;
-      if (request$1.method === "OPTIONS" || request$1.method === "HEAD") {
+      const [request] = args;
+      if (request.method === "OPTIONS" || request.method === "HEAD") {
         return Reflect.apply(target, thisArg, args);
       }
-      return request.wrapRequestHandlerWithInit(
-        { options, request: request$1, context },
+      return wrapRequestHandlerWithInit.wrapRequestHandlerWithInit(
+        { options, request, context },
         () => Reflect.apply(target, thisArg, args),
         sdk.init
       );

package/build/cjs/prod/instrumentations/worker/instrumentFetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentFetch.js","sources":["../../../../../src/instrumentations/worker/instrumentFetch.ts"],"sourcesContent":["import type { AnyExportedHandler } from '../../types';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport type { CloudflareOptions } from '../../client';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { wrapRequestHandlerWithInit } from '../../request';\nimport { init } from '../../sdk';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { instrumentEnv } from './instrumentEnv';\n\n/**\n * Instruments a fetch handler for ExportedHandler (env/ctx come from args).\n */\nexport function instrumentExportedHandlerFetch<T extends AnyExportedHandler>(\n  handler: T,\n  optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n  if (!('fetch' in handler) || typeof handler.fetch !== 'function') {\n    return;\n  }\n\n  handler.fetch = ensureInstrumented(\n    handler.fetch,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, args: Parameters<NonNullable<T['fetch']>>) {\n          const [rawRequest, env, ctx] = args;\n          // `T['fetch']` resolves to the structural `AnyHandlerMethod`, whose parameters are\n          // `any` — but the fetch event is always a `Request` at runtime.\n          const request = rawRequest as Request;\n\n          if (request.method === 'OPTIONS' || request.method === 'HEAD') {\n            return target.apply(thisArg, args);\n          }\n\n          const context = instrumentContext(ctx);\n          const options = getFinalOptions(optionsCallback(env), env);\n          args[1] = instrumentEnv(env, options);\n          args[2] = context;\n\n          return wrapRequestHandlerWithInit({ options, request, context }, () => target.apply(thisArg, args), init);\n        },\n      }),\n  );\n}\n\n/**\n * Instruments a fetch method for WorkerEntrypoint (options/context already available).\n */\nexport function instrumentWorkerEntrypointFetch<T extends WorkerEntrypoint>(\n  instance: T,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n): void {\n  if (!instance.fetch) {\n    return;\n  }\n\n  const original = instance.fetch.bind(instance);\n  instance.fetch = new Proxy(original, {\n    apply(target, thisArg, args: [Request]) {\n      const [request] = args;\n\n      if (request.method === 'OPTIONS' || request.method === 'HEAD') {\n        return Reflect.apply(target, thisArg, args);\n      }\n\n      return wrapRequestHandlerWithInit(\n        { options, request, context },\n        () => Reflect.apply(target, thisArg, args),\n        init,\n      );\n    },\n  });\n}\n"],"names":["ensureInstrumented","request","instrumentContext","options","getFinalOptions","instrumentEnv","wrapRequestHandlerWithInit","init"],"mappings":";;;;;;;;;AAaO,SAAS,8BAAA,CACd,SACA,eAAA,EACM;AACN,EAAA,IAAI,EAAE,OAAA,IAAW,OAAA,CAAA,IAAY,OAAO,OAAA,CAAQ,UAAU,UAAA,EAAY;AAChE,IAAA;AAAA,EACF;AAEA,EAAA,OAAA,CAAQ,KAAA,GAAQA,6BAAA;AAAA,IACd,OAAA,CAAQ,KAAA;AAAA,IACR,CAAA,QAAA,KACE,IAAI,KAAA,CAAM,QAAA,EAAU;AAAA,MAClB,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAA,EAA2C;AAChE,QAAA,MAAM,CAAC,UAAA,EAAY,GAAA,EAAK,GAAG,CAAA,GAAI,IAAA;AAG/B,QAAA,MAAMC,SAAA,GAAU,UAAA;AAEhB,QAAA,IAAIA,SAAA,CAAQ,MAAA,KAAW,SAAA,IAAaA,SAAA,CAAQ,WAAW,MAAA,EAAQ;AAC7D,UAAA,OAAO,MAAA,CAAO,KAAA,CAAM,OAAA,EAAS,IAAI,CAAA;AAAA,QACnC;AAEA,QAAA,MAAM,OAAA,GAAUC,oCAAkB,GAAG,CAAA;AACrC,QAAA,MAAMC,SAAA,GAAUC,uBAAA,CAAgB,eAAA,CAAgB,GAAG,GAAG,GAAG,CAAA;AACzD,QAAA,IAAA,CAAK,CAAC,CAAA,GAAIC,2BAAA,CAAc,GAAA,EAAKF,SAAO,CAAA;AACpC,QAAA,IAAA,CAAK,CAAC,CAAA,GAAI,OAAA;AAEV,QAAA,OAAOG,kCAAA,CAA2B,WAAEH,SAAA,WAASF,SAAA,EAAS,OAAA,EAAQ,EAAG,MAAM,MAAA,CAAO,KAAA,CAAM,OAAA,EAAS,IAAI,CAAA,EAAGM,QAAI,CAAA;AAAA,MAC1G;AAAA,KACD;AAAA,GACL;AACF;AAKO,SAAS,+BAAA,CACd,QAAA,EACA,OAAA,EACA,OAAA,EACM;AACN,EAAA,IAAI,CAAC,SAAS,KAAA,EAAO;AACnB,IAAA;AAAA,EACF;AAEA,EAAA,MAAM,QAAA,GAAW,QAAA,CAAS,KAAA,CAAM,IAAA,CAAK,QAAQ,CAAA;AAC7C,EAAA,QAAA,CAAS,KAAA,GAAQ,IAAI,KAAA,CAAM,QAAA,EAAU;AAAA,IACnC,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAA,EAAiB;AACtC,MAAA,MAAM,CAACN,SAAO,CAAA,GAAI,IAAA;AAElB,MAAA,IAAIA,SAAA,CAAQ,MAAA,KAAW,SAAA,IAAaA,SAAA,CAAQ,WAAW,MAAA,EAAQ;AAC7D,QAAA,OAAO,OAAA,CAAQ,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAI,CAAA;AAAA,MAC5C;AAEA,MAAA,OAAOK,kCAAA;AAAA,QACL,EAAE,OAAA,WAASL,SAAA,EAAS,OAAA,EAAQ;AAAA,QAC5B,MAAM,OAAA,CAAQ,KAAA,CAAM,MAAA,EAAQ,SAAS,IAAI,CAAA;AAAA,QACzCM;AAAA,OACF;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;;"}
+{"version":3,"file":"instrumentFetch.js","sources":["../../../../../src/instrumentations/worker/instrumentFetch.ts"],"sourcesContent":["import type { AnyExportedHandler } from '../../types';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport type { CloudflareOptions } from '../../client';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { wrapRequestHandlerWithInit } from '../../wrapRequestHandlerWithInit';\nimport { init } from '../../sdk';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { instrumentEnv } from './instrumentEnv';\n\n/**\n * Instruments a fetch handler for ExportedHandler (env/ctx come from args).\n */\nexport function instrumentExportedHandlerFetch<T extends AnyExportedHandler>(\n  handler: T,\n  optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n  if (!('fetch' in handler) || typeof handler.fetch !== 'function') {\n    return;\n  }\n\n  handler.fetch = ensureInstrumented(\n    handler.fetch,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, args: Parameters<NonNullable<T['fetch']>>) {\n          const [rawRequest, env, ctx] = args;\n          // `T['fetch']` resolves to the structural `AnyHandlerMethod`, whose parameters are\n          // `any` — but the fetch event is always a `Request` at runtime.\n          const request = rawRequest as Request;\n\n          if (request.method === 'OPTIONS' || request.method === 'HEAD') {\n            return target.apply(thisArg, args);\n          }\n\n          const context = instrumentContext(ctx);\n          const options = getFinalOptions(optionsCallback(env), env);\n          args[1] = instrumentEnv(env, options);\n          args[2] = context;\n\n          return wrapRequestHandlerWithInit({ options, request, context }, () => target.apply(thisArg, args), init);\n        },\n      }),\n  );\n}\n\n/**\n * Instruments a fetch method for WorkerEntrypoint (options/context already available).\n */\nexport function instrumentWorkerEntrypointFetch<T extends WorkerEntrypoint>(\n  instance: T,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n): void {\n  if (!instance.fetch) {\n    return;\n  }\n\n  const original = instance.fetch.bind(instance);\n  instance.fetch = new Proxy(original, {\n    apply(target, thisArg, args: [Request]) {\n      const [request] = args;\n\n      if (request.method === 'OPTIONS' || request.method === 'HEAD') {\n        return Reflect.apply(target, thisArg, args);\n      }\n\n      return wrapRequestHandlerWithInit(\n        { options, request, context },\n        () => Reflect.apply(target, thisArg, args),\n        init,\n      );\n    },\n  });\n}\n"],"names":["ensureInstrumented","instrumentContext","options","getFinalOptions","instrumentEnv","wrapRequestHandlerWithInit","init"],"mappings":";;;;;;;;;AAaO,SAAS,8BAAA,CACd,SACA,eAAA,EACM;AACN,EAAA,IAAI,EAAE,OAAA,IAAW,OAAA,CAAA,IAAY,OAAO,OAAA,CAAQ,UAAU,UAAA,EAAY;AAChE,IAAA;AAAA,EACF;AAEA,EAAA,OAAA,CAAQ,KAAA,GAAQA,6BAAA;AAAA,IACd,OAAA,CAAQ,KAAA;AAAA,IACR,CAAA,QAAA,KACE,IAAI,KAAA,CAAM,QAAA,EAAU;AAAA,MAClB,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAA,EAA2C;AAChE,QAAA,MAAM,CAAC,UAAA,EAAY,GAAA,EAAK,GAAG,CAAA,GAAI,IAAA;AAG/B,QAAA,MAAM,OAAA,GAAU,UAAA;AAEhB,QAAA,IAAI,OAAA,CAAQ,MAAA,KAAW,SAAA,IAAa,OAAA,CAAQ,WAAW,MAAA,EAAQ;AAC7D,UAAA,OAAO,MAAA,CAAO,KAAA,CAAM,OAAA,EAAS,IAAI,CAAA;AAAA,QACnC;AAEA,QAAA,MAAM,OAAA,GAAUC,oCAAkB,GAAG,CAAA;AACrC,QAAA,MAAMC,SAAA,GAAUC,uBAAA,CAAgB,eAAA,CAAgB,GAAG,GAAG,GAAG,CAAA;AACzD,QAAA,IAAA,CAAK,CAAC,CAAA,GAAIC,2BAAA,CAAc,GAAA,EAAKF,SAAO,CAAA;AACpC,QAAA,IAAA,CAAK,CAAC,CAAA,GAAI,OAAA;AAEV,QAAA,OAAOG,qDAAA,CAA2B,WAAEH,SAAA,EAAS,OAAA,EAAS,OAAA,EAAQ,EAAG,MAAM,MAAA,CAAO,KAAA,CAAM,OAAA,EAAS,IAAI,CAAA,EAAGI,QAAI,CAAA;AAAA,MAC1G;AAAA,KACD;AAAA,GACL;AACF;AAKO,SAAS,+BAAA,CACd,QAAA,EACA,OAAA,EACA,OAAA,EACM;AACN,EAAA,IAAI,CAAC,SAAS,KAAA,EAAO;AACnB,IAAA;AAAA,EACF;AAEA,EAAA,MAAM,QAAA,GAAW,QAAA,CAAS,KAAA,CAAM,IAAA,CAAK,QAAQ,CAAA;AAC7C,EAAA,QAAA,CAAS,KAAA,GAAQ,IAAI,KAAA,CAAM,QAAA,EAAU;AAAA,IACnC,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAA,EAAiB;AACtC,MAAA,MAAM,CAAC,OAAO,CAAA,GAAI,IAAA;AAElB,MAAA,IAAI,OAAA,CAAQ,MAAA,KAAW,SAAA,IAAa,OAAA,CAAQ,WAAW,MAAA,EAAQ;AAC7D,QAAA,OAAO,OAAA,CAAQ,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAI,CAAA;AAAA,MAC5C;AAEA,MAAA,OAAOD,qDAAA;AAAA,QACL,EAAE,OAAA,EAAS,OAAA,EAAS,OAAA,EAAQ;AAAA,QAC5B,MAAM,OAAA,CAAQ,KAAA,CAAM,MAAA,EAAQ,SAAS,IAAI,CAAA;AAAA,QACzCC;AAAA,OACF;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;;"}

package/build/cjs/prod/instrumentations/worker/instrumentQueue.js

@@ -9,11 +9,13 @@ const options = require('../../options.js');
 const scopeUtils = require('../../scope-utils.js');
 const sdk = require('../../sdk.js');
 const instrumentContext = require('../../utils/instrumentContext.js');
+const invocationContext = require('../../utils/invocationContext.js');
 const instrumentEnv = require('./instrumentEnv.js');
 
 function wrapQueueHandler(batch, options, context, fn) {
   return core.withIsolationScope((isolationScope) => {
     const waitUntil = context.waitUntil.bind(context);
+    invocationContext.setInvocationState(isolationScope, { ctx: context });
     const client = sdk.init({ ...options, ctx: context });
     isolationScope.setClient(client);
     scopeUtils.addCloudResourceContext(isolationScope);
@@ -21,7 +23,7 @@ function wrapQueueHandler(batch, options, context, fn) {
       {
         name: `process ${batch.queue}`,
         attributes: {
-          [attributes.SENTRY_OP]: op.MESSAGING_QUEUE_PROCESS_SPAN_OP,
+          [attributes.SENTRY_OP]: op.QUEUE_PROCESS,
           "faas.trigger": "pubsub",
           "messaging.destination.name": batch.queue,
           "messaging.system": "cloudflare",
@@ -30,7 +32,7 @@ function wrapQueueHandler(batch, options, context, fn) {
           "messaging.batch.message_count": batch.messages.length,
           "messaging.message.retry.count": batch.messages.reduce((acc, message) => acc + message.attempts - 1, 0),
           [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.faas.cloudflare.queue",
-          [core.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: "task"
+          [attributes.SENTRY_SEGMENT_NAME_SOURCE]: "task"
         }
       },
       async () => {

package/build/cjs/prod/instrumentations/worker/instrumentQueue.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentQueue.js","sources":["../../../../../src/instrumentations/worker/instrumentQueue.ts"],"sourcesContent":["import type { MessageBatch } from '@cloudflare/workers-types';\nimport type { AnyExportedHandler } from '../../types';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport { SENTRY_OP } from '@sentry/conventions/attributes';\nimport { MESSAGING_QUEUE_PROCESS_SPAN_OP } from '@sentry/conventions/op';\nimport {\n  captureException,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  startSpan,\n  withIsolationScope,\n} from '@sentry/core';\nimport type { CloudflareOptions } from '../../client';\nimport { flushAndDispose } from '../../flush';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { addCloudResourceContext } from '../../scope-utils';\nimport { init } from '../../sdk';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { instrumentEnv } from './instrumentEnv';\n\n/**\n * Core queue handler logic - wraps execution with Sentry instrumentation.\n */\nfunction wrapQueueHandler(\n  batch: MessageBatch,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n  fn: () => unknown,\n): unknown {\n  return withIsolationScope(isolationScope => {\n    const waitUntil = context.waitUntil.bind(context);\n\n    const client = init({ ...options, ctx: context });\n    isolationScope.setClient(client);\n\n    addCloudResourceContext(isolationScope);\n\n    return startSpan(\n      {\n        name: `process ${batch.queue}`,\n        attributes: {\n          [SENTRY_OP]: MESSAGING_QUEUE_PROCESS_SPAN_OP,\n          'faas.trigger': 'pubsub',\n          'messaging.destination.name': batch.queue,\n          'messaging.system': 'cloudflare',\n          'messaging.operation.type': 'process',\n          'messaging.operation.name': 'process',\n          'messaging.batch.message_count': batch.messages.length,\n          'messaging.message.retry.count': batch.messages.reduce((acc, message) => acc + message.attempts - 1, 0),\n          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.queue',\n          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n        },\n      },\n      async () => {\n        try {\n          return await fn();\n        } catch (e) {\n          captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.queue' } });\n          throw e;\n        } finally {\n          waitUntil(flushAndDispose(client));\n        }\n      },\n    );\n  });\n}\n\n/**\n * Instruments a queue handler for ExportedHandler (env/ctx come from args).\n */\nexport function instrumentExportedHandlerQueue<T extends AnyExportedHandler>(\n  handler: T,\n  optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n  if (!('queue' in handler) || typeof handler.queue !== 'function') {\n    return;\n  }\n\n  handler.queue = ensureInstrumented(\n    handler.queue,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, args: Parameters<NonNullable<T['queue']>>) {\n          const [batch, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          const options = getFinalOptions(optionsCallback(env), env);\n          args[1] = instrumentEnv(env, options);\n          args[2] = context;\n\n          return wrapQueueHandler(batch, options, context, () => target.apply(thisArg, args));\n        },\n      }),\n  );\n}\n\n/**\n * Instruments a queue method for WorkerEntrypoint (options/context already available).\n */\nexport function instrumentWorkerEntrypointQueue<T extends WorkerEntrypoint>(\n  instance: T,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n): void {\n  if (!instance.queue) {\n    return;\n  }\n\n  const original = instance.queue.bind(instance);\n  instance.queue = new Proxy(original, {\n    apply(target, thisArg, args: [MessageBatch]) {\n      const [batch] = args;\n\n      return wrapQueueHandler(batch, options, context, () => Reflect.apply(target, thisArg, args));\n    },\n  });\n}\n"],"names":["withIsolationScope","init","addCloudResourceContext","startSpan","SENTRY_OP","MESSAGING_QUEUE_PROCESS_SPAN_OP","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","captureException","flushAndDispose","ensureInstrumented","instrumentContext","options","getFinalOptions","instrumentEnv"],"mappings":"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"}
+{"version":3,"file":"instrumentQueue.js","sources":["../../../../../src/instrumentations/worker/instrumentQueue.ts"],"sourcesContent":["import type { MessageBatch } from '@cloudflare/workers-types';\nimport type { AnyExportedHandler } from '../../types';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport { SENTRY_SEGMENT_NAME_SOURCE, SENTRY_OP } from '@sentry/conventions/attributes';\nimport { QUEUE_PROCESS } from '@sentry/conventions/op';\nimport { captureException, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan, withIsolationScope } from '@sentry/core';\nimport type { CloudflareOptions } from '../../client';\nimport { flushAndDispose } from '../../flush';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { addCloudResourceContext } from '../../scope-utils';\nimport { init } from '../../sdk';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { setInvocationState } from '../../utils/invocationContext';\nimport { instrumentEnv } from './instrumentEnv';\n\n/**\n * Core queue handler logic - wraps execution with Sentry instrumentation.\n */\nfunction wrapQueueHandler(\n  batch: MessageBatch,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n  fn: () => unknown,\n): unknown {\n  return withIsolationScope(isolationScope => {\n    const waitUntil = context.waitUntil.bind(context);\n\n    setInvocationState(isolationScope, { ctx: context });\n\n    const client = init({ ...options, ctx: context });\n    isolationScope.setClient(client);\n\n    addCloudResourceContext(isolationScope);\n\n    return startSpan(\n      {\n        name: `process ${batch.queue}`,\n        attributes: {\n          [SENTRY_OP]: QUEUE_PROCESS,\n          'faas.trigger': 'pubsub',\n          'messaging.destination.name': batch.queue,\n          'messaging.system': 'cloudflare',\n          'messaging.operation.type': 'process',\n          'messaging.operation.name': 'process',\n          'messaging.batch.message_count': batch.messages.length,\n          'messaging.message.retry.count': batch.messages.reduce((acc, message) => acc + message.attempts - 1, 0),\n          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.queue',\n          [SENTRY_SEGMENT_NAME_SOURCE]: 'task',\n        },\n      },\n      async () => {\n        try {\n          return await fn();\n        } catch (e) {\n          captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.queue' } });\n          throw e;\n        } finally {\n          waitUntil(flushAndDispose(client));\n        }\n      },\n    );\n  });\n}\n\n/**\n * Instruments a queue handler for ExportedHandler (env/ctx come from args).\n */\nexport function instrumentExportedHandlerQueue<T extends AnyExportedHandler>(\n  handler: T,\n  optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n  if (!('queue' in handler) || typeof handler.queue !== 'function') {\n    return;\n  }\n\n  handler.queue = ensureInstrumented(\n    handler.queue,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, args: Parameters<NonNullable<T['queue']>>) {\n          const [batch, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          const options = getFinalOptions(optionsCallback(env), env);\n          args[1] = instrumentEnv(env, options);\n          args[2] = context;\n\n          return wrapQueueHandler(batch, options, context, () => target.apply(thisArg, args));\n        },\n      }),\n  );\n}\n\n/**\n * Instruments a queue method for WorkerEntrypoint (options/context already available).\n */\nexport function instrumentWorkerEntrypointQueue<T extends WorkerEntrypoint>(\n  instance: T,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n): void {\n  if (!instance.queue) {\n    return;\n  }\n\n  const original = instance.queue.bind(instance);\n  instance.queue = new Proxy(original, {\n    apply(target, thisArg, args: [MessageBatch]) {\n      const [batch] = args;\n\n      return wrapQueueHandler(batch, options, context, () => Reflect.apply(target, thisArg, args));\n    },\n  });\n}\n"],"names":["withIsolationScope","setInvocationState","init","addCloudResourceContext","startSpan","SENTRY_OP","QUEUE_PROCESS","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","SENTRY_SEGMENT_NAME_SOURCE","captureException","flushAndDispose","ensureInstrumented","instrumentContext","options","getFinalOptions","instrumentEnv"],"mappings":"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"}

package/build/cjs/prod/instrumentations/worker/instrumentR2.js

@@ -1,28 +1,30 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
+const attributes = require('@sentry/conventions/attributes');
+const op = require('@sentry/conventions/op');
 const core = require('@sentry/core');
 
 const ORIGIN = "auto.faas.cloudflare.r2";
 const R2_OPERATIONS = {
-  get: { spanName: "r2_get", op: "object.get", operation: "GetObject" },
-  head: { spanName: "r2_head", op: "object.head", operation: "HeadObject" },
-  put: { spanName: "r2_put", op: "object.put", operation: "PutObject" },
-  delete: { spanName: "r2_delete", op: "object.delete", operation: "DeleteObject" },
-  list: { spanName: "r2_list", op: "object.list", operation: "ListObjects" },
-  uploadPart: { spanName: "r2_uploadPart", op: "object.upload_part", operation: "UploadPart" },
+  get: { spanName: "r2_get", op: op.OBJECT_GET, operation: "GetObject" },
+  head: { spanName: "r2_head", op: op.OBJECT_HEAD, operation: "HeadObject" },
+  put: { spanName: "r2_put", op: op.OBJECT_PUT, operation: "PutObject" },
+  delete: { spanName: "r2_delete", op: op.OBJECT_DELETE, operation: "DeleteObject" },
+  list: { spanName: "r2_list", op: op.OBJECT_LIST, operation: "ListObjects" },
+  uploadPart: { spanName: "r2_uploadPart", op: op.OBJECT_UPLOAD_PART, operation: "UploadPart" },
   abortMultipartUpload: {
     spanName: "r2_abortMultipartUpload",
-    op: "object.multipart_upload.abort",
+    op: op.OBJECT_MULTIPART_UPLOAD_ABORT,
     operation: "AbortMultipartUpload"
   },
   createMultipartUpload: {
     spanName: "r2_createMultipartUpload",
-    op: "object.multipart_upload.create",
+    op: op.OBJECT_MULTIPART_UPLOAD_CREATE,
     operation: "CreateMultipartUpload"
   },
   completeMultipartUpload: {
     spanName: "r2_completeMultipartUpload",
-    op: "object.multipart_upload.complete",
+    op: op.OBJECT_MULTIPART_UPLOAD_COMPLETE,
     operation: "CompleteMultipartUpload"
   }
 };
@@ -36,12 +38,12 @@ function createSpanOptions(bindingName, r2Op, key) {
     op,
     name: spanName,
     attributes: {
-      "cloudflare.r2.operation": operation,
-      "cloudflare.r2.bucket": bindingName,
-      ...requestKey !== void 0 && { "cloudflare.r2.request.key": requestKey },
-      ...isR2ListOptions(key) && key.prefix !== void 0 && { "cloudflare.r2.request.prefix": key.prefix },
-      ...isR2ListOptions(key) && key.delimiter !== void 0 && { "cloudflare.r2.request.delimiter": key.delimiter },
-      [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: op,
+      [attributes.CLOUDFLARE_R2_OPERATION]: operation,
+      [attributes.CLOUDFLARE_R2_BUCKET]: bindingName,
+      ...requestKey !== void 0 && { [attributes.CLOUDFLARE_R2_REQUEST_KEY]: requestKey },
+      ...isR2ListOptions(key) && key.prefix !== void 0 && { [attributes.CLOUDFLARE_R2_REQUEST_PREFIX]: key.prefix },
+      ...isR2ListOptions(key) && key.delimiter !== void 0 && { [attributes.CLOUDFLARE_R2_REQUEST_DELIMITER]: key.delimiter },
+      [attributes.SENTRY_OP]: op,
       [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN
     }
   };
@@ -54,12 +56,13 @@ function instrumentR2MultipartUpload(upload, bindingName) {
         const original = Reflect.get(target, prop, receiver);
         return function(...args) {
           const [partNumber] = args;
+          const spanOptions = createSpanOptions(bindingName, "uploadPart", key);
           return core.startSpan(
             {
-              ...createSpanOptions(bindingName, "uploadPart", key),
+              ...spanOptions,
               attributes: {
-                ...createSpanOptions(bindingName, "uploadPart", key).attributes,
-                "cloudflare.r2.request.part_number": partNumber
+                ...spanOptions.attributes,
+                [attributes.CLOUDFLARE_R2_REQUEST_PART_NUMBER]: partNumber
               }
             },
             () => Reflect.apply(original, target, args)

package/build/cjs/prod/instrumentations/worker/instrumentR2.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentR2.js","sources":["../../../../../src/instrumentations/worker/instrumentR2.ts"],"sourcesContent":["import type { R2Bucket, R2ListOptions, R2MultipartUpload } from '@cloudflare/workers-types';\nimport { isObjectLike, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/core';\n\nconst ORIGIN = 'auto.faas.cloudflare.r2';\n\nconst R2_OPERATIONS = {\n  get: { spanName: 'r2_get', op: 'object.get', operation: 'GetObject' },\n  head: { spanName: 'r2_head', op: 'object.head', operation: 'HeadObject' },\n  put: { spanName: 'r2_put', op: 'object.put', operation: 'PutObject' },\n  delete: { spanName: 'r2_delete', op: 'object.delete', operation: 'DeleteObject' },\n  list: { spanName: 'r2_list', op: 'object.list', operation: 'ListObjects' },\n  uploadPart: { spanName: 'r2_uploadPart', op: 'object.upload_part', operation: 'UploadPart' },\n  abortMultipartUpload: {\n    spanName: 'r2_abortMultipartUpload',\n    op: 'object.multipart_upload.abort',\n    operation: 'AbortMultipartUpload',\n  },\n  createMultipartUpload: {\n    spanName: 'r2_createMultipartUpload',\n    op: 'object.multipart_upload.create',\n    operation: 'CreateMultipartUpload',\n  },\n  completeMultipartUpload: {\n    spanName: 'r2_completeMultipartUpload',\n    op: 'object.multipart_upload.complete',\n    operation: 'CompleteMultipartUpload',\n  },\n} as const;\n\ntype R2OperationKey = keyof typeof R2_OPERATIONS;\n\nfunction isR2ListOptions(key: unknown): key is R2ListOptions {\n  return isObjectLike(key) && !Array.isArray(key);\n}\n\nfunction createSpanOptions(bindingName: string, r2Op: R2OperationKey, key?: string | string[] | R2ListOptions) {\n  const { spanName, op, operation } = R2_OPERATIONS[r2Op];\n  const requestKey = Array.isArray(key) ? key.join(', ') : typeof key === 'string' ? key : undefined;\n\n  return {\n    op,\n    name: spanName,\n    attributes: {\n      'cloudflare.r2.operation': operation,\n      'cloudflare.r2.bucket': bindingName,\n      ...(requestKey !== undefined && { 'cloudflare.r2.request.key': requestKey }),\n      ...(isR2ListOptions(key) && key.prefix !== undefined && { 'cloudflare.r2.request.prefix': key.prefix }),\n      ...(isR2ListOptions(key) && key.delimiter !== undefined && { 'cloudflare.r2.request.delimiter': key.delimiter }),\n      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: op,\n      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,\n    },\n  };\n}\n\nfunction instrumentR2MultipartUpload(upload: R2MultipartUpload, bindingName: string): R2MultipartUpload {\n  const { key } = upload;\n\n  return new Proxy(upload, {\n    get(target, prop, receiver) {\n      if (prop === 'uploadPart') {\n        const original = Reflect.get(target, prop, receiver);\n\n        return function (this: unknown, ...args: Parameters<R2MultipartUpload['uploadPart']>) {\n          const [partNumber] = args;\n\n          return startSpan(\n            {\n              ...createSpanOptions(bindingName, 'uploadPart', key),\n              attributes: {\n                ...createSpanOptions(bindingName, 'uploadPart', key).attributes,\n                'cloudflare.r2.request.part_number': partNumber,\n              },\n            },\n            () => Reflect.apply(original, target, args),\n          );\n        };\n      }\n\n      if (prop === 'abort') {\n        const original = Reflect.get(target, prop, receiver);\n\n        return function (this: unknown) {\n          return startSpan(createSpanOptions(bindingName, 'abortMultipartUpload', key), () =>\n            Reflect.apply(original, target, []),\n          );\n        };\n      }\n\n      if (prop === 'complete') {\n        const original = Reflect.get(target, prop, receiver);\n\n        return function (this: unknown, ...args: Parameters<R2MultipartUpload['complete']>) {\n          return startSpan(createSpanOptions(bindingName, 'completeMultipartUpload', key), () =>\n            Reflect.apply(original, target, args),\n          );\n        };\n      }\n\n      return Reflect.get(target, prop, receiver);\n    },\n  });\n}\n\n/**\n * Wraps a Cloudflare R2 Bucket binding to create spans on bucket operations.\n *\n * Instrumented methods: get, head, put, delete, list, createMultipartUpload,\n * resumeMultipartUpload (and the resulting multipart upload operations).\n */\nexport function instrumentR2Bucket<T extends R2Bucket>(bucket: T, bindingName: string): T {\n  return new Proxy(bucket, {\n    get(target, prop, receiver) {\n      if (prop === 'get' || prop === 'head' || prop === 'put' || prop === 'delete' || prop === 'list') {\n        const original = Reflect.get(target, prop, receiver);\n\n        return function (this: unknown, ...args: Parameters<R2Bucket[typeof prop]>) {\n          const [key] = args;\n\n          return startSpan(createSpanOptions(bindingName, prop, key), () => Reflect.apply(original, target, args));\n        };\n      }\n\n      if (prop === 'createMultipartUpload') {\n        const original = Reflect.get(target, prop, receiver) as R2Bucket['createMultipartUpload'];\n\n        return function (this: unknown, ...args: Parameters<R2Bucket['createMultipartUpload']>) {\n          const [key] = args;\n\n          return startSpan(createSpanOptions(bindingName, 'createMultipartUpload', key), async () => {\n            const upload = await Reflect.apply(original, target, args);\n            return instrumentR2MultipartUpload(upload, bindingName);\n          });\n        };\n      }\n\n      if (prop === 'resumeMultipartUpload') {\n        const original = Reflect.get(target, prop, receiver);\n\n        return function (this: unknown, ...args: Parameters<R2Bucket['resumeMultipartUpload']>) {\n          const upload = Reflect.apply(original, target, args);\n\n          return instrumentR2MultipartUpload(upload, bindingName);\n        };\n      }\n\n      return Reflect.get(target, prop, receiver);\n    },\n  });\n}\n"],"names":["isObjectLike","SEMANTIC_ATTRIBUTE_SENTRY_OP","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","startSpan"],"mappings":"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"}
+{"version":3,"file":"instrumentR2.js","sources":["../../../../../src/instrumentations/worker/instrumentR2.ts"],"sourcesContent":["import type { R2Bucket, R2ListOptions, R2MultipartUpload } from '@cloudflare/workers-types';\nimport {\n  CLOUDFLARE_R2_BUCKET,\n  CLOUDFLARE_R2_OPERATION,\n  CLOUDFLARE_R2_REQUEST_DELIMITER,\n  CLOUDFLARE_R2_REQUEST_KEY,\n  CLOUDFLARE_R2_REQUEST_PART_NUMBER,\n  CLOUDFLARE_R2_REQUEST_PREFIX,\n  SENTRY_OP,\n} from '@sentry/conventions/attributes';\nimport {\n  OBJECT_DELETE,\n  OBJECT_GET,\n  OBJECT_HEAD,\n  OBJECT_LIST,\n  OBJECT_MULTIPART_UPLOAD_ABORT,\n  OBJECT_MULTIPART_UPLOAD_COMPLETE,\n  OBJECT_MULTIPART_UPLOAD_CREATE,\n  OBJECT_PUT,\n  OBJECT_UPLOAD_PART,\n} from '@sentry/conventions/op';\nimport { isObjectLike, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/core';\n\nconst ORIGIN = 'auto.faas.cloudflare.r2';\n\nconst R2_OPERATIONS = {\n  get: { spanName: 'r2_get', op: OBJECT_GET, operation: 'GetObject' },\n  head: { spanName: 'r2_head', op: OBJECT_HEAD, operation: 'HeadObject' },\n  put: { spanName: 'r2_put', op: OBJECT_PUT, operation: 'PutObject' },\n  delete: { spanName: 'r2_delete', op: OBJECT_DELETE, operation: 'DeleteObject' },\n  list: { spanName: 'r2_list', op: OBJECT_LIST, operation: 'ListObjects' },\n  uploadPart: { spanName: 'r2_uploadPart', op: OBJECT_UPLOAD_PART, operation: 'UploadPart' },\n  abortMultipartUpload: {\n    spanName: 'r2_abortMultipartUpload',\n    op: OBJECT_MULTIPART_UPLOAD_ABORT,\n    operation: 'AbortMultipartUpload',\n  },\n  createMultipartUpload: {\n    spanName: 'r2_createMultipartUpload',\n    op: OBJECT_MULTIPART_UPLOAD_CREATE,\n    operation: 'CreateMultipartUpload',\n  },\n  completeMultipartUpload: {\n    spanName: 'r2_completeMultipartUpload',\n    op: OBJECT_MULTIPART_UPLOAD_COMPLETE,\n    operation: 'CompleteMultipartUpload',\n  },\n} as const;\n\ntype R2OperationKey = keyof typeof R2_OPERATIONS;\n\nfunction isR2ListOptions(key: unknown): key is R2ListOptions {\n  return isObjectLike(key) && !Array.isArray(key);\n}\n\nfunction createSpanOptions(bindingName: string, r2Op: R2OperationKey, key?: string | string[] | R2ListOptions) {\n  const { spanName, op, operation } = R2_OPERATIONS[r2Op];\n  const requestKey = Array.isArray(key) ? key.join(', ') : typeof key === 'string' ? key : undefined;\n\n  return {\n    op,\n    name: spanName,\n    attributes: {\n      [CLOUDFLARE_R2_OPERATION]: operation,\n      [CLOUDFLARE_R2_BUCKET]: bindingName,\n      ...(requestKey !== undefined && { [CLOUDFLARE_R2_REQUEST_KEY]: requestKey }),\n      ...(isR2ListOptions(key) && key.prefix !== undefined && { [CLOUDFLARE_R2_REQUEST_PREFIX]: key.prefix }),\n      ...(isR2ListOptions(key) && key.delimiter !== undefined && { [CLOUDFLARE_R2_REQUEST_DELIMITER]: key.delimiter }),\n      [SENTRY_OP]: op,\n      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,\n    },\n  };\n}\n\nfunction instrumentR2MultipartUpload(upload: R2MultipartUpload, bindingName: string): R2MultipartUpload {\n  const { key } = upload;\n\n  return new Proxy(upload, {\n    get(target, prop, receiver) {\n      if (prop === 'uploadPart') {\n        const original = Reflect.get(target, prop, receiver);\n\n        return function (this: unknown, ...args: Parameters<R2MultipartUpload['uploadPart']>) {\n          const [partNumber] = args;\n          const spanOptions = createSpanOptions(bindingName, 'uploadPart', key);\n\n          return startSpan(\n            {\n              ...spanOptions,\n              attributes: {\n                ...spanOptions.attributes,\n                [CLOUDFLARE_R2_REQUEST_PART_NUMBER]: partNumber,\n              },\n            },\n            () => Reflect.apply(original, target, args),\n          );\n        };\n      }\n\n      if (prop === 'abort') {\n        const original = Reflect.get(target, prop, receiver);\n\n        return function (this: unknown) {\n          return startSpan(createSpanOptions(bindingName, 'abortMultipartUpload', key), () =>\n            Reflect.apply(original, target, []),\n          );\n        };\n      }\n\n      if (prop === 'complete') {\n        const original = Reflect.get(target, prop, receiver);\n\n        return function (this: unknown, ...args: Parameters<R2MultipartUpload['complete']>) {\n          return startSpan(createSpanOptions(bindingName, 'completeMultipartUpload', key), () =>\n            Reflect.apply(original, target, args),\n          );\n        };\n      }\n\n      return Reflect.get(target, prop, receiver);\n    },\n  });\n}\n\n/**\n * Wraps a Cloudflare R2 Bucket binding to create spans on bucket operations.\n *\n * Instrumented methods: get, head, put, delete, list, createMultipartUpload,\n * resumeMultipartUpload (and the resulting multipart upload operations).\n */\nexport function instrumentR2Bucket<T extends R2Bucket>(bucket: T, bindingName: string): T {\n  return new Proxy(bucket, {\n    get(target, prop, receiver) {\n      if (prop === 'get' || prop === 'head' || prop === 'put' || prop === 'delete' || prop === 'list') {\n        const original = Reflect.get(target, prop, receiver);\n\n        return function (this: unknown, ...args: Parameters<R2Bucket[typeof prop]>) {\n          const [key] = args;\n\n          return startSpan(createSpanOptions(bindingName, prop, key), () => Reflect.apply(original, target, args));\n        };\n      }\n\n      if (prop === 'createMultipartUpload') {\n        const original = Reflect.get(target, prop, receiver) as R2Bucket['createMultipartUpload'];\n\n        return function (this: unknown, ...args: Parameters<R2Bucket['createMultipartUpload']>) {\n          const [key] = args;\n\n          return startSpan(createSpanOptions(bindingName, 'createMultipartUpload', key), async () => {\n            const upload = await Reflect.apply(original, target, args);\n            return instrumentR2MultipartUpload(upload, bindingName);\n          });\n        };\n      }\n\n      if (prop === 'resumeMultipartUpload') {\n        const original = Reflect.get(target, prop, receiver);\n\n        return function (this: unknown, ...args: Parameters<R2Bucket['resumeMultipartUpload']>) {\n          const upload = Reflect.apply(original, target, args);\n\n          return instrumentR2MultipartUpload(upload, bindingName);\n        };\n      }\n\n      return Reflect.get(target, prop, receiver);\n    },\n  });\n}\n"],"names":["OBJECT_GET","OBJECT_HEAD","OBJECT_PUT","OBJECT_DELETE","OBJECT_LIST","OBJECT_UPLOAD_PART","OBJECT_MULTIPART_UPLOAD_ABORT","OBJECT_MULTIPART_UPLOAD_CREATE","OBJECT_MULTIPART_UPLOAD_COMPLETE","isObjectLike","CLOUDFLARE_R2_OPERATION","CLOUDFLARE_R2_BUCKET","CLOUDFLARE_R2_REQUEST_KEY","CLOUDFLARE_R2_REQUEST_PREFIX","CLOUDFLARE_R2_REQUEST_DELIMITER","SENTRY_OP","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","startSpan","CLOUDFLARE_R2_REQUEST_PART_NUMBER"],"mappings":"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"}

package/build/cjs/prod/instrumentations/worker/instrumentRateLimit.js

@@ -1,8 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
+const attributes = require('@sentry/conventions/attributes');
+const op = require('@sentry/conventions/op');
 const core = require('@sentry/core');
 
 const ORIGIN = "auto.faas.cloudflare.rate_limit";
+const RATE_LIMIT_SERVICE = "cloudflare.rate_limit";
 function instrumentRateLimit(rateLimit, bindingName) {
   return new Proxy(rateLimit, {
     get(target, prop, receiver) {
@@ -15,7 +18,9 @@ function instrumentRateLimit(rateLimit, bindingName) {
           {
             name: `rate_limit ${bindingName}`,
             attributes: {
-              [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN
+              [attributes.SENTRY_OP]: op.RPC,
+              [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,
+              [attributes.RPC_SERVICE]: RATE_LIMIT_SERVICE
             }
           },
           () => Reflect.apply(original, target, [options])