@sentry/cloudflare 10.45.0 → 10.47.0

package/build/cjs/flush.js

@@ -43,8 +43,14 @@ function makeFlushLock(context) {
  * @returns A promise that resolves when flush and dispose are complete
  */
 async function flushAndDispose(client, timeout = 2000) {
-  await core.flush(timeout);
-  client?.dispose();
+  if (!client) {
+    await core.flush(timeout);
+
+    return;
+  }
+
+  await client.flush(timeout);
+  client.dispose();
 }
 
 exports.flushAndDispose = flushAndDispose;

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';\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;;;;;"}
+{"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  if (!client) {\n    await flush(timeout);\n\n    return;\n  }\n\n  await client.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,IAAI,CAAC,MAAM,EAAE;AACf,IAAI,MAAMA,UAAK,CAAC,OAAO,CAAC;;AAExB,IAAI;AACJ,EAAE;;AAEF,EAAE,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;AAC7B,EAAE,MAAM,CAAC,OAAO,EAAE;AAClB;;;;;"}

package/build/cjs/workflows.js

@@ -60,7 +60,7 @@ class WrappedWorkflowStep  {
     const userCallback = (maybeCallback || configOrCallback) ;
     const config = typeof configOrCallback === 'function' ? undefined : configOrCallback;
 
-    const instrumentedCallback = async () => {
+    const instrumentedCallback = async (...args) => {
       return core.startSpan(
         {
           op: 'function.step.do',
@@ -77,7 +77,7 @@ class WrappedWorkflowStep  {
         },
         async span => {
           try {
-            const result = await userCallback();
+            const result = await userCallback(...args);
             span.setStatus({ code: 1 });
             return result;
           } catch (error) {

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 { 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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"}
+{"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>>(\n    name: string,\n    callback: (...args: unknown[]) => Promise<T>,\n  ): Promise<T>;\n  public async do<T extends Rpc.Serializable<T>>(\n    name: string,\n    config: WorkflowStepConfig,\n    callback: (...args: unknown[]) => Promise<T>,\n  ): Promise<T>;\n  public async do<T extends Rpc.Serializable<T>>(\n    name: string,\n    configOrCallback: WorkflowStepConfig | (() => Promise<T>),\n    maybeCallback?: (...args: unknown[]) => 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 (...args: unknown[]) => Promise<T>;\n    const config = typeof configOrCallback === 'function' ? undefined : configOrCallback;\n\n    const instrumentedCallback = async (...args: unknown[]): Promise<T> => {\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(...args);\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/esm/flush.js

@@ -41,8 +41,14 @@ function makeFlushLock(context) {
  * @returns A promise that resolves when flush and dispose are complete
  */
 async function flushAndDispose(client, timeout = 2000) {
-  await flush(timeout);
-  client?.dispose();
+  if (!client) {
+    await flush(timeout);
+
+    return;
+  }
+
+  await client.flush(timeout);
+  client.dispose();
 }
 
 export { flushAndDispose, makeFlushLock };

package/build/esm/flush.js.map

@@ -1 +1 @@
-{"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":[],"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,MAAM,KAAK,CAAC,OAAO,CAAC;AACtB,EAAE,MAAM,EAAE,OAAO,EAAE;AACnB;;;;"}
+{"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  if (!client) {\n    await flush(timeout);\n\n    return;\n  }\n\n  await client.flush(timeout);\n  client.dispose();\n}\n"],"names":[],"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,IAAI,CAAC,MAAM,EAAE;AACf,IAAI,MAAM,KAAK,CAAC,OAAO,CAAC;;AAExB,IAAI;AACJ,EAAE;;AAEF,EAAE,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;AAC7B,EAAE,MAAM,CAAC,OAAO,EAAE;AAClB;;;;"}

package/build/esm/package.json

@@ -1 +1 @@
-{"type":"module","version":"10.45.0","sideEffects":false}
+{"type":"module","version":"10.47.0","sideEffects":false}

package/build/esm/workflows.js

@@ -58,7 +58,7 @@ class WrappedWorkflowStep  {
     const userCallback = (maybeCallback || configOrCallback) ;
     const config = typeof configOrCallback === 'function' ? undefined : configOrCallback;
 
-    const instrumentedCallback = async () => {
+    const instrumentedCallback = async (...args) => {
       return startSpan(
         {
           op: 'function.step.do',
@@ -75,7 +75,7 @@ class WrappedWorkflowStep  {
         },
         async span => {
           try {
-            const result = await userCallback();
+            const result = await userCallback(...args);
             span.setStatus({ code: 1 });
             return result;
           } catch (error) {

package/build/esm/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 { 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":[],"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>>(\n    name: string,\n    callback: (...args: unknown[]) => Promise<T>,\n  ): Promise<T>;\n  public async do<T extends Rpc.Serializable<T>>(\n    name: string,\n    config: WorkflowStepConfig,\n    callback: (...args: unknown[]) => Promise<T>,\n  ): Promise<T>;\n  public async do<T extends Rpc.Serializable<T>>(\n    name: string,\n    configOrCallback: WorkflowStepConfig | (() => Promise<T>),\n    maybeCallback?: (...args: unknown[]) => 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 (...args: unknown[]) => Promise<T>;\n    const config = typeof configOrCallback === 'function' ? undefined : configOrCallback;\n\n    const instrumentedCallback = async (...args: unknown[]): Promise<T> => {\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(...args);\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":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"flush.d.ts","sourceRoot":"","sources":["../../src/flush.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,KAAK,SAAS,GAAG;IACf,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAsBlE;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,SAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAG/F"}
+{"version":3,"file":"flush.d.ts","sourceRoot":"","sources":["../../src/flush.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,KAAK,SAAS,GAAG;IACf,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAsBlE;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,SAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAS/F"}

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

@@ -1 +1 @@
-{"version":3,"file":"workflows.d.ts","sourceRoot":"","sources":["../../src/workflows.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,kBAAkB,EAOnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAQlD;;GAEG;AACH,wBAAsB,kCAAkC,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS5F;AA8FD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,4BAA4B,CAC1C,CAAC,EAAE,mBAAmB;AACtB,CAAC,EAAE,eAAe;AAClB,CAAC,SAAS,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,0BAA0B;AAC9D,CAAC,SAAS,KAAK,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EAClD,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,EAAE,aAAa,EAAE,CAAC,GAAG,CAAC,CA2CrE"}
+{"version":3,"file":"workflows.d.ts","sourceRoot":"","sources":["../../src/workflows.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,kBAAkB,EAOnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAQlD;;GAEG;AACH,wBAAsB,kCAAkC,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS5F;AAiGD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,4BAA4B,CAC1C,CAAC,EAAE,mBAAmB;AACtB,CAAC,EAAE,eAAe;AAClB,CAAC,SAAS,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,0BAA0B;AAC9D,CAAC,SAAS,KAAK,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EAClD,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,EAAE,aAAa,EAAE,CAAC,GAAG,CAAC,CA2CrE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cloudflare",
-  "version": "10.45.0",
+  "version": "10.47.0",
   "description": "Official Sentry SDK for Cloudflare Workers and Pages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
@@ -49,8 +49,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.45.0"
+    "@opentelemetry/api": "^1.9.1",
+    "@sentry/core": "10.47.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.x"