@sentry/cloudflare 10.53.0 → 10.54.0

package/build/cjs/instrumentations/worker/instrumentFetch.js

@@ -6,54 +6,40 @@ const request = require('../../request.js');
 const instrumentContext = require('../../utils/instrumentContext.js');
 const instrumentEnv = require('./instrumentEnv.js');
 
-/**
- * Instruments a fetch handler for ExportedHandler (env/ctx come from args).
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function instrumentExportedHandlerFetch(
-  handler,
-  optionsCallback,
-) {
-  if (!('fetch' in handler) || typeof handler.fetch !== 'function') {
+function instrumentExportedHandlerFetch(handler, optionsCallback) {
+  if (!("fetch" in handler) || typeof handler.fetch !== "function") {
     return;
   }
-
   handler.fetch = instrument.ensureInstrumented(
     handler.fetch,
-    original =>
-      new Proxy(original, {
-        apply(target, thisArg, args) {
-          const [request$1, env, ctx] = args;
-          const context = instrumentContext.instrumentContext(ctx);
-          const options$1 = options.getFinalOptions(optionsCallback(env), env);
-          args[1] = instrumentEnv.instrumentEnv(env, options$1);
-          args[2] = context;
-
-          return request.wrapRequestHandler({ options: options$1, request: request$1, context }, () => target.apply(thisArg, args));
-        },
-      }),
+    (original) => new Proxy(original, {
+      apply(target, thisArg, args) {
+        const [request$1, env, ctx] = args;
+        if (request$1.method === "OPTIONS" || request$1.method === "HEAD") {
+          return target.apply(thisArg, args);
+        }
+        const context = instrumentContext.instrumentContext(ctx);
+        const options$1 = options.getFinalOptions(optionsCallback(env), env);
+        args[1] = instrumentEnv.instrumentEnv(env, options$1);
+        args[2] = context;
+        return request.wrapRequestHandler({ options: options$1, request: request$1, context }, () => target.apply(thisArg, args));
+      }
+    })
   );
 }
-
-/**
- * Instruments a fetch method for WorkerEntrypoint (options/context already available).
- */
-function instrumentWorkerEntrypointFetch(
-  instance,
-  options,
-  context,
-) {
+function instrumentWorkerEntrypointFetch(instance, options, context) {
   if (!instance.fetch) {
     return;
   }
-
   const original = instance.fetch.bind(instance);
   instance.fetch = new Proxy(original, {
     apply(target, thisArg, args) {
       const [request$1] = args;
-
+      if (request$1.method === "OPTIONS" || request$1.method === "HEAD") {
+        return Reflect.apply(target, thisArg, args);
+      }
       return request.wrapRequestHandler({ options, request: request$1, context }, () => Reflect.apply(target, thisArg, args));
-    },
+    }
   });
 }
 

package/build/cjs/instrumentations/worker/instrumentFetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentFetch.js","sources":["../../../../src/instrumentations/worker/instrumentFetch.ts"],"sourcesContent":["import type { ExportedHandler } from '@cloudflare/workers-types';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport type { CloudflareOptions } from '../../client';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { wrapRequestHandler } from '../../request';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { instrumentEnv } from './instrumentEnv';\n\n/**\n * Instruments a fetch handler for ExportedHandler (env/ctx come from args).\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function instrumentExportedHandlerFetch<T extends ExportedHandler<any, any, any>>(\n  handler: T,\n  optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n  if (!('fetch' in handler) || typeof handler.fetch !== 'function') {\n    return;\n  }\n\n  handler.fetch = ensureInstrumented(\n    handler.fetch,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, args: Parameters<NonNullable<T['fetch']>>) {\n          const [request, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          const options = getFinalOptions(optionsCallback(env), env);\n          args[1] = instrumentEnv(env, options);\n          args[2] = context;\n\n          return wrapRequestHandler({ options, request, context }, () => target.apply(thisArg, args));\n        },\n      }),\n  );\n}\n\n/**\n * Instruments a fetch method for WorkerEntrypoint (options/context already available).\n */\nexport function instrumentWorkerEntrypointFetch<T extends WorkerEntrypoint>(\n  instance: T,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n): void {\n  if (!instance.fetch) {\n    return;\n  }\n\n  const original = instance.fetch.bind(instance);\n  instance.fetch = new Proxy(original, {\n    apply(target, thisArg, args: [Request]) {\n      const [request] = args;\n\n      return wrapRequestHandler({ options, request, context }, () => Reflect.apply(target, thisArg, args));\n    },\n  });\n}\n"],"names":["ensureInstrumented","request","instrumentContext","options","getFinalOptions","instrumentEnv","wrapRequestHandler"],"mappings":";;;;;;;;AASA;AACA;AACA;AACA;AACO,SAAS,8BAA8B;AAC9C,EAAE,OAAO;AACT,EAAE,eAAe;AACjB,EAAQ;AACR,EAAE,IAAI,EAAE,WAAW,OAAO,CAAA,IAAK,OAAO,OAAO,CAAC,KAAA,KAAU,UAAU,EAAE;AACpE,IAAI;AACJ,EAAE;;AAEF,EAAE,OAAO,CAAC,KAAA,GAAQA,6BAAkB;AACpC,IAAI,OAAO,CAAC,KAAK;AACjB,IAAI,QAAA;AACJ,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE;AAC1B,QAAQ,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAuC;AAC1E,UAAU,MAAM,CAACC,SAAO,EAAE,GAAG,EAAE,GAAG,CAAA,GAAI,IAAI;AAC1C,UAAU,MAAM,OAAA,GAAUC,mCAAiB,CAAC,GAAG,CAAC;AAChD,UAAU,MAAMC,SAAA,GAAUC,uBAAe,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC;AACpE,UAAU,IAAI,CAAC,CAAC,CAAA,GAAIC,2BAAa,CAAC,GAAG,EAAEF,SAAO,CAAC;AAC/C,UAAU,IAAI,CAAC,CAAC,CAAA,GAAI,OAAO;;AAE3B,UAAU,OAAOG,0BAAkB,CAAC,WAAEH,SAAO,WAAEF,SAAO,EAAE,OAAA,EAAS,EAAE,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACrG,QAAQ,CAAC;AACT,OAAO,CAAC;AACR,GAAG;AACH;;AAEA;AACA;AACA;AACO,SAAS,+BAA+B;AAC/C,EAAE,QAAQ;AACV,EAAE,OAAO;AACT,EAAE,OAAO;AACT,EAAQ;AACR,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE;AACvB,IAAI;AACJ,EAAE;;AAEF,EAAE,MAAM,QAAA,GAAW,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;AAChD,EAAE,QAAQ,CAAC,KAAA,GAAQ,IAAI,KAAK,CAAC,QAAQ,EAAE;AACvC,IAAI,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAa;AAC5C,MAAM,MAAM,CAACA,SAAO,CAAA,GAAI,IAAI;;AAE5B,MAAM,OAAOK,0BAAkB,CAAC,EAAE,OAAO,WAAEL,SAAO,EAAE,OAAA,EAAS,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AAC1G,IAAI,CAAC;AACL,GAAG,CAAC;AACJ;;;;;"}
+{"version":3,"file":"instrumentFetch.js","sources":["../../../../src/instrumentations/worker/instrumentFetch.ts"],"sourcesContent":["import type { ExportedHandler } from '@cloudflare/workers-types';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport type { CloudflareOptions } from '../../client';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { wrapRequestHandler } from '../../request';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { instrumentEnv } from './instrumentEnv';\n\n/**\n * Instruments a fetch handler for ExportedHandler (env/ctx come from args).\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function instrumentExportedHandlerFetch<T extends ExportedHandler<any, any, any>>(\n  handler: T,\n  optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n  if (!('fetch' in handler) || typeof handler.fetch !== 'function') {\n    return;\n  }\n\n  handler.fetch = ensureInstrumented(\n    handler.fetch,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, args: Parameters<NonNullable<T['fetch']>>) {\n          const [request, env, ctx] = args;\n\n          if (request.method === 'OPTIONS' || request.method === 'HEAD') {\n            return target.apply(thisArg, args);\n          }\n\n          const context = instrumentContext(ctx);\n          const options = getFinalOptions(optionsCallback(env), env);\n          args[1] = instrumentEnv(env, options);\n          args[2] = context;\n\n          return wrapRequestHandler({ options, request, context }, () => target.apply(thisArg, args));\n        },\n      }),\n  );\n}\n\n/**\n * Instruments a fetch method for WorkerEntrypoint (options/context already available).\n */\nexport function instrumentWorkerEntrypointFetch<T extends WorkerEntrypoint>(\n  instance: T,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n): void {\n  if (!instance.fetch) {\n    return;\n  }\n\n  const original = instance.fetch.bind(instance);\n  instance.fetch = new Proxy(original, {\n    apply(target, thisArg, args: [Request]) {\n      const [request] = args;\n\n      if (request.method === 'OPTIONS' || request.method === 'HEAD') {\n        return Reflect.apply(target, thisArg, args);\n      }\n\n      return wrapRequestHandler({ options, request, context }, () => Reflect.apply(target, thisArg, args));\n    },\n  });\n}\n"],"names":["ensureInstrumented","request","instrumentContext","options","getFinalOptions","instrumentEnv","wrapRequestHandler"],"mappings":";;;;;;;;AAaO,SAAS,8BAAA,CACd,SACA,eAAA,EACM;AACN,EAAA,IAAI,EAAE,OAAA,IAAW,OAAA,CAAA,IAAY,OAAO,OAAA,CAAQ,UAAU,UAAA,EAAY;AAChE,IAAA;AAAA,EACF;AAEA,EAAA,OAAA,CAAQ,KAAA,GAAQA,6BAAA;AAAA,IACd,OAAA,CAAQ,KAAA;AAAA,IACR,CAAA,QAAA,KACE,IAAI,KAAA,CAAM,QAAA,EAAU;AAAA,MAClB,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAA,EAA2C;AAChE,QAAA,MAAM,CAACC,SAAA,EAAS,GAAA,EAAK,GAAG,CAAA,GAAI,IAAA;AAE5B,QAAA,IAAIA,SAAA,CAAQ,MAAA,KAAW,SAAA,IAAaA,SAAA,CAAQ,WAAW,MAAA,EAAQ;AAC7D,UAAA,OAAO,MAAA,CAAO,KAAA,CAAM,OAAA,EAAS,IAAI,CAAA;AAAA,QACnC;AAEA,QAAA,MAAM,OAAA,GAAUC,oCAAkB,GAAG,CAAA;AACrC,QAAA,MAAMC,SAAA,GAAUC,uBAAA,CAAgB,eAAA,CAAgB,GAAG,GAAG,GAAG,CAAA;AACzD,QAAA,IAAA,CAAK,CAAC,CAAA,GAAIC,2BAAA,CAAc,GAAA,EAAKF,SAAO,CAAA;AACpC,QAAA,IAAA,CAAK,CAAC,CAAA,GAAI,OAAA;AAEV,QAAA,OAAOG,0BAAA,CAAmB,WAAEH,SAAA,WAASF,SAAA,EAAS,OAAA,EAAQ,EAAG,MAAM,MAAA,CAAO,KAAA,CAAM,OAAA,EAAS,IAAI,CAAC,CAAA;AAAA,MAC5F;AAAA,KACD;AAAA,GACL;AACF;AAKO,SAAS,+BAAA,CACd,QAAA,EACA,OAAA,EACA,OAAA,EACM;AACN,EAAA,IAAI,CAAC,SAAS,KAAA,EAAO;AACnB,IAAA;AAAA,EACF;AAEA,EAAA,MAAM,QAAA,GAAW,QAAA,CAAS,KAAA,CAAM,IAAA,CAAK,QAAQ,CAAA;AAC7C,EAAA,QAAA,CAAS,KAAA,GAAQ,IAAI,KAAA,CAAM,QAAA,EAAU;AAAA,IACnC,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAA,EAAiB;AACtC,MAAA,MAAM,CAACA,SAAO,CAAA,GAAI,IAAA;AAElB,MAAA,IAAIA,SAAA,CAAQ,MAAA,KAAW,SAAA,IAAaA,SAAA,CAAQ,WAAW,MAAA,EAAQ;AAC7D,QAAA,OAAO,OAAA,CAAQ,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAI,CAAA;AAAA,MAC5C;AAEA,MAAA,OAAOK,0BAAA,CAAmB,EAAE,OAAA,WAASL,SAAA,EAAS,OAAA,EAAQ,EAAG,MAAM,OAAA,CAAQ,KAAA,CAAM,MAAA,EAAQ,OAAA,EAAS,IAAI,CAAC,CAAA;AAAA,IACrG;AAAA,GACD,CAAA;AACH;;;;;"}

package/build/cjs/instrumentations/worker/instrumentFetcher.js

@@ -2,34 +2,20 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@sentry/core');
 
-/**
- * Wraps a fetch-like function to create a span and propagate trace headers
- * (`sentry-trace` and `baggage`) on the outgoing request.
- *
- * Useful for instrumenting Cloudflare bindings that expose a `fetch` method
- * (e.g. Durable Object stubs, Service bindings).
- */
 function instrumentFetcher(fetchFn) {
-  return function (input, init) {
+  return function(input, init) {
     const headers = core._INTERNAL_getTracingHeadersForFetchRequest(input, { headers: init?.headers });
-
-    if (input instanceof Request && init === undefined) {
+    if (input instanceof Request && init === void 0) {
       if (!headers) {
         return fetchFn(input);
       }
-
-      // Newly created headers already include the previous headers from the original request
-      // so we can clone the request and pass in all headers.
-      const requestWithTracing = new Request(input, { headers: headers  });
-
+      const requestWithTracing = new Request(input, { headers });
       return fetchFn(requestWithTracing);
     }
-
     const mergedInit = {
       ...init,
-      ...(headers ? { headers } : {}),
-    } ;
-
+      ...headers ? { headers } : {}
+    };
     return fetchFn(input, mergedInit);
   };
 }

package/build/cjs/instrumentations/worker/instrumentFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentFetcher.js","sources":["../../../../src/instrumentations/worker/instrumentFetcher.ts"],"sourcesContent":["import type { Fetcher } from '@cloudflare/workers-types';\nimport { _INTERNAL_getTracingHeadersForFetchRequest } from '@sentry/core';\n\n/**\n * Wraps a fetch-like function to create a span and propagate trace headers\n * (`sentry-trace` and `baggage`) on the outgoing request.\n *\n * Useful for instrumenting Cloudflare bindings that expose a `fetch` method\n * (e.g. Durable Object stubs, Service bindings).\n */\nexport function instrumentFetcher(fetchFn: Fetcher['fetch']): Fetcher['fetch'] {\n  return function (input: RequestInfo | URL, init?: RequestInit): Promise<Response> {\n    const headers = _INTERNAL_getTracingHeadersForFetchRequest(input, { headers: init?.headers });\n\n    if (input instanceof Request && init === undefined) {\n      if (!headers) {\n        return fetchFn(input);\n      }\n\n      // Newly created headers already include the previous headers from the original request\n      // so we can clone the request and pass in all headers.\n      const requestWithTracing = new Request(input, { headers: headers as HeadersInit });\n\n      return fetchFn(requestWithTracing);\n    }\n\n    const mergedInit = {\n      ...init,\n      ...(headers ? { headers } : {}),\n    } as NonNullable<Parameters<Fetcher['fetch']>[1]>;\n\n    return fetchFn(input, mergedInit);\n  };\n}\n"],"names":["_INTERNAL_getTracingHeadersForFetchRequest"],"mappings":";;;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,iBAAiB,CAAC,OAAO,EAAsC;AAC/E,EAAE,OAAO,UAAU,KAAK,EAAqB,IAAI,EAAmC;AACpF,IAAI,MAAM,OAAA,GAAUA,+CAA0C,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAA,EAAS,CAAC;;AAEjG,IAAI,IAAI,KAAA,YAAiB,WAAW,IAAA,KAAS,SAAS,EAAE;AACxD,MAAM,IAAI,CAAC,OAAO,EAAE;AACpB,QAAQ,OAAO,OAAO,CAAC,KAAK,CAAC;AAC7B,MAAM;;AAEN;AACA;AACA,MAAM,MAAM,kBAAA,GAAqB,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAA,GAAwB,CAAC;;AAExF,MAAM,OAAO,OAAO,CAAC,kBAAkB,CAAC;AACxC,IAAI;;AAEJ,IAAI,MAAM,aAAa;AACvB,MAAM,GAAG,IAAI;AACb,MAAM,IAAI,OAAA,GAAU,EAAE,SAAQ,GAAI,EAAE,CAAC;AACrC,KAAI;;AAEJ,IAAI,OAAO,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC;AACrC,EAAE,CAAC;AACH;;;;"}
+{"version":3,"file":"instrumentFetcher.js","sources":["../../../../src/instrumentations/worker/instrumentFetcher.ts"],"sourcesContent":["import type { Fetcher } from '@cloudflare/workers-types';\nimport { _INTERNAL_getTracingHeadersForFetchRequest } from '@sentry/core';\n\n/**\n * Wraps a fetch-like function to create a span and propagate trace headers\n * (`sentry-trace` and `baggage`) on the outgoing request.\n *\n * Useful for instrumenting Cloudflare bindings that expose a `fetch` method\n * (e.g. Durable Object stubs, Service bindings).\n */\nexport function instrumentFetcher(fetchFn: Fetcher['fetch']): Fetcher['fetch'] {\n  return function (input: RequestInfo | URL, init?: RequestInit): Promise<Response> {\n    const headers = _INTERNAL_getTracingHeadersForFetchRequest(input, { headers: init?.headers });\n\n    if (input instanceof Request && init === undefined) {\n      if (!headers) {\n        return fetchFn(input);\n      }\n\n      // Newly created headers already include the previous headers from the original request\n      // so we can clone the request and pass in all headers.\n      const requestWithTracing = new Request(input, { headers: headers as HeadersInit });\n\n      return fetchFn(requestWithTracing);\n    }\n\n    const mergedInit = {\n      ...init,\n      ...(headers ? { headers } : {}),\n    } as NonNullable<Parameters<Fetcher['fetch']>[1]>;\n\n    return fetchFn(input, mergedInit);\n  };\n}\n"],"names":["_INTERNAL_getTracingHeadersForFetchRequest"],"mappings":";;;;AAUO,SAAS,kBAAkB,OAAA,EAA6C;AAC7E,EAAA,OAAO,SAAU,OAA0B,IAAA,EAAuC;AAChF,IAAA,MAAM,UAAUA,+CAAA,CAA2C,KAAA,EAAO,EAAE,OAAA,EAAS,IAAA,EAAM,SAAS,CAAA;AAE5F,IAAA,IAAI,KAAA,YAAiB,OAAA,IAAW,IAAA,KAAS,MAAA,EAAW;AAClD,MAAA,IAAI,CAAC,OAAA,EAAS;AACZ,QAAA,OAAO,QAAQ,KAAK,CAAA;AAAA,MACtB;AAIA,MAAA,MAAM,qBAAqB,IAAI,OAAA,CAAQ,KAAA,EAAO,EAAE,SAAiC,CAAA;AAEjF,MAAA,OAAO,QAAQ,kBAAkB,CAAA;AAAA,IACnC;AAEA,IAAA,MAAM,UAAA,GAAa;AAAA,MACjB,GAAG,IAAA;AAAA,MACH,GAAI,OAAA,GAAU,EAAE,OAAA,KAAY;AAAC,KAC/B;AAEA,IAAA,OAAO,OAAA,CAAQ,OAAO,UAAU,CAAA;AAAA,EAClC,CAAA;AACF;;;;"}

package/build/cjs/instrumentations/worker/instrumentQueue.js

@@ -9,102 +9,70 @@ const sdk = require('../../sdk.js');
 const instrumentContext = require('../../utils/instrumentContext.js');
 const instrumentEnv = require('./instrumentEnv.js');
 
-/**
- * Core queue handler logic - wraps execution with Sentry instrumentation.
- */
-function wrapQueueHandler(
-  batch,
-  options,
-  context,
-  fn,
-) {
-  return core.withIsolationScope(isolationScope => {
+function wrapQueueHandler(batch, options, context, fn) {
+  return core.withIsolationScope((isolationScope) => {
     const waitUntil = context.waitUntil.bind(context);
-
     const client = sdk.init({ ...options, ctx: context });
     isolationScope.setClient(client);
-
     scopeUtils.addCloudResourceContext(isolationScope);
-
     return core.startSpan(
       {
-        op: 'faas.queue',
+        op: "faas.queue",
         name: `process ${batch.queue}`,
         attributes: {
-          'faas.trigger': 'pubsub',
-          'messaging.destination.name': batch.queue,
-          'messaging.system': 'cloudflare',
-          'messaging.operation.type': 'process',
-          'messaging.operation.name': 'process',
-          'messaging.batch.message_count': batch.messages.length,
-          'messaging.message.retry.count': batch.messages.reduce((acc, message) => acc + message.attempts - 1, 0),
-          [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'queue.process',
-          [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.queue',
-          [core.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
-        },
+          "faas.trigger": "pubsub",
+          "messaging.destination.name": batch.queue,
+          "messaging.system": "cloudflare",
+          "messaging.operation.type": "process",
+          "messaging.operation.name": "process",
+          "messaging.batch.message_count": batch.messages.length,
+          "messaging.message.retry.count": batch.messages.reduce((acc, message) => acc + message.attempts - 1, 0),
+          [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: "queue.process",
+          [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.faas.cloudflare.queue",
+          [core.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: "task"
+        }
       },
       async () => {
         try {
           return await fn();
         } catch (e) {
-          core.captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.queue' } });
+          core.captureException(e, { mechanism: { handled: false, type: "auto.faas.cloudflare.queue" } });
           throw e;
         } finally {
           waitUntil(flush.flushAndDispose(client));
         }
-      },
+      }
     );
   });
 }
-
-/**
- * Instruments a queue handler for ExportedHandler (env/ctx come from args).
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function instrumentExportedHandlerQueue(
-  handler,
-  optionsCallback,
-) {
-  if (!('queue' in handler) || typeof handler.queue !== 'function') {
+function instrumentExportedHandlerQueue(handler, optionsCallback) {
+  if (!("queue" in handler) || typeof handler.queue !== "function") {
     return;
   }
-
   handler.queue = instrument.ensureInstrumented(
     handler.queue,
-    original =>
-      new Proxy(original, {
-        apply(target, thisArg, args) {
-          const [batch, env, ctx] = args;
-          const context = instrumentContext.instrumentContext(ctx);
-          const options$1 = options.getFinalOptions(optionsCallback(env), env);
-          args[1] = instrumentEnv.instrumentEnv(env, options$1);
-          args[2] = context;
-
-          return wrapQueueHandler(batch, options$1, context, () => target.apply(thisArg, args));
-        },
-      }),
+    (original) => new Proxy(original, {
+      apply(target, thisArg, args) {
+        const [batch, env, ctx] = args;
+        const context = instrumentContext.instrumentContext(ctx);
+        const options$1 = options.getFinalOptions(optionsCallback(env), env);
+        args[1] = instrumentEnv.instrumentEnv(env, options$1);
+        args[2] = context;
+        return wrapQueueHandler(batch, options$1, context, () => target.apply(thisArg, args));
+      }
+    })
   );
 }
-
-/**
- * Instruments a queue method for WorkerEntrypoint (options/context already available).
- */
-function instrumentWorkerEntrypointQueue(
-  instance,
-  options,
-  context,
-) {
+function instrumentWorkerEntrypointQueue(instance, options, context) {
   if (!instance.queue) {
     return;
   }
-
   const original = instance.queue.bind(instance);
   instance.queue = new Proxy(original, {
     apply(target, thisArg, args) {
       const [batch] = args;
-
       return wrapQueueHandler(batch, options, context, () => Reflect.apply(target, thisArg, args));
-    },
+    }
   });
 }
 

package/build/cjs/instrumentations/worker/instrumentQueue.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentQueue.js","sources":["../../../../src/instrumentations/worker/instrumentQueue.ts"],"sourcesContent":["import type { ExportedHandler, MessageBatch } from '@cloudflare/workers-types';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport {\n  captureException,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  startSpan,\n  withIsolationScope,\n} from '@sentry/core';\nimport type { CloudflareOptions } from '../../client';\nimport { flushAndDispose } from '../../flush';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { addCloudResourceContext } from '../../scope-utils';\nimport { init } from '../../sdk';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { instrumentEnv } from './instrumentEnv';\n\n/**\n * Core queue handler logic - wraps execution with Sentry instrumentation.\n */\nfunction wrapQueueHandler(\n  batch: MessageBatch,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n  fn: () => unknown,\n): unknown {\n  return withIsolationScope(isolationScope => {\n    const waitUntil = context.waitUntil.bind(context);\n\n    const client = init({ ...options, ctx: context });\n    isolationScope.setClient(client);\n\n    addCloudResourceContext(isolationScope);\n\n    return startSpan(\n      {\n        op: 'faas.queue',\n        name: `process ${batch.queue}`,\n        attributes: {\n          'faas.trigger': 'pubsub',\n          'messaging.destination.name': batch.queue,\n          'messaging.system': 'cloudflare',\n          'messaging.operation.type': 'process',\n          'messaging.operation.name': 'process',\n          'messaging.batch.message_count': batch.messages.length,\n          'messaging.message.retry.count': batch.messages.reduce((acc, message) => acc + message.attempts - 1, 0),\n          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'queue.process',\n          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.queue',\n          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n        },\n      },\n      async () => {\n        try {\n          return await fn();\n        } catch (e) {\n          captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.queue' } });\n          throw e;\n        } finally {\n          waitUntil(flushAndDispose(client));\n        }\n      },\n    );\n  });\n}\n\n/**\n * Instruments a queue handler for ExportedHandler (env/ctx come from args).\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function instrumentExportedHandlerQueue<T extends ExportedHandler<any, any, any>>(\n  handler: T,\n  optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n  if (!('queue' in handler) || typeof handler.queue !== 'function') {\n    return;\n  }\n\n  handler.queue = ensureInstrumented(\n    handler.queue,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, args: Parameters<NonNullable<T['queue']>>) {\n          const [batch, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          const options = getFinalOptions(optionsCallback(env), env);\n          args[1] = instrumentEnv(env, options);\n          args[2] = context;\n\n          return wrapQueueHandler(batch, options, context, () => target.apply(thisArg, args));\n        },\n      }),\n  );\n}\n\n/**\n * Instruments a queue method for WorkerEntrypoint (options/context already available).\n */\nexport function instrumentWorkerEntrypointQueue<T extends WorkerEntrypoint>(\n  instance: T,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n): void {\n  if (!instance.queue) {\n    return;\n  }\n\n  const original = instance.queue.bind(instance);\n  instance.queue = new Proxy(original, {\n    apply(target, thisArg, args: [MessageBatch]) {\n      const [batch] = args;\n\n      return wrapQueueHandler(batch, options, context, () => Reflect.apply(target, thisArg, args));\n    },\n  });\n}\n"],"names":["withIsolationScope","init","addCloudResourceContext","startSpan","SEMANTIC_ATTRIBUTE_SENTRY_OP","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","captureException","flushAndDispose","ensureInstrumented","instrumentContext","options","getFinalOptions","instrumentEnv"],"mappings":"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"}
+{"version":3,"file":"instrumentQueue.js","sources":["../../../../src/instrumentations/worker/instrumentQueue.ts"],"sourcesContent":["import type { ExportedHandler, MessageBatch } from '@cloudflare/workers-types';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport {\n  captureException,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  startSpan,\n  withIsolationScope,\n} from '@sentry/core';\nimport type { CloudflareOptions } from '../../client';\nimport { flushAndDispose } from '../../flush';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { addCloudResourceContext } from '../../scope-utils';\nimport { init } from '../../sdk';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { instrumentEnv } from './instrumentEnv';\n\n/**\n * Core queue handler logic - wraps execution with Sentry instrumentation.\n */\nfunction wrapQueueHandler(\n  batch: MessageBatch,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n  fn: () => unknown,\n): unknown {\n  return withIsolationScope(isolationScope => {\n    const waitUntil = context.waitUntil.bind(context);\n\n    const client = init({ ...options, ctx: context });\n    isolationScope.setClient(client);\n\n    addCloudResourceContext(isolationScope);\n\n    return startSpan(\n      {\n        op: 'faas.queue',\n        name: `process ${batch.queue}`,\n        attributes: {\n          'faas.trigger': 'pubsub',\n          'messaging.destination.name': batch.queue,\n          'messaging.system': 'cloudflare',\n          'messaging.operation.type': 'process',\n          'messaging.operation.name': 'process',\n          'messaging.batch.message_count': batch.messages.length,\n          'messaging.message.retry.count': batch.messages.reduce((acc, message) => acc + message.attempts - 1, 0),\n          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'queue.process',\n          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.queue',\n          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n        },\n      },\n      async () => {\n        try {\n          return await fn();\n        } catch (e) {\n          captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.queue' } });\n          throw e;\n        } finally {\n          waitUntil(flushAndDispose(client));\n        }\n      },\n    );\n  });\n}\n\n/**\n * Instruments a queue handler for ExportedHandler (env/ctx come from args).\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function instrumentExportedHandlerQueue<T extends ExportedHandler<any, any, any>>(\n  handler: T,\n  optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n  if (!('queue' in handler) || typeof handler.queue !== 'function') {\n    return;\n  }\n\n  handler.queue = ensureInstrumented(\n    handler.queue,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, args: Parameters<NonNullable<T['queue']>>) {\n          const [batch, env, ctx] = args;\n          const context = instrumentContext(ctx);\n          const options = getFinalOptions(optionsCallback(env), env);\n          args[1] = instrumentEnv(env, options);\n          args[2] = context;\n\n          return wrapQueueHandler(batch, options, context, () => target.apply(thisArg, args));\n        },\n      }),\n  );\n}\n\n/**\n * Instruments a queue method for WorkerEntrypoint (options/context already available).\n */\nexport function instrumentWorkerEntrypointQueue<T extends WorkerEntrypoint>(\n  instance: T,\n  options: CloudflareOptions,\n  context: ExecutionContext,\n): void {\n  if (!instance.queue) {\n    return;\n  }\n\n  const original = instance.queue.bind(instance);\n  instance.queue = new Proxy(original, {\n    apply(target, thisArg, args: [MessageBatch]) {\n      const [batch] = args;\n\n      return wrapQueueHandler(batch, options, context, () => Reflect.apply(target, thisArg, args));\n    },\n  });\n}\n"],"names":["withIsolationScope","init","addCloudResourceContext","startSpan","SEMANTIC_ATTRIBUTE_SENTRY_OP","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","captureException","flushAndDispose","ensureInstrumented","instrumentContext","options","getFinalOptions","instrumentEnv"],"mappings":"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"}

package/build/cjs/instrumentations/worker/instrumentQueueProducer.js

@@ -2,103 +2,77 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@sentry/core');
 
-const ORIGIN = 'auto.faas.cloudflare.queue';
-
-function startPublishSpan(
-  options
-
-,
-  callback,
-) {
+const ORIGIN = "auto.faas.cloudflare.queue";
+function startPublishSpan(options, callback) {
   const { bindingName, bodySize, messageCount } = options;
-
   return core.startSpan(
     {
-      op: 'queue.publish',
+      op: "queue.publish",
       name: `send ${bindingName}`,
       attributes: {
-        'messaging.system': 'cloudflare',
-        'messaging.destination.name': bindingName,
-        'messaging.operation.type': 'send',
-        'messaging.operation.name': 'send',
-        ...(messageCount !== undefined && { 'messaging.batch.message_count': messageCount }),
-        'messaging.message.body.size': bodySize,
-        [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'queue.publish',
-        [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN,
-      },
+        "messaging.system": "cloudflare",
+        "messaging.destination.name": bindingName,
+        "messaging.operation.type": "send",
+        "messaging.operation.name": "send",
+        ...messageCount !== void 0 && { "messaging.batch.message_count": messageCount },
+        "messaging.message.body.size": bodySize,
+        [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: "queue.publish",
+        [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: ORIGIN
+      }
     },
-    callback,
+    callback
   );
 }
-
 function getBodySize(body) {
   if (body == null) {
-    return undefined;
+    return void 0;
   }
-
-  if (typeof body === 'string') {
+  if (typeof body === "string") {
     return new TextEncoder().encode(body).byteLength;
   }
-
   if (body instanceof ArrayBuffer) {
     return body.byteLength;
   }
-
   if (ArrayBuffer.isView(body)) {
     return body.byteLength;
   }
-
   try {
     return new TextEncoder().encode(JSON.stringify(body)).byteLength;
   } catch {
-    return undefined;
+    return void 0;
   }
 }
-
-/**
- * Wraps a Queue producer binding to create `queue.publish` spans on
- * `send` and `sendBatch` calls.
- *
- * The queue's own name is not available on the binding object, so we use
- * the env binding key (e.g. `MY_QUEUE`) as `messaging.destination.name`.
- */
 function instrumentQueueProducer(queue, bindingName) {
   return new Proxy(queue, {
     get(target, prop, receiver) {
-      if (prop === 'send') {
-        const original = Reflect.get(target, prop, receiver) ;
-
-        return function ( message, options) {
-          return startPublishSpan({ bindingName, bodySize: getBodySize(message) }, () =>
-            Reflect.apply(original, target, [message, options]),
+      if (prop === "send") {
+        const original = Reflect.get(target, prop, receiver);
+        return function(message, options) {
+          return startPublishSpan(
+            { bindingName, bodySize: getBodySize(message) },
+            () => Reflect.apply(original, target, [message, options])
           );
         };
       }
-
-      if (prop === 'sendBatch') {
-        const original = Reflect.get(target, prop, receiver) ;
-        return function (
-
-          messages,
-          options,
-        ) {
+      if (prop === "sendBatch") {
+        const original = Reflect.get(target, prop, receiver);
+        return function(messages, options) {
           const messageArray = Array.from(messages);
           const totalBodySize = messageArray.reduce((acc, m) => {
             const size = getBodySize(m.body);
-            if (size === undefined) {
+            if (size === void 0) {
               return acc;
             }
             return (acc ?? 0) + size;
-          }, undefined);
-
-          return startPublishSpan({ bindingName, bodySize: totalBodySize, messageCount: messageArray.length }, () =>
-            Reflect.apply(original, target, [messageArray, options]),
+          }, void 0);
+          return startPublishSpan(
+            { bindingName, bodySize: totalBodySize, messageCount: messageArray.length },
+            () => Reflect.apply(original, target, [messageArray, options])
           );
         };
       }
-
       return Reflect.get(target, prop, receiver);
-    },
+    }
   });
 }
 

package/build/cjs/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":["startSpan","SEMANTIC_ATTRIBUTE_SENTRY_OP","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN"],"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): 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":["startSpan","SEMANTIC_ATTRIBUTE_SENTRY_OP","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN"],"mappings":"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"}