@sentry/cloudflare 11.0.0-alpha.1 → 11.0.0-beta.0

package/build/cjs/dev/baseSdk.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const core = require('@sentry/core');
 const client = require('./client.js');
 const flush = require('./flush.js');
+const clientCache = require('./clientCache.js');
+const debugBuild = require('./debug-build.js');
 const fetch = require('./integrations/fetch.js');
 const httpServer = require('./integrations/httpServer.js');
 const spotlight = require('./integrations/spotlight.js');
-const tracer = require('./opentelemetry/tracer.js');
 const transport = require('./transport.js');
 const stacktrace = require('./vendor/stacktrace.js');
 
@@ -37,19 +38,30 @@ function getBaseDefaultIntegrations(options) {
   ];
 }
 function initWithDefaultIntegrations(options, getDefaultIntegrationsImpl) {
+  const cached = clientCache.getCachedClient();
+  const cacheEnabled = options.cacheClient !== false;
+  if (cacheEnabled && cached) {
+    if (debugBuild.DEBUG_BUILD && cached.getOptions().dsn !== options.dsn) {
+      core.debug.warn(
+        "[Sentry] init() was called with a different DSN than the cached client of this isolate; the cached client keeps its DSN. Pass `cacheClient: false` for per-invocation options."
+      );
+    }
+    core.getCurrentScope().update(options.initialScope);
+    core.setCurrentClient(cached);
+    return cached;
+  }
   if (options.defaultIntegrations === void 0) {
     options.defaultIntegrations = getDefaultIntegrationsImpl(options);
   }
-  const flushLock = options.ctx ? flush.makeFlushLock(options.ctx) : void 0;
+  const invocationContext = options.ctx;
+  const flushLock = !cacheEnabled && invocationContext ? flush.makeFlushLock(invocationContext) : void 0;
   delete options.ctx;
   const clientOptions = {
     ...options,
+    cacheClient: cacheEnabled,
     stackParser: core.stackParserFromStackParserOptions(options.stackParser || stacktrace.defaultStackParser),
     integrations: core.getIntegrationsToSetup(options),
     transport: options.transport || transport.makeCloudflareTransport,
-    // Like most Node-based SDKs, Cloudflare defaults to running without a Sentry OpenTelemetry tracer
-    // provider. Scope isolation is handled by the entrypoint wrappers' AsyncLocalStorage strategy.
-    enableOpenTelemetrySetup: options.enableOpenTelemetrySetup ?? false,
     flushLock
   };
   /*! rollup-include-development-only */
@@ -61,10 +73,10 @@ function initWithDefaultIntegrations(options, getDefaultIntegrationsImpl) {
     );
   }
   /*! rollup-include-development-only-end */
-  if (clientOptions.enableOpenTelemetrySetup) {
-    tracer.setupOpenTelemetryTracer();
-  }
   const client$1 = core.initAndBind(client.CloudflareClient, clientOptions);
+  if (cacheEnabled && client$1) {
+    clientCache.cacheClient(client$1);
+  }
   client$1.on("orchestrion.module-injected", (moduleName) => {
     const factory = core.GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations?.get(moduleName);
     if (factory) {

package/build/cjs/dev/baseSdk.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseSdk.js","sources":["../../../src/baseSdk.ts"],"sourcesContent":["import type { Integration } from '@sentry/core';\nimport {\n  consoleIntegration,\n  conversationIdIntegration,\n  dedupeIntegration,\n  eventFiltersIntegration,\n  functionToStringIntegration,\n  getIntegrationsToSetup,\n  GLOBAL_OBJ,\n  initAndBind,\n  linkedErrorsIntegration,\n  requestDataIntegration,\n  stackParserFromStackParserOptions,\n} from '@sentry/core';\nimport type { CloudflareClientOptions, CloudflareOptions } from './client';\nimport { CloudflareClient } from './client';\nimport { makeFlushLock } from './flush';\nimport { fetchIntegration } from './integrations/fetch';\nimport { httpServerIntegration } from './integrations/httpServer';\nimport { INTEGRATION_NAME as SPOTLIGHT_INTEGRATION_NAME, spotlightIntegration } from './integrations/spotlight';\nimport { setupOpenTelemetryTracer } from './opentelemetry/tracer';\nimport { makeCloudflareTransport } from './transport';\nimport { defaultStackParser } from './vendor/stacktrace';\n\n/**\n * Instantiate the channel-subscriber factories the `@sentry/cloudflare/vite`\n * plugin registered on the global marker. The plugin splices a small snippet\n * into each instrumented module that `.set`s its factory here (keyed by module\n * name), so the marker holds one factory per package actually bundled.\n *\n * The marker is read directly instead of importing the factories, so a worker\n * built without the plugin — where the channels never fire — ships none of this\n * code.\n * TODO(v11): Use `@sentry/server-utils/orchestrion` once we move to `nodejs_compat` by default.\n */\nfunction getRegisteredChannelIntegrations(): Integration[] {\n  const registered = GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations;\n\n  return registered ? [...registered.values()].map(factory => factory()) : [];\n}\n\n/**\n * Get the default integrations that run on any Workers-compatible runtime, i.e. without the\n * `nodejs_compat` compatibility flag.\n *\n * `getDefaultIntegrations` in `sdk.ts` extends this set with the integrations that do depend on\n * Node.js APIs. Keeping the two apart is what allows `wrapRequestHandler` to stay usable on runtimes\n * that cannot enable `nodejs_compat`, such as Shopify Oxygen.\n */\nexport function getBaseDefaultIntegrations(options: CloudflareOptions): Integration[] {\n  return [\n    // The Dedupe integration should not be used in workflows because we want to\n    // capture all step failures, even if they are the same error.\n    ...(options.enableDedupe === false ? [] : [dedupeIntegration()]),\n    eventFiltersIntegration(),\n    functionToStringIntegration(),\n    conversationIdIntegration(),\n    linkedErrorsIntegration(),\n    fetchIntegration(),\n    httpServerIntegration(),\n    requestDataIntegration(),\n    consoleIntegration(),\n    // The orchestrion diagnostics-channel subscribers (mysql, pg, …). The\n    // `@sentry/cloudflare/vite` plugin injects the channels at build time and,\n    // next to each, a snippet that registers the matching subscriber factory on\n    // the global marker. Read from there instead of importing them so bundles\n    // built without the plugin — where the channels would never fire — don't\n    // ship the code.\n    ...getRegisteredChannelIntegrations(),\n  ];\n}\n\n/**\n * Initializes the Cloudflare SDK with the passed default integrations.\n *\n * The default integrations are injected rather than imported so that this module stays free of\n * Node.js-only code. `request.ts` — which backs both `wrapRequestHandler` and the\n * `@sentry/cloudflare/request` entry point, and therefore has to work on runtimes without the\n * `nodejs_compat` compatibility flag — creates its client from here instead of from `sdk.ts`.\n */\nexport function initWithDefaultIntegrations(\n  options: CloudflareOptions,\n  getDefaultIntegrationsImpl: (options: CloudflareOptions) => Integration[],\n): CloudflareClient | undefined {\n  if (options.defaultIntegrations === undefined) {\n    options.defaultIntegrations = getDefaultIntegrationsImpl(options);\n  }\n\n  const flushLock = options.ctx ? makeFlushLock(options.ctx) : undefined;\n  delete options.ctx;\n\n  const clientOptions: CloudflareClientOptions = {\n    ...options,\n    stackParser: stackParserFromStackParserOptions(options.stackParser || defaultStackParser),\n    integrations: getIntegrationsToSetup(options),\n    transport: options.transport || makeCloudflareTransport,\n    // Like most Node-based SDKs, Cloudflare defaults to running without a Sentry OpenTelemetry tracer\n    // provider. Scope isolation is handled by the entrypoint wrappers' AsyncLocalStorage strategy.\n    enableOpenTelemetrySetup: options.enableOpenTelemetrySetup ?? false,\n    flushLock,\n  };\n\n  /*! rollup-include-development-only */\n  if (options.spotlight && !clientOptions.integrations.some(({ name }) => name === SPOTLIGHT_INTEGRATION_NAME)) {\n    clientOptions.integrations.push(\n      spotlightIntegration({\n        sidecarUrl: typeof options.spotlight === 'string' ? options.spotlight : undefined,\n      }),\n    );\n  }\n  /*! rollup-include-development-only-end */\n\n  // Opt-in only: when `enableOpenTelemetrySetup` is `true`, set up a custom trace provider so spans\n  // emitted via `@opentelemetry/api` are captured by Sentry. See the option's docs for the caveats.\n  if (clientOptions.enableOpenTelemetrySetup) {\n    setupOpenTelemetryTracer();\n  }\n\n  const client = initAndBind(CloudflareClient, clientOptions) as CloudflareClient;\n\n  // An instrumented module that first evaluates AFTER this init (e.g. a driver\n  // lazily required on first use) stores its subscriber factory on the global\n  // marker too late for the default-integrations snapshot above. Its injected\n  // snippet emits this event right after storing the factory, so install the\n  // integration on the live client here. `addIntegration` dedupes by\n  // integration name, so already-installed integrations are no-ops.\n  client.on('orchestrion.module-injected', moduleName => {\n    const factory = GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations?.get(moduleName);\n    if (factory) {\n      client.addIntegration(factory());\n    }\n  });\n\n  return client;\n}\n\n/**\n * Initializes the Cloudflare SDK with only the default integrations from\n * {@link getBaseDefaultIntegrations}, i.e. those that work without the `nodejs_compat`\n * compatibility flag.\n */\nexport function initBaseSdk(options: CloudflareOptions): CloudflareClient | undefined {\n  return initWithDefaultIntegrations(options, getBaseDefaultIntegrations);\n}\n"],"names":["GLOBAL_OBJ","dedupeIntegration","eventFiltersIntegration","functionToStringIntegration","conversationIdIntegration","linkedErrorsIntegration","fetchIntegration","httpServerIntegration","requestDataIntegration","consoleIntegration","makeFlushLock","stackParserFromStackParserOptions","defaultStackParser","getIntegrationsToSetup","makeCloudflareTransport","SPOTLIGHT_INTEGRATION_NAME","spotlightIntegration","setupOpenTelemetryTracer","client","initAndBind","CloudflareClient"],"mappings":";;;;;;;;;;;;AAmCA,SAAS,gCAAA,GAAkD;AACzD,EAAA,MAAM,UAAA,GAAaA,gBAAW,sBAAA,EAAwB,YAAA;AAEtD,EAAA,OAAO,UAAA,GAAa,CAAC,GAAG,UAAA,CAAW,MAAA,EAAQ,CAAA,CAAE,GAAA,CAAI,CAAA,OAAA,KAAW,OAAA,EAAS,CAAA,GAAI,EAAC;AAC5E;AAUO,SAAS,2BAA2B,OAAA,EAA2C;AACpF,EAAA,OAAO;AAAA;AAAA;AAAA,IAGL,GAAI,QAAQ,YAAA,KAAiB,KAAA,GAAQ,EAAC,GAAI,CAACC,wBAAmB,CAAA;AAAA,IAC9DC,4BAAA,EAAwB;AAAA,IACxBC,gCAAA,EAA4B;AAAA,IAC5BC,8BAAA,EAA0B;AAAA,IAC1BC,4BAAA,EAAwB;AAAA,IACxBC,sBAAA,EAAiB;AAAA,IACjBC,gCAAA,EAAsB;AAAA,IACtBC,2BAAA,EAAuB;AAAA,IACvBC,uBAAA,EAAmB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAOnB,GAAG,gCAAA;AAAiC,GACtC;AACF;AAUO,SAAS,2BAAA,CACd,SACA,0BAAA,EAC8B;AAC9B,EAAA,IAAI,OAAA,CAAQ,wBAAwB,MAAA,EAAW;AAC7C,IAAA,OAAA,CAAQ,mBAAA,GAAsB,2BAA2B,OAAO,CAAA;AAAA,EAClE;AAEA,EAAA,MAAM,YAAY,OAAA,CAAQ,GAAA,GAAMC,mBAAA,CAAc,OAAA,CAAQ,GAAG,CAAA,GAAI,MAAA;AAC7D,EAAA,OAAO,OAAA,CAAQ,GAAA;AAEf,EAAA,MAAM,aAAA,GAAyC;AAAA,IAC7C,GAAG,OAAA;AAAA,IACH,WAAA,EAAaC,sCAAA,CAAkC,OAAA,CAAQ,WAAA,IAAeC,6BAAkB,CAAA;AAAA,IACxF,YAAA,EAAcC,4BAAuB,OAAO,CAAA;AAAA,IAC5C,SAAA,EAAW,QAAQ,SAAA,IAAaC,iCAAA;AAAA;AAAA;AAAA,IAGhC,wBAAA,EAA0B,QAAQ,wBAAA,IAA4B,KAAA;AAAA,IAC9D;AAAA,GACF;AAAA;AAGA,EAAA,IAAI,OAAA,CAAQ,SAAA,IAAa,CAAC,aAAA,CAAc,YAAA,CAAa,IAAA,CAAK,CAAC,EAAE,IAAA,EAAK,KAAM,IAAA,KAASC,0BAA0B,CAAA,EAAG;AAC5G,IAAA,aAAA,CAAc,YAAA,CAAa,IAAA;AAAA,MACzBC,8BAAA,CAAqB;AAAA,QACnB,YAAY,OAAO,OAAA,CAAQ,SAAA,KAAc,QAAA,GAAW,QAAQ,SAAA,GAAY;AAAA,OACzE;AAAA,KACH;AAAA,EACF;AAAA;AAKA,EAAA,IAAI,cAAc,wBAAA,EAA0B;AAC1C,IAAAC,+BAAA,EAAyB;AAAA,EAC3B;AAEA,EAAA,MAAMC,QAAA,GAASC,gBAAA,CAAYC,uBAAA,EAAkB,aAAa,CAAA;AAQ1D,EAAAF,QAAA,CAAO,EAAA,CAAG,+BAA+B,CAAA,UAAA,KAAc;AACrD,IAAA,MAAM,OAAA,GAAUlB,eAAA,CAAW,sBAAA,EAAwB,YAAA,EAAc,IAAI,UAAU,CAAA;AAC/E,IAAA,IAAI,OAAA,EAAS;AACX,MAAAkB,QAAA,CAAO,cAAA,CAAe,SAAS,CAAA;AAAA,IACjC;AAAA,EACF,CAAC,CAAA;AAED,EAAA,OAAOA,QAAA;AACT;AAOO,SAAS,YAAY,OAAA,EAA0D;AACpF,EAAA,OAAO,2BAAA,CAA4B,SAAS,0BAA0B,CAAA;AACxE;;;;;;"}
+{"version":3,"file":"baseSdk.js","sources":["../../../src/baseSdk.ts"],"sourcesContent":["import type { Integration } from '@sentry/core';\nimport { debug, getCurrentScope, setCurrentClient } from '@sentry/core';\nimport {\n  consoleIntegration,\n  conversationIdIntegration,\n  dedupeIntegration,\n  eventFiltersIntegration,\n  functionToStringIntegration,\n  getIntegrationsToSetup,\n  GLOBAL_OBJ,\n  initAndBind,\n  linkedErrorsIntegration,\n  requestDataIntegration,\n  stackParserFromStackParserOptions,\n} from '@sentry/core';\nimport type { CloudflareClientOptions, CloudflareOptions } from './client';\nimport { CloudflareClient } from './client';\nimport { makeFlushLock } from './flush';\nimport { cacheClient, getCachedClient } from './clientCache';\nimport { DEBUG_BUILD } from './debug-build';\nimport { fetchIntegration } from './integrations/fetch';\nimport { httpServerIntegration } from './integrations/httpServer';\nimport { INTEGRATION_NAME as SPOTLIGHT_INTEGRATION_NAME, spotlightIntegration } from './integrations/spotlight';\nimport { makeCloudflareTransport } from './transport';\nimport { defaultStackParser } from './vendor/stacktrace';\n\n/**\n * Instantiate the channel-subscriber factories the `@sentry/cloudflare/vite`\n * plugin registered on the global marker. The plugin splices a small snippet\n * into each instrumented module that `.set`s its factory here (keyed by module\n * name), so the marker holds one factory per package actually bundled.\n *\n * The marker is read directly instead of importing the factories, so a worker\n * built without the plugin — where the channels never fire — ships none of this\n * code.\n */\nfunction getRegisteredChannelIntegrations(): Integration[] {\n  const registered = GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations;\n\n  return registered ? [...registered.values()].map(factory => factory()) : [];\n}\n\n/**\n * Get the default integrations that run on any Workers-compatible runtime, i.e. without the\n * `nodejs_compat` compatibility flag.\n *\n * `getDefaultIntegrations` in `sdk.ts` extends this set with the integrations that do depend on\n * Node.js APIs. Keeping the two apart is what allows `wrapRequestHandler` to stay usable on runtimes\n * that cannot enable `nodejs_compat`, such as Shopify Oxygen.\n */\nexport function getBaseDefaultIntegrations(options: CloudflareOptions): Integration[] {\n  return [\n    // The Dedupe integration should not be used in workflows because we want to\n    // capture all step failures, even if they are the same error.\n    ...(options.enableDedupe === false ? [] : [dedupeIntegration()]),\n    eventFiltersIntegration(),\n    functionToStringIntegration(),\n    conversationIdIntegration(),\n    linkedErrorsIntegration(),\n    fetchIntegration(),\n    httpServerIntegration(),\n    requestDataIntegration(),\n    consoleIntegration(),\n    // The orchestrion diagnostics-channel subscribers (mysql, pg, …). The\n    // `@sentry/cloudflare/vite` plugin injects the channels at build time and,\n    // next to each, a snippet that registers the matching subscriber factory on\n    // the global marker. Read from there instead of importing them so bundles\n    // built without the plugin — where the channels would never fire — don't\n    // ship the code.\n    ...getRegisteredChannelIntegrations(),\n  ];\n}\n\n/**\n * Initializes the Cloudflare SDK with the passed default integrations.\n *\n * The default integrations are injected rather than imported so that this module stays free of\n * Node.js-only code. `request.ts` — which backs both `wrapRequestHandler` and the\n * `@sentry/cloudflare/request` entry point, and therefore has to work on runtimes without the\n * `nodejs_compat` compatibility flag — creates its client from here instead of from `sdk.ts`.\n *\n * The client is cached and reused across invocations within the same isolate,\n * unless `cacheClient: false` is passed. This avoids the\n * per-invocation cost of constructing a new client, and it is what makes\n * Durable Object telemetry reliable: a per-invocation client is disposed at\n * the end of the handler, and in a Durable Object there is no `waitUntil`\n * boundary that reliably extends execution, so spans/events that end after\n * disposal would otherwise be lost.\n */\nexport function initWithDefaultIntegrations(\n  options: CloudflareOptions,\n  getDefaultIntegrationsImpl: (options: CloudflareOptions) => Integration[],\n): CloudflareClient | undefined {\n  const cached = getCachedClient();\n  const cacheEnabled = options.cacheClient !== false;\n\n  if (cacheEnabled && cached) {\n    if (DEBUG_BUILD && cached.getOptions().dsn !== options.dsn) {\n      debug.warn(\n        '[Sentry] init() was called with a different DSN than the cached client of this isolate; the cached client keeps its DSN. Pass `cacheClient: false` for per-invocation options.',\n      );\n    }\n    getCurrentScope().update(options.initialScope);\n    setCurrentClient(cached);\n    return cached;\n  }\n\n  if (options.defaultIntegrations === undefined) {\n    options.defaultIntegrations = getDefaultIntegrationsImpl(options);\n  }\n\n  // A cached client outlives any single invocation, so binding it to one\n  // invocation's flush lock would make later flushes wait on that invocation's\n  // waitUntil work forever. Eager delivery replaces the flush lock's purpose.\n  const invocationContext = options.ctx;\n  const flushLock = !cacheEnabled && invocationContext ? makeFlushLock(invocationContext) : undefined;\n  delete options.ctx;\n\n  const clientOptions: CloudflareClientOptions = {\n    ...options,\n    cacheClient: cacheEnabled,\n    stackParser: stackParserFromStackParserOptions(options.stackParser || defaultStackParser),\n    integrations: getIntegrationsToSetup(options),\n    transport: options.transport || makeCloudflareTransport,\n    flushLock,\n  };\n\n  /*! rollup-include-development-only */\n  if (options.spotlight && !clientOptions.integrations.some(({ name }) => name === SPOTLIGHT_INTEGRATION_NAME)) {\n    clientOptions.integrations.push(\n      spotlightIntegration({\n        sidecarUrl: typeof options.spotlight === 'string' ? options.spotlight : undefined,\n      }),\n    );\n  }\n  /*! rollup-include-development-only-end */\n\n  const client = initAndBind(CloudflareClient, clientOptions) as CloudflareClient;\n\n  if (cacheEnabled && client) {\n    cacheClient(client);\n  }\n\n  // An instrumented module that first evaluates AFTER this init (e.g. a driver\n  // lazily required on first use) stores its subscriber factory on the global\n  // marker too late for the default-integrations snapshot above. Its injected\n  // snippet emits this event right after storing the factory, so install the\n  // integration on the live client here. `addIntegration` dedupes by\n  // integration name, so already-installed integrations are no-ops.\n  client.on('orchestrion.module-injected', moduleName => {\n    const factory = GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations?.get(moduleName);\n    if (factory) {\n      client.addIntegration(factory());\n    }\n  });\n\n  return client;\n}\n\n/**\n * Initializes the Cloudflare SDK with only the default integrations from\n * {@link getBaseDefaultIntegrations}, i.e. those that work without the `nodejs_compat`\n * compatibility flag.\n */\nexport function initBaseSdk(options: CloudflareOptions): CloudflareClient | undefined {\n  return initWithDefaultIntegrations(options, getBaseDefaultIntegrations);\n}\n"],"names":["GLOBAL_OBJ","dedupeIntegration","eventFiltersIntegration","functionToStringIntegration","conversationIdIntegration","linkedErrorsIntegration","fetchIntegration","httpServerIntegration","requestDataIntegration","consoleIntegration","getCachedClient","DEBUG_BUILD","debug","getCurrentScope","setCurrentClient","makeFlushLock","stackParserFromStackParserOptions","defaultStackParser","getIntegrationsToSetup","makeCloudflareTransport","SPOTLIGHT_INTEGRATION_NAME","spotlightIntegration","client","initAndBind","CloudflareClient","cacheClient"],"mappings":";;;;;;;;;;;;;AAoCA,SAAS,gCAAA,GAAkD;AACzD,EAAA,MAAM,UAAA,GAAaA,gBAAW,sBAAA,EAAwB,YAAA;AAEtD,EAAA,OAAO,UAAA,GAAa,CAAC,GAAG,UAAA,CAAW,MAAA,EAAQ,CAAA,CAAE,GAAA,CAAI,CAAA,OAAA,KAAW,OAAA,EAAS,CAAA,GAAI,EAAC;AAC5E;AAUO,SAAS,2BAA2B,OAAA,EAA2C;AACpF,EAAA,OAAO;AAAA;AAAA;AAAA,IAGL,GAAI,QAAQ,YAAA,KAAiB,KAAA,GAAQ,EAAC,GAAI,CAACC,wBAAmB,CAAA;AAAA,IAC9DC,4BAAA,EAAwB;AAAA,IACxBC,gCAAA,EAA4B;AAAA,IAC5BC,8BAAA,EAA0B;AAAA,IAC1BC,4BAAA,EAAwB;AAAA,IACxBC,sBAAA,EAAiB;AAAA,IACjBC,gCAAA,EAAsB;AAAA,IACtBC,2BAAA,EAAuB;AAAA,IACvBC,uBAAA,EAAmB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAOnB,GAAG,gCAAA;AAAiC,GACtC;AACF;AAkBO,SAAS,2BAAA,CACd,SACA,0BAAA,EAC8B;AAC9B,EAAA,MAAM,SAASC,2BAAA,EAAgB;AAC/B,EAAA,MAAM,YAAA,GAAe,QAAQ,WAAA,KAAgB,KAAA;AAE7C,EAAA,IAAI,gBAAgB,MAAA,EAAQ;AAC1B,IAAA,IAAIC,0BAAe,MAAA,CAAO,UAAA,EAAW,CAAE,GAAA,KAAQ,QAAQ,GAAA,EAAK;AAC1D,MAAAC,UAAA,CAAM,IAAA;AAAA,QACJ;AAAA,OACF;AAAA,IACF;AACA,IAAAC,oBAAA,EAAgB,CAAE,MAAA,CAAO,OAAA,CAAQ,YAAY,CAAA;AAC7C,IAAAC,qBAAA,CAAiB,MAAM,CAAA;AACvB,IAAA,OAAO,MAAA;AAAA,EACT;AAEA,EAAA,IAAI,OAAA,CAAQ,wBAAwB,MAAA,EAAW;AAC7C,IAAA,OAAA,CAAQ,mBAAA,GAAsB,2BAA2B,OAAO,CAAA;AAAA,EAClE;AAKA,EAAA,MAAM,oBAAoB,OAAA,CAAQ,GAAA;AAClC,EAAA,MAAM,YAAY,CAAC,YAAA,IAAgB,iBAAA,GAAoBC,mBAAA,CAAc,iBAAiB,CAAA,GAAI,MAAA;AAC1F,EAAA,OAAO,OAAA,CAAQ,GAAA;AAEf,EAAA,MAAM,aAAA,GAAyC;AAAA,IAC7C,GAAG,OAAA;AAAA,IACH,WAAA,EAAa,YAAA;AAAA,IACb,WAAA,EAAaC,sCAAA,CAAkC,OAAA,CAAQ,WAAA,IAAeC,6BAAkB,CAAA;AAAA,IACxF,YAAA,EAAcC,4BAAuB,OAAO,CAAA;AAAA,IAC5C,SAAA,EAAW,QAAQ,SAAA,IAAaC,iCAAA;AAAA,IAChC;AAAA,GACF;AAAA;AAGA,EAAA,IAAI,OAAA,CAAQ,SAAA,IAAa,CAAC,aAAA,CAAc,YAAA,CAAa,IAAA,CAAK,CAAC,EAAE,IAAA,EAAK,KAAM,IAAA,KAASC,0BAA0B,CAAA,EAAG;AAC5G,IAAA,aAAA,CAAc,YAAA,CAAa,IAAA;AAAA,MACzBC,8BAAA,CAAqB;AAAA,QACnB,YAAY,OAAO,OAAA,CAAQ,SAAA,KAAc,QAAA,GAAW,QAAQ,SAAA,GAAY;AAAA,OACzE;AAAA,KACH;AAAA,EACF;AAAA;AAGA,EAAA,MAAMC,QAAA,GAASC,gBAAA,CAAYC,uBAAA,EAAkB,aAAa,CAAA;AAE1D,EAAA,IAAI,gBAAgBF,QAAA,EAAQ;AAC1B,IAAAG,uBAAA,CAAYH,QAAM,CAAA;AAAA,EACpB;AAQA,EAAAA,QAAA,CAAO,EAAA,CAAG,+BAA+B,CAAA,UAAA,KAAc;AACrD,IAAA,MAAM,OAAA,GAAUtB,eAAA,CAAW,sBAAA,EAAwB,YAAA,EAAc,IAAI,UAAU,CAAA;AAC/E,IAAA,IAAI,OAAA,EAAS;AACX,MAAAsB,QAAA,CAAO,cAAA,CAAe,SAAS,CAAA;AAAA,IACjC;AAAA,EACF,CAAC,CAAA;AAED,EAAA,OAAOA,QAAA;AACT;AAOO,SAAS,YAAY,OAAA,EAA0D;AACpF,EAAA,OAAO,2BAAA,CAA4B,SAAS,0BAA0B,CAAA;AACxE;;;;;;"}

package/build/cjs/dev/client.js

@@ -1,9 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@sentry/core');
+const server = require('@sentry/core/server');
 const debugBuild = require('./debug-build.js');
+const invocationContext = require('./utils/invocationContext.js');
 
-class CloudflareClient extends core.ServerRuntimeClient {
+class CloudflareClient extends server.ServerRuntimeClient {
   /**
    * Creates a new Cloudflare SDK instance.
    * @param options Configuration options for this SDK.
@@ -26,30 +28,36 @@ class CloudflareClient extends core.ServerRuntimeClient {
     this._resolveSpanCompletion = null;
     this._unsubscribeSpanStart = null;
     this._unsubscribeSpanEnd = null;
+    // True while a boundary `flush()` is draining; envelopes created by that drain ride it
+    // and must not each start their own eager transport flush.
+    this._inBoundaryFlush = false;
     this._flushLock = flushLock;
-    this._unsubscribeSpanStart = this.on("spanStart", (span) => {
-      const spanId = span.spanContext().spanId;
-      debugBuild.DEBUG_BUILD && core.debug.log("[CloudflareClient] Span started:", spanId);
-      if (!core.spanIsSampled(span)) {
-        return;
-      }
-      this._pendingSpans.add(spanId);
-      if (!this._spanCompletionPromise) {
-        this._spanCompletionPromise = new Promise((resolve) => {
-          this._resolveSpanCompletion = resolve;
-        });
-      }
-    });
-    this._unsubscribeSpanEnd = this.on("spanEnd", (span) => {
-      const spanId = span.spanContext().spanId;
-      debugBuild.DEBUG_BUILD && core.debug.log("[CloudflareClient] Span ended:", spanId);
-      this._pendingSpans.delete(spanId);
-      if (this._pendingSpans.size === 0 && this._resolveSpanCompletion) {
-        debugBuild.DEBUG_BUILD && core.debug.log("[CloudflareClient] All spans completed, resolving promise");
-        this._resolveSpanCompletion();
-        this._resetSpanCompletionPromise();
-      }
-    });
+    this.isCachedClient = options.cacheClient === true;
+    if (!this.isCachedClient) {
+      this._unsubscribeSpanStart = this.on("spanStart", (span) => {
+        const spanId = span.spanContext().spanId;
+        debugBuild.DEBUG_BUILD && core.debug.log("[CloudflareClient] Span started:", spanId);
+        if (!core.spanIsSampled(span)) {
+          return;
+        }
+        this._pendingSpans.add(spanId);
+        if (!this._spanCompletionPromise) {
+          this._spanCompletionPromise = new Promise((resolve) => {
+            this._resolveSpanCompletion = resolve;
+          });
+        }
+      });
+      this._unsubscribeSpanEnd = this.on("spanEnd", (span) => {
+        const spanId = span.spanContext().spanId;
+        debugBuild.DEBUG_BUILD && core.debug.log("[CloudflareClient] Span ended:", spanId);
+        this._pendingSpans.delete(spanId);
+        if (this._pendingSpans.size === 0 && this._resolveSpanCompletion) {
+          debugBuild.DEBUG_BUILD && core.debug.log("[CloudflareClient] All spans completed, preparing to flush");
+          this._resolveSpanCompletion();
+          this._resetSpanCompletionPromise();
+        }
+      });
+    }
   }
   /**
    * Flushes pending operations and ensures all data is processed.
@@ -78,7 +86,12 @@ class CloudflareClient extends core.ServerRuntimeClient {
       ]);
       await spanCompletionRace;
     }
-    return super.flush(timeout);
+    this._inBoundaryFlush = true;
+    try {
+      return await super.flush(timeout);
+    } finally {
+      this._inBoundaryFlush = false;
+    }
   }
   /**
    * Disposes of the client and releases all resources.
@@ -107,6 +120,16 @@ class CloudflareClient extends core.ServerRuntimeClient {
   _setupIntegrations() {
     core._INTERNAL_clearAiProviderSkips();
     super._setupIntegrations();
+    if (this.isCachedClient) {
+      this.on("flush", () => {
+        const invocationState = invocationContext.getInvocationState();
+        if (invocationState) {
+          invocationState.flushPointReached = true;
+        }
+      });
+      this._setupEagerEnvelopeDelivery();
+      this._setupEagerBufferDelivery();
+    }
   }
   /**
    * Resets the span completion promise and resolve function.
@@ -116,6 +139,76 @@ class CloudflareClient extends core.ServerRuntimeClient {
     this._spanCompletionPromise = null;
     this._resolveSpanCompletion = null;
   }
+  /**
+   * Drains the transport after an envelope has been accepted past the invocation's
+   * flush point. The transport queues request producers until `flush()`; before the
+   * flush point the boundary `flush()` drains everything, but envelopes created after
+   * it (post-response `waitUntil` work, detached continuations) have no later flush to
+   * ride. The drain is registered with the invocation's `waitUntil` to keep the fetch
+   * alive; outside any instrumented invocation it always runs.
+   */
+  _setupEagerEnvelopeDelivery() {
+    this.on("afterEnvelope", () => {
+      const transport = this.getTransport();
+      const invocationState = invocationContext.getInvocationState();
+      if (!transport || this._inBoundaryFlush || invocationState && !invocationState.flushPointReached) {
+        return;
+      }
+      this._registerWithInvocationWaitUntil(transport.flush(2e3));
+    });
+  }
+  /**
+   * Turns spans, logs and metrics captured past the invocation's flush point into
+   * envelopes. Before the flush point the boundary `flush()` drains their buffers; after
+   * it (or outside any instrumented invocation) nothing else would: the log/metric idle
+   * timer is disabled for this runtime (`_flushInterval: 0`) and the span buffer's own 5s
+   * timer fires outside any invocation, where the runtime suspends the send. Each capture
+   * drains only its own bucket (the ended span's trace, the log buffer, the metric
+   * buffer), so a fan-out of concurrent traces stays one envelope per trace. RPC method
+   * spans never reach this path: `wrapMethodWithSentry` runs the boundary flush after the
+   * method span has ended, so only work past that (e.g. detached continuations) lands here.
+   */
+  _setupEagerBufferDelivery() {
+    this.on("afterSpanEnd", (span) => {
+      const traceId = span.spanContext().traceId;
+      this._eagerDrain(() => this.emit("flushTraceSpans", traceId));
+    });
+    this.on("afterCaptureLog", () => this._eagerDrain(() => core._INTERNAL_flushLogsBuffer(this)));
+    this.on("afterCaptureMetric", () => this._eagerDrain(() => core._INTERNAL_flushMetricsBuffer(this)));
+  }
+  /**
+   * Runs `drain` unless the owning invocation has not reached its flush point yet
+   * (before it the boundary `flush()` delivers the buffers).
+   */
+  _eagerDrain(drain) {
+    const invocationState = invocationContext.getInvocationState();
+    if (invocationState && !invocationState.flushPointReached) {
+      return;
+    }
+    drain();
+  }
+  /**
+   * Attaches a promise to the `waitUntil` of the invocation that owns the current
+   * async context, so the runtime keeps the send alive after the response is returned.
+   * Outside any instrumented invocation (or where the context has no `waitUntil`,
+   * e.g. Astro prerendering) the send is fire-and-forget.
+   */
+  _registerWithInvocationWaitUntil(promise) {
+    const invocationState = invocationContext.getInvocationState();
+    const waitUntil = invocationState && invocationContext.getInvocationWaitUntil(invocationState);
+    if (!waitUntil) {
+      return;
+    }
+    try {
+      waitUntil(
+        Promise.resolve(promise).then(
+          () => void 0,
+          () => void 0
+        )
+      );
+    } catch {
+    }
+  }
 }
 
 exports.CloudflareClient = CloudflareClient;

package/build/cjs/dev/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sources":["../../../src/client.ts"],"sourcesContent":["import type { ClientOptions, Options, ServerRuntimeClientOptions } from '@sentry/core';\nimport {\n  _INTERNAL_clearAiProviderSkips,\n  applySdkMetadata,\n  debug,\n  ServerRuntimeClient,\n  spanIsSampled,\n} from '@sentry/core';\nimport { DEBUG_BUILD } from './debug-build';\nimport type { ExecutionContextCompat } from './executionContext';\nimport type { makeFlushLock } from './flush';\nimport type { CloudflareTransportOptions } from './transport';\n\n/**\n * The Sentry Cloudflare SDK Client.\n *\n * @see CloudflareClientOptions for documentation on configuration options.\n * @see ServerRuntimeClient for usage documentation.\n */\nexport class CloudflareClient extends ServerRuntimeClient {\n  private readonly _flushLock: ReturnType<typeof makeFlushLock> | void;\n  private _pendingSpans: Set<string> = new Set();\n  private _spanCompletionPromise: Promise<void> | null = null;\n  private _resolveSpanCompletion: (() => void) | null = null;\n\n  private _unsubscribeSpanStart: (() => void) | null = null;\n  private _unsubscribeSpanEnd: (() => void) | null = null;\n\n  /**\n   * Creates a new Cloudflare SDK instance.\n   * @param options Configuration options for this SDK.\n   */\n  public constructor(options: CloudflareClientOptions) {\n    applySdkMetadata(options, 'cloudflare');\n    options._metadata = options._metadata || {};\n    const { flushLock, ...serverOptions } = options;\n\n    const clientOptions: ServerRuntimeClientOptions = {\n      ...serverOptions,\n      platform: 'javascript',\n      // TODO: Grab version information\n      runtime: { name: 'cloudflare' },\n      // TODO: Add server name\n      _flushInterval: 0,\n    };\n\n    super(clientOptions);\n    this._flushLock = flushLock;\n\n    // Track span lifecycle to know when to flush\n    this._unsubscribeSpanStart = this.on('spanStart', span => {\n      const spanId = span.spanContext().spanId;\n      DEBUG_BUILD && debug.log('[CloudflareClient] Span started:', spanId);\n\n      // Negatively sampled spans never emit spanEnd,\n      // so tracking them would cause _pendingSpans to grow unboundedly.\n      // We should fix the inconsistent behavior for NonRecordingSpans in the future but\n      // for now, we just ignore them.\n      if (!spanIsSampled(span)) {\n        return;\n      }\n\n      this._pendingSpans.add(spanId);\n\n      if (!this._spanCompletionPromise) {\n        this._spanCompletionPromise = new Promise(resolve => {\n          this._resolveSpanCompletion = resolve;\n        });\n      }\n    });\n\n    this._unsubscribeSpanEnd = this.on('spanEnd', span => {\n      const spanId = span.spanContext().spanId;\n      DEBUG_BUILD && debug.log('[CloudflareClient] Span ended:', spanId);\n      this._pendingSpans.delete(spanId);\n\n      // If no more pending spans, resolve the completion promise\n      if (this._pendingSpans.size === 0 && this._resolveSpanCompletion) {\n        DEBUG_BUILD && debug.log('[CloudflareClient] All spans completed, resolving promise');\n        this._resolveSpanCompletion();\n        this._resetSpanCompletionPromise();\n      }\n    });\n  }\n\n  /**\n   * Flushes pending operations and ensures all data is processed.\n   * If a timeout is provided, the operation will be completed within the specified time limit.\n   *\n   * It will wait for all pending spans to complete before flushing.\n   *\n   * @param {number} [timeout] - Optional timeout in milliseconds to force the completion of the flush operation.\n   * @return {Promise<boolean>} A promise that resolves to a boolean indicating whether the flush operation was successful.\n   */\n  public async flush(timeout?: number): Promise<boolean> {\n    if (this._flushLock) {\n      await this._flushLock.finalize();\n    }\n\n    if (this._pendingSpans.size > 0 && this._spanCompletionPromise) {\n      DEBUG_BUILD &&\n        debug.log('[CloudflareClient] Waiting for', this._pendingSpans.size, 'pending spans to complete...');\n\n      const timeoutMs = timeout ?? 5000;\n      const spanCompletionRace = Promise.race([\n        this._spanCompletionPromise,\n        new Promise(resolve =>\n          setTimeout(() => {\n            DEBUG_BUILD &&\n              debug.log('[CloudflareClient] Span completion timeout after', timeoutMs, 'ms, flushing anyway');\n            resolve(undefined);\n          }, timeoutMs),\n        ),\n      ]);\n\n      await spanCompletionRace;\n    }\n\n    return super.flush(timeout);\n  }\n\n  /**\n   * Disposes of the client and releases all resources.\n   *\n   * This method clears all Cloudflare-specific state in addition to the base client cleanup.\n   * It unsubscribes from span lifecycle events and clears pending span tracking.\n   *\n   * Call this method after flushing to allow the client to be garbage collected.\n   * After calling dispose(), the client should not be used anymore.\n   */\n  public override dispose(): void {\n    DEBUG_BUILD && debug.log('[CloudflareClient] Disposing client...');\n\n    super.dispose();\n\n    if (this._unsubscribeSpanStart) {\n      this._unsubscribeSpanStart();\n      this._unsubscribeSpanStart = null;\n    }\n    if (this._unsubscribeSpanEnd) {\n      this._unsubscribeSpanEnd();\n      this._unsubscribeSpanEnd = null;\n    }\n\n    this._resetSpanCompletionPromise();\n    (this as unknown as { _flushLock: ReturnType<typeof makeFlushLock> | void })._flushLock = undefined;\n  }\n\n  /** @inheritDoc */\n  protected override _setupIntegrations(): void {\n    // Clear AI provider skip registrations before setting up integrations.\n    // The registry is module-global and Cloudflare calls `init()` per request, so without this a\n    // single `ai` SDK call would suppress direct `env.AI.run` spans for the rest of the isolate's\n    // life. Mirrors the same reset in the Node client.\n    _INTERNAL_clearAiProviderSkips();\n    super._setupIntegrations();\n  }\n\n  /**\n   * Resets the span completion promise and resolve function.\n   */\n  private _resetSpanCompletionPromise(): void {\n    this._pendingSpans.clear();\n    this._spanCompletionPromise = null;\n    this._resolveSpanCompletion = null;\n  }\n}\n\ninterface BaseCloudflareOptions {\n  /**\n   * @ignore Used internally to disable the deDupeIntegration for workflows.\n   * @hidden Used internally to disable the deDupeIntegration for workflows.\n   * @default true\n   */\n  enableDedupe?: boolean;\n\n  /**\n   * The Cloudflare SDK is not OpenTelemetry native. By default (`false`) it does not set up a tracer\n   * provider; spans are emitted via the SDK's own instrumentation and scopes are isolated with\n   * AsyncLocalStorage.\n   *\n   * Set this to `true` to opt into the OpenTelemetry compatibility tracer, which captures spans\n   * emitted via `@opentelemetry/api`. Big caveat: it does not handle custom context, always working\n   * off the current scope. This is good enough for many, but not all, integrations.\n   *\n   * @default false\n   */\n  enableOpenTelemetrySetup?: boolean;\n\n  /**\n   * Enable trace propagation for RPC calls between Workers, Durable Objects, and Service Bindings.\n   *\n   * When enabled, trace context (sentry-trace + baggage) is propagated across:\n   * - `stub.fetch()` calls to Durable Objects (via HTTP headers)\n   * - Service binding `fetch()` calls (via HTTP headers)\n   * - RPC method calls to Durable Objects and WorkerEntrypoints (via trailing argument)\n   *\n   * When enabled on the **receiver side** (DurableObject or WorkerEntrypoint), the SDK will also:\n   * - Extract and continue traces from incoming RPC calls\n   * - Create spans for each RPC method invocation\n   * - Capture errors thrown by RPC methods\n   *\n   * **Important:** This option is enabled by default. Set it to `false` to opt out, e.g. if you\n   * do not want trace context to leave your Worker via RPC calls.\n   *\n   * @default true\n   * @example\n   * ```ts\n   * // Opt out of RPC trace propagation\n   * export default Sentry.withSentry(\n   *   (env) => ({\n   *     dsn: env.SENTRY_DSN,\n   *     enableRpcTracePropagation: false,\n   *   }),\n   *   handler,\n   * );\n   * ```\n   */\n  enableRpcTracePropagation?: boolean;\n\n  /**\n   * Table names that should stay instrumented even though they match the reserved `cf_` prefix used\n   * by Durable Object frameworks (`agents`, `partyserver`, ...) for their internal SQLite tables.\n   *\n   * By default, `exec` queries against `cf_`-prefixed tables are treated as framework noise and no\n   * `db.query` span is created for them. If one of your own tables happens to use this prefix, add it\n   * here to opt it back into instrumentation. Entries are matched against each table name in the\n   * query summary — strings must match exactly, while regular expressions give you prefix/pattern\n   * matching.\n   *\n   * @default []\n   * @example\n   * ```ts\n   * export default Sentry.withSentry(\n   *   (env) => ({\n   *     dsn: env.SENTRY_DSN,\n   *     durableObjectSqlSpanAllowlist: ['cf_my_table', /^cf_reports_/],\n   *   }),\n   *   handler,\n   * );\n   * ```\n   */\n  durableObjectSqlSpanAllowlist?: Array<string | RegExp>;\n\n  /**\n   * KV keys that should stay instrumented even though they match a reserved prefix used by Durable\n   * Object frameworks (`agents`, `partyserver`, ...) for their internal storage entries.\n   *\n   * By default, KV reads/writes (`get`, `put`, `delete`, `list`) of `cf_`- or `__ps_`-prefixed keys\n   * are treated as framework noise and no `durable_object_storage_*` span is created for them,\n   * mirroring how `cf_`-prefixed SQL tables are handled (see {@link durableObjectSqlSpanAllowlist}).\n   * If one of your own keys happens to use such a prefix, add it here to opt it back into\n   * instrumentation. Strings must match exactly, while regular expressions give you prefix/pattern\n   * matching.\n   *\n   * @default []\n   * @example\n   * ```ts\n   * export default Sentry.withSentry(\n   *   (env) => ({\n   *     dsn: env.SENTRY_DSN,\n   *     durableObjectStorageSpanAllowlist: ['cf_my_key', /^cf_reports_/],\n   *   }),\n   *   handler,\n   * );\n   * ```\n   */\n  durableObjectStorageSpanAllowlist?: Array<string | RegExp>;\n\n  /**\n   * If you use Spotlight by Sentry during development, use\n   * this option to forward captured Sentry events to Spotlight.\n   *\n   * Either set it to true, or provide a specific Spotlight Sidecar URL.\n   *\n   * More details: https://spotlightjs.com/\n   *\n   * IMPORTANT: Only set this option to `true` while developing, not in production!\n   */\n  spotlight?: boolean | string;\n}\n\n/**\n * Configuration options for the Sentry Cloudflare SDK\n *\n * @see @sentry/core Options for more information.\n */\nexport interface CloudflareOptions extends Options<CloudflareTransportOptions>, BaseCloudflareOptions {\n  ctx?: ExecutionContextCompat;\n}\n\n/**\n * Configuration options for the Sentry Cloudflare SDK Client class\n *\n * @see CloudflareClient for more information.\n */\nexport interface CloudflareClientOptions extends ClientOptions<CloudflareTransportOptions>, BaseCloudflareOptions {\n  flushLock?: ReturnType<typeof makeFlushLock>;\n}\n"],"names":["ServerRuntimeClient","applySdkMetadata","DEBUG_BUILD","debug","spanIsSampled","_INTERNAL_clearAiProviderSkips"],"mappings":"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"}
+{"version":3,"file":"client.js","sources":["../../../src/client.ts"],"sourcesContent":["import type { ClientOptions, Options, TracePropagationTargets } from '@sentry/core';\nimport {\n  _INTERNAL_clearAiProviderSkips,\n  _INTERNAL_flushLogsBuffer,\n  _INTERNAL_flushMetricsBuffer,\n  applySdkMetadata,\n  debug,\n  spanIsSampled,\n} from '@sentry/core';\nimport type { ServerRuntimeClientOptions } from '@sentry/core/server';\nimport { ServerRuntimeClient } from '@sentry/core/server';\nimport { DEBUG_BUILD } from './debug-build';\nimport type { ExecutionContextCompat } from './executionContext';\nimport type { makeFlushLock } from './flush';\nimport type { CloudflareTransportOptions } from './transport';\nimport { getInvocationState, getInvocationWaitUntil } from './utils/invocationContext';\n\n/**\n * The Sentry Cloudflare SDK Client.\n *\n * @see CloudflareClientOptions for documentation on configuration options.\n * @see ServerRuntimeClient for usage documentation.\n */\nexport class CloudflareClient extends ServerRuntimeClient {\n  private readonly _flushLock: ReturnType<typeof makeFlushLock> | void;\n  private _pendingSpans: Set<string> = new Set();\n  private _spanCompletionPromise: Promise<void> | null = null;\n  private _resolveSpanCompletion: (() => void) | null = null;\n\n  private _unsubscribeSpanStart: (() => void) | null = null;\n  private _unsubscribeSpanEnd: (() => void) | null = null;\n\n  // True while a boundary `flush()` is draining; envelopes created by that drain ride it\n  // and must not each start their own eager transport flush.\n  private _inBoundaryFlush = false;\n\n  /**\n   * Whether this client is a cached, cross-invocation client (`cacheClient`).\n   * Cached clients are never disposed at an invocation boundary, so their spans/events\n   * are delivered eagerly instead of waiting for a per-invocation flush.\n   */\n  public readonly isCachedClient: boolean;\n\n  /**\n   * Creates a new Cloudflare SDK instance.\n   * @param options Configuration options for this SDK.\n   */\n  public constructor(options: CloudflareClientOptions) {\n    applySdkMetadata(options, 'cloudflare');\n    options._metadata = options._metadata || {};\n    const { flushLock, ...serverOptions } = options;\n\n    const clientOptions: ServerRuntimeClientOptions = {\n      ...serverOptions,\n      platform: 'javascript',\n      // TODO: Grab version information\n      runtime: { name: 'cloudflare' },\n      // TODO: Add server name\n      _flushInterval: 0,\n    };\n\n    super(clientOptions);\n    this._flushLock = flushLock;\n    this.isCachedClient = options.cacheClient === true;\n\n    // Track span lifecycle to know when to flush. Skipped for cached clients\n    // (`cacheClient`): they are never disposed, so spans that end after\n    // a flush are still delivered. Per-invocation clients are disposed right after\n    // the boundary flush, so the flush must wait for open spans to end otherwise\n    // their transaction never gets emitted.\n    if (!this.isCachedClient) {\n      this._unsubscribeSpanStart = this.on('spanStart', span => {\n        const spanId = span.spanContext().spanId;\n        DEBUG_BUILD && debug.log('[CloudflareClient] Span started:', spanId);\n\n        // Negatively sampled spans never emit spanEnd,\n        // so tracking them would cause _pendingSpans to grow unboundedly.\n        // We should fix the inconsistent behavior for NonRecordingSpans in the future but\n        // for now, we just ignore them.\n        if (!spanIsSampled(span)) {\n          return;\n        }\n\n        this._pendingSpans.add(spanId);\n\n        if (!this._spanCompletionPromise) {\n          this._spanCompletionPromise = new Promise(resolve => {\n            this._resolveSpanCompletion = resolve;\n          });\n        }\n      });\n\n      this._unsubscribeSpanEnd = this.on('spanEnd', span => {\n        const spanId = span.spanContext().spanId;\n        DEBUG_BUILD && debug.log('[CloudflareClient] Span ended:', spanId);\n        this._pendingSpans.delete(spanId);\n\n        // If no more pending spans, resolve the completion promise\n        if (this._pendingSpans.size === 0 && this._resolveSpanCompletion) {\n          DEBUG_BUILD && debug.log('[CloudflareClient] All spans completed, preparing to flush');\n          this._resolveSpanCompletion();\n          this._resetSpanCompletionPromise();\n        }\n      });\n    }\n  }\n\n  /**\n   * Flushes pending operations and ensures all data is processed.\n   * If a timeout is provided, the operation will be completed within the specified time limit.\n   *\n   * It will wait for all pending spans to complete before flushing.\n   *\n   * @param {number} [timeout] - Optional timeout in milliseconds to force the completion of the flush operation.\n   * @return {Promise<boolean>} A promise that resolves to a boolean indicating whether the flush operation was successful.\n   */\n  public async flush(timeout?: number): Promise<boolean> {\n    // Wait for user waitUntil-registered work to settle before draining, so events\n    // captured in that work are still in the buffer. Without this the final flush\n    // can drain (and the client be disposed) before background captures land.\n    if (this._flushLock) {\n      await this._flushLock.finalize();\n    }\n\n    if (this._pendingSpans.size > 0 && this._spanCompletionPromise) {\n      DEBUG_BUILD &&\n        debug.log('[CloudflareClient] Waiting for', this._pendingSpans.size, 'pending spans to complete...');\n\n      const timeoutMs = timeout ?? 5000;\n      const spanCompletionRace = Promise.race([\n        this._spanCompletionPromise,\n        new Promise(resolve =>\n          setTimeout(() => {\n            DEBUG_BUILD &&\n              debug.log('[CloudflareClient] Span completion timeout after', timeoutMs, 'ms, flushing anyway');\n            resolve(undefined);\n          }, timeoutMs),\n        ),\n      ]);\n\n      await spanCompletionRace;\n    }\n\n    // Envelopes created while this flush drains (log/metric/span buffers turning into\n    // envelopes on the `flush` emit) ride its own transport drain; without the flag each\n    // of them would also start an eager drain and a `waitUntil` registration.\n    this._inBoundaryFlush = true;\n    try {\n      return await super.flush(timeout);\n    } finally {\n      this._inBoundaryFlush = false;\n    }\n  }\n\n  /**\n   * Disposes of the client and releases all resources.\n   *\n   * This method clears all Cloudflare-specific state in addition to the base client cleanup.\n   * It unsubscribes from span lifecycle events and clears pending span tracking.\n   *\n   * Call this method after flushing to allow the client to be garbage collected.\n   * After calling dispose(), the client should not be used anymore.\n   */\n  public override dispose(): void {\n    DEBUG_BUILD && debug.log('[CloudflareClient] Disposing client...');\n\n    super.dispose();\n\n    if (this._unsubscribeSpanStart) {\n      this._unsubscribeSpanStart();\n      this._unsubscribeSpanStart = null;\n    }\n    if (this._unsubscribeSpanEnd) {\n      this._unsubscribeSpanEnd();\n      this._unsubscribeSpanEnd = null;\n    }\n\n    this._resetSpanCompletionPromise();\n    (this as unknown as { _flushLock: ReturnType<typeof makeFlushLock> | void })._flushLock = undefined;\n  }\n\n  /** @inheritDoc */\n  protected override _setupIntegrations(): void {\n    // Clear AI provider skip registrations before setting up integrations.\n    // The registry is module-global and Cloudflare calls `init()` per request, so without this a\n    // single `ai` SDK call would suppress direct `env.AI.run` spans for the rest of the isolate's\n    // life. Mirrors the same reset in the Node client.\n    _INTERNAL_clearAiProviderSkips();\n    super._setupIntegrations();\n\n    // Registered after the integrations on purpose: the flush-point marker must run\n    // after core and the span buffer have turned their buffers into envelopes on the\n    // same `flush` emit (so those envelopes ride the boundary drain instead of starting\n    // eager ones), and the eager span handler relies on `spanStreamingIntegration`\n    // having already buffered the span that triggers it.\n    if (this.isCachedClient) {\n      // Marks the invocation's natural flush point: anything captured from now on\n      // (post-response `waitUntil` work, detached continuations) has no later flush\n      // to ride and is delivered eagerly by the hooks below.\n      this.on('flush', () => {\n        const invocationState = getInvocationState();\n        if (invocationState) {\n          invocationState.flushPointReached = true;\n        }\n      });\n      this._setupEagerEnvelopeDelivery();\n      this._setupEagerBufferDelivery();\n    }\n  }\n\n  /**\n   * Resets the span completion promise and resolve function.\n   */\n  private _resetSpanCompletionPromise(): void {\n    this._pendingSpans.clear();\n    this._spanCompletionPromise = null;\n    this._resolveSpanCompletion = null;\n  }\n\n  /**\n   * Drains the transport after an envelope has been accepted past the invocation's\n   * flush point. The transport queues request producers until `flush()`; before the\n   * flush point the boundary `flush()` drains everything, but envelopes created after\n   * it (post-response `waitUntil` work, detached continuations) have no later flush to\n   * ride. The drain is registered with the invocation's `waitUntil` to keep the fetch\n   * alive; outside any instrumented invocation it always runs.\n   */\n  private _setupEagerEnvelopeDelivery(): void {\n    this.on('afterEnvelope', () => {\n      const transport = this.getTransport();\n      const invocationState = getInvocationState();\n\n      if (!transport || this._inBoundaryFlush || (invocationState && !invocationState.flushPointReached)) {\n        return;\n      }\n\n      this._registerWithInvocationWaitUntil(transport.flush(2000));\n    });\n  }\n\n  /**\n   * Turns spans, logs and metrics captured past the invocation's flush point into\n   * envelopes. Before the flush point the boundary `flush()` drains their buffers; after\n   * it (or outside any instrumented invocation) nothing else would: the log/metric idle\n   * timer is disabled for this runtime (`_flushInterval: 0`) and the span buffer's own 5s\n   * timer fires outside any invocation, where the runtime suspends the send. Each capture\n   * drains only its own bucket (the ended span's trace, the log buffer, the metric\n   * buffer), so a fan-out of concurrent traces stays one envelope per trace. RPC method\n   * spans never reach this path: `wrapMethodWithSentry` runs the boundary flush after the\n   * method span has ended, so only work past that (e.g. detached continuations) lands here.\n   */\n  private _setupEagerBufferDelivery(): void {\n    this.on('afterSpanEnd', span => {\n      // The trace id must come from the span, not the current scope: `continueTrace`\n      // writes the propagation context to the *current* scope, so the forked\n      // isolation scope's propagation context carries a different trace id and\n      // flushing by it silently no-ops.\n      const traceId = span.spanContext().traceId;\n      this._eagerDrain(() => this.emit('flushTraceSpans', traceId));\n    });\n    this.on('afterCaptureLog', () => this._eagerDrain(() => _INTERNAL_flushLogsBuffer(this)));\n    this.on('afterCaptureMetric', () => this._eagerDrain(() => _INTERNAL_flushMetricsBuffer(this)));\n  }\n\n  /**\n   * Runs `drain` unless the owning invocation has not reached its flush point yet\n   * (before it the boundary `flush()` delivers the buffers).\n   */\n  private _eagerDrain(drain: () => void): void {\n    const invocationState = getInvocationState();\n\n    if (invocationState && !invocationState.flushPointReached) {\n      return;\n    }\n\n    drain();\n  }\n\n  /**\n   * Attaches a promise to the `waitUntil` of the invocation that owns the current\n   * async context, so the runtime keeps the send alive after the response is returned.\n   * Outside any instrumented invocation (or where the context has no `waitUntil`,\n   * e.g. Astro prerendering) the send is fire-and-forget.\n   */\n  private _registerWithInvocationWaitUntil(promise: PromiseLike<unknown>): void {\n    const invocationState = getInvocationState();\n    const waitUntil = invocationState && getInvocationWaitUntil(invocationState);\n    if (!waitUntil) {\n      return;\n    }\n\n    try {\n      waitUntil(\n        Promise.resolve(promise).then(\n          () => undefined,\n          () => undefined,\n        ),\n      );\n    } catch {\n      // The owning invocation already ended; the send races isolate teardown either way.\n    }\n  }\n}\n\ninterface BaseCloudflareOptions {\n  /**\n   * @ignore Used internally to disable the deDupeIntegration for workflows.\n   * @hidden Used internally to disable the deDupeIntegration for workflows.\n   * @default true\n   */\n  enableDedupe?: boolean;\n\n  /**\n   * The Cloudflare SDK is not OpenTelemetry native. By default (`false`) it does not set up a tracer\n   * provider; spans are emitted via the SDK's own instrumentation and scopes are isolated with\n   * AsyncLocalStorage.\n   *\n   * Set this to `true` to opt into the OpenTelemetry compatibility tracer, which captures spans\n   * emitted via `@opentelemetry/api`. Big caveat: it does not handle custom context, always working\n   * off the current scope. This is good enough for many, but not all, integrations.\n   *\n   * @default false\n   */\n  enableOpenTelemetrySetup?: boolean;\n\n  /**\n   * The bindings on `env` that outgoing RPC calls propagate trace context to.\n   *\n   * Strings match a binding name exactly, regular expressions match by pattern. An empty array\n   * (the default) propagates to nothing.\n   *\n   * RPC has no headers to carry trace context, so the SDK appends it as a trailing argument to\n   * every RPC method call on a matching binding. Only a Sentry-instrumented receiver strips that\n   * argument again. Anywhere else it arrives as a real argument and changes what the method was\n   * called with, so list only the bindings whose receiver you know runs Sentry.\n   *\n   * Propagation over `stub.fetch()` and service binding `fetch()` uses HTTP headers and is not\n   * affected by this option.\n   *\n   * Strings match a binding name exactly, regular expressions match by pattern. Both match\n   * case-insensitively.\n   *\n   * When you build with the Sentry Cloudflare Vite plugin, bindings that resolve to *this* worker\n   * (its own Durable Objects, its self service bindings) are added for you, because the plugin\n   * instruments those receivers itself. Whatever you list here is added on top of them.\n   *\n   * @default []\n   * @example\n   * ```ts\n   * // Propagate to `env.ORDERS` and every `env.SVC_*` binding\n   * export default Sentry.withSentry(\n   *   env => ({\n   *     dsn: env.SENTRY_DSN,\n   *     rpcTracePropagationBindings: ['ORDERS', /^SVC_/],\n   *   }),\n   *   handler,\n   * );\n   * ```\n   */\n  rpcTracePropagationBindings?: TracePropagationTargets;\n\n  /**\n   * Table names that should stay instrumented even though they match the reserved `cf_` prefix used\n   * by Durable Object frameworks (`agents`, `partyserver`, ...) for their internal SQLite tables.\n   *\n   * By default, `exec` queries against `cf_`-prefixed tables are treated as framework noise and no\n   * `db.query` span is created for them. If one of your own tables happens to use this prefix, add it\n   * here to opt it back into instrumentation. Entries are matched against each table name in the\n   * query summary — strings must match exactly, while regular expressions give you prefix/pattern\n   * matching.\n   *\n   * @default []\n   * @example\n   * ```ts\n   * export default Sentry.withSentry(\n   *   (env) => ({\n   *     dsn: env.SENTRY_DSN,\n   *     durableObjectSqlSpanAllowlist: ['cf_my_table', /^cf_reports_/],\n   *   }),\n   *   handler,\n   * );\n   * ```\n   */\n  durableObjectSqlSpanAllowlist?: Array<string | RegExp>;\n\n  /**\n   * KV keys that should stay instrumented even though they match a reserved prefix used by Durable\n   * Object frameworks (`agents`, `partyserver`, ...) for their internal storage entries.\n   *\n   * By default, KV reads/writes (`get`, `put`, `delete`, `list`) of `cf_`- or `__ps_`-prefixed keys\n   * are treated as framework noise and no `durable_object_storage_*` span is created for them,\n   * mirroring how `cf_`-prefixed SQL tables are handled (see {@link durableObjectSqlSpanAllowlist}).\n   * If one of your own keys happens to use such a prefix, add it here to opt it back into\n   * instrumentation. Strings must match exactly, while regular expressions give you prefix/pattern\n   * matching.\n   *\n   * @default []\n   * @example\n   * ```ts\n   * export default Sentry.withSentry(\n   *   (env) => ({\n   *     dsn: env.SENTRY_DSN,\n   *     durableObjectStorageSpanAllowlist: ['cf_my_key', /^cf_reports_/],\n   *   }),\n   *   handler,\n   * );\n   * ```\n   */\n  durableObjectStorageSpanAllowlist?: Array<string | RegExp>;\n\n  /**\n   * Sets an optional server name (device name).\n   *\n   * This is useful for identifying which server or instance is sending events.\n   */\n  serverName?: string;\n\n  /**\n   * If you use Spotlight by Sentry during development, use\n   * this option to forward captured Sentry events to Spotlight.\n   *\n   * Either set it to true, or provide a specific Spotlight Sidecar URL.\n   *\n   * More details: https://spotlightjs.com/\n   *\n   * IMPORTANT: Only set this option to `true` while developing, not in production!\n   */\n  spotlight?: boolean | string;\n\n  /**\n   * Cache the client and reuse it across invocations within the same isolate.\n   *\n   * The SDK creates one client per isolate and reuses it for all requests/DO\n   * handlers in that isolate. This avoids the per-invocation cost of\n   * constructing a new client.\n   *\n   * Since a cached client outlives any single invocation, data captured after an\n   * invocation's flush point (post-response `waitUntil` work, detached background\n   * work) is delivered eagerly instead of waiting for a flush that never comes.\n   *\n   * The first `init()` in an isolate decides the cached client's options; later\n   * `init()` calls with different options (e.g. another DSN) reuse the cached client\n   * unchanged (a debug warning is logged for a DSN change). Use `cacheClient: false`\n   * when options must differ per invocation.\n   *\n   * When disabled, a new client is created per invocation and disposed after the\n   * handler completes.\n   *\n   * @default true\n   */\n  cacheClient?: boolean;\n}\n\n/**\n * Configuration options for the Sentry Cloudflare SDK\n *\n * @see @sentry/core Options for more information.\n */\nexport interface CloudflareOptions extends Options<CloudflareTransportOptions>, BaseCloudflareOptions {\n  ctx?: ExecutionContextCompat;\n}\n\n/**\n * Configuration options for the Sentry Cloudflare SDK Client class\n *\n * @see CloudflareClient for more information.\n */\nexport interface CloudflareClientOptions extends ClientOptions<CloudflareTransportOptions>, BaseCloudflareOptions {\n  flushLock?: ReturnType<typeof makeFlushLock>;\n}\n"],"names":["ServerRuntimeClient","applySdkMetadata","DEBUG_BUILD","debug","spanIsSampled","_INTERNAL_clearAiProviderSkips","getInvocationState","_INTERNAL_flushLogsBuffer","_INTERNAL_flushMetricsBuffer","getInvocationWaitUntil"],"mappings":"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"}

package/build/cjs/dev/clientCache.js

@@ -0,0 +1,15 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+
+const core = require('@sentry/core');
+
+const GLOBAL_CLIENT_KEY = "__SENTRY_CLOUDFLARE_CLIENT__";
+function getCachedClient() {
+  return core.GLOBAL_OBJ[GLOBAL_CLIENT_KEY];
+}
+function cacheClient(client) {
+  core.GLOBAL_OBJ[GLOBAL_CLIENT_KEY] = client;
+}
+
+exports.cacheClient = cacheClient;
+exports.getCachedClient = getCachedClient;
+//# sourceMappingURL=clientCache.js.map

package/build/cjs/dev/clientCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clientCache.js","sources":["../../../src/clientCache.ts"],"sourcesContent":["import { GLOBAL_OBJ } from '@sentry/core';\nimport type { CloudflareClient } from './client';\n\nconst GLOBAL_CLIENT_KEY = '__SENTRY_CLOUDFLARE_CLIENT__' as const;\n\ntype GlobalWithCloudflareClient = typeof GLOBAL_OBJ & {\n  [GLOBAL_CLIENT_KEY]?: CloudflareClient;\n};\n\n/** Returns the one cached Cloudflare client for this isolate. */\nexport function getCachedClient(): CloudflareClient | undefined {\n  return (GLOBAL_OBJ as GlobalWithCloudflareClient)[GLOBAL_CLIENT_KEY];\n}\n\n/** Stores the one Cloudflare client reused by every invocation in this isolate. */\nexport function cacheClient(client: CloudflareClient): void {\n  (GLOBAL_OBJ as GlobalWithCloudflareClient)[GLOBAL_CLIENT_KEY] = client;\n}\n\n/** @hidden Only for testing - clears the isolate's cached Cloudflare client. */\nexport function _clearGlobalClientCache(): void {\n  (GLOBAL_OBJ as GlobalWithCloudflareClient)[GLOBAL_CLIENT_KEY] = undefined;\n}\n"],"names":["GLOBAL_OBJ"],"mappings":";;;;AAGA,MAAM,iBAAA,GAAoB,8BAAA;AAOnB,SAAS,eAAA,GAAgD;AAC9D,EAAA,OAAQA,gBAA0C,iBAAiB,CAAA;AACrE;AAGO,SAAS,YAAY,MAAA,EAAgC;AAC1D,EAACA,eAAA,CAA0C,iBAAiB,CAAA,GAAI,MAAA;AAClE;;;;;"}

package/build/cjs/dev/defineCloudflareOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"defineCloudflareOptions.js","sources":["../../../src/defineCloudflareOptions.ts"],"sourcesContent":["import type { CloudflareOptions } from './client';\nimport type { DefaultEnv } from './types';\n\n/**\n * Define the Sentry options for a Cloudflare Worker in a dedicated module.\n *\n * This is the recommended way to configure the SDK when using the Vite plugin's\n * auto-instrumentation: place an `instrument.server.{ts,js,mjs}` file next to\n * the worker entry whose **default export** is the result of this function. The\n * plugin picks it up automatically and hands it to `withSentry`.\n *\n * Unlike Node's `Sentry.init(...)`, the options cannot be applied at module\n * load time on Cloudflare: the DSN and other settings typically come from the\n * per-request `env`, which only exists inside the handler. Pass a callback to\n * read from `env`, or a static object when no `env` access is needed — either\n * way you get full type-checking and autocomplete on {@link CloudflareOptions}.\n *\n * At runtime this is a thin pass-through; it only normalizes a static object\n * into a callback so the plugin always imports a `(env) => options` function.\n *\n * @example\n * ```ts\n * // src/instrument.server.ts\n * import { defineCloudflareOptions } from '@sentry/cloudflare';\n *\n * export default defineCloudflareOptions((env) => ({\n *   dsn: env.SENTRY_DSN,\n *   tracesSampleRate: 1.0,\n * }));\n * ```\n *\n * @example\n * ```ts\n * // Static options — no `env` access needed\n * export default defineCloudflareOptions({ tracesSampleRate: 1.0 });\n * ```\n */\nexport function defineCloudflareOptions<Env = DefaultEnv>(\n  optionsOrCallback: CloudflareOptions | ((env: Env) => CloudflareOptions | undefined),\n): (env: Env) => CloudflareOptions | undefined {\n  if (typeof optionsOrCallback === 'function') {\n    return optionsOrCallback;\n  }\n\n  return () => optionsOrCallback;\n}\n"],"names":[],"mappings":";;AAqCO,SAAS,wBACd,iBAAA,EAC6C;AAC7C,EAAA,IAAI,OAAO,sBAAsB,UAAA,EAAY;AAC3C,IAAA,OAAO,iBAAA;AAAA,EACT;AAEA,EAAA,OAAO,MAAM,iBAAA;AACf;;;;"}
+{"version":3,"file":"defineCloudflareOptions.js","sources":["../../../src/defineCloudflareOptions.ts"],"sourcesContent":["import type { CloudflareOptions } from './client';\nimport type { DefaultEnv, StrictCloudflareOptions } from './types';\n\n/**\n * Define the Sentry options for a Cloudflare Worker in a dedicated module.\n *\n * This is the recommended way to configure the SDK when using the Vite plugin's\n * auto-instrumentation: place an `instrument.server.{ts,js,mjs}` file next to\n * the worker entry whose **default export** is the result of this function. The\n * plugin picks it up automatically and hands it to `withSentry`.\n *\n * Unlike Node's `Sentry.init(...)`, the options cannot be applied at module\n * load time on Cloudflare: the DSN and other settings typically come from the\n * per-request `env`, which only exists inside the handler. Pass a callback to\n * read from `env`, or a static object when no `env` access is needed — either\n * way you get full type-checking and autocomplete on {@link CloudflareOptions}.\n *\n * At runtime this is a thin pass-through; it only normalizes a static object\n * into a callback so the plugin always imports a `(env) => options` function.\n *\n * @example\n * ```ts\n * // src/instrument.server.ts\n * import { defineCloudflareOptions } from '@sentry/cloudflare';\n *\n * export default defineCloudflareOptions((env) => ({\n *   dsn: env.SENTRY_DSN,\n *   tracesSampleRate: 1.0,\n * }));\n * ```\n *\n * @example\n * ```ts\n * // Static options — no `env` access needed\n * export default defineCloudflareOptions({ tracesSampleRate: 1.0 });\n * ```\n */\n// Overloads rather than a union parameter: TypeScript does not infer `O` out of a union member,\n// so a union signature falls back to the default and the unknown-key check never runs. The object\n// overload stays on plain `CloudflareOptions` — a direct object literal is still excess property\n// checked, and a callback cannot match it.\nexport function defineCloudflareOptions<Env = DefaultEnv, O = unknown>(\n  callback: (env: Env) => StrictCloudflareOptions<O> | undefined,\n): (env: Env) => CloudflareOptions | undefined;\nexport function defineCloudflareOptions<Env = DefaultEnv>(\n  options: CloudflareOptions,\n): (env: Env) => CloudflareOptions | undefined;\nexport function defineCloudflareOptions<Env = DefaultEnv>(\n  optionsOrCallback: CloudflareOptions | ((env: Env) => CloudflareOptions | undefined),\n): (env: Env) => CloudflareOptions | undefined {\n  if (typeof optionsOrCallback === 'function') {\n    return optionsOrCallback;\n  }\n\n  return () => optionsOrCallback;\n}\n"],"names":[],"mappings":";;AA+CO,SAAS,wBACd,iBAAA,EAC6C;AAC7C,EAAA,IAAI,OAAO,sBAAsB,UAAA,EAAY;AAC3C,IAAA,OAAO,iBAAA;AAAA,EACT;AAEA,EAAA,OAAO,MAAM,iBAAA;AACf;;;;"}

package/build/cjs/dev/durableobject.js

@@ -1,12 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
+const op = require('@sentry/conventions/op');
 const core = require('@sentry/core');
 const noDiagnosticChannels = require('@sentry/server-utils/no-diagnostic-channels');
 const instrument = require('./instrument.js');
+const instrumentDurableObjectHandlers = require('./instrumentations/instrumentDurableObjectHandlers.js');
 const instrumentEnv = require('./instrumentations/worker/instrumentEnv.js');
 const options = require('./options.js');
-const request = require('./request.js');
-const sdk = require('./sdk.js');
 const instrumentContext = require('./utils/instrumentContext.js');
 const rpcMeta = require('./utils/rpcMeta.js');
 const index = require('./instrumentations/agents/index.js');
@@ -27,7 +27,7 @@ function constructInstrumentedDurableObject(target, ctx, env, newTarget, options
     methodsBeforeConstruction,
     cachedFrameworkManagedMethods
   );
-  instrumentDurableObjectHandlers(obj, options$1, context);
+  instrumentDurableObjectHandlers.instrumentDurableObjectHandlers(obj, options$1, context);
   return { obj, options: options$1, context, frameworkManagedMethods };
 }
 const frameworkManagedMethodsCache = /* @__PURE__ */ new WeakMap();
@@ -61,61 +61,6 @@ function resolveFrameworkManagedMethods(prototype, obj, methodsBeforeConstructio
   frameworkManagedMethodsCache.set(prototype, managed);
   return managed;
 }
-function instrumentDurableObjectHandlers(obj, options, context) {
-  if (obj.fetch && typeof obj.fetch === "function") {
-    obj.fetch = instrument.ensureInstrumented(
-      obj.fetch.bind(obj),
-      (original) => new Proxy(original, {
-        apply(target, thisArg, args) {
-          return request.wrapRequestHandlerWithInit(
-            { options, request: args[0], context },
-            () => {
-              return Reflect.apply(target, thisArg, args);
-            },
-            sdk.init
-          );
-        }
-      })
-    );
-  }
-  if (obj.alarm && typeof obj.alarm === "function") {
-    obj.alarm = wrapMethodWithSentry.wrapMethodWithSentry(
-      {
-        options,
-        context,
-        spanName: "alarm",
-        spanOp: "function",
-        startNewTrace: true,
-        origin: "auto.faas.cloudflare.durable_object"
-      },
-      obj.alarm.bind(obj)
-    );
-  }
-  if (obj.webSocketMessage && typeof obj.webSocketMessage === "function") {
-    obj.webSocketMessage = wrapMethodWithSentry.wrapMethodWithSentry(
-      { options, context, spanName: "webSocketMessage", origin: "auto.faas.cloudflare.durable_object" },
-      obj.webSocketMessage.bind(obj)
-    );
-  }
-  if (obj.webSocketClose && typeof obj.webSocketClose === "function") {
-    obj.webSocketClose = wrapMethodWithSentry.wrapMethodWithSentry(
-      { options, context, spanName: "webSocketClose", origin: "auto.faas.cloudflare.durable_object" },
-      obj.webSocketClose.bind(obj)
-    );
-  }
-  if (obj.webSocketError && typeof obj.webSocketError === "function") {
-    obj.webSocketError = wrapMethodWithSentry.wrapMethodWithSentry(
-      { options, context, spanName: "webSocketError", origin: "auto.faas.cloudflare.durable_object" },
-      obj.webSocketError.bind(obj),
-      (_, error) => core.captureException(error, {
-        mechanism: {
-          type: "auto.faas.cloudflare.durable_object_websocket",
-          handled: false
-        }
-      })
-    );
-  }
-}
 const RESERVED_RPC_METHOD_NAMES = /* @__PURE__ */ new Set([
   "constructor",
   "fetch",
@@ -128,9 +73,6 @@ const RESERVED_RPC_METHOD_NAMES = /* @__PURE__ */ new Set([
 ]);
 const rpcInstanceStates = /* @__PURE__ */ new WeakMap();
 function finalizeWithRpcInstrumentation(obj, options, context, excludedMethods) {
-  if (options.enableRpcTracePropagation === false) {
-    return obj;
-  }
   rpcInstanceStates.set(obj, { options, context });
   instrumentPrototypeRpcMethods(obj, excludedMethods);
   return obj;
@@ -180,7 +122,7 @@ function createRpcPrototypeWrapper(methodName, originalMethod) {
           options: state.options,
           context: state.context,
           spanName: methodName,
-          spanOp: "rpc",
+          spanOp: op.RPC,
           origin: "auto.faas.cloudflare.durable_object"
         },
         originalMethod,