@sentry/cloudflare 10.53.0 → 10.54.0

package/build/cjs/vendor/stacktrace.js

@@ -2,46 +2,25 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@sentry/core');
 
-/**
- * Stack line parser for Cloudflare Workers.
- * This wraps node stack parser and adjusts root paths to match with source maps.
- *
- */
-function workersStackLineParser(getModule) {
-  const [arg1, arg2] = core.nodeStackLineParser(getModule);
-
-  const fn = line => {
+function workersStackLineParser(getModule2) {
+  const [arg1, arg2] = core.nodeStackLineParser(getModule2);
+  const fn = (line) => {
     const result = arg2(line);
     if (result) {
       const filename = result.filename;
-      // Workers runtime runs a single bundled file that is always in a virtual root
-      result.abs_path = filename !== undefined && !filename.startsWith('/') ? `/${filename}` : filename;
-      // There is no way to tell what code is in_app and what comes from dependencies (node_modules), since we have one bundled file.
-      // So everything is in_app, unless an error comes from runtime function (ie. JSON.parse), which is determined by the presence of filename.
-      result.in_app = filename !== undefined;
+      result.abs_path = filename !== void 0 && !filename.startsWith("/") ? `/${filename}` : filename;
+      result.in_app = filename !== void 0;
     }
     return result;
   };
-
   return [arg1, fn];
 }
-
-/**
- * Gets the module from filename.
- *
- * @param filename
- * @returns Module name
- */
 function getModule(filename) {
   if (!filename) {
     return;
   }
-
-  // In Cloudflare Workers there is always only one bundled file
-  return core.basename(filename, '.js');
+  return core.basename(filename, ".js");
 }
-
-/** Cloudflare Workers stack parser */
 const defaultStackParser = core.createStackParser(workersStackLineParser(getModule));
 
 exports.defaultStackParser = defaultStackParser;

package/build/cjs/vendor/stacktrace.js.map

@@ -1 +1 @@
-{"version":3,"file":"stacktrace.js","sources":["../../../src/vendor/stacktrace.ts"],"sourcesContent":["// Vendored from https://github.com/robertcepa/toucan-js/blob/036568729e49d0a937de527dc32d73580d9a41b3/packages/toucan-js/src/stacktrace.ts\n// MIT License\n\n// Copyright (c) 2022 Robert Cepa\n\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n\n// The above copyright notice and this permission notice shall be included in all\n// copies or substantial portions of the Software.\n\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n// SOFTWARE.\n\nimport type { StackLineParser, StackLineParserFn, StackParser } from '@sentry/core';\nimport { basename, createStackParser, nodeStackLineParser } from '@sentry/core';\n\ntype GetModuleFn = (filename: string | undefined) => string | undefined;\n\n/**\n * Stack line parser for Cloudflare Workers.\n * This wraps node stack parser and adjusts root paths to match with source maps.\n *\n */\nfunction workersStackLineParser(getModule?: GetModuleFn): StackLineParser {\n  const [arg1, arg2] = nodeStackLineParser(getModule);\n\n  const fn: StackLineParserFn = line => {\n    const result = arg2(line);\n    if (result) {\n      const filename = result.filename;\n      // Workers runtime runs a single bundled file that is always in a virtual root\n      result.abs_path = filename !== undefined && !filename.startsWith('/') ? `/${filename}` : filename;\n      // There is no way to tell what code is in_app and what comes from dependencies (node_modules), since we have one bundled file.\n      // So everything is in_app, unless an error comes from runtime function (ie. JSON.parse), which is determined by the presence of filename.\n      result.in_app = filename !== undefined;\n    }\n    return result;\n  };\n\n  return [arg1, fn];\n}\n\n/**\n * Gets the module from filename.\n *\n * @param filename\n * @returns Module name\n */\nexport function getModule(filename: string | undefined): string | undefined {\n  if (!filename) {\n    return;\n  }\n\n  // In Cloudflare Workers there is always only one bundled file\n  return basename(filename, '.js');\n}\n\n/** Cloudflare Workers stack parser */\nexport const defaultStackParser: StackParser = createStackParser(workersStackLineParser(getModule));\n"],"names":["nodeStackLineParser","basename","createStackParser"],"mappings":";;;;AA4BA;AACA;AACA;AACA;AACA;AACA,SAAS,sBAAsB,CAAC,SAAS,EAAiC;AAC1E,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,IAAIA,wBAAmB,CAAC,SAAS,CAAC;;AAErD,EAAE,MAAM,EAAE,GAAsB,QAAQ;AACxC,IAAI,MAAM,MAAA,GAAS,IAAI,CAAC,IAAI,CAAC;AAC7B,IAAI,IAAI,MAAM,EAAE;AAChB,MAAM,MAAM,QAAA,GAAW,MAAM,CAAC,QAAQ;AACtC;AACA,MAAM,MAAM,CAAC,QAAA,GAAW,aAAa,SAAA,IAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAA,GAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA,GAAA,QAAA;AACA;AACA;AACA,MAAA,MAAA,CAAA,MAAA,GAAA,QAAA,KAAA,SAAA;AACA,IAAA;AACA,IAAA,OAAA,MAAA;AACA,EAAA,CAAA;;AAEA,EAAA,OAAA,CAAA,IAAA,EAAA,EAAA,CAAA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,SAAA,SAAA,CAAA,QAAA,EAAA;AACA,EAAA,IAAA,CAAA,QAAA,EAAA;AACA,IAAA;AACA,EAAA;;AAEA;AACA,EAAA,OAAAC,aAAA,CAAA,QAAA,EAAA,KAAA,CAAA;AACA;;AAEA;AACA,MAAA,kBAAA,GAAAC,sBAAA,CAAA,sBAAA,CAAA,SAAA,CAAA;;;;;"}
+{"version":3,"file":"stacktrace.js","sources":["../../../src/vendor/stacktrace.ts"],"sourcesContent":["// Vendored from https://github.com/robertcepa/toucan-js/blob/036568729e49d0a937de527dc32d73580d9a41b3/packages/toucan-js/src/stacktrace.ts\n// MIT License\n\n// Copyright (c) 2022 Robert Cepa\n\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n\n// The above copyright notice and this permission notice shall be included in all\n// copies or substantial portions of the Software.\n\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n// SOFTWARE.\n\nimport type { StackLineParser, StackLineParserFn, StackParser } from '@sentry/core';\nimport { basename, createStackParser, nodeStackLineParser } from '@sentry/core';\n\ntype GetModuleFn = (filename: string | undefined) => string | undefined;\n\n/**\n * Stack line parser for Cloudflare Workers.\n * This wraps node stack parser and adjusts root paths to match with source maps.\n *\n */\nfunction workersStackLineParser(getModule?: GetModuleFn): StackLineParser {\n  const [arg1, arg2] = nodeStackLineParser(getModule);\n\n  const fn: StackLineParserFn = line => {\n    const result = arg2(line);\n    if (result) {\n      const filename = result.filename;\n      // Workers runtime runs a single bundled file that is always in a virtual root\n      result.abs_path = filename !== undefined && !filename.startsWith('/') ? `/${filename}` : filename;\n      // There is no way to tell what code is in_app and what comes from dependencies (node_modules), since we have one bundled file.\n      // So everything is in_app, unless an error comes from runtime function (ie. JSON.parse), which is determined by the presence of filename.\n      result.in_app = filename !== undefined;\n    }\n    return result;\n  };\n\n  return [arg1, fn];\n}\n\n/**\n * Gets the module from filename.\n *\n * @param filename\n * @returns Module name\n */\nexport function getModule(filename: string | undefined): string | undefined {\n  if (!filename) {\n    return;\n  }\n\n  // In Cloudflare Workers there is always only one bundled file\n  return basename(filename, '.js');\n}\n\n/** Cloudflare Workers stack parser */\nexport const defaultStackParser: StackParser = createStackParser(workersStackLineParser(getModule));\n"],"names":["getModule","nodeStackLineParser","basename","createStackParser"],"mappings":";;;;AAiCA,SAAS,uBAAuBA,UAAAA,EAA0C;AACxE,EAAA,MAAM,CAAC,IAAA,EAAM,IAAI,CAAA,GAAIC,yBAAoBD,UAAS,CAAA;AAElD,EAAA,MAAM,KAAwB,CAAA,IAAA,KAAQ;AACpC,IAAA,MAAM,MAAA,GAAS,KAAK,IAAI,CAAA;AACxB,IAAA,IAAI,MAAA,EAAQ;AACV,MAAA,MAAM,WAAW,MAAA,CAAO,QAAA;AAExB,MAAA,MAAA,CAAO,QAAA,GAAW,QAAA,KAAa,MAAA,IAAa,CAAC,QAAA,CAAS,WAAW,GAAG,CAAA,GAAI,CAAA,CAAA,EAAI,QAAQ,CAAA,CAAA,GAAK,QAAA;AAGzF,MAAA,MAAA,CAAO,SAAS,QAAA,KAAa,MAAA;AAAA,IAC/B;AACA,IAAA,OAAO,MAAA;AAAA,EACT,CAAA;AAEA,EAAA,OAAO,CAAC,MAAM,EAAE,CAAA;AAClB;AAQO,SAAS,UAAU,QAAA,EAAkD;AAC1E,EAAA,IAAI,CAAC,QAAA,EAAU;AACb,IAAA;AAAA,EACF;AAGA,EAAA,OAAOE,aAAA,CAAS,UAAU,KAAK,CAAA;AACjC;AAGO,MAAM,kBAAA,GAAkCC,sBAAA,CAAkB,sBAAA,CAAuB,SAAS,CAAC;;;;;"}

package/build/cjs/withSentry.js

@@ -11,64 +11,33 @@ const hono = require('./integrations/hono.js');
 const isCloudflareClass = require('./utils/isCloudflareClass.js');
 const instrumentWorkerEntrypoint = require('./instrumentations/instrumentWorkerEntrypoint.js');
 
-/**
- * Wrapper for Cloudflare handlers.
- *
- * Initializes the SDK and wraps the handler with Sentry instrumentation.
- *
- * Automatically instruments the `fetch` method of the handler.
- *
- * @param optionsCallback Function that returns the options for the SDK initialization.
- * @param handler {ExportedHandler} The handler to wrap.
- * @returns The wrapped handler.
- */
-// TODO(v11): The generic types need to be rewritten to following to improve type safety:
-// T extends ExportedHandler<any, any, any> | WorkerEntrypointConstructor<any, any>
-function withSentry
-
-(optionsCallback, handler) {
-  if (isCloudflareClass.isCloudflareClass(handler, 'WorkerEntrypoint')) {
-    // oxlint-disable-next-line typescript/no-explicit-any
-    return instrumentWorkerEntrypoint.instrumentWorkerEntrypoint(optionsCallback , handler);
+function withSentry(optionsCallback, handler) {
+  if (isCloudflareClass.isCloudflareClass(handler, "WorkerEntrypoint")) {
+    return instrumentWorkerEntrypoint.instrumentWorkerEntrypoint(optionsCallback, handler);
   }
-
   async.setAsyncLocalStorageAsyncContextStrategy();
-
   try {
-    // oxlint-disable-next-line typescript/no-explicit-any
-    instrumentFetch.instrumentExportedHandlerFetch(handler, optionsCallback );
+    instrumentFetch.instrumentExportedHandlerFetch(handler, optionsCallback);
     instrumentHonoErrorHandler(handler);
-    // oxlint-disable-next-line typescript/no-explicit-any
-    instrumentScheduled.instrumentExportedHandlerScheduled(handler, optionsCallback );
-    // oxlint-disable-next-line typescript/no-explicit-any
-    instrumentEmail.instrumentExportedHandlerEmail(handler, optionsCallback );
-    // oxlint-disable-next-line typescript/no-explicit-any
-    instrumentQueue.instrumentExportedHandlerQueue(handler, optionsCallback );
-    // oxlint-disable-next-line typescript/no-explicit-any
-    instrumentTail.instrumentExportedHandlerTail(handler, optionsCallback );
-    // This is here because Miniflare sometimes cannot get instrumented
+    instrumentScheduled.instrumentExportedHandlerScheduled(handler, optionsCallback);
+    instrumentEmail.instrumentExportedHandlerEmail(handler, optionsCallback);
+    instrumentQueue.instrumentExportedHandlerQueue(handler, optionsCallback);
+    instrumentTail.instrumentExportedHandlerTail(handler, optionsCallback);
   } catch {
-    // Do not console anything here, we don't want to spam the console with errors
   }
-
   return handler;
 }
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function instrumentHonoErrorHandler(handler) {
-  if ('onError' in handler && 'errorHandler' in handler && typeof handler.errorHandler === 'function') {
+  if ("onError" in handler && "errorHandler" in handler && typeof handler.errorHandler === "function") {
     handler.errorHandler = instrument.ensureInstrumented(
       handler.errorHandler,
-      original =>
-        new Proxy(original, {
-          apply(target, thisArg, args) {
-            const [err, context] = args;
-
-            hono.getHonoIntegration()?.handleHonoException(err, context);
-
-            return Reflect.apply(target, thisArg, args);
-          },
-        }),
+      (original) => new Proxy(original, {
+        apply(target, thisArg, args) {
+          const [err, context] = args;
+          hono.getHonoIntegration()?.handleHonoException(err, context);
+          return Reflect.apply(target, thisArg, args);
+        }
+      })
     );
   }
 }

package/build/cjs/withSentry.js.map

@@ -1 +1 @@
-{"version":3,"file":"withSentry.js","sources":["../../src/withSentry.ts"],"sourcesContent":["import type { env as cloudflareEnv } from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { ensureInstrumented } from './instrument';\nimport { instrumentExportedHandlerEmail } from './instrumentations/worker/instrumentEmail';\nimport { instrumentExportedHandlerFetch } from './instrumentations/worker/instrumentFetch';\nimport { instrumentExportedHandlerQueue } from './instrumentations/worker/instrumentQueue';\nimport { instrumentExportedHandlerScheduled } from './instrumentations/worker/instrumentScheduled';\nimport { instrumentExportedHandlerTail } from './instrumentations/worker/instrumentTail';\nimport { getHonoIntegration } from './integrations/hono';\nimport { isCloudflareClass } from './utils/isCloudflareClass';\nimport {\n  instrumentWorkerEntrypoint,\n  type WorkerEntrypointConstructor,\n} from './instrumentations/instrumentWorkerEntrypoint';\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// TODO(v11): The generic types need to be rewritten to following to improve type safety:\n// T extends ExportedHandler<any, any, any> | WorkerEntrypointConstructor<any, any>\nexport function withSentry<\n  Env = typeof cloudflareEnv,\n  QueueHandlerMessage = unknown,\n  CfHostMetadata = unknown,\n  T extends ExportedHandler<Env, QueueHandlerMessage, CfHostMetadata> | WorkerEntrypointConstructor = ExportedHandler<\n    Env,\n    QueueHandlerMessage,\n    CfHostMetadata\n  >,\n>(optionsCallback: (env: Env) => CloudflareOptions | undefined, handler: T): T {\n  if (isCloudflareClass(handler, 'WorkerEntrypoint')) {\n    // oxlint-disable-next-line typescript/no-explicit-any\n    return instrumentWorkerEntrypoint(optionsCallback as any, handler);\n  }\n\n  setAsyncLocalStorageAsyncContextStrategy();\n\n  try {\n    // oxlint-disable-next-line typescript/no-explicit-any\n    instrumentExportedHandlerFetch(handler, optionsCallback as any);\n    instrumentHonoErrorHandler(handler);\n    // oxlint-disable-next-line typescript/no-explicit-any\n    instrumentExportedHandlerScheduled(handler, optionsCallback as any);\n    // oxlint-disable-next-line typescript/no-explicit-any\n    instrumentExportedHandlerEmail(handler, optionsCallback as any);\n    // oxlint-disable-next-line typescript/no-explicit-any\n    instrumentExportedHandlerQueue(handler, optionsCallback as any);\n    // oxlint-disable-next-line typescript/no-explicit-any\n    instrumentExportedHandlerTail(handler, optionsCallback as any);\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\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nfunction instrumentHonoErrorHandler<T extends ExportedHandler<any, any, any>>(handler: T): void {\n  if ('onError' in handler && 'errorHandler' in handler && typeof handler.errorHandler === 'function') {\n    handler.errorHandler = ensureInstrumented(\n      handler.errorHandler,\n      original =>\n        new Proxy(original, {\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  }\n}\n"],"names":["isCloudflareClass","instrumentWorkerEntrypoint","setAsyncLocalStorageAsyncContextStrategy","instrumentExportedHandlerFetch","instrumentExportedHandlerScheduled","instrumentExportedHandlerEmail","instrumentExportedHandlerQueue","instrumentExportedHandlerTail","ensureInstrumented","getHonoIntegration"],"mappings":";;;;;;;;;;;;;AAgBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS;;AAShB,CAAE,eAAe,EAA+C,OAAO,EAAQ;AAC/E,EAAE,IAAIA,mCAAiB,CAAC,OAAO,EAAE,kBAAkB,CAAC,EAAE;AACtD;AACA,IAAI,OAAOC,qDAA0B,CAAC,eAAA,GAAwB,OAAO,CAAC;AACtE,EAAE;;AAEF,EAAEC,8CAAwC,EAAE;;AAE5C,EAAE,IAAI;AACN;AACA,IAAIC,8CAA8B,CAAC,OAAO,EAAE,iBAAuB;AACnE,IAAI,0BAA0B,CAAC,OAAO,CAAC;AACvC;AACA,IAAIC,sDAAkC,CAAC,OAAO,EAAE,iBAAuB;AACvE;AACA,IAAIC,8CAA8B,CAAC,OAAO,EAAE,iBAAuB;AACnE;AACA,IAAIC,8CAA8B,CAAC,OAAO,EAAE,iBAAuB;AACnE;AACA,IAAIC,4CAA6B,CAAC,OAAO,EAAE,iBAAuB;AAClE;AACA,EAAE,EAAE,MAAM;AACV;AACA,EAAE;;AAEF,EAAE,OAAO,OAAO;AAChB;;AAEA;AACA,SAAS,0BAA0B,CAA2C,OAAO,EAAW;AAChG,EAAE,IAAI,SAAA,IAAa,OAAA,IAAW,cAAA,IAAkB,OAAA,IAAW,OAAO,OAAO,CAAC,YAAA,KAAiB,UAAU,EAAE;AACvG,IAAI,OAAO,CAAC,YAAA,GAAeC,6BAAkB;AAC7C,MAAM,OAAO,CAAC,YAAY;AAC1B,MAAM,QAAA;AACN,QAAQ,IAAI,KAAK,CAAC,QAAQ,EAAE;AAC5B,UAAU,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;AACvC,YAAY,MAAM,CAAC,GAAG,EAAE,OAAO,CAAA,GAAI,IAAI;;AAEvC,YAAYC,uBAAkB,EAAE,EAAE,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC;;AAEnE,YAAY,OAAO,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC;AACvD,UAAU,CAAC;AACX,SAAS,CAAC;AACV,KAAK;AACL,EAAE;AACF;;;;"}
+{"version":3,"file":"withSentry.js","sources":["../../src/withSentry.ts"],"sourcesContent":["import type { env as cloudflareEnv } from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { ensureInstrumented } from './instrument';\nimport { instrumentExportedHandlerEmail } from './instrumentations/worker/instrumentEmail';\nimport { instrumentExportedHandlerFetch } from './instrumentations/worker/instrumentFetch';\nimport { instrumentExportedHandlerQueue } from './instrumentations/worker/instrumentQueue';\nimport { instrumentExportedHandlerScheduled } from './instrumentations/worker/instrumentScheduled';\nimport { instrumentExportedHandlerTail } from './instrumentations/worker/instrumentTail';\nimport { getHonoIntegration } from './integrations/hono';\nimport { isCloudflareClass } from './utils/isCloudflareClass';\nimport {\n  instrumentWorkerEntrypoint,\n  type WorkerEntrypointConstructor,\n} from './instrumentations/instrumentWorkerEntrypoint';\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// TODO(v11): The generic types need to be rewritten to following to improve type safety:\n// T extends ExportedHandler<any, any, any> | WorkerEntrypointConstructor<any, any>\nexport function withSentry<\n  Env = typeof cloudflareEnv,\n  QueueHandlerMessage = unknown,\n  CfHostMetadata = unknown,\n  T extends ExportedHandler<Env, QueueHandlerMessage, CfHostMetadata> | WorkerEntrypointConstructor = ExportedHandler<\n    Env,\n    QueueHandlerMessage,\n    CfHostMetadata\n  >,\n>(optionsCallback: (env: Env) => CloudflareOptions | undefined, handler: T): T {\n  if (isCloudflareClass(handler, 'WorkerEntrypoint')) {\n    // oxlint-disable-next-line typescript/no-explicit-any\n    return instrumentWorkerEntrypoint(optionsCallback as any, handler);\n  }\n\n  setAsyncLocalStorageAsyncContextStrategy();\n\n  try {\n    // oxlint-disable-next-line typescript/no-explicit-any\n    instrumentExportedHandlerFetch(handler, optionsCallback as any);\n    instrumentHonoErrorHandler(handler);\n    // oxlint-disable-next-line typescript/no-explicit-any\n    instrumentExportedHandlerScheduled(handler, optionsCallback as any);\n    // oxlint-disable-next-line typescript/no-explicit-any\n    instrumentExportedHandlerEmail(handler, optionsCallback as any);\n    // oxlint-disable-next-line typescript/no-explicit-any\n    instrumentExportedHandlerQueue(handler, optionsCallback as any);\n    // oxlint-disable-next-line typescript/no-explicit-any\n    instrumentExportedHandlerTail(handler, optionsCallback as any);\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\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nfunction instrumentHonoErrorHandler<T extends ExportedHandler<any, any, any>>(handler: T): void {\n  if ('onError' in handler && 'errorHandler' in handler && typeof handler.errorHandler === 'function') {\n    handler.errorHandler = ensureInstrumented(\n      handler.errorHandler,\n      original =>\n        new Proxy(original, {\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  }\n}\n"],"names":["isCloudflareClass","instrumentWorkerEntrypoint","setAsyncLocalStorageAsyncContextStrategy","instrumentExportedHandlerFetch","instrumentExportedHandlerScheduled","instrumentExportedHandlerEmail","instrumentExportedHandlerQueue","instrumentExportedHandlerTail","ensureInstrumented","getHonoIntegration"],"mappings":";;;;;;;;;;;;;AA6BO,SAAS,UAAA,CASd,iBAA8D,OAAA,EAAe;AAC7E,EAAA,IAAIA,mCAAA,CAAkB,OAAA,EAAS,kBAAkB,CAAA,EAAG;AAElD,IAAA,OAAOC,qDAAA,CAA2B,iBAAwB,OAAO,CAAA;AAAA,EACnE;AAEA,EAAAC,8CAAA,EAAyC;AAEzC,EAAA,IAAI;AAEF,IAAAC,8CAAA,CAA+B,SAAS,eAAsB,CAAA;AAC9D,IAAA,0BAAA,CAA2B,OAAO,CAAA;AAElC,IAAAC,sDAAA,CAAmC,SAAS,eAAsB,CAAA;AAElE,IAAAC,8CAAA,CAA+B,SAAS,eAAsB,CAAA;AAE9D,IAAAC,8CAAA,CAA+B,SAAS,eAAsB,CAAA;AAE9D,IAAAC,4CAAA,CAA8B,SAAS,eAAsB,CAAA;AAAA,EAE/D,CAAA,CAAA,MAAQ;AAAA,EAER;AAEA,EAAA,OAAO,OAAA;AACT;AAGA,SAAS,2BAAqE,OAAA,EAAkB;AAC9F,EAAA,IAAI,aAAa,OAAA,IAAW,cAAA,IAAkB,WAAW,OAAO,OAAA,CAAQ,iBAAiB,UAAA,EAAY;AACnG,IAAA,OAAA,CAAQ,YAAA,GAAeC,6BAAA;AAAA,MACrB,OAAA,CAAQ,YAAA;AAAA,MACR,CAAA,QAAA,KACE,IAAI,KAAA,CAAM,QAAA,EAAU;AAAA,QAClB,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAA,EAAM;AAC3B,UAAA,MAAM,CAAC,GAAA,EAAK,OAAO,CAAA,GAAI,IAAA;AAEvB,UAAAC,uBAAA,EAAmB,EAAG,mBAAA,CAAoB,GAAA,EAAK,OAAO,CAAA;AAEtD,UAAA,OAAO,OAAA,CAAQ,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAI,CAAA;AAAA,QAC5C;AAAA,OACD;AAAA,KACL;AAAA,EACF;AACF;;;;"}

package/build/cjs/workflows.js

@@ -9,157 +9,97 @@ const sdk = require('./sdk.js');
 const instrumentContext = require('./utils/instrumentContext.js');
 
 const UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;
-
-/**
- * Hashes a string to a UUID using SHA-1.
- */
 async function deterministicTraceIdFromInstanceId(instanceId) {
-  const buf = await crypto.subtle.digest('SHA-1', new TextEncoder().encode(instanceId));
-  return (
-    Array.from(new Uint8Array(buf))
-      // We only need the first 16 bytes for the 32 characters
-      .slice(0, 16)
-      .map(b => b.toString(16).padStart(2, '0'))
-      .join('')
-  );
+  const buf = await crypto.subtle.digest("SHA-1", new TextEncoder().encode(instanceId));
+  return Array.from(new Uint8Array(buf)).slice(0, 16).map((b) => b.toString(16).padStart(2, "0")).join("");
 }
-
 async function propagationContextFromInstanceId(instanceId) {
-  const traceId = UUID_REGEX.test(instanceId)
-    ? instanceId.replace(/-/g, '')
-    : await deterministicTraceIdFromInstanceId(instanceId);
-
-  // Derive sampleRand from last 4 characters of the random UUID
-  //
-  // We cannot store any state between workflow steps, so we derive the
-  // sampleRand from the traceId itself. This ensures that the sampling is
-  // consistent across all steps in the same workflow instance.
-  const sampleRand = parseInt(traceId.slice(-4), 16) / 0xffff;
-
+  const traceId = UUID_REGEX.test(instanceId) ? instanceId.replace(/-/g, "") : await deterministicTraceIdFromInstanceId(instanceId);
+  const sampleRand = parseInt(traceId.slice(-4), 16) / 65535;
   return {
     traceId,
-    sampleRand,
+    sampleRand
   };
 }
-
-class WrappedWorkflowStep  {
-   constructor(
-     _instanceId,
-     _options,
-     _step,
-     _waitUntil,
-  ) {this._instanceId = _instanceId;this._options = _options;this._step = _step;this._waitUntil = _waitUntil;}
-
-   async do(
-    name,
-    configOrCallback,
-    maybeCallback,
-  ) {
-    // Capture the current scope, so parent span (e.g., a startSpan surrounding step.do) is preserved
+class WrappedWorkflowStep {
+  constructor(_instanceId, _options, _step, _waitUntil) {
+    this._instanceId = _instanceId;
+    this._options = _options;
+    this._step = _step;
+    this._waitUntil = _waitUntil;
+  }
+  async do(name, configOrCallback, maybeCallback) {
     const scopeForStep = core.getCurrentScope();
-
-    const userCallback = (maybeCallback || configOrCallback) ;
-    const config = typeof configOrCallback === 'function' ? undefined : configOrCallback;
-
+    const userCallback = maybeCallback || configOrCallback;
+    const config = typeof configOrCallback === "function" ? void 0 : configOrCallback;
     const instrumentedCallback = async (...args) => {
       return core.startSpan(
         {
-          op: 'function.step.do',
+          op: "function.step.do",
           name,
           scope: scopeForStep,
           attributes: {
-            'cloudflare.workflow.timeout': config?.timeout,
-            'cloudflare.workflow.retries.backoff': config?.retries?.backoff,
-            'cloudflare.workflow.retries.delay': config?.retries?.delay,
-            'cloudflare.workflow.retries.limit': config?.retries?.limit,
-            [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.workflow',
-            [core.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
-          },
+            "cloudflare.workflow.timeout": config?.timeout,
+            "cloudflare.workflow.retries.backoff": config?.retries?.backoff,
+            "cloudflare.workflow.retries.delay": config?.retries?.delay,
+            "cloudflare.workflow.retries.limit": config?.retries?.limit,
+            [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.faas.cloudflare.workflow",
+            [core.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: "task"
+          }
         },
-        async span => {
+        async (span) => {
           try {
             const result = await userCallback(...args);
             span.setStatus({ code: 1 });
             return result;
           } catch (error) {
-            core.captureException(error, { mechanism: { handled: true, type: 'auto.faas.cloudflare.workflow' } });
+            core.captureException(error, { mechanism: { handled: true, type: "auto.faas.cloudflare.workflow" } });
             throw error;
           } finally {
-            this._waitUntil(core.flush(2000));
+            this._waitUntil(core.flush(2e3));
           }
-        },
+        }
       );
     };
-
     return config ? this._step.do(name, config, instrumentedCallback) : this._step.do(name, instrumentedCallback);
   }
-
-   async sleep(name, duration) {
+  async sleep(name, duration) {
     return this._step.sleep(name, duration);
   }
-
-   async sleepUntil(name, timestamp) {
+  async sleepUntil(name, timestamp) {
     return this._step.sleepUntil(name, timestamp);
   }
-
-   async waitForEvent(
-    name,
-    options,
-  ) {
+  async waitForEvent(name, options) {
     return this._step.waitForEvent(name, options);
   }
 }
-
-/**
- * Instruments a Cloudflare Workflow class with Sentry.
- *
- * @example
- * ```typescript
- * const InstrumentedWorkflow = instrumentWorkflowWithSentry(
- *   (env) => ({ dsn: env.SENTRY_DSN }),
- *   MyWorkflowClass
- * );
- *
- * export default InstrumentedWorkflow;
- * ```
- *
- * @param optionsCallback - Function that returns Sentry options to initialize Sentry
- * @param WorkflowClass - The workflow class to instrument
- * @returns Instrumented workflow class with the same interface
- */
-function instrumentWorkflowWithSentry
-
-(optionsCallback, WorkFlowClass) {
+function instrumentWorkflowWithSentry(optionsCallback, WorkFlowClass) {
   return new Proxy(WorkFlowClass, {
     construct(target, args, newTarget) {
       const [ctx, env] = args;
       const context = instrumentContext.instrumentContext(ctx);
       const options = optionsCallback(env);
       args[0] = context;
-      args[1] = instrumentEnv.instrumentEnv(env , options) ;
-      const instance = Reflect.construct(target, args, newTarget) ;
+      args[1] = instrumentEnv.instrumentEnv(env, options);
+      const instance = Reflect.construct(target, args, newTarget);
       return new Proxy(instance, {
         get(obj, prop, receiver) {
-          if (prop === 'run') {
-            return async function (event, step) {
+          if (prop === "run") {
+            return async function(event, step) {
               async.setAsyncLocalStorageAsyncContextStrategy();
-
-              return core.withIsolationScope(async isolationScope => {
+              return core.withIsolationScope(async (isolationScope) => {
                 const waitUntil = context.waitUntil.bind(context);
                 const client = sdk.init({ ...options, ctx: context, enableDedupe: false });
                 isolationScope.setClient(client);
-
                 scopeUtils.addCloudResourceContext(isolationScope);
-
-                return core.withScope(async scope => {
+                return core.withScope(async (scope) => {
                   const propagationContext = await propagationContextFromInstanceId(event.instanceId);
                   scope.setPropagationContext(propagationContext);
-
                   try {
                     return await obj.run.call(
                       obj,
                       event,
-                      new WrappedWorkflowStep(event.instanceId, options, step, waitUntil),
+                      new WrappedWorkflowStep(event.instanceId, options, step, waitUntil)
                     );
                   } finally {
                     waitUntil(flush.flushAndDispose(client));
@@ -169,9 +109,9 @@ function instrumentWorkflowWithSentry
             };
           }
           return Reflect.get(obj, prop, receiver);
-        },
+        }
       });
-    },
+    }
   });
 }
 

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 { instrumentEnv } from './instrumentations/worker/instrumentEnv';\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 _options: CloudflareOptions,\n    private _step: WorkflowStep,\n    private _waitUntil: ExecutionContext['waitUntil'],\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._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      const options = optionsCallback(env);\n      args[0] = context;\n      args[1] = instrumentEnv(env as Record<string, unknown>, options) as E;\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 waitUntil = context.waitUntil.bind(context);\n                const client = init({ ...options, ctx: context, 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, options, step, waitUntil),\n                    );\n                  } finally {\n                    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","instrumentEnv","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 { instrumentEnv } from './instrumentations/worker/instrumentEnv';\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 _options: CloudflareOptions,\n    private _step: WorkflowStep,\n    private _waitUntil: ExecutionContext['waitUntil'],\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._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      const options = optionsCallback(env);\n      args[0] = context;\n      args[1] = instrumentEnv(env as Record<string, unknown>, options) as E;\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 waitUntil = context.waitUntil.bind(context);\n                const client = init({ ...options, ctx: context, 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, options, step, waitUntil),\n                    );\n                  } finally {\n                    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","instrumentEnv","setAsyncLocalStorageAsyncContextStrategy","withIsolationScope","init","addCloudResourceContext","withScope","flushAndDispose"],"mappings":"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"}