@sentry/cloudflare 10.40.0 → 10.41.0

package/build/cjs/client.js

@@ -15,6 +15,9 @@ class CloudflareClient extends core.ServerRuntimeClient {
    __init2() {this._spanCompletionPromise = null;}
    __init3() {this._resolveSpanCompletion = null;}
 
+   __init4() {this._unsubscribeSpanStart = null;}
+   __init5() {this._unsubscribeSpanEnd = null;}
+
   /**
    * Creates a new Cloudflare SDK instance.
    * @param options Configuration options for this SDK.
@@ -32,10 +35,10 @@ class CloudflareClient extends core.ServerRuntimeClient {
       // TODO: Add server name
     };
 
-    super(clientOptions);CloudflareClient.prototype.__init.call(this);CloudflareClient.prototype.__init2.call(this);CloudflareClient.prototype.__init3.call(this);    this._flushLock = flushLock;
+    super(clientOptions);CloudflareClient.prototype.__init.call(this);CloudflareClient.prototype.__init2.call(this);CloudflareClient.prototype.__init3.call(this);CloudflareClient.prototype.__init4.call(this);CloudflareClient.prototype.__init5.call(this);    this._flushLock = flushLock;
 
     // Track span lifecycle to know when to flush
-    this.on('spanStart', span => {
+    this._unsubscribeSpanStart = this.on('spanStart', span => {
       const spanId = span.spanContext().spanId;
       debugBuild.DEBUG_BUILD && core.debug.log('[CloudflareClient] Span started:', spanId);
       this._pendingSpans.add(spanId);
@@ -47,7 +50,7 @@ class CloudflareClient extends core.ServerRuntimeClient {
       }
     });
 
-    this.on('spanEnd', span => {
+    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);
@@ -97,6 +100,33 @@ class CloudflareClient extends core.ServerRuntimeClient {
     return super.flush(timeout);
   }
 
+  /**
+   * Disposes of the client and releases all resources.
+   *
+   * This method clears all Cloudflare-specific state in addition to the base client cleanup.
+   * It unsubscribes from span lifecycle events and clears pending span tracking.
+   *
+   * Call this method after flushing to allow the client to be garbage collected.
+   * After calling dispose(), the client should not be used anymore.
+   */
+    dispose() {
+    debugBuild.DEBUG_BUILD && core.debug.log('[CloudflareClient] Disposing client...');
+
+    super.dispose();
+
+    if (this._unsubscribeSpanStart) {
+      this._unsubscribeSpanStart();
+      this._unsubscribeSpanStart = null;
+    }
+    if (this._unsubscribeSpanEnd) {
+      this._unsubscribeSpanEnd();
+      this._unsubscribeSpanEnd = null;
+    }
+
+    this._resetSpanCompletionPromise();
+    (this )._flushLock = undefined;
+  }
+
   /**
    * Resets the span completion promise and resolve function.
    */

package/build/cjs/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sources":["../../src/client.ts"],"sourcesContent":["import type { ClientOptions, Options, ServerRuntimeClientOptions } from '@sentry/core';\nimport { applySdkMetadata, debug, ServerRuntimeClient } from '@sentry/core';\nimport { DEBUG_BUILD } from './debug-build';\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  /**\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    };\n\n    super(clientOptions);\n    this._flushLock = flushLock;\n\n    // Track span lifecycle to know when to flush\n    this.on('spanStart', span => {\n      const spanId = span.spanContext().spanId;\n      DEBUG_BUILD && debug.log('[CloudflareClient] Span started:', spanId);\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.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   * 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, however, we set up some OpenTelemetry compatibility\n   * via a custom trace provider.\n   * This ensures that any spans emitted via `@opentelemetry/api` will be captured by Sentry.\n   * HOWEVER, big caveat: This does not handle custom context handling, it will always work off the current scope.\n   * This should be good enough for many, but not all integrations.\n   *\n   * If you want to opt-out of setting up the OpenTelemetry compatibility tracer, set this to `true`.\n   *\n   * @default false\n   */\n  skipOpenTelemetrySetup?: boolean;\n\n  /**\n   * Enable instrumentation of prototype methods for DurableObjects.\n   *\n   * When `true`, the SDK will wrap all methods on the DurableObject prototype chain\n   * to automatically create spans and capture errors for RPC method calls.\n   *\n   * When an array of strings is provided, only the specified method names will be instrumented.\n   *\n   * This feature adds runtime overhead as it wraps methods at the prototype level.\n   * Only enable this if you need automatic instrumentation of prototype methods.\n   *\n   * @default false\n   * @example\n   * ```ts\n   * // Instrument all prototype methods\n   * instrumentPrototypeMethods: true\n   *\n   * // Instrument only specific methods\n   * instrumentPrototypeMethods: ['myMethod', 'anotherMethod']\n   * ```\n   */\n  instrumentPrototypeMethods?: 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?: ExecutionContext;\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"],"mappings":"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"}
+{"version":3,"file":"client.js","sources":["../../src/client.ts"],"sourcesContent":["import type { ClientOptions, Options, ServerRuntimeClientOptions } from '@sentry/core';\nimport { applySdkMetadata, debug, ServerRuntimeClient } from '@sentry/core';\nimport { DEBUG_BUILD } from './debug-build';\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    };\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      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  /**\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, however, we set up some OpenTelemetry compatibility\n   * via a custom trace provider.\n   * This ensures that any spans emitted via `@opentelemetry/api` will be captured by Sentry.\n   * HOWEVER, big caveat: This does not handle custom context handling, it will always work off the current scope.\n   * This should be good enough for many, but not all integrations.\n   *\n   * If you want to opt-out of setting up the OpenTelemetry compatibility tracer, set this to `true`.\n   *\n   * @default false\n   */\n  skipOpenTelemetrySetup?: boolean;\n\n  /**\n   * Enable instrumentation of prototype methods for DurableObjects.\n   *\n   * When `true`, the SDK will wrap all methods on the DurableObject prototype chain\n   * to automatically create spans and capture errors for RPC method calls.\n   *\n   * When an array of strings is provided, only the specified method names will be instrumented.\n   *\n   * This feature adds runtime overhead as it wraps methods at the prototype level.\n   * Only enable this if you need automatic instrumentation of prototype methods.\n   *\n   * @default false\n   * @example\n   * ```ts\n   * // Instrument all prototype methods\n   * instrumentPrototypeMethods: true\n   *\n   * // Instrument only specific methods\n   * instrumentPrototypeMethods: ['myMethod', 'anotherMethod']\n   * ```\n   */\n  instrumentPrototypeMethods?: 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?: ExecutionContext;\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"],"mappings":"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"}

package/build/cjs/flush.js

@@ -1,5 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
+const core = require('@sentry/core');
+
 /**
  * Enhances the given execution context by wrapping its `waitUntil` method with a proxy
  * to monitor pending tasks, and provides a flusher function to ensure all tasks
@@ -32,5 +34,19 @@ function makeFlushLock(context) {
   });
 }
 
+/**
+ * Flushes the client and then disposes of it to allow garbage collection.
+ * This should be called at the end of each request to prevent memory leaks.
+ *
+ * @param client - The CloudflareClient instance to flush and dispose
+ * @param timeout - Timeout in milliseconds for the flush operation
+ * @returns A promise that resolves when flush and dispose are complete
+ */
+async function flushAndDispose(client, timeout = 2000) {
+  await core.flush(timeout);
+  client?.dispose();
+}
+
+exports.flushAndDispose = flushAndDispose;
 exports.makeFlushLock = makeFlushLock;
 //# sourceMappingURL=flush.js.map

package/build/cjs/flush.js.map

@@ -1 +1 @@
-{"version":3,"file":"flush.js","sources":["../../src/flush.ts"],"sourcesContent":["import type { ExecutionContext } from '@cloudflare/workers-types';\n\ntype FlushLock = {\n  readonly ready: Promise<void>;\n  readonly finalize: () => Promise<void>;\n};\n\n/**\n * Enhances the given execution context by wrapping its `waitUntil` method with a proxy\n * to monitor pending tasks, and provides a flusher function to ensure all tasks\n * have been completed before executing any subsequent logic.\n *\n * @param {ExecutionContext} context - The execution context to be enhanced. If no context is provided, the function returns undefined.\n * @return {FlushLock} Returns a flusher function if a valid context is provided, otherwise undefined.\n */\nexport function makeFlushLock(context: ExecutionContext): FlushLock {\n  let resolveAllDone: () => void = () => undefined;\n  const allDone = new Promise<void>(res => {\n    resolveAllDone = res;\n  });\n  let pending = 0;\n  const originalWaitUntil = context.waitUntil.bind(context) as typeof context.waitUntil;\n  context.waitUntil = promise => {\n    pending++;\n    return originalWaitUntil(\n      promise.finally(() => {\n        if (--pending === 0) resolveAllDone();\n      }),\n    );\n  };\n  return Object.freeze({\n    ready: allDone,\n    finalize: () => {\n      if (pending === 0) resolveAllDone();\n      return allDone;\n    },\n  });\n}\n"],"names":[],"mappings":";;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,aAAa,CAAC,OAAO,EAA+B;AACpE,EAAE,IAAI,cAAc,GAAe,MAAM,SAAS;AAClD,EAAE,MAAM,OAAA,GAAU,IAAI,OAAO,CAAO,OAAO;AAC3C,IAAI,cAAA,GAAiB,GAAG;AACxB,EAAE,CAAC,CAAC;AACJ,EAAE,IAAI,OAAA,GAAU,CAAC;AACjB,EAAE,MAAM,iBAAA,GAAoB,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAA;AAC1D,EAAE,OAAO,CAAC,SAAA,GAAY,WAAW;AACjC,IAAI,OAAO,EAAE;AACb,IAAI,OAAO,iBAAiB;AAC5B,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM;AAC5B,QAAQ,IAAI,EAAE,OAAA,KAAY,CAAC,EAAE,cAAc,EAAE;AAC7C,MAAM,CAAC,CAAC;AACR,KAAK;AACL,EAAE,CAAC;AACH,EAAE,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,IAAI,KAAK,EAAE,OAAO;AAClB,IAAI,QAAQ,EAAE,MAAM;AACpB,MAAM,IAAI,OAAA,KAAY,CAAC,EAAE,cAAc,EAAE;AACzC,MAAM,OAAO,OAAO;AACpB,IAAI,CAAC;AACL,GAAG,CAAC;AACJ;;;;"}
+{"version":3,"file":"flush.js","sources":["../../src/flush.ts"],"sourcesContent":["import type { ExecutionContext } from '@cloudflare/workers-types';\nimport type { Client } from '@sentry/core';\nimport { flush } from '@sentry/core';\n\ntype FlushLock = {\n  readonly ready: Promise<void>;\n  readonly finalize: () => Promise<void>;\n};\n\n/**\n * Enhances the given execution context by wrapping its `waitUntil` method with a proxy\n * to monitor pending tasks, and provides a flusher function to ensure all tasks\n * have been completed before executing any subsequent logic.\n *\n * @param {ExecutionContext} context - The execution context to be enhanced. If no context is provided, the function returns undefined.\n * @return {FlushLock} Returns a flusher function if a valid context is provided, otherwise undefined.\n */\nexport function makeFlushLock(context: ExecutionContext): FlushLock {\n  let resolveAllDone: () => void = () => undefined;\n  const allDone = new Promise<void>(res => {\n    resolveAllDone = res;\n  });\n  let pending = 0;\n  const originalWaitUntil = context.waitUntil.bind(context) as typeof context.waitUntil;\n  context.waitUntil = promise => {\n    pending++;\n    return originalWaitUntil(\n      promise.finally(() => {\n        if (--pending === 0) resolveAllDone();\n      }),\n    );\n  };\n  return Object.freeze({\n    ready: allDone,\n    finalize: () => {\n      if (pending === 0) resolveAllDone();\n      return allDone;\n    },\n  });\n}\n\n/**\n * Flushes the client and then disposes of it to allow garbage collection.\n * This should be called at the end of each request to prevent memory leaks.\n *\n * @param client - The CloudflareClient instance to flush and dispose\n * @param timeout - Timeout in milliseconds for the flush operation\n * @returns A promise that resolves when flush and dispose are complete\n */\nexport async function flushAndDispose(client: Client | undefined, timeout = 2000): Promise<void> {\n  await flush(timeout);\n  client?.dispose();\n}\n"],"names":["flush"],"mappings":";;;;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,aAAa,CAAC,OAAO,EAA+B;AACpE,EAAE,IAAI,cAAc,GAAe,MAAM,SAAS;AAClD,EAAE,MAAM,OAAA,GAAU,IAAI,OAAO,CAAO,OAAO;AAC3C,IAAI,cAAA,GAAiB,GAAG;AACxB,EAAE,CAAC,CAAC;AACJ,EAAE,IAAI,OAAA,GAAU,CAAC;AACjB,EAAE,MAAM,iBAAA,GAAoB,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAA;AAC1D,EAAE,OAAO,CAAC,SAAA,GAAY,WAAW;AACjC,IAAI,OAAO,EAAE;AACb,IAAI,OAAO,iBAAiB;AAC5B,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM;AAC5B,QAAQ,IAAI,EAAE,OAAA,KAAY,CAAC,EAAE,cAAc,EAAE;AAC7C,MAAM,CAAC,CAAC;AACR,KAAK;AACL,EAAE,CAAC;AACH,EAAE,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,IAAI,KAAK,EAAE,OAAO;AAClB,IAAI,QAAQ,EAAE,MAAM;AACpB,MAAM,IAAI,OAAA,KAAY,CAAC,EAAE,cAAc,EAAE;AACzC,MAAM,OAAO,OAAO;AACpB,IAAI,CAAC;AACL,GAAG,CAAC;AACJ;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAe,eAAe,CAAC,MAAM,EAAsB,OAAA,GAAU,IAAI,EAAiB;AACjG,EAAE,MAAMA,UAAK,CAAC,OAAO,CAAC;AACtB,EAAE,MAAM,EAAE,OAAO,EAAE;AACnB;;;;;"}

package/build/cjs/handler.js

@@ -2,6 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@sentry/core');
 const async = require('./async.js');
+const flush = require('./flush.js');
 const instrument = require('./instrument.js');
 const hono = require('./integrations/hono.js');
 const options = require('./options.js');
@@ -99,7 +100,7 @@ function withSentry
                   core.captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.scheduled' } });
                   throw e;
                 } finally {
-                  waitUntil(core.flush(2000));
+                  waitUntil(flush.flushAndDispose(client));
                 }
               },
             );
@@ -143,7 +144,7 @@ function withSentry
                   core.captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.email' } });
                   throw e;
                 } finally {
-                  waitUntil(core.flush(2000));
+                  waitUntil(flush.flushAndDispose(client));
                 }
               },
             );
@@ -195,7 +196,7 @@ function withSentry
                   core.captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.queue' } });
                   throw e;
                 } finally {
-                  waitUntil(core.flush(2000));
+                  waitUntil(flush.flushAndDispose(client));
                 }
               },
             );
@@ -229,7 +230,7 @@ function withSentry
               core.captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.tail' } });
               throw e;
             } finally {
-              waitUntil(core.flush(2000));
+              waitUntil(flush.flushAndDispose(client));
             }
           });
         },

package/build/cjs/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sources":["../../src/handler.ts"],"sourcesContent":["import {\n  captureException,\n  flush,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  startSpan,\n  withIsolationScope,\n} from '@sentry/core';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { isInstrumented, markAsInstrumented } from './instrument';\nimport { getHonoIntegration } from './integrations/hono';\nimport { getFinalOptions } from './options';\nimport { wrapRequestHandler } from './request';\nimport { addCloudResourceContext } from './scope-utils';\nimport { init } from './sdk';\nimport { instrumentContext } from './utils/instrumentContext';\n\n/**\n * Wrapper for Cloudflare handlers.\n *\n * Initializes the SDK and wraps the handler with Sentry instrumentation.\n *\n * Automatically instruments the `fetch` method of the handler.\n *\n * @param optionsCallback Function that returns the options for the SDK initialization.\n * @param handler {ExportedHandler} The handler to wrap.\n * @returns The wrapped handler.\n */\n// eslint-disable-next-line complexity\nexport function withSentry<\n  Env = unknown,\n  QueueHandlerMessage = unknown,\n  CfHostMetadata = unknown,\n  T extends ExportedHandler<Env, QueueHandlerMessage, CfHostMetadata> = ExportedHandler<\n    Env,\n    QueueHandlerMessage,\n    CfHostMetadata\n  >,\n>(optionsCallback: (env: Env) => CloudflareOptions | undefined, handler: T): T {\n  setAsyncLocalStorageAsyncContextStrategy();\n\n  try {\n    if ('fetch' in handler && typeof handler.fetch === 'function' && !isInstrumented(handler.fetch)) {\n      handler.fetch = new Proxy(handler.fetch, {\n        apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<Env, CfHostMetadata>>) {\n          const [request, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          args[2] = context;\n\n          const options = getFinalOptions(optionsCallback(env), env);\n\n          return wrapRequestHandler({ options, request, context }, () => target.apply(thisArg, args));\n        },\n      });\n\n      markAsInstrumented(handler.fetch);\n    }\n\n    /* Hono does not reach the catch block of the fetch handler and captureException needs to be called in the hono errorHandler */\n    if (\n      'onError' in handler &&\n      'errorHandler' in handler &&\n      typeof handler.errorHandler === 'function' &&\n      !isInstrumented(handler.errorHandler)\n    ) {\n      handler.errorHandler = new Proxy(handler.errorHandler, {\n        apply(target, thisArg, args) {\n          const [err, context] = args;\n\n          getHonoIntegration()?.handleHonoException(err, context);\n\n          return Reflect.apply(target, thisArg, args);\n        },\n      });\n\n      markAsInstrumented(handler.errorHandler);\n    }\n\n    if ('scheduled' in handler && typeof handler.scheduled === 'function' && !isInstrumented(handler.scheduled)) {\n      handler.scheduled = new Proxy(handler.scheduled, {\n        apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<Env>>) {\n          const [event, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          args[2] = context;\n\n          return withIsolationScope(isolationScope => {\n            const options = getFinalOptions(optionsCallback(env), env);\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                op: 'faas.cron',\n                name: `Scheduled Cron ${event.cron}`,\n                attributes: {\n                  'faas.cron': event.cron,\n                  'faas.time': new Date(event.scheduledTime).toISOString(),\n                  'faas.trigger': 'timer',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.scheduled',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n                },\n              },\n              async () => {\n                try {\n                  return await (target.apply(thisArg, args) as ReturnType<typeof target>);\n                } catch (e) {\n                  captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.scheduled' } });\n                  throw e;\n                } finally {\n                  waitUntil(flush(2000));\n                }\n              },\n            );\n          });\n        },\n      });\n\n      markAsInstrumented(handler.scheduled);\n    }\n\n    if ('email' in handler && typeof handler.email === 'function' && !isInstrumented(handler.email)) {\n      handler.email = new Proxy(handler.email, {\n        apply(target, thisArg, args: Parameters<EmailExportedHandler<Env>>) {\n          const [emailMessage, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          args[2] = context;\n\n          return withIsolationScope(isolationScope => {\n            const options = getFinalOptions(optionsCallback(env), env);\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                op: 'faas.email',\n                name: `Handle Email ${emailMessage.to}`,\n                attributes: {\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 (target.apply(thisArg, args) as ReturnType<typeof target>);\n                } catch (e) {\n                  captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.email' } });\n                  throw e;\n                } finally {\n                  waitUntil(flush(2000));\n                }\n              },\n            );\n          });\n        },\n      });\n\n      markAsInstrumented(handler.email);\n    }\n\n    if ('queue' in handler && typeof handler.queue === 'function' && !isInstrumented(handler.queue)) {\n      handler.queue = new Proxy(handler.queue, {\n        apply(target, thisArg, args: Parameters<ExportedHandlerQueueHandler<Env, QueueHandlerMessage>>) {\n          const [batch, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          args[2] = context;\n\n          return withIsolationScope(isolationScope => {\n            const options = getFinalOptions(optionsCallback(env), env);\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                op: 'faas.queue',\n                name: `process ${batch.queue}`,\n                attributes: {\n                  'faas.trigger': 'pubsub',\n                  'messaging.destination.name': batch.queue,\n                  'messaging.system': 'cloudflare',\n                  'messaging.batch.message_count': batch.messages.length,\n                  'messaging.message.retry.count': batch.messages.reduce(\n                    (acc, message) => acc + message.attempts - 1,\n                    0,\n                  ),\n                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'queue.process',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.queue',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n                },\n              },\n              async () => {\n                try {\n                  return await (target.apply(thisArg, args) as ReturnType<typeof target>);\n                } catch (e) {\n                  captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.queue' } });\n                  throw e;\n                } finally {\n                  waitUntil(flush(2000));\n                }\n              },\n            );\n          });\n        },\n      });\n\n      markAsInstrumented(handler.queue);\n    }\n\n    if ('tail' in handler && typeof handler.tail === 'function' && !isInstrumented(handler.tail)) {\n      handler.tail = new Proxy(handler.tail, {\n        apply(target, thisArg, args: Parameters<ExportedHandlerTailHandler<Env>>) {\n          const [, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          args[2] = context;\n\n          return withIsolationScope(async isolationScope => {\n            const options = getFinalOptions(optionsCallback(env), env);\n\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            try {\n              return await (target.apply(thisArg, args) as ReturnType<typeof target>);\n            } catch (e) {\n              captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.tail' } });\n              throw e;\n            } finally {\n              waitUntil(flush(2000));\n            }\n          });\n        },\n      });\n\n      markAsInstrumented(handler.tail);\n    }\n\n    // This is here because Miniflare sometimes cannot get instrumented\n  } catch {\n    // Do not console anything here, we don't want to spam the console with errors\n  }\n\n  return handler;\n}\n"],"names":["setAsyncLocalStorageAsyncContextStrategy","isInstrumented","request","instrumentContext","options","getFinalOptions","wrapRequestHandler","markAsInstrumented","getHonoIntegration","withIsolationScope","init","addCloudResourceContext","startSpan","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","captureException","flush","SEMANTIC_ATTRIBUTE_SENTRY_OP"],"mappings":"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"}
+{"version":3,"file":"handler.js","sources":["../../src/handler.ts"],"sourcesContent":["import {\n  captureException,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  startSpan,\n  withIsolationScope,\n} from '@sentry/core';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { flushAndDispose } from './flush';\nimport { isInstrumented, markAsInstrumented } from './instrument';\nimport { getHonoIntegration } from './integrations/hono';\nimport { getFinalOptions } from './options';\nimport { wrapRequestHandler } from './request';\nimport { addCloudResourceContext } from './scope-utils';\nimport { init } from './sdk';\nimport { instrumentContext } from './utils/instrumentContext';\n\n/**\n * Wrapper for Cloudflare handlers.\n *\n * Initializes the SDK and wraps the handler with Sentry instrumentation.\n *\n * Automatically instruments the `fetch` method of the handler.\n *\n * @param optionsCallback Function that returns the options for the SDK initialization.\n * @param handler {ExportedHandler} The handler to wrap.\n * @returns The wrapped handler.\n */\n// eslint-disable-next-line complexity\nexport function withSentry<\n  Env = unknown,\n  QueueHandlerMessage = unknown,\n  CfHostMetadata = unknown,\n  T extends ExportedHandler<Env, QueueHandlerMessage, CfHostMetadata> = ExportedHandler<\n    Env,\n    QueueHandlerMessage,\n    CfHostMetadata\n  >,\n>(optionsCallback: (env: Env) => CloudflareOptions | undefined, handler: T): T {\n  setAsyncLocalStorageAsyncContextStrategy();\n\n  try {\n    if ('fetch' in handler && typeof handler.fetch === 'function' && !isInstrumented(handler.fetch)) {\n      handler.fetch = new Proxy(handler.fetch, {\n        apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<Env, CfHostMetadata>>) {\n          const [request, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          args[2] = context;\n\n          const options = getFinalOptions(optionsCallback(env), env);\n\n          return wrapRequestHandler({ options, request, context }, () => target.apply(thisArg, args));\n        },\n      });\n\n      markAsInstrumented(handler.fetch);\n    }\n\n    /* Hono does not reach the catch block of the fetch handler and captureException needs to be called in the hono errorHandler */\n    if (\n      'onError' in handler &&\n      'errorHandler' in handler &&\n      typeof handler.errorHandler === 'function' &&\n      !isInstrumented(handler.errorHandler)\n    ) {\n      handler.errorHandler = new Proxy(handler.errorHandler, {\n        apply(target, thisArg, args) {\n          const [err, context] = args;\n\n          getHonoIntegration()?.handleHonoException(err, context);\n\n          return Reflect.apply(target, thisArg, args);\n        },\n      });\n\n      markAsInstrumented(handler.errorHandler);\n    }\n\n    if ('scheduled' in handler && typeof handler.scheduled === 'function' && !isInstrumented(handler.scheduled)) {\n      handler.scheduled = new Proxy(handler.scheduled, {\n        apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<Env>>) {\n          const [event, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          args[2] = context;\n\n          return withIsolationScope(isolationScope => {\n            const options = getFinalOptions(optionsCallback(env), env);\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                op: 'faas.cron',\n                name: `Scheduled Cron ${event.cron}`,\n                attributes: {\n                  'faas.cron': event.cron,\n                  'faas.time': new Date(event.scheduledTime).toISOString(),\n                  'faas.trigger': 'timer',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.scheduled',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n                },\n              },\n              async () => {\n                try {\n                  return await (target.apply(thisArg, args) as ReturnType<typeof target>);\n                } catch (e) {\n                  captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.scheduled' } });\n                  throw e;\n                } finally {\n                  waitUntil(flushAndDispose(client));\n                }\n              },\n            );\n          });\n        },\n      });\n\n      markAsInstrumented(handler.scheduled);\n    }\n\n    if ('email' in handler && typeof handler.email === 'function' && !isInstrumented(handler.email)) {\n      handler.email = new Proxy(handler.email, {\n        apply(target, thisArg, args: Parameters<EmailExportedHandler<Env>>) {\n          const [emailMessage, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          args[2] = context;\n\n          return withIsolationScope(isolationScope => {\n            const options = getFinalOptions(optionsCallback(env), env);\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                op: 'faas.email',\n                name: `Handle Email ${emailMessage.to}`,\n                attributes: {\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 (target.apply(thisArg, args) as ReturnType<typeof target>);\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      markAsInstrumented(handler.email);\n    }\n\n    if ('queue' in handler && typeof handler.queue === 'function' && !isInstrumented(handler.queue)) {\n      handler.queue = new Proxy(handler.queue, {\n        apply(target, thisArg, args: Parameters<ExportedHandlerQueueHandler<Env, QueueHandlerMessage>>) {\n          const [batch, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          args[2] = context;\n\n          return withIsolationScope(isolationScope => {\n            const options = getFinalOptions(optionsCallback(env), env);\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                op: 'faas.queue',\n                name: `process ${batch.queue}`,\n                attributes: {\n                  'faas.trigger': 'pubsub',\n                  'messaging.destination.name': batch.queue,\n                  'messaging.system': 'cloudflare',\n                  'messaging.batch.message_count': batch.messages.length,\n                  'messaging.message.retry.count': batch.messages.reduce(\n                    (acc, message) => acc + message.attempts - 1,\n                    0,\n                  ),\n                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'queue.process',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.queue',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n                },\n              },\n              async () => {\n                try {\n                  return await (target.apply(thisArg, args) as ReturnType<typeof target>);\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      markAsInstrumented(handler.queue);\n    }\n\n    if ('tail' in handler && typeof handler.tail === 'function' && !isInstrumented(handler.tail)) {\n      handler.tail = new Proxy(handler.tail, {\n        apply(target, thisArg, args: Parameters<ExportedHandlerTailHandler<Env>>) {\n          const [, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          args[2] = context;\n\n          return withIsolationScope(async isolationScope => {\n            const options = getFinalOptions(optionsCallback(env), env);\n\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            try {\n              return await (target.apply(thisArg, args) as ReturnType<typeof target>);\n            } catch (e) {\n              captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.tail' } });\n              throw e;\n            } finally {\n              waitUntil(flushAndDispose(client));\n            }\n          });\n        },\n      });\n\n      markAsInstrumented(handler.tail);\n    }\n\n    // This is here because Miniflare sometimes cannot get instrumented\n  } catch {\n    // Do not console anything here, we don't want to spam the console with errors\n  }\n\n  return handler;\n}\n"],"names":["setAsyncLocalStorageAsyncContextStrategy","isInstrumented","request","instrumentContext","options","getFinalOptions","wrapRequestHandler","markAsInstrumented","getHonoIntegration","withIsolationScope","init","addCloudResourceContext","startSpan","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","captureException","flushAndDispose","SEMANTIC_ATTRIBUTE_SENTRY_OP"],"mappings":"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"}

package/build/cjs/index.js

@@ -60,6 +60,7 @@ exports.instrumentAnthropicAiClient = core.instrumentAnthropicAiClient;
 exports.instrumentGoogleGenAIClient = core.instrumentGoogleGenAIClient;
 exports.instrumentLangGraph = core.instrumentLangGraph;
 exports.instrumentOpenAiClient = core.instrumentOpenAiClient;
+exports.instrumentPostgresJsSql = core.instrumentPostgresJsSql;
 exports.instrumentSupabaseClient = core.instrumentSupabaseClient;
 exports.isEnabled = core.isEnabled;
 exports.isInitialized = core.isInitialized;

package/build/cjs/index.js.map

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

package/build/cjs/request.js

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@sentry/core');
+const flush = require('./flush.js');
 const scopeUtils = require('./scope-utils.js');
 const sdk = require('./sdk.js');
 const streaming = require('./utils/streaming.js');
@@ -65,7 +66,7 @@ function wrapRequestHandler(
         }
         throw e;
       } finally {
-        waitUntil?.(core.flush(2000));
+        waitUntil?.(flush.flushAndDispose(client));
       }
     }
 
@@ -92,7 +93,7 @@ function wrapRequestHandler(
             if (captureErrors) {
               core.captureException(e, { mechanism: { handled: false, type: 'auto.http.cloudflare' } });
             }
-            waitUntil?.(core.flush(2000));
+            waitUntil?.(flush.flushAndDispose(client));
             throw e;
           }
 
@@ -119,7 +120,7 @@ function wrapRequestHandler(
                 } finally {
                   reader.releaseLock();
                   span.end();
-                  waitUntil?.(core.flush(2000));
+                  waitUntil?.(flush.flushAndDispose(client));
                 }
               })();
 
@@ -135,14 +136,22 @@ function wrapRequestHandler(
             } catch (e) {
               // tee() failed (e.g stream already locked) - fall back to non-streaming handling
               span.end();
-              waitUntil?.(core.flush(2000));
+              waitUntil?.(flush.flushAndDispose(client));
               return res;
             }
           }
 
           // Non-streaming response - end span immediately and return original
           span.end();
-          waitUntil?.(core.flush(2000));
+
+          // Don't dispose for protocol upgrades (101 Switching Protocols) - the connection stays alive.
+          // This includes WebSocket upgrades where webSocketMessage/webSocketClose handlers
+          // will still be called and may need the client to capture errors.
+          if (res.status === 101) {
+            waitUntil?.(client?.flush(2000));
+          } else {
+            waitUntil?.(flush.flushAndDispose(client));
+          }
           return res;
         });
       },

package/build/cjs/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sources":["../../src/request.ts"],"sourcesContent":["import type { ExecutionContext, IncomingRequestCfProperties } from '@cloudflare/workers-types';\nimport {\n  captureException,\n  continueTrace,\n  flush,\n  getClient,\n  getHttpSpanDetailsFromUrlObject,\n  httpHeadersToSpanAttributes,\n  parseStringToURLObject,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  setHttpStatus,\n  startSpanManual,\n  winterCGHeadersToDict,\n  withIsolationScope,\n} from '@sentry/core';\nimport type { CloudflareOptions } from './client';\nimport { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils';\nimport { init } from './sdk';\nimport { classifyResponseStreaming } from './utils/streaming';\n\ninterface RequestHandlerWrapperOptions {\n  options: CloudflareOptions;\n  request: Request<unknown, IncomingRequestCfProperties<unknown>>;\n  context: ExecutionContext;\n  /**\n   * If true, errors will be captured, rethrown and sent to Sentry.\n   * Otherwise, errors are rethrown but not captured.\n   *\n   * You most likely don't want to set this to `false`, if you use `wrapRequestHandler` directly.\n   * This is primarily meant as an escape hatch for higher-level SDKs relying on additional error\n   * capturing mechanisms where this wrapper captures errors too early or too generally.\n   *\n   * @default true\n   */\n  captureErrors?: boolean;\n}\n\n/**\n * Wraps a cloudflare request handler in Sentry instrumentation\n */\nexport function wrapRequestHandler(\n  wrapperOptions: RequestHandlerWrapperOptions,\n  handler: (...args: unknown[]) => Response | Promise<Response>,\n): Promise<Response> {\n  return withIsolationScope(async isolationScope => {\n    const { options, request, captureErrors = true } = wrapperOptions;\n\n    // In certain situations, the passed context can become undefined.\n    // For example, for Astro while prerendering pages at build time.\n    // see: https://github.com/getsentry/sentry-javascript/issues/13217\n    const context = wrapperOptions.context as ExecutionContext | undefined;\n\n    const waitUntil = context?.waitUntil?.bind?.(context);\n\n    const client = init({ ...options, ctx: context });\n    isolationScope.setClient(client);\n\n    const urlObject = parseStringToURLObject(request.url);\n    const [name, attributes] = getHttpSpanDetailsFromUrlObject(urlObject, 'server', 'auto.http.cloudflare', request);\n\n    const contentLength = request.headers.get('content-length');\n    if (contentLength) {\n      attributes['http.request.body.size'] = parseInt(contentLength, 10);\n    }\n\n    const userAgentHeader = request.headers.get('user-agent');\n    if (userAgentHeader) {\n      attributes['user_agent.original'] = userAgentHeader;\n    }\n\n    Object.assign(\n      attributes,\n      httpHeadersToSpanAttributes(\n        winterCGHeadersToDict(request.headers),\n        getClient()?.getOptions().sendDefaultPii ?? false,\n      ),\n    );\n\n    attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] = 'http.server';\n\n    addCloudResourceContext(isolationScope);\n    addRequest(isolationScope, request);\n    if (request.cf) {\n      addCultureContext(isolationScope, request.cf);\n      attributes['network.protocol.name'] = request.cf.httpProtocol;\n    }\n\n    // Do not capture spans for OPTIONS and HEAD requests\n    if (request.method === 'OPTIONS' || request.method === 'HEAD') {\n      try {\n        return await handler();\n      } catch (e) {\n        if (captureErrors) {\n          captureException(e, { mechanism: { handled: false, type: 'auto.http.cloudflare' } });\n        }\n        throw e;\n      } finally {\n        waitUntil?.(flush(2000));\n      }\n    }\n\n    return continueTrace(\n      { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },\n      () => {\n        // Note: This span will not have a duration unless I/O happens in the handler. This is\n        // because of how the cloudflare workers runtime works.\n        // See: https://developers.cloudflare.com/workers/runtime-apis/performance/\n\n        // Use startSpanManual to control when span ends (needed for streaming responses)\n        return startSpanManual({ name, attributes }, async span => {\n          let res: Response;\n\n          try {\n            res = await handler();\n            setHttpStatus(span, res.status);\n\n            // After the handler runs, the span name might have been updated by nested instrumentation\n            // (e.g., Remix parameterizing routes). The span should already have the correct name\n            // from that instrumentation, so we don't need to do anything here.\n          } catch (e) {\n            span.end();\n            if (captureErrors) {\n              captureException(e, { mechanism: { handled: false, type: 'auto.http.cloudflare' } });\n            }\n            waitUntil?.(flush(2000));\n            throw e;\n          }\n\n          // Classify response to detect actual streaming\n          const classification = classifyResponseStreaming(res);\n\n          if (classification.isStreaming && res.body) {\n            // Streaming response detected - monitor consumption to keep span alive\n            try {\n              const [clientStream, monitorStream] = res.body.tee();\n\n              // Monitor stream consumption and end span when complete\n              const streamMonitor = (async () => {\n                const reader = monitorStream.getReader();\n\n                try {\n                  let done = false;\n                  while (!done) {\n                    const result = await reader.read();\n                    done = result.done;\n                  }\n                } catch {\n                  // Stream error or cancellation - will end span in finally\n                } finally {\n                  reader.releaseLock();\n                  span.end();\n                  waitUntil?.(flush(2000));\n                }\n              })();\n\n              // Keep worker alive until stream monitoring completes (otherwise span won't end)\n              waitUntil?.(streamMonitor);\n\n              // Return response with client stream\n              return new Response(clientStream, {\n                status: res.status,\n                statusText: res.statusText,\n                headers: res.headers,\n              });\n            } catch (e) {\n              // tee() failed (e.g stream already locked) - fall back to non-streaming handling\n              span.end();\n              waitUntil?.(flush(2000));\n              return res;\n            }\n          }\n\n          // Non-streaming response - end span immediately and return original\n          span.end();\n          waitUntil?.(flush(2000));\n          return res;\n        });\n      },\n    );\n  });\n}\n"],"names":["withIsolationScope","init","parseStringToURLObject","getHttpSpanDetailsFromUrlObject","httpHeadersToSpanAttributes","winterCGHeadersToDict","getClient","SEMANTIC_ATTRIBUTE_SENTRY_OP","addCloudResourceContext","addRequest","addCultureContext","captureException","flush","continueTrace","startSpanManual","setHttpStatus","classifyResponseStreaming"],"mappings":"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"}
+{"version":3,"file":"request.js","sources":["../../src/request.ts"],"sourcesContent":["import type { ExecutionContext, IncomingRequestCfProperties } from '@cloudflare/workers-types';\nimport {\n  captureException,\n  continueTrace,\n  getClient,\n  getHttpSpanDetailsFromUrlObject,\n  httpHeadersToSpanAttributes,\n  parseStringToURLObject,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  setHttpStatus,\n  startSpanManual,\n  winterCGHeadersToDict,\n  withIsolationScope,\n} from '@sentry/core';\nimport type { CloudflareOptions } from './client';\nimport { flushAndDispose } from './flush';\nimport { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils';\nimport { init } from './sdk';\nimport { classifyResponseStreaming } from './utils/streaming';\n\ninterface RequestHandlerWrapperOptions {\n  options: CloudflareOptions;\n  request: Request<unknown, IncomingRequestCfProperties<unknown>>;\n  context: ExecutionContext;\n  /**\n   * If true, errors will be captured, rethrown and sent to Sentry.\n   * Otherwise, errors are rethrown but not captured.\n   *\n   * You most likely don't want to set this to `false`, if you use `wrapRequestHandler` directly.\n   * This is primarily meant as an escape hatch for higher-level SDKs relying on additional error\n   * capturing mechanisms where this wrapper captures errors too early or too generally.\n   *\n   * @default true\n   */\n  captureErrors?: boolean;\n}\n\n/**\n * Wraps a cloudflare request handler in Sentry instrumentation\n */\nexport function wrapRequestHandler(\n  wrapperOptions: RequestHandlerWrapperOptions,\n  handler: (...args: unknown[]) => Response | Promise<Response>,\n): Promise<Response> {\n  return withIsolationScope(async isolationScope => {\n    const { options, request, captureErrors = true } = wrapperOptions;\n\n    // In certain situations, the passed context can become undefined.\n    // For example, for Astro while prerendering pages at build time.\n    // see: https://github.com/getsentry/sentry-javascript/issues/13217\n    const context = wrapperOptions.context as ExecutionContext | undefined;\n\n    const waitUntil = context?.waitUntil?.bind?.(context);\n\n    const client = init({ ...options, ctx: context });\n    isolationScope.setClient(client);\n\n    const urlObject = parseStringToURLObject(request.url);\n    const [name, attributes] = getHttpSpanDetailsFromUrlObject(urlObject, 'server', 'auto.http.cloudflare', request);\n\n    const contentLength = request.headers.get('content-length');\n    if (contentLength) {\n      attributes['http.request.body.size'] = parseInt(contentLength, 10);\n    }\n\n    const userAgentHeader = request.headers.get('user-agent');\n    if (userAgentHeader) {\n      attributes['user_agent.original'] = userAgentHeader;\n    }\n\n    Object.assign(\n      attributes,\n      httpHeadersToSpanAttributes(\n        winterCGHeadersToDict(request.headers),\n        getClient()?.getOptions().sendDefaultPii ?? false,\n      ),\n    );\n\n    attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] = 'http.server';\n\n    addCloudResourceContext(isolationScope);\n    addRequest(isolationScope, request);\n    if (request.cf) {\n      addCultureContext(isolationScope, request.cf);\n      attributes['network.protocol.name'] = request.cf.httpProtocol;\n    }\n\n    // Do not capture spans for OPTIONS and HEAD requests\n    if (request.method === 'OPTIONS' || request.method === 'HEAD') {\n      try {\n        return await handler();\n      } catch (e) {\n        if (captureErrors) {\n          captureException(e, { mechanism: { handled: false, type: 'auto.http.cloudflare' } });\n        }\n        throw e;\n      } finally {\n        waitUntil?.(flushAndDispose(client));\n      }\n    }\n\n    return continueTrace(\n      { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },\n      () => {\n        // Note: This span will not have a duration unless I/O happens in the handler. This is\n        // because of how the cloudflare workers runtime works.\n        // See: https://developers.cloudflare.com/workers/runtime-apis/performance/\n\n        // Use startSpanManual to control when span ends (needed for streaming responses)\n        return startSpanManual({ name, attributes }, async span => {\n          let res: Response;\n\n          try {\n            res = await handler();\n            setHttpStatus(span, res.status);\n\n            // After the handler runs, the span name might have been updated by nested instrumentation\n            // (e.g., Remix parameterizing routes). The span should already have the correct name\n            // from that instrumentation, so we don't need to do anything here.\n          } catch (e) {\n            span.end();\n            if (captureErrors) {\n              captureException(e, { mechanism: { handled: false, type: 'auto.http.cloudflare' } });\n            }\n            waitUntil?.(flushAndDispose(client));\n            throw e;\n          }\n\n          // Classify response to detect actual streaming\n          const classification = classifyResponseStreaming(res);\n\n          if (classification.isStreaming && res.body) {\n            // Streaming response detected - monitor consumption to keep span alive\n            try {\n              const [clientStream, monitorStream] = res.body.tee();\n\n              // Monitor stream consumption and end span when complete\n              const streamMonitor = (async () => {\n                const reader = monitorStream.getReader();\n\n                try {\n                  let done = false;\n                  while (!done) {\n                    const result = await reader.read();\n                    done = result.done;\n                  }\n                } catch {\n                  // Stream error or cancellation - will end span in finally\n                } finally {\n                  reader.releaseLock();\n                  span.end();\n                  waitUntil?.(flushAndDispose(client));\n                }\n              })();\n\n              // Keep worker alive until stream monitoring completes (otherwise span won't end)\n              waitUntil?.(streamMonitor);\n\n              // Return response with client stream\n              return new Response(clientStream, {\n                status: res.status,\n                statusText: res.statusText,\n                headers: res.headers,\n              });\n            } catch (e) {\n              // tee() failed (e.g stream already locked) - fall back to non-streaming handling\n              span.end();\n              waitUntil?.(flushAndDispose(client));\n              return res;\n            }\n          }\n\n          // Non-streaming response - end span immediately and return original\n          span.end();\n\n          // Don't dispose for protocol upgrades (101 Switching Protocols) - the connection stays alive.\n          // This includes WebSocket upgrades where webSocketMessage/webSocketClose handlers\n          // will still be called and may need the client to capture errors.\n          if (res.status === 101) {\n            waitUntil?.(client?.flush(2000));\n          } else {\n            waitUntil?.(flushAndDispose(client));\n          }\n          return res;\n        });\n      },\n    );\n  });\n}\n"],"names":["withIsolationScope","init","parseStringToURLObject","getHttpSpanDetailsFromUrlObject","httpHeadersToSpanAttributes","winterCGHeadersToDict","getClient","SEMANTIC_ATTRIBUTE_SENTRY_OP","addCloudResourceContext","addRequest","addCultureContext","captureException","flushAndDispose","continueTrace","startSpanManual","setHttpStatus","classifyResponseStreaming"],"mappings":"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"}

package/build/cjs/workflows.js

@@ -2,6 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@sentry/core');
 const async = require('./async.js');
+const flush = require('./flush.js');
 const scopeUtils = require('./scope-utils.js');
 const sdk = require('./sdk.js');
 const instrumentContext = require('./utils/instrumentContext.js');
@@ -159,7 +160,7 @@ function instrumentWorkflowWithSentry
                       new WrappedWorkflowStep(event.instanceId, context, options, step),
                     );
                   } finally {
-                    context.waitUntil(core.flush(2000));
+                    context.waitUntil(flush.flushAndDispose(client));
                   }
                 });
               });

package/build/cjs/workflows.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflows.js","sources":["../../src/workflows.ts"],"sourcesContent":["import type { PropagationContext } from '@sentry/core';\nimport {\n  captureException,\n  flush,\n  getCurrentScope,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  startSpan,\n  withIsolationScope,\n  withScope,\n} from '@sentry/core';\nimport type {\n  WorkflowEntrypoint,\n  WorkflowEvent,\n  WorkflowSleepDuration,\n  WorkflowStep,\n  WorkflowStepConfig,\n  WorkflowStepEvent,\n  WorkflowTimeoutDuration,\n} from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { addCloudResourceContext } from './scope-utils';\nimport { init } from './sdk';\nimport { instrumentContext } from './utils/instrumentContext';\n\nconst UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;\n\n/**\n * Hashes a string to a UUID using SHA-1.\n */\nexport async function deterministicTraceIdFromInstanceId(instanceId: string): Promise<string> {\n  const buf = await crypto.subtle.digest('SHA-1', new TextEncoder().encode(instanceId));\n  return (\n    Array.from(new Uint8Array(buf))\n      // We only need the first 16 bytes for the 32 characters\n      .slice(0, 16)\n      .map(b => b.toString(16).padStart(2, '0'))\n      .join('')\n  );\n}\n\nasync function propagationContextFromInstanceId(instanceId: string): Promise<PropagationContext> {\n  const traceId = UUID_REGEX.test(instanceId)\n    ? instanceId.replace(/-/g, '')\n    : await deterministicTraceIdFromInstanceId(instanceId);\n\n  // Derive sampleRand from last 4 characters of the random UUID\n  //\n  // We cannot store any state between workflow steps, so we derive the\n  // sampleRand from the traceId itself. This ensures that the sampling is\n  // consistent across all steps in the same workflow instance.\n  const sampleRand = parseInt(traceId.slice(-4), 16) / 0xffff;\n\n  return {\n    traceId,\n    sampleRand,\n  };\n}\n\nclass WrappedWorkflowStep implements WorkflowStep {\n  public constructor(\n    private _instanceId: string,\n    private _ctx: ExecutionContext,\n    private _options: CloudflareOptions,\n    private _step: WorkflowStep,\n  ) {}\n\n  public async do<T extends Rpc.Serializable<T>>(name: string, callback: () => Promise<T>): Promise<T>;\n  public async do<T extends Rpc.Serializable<T>>(\n    name: string,\n    config: WorkflowStepConfig,\n    callback: () => Promise<T>,\n  ): Promise<T>;\n  public async do<T extends Rpc.Serializable<T>>(\n    name: string,\n    configOrCallback: WorkflowStepConfig | (() => Promise<T>),\n    maybeCallback?: () => Promise<T>,\n  ): Promise<T> {\n    // Capture the current scope, so parent span (e.g., a startSpan surrounding step.do) is preserved\n    const scopeForStep = getCurrentScope();\n\n    const userCallback = (maybeCallback || configOrCallback) as () => Promise<T>;\n    const config = typeof configOrCallback === 'function' ? undefined : configOrCallback;\n\n    const instrumentedCallback: () => Promise<T> = async () => {\n      return startSpan(\n        {\n          op: 'function.step.do',\n          name,\n          scope: scopeForStep,\n          attributes: {\n            'cloudflare.workflow.timeout': config?.timeout,\n            'cloudflare.workflow.retries.backoff': config?.retries?.backoff,\n            'cloudflare.workflow.retries.delay': config?.retries?.delay,\n            'cloudflare.workflow.retries.limit': config?.retries?.limit,\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.workflow',\n            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n          },\n        },\n        async span => {\n          try {\n            const result = await userCallback();\n            span.setStatus({ code: 1 });\n            return result;\n          } catch (error) {\n            captureException(error, { mechanism: { handled: true, type: 'auto.faas.cloudflare.workflow' } });\n            throw error;\n          } finally {\n            this._ctx.waitUntil(flush(2000));\n          }\n        },\n      );\n    };\n\n    return config ? this._step.do(name, config, instrumentedCallback) : this._step.do(name, instrumentedCallback);\n  }\n\n  public async sleep(name: string, duration: WorkflowSleepDuration): Promise<void> {\n    return this._step.sleep(name, duration);\n  }\n\n  public async sleepUntil(name: string, timestamp: Date | number): Promise<void> {\n    return this._step.sleepUntil(name, timestamp);\n  }\n\n  public async waitForEvent<T extends Rpc.Serializable<T>>(\n    name: string,\n    options: { type: string; timeout?: WorkflowTimeoutDuration | number },\n  ): Promise<WorkflowStepEvent<T>> {\n    return this._step.waitForEvent<T>(name, options);\n  }\n}\n\n/**\n * Instruments a Cloudflare Workflow class with Sentry.\n *\n * @example\n * ```typescript\n * const InstrumentedWorkflow = instrumentWorkflowWithSentry(\n *   (env) => ({ dsn: env.SENTRY_DSN }),\n *   MyWorkflowClass\n * );\n *\n * export default InstrumentedWorkflow;\n * ```\n *\n * @param optionsCallback - Function that returns Sentry options to initialize Sentry\n * @param WorkflowClass - The workflow class to instrument\n * @returns Instrumented workflow class with the same interface\n */\nexport function instrumentWorkflowWithSentry<\n  E, // Environment type\n  P, // Payload type\n  T extends WorkflowEntrypoint<E, P>, // WorkflowEntrypoint type\n  C extends new (ctx: ExecutionContext, env: E) => T, // Constructor type of the WorkflowEntrypoint class\n>(optionsCallback: (env: E) => CloudflareOptions, WorkFlowClass: C): C {\n  return new Proxy(WorkFlowClass, {\n    construct(target: C, args: [ctx: ExecutionContext, env: E], newTarget) {\n      const [ctx, env] = args;\n      const context = instrumentContext(ctx);\n      args[0] = context;\n\n      const options = optionsCallback(env);\n      const instance = Reflect.construct(target, args, newTarget) as T;\n      return new Proxy(instance, {\n        get(obj, prop, receiver) {\n          if (prop === 'run') {\n            return async function (event: WorkflowEvent<P>, step: WorkflowStep): Promise<unknown> {\n              setAsyncLocalStorageAsyncContextStrategy();\n\n              return withIsolationScope(async isolationScope => {\n                const client = init({ ...options, enableDedupe: false });\n                isolationScope.setClient(client);\n\n                addCloudResourceContext(isolationScope);\n\n                return withScope(async scope => {\n                  const propagationContext = await propagationContextFromInstanceId(event.instanceId);\n                  scope.setPropagationContext(propagationContext);\n\n                  try {\n                    return await obj.run.call(\n                      obj,\n                      event,\n                      new WrappedWorkflowStep(event.instanceId, context, options, step),\n                    );\n                  } finally {\n                    context.waitUntil(flush(2000));\n                  }\n                });\n              });\n            };\n          }\n          return Reflect.get(obj, prop, receiver);\n        },\n      });\n    },\n  });\n}\n"],"names":["getCurrentScope","startSpan","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","captureException","flush","instrumentContext","setAsyncLocalStorageAsyncContextStrategy","withIsolationScope","init","addCloudResourceContext","withScope"],"mappings":"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"}
+{"version":3,"file":"workflows.js","sources":["../../src/workflows.ts"],"sourcesContent":["import type { PropagationContext } from '@sentry/core';\nimport {\n  captureException,\n  flush,\n  getCurrentScope,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  startSpan,\n  withIsolationScope,\n  withScope,\n} from '@sentry/core';\nimport type {\n  WorkflowEntrypoint,\n  WorkflowEvent,\n  WorkflowSleepDuration,\n  WorkflowStep,\n  WorkflowStepConfig,\n  WorkflowStepEvent,\n  WorkflowTimeoutDuration,\n} from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { flushAndDispose } from './flush';\nimport { addCloudResourceContext } from './scope-utils';\nimport { init } from './sdk';\nimport { instrumentContext } from './utils/instrumentContext';\n\nconst UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;\n\n/**\n * Hashes a string to a UUID using SHA-1.\n */\nexport async function deterministicTraceIdFromInstanceId(instanceId: string): Promise<string> {\n  const buf = await crypto.subtle.digest('SHA-1', new TextEncoder().encode(instanceId));\n  return (\n    Array.from(new Uint8Array(buf))\n      // We only need the first 16 bytes for the 32 characters\n      .slice(0, 16)\n      .map(b => b.toString(16).padStart(2, '0'))\n      .join('')\n  );\n}\n\nasync function propagationContextFromInstanceId(instanceId: string): Promise<PropagationContext> {\n  const traceId = UUID_REGEX.test(instanceId)\n    ? instanceId.replace(/-/g, '')\n    : await deterministicTraceIdFromInstanceId(instanceId);\n\n  // Derive sampleRand from last 4 characters of the random UUID\n  //\n  // We cannot store any state between workflow steps, so we derive the\n  // sampleRand from the traceId itself. This ensures that the sampling is\n  // consistent across all steps in the same workflow instance.\n  const sampleRand = parseInt(traceId.slice(-4), 16) / 0xffff;\n\n  return {\n    traceId,\n    sampleRand,\n  };\n}\n\nclass WrappedWorkflowStep implements WorkflowStep {\n  public constructor(\n    private _instanceId: string,\n    private _ctx: ExecutionContext,\n    private _options: CloudflareOptions,\n    private _step: WorkflowStep,\n  ) {}\n\n  public async do<T extends Rpc.Serializable<T>>(name: string, callback: () => Promise<T>): Promise<T>;\n  public async do<T extends Rpc.Serializable<T>>(\n    name: string,\n    config: WorkflowStepConfig,\n    callback: () => Promise<T>,\n  ): Promise<T>;\n  public async do<T extends Rpc.Serializable<T>>(\n    name: string,\n    configOrCallback: WorkflowStepConfig | (() => Promise<T>),\n    maybeCallback?: () => Promise<T>,\n  ): Promise<T> {\n    // Capture the current scope, so parent span (e.g., a startSpan surrounding step.do) is preserved\n    const scopeForStep = getCurrentScope();\n\n    const userCallback = (maybeCallback || configOrCallback) as () => Promise<T>;\n    const config = typeof configOrCallback === 'function' ? undefined : configOrCallback;\n\n    const instrumentedCallback: () => Promise<T> = async () => {\n      return startSpan(\n        {\n          op: 'function.step.do',\n          name,\n          scope: scopeForStep,\n          attributes: {\n            'cloudflare.workflow.timeout': config?.timeout,\n            'cloudflare.workflow.retries.backoff': config?.retries?.backoff,\n            'cloudflare.workflow.retries.delay': config?.retries?.delay,\n            'cloudflare.workflow.retries.limit': config?.retries?.limit,\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.workflow',\n            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n          },\n        },\n        async span => {\n          try {\n            const result = await userCallback();\n            span.setStatus({ code: 1 });\n            return result;\n          } catch (error) {\n            captureException(error, { mechanism: { handled: true, type: 'auto.faas.cloudflare.workflow' } });\n            throw error;\n          } finally {\n            this._ctx.waitUntil(flush(2000));\n          }\n        },\n      );\n    };\n\n    return config ? this._step.do(name, config, instrumentedCallback) : this._step.do(name, instrumentedCallback);\n  }\n\n  public async sleep(name: string, duration: WorkflowSleepDuration): Promise<void> {\n    return this._step.sleep(name, duration);\n  }\n\n  public async sleepUntil(name: string, timestamp: Date | number): Promise<void> {\n    return this._step.sleepUntil(name, timestamp);\n  }\n\n  public async waitForEvent<T extends Rpc.Serializable<T>>(\n    name: string,\n    options: { type: string; timeout?: WorkflowTimeoutDuration | number },\n  ): Promise<WorkflowStepEvent<T>> {\n    return this._step.waitForEvent<T>(name, options);\n  }\n}\n\n/**\n * Instruments a Cloudflare Workflow class with Sentry.\n *\n * @example\n * ```typescript\n * const InstrumentedWorkflow = instrumentWorkflowWithSentry(\n *   (env) => ({ dsn: env.SENTRY_DSN }),\n *   MyWorkflowClass\n * );\n *\n * export default InstrumentedWorkflow;\n * ```\n *\n * @param optionsCallback - Function that returns Sentry options to initialize Sentry\n * @param WorkflowClass - The workflow class to instrument\n * @returns Instrumented workflow class with the same interface\n */\nexport function instrumentWorkflowWithSentry<\n  E, // Environment type\n  P, // Payload type\n  T extends WorkflowEntrypoint<E, P>, // WorkflowEntrypoint type\n  C extends new (ctx: ExecutionContext, env: E) => T, // Constructor type of the WorkflowEntrypoint class\n>(optionsCallback: (env: E) => CloudflareOptions, WorkFlowClass: C): C {\n  return new Proxy(WorkFlowClass, {\n    construct(target: C, args: [ctx: ExecutionContext, env: E], newTarget) {\n      const [ctx, env] = args;\n      const context = instrumentContext(ctx);\n      args[0] = context;\n\n      const options = optionsCallback(env);\n      const instance = Reflect.construct(target, args, newTarget) as T;\n      return new Proxy(instance, {\n        get(obj, prop, receiver) {\n          if (prop === 'run') {\n            return async function (event: WorkflowEvent<P>, step: WorkflowStep): Promise<unknown> {\n              setAsyncLocalStorageAsyncContextStrategy();\n\n              return withIsolationScope(async isolationScope => {\n                const client = init({ ...options, enableDedupe: false });\n                isolationScope.setClient(client);\n\n                addCloudResourceContext(isolationScope);\n\n                return withScope(async scope => {\n                  const propagationContext = await propagationContextFromInstanceId(event.instanceId);\n                  scope.setPropagationContext(propagationContext);\n\n                  try {\n                    return await obj.run.call(\n                      obj,\n                      event,\n                      new WrappedWorkflowStep(event.instanceId, context, options, step),\n                    );\n                  } finally {\n                    context.waitUntil(flushAndDispose(client));\n                  }\n                });\n              });\n            };\n          }\n          return Reflect.get(obj, prop, receiver);\n        },\n      });\n    },\n  });\n}\n"],"names":["getCurrentScope","startSpan","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","captureException","flush","instrumentContext","setAsyncLocalStorageAsyncContextStrategy","withIsolationScope","init","addCloudResourceContext","withScope","flushAndDispose"],"mappings":"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"}

package/build/cjs/wrapMethodWithSentry.js

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@sentry/core');
+const flush = require('./flush.js');
 const instrument = require('./instrument.js');
 const sdk = require('./sdk.js');
 
@@ -49,6 +50,8 @@ function wrapMethodWithSentry(
           scope.setClient(client);
         }
 
+        const clientToDispose = currentClient || scope.getClient();
+
         if (!wrapperOptions.spanName) {
           try {
             if (callback) {
@@ -59,7 +62,7 @@ function wrapMethodWithSentry(
             if (core.isThenable(result)) {
               return result.then(
                 (res) => {
-                  waitUntil?.(core.flush(2000));
+                  waitUntil?.(flush.flushAndDispose(clientToDispose));
                   return res;
                 },
                 (e) => {
@@ -69,12 +72,12 @@ function wrapMethodWithSentry(
                       handled: false,
                     },
                   });
-                  waitUntil?.(core.flush(2000));
+                  waitUntil?.(flush.flushAndDispose(clientToDispose));
                   throw e;
                 },
               );
             } else {
-              waitUntil?.(core.flush(2000));
+              waitUntil?.(flush.flushAndDispose(clientToDispose));
               return result;
             }
           } catch (e) {
@@ -84,7 +87,7 @@ function wrapMethodWithSentry(
                 handled: false,
               },
             });
-            waitUntil?.(core.flush(2000));
+            waitUntil?.(flush.flushAndDispose(clientToDispose));
             throw e;
           }
         }
@@ -103,7 +106,7 @@ function wrapMethodWithSentry(
             if (core.isThenable(result)) {
               return result.then(
                 (res) => {
-                  waitUntil?.(core.flush(2000));
+                  waitUntil?.(flush.flushAndDispose(clientToDispose));
                   return res;
                 },
                 (e) => {
@@ -113,12 +116,12 @@ function wrapMethodWithSentry(
                       handled: false,
                     },
                   });
-                  waitUntil?.(core.flush(2000));
+                  waitUntil?.(flush.flushAndDispose(clientToDispose));
                   throw e;
                 },
               );
             } else {
-              waitUntil?.(core.flush(2000));
+              waitUntil?.(flush.flushAndDispose(clientToDispose));
               return result;
             }
           } catch (e) {
@@ -128,7 +131,7 @@ function wrapMethodWithSentry(
                 handled: false,
               },
             });
-            waitUntil?.(core.flush(2000));
+            waitUntil?.(flush.flushAndDispose(clientToDispose));
             throw e;
           }
         });