@sentry/cloudflare 10.65.0 → 10.67.0

package/build/esm/instrumentations/instrumentSqlStorage.js

@@ -1,4 +1,5 @@
-import { _INTERNAL_sanitizeSqlQuery, _INTERNAL_getSqlQuerySummary, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { _INTERNAL_sanitizeSqlQuery, _INTERNAL_getSqlQuerySummary, getClient, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { targetsCloudflareInternalTable } from '../utils/internalSqlQuery.js';
 
 function instrumentSqlStorage(sql) {
   return new Proxy(sql, {
@@ -11,6 +12,10 @@ function instrumentSqlStorage(sql) {
         const [query, ...bindings] = args;
         const sanitizedQuery = _INTERNAL_sanitizeSqlQuery(query);
         const querySummary = _INTERNAL_getSqlQuerySummary(sanitizedQuery);
+        const allowlist = getClient()?.getOptions()?.durableObjectSqlSpanAllowlist;
+        if (targetsCloudflareInternalTable(querySummary, allowlist)) {
+          return original.apply(target, args);
+        }
         return startSpan(
           {
             op: "db.query",

package/build/esm/instrumentations/instrumentSqlStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentSqlStorage.js","sources":["../../../src/instrumentations/instrumentSqlStorage.ts"],"sourcesContent":["import type { SqlStorage } from '@cloudflare/workers-types';\nimport {\n  _INTERNAL_getSqlQuerySummary,\n  _INTERNAL_sanitizeSqlQuery,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  startSpan,\n} from '@sentry/core';\n\n/**\n * Instruments the Durable Object SqlStorage `exec` method with Sentry spans.\n *\n * @param sql - The SqlStorage instance to instrument\n * @returns An instrumented SqlStorage instance\n */\nexport function instrumentSqlStorage(sql: SqlStorage): SqlStorage {\n  return new Proxy(sql, {\n    get(target, prop, _receiver) {\n      const original = Reflect.get(target, prop, target);\n\n      if (prop !== 'exec' || typeof original !== 'function') {\n        return original;\n      }\n\n      return function (this: unknown, ...args: unknown[]) {\n        const [query, ...bindings] = args as [string, ...unknown[]];\n        const sanitizedQuery = _INTERNAL_sanitizeSqlQuery(query);\n        const querySummary = _INTERNAL_getSqlQuerySummary(sanitizedQuery);\n\n        return startSpan(\n          {\n            op: 'db.query',\n            name: querySummary || sanitizedQuery,\n            attributes: {\n              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.cloudflare.durable_object.sql',\n              'db.system.name': 'cloudflare-durable-object-sql',\n              'db.operation.name': 'exec',\n              'db.query.text': sanitizedQuery,\n              'db.query.summary': querySummary,\n              'cloudflare.durable_object.query.bindings': bindings.length,\n            },\n          },\n          () => (original as (...a: unknown[]) => ReturnType<SqlStorage['exec']>).apply(target, args),\n        );\n      };\n    },\n  });\n}\n"],"names":[],"mappings":";;AAcO,SAAS,qBAAqB,GAAA,EAA6B;AAChE,EAAA,OAAO,IAAI,MAAM,GAAA,EAAK;AAAA,IACpB,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAC3B,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,MAAM,CAAA;AAEjD,MAAA,IAAI,IAAA,KAAS,MAAA,IAAU,OAAO,QAAA,KAAa,UAAA,EAAY;AACrD,QAAA,OAAO,QAAA;AAAA,MACT;AAEA,MAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,QAAA,MAAM,CAAC,KAAA,EAAO,GAAG,QAAQ,CAAA,GAAI,IAAA;AAC7B,QAAA,MAAM,cAAA,GAAiB,2BAA2B,KAAK,CAAA;AACvD,QAAA,MAAM,YAAA,GAAe,6BAA6B,cAAc,CAAA;AAEhE,QAAA,OAAO,SAAA;AAAA,UACL;AAAA,YACE,EAAA,EAAI,UAAA;AAAA,YACJ,MAAM,YAAA,IAAgB,cAAA;AAAA,YACtB,UAAA,EAAY;AAAA,cACV,CAAC,gCAAgC,GAAG,uCAAA;AAAA,cACpC,gBAAA,EAAkB,+BAAA;AAAA,cAClB,mBAAA,EAAqB,MAAA;AAAA,cACrB,eAAA,EAAiB,cAAA;AAAA,cACjB,kBAAA,EAAoB,YAAA;AAAA,cACpB,4CAA4C,QAAA,CAAS;AAAA;AACvD,WACF;AAAA,UACA,MAAO,QAAA,CAAiE,KAAA,CAAM,MAAA,EAAQ,IAAI;AAAA,SAC5F;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;"}
+{"version":3,"file":"instrumentSqlStorage.js","sources":["../../../src/instrumentations/instrumentSqlStorage.ts"],"sourcesContent":["import type { SqlStorage } from '@cloudflare/workers-types';\nimport {\n  _INTERNAL_getSqlQuerySummary,\n  _INTERNAL_sanitizeSqlQuery,\n  getClient,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  startSpan,\n} from '@sentry/core';\nimport type { CloudflareClientOptions } from '../client';\nimport { targetsCloudflareInternalTable } from '../utils/internalSqlQuery';\n\n/**\n * Instruments the Durable Object SqlStorage `exec` method with Sentry spans.\n *\n * @param sql - The SqlStorage instance to instrument\n * @returns An instrumented SqlStorage instance\n */\nexport function instrumentSqlStorage(sql: SqlStorage): SqlStorage {\n  return new Proxy(sql, {\n    get(target, prop, _receiver) {\n      const original = Reflect.get(target, prop, target);\n\n      if (prop !== 'exec' || typeof original !== 'function') {\n        return original;\n      }\n\n      return function (this: unknown, ...args: unknown[]) {\n        const [query, ...bindings] = args as [string, ...unknown[]];\n\n        const sanitizedQuery = _INTERNAL_sanitizeSqlQuery(query);\n        const querySummary = _INTERNAL_getSqlQuerySummary(sanitizedQuery);\n\n        const allowlist = (getClient()?.getOptions() as CloudflareClientOptions | undefined)\n          ?.durableObjectSqlSpanAllowlist;\n\n        if (targetsCloudflareInternalTable(querySummary, allowlist)) {\n          return (original as (...a: unknown[]) => ReturnType<SqlStorage['exec']>).apply(target, args);\n        }\n\n        return startSpan(\n          {\n            op: 'db.query',\n            name: querySummary || sanitizedQuery,\n            attributes: {\n              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.cloudflare.durable_object.sql',\n              'db.system.name': 'cloudflare-durable-object-sql',\n              'db.operation.name': 'exec',\n              'db.query.text': sanitizedQuery,\n              'db.query.summary': querySummary,\n              'cloudflare.durable_object.query.bindings': bindings.length,\n            },\n          },\n          () => (original as (...a: unknown[]) => ReturnType<SqlStorage['exec']>).apply(target, args),\n        );\n      };\n    },\n  });\n}\n"],"names":[],"mappings":";;;AAiBO,SAAS,qBAAqB,GAAA,EAA6B;AAChE,EAAA,OAAO,IAAI,MAAM,GAAA,EAAK;AAAA,IACpB,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAC3B,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,MAAM,CAAA;AAEjD,MAAA,IAAI,IAAA,KAAS,MAAA,IAAU,OAAO,QAAA,KAAa,UAAA,EAAY;AACrD,QAAA,OAAO,QAAA;AAAA,MACT;AAEA,MAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,QAAA,MAAM,CAAC,KAAA,EAAO,GAAG,QAAQ,CAAA,GAAI,IAAA;AAE7B,QAAA,MAAM,cAAA,GAAiB,2BAA2B,KAAK,CAAA;AACvD,QAAA,MAAM,YAAA,GAAe,6BAA6B,cAAc,CAAA;AAEhE,QAAA,MAAM,SAAA,GAAa,SAAA,EAAU,EAAG,UAAA,EAAW,EACvC,6BAAA;AAEJ,QAAA,IAAI,8BAAA,CAA+B,YAAA,EAAc,SAAS,CAAA,EAAG;AAC3D,UAAA,OAAQ,QAAA,CAAiE,KAAA,CAAM,MAAA,EAAQ,IAAI,CAAA;AAAA,QAC7F;AAEA,QAAA,OAAO,SAAA;AAAA,UACL;AAAA,YACE,EAAA,EAAI,UAAA;AAAA,YACJ,MAAM,YAAA,IAAgB,cAAA;AAAA,YACtB,UAAA,EAAY;AAAA,cACV,CAAC,gCAAgC,GAAG,uCAAA;AAAA,cACpC,gBAAA,EAAkB,+BAAA;AAAA,cAClB,mBAAA,EAAqB,MAAA;AAAA,cACrB,eAAA,EAAiB,cAAA;AAAA,cACjB,kBAAA,EAAoB,YAAA;AAAA,cACpB,4CAA4C,QAAA,CAAS;AAAA;AACvD,WACF;AAAA,UACA,MAAO,QAAA,CAAiE,KAAA,CAAM,MAAA,EAAQ,IAAI;AAAA,SAC5F;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;"}

package/build/esm/instrumentations/instrumentWorkerEntrypoint.js

@@ -1,12 +1,75 @@
 import { setAsyncLocalStorageAsyncContextStrategy } from '../async.js';
+import { getFinalOptions } from '../options.js';
+import { instrumentContext } from '../utils/instrumentContext.js';
+import { extractRpcMeta } from '../utils/rpcMeta.js';
+import { wrapMethodWithSentry } from '../wrapMethodWithSentry.js';
+import { instrumentEnv } from './worker/instrumentEnv.js';
 import { instrumentWorkerEntrypointFetch } from './worker/instrumentFetch.js';
 import { instrumentWorkerEntrypointQueue } from './worker/instrumentQueue.js';
 import { instrumentWorkerEntrypointScheduled } from './worker/instrumentScheduled.js';
 import { instrumentWorkerEntrypointTail } from './worker/instrumentTail.js';
-import { getFinalOptions } from '../options.js';
-import { instrumentContext } from '../utils/instrumentContext.js';
-import { instrumentEnv } from './worker/instrumentEnv.js';
 
+const WORKER_ENTRYPOINT_ORIGIN = "auto.faas.cloudflare.worker_entrypoint";
+const RESERVED_METHODS = /* @__PURE__ */ new Set([
+  "connect",
+  "constructor",
+  "dup",
+  "email",
+  "fetch",
+  "queue",
+  "scheduled",
+  "tail",
+  "tailStream",
+  "test",
+  "trace"
+]);
+function isPrototypeMethod(instance, prop, method) {
+  let prototype = Object.getPrototypeOf(instance);
+  while (prototype && prototype !== Object.prototype) {
+    const descriptor = Object.getOwnPropertyDescriptor(prototype, prop);
+    if (descriptor) {
+      return descriptor.value === method;
+    }
+    prototype = Object.getPrototypeOf(prototype);
+  }
+  return false;
+}
+function bindToInstance(instance, proxy, method) {
+  return new Proxy(method, {
+    apply(target, thisArg, args) {
+      return Reflect.apply(target, thisArg === proxy ? instance : thisArg, args);
+    }
+  });
+}
+function instrumentMethod(instance, proxy, prop, method, options, context) {
+  const ownDescriptor = Object.getOwnPropertyDescriptor(instance, prop);
+  if (ownDescriptor && "value" in ownDescriptor && !ownDescriptor.configurable && !ownDescriptor.writable) {
+    return method;
+  }
+  const boundMethod = bindToInstance(instance, proxy, method);
+  if (typeof prop !== "string" || RESERVED_METHODS.has(prop) || !isPrototypeMethod(instance, prop, method)) {
+    return boundMethod;
+  }
+  const captureMethod = wrapMethodWithSentry(
+    { options, context, spanOp: "rpc", origin: WORKER_ENTRYPOINT_ORIGIN },
+    boundMethod,
+    void 0,
+    true
+  );
+  if (!options.enableRpcTracePropagation) {
+    return captureMethod;
+  }
+  const tracedMethod = wrapMethodWithSentry(
+    { options, context, spanName: prop, spanOp: "rpc", origin: WORKER_ENTRYPOINT_ORIGIN },
+    boundMethod,
+    void 0,
+    true
+  );
+  return (...args) => {
+    const { rpcMeta } = extractRpcMeta(args);
+    return rpcMeta ? tracedMethod.call(proxy, ...args) : captureMethod.call(proxy, ...args);
+  };
+}
 function instrumentWorkerEntrypoint(optionsCallback, WorkerEntrypointClass) {
   setAsyncLocalStorageAsyncContextStrategy();
   return new Proxy(WorkerEntrypointClass, {
@@ -43,11 +106,29 @@ function instrumentWorkerEntrypoint(optionsCallback, WorkerEntrypointClass) {
         writable: false,
         configurable: false
       });
-      instrumentWorkerEntrypointFetch(obj, options, context);
-      instrumentWorkerEntrypointScheduled(obj, options, context);
-      instrumentWorkerEntrypointQueue(obj, options, context);
-      instrumentWorkerEntrypointTail(obj, options, context);
-      return obj;
+      const entrypoint = obj;
+      instrumentWorkerEntrypointFetch(entrypoint, options, context);
+      instrumentWorkerEntrypointScheduled(entrypoint, options, context);
+      instrumentWorkerEntrypointQueue(entrypoint, options, context);
+      instrumentWorkerEntrypointTail(entrypoint, options, context);
+      const methodCache = /* @__PURE__ */ new Map();
+      const proxy = new Proxy(obj, {
+        get(instance, prop) {
+          const value = Reflect.get(instance, prop, instance);
+          if (typeof value !== "function") {
+            return value;
+          }
+          const method = value;
+          const cached = methodCache.get(prop);
+          if (cached?.source === method) {
+            return cached.wrapped;
+          }
+          const wrapped = instrumentMethod(instance, proxy, prop, method, options, context);
+          methodCache.set(prop, { source: method, wrapped });
+          return wrapped;
+        }
+      });
+      return proxy;
     }
   });
 }

package/build/esm/instrumentations/instrumentWorkerEntrypoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentWorkerEntrypoint.js","sources":["../../../src/instrumentations/instrumentWorkerEntrypoint.ts"],"sourcesContent":["import { setAsyncLocalStorageAsyncContextStrategy } from '../async';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport type { CloudflareOptions } from '../client';\nimport { instrumentWorkerEntrypointFetch } from './worker/instrumentFetch';\nimport { instrumentWorkerEntrypointQueue } from './worker/instrumentQueue';\nimport { instrumentWorkerEntrypointScheduled } from './worker/instrumentScheduled';\nimport { instrumentWorkerEntrypointTail } from './worker/instrumentTail';\nimport { getFinalOptions } from '../options';\nimport { instrumentContext } from '../utils/instrumentContext';\nimport { instrumentEnv } from './worker/instrumentEnv';\n\nexport type WorkerEntrypointConstructor<Env = typeof cloudflareEnv, Props = {}> = new (\n  ctx: ExecutionContext,\n  env: typeof cloudflareEnv,\n) => InstanceType<typeof WorkerEntrypoint<Env, Props>>;\n\n/**\n * Instruments a WorkerEntrypoint class to capture errors and performance data.\n *\n * Instruments the following methods (same as `withSentry` for ExportedHandler):\n * - fetch (HTTP requests)\n * - scheduled (cron triggers)\n * - queue (queue consumers)\n * - email (email handlers)\n * - tail (tail workers)\n *\n * as well as any other public RPC methods on the WorkerEntrypoint instance.\n *\n * @param optionsCallback Function that returns the options for the SDK initialization.\n * @param WorkerEntrypointClass The WorkerEntrypoint class to instrument.\n * @returns The instrumented WorkerEntrypoint class.\n *\n * @example\n * ```ts\n * class MyWorkerBase extends WorkerEntrypoint<Env> {\n *   async fetch(request: Request): Promise<Response> {\n *     return new Response('Hello World!');\n *   }\n *\n *   async myRpcMethod(arg: string): Promise<string> {\n *     return `Hello ${arg}!`;\n *   }\n * }\n *\n * export default instrumentWorkerEntrypoint(\n *   env => ({\n *     dsn: env.SENTRY_DSN,\n *     tracesSampleRate: 1.0,\n *   }),\n *   MyWorkerBase,\n * );\n * ```\n */\nexport function instrumentWorkerEntrypoint<T extends WorkerEntrypointConstructor>(\n  optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n  WorkerEntrypointClass: T,\n): T {\n  // Set up AsyncLocalStorage strategy ONCE at instrumentation time, not per-request\n  // This is critical - calling this per-request would create a new AsyncLocalStorage\n  // each time, breaking scope isolation for concurrent requests\n  setAsyncLocalStorageAsyncContextStrategy();\n\n  return new Proxy(WorkerEntrypointClass, {\n    construct(target, [ctx, env]) {\n      const context = instrumentContext(ctx);\n      const options = getFinalOptions(optionsCallback(env), env);\n      const instrumentedEnv = instrumentEnv(env, options);\n      const obj = new target(context, instrumentedEnv);\n\n      // Override this.ctx to ensure the instrumented context is used\n      // This is necessary because the base WorkerEntrypoint class sets this.ctx\n      // from the constructor parameter, but we want users accessing this.ctx\n      // to get the instrumented version\n      if ('ctx' in obj) {\n        Object.defineProperty(obj, 'ctx', {\n          value: context,\n          writable: true,\n          enumerable: true,\n          configurable: true,\n        });\n      }\n\n      if ('env' in obj) {\n        Object.defineProperty(obj, 'env', {\n          value: instrumentedEnv,\n          writable: true,\n          enumerable: true,\n          configurable: true,\n        });\n      }\n\n      Object.defineProperty(obj, '__SENTRY_CONTEXT__', {\n        value: context,\n        enumerable: false,\n        writable: false,\n        configurable: false,\n      });\n\n      Object.defineProperty(obj, '__SENTRY_OPTIONS__', {\n        value: options,\n        enumerable: false,\n        writable: false,\n        configurable: false,\n      });\n\n      instrumentWorkerEntrypointFetch(obj, options, context);\n      instrumentWorkerEntrypointScheduled(obj, options, context);\n      instrumentWorkerEntrypointQueue(obj, options, context);\n      instrumentWorkerEntrypointTail(obj, options, context);\n\n      return obj;\n    },\n  });\n}\n"],"names":[],"mappings":";;;;;;;;;AAqDO,SAAS,0BAAA,CACd,iBACA,qBAAA,EACG;AAIH,EAAA,wCAAA,EAAyC;AAEzC,EAAA,OAAO,IAAI,MAAM,qBAAA,EAAuB;AAAA,IACtC,SAAA,CAAU,MAAA,EAAQ,CAAC,GAAA,EAAK,GAAG,CAAA,EAAG;AAC5B,MAAA,MAAM,OAAA,GAAU,kBAAkB,GAAG,CAAA;AACrC,MAAA,MAAM,OAAA,GAAU,eAAA,CAAgB,eAAA,CAAgB,GAAG,GAAG,GAAG,CAAA;AACzD,MAAA,MAAM,eAAA,GAAkB,aAAA,CAAc,GAAA,EAAK,OAAO,CAAA;AAClD,MAAA,MAAM,GAAA,GAAM,IAAI,MAAA,CAAO,OAAA,EAAS,eAAe,CAAA;AAM/C,MAAA,IAAI,SAAS,GAAA,EAAK;AAChB,QAAA,MAAA,CAAO,cAAA,CAAe,KAAK,KAAA,EAAO;AAAA,UAChC,KAAA,EAAO,OAAA;AAAA,UACP,QAAA,EAAU,IAAA;AAAA,UACV,UAAA,EAAY,IAAA;AAAA,UACZ,YAAA,EAAc;AAAA,SACf,CAAA;AAAA,MACH;AAEA,MAAA,IAAI,SAAS,GAAA,EAAK;AAChB,QAAA,MAAA,CAAO,cAAA,CAAe,KAAK,KAAA,EAAO;AAAA,UAChC,KAAA,EAAO,eAAA;AAAA,UACP,QAAA,EAAU,IAAA;AAAA,UACV,UAAA,EAAY,IAAA;AAAA,UACZ,YAAA,EAAc;AAAA,SACf,CAAA;AAAA,MACH;AAEA,MAAA,MAAA,CAAO,cAAA,CAAe,KAAK,oBAAA,EAAsB;AAAA,QAC/C,KAAA,EAAO,OAAA;AAAA,QACP,UAAA,EAAY,KAAA;AAAA,QACZ,QAAA,EAAU,KAAA;AAAA,QACV,YAAA,EAAc;AAAA,OACf,CAAA;AAED,MAAA,MAAA,CAAO,cAAA,CAAe,KAAK,oBAAA,EAAsB;AAAA,QAC/C,KAAA,EAAO,OAAA;AAAA,QACP,UAAA,EAAY,KAAA;AAAA,QACZ,QAAA,EAAU,KAAA;AAAA,QACV,YAAA,EAAc;AAAA,OACf,CAAA;AAED,MAAA,+BAAA,CAAgC,GAAA,EAAK,SAAS,OAAO,CAAA;AACrD,MAAA,mCAAA,CAAoC,GAAA,EAAK,SAAS,OAAO,CAAA;AACzD,MAAA,+BAAA,CAAgC,GAAA,EAAK,SAAS,OAAO,CAAA;AACrD,MAAA,8BAAA,CAA+B,GAAA,EAAK,SAAS,OAAO,CAAA;AAEpD,MAAA,OAAO,GAAA;AAAA,IACT;AAAA,GACD,CAAA;AACH;;;;"}
+{"version":3,"file":"instrumentWorkerEntrypoint.js","sources":["../../../src/instrumentations/instrumentWorkerEntrypoint.ts"],"sourcesContent":["import type { RpcStub, WorkerEntrypoint } from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from '../async';\nimport type { CloudflareOptions } from '../client';\nimport { getFinalOptions } from '../options';\nimport { instrumentContext } from '../utils/instrumentContext';\nimport { extractRpcMeta } from '../utils/rpcMeta';\nimport { type UncheckedMethod, wrapMethodWithSentry } from '../wrapMethodWithSentry';\nimport { instrumentEnv } from './worker/instrumentEnv';\nimport { instrumentWorkerEntrypointFetch } from './worker/instrumentFetch';\nimport { instrumentWorkerEntrypointQueue } from './worker/instrumentQueue';\nimport { instrumentWorkerEntrypointScheduled } from './worker/instrumentScheduled';\nimport { instrumentWorkerEntrypointTail } from './worker/instrumentTail';\n\nconst WORKER_ENTRYPOINT_ORIGIN = 'auto.faas.cloudflare.worker_entrypoint';\n\ntype ReservedMethod =\n  | Exclude<Extract<keyof WorkerEntrypoint, string>, '__WORKER_ENTRYPOINT_BRAND'>\n  | Extract<keyof ExportedHandler, string>\n  | Exclude<Extract<keyof RpcStub<(...args: unknown[]) => unknown>, string>, '__RPC_STUB_BRAND'>\n  | 'constructor';\n\nconst RESERVED_METHODS = new Set<string>([\n  'connect',\n  'constructor',\n  'dup',\n  'email',\n  'fetch',\n  'queue',\n  'scheduled',\n  'tail',\n  'tailStream',\n  'test',\n  'trace',\n] satisfies ReservedMethod[]);\n\ninterface CachedMethod {\n  source: UncheckedMethod;\n  wrapped: UncheckedMethod;\n}\n\nexport type WorkerEntrypointConstructor<Env = unknown, Props = {}> = new (\n  ctx: ExecutionContext,\n  // WorkerEntrypoint subclasses can define different `env` shapes, so this constructor must accept all of them.\n  // oxlint-disable-next-line typescript/no-explicit-any\n  env: any,\n) => InstanceType<typeof WorkerEntrypoint<Env, Props>>;\n\nfunction isPrototypeMethod(instance: object, prop: string, method: UncheckedMethod): boolean {\n  let prototype = Object.getPrototypeOf(instance);\n\n  while (prototype && prototype !== Object.prototype) {\n    const descriptor = Object.getOwnPropertyDescriptor(prototype, prop);\n    if (descriptor) {\n      return descriptor.value === method;\n    }\n    prototype = Object.getPrototypeOf(prototype);\n  }\n\n  return false;\n}\n\nfunction bindToInstance(instance: object, proxy: object, method: UncheckedMethod): UncheckedMethod {\n  return new Proxy(method, {\n    apply(target, thisArg, args) {\n      return Reflect.apply(target, thisArg === proxy ? instance : thisArg, args);\n    },\n  });\n}\n\nfunction instrumentMethod(\n  instance: object,\n  proxy: object,\n  prop: PropertyKey,\n  method: UncheckedMethod,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n): UncheckedMethod {\n  const ownDescriptor = Object.getOwnPropertyDescriptor(instance, prop);\n  if (ownDescriptor && 'value' in ownDescriptor && !ownDescriptor.configurable && !ownDescriptor.writable) {\n    return method;\n  }\n\n  const boundMethod = bindToInstance(instance, proxy, method);\n\n  if (typeof prop !== 'string' || RESERVED_METHODS.has(prop) || !isPrototypeMethod(instance, prop, method)) {\n    return boundMethod;\n  }\n\n  const captureMethod = wrapMethodWithSentry(\n    { options, context, spanOp: 'rpc', origin: WORKER_ENTRYPOINT_ORIGIN },\n    boundMethod,\n    undefined,\n    true,\n  );\n\n  if (!options.enableRpcTracePropagation) {\n    return captureMethod;\n  }\n\n  const tracedMethod = wrapMethodWithSentry(\n    { options, context, spanName: prop, spanOp: 'rpc', origin: WORKER_ENTRYPOINT_ORIGIN },\n    boundMethod,\n    undefined,\n    true,\n  );\n\n  return (...args: unknown[]) => {\n    const { rpcMeta } = extractRpcMeta(args);\n    return rpcMeta ? tracedMethod.call(proxy, ...args) : captureMethod.call(proxy, ...args);\n  };\n}\n\n/**\n * Instruments a WorkerEntrypoint class to capture errors and performance data.\n *\n * Instruments the following methods (same as `withSentry` for ExportedHandler):\n * - fetch (HTTP requests)\n * - scheduled (cron triggers)\n * - queue (queue consumers)\n * - email (email handlers)\n * - tail (tail workers)\n *\n * as well as any other public RPC methods on the WorkerEntrypoint instance.\n *\n * @param optionsCallback Function that returns the options for the SDK initialization.\n * @param WorkerEntrypointClass The WorkerEntrypoint class to instrument.\n * @returns The instrumented WorkerEntrypoint class.\n *\n * @example\n * ```ts\n * class MyWorkerBase extends WorkerEntrypoint<Env> {\n *   async fetch(request: Request): Promise<Response> {\n *     return new Response('Hello World!');\n *   }\n *\n *   async myRpcMethod(arg: string): Promise<string> {\n *     return `Hello ${arg}!`;\n *   }\n * }\n *\n * export default instrumentWorkerEntrypoint(\n *   env => ({\n *     dsn: env.SENTRY_DSN,\n *     tracesSampleRate: 1.0,\n *   }),\n *   MyWorkerBase,\n * );\n * ```\n */\nexport function instrumentWorkerEntrypoint<\n  Env,\n  Props,\n  T extends InstanceType<typeof WorkerEntrypoint<Env, Props>>,\n  C extends new (ctx: ExecutionContext, env: Env) => T,\n>(optionsCallback: (env: Env) => CloudflareOptions | undefined, WorkerEntrypointClass: C): C {\n  // Set up AsyncLocalStorage strategy ONCE at instrumentation time, not per-request\n  // This is critical - calling this per-request would create a new AsyncLocalStorage\n  // each time, breaking scope isolation for concurrent requests\n  setAsyncLocalStorageAsyncContextStrategy();\n\n  return new Proxy(WorkerEntrypointClass, {\n    construct(target, [ctx, env]) {\n      const context = instrumentContext(ctx);\n      const options = getFinalOptions(optionsCallback(env), env);\n      const instrumentedEnv = instrumentEnv(env, options);\n      const obj = new target(context, instrumentedEnv);\n\n      // Override this.ctx to ensure the instrumented context is used\n      // This is necessary because the base WorkerEntrypoint class sets this.ctx\n      // from the constructor parameter, but we want users accessing this.ctx\n      // to get the instrumented version\n      if ('ctx' in obj) {\n        Object.defineProperty(obj, 'ctx', {\n          value: context,\n          writable: true,\n          enumerable: true,\n          configurable: true,\n        });\n      }\n\n      if ('env' in obj) {\n        Object.defineProperty(obj, 'env', {\n          value: instrumentedEnv,\n          writable: true,\n          enumerable: true,\n          configurable: true,\n        });\n      }\n\n      Object.defineProperty(obj, '__SENTRY_CONTEXT__', {\n        value: context,\n        enumerable: false,\n        writable: false,\n        configurable: false,\n      });\n\n      Object.defineProperty(obj, '__SENTRY_OPTIONS__', {\n        value: options,\n        enumerable: false,\n        writable: false,\n        configurable: false,\n      });\n\n      const entrypoint = obj as WorkerEntrypoint;\n      instrumentWorkerEntrypointFetch(entrypoint, options, context);\n      instrumentWorkerEntrypointScheduled(entrypoint, options, context);\n      instrumentWorkerEntrypointQueue(entrypoint, options, context);\n      instrumentWorkerEntrypointTail(entrypoint, options, context);\n\n      // workerd resolves RPC methods through property access.\n      const methodCache = new Map<PropertyKey, CachedMethod>();\n\n      const proxy: typeof obj = new Proxy(obj, {\n        get(instance, prop) {\n          const value = Reflect.get(instance, prop, instance);\n\n          if (typeof value !== 'function') {\n            return value;\n          }\n\n          const method = value as UncheckedMethod;\n\n          const cached = methodCache.get(prop);\n          if (cached?.source === method) {\n            return cached.wrapped;\n          }\n\n          const wrapped = instrumentMethod(instance, proxy, prop, method, options, context);\n          methodCache.set(prop, { source: method, wrapped });\n          return wrapped;\n        },\n      });\n\n      return proxy;\n    },\n  });\n}\n"],"names":[],"mappings":"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"}

package/build/esm/instrumentations/worker/instrumentEnv.js

@@ -1,5 +1,5 @@
-import { isObjectLike } from '@sentry/core';
-import { isD1Database, isQueue, isR2Bucket, isDurableObjectNamespace, isJSRPC } from '../../utils/isBinding.js';
+import { instrumentWorkersAiClient, isObjectLike } from '@sentry/core';
+import { isD1Database, isQueue, isR2Bucket, isRateLimit, isAiBinding, isDurableObjectNamespace, isJSRPC } from '../../utils/isBinding.js';
 import { instrumentD1 } from './instrumentD1.js';
 import { appendRpcMeta } from '../../utils/rpcMeta.js';
 import { getEffectiveRpcPropagation } from '../../utils/rpcOptions.js';
@@ -7,6 +7,7 @@ import { instrumentDurableObjectNamespace, STUB_NON_RPC_METHODS } from '../instr
 import { instrumentFetcher } from './instrumentFetcher.js';
 import { instrumentQueueProducer } from './instrumentQueueProducer.js';
 import { instrumentR2Bucket } from './instrumentR2.js';
+import { instrumentRateLimit } from './instrumentRateLimit.js';
 
 function isProxyable(item) {
   return isObjectLike(item) || typeof item === "function";
@@ -44,6 +45,17 @@ function instrumentEnv(env, options) {
         instrumentedBindings.set(item, instrumented);
         return instrumented;
       }
+      if (isRateLimit(item)) {
+        const bindingName = typeof prop === "string" ? prop : String(prop);
+        const instrumented = instrumentRateLimit(item, bindingName);
+        instrumentedBindings.set(item, instrumented);
+        return instrumented;
+      }
+      if (isAiBinding(item)) {
+        const instrumented = instrumentWorkersAiClient(item);
+        instrumentedBindings.set(item, instrumented);
+        return instrumented;
+      }
       if (!rpcPropagation) {
         return item;
       }

package/build/esm/instrumentations/worker/instrumentEnv.js.map

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

package/build/esm/instrumentations/worker/instrumentQueueProducer.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentQueueProducer.js","sources":["../../../../src/instrumentations/worker/instrumentQueueProducer.ts"],"sourcesContent":["import type { MessageSendRequest, Queue, QueueSendBatchOptions, QueueSendOptions } from '@cloudflare/workers-types';\nimport { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/core';\n\nconst ORIGIN = 'auto.faas.cloudflare.queue';\n\nfunction startPublishSpan<T>(\n  options: {\n    bindingName: string;\n    bodySize: number | undefined;\n    messageCount?: number;\n  },\n  callback: () => T,\n): T {\n  const { bindingName, bodySize, messageCount } = options;\n\n  return startSpan(\n    {\n      op: 'queue.publish',\n      name: `send ${bindingName}`,\n      attributes: {\n        'messaging.system': 'cloudflare',\n        'messaging.destination.name': bindingName,\n        'messaging.operation.type': 'send',\n        'messaging.operation.name': 'send',\n        ...(messageCount !== undefined && { 'messaging.batch.message_count': messageCount }),\n        'messaging.message.body.size': bodySize,\n        [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'queue.publish',\n        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,\n      },\n    },\n    callback,\n  );\n}\n\nfunction getBodySize(body: unknown): number | undefined {\n  if (body == null) {\n    return undefined;\n  }\n\n  if (typeof body === 'string') {\n    return new TextEncoder().encode(body).byteLength;\n  }\n\n  if (body instanceof ArrayBuffer) {\n    return body.byteLength;\n  }\n\n  if (ArrayBuffer.isView(body)) {\n    return body.byteLength;\n  }\n\n  try {\n    return new TextEncoder().encode(JSON.stringify(body)).byteLength;\n  } catch {\n    return undefined;\n  }\n}\n\n/**\n * Wraps a Queue producer binding to create `queue.publish` spans on\n * `send` and `sendBatch` calls.\n *\n * The queue's own name is not available on the binding object, so we use\n * the env binding key (e.g. `MY_QUEUE`) as `messaging.destination.name`.\n */\nexport function instrumentQueueProducer<T extends Queue>(queue: T, bindingName: string): T {\n  return new Proxy(queue, {\n    get(target, prop, receiver) {\n      if (prop === 'send') {\n        const original = Reflect.get(target, prop, receiver) as Queue['send'];\n\n        return function (this: unknown, message: unknown, options?: QueueSendOptions): Promise<void> {\n          return startPublishSpan({ bindingName, bodySize: getBodySize(message) }, () =>\n            Reflect.apply(original, target, [message, options]),\n          );\n        };\n      }\n\n      if (prop === 'sendBatch') {\n        const original = Reflect.get(target, prop, receiver) as Queue['sendBatch'];\n        return function (\n          this: unknown,\n          messages: Iterable<MessageSendRequest>,\n          options?: QueueSendBatchOptions,\n        ): Promise<void> {\n          const messageArray = Array.from(messages);\n          const totalBodySize = messageArray.reduce<number | undefined>((acc, m) => {\n            const size = getBodySize(m.body);\n            if (size === undefined) {\n              return acc;\n            }\n            return (acc ?? 0) + size;\n          }, undefined);\n\n          return startPublishSpan({ bindingName, bodySize: totalBodySize, messageCount: messageArray.length }, () =>\n            Reflect.apply(original, target, [messageArray, options]),\n          );\n        };\n      }\n\n      return Reflect.get(target, prop, receiver);\n    },\n  });\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"instrumentQueueProducer.js","sources":["../../../../src/instrumentations/worker/instrumentQueueProducer.ts"],"sourcesContent":["import type { MessageSendRequest, Queue, QueueSendBatchOptions, QueueSendOptions } from '@cloudflare/workers-types';\nimport { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/core';\n\nconst ORIGIN = 'auto.faas.cloudflare.queue';\n\nfunction startPublishSpan<T>(\n  options: {\n    bindingName: string;\n    bodySize: number | undefined;\n    messageCount?: number;\n  },\n  callback: () => T,\n): T {\n  const { bindingName, bodySize, messageCount } = options;\n\n  return startSpan(\n    {\n      op: 'queue.publish',\n      name: `send ${bindingName}`,\n      attributes: {\n        'messaging.system': 'cloudflare',\n        'messaging.destination.name': bindingName,\n        'messaging.operation.type': 'send',\n        'messaging.operation.name': 'send',\n        ...(messageCount !== undefined && { 'messaging.batch.message_count': messageCount }),\n        'messaging.message.body.size': bodySize,\n        [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'queue.publish',\n        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,\n      },\n    },\n    callback,\n  );\n}\n\nfunction getBodySize(body: unknown): number | undefined {\n  if (body == null) {\n    return undefined;\n  }\n\n  if (typeof body === 'string') {\n    return new TextEncoder().encode(body).byteLength;\n  }\n\n  if (body instanceof ArrayBuffer) {\n    return body.byteLength;\n  }\n\n  if (ArrayBuffer.isView(body)) {\n    return body.byteLength;\n  }\n\n  try {\n    return new TextEncoder().encode(JSON.stringify(body)).byteLength;\n  } catch {\n    return undefined;\n  }\n}\n\n/**\n * Wraps a Queue producer binding to create `queue.publish` spans on\n * `send` and `sendBatch` calls.\n *\n * The queue's own name is not available on the binding object, so we use\n * the env binding key (e.g. `MY_QUEUE`) as `messaging.destination.name`.\n */\nexport function instrumentQueueProducer<T extends Queue>(queue: T, bindingName: string): T {\n  return new Proxy(queue, {\n    get(target, prop, receiver) {\n      if (prop === 'send') {\n        const original = Reflect.get(target, prop, receiver) as Queue['send'];\n\n        return function (this: unknown, message: unknown, options?: QueueSendOptions): ReturnType<Queue['send']> {\n          return startPublishSpan({ bindingName, bodySize: getBodySize(message) }, () =>\n            Reflect.apply(original, target, [message, options]),\n          );\n        };\n      }\n\n      if (prop === 'sendBatch') {\n        const original = Reflect.get(target, prop, receiver) as Queue['sendBatch'];\n        return function (\n          this: unknown,\n          messages: Iterable<MessageSendRequest>,\n          options?: QueueSendBatchOptions,\n        ): ReturnType<Queue['sendBatch']> {\n          const messageArray = Array.from(messages);\n          const totalBodySize = messageArray.reduce<number | undefined>((acc, m) => {\n            const size = getBodySize(m.body);\n            if (size === undefined) {\n              return acc;\n            }\n            return (acc ?? 0) + size;\n          }, undefined);\n\n          return startPublishSpan({ bindingName, bodySize: totalBodySize, messageCount: messageArray.length }, () =>\n            Reflect.apply(original, target, [messageArray, options]),\n          );\n        };\n      }\n\n      return Reflect.get(target, prop, receiver);\n    },\n  });\n}\n"],"names":[],"mappings":"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"}

package/build/esm/instrumentations/worker/instrumentRateLimit.js

@@ -0,0 +1,27 @@
+import { startSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+
+const ORIGIN = "auto.faas.cloudflare.rate_limit";
+function instrumentRateLimit(rateLimit, bindingName) {
+  return new Proxy(rateLimit, {
+    get(target, prop, receiver) {
+      if (prop !== "limit") {
+        return Reflect.get(target, prop, receiver);
+      }
+      const original = Reflect.get(target, prop, receiver);
+      return function(options) {
+        return startSpan(
+          {
+            name: `rate_limit ${bindingName}`,
+            attributes: {
+              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN
+            }
+          },
+          () => Reflect.apply(original, target, [options])
+        );
+      };
+    }
+  });
+}
+
+export { instrumentRateLimit };
+//# sourceMappingURL=instrumentRateLimit.js.map

package/build/esm/instrumentations/worker/instrumentRateLimit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instrumentRateLimit.js","sources":["../../../../src/instrumentations/worker/instrumentRateLimit.ts"],"sourcesContent":["import type { RateLimit, RateLimitOptions, RateLimitOutcome } from '@cloudflare/workers-types';\nimport { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/core';\n\nconst ORIGIN = 'auto.faas.cloudflare.rate_limit';\n\n/**\n * Wraps a Cloudflare rate limiter binding to create a span on each `limit()` call.\n */\nexport function instrumentRateLimit<T extends RateLimit>(rateLimit: T, bindingName: string): T {\n  return new Proxy(rateLimit, {\n    get(target, prop, receiver) {\n      if (prop !== 'limit') {\n        return Reflect.get(target, prop, receiver);\n      }\n\n      const original = Reflect.get(target, prop, receiver) as RateLimit['limit'];\n\n      return function (this: unknown, options: RateLimitOptions): Promise<RateLimitOutcome> {\n        return startSpan(\n          {\n            name: `rate_limit ${bindingName}`,\n            attributes: {\n              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,\n            },\n          },\n          () => Reflect.apply(original, target, [options]),\n        );\n      };\n    },\n  });\n}\n"],"names":[],"mappings":";;AAGA,MAAM,MAAA,GAAS,iCAAA;AAKR,SAAS,mBAAA,CAAyC,WAAc,WAAA,EAAwB;AAC7F,EAAA,OAAO,IAAI,MAAM,SAAA,EAAW;AAAA,IAC1B,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,QAAA,EAAU;AAC1B,MAAA,IAAI,SAAS,OAAA,EAAS;AACpB,QAAA,OAAO,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,QAAQ,CAAA;AAAA,MAC3C;AAEA,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,QAAQ,CAAA;AAEnD,MAAA,OAAO,SAAyB,OAAA,EAAsD;AACpF,QAAA,OAAO,SAAA;AAAA,UACL;AAAA,YACE,IAAA,EAAM,cAAc,WAAW,CAAA,CAAA;AAAA,YAC/B,UAAA,EAAY;AAAA,cACV,CAAC,gCAAgC,GAAG;AAAA;AACtC,WACF;AAAA,UACA,MAAM,OAAA,CAAQ,KAAA,CAAM,UAAU,MAAA,EAAQ,CAAC,OAAO,CAAC;AAAA,SACjD;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;"}

package/build/esm/package.json

@@ -1 +1 @@
-{"type":"module","version":"10.65.0","sideEffects":false}
+{"type":"module","version":"10.67.0","sideEffects":false}

package/build/esm/pages-plugin.js

@@ -8,10 +8,8 @@ function sentryPagesPlugin(handlerOrOptions) {
       return context.next();
     }
     const options = typeof handlerOrOptions === "function" ? handlerOrOptions(context) : handlerOrOptions;
-    return wrapRequestHandler(
-      { options, request: context.request, context: { ...context, props: {} } },
-      () => context.next()
-    );
+    const executionContext = { ...context, props: {} };
+    return wrapRequestHandler({ options, request: context.request, context: executionContext }, () => context.next());
   };
 }
 

package/build/esm/pages-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"pages-plugin.js","sources":["../../src/pages-plugin.ts"],"sourcesContent":["import { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { wrapRequestHandler } from './request';\n\n/**\n * Plugin middleware for Cloudflare Pages.\n *\n * Initializes the SDK and wraps cloudflare pages requests with SDK instrumentation.\n *\n * @example Simple usage\n *\n * ```javascript\n * // functions/_middleware.js\n * import * as Sentry from '@sentry/cloudflare';\n *\n * export const onRequest = Sentry.sentryPagesPlugin({\n *   dsn: process.env.SENTRY_DSN,\n *   tracesSampleRate: 1.0,\n * });\n * ```\n *\n * @example Usage with handler function to access context for environmental variables\n *\n * ```javascript\n * import * as Sentry from '@sentry/cloudflare';\n *\n * const const onRequest = Sentry.sentryPagesPlugin((context) => ({\n *   dsn: context.env.SENTRY_DSN,\n *   tracesSampleRate: 1.0,\n * })\n * ```\n *\n * @param handlerOrOptions Configuration options or a function that returns configuration options.\n * @returns A plugin function that can be used in Cloudflare Pages.\n */\nexport function sentryPagesPlugin<\n  Env = unknown,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  Params extends string = any,\n  Data extends Record<string, unknown> = Record<string, unknown>,\n  // Although it is not ideal to use `any` here, it makes usage more flexible for different setups.\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  PluginParams = any,\n>(\n  handlerOrOptions:\n    | CloudflareOptions\n    | ((context: EventPluginContext<Env, Params, Data, PluginParams>) => CloudflareOptions),\n): PagesPluginFunction<Env, Params, Data, PluginParams> {\n  setAsyncLocalStorageAsyncContextStrategy();\n  return context => {\n    if (context.request.method === 'OPTIONS' || context.request.method === 'HEAD') {\n      return context.next();\n    }\n\n    const options = typeof handlerOrOptions === 'function' ? handlerOrOptions(context) : handlerOrOptions;\n    return wrapRequestHandler({ options, request: context.request, context: { ...context, props: {} } }, () =>\n      context.next(),\n    );\n  };\n}\n"],"names":[],"mappings":";;;AAmCO,SAAS,kBASd,gBAAA,EAGsD;AACtD,EAAA,wCAAA,EAAyC;AACzC,EAAA,OAAO,CAAA,OAAA,KAAW;AAChB,IAAA,IAAI,QAAQ,OAAA,CAAQ,MAAA,KAAW,aAAa,OAAA,CAAQ,OAAA,CAAQ,WAAW,MAAA,EAAQ;AAC7E,MAAA,OAAO,QAAQ,IAAA,EAAK;AAAA,IACtB;AAEA,IAAA,MAAM,UAAU,OAAO,gBAAA,KAAqB,UAAA,GAAa,gBAAA,CAAiB,OAAO,CAAA,GAAI,gBAAA;AACrF,IAAA,OAAO,kBAAA;AAAA,MAAmB,EAAE,OAAA,EAAS,OAAA,EAAS,OAAA,CAAQ,OAAA,EAAS,OAAA,EAAS,EAAE,GAAG,OAAA,EAAS,KAAA,EAAO,EAAC,EAAE,EAAE;AAAA,MAAG,MACnG,QAAQ,IAAA;AAAK,KACf;AAAA,EACF,CAAA;AACF;;;;"}
+{"version":3,"file":"pages-plugin.js","sources":["../../src/pages-plugin.ts"],"sourcesContent":["import { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport type { ExecutionContextCompat } from './executionContext';\nimport { wrapRequestHandler } from './request';\n\n/**\n * Plugin middleware for Cloudflare Pages.\n *\n * Initializes the SDK and wraps cloudflare pages requests with SDK instrumentation.\n *\n * @example Simple usage\n *\n * ```javascript\n * // functions/_middleware.js\n * import * as Sentry from '@sentry/cloudflare';\n *\n * export const onRequest = Sentry.sentryPagesPlugin({\n *   dsn: process.env.SENTRY_DSN,\n *   tracesSampleRate: 1.0,\n * });\n * ```\n *\n * @example Usage with handler function to access context for environmental variables\n *\n * ```javascript\n * import * as Sentry from '@sentry/cloudflare';\n *\n * const const onRequest = Sentry.sentryPagesPlugin((context) => ({\n *   dsn: context.env.SENTRY_DSN,\n *   tracesSampleRate: 1.0,\n * })\n * ```\n *\n * @param handlerOrOptions Configuration options or a function that returns configuration options.\n * @returns A plugin function that can be used in Cloudflare Pages.\n */\nexport function sentryPagesPlugin<\n  Env = unknown,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  Params extends string = any,\n  Data extends Record<string, unknown> = Record<string, unknown>,\n  // Although it is not ideal to use `any` here, it makes usage more flexible for different setups.\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  PluginParams = any,\n>(\n  handlerOrOptions:\n    | CloudflareOptions\n    | ((context: EventPluginContext<Env, Params, Data, PluginParams>) => CloudflareOptions),\n): PagesPluginFunction<Env, Params, Data, PluginParams> {\n  setAsyncLocalStorageAsyncContextStrategy();\n  return context => {\n    if (context.request.method === 'OPTIONS' || context.request.method === 'HEAD') {\n      return context.next();\n    }\n\n    const options = typeof handlerOrOptions === 'function' ? handlerOrOptions(context) : handlerOrOptions;\n    // A Pages `EventPluginContext` is not a Workers `ExecutionContext`, but `wrapRequestHandler` only\n    // uses `waitUntil` and a `'storage' in context` check, both of which this satisfies.\n    const executionContext = { ...context, props: {} } as unknown as ExecutionContextCompat;\n    return wrapRequestHandler({ options, request: context.request, context: executionContext }, () => context.next());\n  };\n}\n"],"names":[],"mappings":";;;AAoCO,SAAS,kBASd,gBAAA,EAGsD;AACtD,EAAA,wCAAA,EAAyC;AACzC,EAAA,OAAO,CAAA,OAAA,KAAW;AAChB,IAAA,IAAI,QAAQ,OAAA,CAAQ,MAAA,KAAW,aAAa,OAAA,CAAQ,OAAA,CAAQ,WAAW,MAAA,EAAQ;AAC7E,MAAA,OAAO,QAAQ,IAAA,EAAK;AAAA,IACtB;AAEA,IAAA,MAAM,UAAU,OAAO,gBAAA,KAAqB,UAAA,GAAa,gBAAA,CAAiB,OAAO,CAAA,GAAI,gBAAA;AAGrF,IAAA,MAAM,mBAAmB,EAAE,GAAG,OAAA,EAAS,KAAA,EAAO,EAAC,EAAE;AACjD,IAAA,OAAO,kBAAA,CAAmB,EAAE,OAAA,EAAS,OAAA,EAAS,OAAA,CAAQ,OAAA,EAAS,OAAA,EAAS,gBAAA,EAAiB,EAAG,MAAM,OAAA,CAAQ,IAAA,EAAM,CAAA;AAAA,EAClH,CAAA;AACF;;;;"}

package/build/esm/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sources":["../../src/request.ts"],"sourcesContent":["import type { CfProperties, ExecutionContext, IncomingRequestCfProperties } from '@cloudflare/workers-types';\nimport {\n  captureException,\n  continueTrace,\n  getClient,\n  getHttpSpanDetailsFromUrlObject,\n  httpHeadersToSpanAttributes,\n  parseStringToURLObject,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  setHttpStatus,\n  startSpanManual,\n  winterCGHeadersToDict,\n  withIsolationScope,\n} from '@sentry/core';\nimport { captureIncomingRequestBody } from './integrations/httpServer';\nimport type { CloudflareOptions } from './client';\nimport { flushAndDispose, getOriginalWaitUntil } from './flush';\nimport { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils';\nimport { init } from './sdk';\nimport { classifyResponseStreaming } from './utils/streaming';\n\nfunction getRequestErrorMechanismType(context: ExecutionContext | undefined): string {\n  // Durable Object fetch handlers use DO state as context (see instrumentDurableObjectWithSentry)\n  return context && 'storage' in context ? 'auto.faas.cloudflare.durable_object' : 'auto.http.cloudflare';\n}\n\ninterface RequestHandlerWrapperOptions {\n  options: CloudflareOptions;\n  request: Request<unknown, IncomingRequestCfProperties<unknown> | CfProperties<unknown>>;\n  context: ExecutionContext | undefined;\n  /**\n   * If true, errors will be captured, rethrown and sent to Sentry.\n   * Otherwise, errors are rethrown but not captured.\n   *\n   * You most likely don't want to set this to `false`, if you use `wrapRequestHandler` directly.\n   * This is primarily meant as an escape hatch for higher-level SDKs relying on additional error\n   * capturing mechanisms where this wrapper captures errors too early or too generally.\n   *\n   * @default true\n   */\n  captureErrors?: boolean;\n}\n\n/**\n * Wraps a cloudflare request handler in Sentry instrumentation\n */\nexport function wrapRequestHandler(\n  wrapperOptions: RequestHandlerWrapperOptions,\n  handler: (...args: unknown[]) => Response | Promise<Response>,\n): Promise<Response> {\n  return withIsolationScope(async isolationScope => {\n    const { options, request, captureErrors = true } = wrapperOptions;\n    const context = wrapperOptions.context;\n\n    // Use getOriginalWaitUntil to get the un-instrumented waitUntil function.\n    // This is crucial to avoid deadlock: the flush lock mechanism wraps waitUntil\n    // to track pending tasks. If we use the instrumented version for flushAndDispose,\n    // it acquires the lock, then flushAndDispose tries to wait for the same lock,\n    // creating a deadlock.\n    const waitUntil = context ? getOriginalWaitUntil(context)?.bind(context) : undefined;\n    const errorMechanismType = getRequestErrorMechanismType(context);\n\n    const client = init({ ...options, ctx: context });\n    isolationScope.setClient(client);\n\n    const urlObject = parseStringToURLObject(request.url);\n    const [name, attributes] = getHttpSpanDetailsFromUrlObject(urlObject, 'server', 'auto.http.cloudflare', request);\n\n    const contentLength = request.headers.get('content-length');\n    if (contentLength) {\n      attributes['http.request.body.size'] = parseInt(contentLength, 10);\n    }\n\n    const userAgentHeader = request.headers.get('user-agent');\n    if (userAgentHeader) {\n      attributes['user_agent.original'] = userAgentHeader;\n    }\n\n    Object.assign(\n      attributes,\n      httpHeadersToSpanAttributes(\n        winterCGHeadersToDict(request.headers),\n        getClient()?.getDataCollectionOptions() ?? false,\n      ),\n    );\n\n    attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] = 'http.server';\n\n    addCloudResourceContext(isolationScope);\n    addRequest(isolationScope, request);\n    if (request.cf) {\n      addCultureContext(isolationScope, request.cf);\n\n      if (typeof request.cf.httpProtocol === 'string') {\n        attributes['network.protocol.name'] = request.cf.httpProtocol;\n      }\n    }\n\n    // Do not capture spans for OPTIONS and HEAD requests\n    if (request.method === 'OPTIONS' || request.method === 'HEAD') {\n      try {\n        return await handler();\n      } catch (e) {\n        if (captureErrors) {\n          captureException(e, { mechanism: { handled: false, type: errorMechanismType } });\n        }\n        throw e;\n      } finally {\n        waitUntil?.(flushAndDispose(client));\n      }\n    }\n\n    if (client) {\n      await captureIncomingRequestBody(client, request);\n    }\n\n    return continueTrace(\n      { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },\n      () => {\n        // Note: This span will not have a duration unless I/O happens in the handler. This is\n        // because of how the cloudflare workers runtime works.\n        // See: https://developers.cloudflare.com/workers/runtime-apis/performance/\n\n        // Use startSpanManual to control when span ends (needed for streaming responses)\n        return startSpanManual({ name, attributes }, async span => {\n          let res: Response;\n\n          try {\n            res = await handler();\n            setHttpStatus(span, res.status);\n\n            // After the handler runs, the span name might have been updated by nested instrumentation\n            // (e.g., Remix parameterizing routes). The span should already have the correct name\n            // from that instrumentation, so we don't need to do anything here.\n          } catch (e) {\n            span.end();\n            if (captureErrors) {\n              captureException(e, { mechanism: { handled: false, type: errorMechanismType } });\n            }\n            waitUntil?.(flushAndDispose(client));\n            throw e;\n          }\n\n          // Classify response to detect actual streaming\n          const classification = classifyResponseStreaming(res);\n\n          if (classification.isStreaming && res.body) {\n            try {\n              let ended = false;\n\n              const endSpanOnce = (): void => {\n                if (ended) return;\n\n                ended = true;\n                span.end();\n                waitUntil?.(flushAndDispose(client));\n              };\n\n              const transform = new TransformStream({\n                flush() {\n                  // Source stream completed normally.\n                  endSpanOnce();\n                },\n                cancel() {\n                  // Client disconnected (or downstream cancelled). The `cancel`\n                  // is being called while the response is still considered\n                  // active, so this is a safe place to end the span.\n                  endSpanOnce();\n                },\n              });\n\n              return new Response(res.body.pipeThrough(transform), {\n                status: res.status,\n                statusText: res.statusText,\n                headers: res.headers,\n              });\n            } catch {\n              span.end();\n              waitUntil?.(flushAndDispose(client));\n              return res;\n            }\n          }\n\n          // Non-streaming response - end span immediately and return original\n          span.end();\n\n          // Don't dispose for protocol upgrades (101 Switching Protocols) - the connection stays alive.\n          // This includes WebSocket upgrades where webSocketMessage/webSocketClose handlers\n          // will still be called and may need the client to capture errors.\n          if (res.status === 101) {\n            waitUntil?.(client?.flush(2000));\n          } else {\n            waitUntil?.(flushAndDispose(client));\n          }\n          return res;\n        });\n      },\n    );\n  });\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"request.js","sources":["../../src/request.ts"],"sourcesContent":["import type { CfProperties, IncomingRequestCfProperties } from '@cloudflare/workers-types';\nimport {\n  captureException,\n  continueTrace,\n  getClient,\n  getHttpSpanDetailsFromUrlObject,\n  httpHeadersToSpanAttributes,\n  parseStringToURLObject,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  setHttpStatus,\n  startSpanManual,\n  winterCGHeadersToDict,\n  withIsolationScope,\n} from '@sentry/core';\nimport { captureIncomingRequestBody } from './integrations/httpServer';\nimport type { CloudflareOptions } from './client';\nimport type { ExecutionContextCompat } from './executionContext';\nimport { flushAndDispose, getOriginalWaitUntil } from './flush';\nimport { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils';\nimport { init } from './sdk';\nimport { classifyResponseStreaming } from './utils/streaming';\n\nfunction getRequestErrorMechanismType(context: ExecutionContextCompat | undefined): string {\n  // Durable Object fetch handlers use DO state as context (see instrumentDurableObjectWithSentry)\n  return context && 'storage' in context ? 'auto.faas.cloudflare.durable_object' : 'auto.http.cloudflare';\n}\n\ninterface RequestHandlerWrapperOptions {\n  options: CloudflareOptions;\n  request: Request<unknown, IncomingRequestCfProperties<unknown> | CfProperties<unknown>>;\n  context: ExecutionContextCompat | undefined;\n  /**\n   * If true, errors will be captured, rethrown and sent to Sentry.\n   * Otherwise, errors are rethrown but not captured.\n   *\n   * You most likely don't want to set this to `false`, if you use `wrapRequestHandler` directly.\n   * This is primarily meant as an escape hatch for higher-level SDKs relying on additional error\n   * capturing mechanisms where this wrapper captures errors too early or too generally.\n   *\n   * @default true\n   */\n  captureErrors?: boolean;\n}\n\n/**\n * Wraps a cloudflare request handler in Sentry instrumentation\n */\nexport function wrapRequestHandler(\n  wrapperOptions: RequestHandlerWrapperOptions,\n  handler: (...args: unknown[]) => Response | Promise<Response>,\n): Promise<Response> {\n  return withIsolationScope(async isolationScope => {\n    const { options, request, captureErrors = true } = wrapperOptions;\n    const context = wrapperOptions.context;\n\n    // Use getOriginalWaitUntil to get the un-instrumented waitUntil function.\n    // This is crucial to avoid deadlock: the flush lock mechanism wraps waitUntil\n    // to track pending tasks. If we use the instrumented version for flushAndDispose,\n    // it acquires the lock, then flushAndDispose tries to wait for the same lock,\n    // creating a deadlock.\n    const waitUntil = context ? getOriginalWaitUntil(context)?.bind(context) : undefined;\n    const errorMechanismType = getRequestErrorMechanismType(context);\n\n    const client = init({ ...options, ctx: context });\n    isolationScope.setClient(client);\n\n    const urlObject = parseStringToURLObject(request.url);\n    const [name, attributes] = getHttpSpanDetailsFromUrlObject(urlObject, 'server', 'auto.http.cloudflare', request);\n\n    const contentLength = request.headers.get('content-length');\n    if (contentLength) {\n      attributes['http.request.body.size'] = parseInt(contentLength, 10);\n    }\n\n    const userAgentHeader = request.headers.get('user-agent');\n    if (userAgentHeader) {\n      attributes['user_agent.original'] = userAgentHeader;\n    }\n\n    Object.assign(\n      attributes,\n      httpHeadersToSpanAttributes(\n        winterCGHeadersToDict(request.headers),\n        getClient()?.getDataCollectionOptions() ?? false,\n      ),\n    );\n\n    attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] = 'http.server';\n\n    addCloudResourceContext(isolationScope);\n    addRequest(isolationScope, request);\n    if (request.cf) {\n      addCultureContext(isolationScope, request.cf);\n\n      if (typeof request.cf.httpProtocol === 'string') {\n        attributes['network.protocol.name'] = request.cf.httpProtocol;\n      }\n    }\n\n    // Do not capture spans for OPTIONS and HEAD requests\n    if (request.method === 'OPTIONS' || request.method === 'HEAD') {\n      try {\n        return await handler();\n      } catch (e) {\n        if (captureErrors) {\n          captureException(e, { mechanism: { handled: false, type: errorMechanismType } });\n        }\n        throw e;\n      } finally {\n        waitUntil?.(flushAndDispose(client));\n      }\n    }\n\n    if (client) {\n      await captureIncomingRequestBody(client, request);\n    }\n\n    return continueTrace(\n      { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },\n      () => {\n        // Note: This span will not have a duration unless I/O happens in the handler. This is\n        // because of how the cloudflare workers runtime works.\n        // See: https://developers.cloudflare.com/workers/runtime-apis/performance/\n\n        // Use startSpanManual to control when span ends (needed for streaming responses)\n        return startSpanManual({ name, attributes }, async span => {\n          let res: Response;\n\n          try {\n            res = await handler();\n            setHttpStatus(span, res.status);\n\n            // After the handler runs, the span name might have been updated by nested instrumentation\n            // (e.g., Remix parameterizing routes). The span should already have the correct name\n            // from that instrumentation, so we don't need to do anything here.\n          } catch (e) {\n            span.end();\n            if (captureErrors) {\n              captureException(e, { mechanism: { handled: false, type: errorMechanismType } });\n            }\n            waitUntil?.(flushAndDispose(client));\n            throw e;\n          }\n\n          // Classify response to detect actual streaming\n          const classification = classifyResponseStreaming(res);\n\n          if (classification.isStreaming && res.body) {\n            try {\n              let ended = false;\n\n              const endSpanOnce = (): void => {\n                if (ended) return;\n\n                ended = true;\n                span.end();\n                waitUntil?.(flushAndDispose(client));\n              };\n\n              const transform = new TransformStream({\n                flush() {\n                  // Source stream completed normally.\n                  endSpanOnce();\n                },\n                cancel() {\n                  // Client disconnected (or downstream cancelled). The `cancel`\n                  // is being called while the response is still considered\n                  // active, so this is a safe place to end the span.\n                  endSpanOnce();\n                },\n              });\n\n              return new Response(res.body.pipeThrough(transform), {\n                status: res.status,\n                statusText: res.statusText,\n                headers: res.headers,\n              });\n            } catch {\n              span.end();\n              waitUntil?.(flushAndDispose(client));\n              return res;\n            }\n          }\n\n          // Non-streaming response - end span immediately and return original\n          span.end();\n\n          // Don't dispose for protocol upgrades (101 Switching Protocols) - the connection stays alive.\n          // This includes WebSocket upgrades where webSocketMessage/webSocketClose handlers\n          // will still be called and may need the client to capture errors.\n          if (res.status === 101) {\n            waitUntil?.(client?.flush(2000));\n          } else {\n            waitUntil?.(flushAndDispose(client));\n          }\n          return res;\n        });\n      },\n    );\n  });\n}\n"],"names":[],"mappings":"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"}

package/build/esm/utils/internalSqlQuery.js

@@ -0,0 +1,17 @@
+import { stringMatchesSomePattern } from '@sentry/core';
+
+function targetsCloudflareInternalTable(querySummary, allowlist) {
+  if (!querySummary) {
+    return false;
+  }
+  const [, ...tables] = querySummary.split(" ");
+  return tables.some((table) => {
+    if (!table.toLowerCase().startsWith("cf_")) {
+      return false;
+    }
+    return !allowlist?.length || !stringMatchesSomePattern(table, allowlist, true);
+  });
+}
+
+export { targetsCloudflareInternalTable };
+//# sourceMappingURL=internalSqlQuery.js.map

package/build/esm/utils/internalSqlQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"internalSqlQuery.js","sources":["../../../src/utils/internalSqlQuery.ts"],"sourcesContent":["import { stringMatchesSomePattern } from '@sentry/core';\n\n/**\n * Cloudflare frameworks that build on Durable Objects (`agents`, `partyserver`, ...) manage their\n * own internal SQLite tables, all namespaced with a `cf_` prefix — e.g. `cf_agents_schedules`,\n * `cf_agent_state`, `cf_ai_chat_stream_chunks`. Queries against them (schedule polling, chat-stream\n * persistence, state bookkeeping) are framework implementation details that otherwise flood traces\n * with dozens of zero-signal `db.query` spans per request. The exact set of tables even varies\n * between framework versions, so we match the reserved prefix rather than an enumerated list.\n *\n * The `cf_` prefix is a reserved convention for framework-managed tables, so user tables should not\n * use it. In case a user table does collide with the prefix, the `durableObjectSqlSpanAllowlist`\n * option lets them opt those tables back into instrumentation.\n *\n * The check operates on the query summary produced by `getSqlQuerySummary` (`{operation} {table} ...`,\n * the same value used as the span name), so table targets are already isolated from the rest of the\n * query.\n */\nexport function targetsCloudflareInternalTable(\n  querySummary: string | undefined,\n  allowlist?: Array<string | RegExp>,\n): boolean {\n  if (!querySummary) {\n    return false;\n  }\n\n  const [, ...tables] = querySummary.split(' ');\n\n  return tables.some(table => {\n    if (!table.toLowerCase().startsWith('cf_')) {\n      return false;\n    }\n\n    // A table on the allowlist is treated as a user table and stays instrumented, even though it\n    // matches the reserved prefix.\n    return !allowlist?.length || !stringMatchesSomePattern(table, allowlist, true);\n  });\n}\n"],"names":[],"mappings":";;AAkBO,SAAS,8BAAA,CACd,cACA,SAAA,EACS;AACT,EAAA,IAAI,CAAC,YAAA,EAAc;AACjB,IAAA,OAAO,KAAA;AAAA,EACT;AAEA,EAAA,MAAM,GAAG,GAAG,MAAM,CAAA,GAAI,YAAA,CAAa,MAAM,GAAG,CAAA;AAE5C,EAAA,OAAO,MAAA,CAAO,KAAK,CAAA,KAAA,KAAS;AAC1B,IAAA,IAAI,CAAC,KAAA,CAAM,WAAA,EAAY,CAAE,UAAA,CAAW,KAAK,CAAA,EAAG;AAC1C,MAAA,OAAO,KAAA;AAAA,IACT;AAIA,IAAA,OAAO,CAAC,SAAA,EAAW,MAAA,IAAU,CAAC,wBAAA,CAAyB,KAAA,EAAO,WAAW,IAAI,CAAA;AAAA,EAC/E,CAAC,CAAA;AACH;;;;"}

package/build/esm/utils/isBinding.js

@@ -15,9 +15,15 @@ function isQueue(item) {
 function isD1Database(item) {
   return item != null && isNotJSRPC(item) && typeof item.prepare === "function" && typeof item.batch === "function" && typeof item.exec === "function";
 }
+function isAiBinding(item) {
+  return item != null && isNotJSRPC(item) && typeof item.run === "function" && typeof item.gateway === "function" && typeof item.toMarkdown === "function";
+}
 function isR2Bucket(item) {
   return item != null && isNotJSRPC(item) && typeof item.head === "function" && typeof item.put === "function" && typeof item.createMultipartUpload === "function";
 }
+function isRateLimit(item) {
+  return item != null && isNotJSRPC(item) && typeof item.limit === "function";
+}
 
-export { isD1Database, isDurableObjectNamespace, isJSRPC, isQueue, isR2Bucket };
+export { isAiBinding, isD1Database, isDurableObjectNamespace, isJSRPC, isQueue, isR2Bucket, isRateLimit };
 //# sourceMappingURL=isBinding.js.map

package/build/esm/utils/isBinding.js.map

@@ -1 +1 @@
-{"version":3,"file":"isBinding.js","sources":["../../../src/utils/isBinding.ts"],"sourcesContent":["/**\n * Adapted from https://github.com/evanderkoogh/otel-cf-workers/blob/effeb549f0a4ed1c55ea0c4f0d8e8e37e5494fb3/src/instrumentation/env.ts\n *\n * BSD 3-Clause License\n *\n * Copyright (c) 2023, Erwin van der Koogh\n *\n * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions are met:\n *\n * 1. Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following disclaimer.\n *\n * 2. Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * 3. Neither the name of the copyright holder nor the names of its\n *    contributors may be used to endorse or promote products derived from\n *    this software without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n */\n\nimport type { D1Database, DurableObjectNamespace, Queue, R2Bucket } from '@cloudflare/workers-types';\n\n/**\n * Checks if a value is a JSRPC proxy (service binding).\n *\n * JSRPC proxies return a truthy value for ANY property access, including\n * properties that don't exist. This makes other duck-type checks unreliable\n * unless we exclude JSRPC first.\n *\n * Must be checked before other binding type checks.\n */\nexport function isJSRPC(item: unknown): item is Service {\n  try {\n    return !!(item as Record<string, unknown>)[`__some_property_that_will_never_exist__${Math.random()}`];\n  } catch {\n    return false;\n  }\n}\n\nconst isNotJSRPC = (item: unknown): item is Record<string, unknown> => !isJSRPC(item);\n\n/**\n * Duck-type check for DurableObjectNamespace bindings.\n * DurableObjectNamespace has `idFromName`, `idFromString`, `get`, `newUniqueId`.\n */\nexport function isDurableObjectNamespace(item: unknown): item is DurableObjectNamespace {\n  return item != null && isNotJSRPC(item) && typeof item.idFromName === 'function';\n}\n\n/**\n * Duck-type check for Queue producer bindings.\n * Queue has `send` and `sendBatch` async methods.\n */\nexport function isQueue(item: unknown): item is Queue {\n  return item != null && isNotJSRPC(item) && typeof item.send === 'function' && typeof item.sendBatch === 'function';\n}\n\n/**\n * Duck-type check for D1Database bindings.\n * D1Database has `prepare`, `batch`, and `exec` methods.\n */\nexport function isD1Database(item: unknown): item is D1Database {\n  return (\n    item != null &&\n    isNotJSRPC(item) &&\n    typeof item.prepare === 'function' &&\n    typeof item.batch === 'function' &&\n    typeof item.exec === 'function'\n  );\n}\n\n/**\n * Duck-type check for R2 Bucket bindings.\n * R2Bucket has `head`, `put`, and `createMultipartUpload` methods.\n */\nexport function isR2Bucket(item: unknown): item is R2Bucket {\n  return (\n    item != null &&\n    isNotJSRPC(item) &&\n    typeof item.head === 'function' &&\n    typeof item.put === 'function' &&\n    typeof item.createMultipartUpload === 'function'\n  );\n}\n"],"names":[],"mappings":"AA4CO,SAAS,QAAQ,IAAA,EAAgC;AACtD,EAAA,IAAI;AACF,IAAA,OAAO,CAAC,CAAE,IAAA,CAAiC,0CAA0C,IAAA,CAAK,MAAA,EAAQ,CAAA,CAAE,CAAA;AAAA,EACtG,CAAA,CAAA,MAAQ;AACN,IAAA,OAAO,KAAA;AAAA,EACT;AACF;AAEA,MAAM,UAAA,GAAa,CAAC,IAAA,KAAmD,CAAC,QAAQ,IAAI,CAAA;AAM7E,SAAS,yBAAyB,IAAA,EAA+C;AACtF,EAAA,OAAO,QAAQ,IAAA,IAAQ,UAAA,CAAW,IAAI,CAAA,IAAK,OAAO,KAAK,UAAA,KAAe,UAAA;AACxE;AAMO,SAAS,QAAQ,IAAA,EAA8B;AACpD,EAAA,OAAO,IAAA,IAAQ,IAAA,IAAQ,UAAA,CAAW,IAAI,CAAA,IAAK,OAAO,IAAA,CAAK,IAAA,KAAS,UAAA,IAAc,OAAO,IAAA,CAAK,SAAA,KAAc,UAAA;AAC1G;AAMO,SAAS,aAAa,IAAA,EAAmC;AAC9D,EAAA,OACE,IAAA,IAAQ,IAAA,IACR,UAAA,CAAW,IAAI,KACf,OAAO,IAAA,CAAK,OAAA,KAAY,UAAA,IACxB,OAAO,IAAA,CAAK,KAAA,KAAU,UAAA,IACtB,OAAO,KAAK,IAAA,KAAS,UAAA;AAEzB;AAMO,SAAS,WAAW,IAAA,EAAiC;AAC1D,EAAA,OACE,IAAA,IAAQ,IAAA,IACR,UAAA,CAAW,IAAI,KACf,OAAO,IAAA,CAAK,IAAA,KAAS,UAAA,IACrB,OAAO,IAAA,CAAK,GAAA,KAAQ,UAAA,IACpB,OAAO,KAAK,qBAAA,KAA0B,UAAA;AAE1C;;;;"}
+{"version":3,"file":"isBinding.js","sources":["../../../src/utils/isBinding.ts"],"sourcesContent":["/**\n * Adapted from https://github.com/evanderkoogh/otel-cf-workers/blob/effeb549f0a4ed1c55ea0c4f0d8e8e37e5494fb3/src/instrumentation/env.ts\n *\n * BSD 3-Clause License\n *\n * Copyright (c) 2023, Erwin van der Koogh\n *\n * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions are met:\n *\n * 1. Redistributions of source code must retain the above copyright notice, this\n *    list of conditions and the following disclaimer.\n *\n * 2. Redistributions in binary form must reproduce the above copyright notice,\n *    this list of conditions and the following disclaimer in the documentation\n *    and/or other materials provided with the distribution.\n *\n * 3. Neither the name of the copyright holder nor the names of its\n *    contributors may be used to endorse or promote products derived from\n *    this software without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n */\n\nimport type { Ai, D1Database, DurableObjectNamespace, Queue, R2Bucket, RateLimit } from '@cloudflare/workers-types';\n\n/**\n * Checks if a value is a JSRPC proxy (service binding).\n *\n * JSRPC proxies return a truthy value for ANY property access, including\n * properties that don't exist. This makes other duck-type checks unreliable\n * unless we exclude JSRPC first.\n *\n * Must be checked before other binding type checks.\n */\nexport function isJSRPC(item: unknown): item is Service {\n  try {\n    return !!(item as Record<string, unknown>)[`__some_property_that_will_never_exist__${Math.random()}`];\n  } catch {\n    return false;\n  }\n}\n\nconst isNotJSRPC = (item: unknown): item is Record<string, unknown> => !isJSRPC(item);\n\n/**\n * Duck-type check for DurableObjectNamespace bindings.\n * DurableObjectNamespace has `idFromName`, `idFromString`, `get`, `newUniqueId`.\n */\nexport function isDurableObjectNamespace(item: unknown): item is DurableObjectNamespace {\n  return item != null && isNotJSRPC(item) && typeof item.idFromName === 'function';\n}\n\n/**\n * Duck-type check for Queue producer bindings.\n * Queue has `send` and `sendBatch` async methods.\n */\nexport function isQueue(item: unknown): item is Queue {\n  return item != null && isNotJSRPC(item) && typeof item.send === 'function' && typeof item.sendBatch === 'function';\n}\n\n/**\n * Duck-type check for D1Database bindings.\n * D1Database has `prepare`, `batch`, and `exec` methods.\n */\nexport function isD1Database(item: unknown): item is D1Database {\n  return (\n    item != null &&\n    isNotJSRPC(item) &&\n    typeof item.prepare === 'function' &&\n    typeof item.batch === 'function' &&\n    typeof item.exec === 'function'\n  );\n}\n\n/**\n * Duck-type check for Workers AI bindings.\n * The Ai binding has `run`, `gateway`, and `toMarkdown` methods.\n */\nexport function isAiBinding(item: unknown): item is Ai {\n  return (\n    item != null &&\n    isNotJSRPC(item) &&\n    typeof item.run === 'function' &&\n    typeof item.gateway === 'function' &&\n    typeof item.toMarkdown === 'function'\n  );\n}\n\n/**\n * Duck-type check for R2 Bucket bindings.\n * R2Bucket has `head`, `put`, and `createMultipartUpload` methods.\n */\nexport function isR2Bucket(item: unknown): item is R2Bucket {\n  return (\n    item != null &&\n    isNotJSRPC(item) &&\n    typeof item.head === 'function' &&\n    typeof item.put === 'function' &&\n    typeof item.createMultipartUpload === 'function'\n  );\n}\n\n/**\n * Duck-type check for RateLimit bindings.\n * RateLimit only exposes a single `limit` method. Because that is a fairly\n * common method name, this check is intentionally run after the more specific\n * binding checks (Queue, R2, D1) in `instrumentEnv`, so those win when a binding\n * also happens to expose `limit`.\n */\nexport function isRateLimit(item: unknown): item is RateLimit {\n  return item != null && isNotJSRPC(item) && typeof item.limit === 'function';\n}\n"],"names":[],"mappings":"AA4CO,SAAS,QAAQ,IAAA,EAAgC;AACtD,EAAA,IAAI;AACF,IAAA,OAAO,CAAC,CAAE,IAAA,CAAiC,0CAA0C,IAAA,CAAK,MAAA,EAAQ,CAAA,CAAE,CAAA;AAAA,EACtG,CAAA,CAAA,MAAQ;AACN,IAAA,OAAO,KAAA;AAAA,EACT;AACF;AAEA,MAAM,UAAA,GAAa,CAAC,IAAA,KAAmD,CAAC,QAAQ,IAAI,CAAA;AAM7E,SAAS,yBAAyB,IAAA,EAA+C;AACtF,EAAA,OAAO,QAAQ,IAAA,IAAQ,UAAA,CAAW,IAAI,CAAA,IAAK,OAAO,KAAK,UAAA,KAAe,UAAA;AACxE;AAMO,SAAS,QAAQ,IAAA,EAA8B;AACpD,EAAA,OAAO,IAAA,IAAQ,IAAA,IAAQ,UAAA,CAAW,IAAI,CAAA,IAAK,OAAO,IAAA,CAAK,IAAA,KAAS,UAAA,IAAc,OAAO,IAAA,CAAK,SAAA,KAAc,UAAA;AAC1G;AAMO,SAAS,aAAa,IAAA,EAAmC;AAC9D,EAAA,OACE,IAAA,IAAQ,IAAA,IACR,UAAA,CAAW,IAAI,KACf,OAAO,IAAA,CAAK,OAAA,KAAY,UAAA,IACxB,OAAO,IAAA,CAAK,KAAA,KAAU,UAAA,IACtB,OAAO,KAAK,IAAA,KAAS,UAAA;AAEzB;AAMO,SAAS,YAAY,IAAA,EAA2B;AACrD,EAAA,OACE,IAAA,IAAQ,IAAA,IACR,UAAA,CAAW,IAAI,KACf,OAAO,IAAA,CAAK,GAAA,KAAQ,UAAA,IACpB,OAAO,IAAA,CAAK,OAAA,KAAY,UAAA,IACxB,OAAO,KAAK,UAAA,KAAe,UAAA;AAE/B;AAMO,SAAS,WAAW,IAAA,EAAiC;AAC1D,EAAA,OACE,IAAA,IAAQ,IAAA,IACR,UAAA,CAAW,IAAI,KACf,OAAO,IAAA,CAAK,IAAA,KAAS,UAAA,IACrB,OAAO,IAAA,CAAK,GAAA,KAAQ,UAAA,IACpB,OAAO,KAAK,qBAAA,KAA0B,UAAA;AAE1C;AASO,SAAS,YAAY,IAAA,EAAkC;AAC5D,EAAA,OAAO,QAAQ,IAAA,IAAQ,UAAA,CAAW,IAAI,CAAA,IAAK,OAAO,KAAK,KAAA,KAAU,UAAA;AACnE;;;;"}

package/build/esm/workflows.js

@@ -26,10 +26,12 @@ class WrappedWorkflowStep {
     this._step = _step;
     this._waitUntil = _waitUntil;
   }
-  async do(name, configOrCallback, maybeCallback) {
+  async do(name, configOrCallback, callbackOrRollback, maybeRollback) {
     const scopeForStep = getCurrentScope();
-    const userCallback = maybeCallback || configOrCallback;
-    const config = typeof configOrCallback === "function" ? void 0 : configOrCallback;
+    const hasConfig = typeof configOrCallback !== "function";
+    const config = hasConfig ? configOrCallback : void 0;
+    const userCallback = hasConfig ? callbackOrRollback : configOrCallback;
+    const rollbackOptions = hasConfig ? maybeRollback : callbackOrRollback;
     const instrumentedCallback = async (...args) => {
       const stepContext = args[0];
       const attempt = stepContext?.attempt;
@@ -44,7 +46,8 @@ class WrappedWorkflowStep {
           attributes: {
             "cloudflare.workflow.timeout": config?.timeout,
             "cloudflare.workflow.retries.backoff": config?.retries?.backoff,
-            "cloudflare.workflow.retries.delay": config?.retries?.delay,
+            // In workers-types v5, `delay` may be a `WorkflowDelayFunction`, which isn't a valid span attribute value.
+            "cloudflare.workflow.retries.delay": typeof config?.retries?.delay === "function" ? void 0 : config?.retries?.delay,
             "cloudflare.workflow.retries.limit": config?.retries?.limit,
             "cloudflare.workflow.attempt": attempt,
             [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.faas.cloudflare.workflow",
@@ -67,7 +70,10 @@ class WrappedWorkflowStep {
         }
       );
     };
-    return config ? this._step.do(name, config, instrumentedCallback) : this._step.do(name, instrumentedCallback);
+    if (config) {
+      return rollbackOptions ? this._step.do(name, config, instrumentedCallback, rollbackOptions) : this._step.do(name, config, instrumentedCallback);
+    }
+    return rollbackOptions ? this._step.do(name, instrumentedCallback, rollbackOptions) : this._step.do(name, instrumentedCallback);
   }
   async sleep(name, duration) {
     return this._step.sleep(name, duration);