@sentry/cloudflare 9.17.0 → 9.18.0

package/build/cjs/handler.js

@@ -60,7 +60,7 @@ function withSentry(
                   'faas.cron': event.cron,
                   'faas.time': new Date(event.scheduledTime).toISOString(),
                   'faas.trigger': 'timer',
-                  [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare',
+                  [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.scheduled',
                   [core.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
                 },
               },
@@ -81,8 +81,122 @@ function withSentry(
 
       instrument.markAsInstrumented(handler.scheduled);
     }
+
+    if ('email' in handler && typeof handler.email === 'function' && !instrument.isInstrumented(handler.email)) {
+      handler.email = new Proxy(handler.email, {
+        apply(target, thisArg, args) {
+          const [emailMessage, env, context] = args;
+          return core.withIsolationScope(isolationScope => {
+            const options$1 = options.getFinalOptions(optionsCallback(env), env);
+
+            const client = sdk.init(options$1);
+            isolationScope.setClient(client);
+
+            scopeUtils.addCloudResourceContext(isolationScope);
+
+            return core.startSpan(
+              {
+                op: 'faas.email',
+                name: `Handle Email ${emailMessage.to}`,
+                attributes: {
+                  'faas.trigger': 'email',
+                  [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.email',
+                  [core.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+                },
+              },
+              async () => {
+                try {
+                  return await (target.apply(thisArg, args) );
+                } catch (e) {
+                  core.captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
+                  throw e;
+                } finally {
+                  context.waitUntil(core.flush(2000));
+                }
+              },
+            );
+          });
+        },
+      });
+
+      instrument.markAsInstrumented(handler.email);
+    }
+
+    if ('queue' in handler && typeof handler.queue === 'function' && !instrument.isInstrumented(handler.queue)) {
+      handler.queue = new Proxy(handler.queue, {
+        apply(target, thisArg, args) {
+          const [batch, env, context] = args;
+
+          return core.withIsolationScope(isolationScope => {
+            const options$1 = options.getFinalOptions(optionsCallback(env), env);
+
+            const client = sdk.init(options$1);
+            isolationScope.setClient(client);
+
+            scopeUtils.addCloudResourceContext(isolationScope);
+
+            return core.startSpan(
+              {
+                op: 'faas.queue',
+                name: `process ${batch.queue}`,
+                attributes: {
+                  'faas.trigger': 'pubsub',
+                  'messaging.destination.name': batch.queue,
+                  'messaging.system': 'cloudflare',
+                  'messaging.batch.message_count': batch.messages.length,
+                  'messaging.message.retry.count': batch.messages.reduce((acc, message) => acc + message.attempts, 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 (target.apply(thisArg, args) );
+                } catch (e) {
+                  core.captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
+                  throw e;
+                } finally {
+                  context.waitUntil(core.flush(2000));
+                }
+              },
+            );
+          });
+        },
+      });
+
+      instrument.markAsInstrumented(handler.queue);
+    }
+
+    if ('tail' in handler && typeof handler.tail === 'function' && !instrument.isInstrumented(handler.tail)) {
+      handler.tail = new Proxy(handler.tail, {
+        apply(target, thisArg, args) {
+          const [, env, context] = args;
+
+          return core.withIsolationScope(async isolationScope => {
+            const options$1 = options.getFinalOptions(optionsCallback(env), env);
+
+            const client = sdk.init(options$1);
+            isolationScope.setClient(client);
+
+            scopeUtils.addCloudResourceContext(isolationScope);
+
+            try {
+              return await (target.apply(thisArg, args) );
+            } catch (e) {
+              core.captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
+              throw e;
+            } finally {
+              context.waitUntil(core.flush(2000));
+            }
+          });
+        },
+      });
+
+      instrument.markAsInstrumented(handler.tail);
+    }
+
     // This is here because Miniflare sometimes cannot get instrumented
-    //
   } catch (e) {
     // Do not console anything here, we don't want to spam the console with errors
   }

package/build/cjs/handler.js.map

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

package/build/cjs/request.js

@@ -22,28 +22,15 @@ function wrapRequestHandler(
     const client = sdk.init(options);
     isolationScope.setClient(client);
 
-    const attributes = {
-      [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.cloudflare',
-      [core.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-      [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',
-      [core.SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: request.method,
-      [core.SEMANTIC_ATTRIBUTE_URL_FULL]: request.url,
-    };
+    const urlObject = core.parseStringToURLObject(request.url);
+    const [name, attributes] = core.getHttpSpanDetailsFromUrlObject(urlObject, 'server', 'auto.http.cloudflare', request);
 
     const contentLength = request.headers.get('content-length');
     if (contentLength) {
       attributes['http.request.body.size'] = parseInt(contentLength, 10);
     }
 
-    let pathname = '';
-    try {
-      const url = new URL(request.url);
-      pathname = url.pathname;
-      attributes['server.address'] = url.hostname;
-      attributes['url.scheme'] = url.protocol.replace(':', '');
-    } catch {
-      // skip
-    }
+    attributes[core.SEMANTIC_ATTRIBUTE_SENTRY_OP] = 'http.server';
 
     scopeUtils.addCloudResourceContext(isolationScope);
     if (request) {
@@ -54,8 +41,6 @@ function wrapRequestHandler(
       }
     }
 
-    const routeName = `${request.method} ${pathname ? core.stripUrlQueryAndFragment(pathname) : '/'}`;
-
     // Do not capture spans for OPTIONS and HEAD requests
     if (request.method === 'OPTIONS' || request.method === 'HEAD') {
       try {
@@ -76,7 +61,7 @@ function wrapRequestHandler(
         // See: https://developers.cloudflare.com/workers/runtime-apis/performance/
         return core.startSpan(
           {
-            name: routeName,
+            name,
             attributes,
           },
           async span => {

package/build/cjs/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sources":["../../src/request.ts"],"sourcesContent":["import type { ExecutionContext, IncomingRequestCfProperties } from '@cloudflare/workers-types';\nimport type { SpanAttributes } from '@sentry/core';\nimport {\n  captureException,\n  continueTrace,\n  flush,\n  SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  SEMANTIC_ATTRIBUTE_URL_FULL,\n  setHttpStatus,\n  startSpan,\n  stripUrlQueryAndFragment,\n  withIsolationScope,\n} from '@sentry/core';\nimport type { CloudflareOptions } from './client';\nimport { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils';\nimport { init } from './sdk';\n\ninterface RequestHandlerWrapperOptions {\n  options: CloudflareOptions;\n  request: Request<unknown, IncomingRequestCfProperties<unknown>>;\n  context: ExecutionContext;\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 } = wrapperOptions;\n\n    // In certain situations, the passed context can become undefined.\n    // For example, for Astro while prerendering pages at build time.\n    // see: https://github.com/getsentry/sentry-javascript/issues/13217\n    const context = wrapperOptions.context as ExecutionContext | undefined;\n\n    const client = init(options);\n    isolationScope.setClient(client);\n\n    const attributes: SpanAttributes = {\n      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.cloudflare',\n      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',\n      [SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: request.method,\n      [SEMANTIC_ATTRIBUTE_URL_FULL]: request.url,\n    };\n\n    const contentLength = request.headers.get('content-length');\n    if (contentLength) {\n      attributes['http.request.body.size'] = parseInt(contentLength, 10);\n    }\n\n    let pathname = '';\n    try {\n      const url = new URL(request.url);\n      pathname = url.pathname;\n      attributes['server.address'] = url.hostname;\n      attributes['url.scheme'] = url.protocol.replace(':', '');\n    } catch {\n      // skip\n    }\n\n    addCloudResourceContext(isolationScope);\n    if (request) {\n      addRequest(isolationScope, request);\n      if (request.cf) {\n        addCultureContext(isolationScope, request.cf);\n        attributes['network.protocol.name'] = request.cf.httpProtocol;\n      }\n    }\n\n    const routeName = `${request.method} ${pathname ? stripUrlQueryAndFragment(pathname) : '/'}`;\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        captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });\n        throw e;\n      } finally {\n        context?.waitUntil(flush(2000));\n      }\n    }\n\n    return continueTrace(\n      { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },\n      () => {\n        // Note: This span will not have a duration unless I/O happens in the handler. This is\n        // because of how the cloudflare workers runtime works.\n        // See: https://developers.cloudflare.com/workers/runtime-apis/performance/\n        return startSpan(\n          {\n            name: routeName,\n            attributes,\n          },\n          async span => {\n            try {\n              const res = await handler();\n              setHttpStatus(span, res.status);\n              return res;\n            } catch (e) {\n              captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });\n              throw e;\n            } finally {\n              context?.waitUntil(flush(2000));\n            }\n          },\n        );\n      },\n    );\n  });\n}\n"],"names":["withIsolationScope","init","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","SEMANTIC_ATTRIBUTE_SENTRY_OP","SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD","SEMANTIC_ATTRIBUTE_URL_FULL","addCloudResourceContext","addRequest","addCultureContext","stripUrlQueryAndFragment","captureException","flush","continueTrace","startSpan","setHttpStatus"],"mappings":"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"}
+{"version":3,"file":"request.js","sources":["../../src/request.ts"],"sourcesContent":["import type { ExecutionContext, IncomingRequestCfProperties } from '@cloudflare/workers-types';\nimport {\n  captureException,\n  continueTrace,\n  flush,\n  getHttpSpanDetailsFromUrlObject,\n  parseStringToURLObject,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  setHttpStatus,\n  startSpan,\n  withIsolationScope,\n} from '@sentry/core';\nimport type { CloudflareOptions } from './client';\nimport { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils';\nimport { init } from './sdk';\n\ninterface RequestHandlerWrapperOptions {\n  options: CloudflareOptions;\n  request: Request<unknown, IncomingRequestCfProperties<unknown>>;\n  context: ExecutionContext;\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 } = wrapperOptions;\n\n    // In certain situations, the passed context can become undefined.\n    // For example, for Astro while prerendering pages at build time.\n    // see: https://github.com/getsentry/sentry-javascript/issues/13217\n    const context = wrapperOptions.context as ExecutionContext | undefined;\n\n    const client = init(options);\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    attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] = 'http.server';\n\n    addCloudResourceContext(isolationScope);\n    if (request) {\n      addRequest(isolationScope, request);\n      if (request.cf) {\n        addCultureContext(isolationScope, request.cf);\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        captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });\n        throw e;\n      } finally {\n        context?.waitUntil(flush(2000));\n      }\n    }\n\n    return continueTrace(\n      { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },\n      () => {\n        // Note: This span will not have a duration unless I/O happens in the handler. This is\n        // because of how the cloudflare workers runtime works.\n        // See: https://developers.cloudflare.com/workers/runtime-apis/performance/\n        return startSpan(\n          {\n            name,\n            attributes,\n          },\n          async span => {\n            try {\n              const res = await handler();\n              setHttpStatus(span, res.status);\n              return res;\n            } catch (e) {\n              captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });\n              throw e;\n            } finally {\n              context?.waitUntil(flush(2000));\n            }\n          },\n        );\n      },\n    );\n  });\n}\n"],"names":["withIsolationScope","init","parseStringToURLObject","getHttpSpanDetailsFromUrlObject","SEMANTIC_ATTRIBUTE_SENTRY_OP","addCloudResourceContext","addRequest","addCultureContext","captureException","flush","continueTrace","startSpan","setHttpStatus"],"mappings":"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"}

package/build/esm/handler.js

@@ -1,4 +1,4 @@
-import { withIsolationScope, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, captureException, flush } from '@sentry/core';
+import { withIsolationScope, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, captureException, flush, SEMANTIC_ATTRIBUTE_SENTRY_OP } from '@sentry/core';
 import { setAsyncLocalStorageAsyncContextStrategy } from './async.js';
 import { isInstrumented, markAsInstrumented } from './instrument.js';
 import { getFinalOptions } from './options.js';
@@ -58,7 +58,7 @@ function withSentry(
                   'faas.cron': event.cron,
                   'faas.time': new Date(event.scheduledTime).toISOString(),
                   'faas.trigger': 'timer',
-                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare',
+                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.scheduled',
                   [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
                 },
               },
@@ -79,8 +79,122 @@ function withSentry(
 
       markAsInstrumented(handler.scheduled);
     }
+
+    if ('email' in handler && typeof handler.email === 'function' && !isInstrumented(handler.email)) {
+      handler.email = new Proxy(handler.email, {
+        apply(target, thisArg, args) {
+          const [emailMessage, env, context] = args;
+          return withIsolationScope(isolationScope => {
+            const options = getFinalOptions(optionsCallback(env), env);
+
+            const client = init(options);
+            isolationScope.setClient(client);
+
+            addCloudResourceContext(isolationScope);
+
+            return startSpan(
+              {
+                op: 'faas.email',
+                name: `Handle Email ${emailMessage.to}`,
+                attributes: {
+                  'faas.trigger': 'email',
+                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.email',
+                  [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+                },
+              },
+              async () => {
+                try {
+                  return await (target.apply(thisArg, args) );
+                } catch (e) {
+                  captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
+                  throw e;
+                } finally {
+                  context.waitUntil(flush(2000));
+                }
+              },
+            );
+          });
+        },
+      });
+
+      markAsInstrumented(handler.email);
+    }
+
+    if ('queue' in handler && typeof handler.queue === 'function' && !isInstrumented(handler.queue)) {
+      handler.queue = new Proxy(handler.queue, {
+        apply(target, thisArg, args) {
+          const [batch, env, context] = args;
+
+          return withIsolationScope(isolationScope => {
+            const options = getFinalOptions(optionsCallback(env), env);
+
+            const client = init(options);
+            isolationScope.setClient(client);
+
+            addCloudResourceContext(isolationScope);
+
+            return startSpan(
+              {
+                op: 'faas.queue',
+                name: `process ${batch.queue}`,
+                attributes: {
+                  'faas.trigger': 'pubsub',
+                  'messaging.destination.name': batch.queue,
+                  'messaging.system': 'cloudflare',
+                  'messaging.batch.message_count': batch.messages.length,
+                  'messaging.message.retry.count': batch.messages.reduce((acc, message) => acc + message.attempts, 0),
+                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'queue.process',
+                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.queue',
+                  [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+                },
+              },
+              async () => {
+                try {
+                  return await (target.apply(thisArg, args) );
+                } catch (e) {
+                  captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
+                  throw e;
+                } finally {
+                  context.waitUntil(flush(2000));
+                }
+              },
+            );
+          });
+        },
+      });
+
+      markAsInstrumented(handler.queue);
+    }
+
+    if ('tail' in handler && typeof handler.tail === 'function' && !isInstrumented(handler.tail)) {
+      handler.tail = new Proxy(handler.tail, {
+        apply(target, thisArg, args) {
+          const [, env, context] = args;
+
+          return withIsolationScope(async isolationScope => {
+            const options = getFinalOptions(optionsCallback(env), env);
+
+            const client = init(options);
+            isolationScope.setClient(client);
+
+            addCloudResourceContext(isolationScope);
+
+            try {
+              return await (target.apply(thisArg, args) );
+            } catch (e) {
+              captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
+              throw e;
+            } finally {
+              context.waitUntil(flush(2000));
+            }
+          });
+        },
+      });
+
+      markAsInstrumented(handler.tail);
+    }
+
     // This is here because Miniflare sometimes cannot get instrumented
-    //
   } catch (e) {
     // Do not console anything here, we don't want to spam the console with errors
   }

package/build/esm/handler.js.map

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

package/build/esm/package.json

@@ -1 +1 @@
-{"type":"module","version":"9.17.0","sideEffects":false}
+{"type":"module","version":"9.18.0","sideEffects":false}

package/build/esm/request.js

@@ -1,4 +1,4 @@
-import { withIsolationScope, SEMANTIC_ATTRIBUTE_URL_FULL, SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD, stripUrlQueryAndFragment, captureException, flush, continueTrace, startSpan, setHttpStatus, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { withIsolationScope, parseStringToURLObject, getHttpSpanDetailsFromUrlObject, SEMANTIC_ATTRIBUTE_SENTRY_OP, captureException, flush, continueTrace, startSpan, setHttpStatus } from '@sentry/core';
 import { addCloudResourceContext, addRequest, addCultureContext } from './scope-utils.js';
 import { init } from './sdk.js';
 
@@ -20,28 +20,15 @@ function wrapRequestHandler(
     const client = init(options);
     isolationScope.setClient(client);
 
-    const attributes = {
-      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.cloudflare',
-      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',
-      [SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: request.method,
-      [SEMANTIC_ATTRIBUTE_URL_FULL]: request.url,
-    };
+    const urlObject = parseStringToURLObject(request.url);
+    const [name, attributes] = getHttpSpanDetailsFromUrlObject(urlObject, 'server', 'auto.http.cloudflare', request);
 
     const contentLength = request.headers.get('content-length');
     if (contentLength) {
       attributes['http.request.body.size'] = parseInt(contentLength, 10);
     }
 
-    let pathname = '';
-    try {
-      const url = new URL(request.url);
-      pathname = url.pathname;
-      attributes['server.address'] = url.hostname;
-      attributes['url.scheme'] = url.protocol.replace(':', '');
-    } catch {
-      // skip
-    }
+    attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] = 'http.server';
 
     addCloudResourceContext(isolationScope);
     if (request) {
@@ -52,8 +39,6 @@ function wrapRequestHandler(
       }
     }
 
-    const routeName = `${request.method} ${pathname ? stripUrlQueryAndFragment(pathname) : '/'}`;
-
     // Do not capture spans for OPTIONS and HEAD requests
     if (request.method === 'OPTIONS' || request.method === 'HEAD') {
       try {
@@ -74,7 +59,7 @@ function wrapRequestHandler(
         // See: https://developers.cloudflare.com/workers/runtime-apis/performance/
         return startSpan(
           {
-            name: routeName,
+            name,
             attributes,
           },
           async span => {

package/build/esm/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sources":["../../src/request.ts"],"sourcesContent":["import type { ExecutionContext, IncomingRequestCfProperties } from '@cloudflare/workers-types';\nimport type { SpanAttributes } from '@sentry/core';\nimport {\n  captureException,\n  continueTrace,\n  flush,\n  SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  SEMANTIC_ATTRIBUTE_URL_FULL,\n  setHttpStatus,\n  startSpan,\n  stripUrlQueryAndFragment,\n  withIsolationScope,\n} from '@sentry/core';\nimport type { CloudflareOptions } from './client';\nimport { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils';\nimport { init } from './sdk';\n\ninterface RequestHandlerWrapperOptions {\n  options: CloudflareOptions;\n  request: Request<unknown, IncomingRequestCfProperties<unknown>>;\n  context: ExecutionContext;\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 } = wrapperOptions;\n\n    // In certain situations, the passed context can become undefined.\n    // For example, for Astro while prerendering pages at build time.\n    // see: https://github.com/getsentry/sentry-javascript/issues/13217\n    const context = wrapperOptions.context as ExecutionContext | undefined;\n\n    const client = init(options);\n    isolationScope.setClient(client);\n\n    const attributes: SpanAttributes = {\n      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.cloudflare',\n      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',\n      [SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: request.method,\n      [SEMANTIC_ATTRIBUTE_URL_FULL]: request.url,\n    };\n\n    const contentLength = request.headers.get('content-length');\n    if (contentLength) {\n      attributes['http.request.body.size'] = parseInt(contentLength, 10);\n    }\n\n    let pathname = '';\n    try {\n      const url = new URL(request.url);\n      pathname = url.pathname;\n      attributes['server.address'] = url.hostname;\n      attributes['url.scheme'] = url.protocol.replace(':', '');\n    } catch {\n      // skip\n    }\n\n    addCloudResourceContext(isolationScope);\n    if (request) {\n      addRequest(isolationScope, request);\n      if (request.cf) {\n        addCultureContext(isolationScope, request.cf);\n        attributes['network.protocol.name'] = request.cf.httpProtocol;\n      }\n    }\n\n    const routeName = `${request.method} ${pathname ? stripUrlQueryAndFragment(pathname) : '/'}`;\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        captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });\n        throw e;\n      } finally {\n        context?.waitUntil(flush(2000));\n      }\n    }\n\n    return continueTrace(\n      { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },\n      () => {\n        // Note: This span will not have a duration unless I/O happens in the handler. This is\n        // because of how the cloudflare workers runtime works.\n        // See: https://developers.cloudflare.com/workers/runtime-apis/performance/\n        return startSpan(\n          {\n            name: routeName,\n            attributes,\n          },\n          async span => {\n            try {\n              const res = await handler();\n              setHttpStatus(span, res.status);\n              return res;\n            } catch (e) {\n              captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });\n              throw e;\n            } finally {\n              context?.waitUntil(flush(2000));\n            }\n          },\n        );\n      },\n    );\n  });\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"request.js","sources":["../../src/request.ts"],"sourcesContent":["import type { ExecutionContext, IncomingRequestCfProperties } from '@cloudflare/workers-types';\nimport {\n  captureException,\n  continueTrace,\n  flush,\n  getHttpSpanDetailsFromUrlObject,\n  parseStringToURLObject,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  setHttpStatus,\n  startSpan,\n  withIsolationScope,\n} from '@sentry/core';\nimport type { CloudflareOptions } from './client';\nimport { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils';\nimport { init } from './sdk';\n\ninterface RequestHandlerWrapperOptions {\n  options: CloudflareOptions;\n  request: Request<unknown, IncomingRequestCfProperties<unknown>>;\n  context: ExecutionContext;\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 } = wrapperOptions;\n\n    // In certain situations, the passed context can become undefined.\n    // For example, for Astro while prerendering pages at build time.\n    // see: https://github.com/getsentry/sentry-javascript/issues/13217\n    const context = wrapperOptions.context as ExecutionContext | undefined;\n\n    const client = init(options);\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    attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] = 'http.server';\n\n    addCloudResourceContext(isolationScope);\n    if (request) {\n      addRequest(isolationScope, request);\n      if (request.cf) {\n        addCultureContext(isolationScope, request.cf);\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        captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });\n        throw e;\n      } finally {\n        context?.waitUntil(flush(2000));\n      }\n    }\n\n    return continueTrace(\n      { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },\n      () => {\n        // Note: This span will not have a duration unless I/O happens in the handler. This is\n        // because of how the cloudflare workers runtime works.\n        // See: https://developers.cloudflare.com/workers/runtime-apis/performance/\n        return startSpan(\n          {\n            name,\n            attributes,\n          },\n          async span => {\n            try {\n              const res = await handler();\n              setHttpStatus(span, res.status);\n              return res;\n            } catch (e) {\n              captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });\n              throw e;\n            } finally {\n              context?.waitUntil(flush(2000));\n            }\n          },\n        );\n      },\n    );\n  });\n}\n"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/handler.ts"],"names":[],"mappings":";AASA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAOlD;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,GAAG,GAAG,OAAO,EAAE,mBAAmB,GAAG,OAAO,EAAE,cAAc,GAAG,OAAO,EAC/F,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,iBAAiB,EAChD,OAAO,EAAE,eAAe,CAAC,GAAG,EAAE,mBAAmB,EAAE,cAAc,CAAC,GACjE,eAAe,CAAC,GAAG,EAAE,mBAAmB,EAAE,cAAc,CAAC,CAkE3D"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/handler.ts"],"names":[],"mappings":";AAUA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAOlD;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,GAAG,GAAG,OAAO,EAAE,mBAAmB,GAAG,OAAO,EAAE,cAAc,GAAG,OAAO,EAC/F,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,iBAAiB,EAChD,OAAO,EAAE,eAAe,CAAC,GAAG,EAAE,mBAAmB,EAAE,cAAc,CAAC,GACjE,eAAe,CAAC,GAAG,EAAE,mBAAmB,EAAE,cAAc,CAAC,CAoL3D"}

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

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAgB/F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAIlD,UAAU,4BAA4B;IACpC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,2BAA2B,CAAC,OAAO,CAAC,CAAC,CAAC;IAChE,OAAO,EAAE,gBAAgB,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,cAAc,EAAE,4BAA4B,EAC5C,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAC5D,OAAO,CAAC,QAAQ,CAAC,CAqFnB"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAY/F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAIlD,UAAU,4BAA4B;IACpC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,2BAA2B,CAAC,OAAO,CAAC,CAAC,CAAC;IAChE,OAAO,EAAE,gBAAgB,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,cAAc,EAAE,4BAA4B,EAC5C,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAC5D,OAAO,CAAC,QAAQ,CAAC,CAsEnB"}

package/package.json

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