@sentry/cloudflare 11.0.0-rc.1 → 11.1.0

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

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

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

@@ -70,7 +70,8 @@ function instrumentQueueProducer(queue, bindingName) {
           );
         };
       }
-      return Reflect.get(target, prop, receiver);
+      const value = Reflect.get(target, prop);
+      return typeof value === "function" ? value.bind(target) : value;
     }
   });
 }

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

package/build/esm/prod/package.json

@@ -1 +1 @@
-{"type":"module","version":"11.0.0-rc.1","sideEffects":false}
+{"type":"module","version":"11.1.0","sideEffects":false}

package/build/esm/prod/request.js

@@ -1,5 +1,6 @@
 import { initBaseSdk } from './baseSdk.js';
 import { wrapRequestHandlerWithInit } from './wrapRequestHandlerWithInit.js';
+export { httpServerIntegration } from './integrations/httpServer.js';
 
 function wrapRequestHandler(wrapperOptions, handler) {
   return wrapRequestHandlerWithInit(wrapperOptions, handler, initBaseSdk);

package/build/esm/prod/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sources":["../../../src/request.ts"],"sourcesContent":["import { initBaseSdk } from './baseSdk';\nimport type { CloudflareOptions } from './client';\nimport { type RequestHandlerWrapperOptions, wrapRequestHandlerWithInit } from './wrapRequestHandlerWithInit';\n\n/**\n * Wraps a cloudflare request handler in Sentry instrumentation.\n *\n * The client is set up with the default integrations that work without the `nodejs_compat`\n * compatibility flag, so that this also works on runtimes that cannot enable it (e.g. Shopify\n * Oxygen). On a runtime that has `nodejs_compat`, pass `defaultIntegrations:\n * getDefaultIntegrations(options)` in `options` to get the full set instead.\n */\nexport function wrapRequestHandler(\n  wrapperOptions: Omit<RequestHandlerWrapperOptions, 'options'> & {\n    // `enableOpenTelemetrySetup` is only honored by `init` from `sdk.ts`; this entry point\n    // initializes the SDK via `initBaseSdk`, where setting it would have no effect.\n    options: Omit<CloudflareOptions, 'enableOpenTelemetrySetup'>;\n  },\n  handler: (...args: unknown[]) => Response | Promise<Response>,\n): Promise<Response> {\n  return wrapRequestHandlerWithInit(wrapperOptions, handler, initBaseSdk);\n}\n"],"names":[],"mappings":";;;AAYO,SAAS,kBAAA,CACd,gBAKA,OAAA,EACmB;AACnB,EAAA,OAAO,0BAAA,CAA2B,cAAA,EAAgB,OAAA,EAAS,WAAW,CAAA;AACxE;;;;"}
+{"version":3,"file":"request.js","sources":["../../../src/request.ts"],"sourcesContent":["import { initBaseSdk } from './baseSdk';\nimport type { CloudflareOptions } from './client';\nimport { type RequestHandlerWrapperOptions, wrapRequestHandlerWithInit } from './wrapRequestHandlerWithInit';\n\n/**\n * Wraps a cloudflare request handler in Sentry instrumentation.\n *\n * The client is set up with the default integrations that work without the `nodejs_compat`\n * compatibility flag, so that this also works on runtimes that cannot enable it (e.g. Shopify\n * Oxygen). On a runtime that has `nodejs_compat`, pass `defaultIntegrations:\n * getDefaultIntegrations(options)` in `options` to get the full set instead.\n */\nexport function wrapRequestHandler(\n  wrapperOptions: Omit<RequestHandlerWrapperOptions, 'options'> & {\n    // `enableOpenTelemetrySetup` is only honored by `init` from `sdk.ts`; this entry point\n    // initializes the SDK via `initBaseSdk`, where setting it would have no effect.\n    options: Omit<CloudflareOptions, 'enableOpenTelemetrySetup'>;\n  },\n  handler: (...args: unknown[]) => Response | Promise<Response>,\n): Promise<Response> {\n  return wrapRequestHandlerWithInit(wrapperOptions, handler, initBaseSdk);\n}\n\nexport { httpServerIntegration } from './integrations/httpServer';\n"],"names":[],"mappings":";;;;AAYO,SAAS,kBAAA,CACd,gBAKA,OAAA,EACmB;AACnB,EAAA,OAAO,0BAAA,CAA2B,cAAA,EAAgB,OAAA,EAAS,WAAW,CAAA;AACxE;;;;"}

package/build/esm/prod/transport.js

@@ -1,4 +1,4 @@
-import { createTransport, suppressTracing, SENTRY_BUFFER_FULL_ERROR } from '@sentry/core';
+import { createTransport, SENTRY_BUFFER_FULL_ERROR, suppressTracing } from '@sentry/core';
 
 const DEFAULT_TRANSPORT_BUFFER_SIZE = 256;
 class IsolatedPromiseBuffer {
@@ -23,15 +23,24 @@ class IsolatedPromiseBuffer {
   drain(timeout) {
     const oldTaskProducers = [...this._taskProducers];
     this._taskProducers = [];
+    const drainController = new AbortController();
+    this.drainSignal = drainController.signal;
+    let tasks;
+    try {
+      tasks = oldTaskProducers.map((taskProducer) => taskProducer());
+    } finally {
+      this.drainSignal = void 0;
+    }
     return new Promise((resolve) => {
       const timer = setTimeout(() => {
         if (timeout && timeout > 0) {
+          drainController.abort();
           resolve(false);
         }
       }, timeout);
       Promise.all(
-        oldTaskProducers.map(
-          (taskProducer) => taskProducer().then(null, () => {
+        tasks.map(
+          (task) => task.then(null, () => {
           })
         )
       ).then(() => {
@@ -42,12 +51,17 @@ class IsolatedPromiseBuffer {
   }
 }
 function makeCloudflareTransport(options) {
+  const buffer = new IsolatedPromiseBuffer(options.bufferSize);
   function makeRequest(request) {
+    const drainSignal = buffer.drainSignal;
+    const callerSignal = options.fetchOptions?.signal ?? void 0;
+    const signal = drainSignal && callerSignal ? AbortSignal.any([drainSignal, callerSignal]) : drainSignal ?? callerSignal;
     const requestOptions = {
       body: request.body,
       method: "POST",
       headers: options.headers,
-      ...options.fetchOptions
+      ...options.fetchOptions,
+      ...signal ? { signal } : {}
     };
     return suppressTracing(() => {
       return (options.fetch ?? fetch)(options.url, requestOptions).then(async (response) => {
@@ -65,7 +79,7 @@ function makeCloudflareTransport(options) {
       });
     });
   }
-  return createTransport(options, makeRequest, new IsolatedPromiseBuffer(options.bufferSize));
+  return createTransport(options, makeRequest, buffer);
 }
 
 export { IsolatedPromiseBuffer, makeCloudflareTransport };

package/build/esm/prod/transport.js.map

@@ -1 +1 @@
-{"version":3,"file":"transport.js","sources":["../../../src/transport.ts"],"sourcesContent":["import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core';\nimport { createTransport, SENTRY_BUFFER_FULL_ERROR, suppressTracing } from '@sentry/core';\n\nexport interface CloudflareTransportOptions extends BaseTransportOptions {\n  /** Custom fetch function to use. This allows usage of things like Workers VPC */\n  fetch?: typeof fetch;\n  /** Fetch API init parameters. */\n  fetchOptions?: RequestInit;\n}\n\n/**\n * How many payloads the buffer holds before it starts rejecting new ones.\n *\n * With `cacheClient` a single client is reused across an isolate's invocations, so one buffer now has to absorb\n * the payloads of many invocations rather than one. 256 is the size that held up under load testing that scenario.\n */\nconst DEFAULT_TRANSPORT_BUFFER_SIZE = 256;\n\n/**\n * This is a modified promise buffer that collects tasks until drain is called.\n * We need this in the edge runtime because edge function invocations may not share I/O objects, like fetch requests\n * and responses, and the normal PromiseBuffer inherently buffers stuff inbetween incoming requests.\n *\n * A limitation we need to be aware of is that DEFAULT_TRANSPORT_BUFFER_SIZE is the maximum amount of payloads the\n * SDK can send for a given edge function invocation.\n */\nexport class IsolatedPromiseBuffer {\n  // We just have this field because the promise buffer interface requires it.\n  // If we ever remove it from the interface we should also remove it here.\n  public $: Array<PromiseLike<TransportMakeRequestResponse>>;\n\n  private _taskProducers: (() => PromiseLike<TransportMakeRequestResponse>)[];\n\n  private readonly _bufferSize: number;\n\n  public constructor(_bufferSize = DEFAULT_TRANSPORT_BUFFER_SIZE) {\n    this.$ = [];\n    this._taskProducers = [];\n    this._bufferSize = _bufferSize;\n  }\n\n  /**\n   * @inheritdoc\n   */\n  public add(taskProducer: () => PromiseLike<TransportMakeRequestResponse>): PromiseLike<TransportMakeRequestResponse> {\n    if (this._taskProducers.length >= this._bufferSize) {\n      return Promise.reject(SENTRY_BUFFER_FULL_ERROR);\n    }\n\n    this._taskProducers.push(taskProducer);\n    return Promise.resolve({});\n  }\n\n  /**\n   * @inheritdoc\n   */\n  public drain(timeout?: number): PromiseLike<boolean> {\n    const oldTaskProducers = [...this._taskProducers];\n    this._taskProducers = [];\n\n    return new Promise(resolve => {\n      const timer = setTimeout(() => {\n        if (timeout && timeout > 0) {\n          resolve(false);\n        }\n      }, timeout);\n\n      // This cannot reject\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      Promise.all(\n        oldTaskProducers.map(taskProducer =>\n          taskProducer().then(null, () => {\n            // catch all failed requests\n          }),\n        ),\n      ).then(() => {\n        // resolve to true if all fetch requests settled\n        clearTimeout(timer);\n        resolve(true);\n      });\n    });\n  }\n}\n\n/**\n * Creates a Transport that uses the native fetch API to send events to Sentry.\n */\nexport function makeCloudflareTransport(options: CloudflareTransportOptions): Transport {\n  function makeRequest(request: TransportRequest): PromiseLike<TransportMakeRequestResponse> {\n    const requestOptions: RequestInit = {\n      body: request.body as BodyInit,\n      method: 'POST',\n      headers: options.headers,\n      ...options.fetchOptions,\n    };\n\n    return suppressTracing(() => {\n      return (options.fetch ?? fetch)(options.url, requestOptions).then(async response => {\n        // Consume the response body to satisfy Cloudflare Workers' fetch requirements.\n        // The runtime requires all fetch response bodies to be read or explicitly canceled\n        // to prevent connection stalls and potential deadlocks. We read the body as text\n        // even though we don't use the content, as Sentry's response information is in the headers.\n        // See: https://github.com/getsentry/sentry-javascript/issues/18534\n        try {\n          await response.text();\n        } catch {\n          // no-op\n        }\n\n        return {\n          statusCode: response.status,\n          headers: {\n            'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),\n            'retry-after': response.headers.get('Retry-After'),\n          },\n        };\n      });\n    });\n  }\n\n  return createTransport(options, makeRequest, new IsolatedPromiseBuffer(options.bufferSize));\n}\n"],"names":[],"mappings":";;AAgBA,MAAM,6BAAA,GAAgC,GAAA;AAU/B,MAAM,qBAAA,CAAsB;AAAA,EAS1B,WAAA,CAAY,cAAc,6BAAA,EAA+B;AAC9D,IAAA,IAAA,CAAK,IAAI,EAAC;AACV,IAAA,IAAA,CAAK,iBAAiB,EAAC;AACvB,IAAA,IAAA,CAAK,WAAA,GAAc,WAAA;AAAA,EACrB;AAAA;AAAA;AAAA;AAAA,EAKO,IAAI,YAAA,EAA0G;AACnH,IAAA,IAAI,IAAA,CAAK,cAAA,CAAe,MAAA,IAAU,IAAA,CAAK,WAAA,EAAa;AAClD,MAAA,OAAO,OAAA,CAAQ,OAAO,wBAAwB,CAAA;AAAA,IAChD;AAEA,IAAA,IAAA,CAAK,cAAA,CAAe,KAAK,YAAY,CAAA;AACrC,IAAA,OAAO,OAAA,CAAQ,OAAA,CAAQ,EAAE,CAAA;AAAA,EAC3B;AAAA;AAAA;AAAA;AAAA,EAKO,MAAM,OAAA,EAAwC;AACnD,IAAA,MAAM,gBAAA,GAAmB,CAAC,GAAG,IAAA,CAAK,cAAc,CAAA;AAChD,IAAA,IAAA,CAAK,iBAAiB,EAAC;AAEvB,IAAA,OAAO,IAAI,QAAQ,CAAA,OAAA,KAAW;AAC5B,MAAA,MAAM,KAAA,GAAQ,WAAW,MAAM;AAC7B,QAAA,IAAI,OAAA,IAAW,UAAU,CAAA,EAAG;AAC1B,UAAA,OAAA,CAAQ,KAAK,CAAA;AAAA,QACf;AAAA,MACF,GAAG,OAAO,CAAA;AAIV,MAAA,OAAA,CAAQ,GAAA;AAAA,QACN,gBAAA,CAAiB,GAAA;AAAA,UAAI,CAAA,YAAA,KACnB,YAAA,EAAa,CAAE,IAAA,CAAK,MAAM,MAAM;AAAA,UAEhC,CAAC;AAAA;AACH,OACF,CAAE,KAAK,MAAM;AAEX,QAAA,YAAA,CAAa,KAAK,CAAA;AAClB,QAAA,OAAA,CAAQ,IAAI,CAAA;AAAA,MACd,CAAC,CAAA;AAAA,IACH,CAAC,CAAA;AAAA,EACH;AACF;AAKO,SAAS,wBAAwB,OAAA,EAAgD;AACtF,EAAA,SAAS,YAAY,OAAA,EAAsE;AACzF,IAAA,MAAM,cAAA,GAA8B;AAAA,MAClC,MAAM,OAAA,CAAQ,IAAA;AAAA,MACd,MAAA,EAAQ,MAAA;AAAA,MACR,SAAS,OAAA,CAAQ,OAAA;AAAA,MACjB,GAAG,OAAA,CAAQ;AAAA,KACb;AAEA,IAAA,OAAO,gBAAgB,MAAM;AAC3B,MAAA,OAAA,CAAQ,OAAA,CAAQ,SAAS,KAAA,EAAO,OAAA,CAAQ,KAAK,cAAc,CAAA,CAAE,IAAA,CAAK,OAAM,QAAA,KAAY;AAMlF,QAAA,IAAI;AACF,UAAA,MAAM,SAAS,IAAA,EAAK;AAAA,QACtB,CAAA,CAAA,MAAQ;AAAA,QAER;AAEA,QAAA,OAAO;AAAA,UACL,YAAY,QAAA,CAAS,MAAA;AAAA,UACrB,OAAA,EAAS;AAAA,YACP,sBAAA,EAAwB,QAAA,CAAS,OAAA,CAAQ,GAAA,CAAI,sBAAsB,CAAA;AAAA,YACnE,aAAA,EAAe,QAAA,CAAS,OAAA,CAAQ,GAAA,CAAI,aAAa;AAAA;AACnD,SACF;AAAA,MACF,CAAC,CAAA;AAAA,IACH,CAAC,CAAA;AAAA,EACH;AAEA,EAAA,OAAO,gBAAgB,OAAA,EAAS,WAAA,EAAa,IAAI,qBAAA,CAAsB,OAAA,CAAQ,UAAU,CAAC,CAAA;AAC5F;;;;"}
+{"version":3,"file":"transport.js","sources":["../../../src/transport.ts"],"sourcesContent":["import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core';\nimport { createTransport, SENTRY_BUFFER_FULL_ERROR, suppressTracing } from '@sentry/core';\n\nexport interface CloudflareTransportOptions extends BaseTransportOptions {\n  /** Custom fetch function to use. This allows usage of things like Workers VPC */\n  fetch?: typeof fetch;\n  /** Fetch API init parameters. */\n  fetchOptions?: RequestInit;\n}\n\n/**\n * How many payloads the buffer holds before it starts rejecting new ones.\n *\n * With `cacheClient` a single client is reused across an isolate's invocations, so one buffer now has to absorb\n * the payloads of many invocations rather than one. 256 is the size that held up under load testing that scenario.\n */\nconst DEFAULT_TRANSPORT_BUFFER_SIZE = 256;\n\n/**\n * This is a modified promise buffer that collects tasks until drain is called.\n * We need this in the edge runtime because edge function invocations may not share I/O objects, like fetch requests\n * and responses, and the normal PromiseBuffer inherently buffers stuff inbetween incoming requests.\n *\n * A limitation we need to be aware of is that DEFAULT_TRANSPORT_BUFFER_SIZE is the maximum amount of payloads the\n * SDK can send for a given edge function invocation.\n */\nexport class IsolatedPromiseBuffer {\n  // We just have this field because the promise buffer interface requires it.\n  // If we ever remove it from the interface we should also remove it here.\n  public $: Array<PromiseLike<TransportMakeRequestResponse>>;\n\n  /**\n   * Abort signal of the drain that is starting its requests. It is set only while `drain()` runs the task\n   * producers, so a request reads the signal of the drain that sends it.\n   */\n  public drainSignal: AbortSignal | undefined;\n\n  private _taskProducers: (() => PromiseLike<TransportMakeRequestResponse>)[];\n\n  private readonly _bufferSize: number;\n\n  public constructor(_bufferSize = DEFAULT_TRANSPORT_BUFFER_SIZE) {\n    this.$ = [];\n    this._taskProducers = [];\n    this._bufferSize = _bufferSize;\n  }\n\n  /**\n   * @inheritdoc\n   */\n  public add(taskProducer: () => PromiseLike<TransportMakeRequestResponse>): PromiseLike<TransportMakeRequestResponse> {\n    if (this._taskProducers.length >= this._bufferSize) {\n      return Promise.reject(SENTRY_BUFFER_FULL_ERROR);\n    }\n\n    this._taskProducers.push(taskProducer);\n    return Promise.resolve({});\n  }\n\n  /**\n   * @inheritdoc\n   */\n  public drain(timeout?: number): PromiseLike<boolean> {\n    const oldTaskProducers = [...this._taskProducers];\n    this._taskProducers = [];\n\n    const drainController = new AbortController();\n    this.drainSignal = drainController.signal;\n    let tasks: PromiseLike<TransportMakeRequestResponse>[];\n    try {\n      tasks = oldTaskProducers.map(taskProducer => taskProducer());\n    } finally {\n      this.drainSignal = undefined;\n    }\n\n    return new Promise(resolve => {\n      const timer = setTimeout(() => {\n        if (timeout && timeout > 0) {\n          // Requests still pending when the drain times out are aborted. Otherwise Cloudflare keeps them\n          // until it cancels the invocation's `waitUntil` work and logs a warning.\n          drainController.abort();\n          resolve(false);\n        }\n      }, timeout);\n\n      // This cannot reject\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      Promise.all(\n        tasks.map(task =>\n          task.then(null, () => {\n            // catch all failed requests\n          }),\n        ),\n      ).then(() => {\n        // resolve to true if all fetch requests settled\n        clearTimeout(timer);\n        resolve(true);\n      });\n    });\n  }\n}\n\n/**\n * Creates a Transport that uses the native fetch API to send events to Sentry.\n */\nexport function makeCloudflareTransport(options: CloudflareTransportOptions): Transport {\n  const buffer = new IsolatedPromiseBuffer(options.bufferSize);\n\n  function makeRequest(request: TransportRequest): PromiseLike<TransportMakeRequestResponse> {\n    const drainSignal = buffer.drainSignal;\n    const callerSignal = options.fetchOptions?.signal ?? undefined;\n    const signal =\n      drainSignal && callerSignal ? AbortSignal.any([drainSignal, callerSignal]) : (drainSignal ?? callerSignal);\n\n    const requestOptions: RequestInit = {\n      body: request.body as BodyInit,\n      method: 'POST',\n      headers: options.headers,\n      ...options.fetchOptions,\n      ...(signal ? { signal } : {}),\n    };\n\n    return suppressTracing(() => {\n      return (options.fetch ?? fetch)(options.url, requestOptions).then(async response => {\n        // Consume the response body to satisfy Cloudflare Workers' fetch requirements.\n        // The runtime requires all fetch response bodies to be read or explicitly canceled\n        // to prevent connection stalls and potential deadlocks. We read the body as text\n        // even though we don't use the content, as Sentry's response information is in the headers.\n        // See: https://github.com/getsentry/sentry-javascript/issues/18534\n        try {\n          await response.text();\n        } catch {\n          // no-op\n        }\n\n        return {\n          statusCode: response.status,\n          headers: {\n            'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),\n            'retry-after': response.headers.get('Retry-After'),\n          },\n        };\n      });\n    });\n  }\n\n  return createTransport(options, makeRequest, buffer);\n}\n"],"names":[],"mappings":";;AAgBA,MAAM,6BAAA,GAAgC,GAAA;AAU/B,MAAM,qBAAA,CAAsB;AAAA,EAe1B,WAAA,CAAY,cAAc,6BAAA,EAA+B;AAC9D,IAAA,IAAA,CAAK,IAAI,EAAC;AACV,IAAA,IAAA,CAAK,iBAAiB,EAAC;AACvB,IAAA,IAAA,CAAK,WAAA,GAAc,WAAA;AAAA,EACrB;AAAA;AAAA;AAAA;AAAA,EAKO,IAAI,YAAA,EAA0G;AACnH,IAAA,IAAI,IAAA,CAAK,cAAA,CAAe,MAAA,IAAU,IAAA,CAAK,WAAA,EAAa;AAClD,MAAA,OAAO,OAAA,CAAQ,OAAO,wBAAwB,CAAA;AAAA,IAChD;AAEA,IAAA,IAAA,CAAK,cAAA,CAAe,KAAK,YAAY,CAAA;AACrC,IAAA,OAAO,OAAA,CAAQ,OAAA,CAAQ,EAAE,CAAA;AAAA,EAC3B;AAAA;AAAA;AAAA;AAAA,EAKO,MAAM,OAAA,EAAwC;AACnD,IAAA,MAAM,gBAAA,GAAmB,CAAC,GAAG,IAAA,CAAK,cAAc,CAAA;AAChD,IAAA,IAAA,CAAK,iBAAiB,EAAC;AAEvB,IAAA,MAAM,eAAA,GAAkB,IAAI,eAAA,EAAgB;AAC5C,IAAA,IAAA,CAAK,cAAc,eAAA,CAAgB,MAAA;AACnC,IAAA,IAAI,KAAA;AACJ,IAAA,IAAI;AACF,MAAA,KAAA,GAAQ,gBAAA,CAAiB,GAAA,CAAI,CAAA,YAAA,KAAgB,YAAA,EAAc,CAAA;AAAA,IAC7D,CAAA,SAAE;AACA,MAAA,IAAA,CAAK,WAAA,GAAc,MAAA;AAAA,IACrB;AAEA,IAAA,OAAO,IAAI,QAAQ,CAAA,OAAA,KAAW;AAC5B,MAAA,MAAM,KAAA,GAAQ,WAAW,MAAM;AAC7B,QAAA,IAAI,OAAA,IAAW,UAAU,CAAA,EAAG;AAG1B,UAAA,eAAA,CAAgB,KAAA,EAAM;AACtB,UAAA,OAAA,CAAQ,KAAK,CAAA;AAAA,QACf;AAAA,MACF,GAAG,OAAO,CAAA;AAIV,MAAA,OAAA,CAAQ,GAAA;AAAA,QACN,KAAA,CAAM,GAAA;AAAA,UAAI,CAAA,IAAA,KACR,IAAA,CAAK,IAAA,CAAK,IAAA,EAAM,MAAM;AAAA,UAEtB,CAAC;AAAA;AACH,OACF,CAAE,KAAK,MAAM;AAEX,QAAA,YAAA,CAAa,KAAK,CAAA;AAClB,QAAA,OAAA,CAAQ,IAAI,CAAA;AAAA,MACd,CAAC,CAAA;AAAA,IACH,CAAC,CAAA;AAAA,EACH;AACF;AAKO,SAAS,wBAAwB,OAAA,EAAgD;AACtF,EAAA,MAAM,MAAA,GAAS,IAAI,qBAAA,CAAsB,OAAA,CAAQ,UAAU,CAAA;AAE3D,EAAA,SAAS,YAAY,OAAA,EAAsE;AACzF,IAAA,MAAM,cAAc,MAAA,CAAO,WAAA;AAC3B,IAAA,MAAM,YAAA,GAAe,OAAA,CAAQ,YAAA,EAAc,MAAA,IAAU,MAAA;AACrD,IAAA,MAAM,MAAA,GACJ,WAAA,IAAe,YAAA,GAAe,WAAA,CAAY,GAAA,CAAI,CAAC,WAAA,EAAa,YAAY,CAAC,CAAA,GAAK,WAAA,IAAe,YAAA;AAE/F,IAAA,MAAM,cAAA,GAA8B;AAAA,MAClC,MAAM,OAAA,CAAQ,IAAA;AAAA,MACd,MAAA,EAAQ,MAAA;AAAA,MACR,SAAS,OAAA,CAAQ,OAAA;AAAA,MACjB,GAAG,OAAA,CAAQ,YAAA;AAAA,MACX,GAAI,MAAA,GAAS,EAAE,MAAA,KAAW;AAAC,KAC7B;AAEA,IAAA,OAAO,gBAAgB,MAAM;AAC3B,MAAA,OAAA,CAAQ,OAAA,CAAQ,SAAS,KAAA,EAAO,OAAA,CAAQ,KAAK,cAAc,CAAA,CAAE,IAAA,CAAK,OAAM,QAAA,KAAY;AAMlF,QAAA,IAAI;AACF,UAAA,MAAM,SAAS,IAAA,EAAK;AAAA,QACtB,CAAA,CAAA,MAAQ;AAAA,QAER;AAEA,QAAA,OAAO;AAAA,UACL,YAAY,QAAA,CAAS,MAAA;AAAA,UACrB,OAAA,EAAS;AAAA,YACP,sBAAA,EAAwB,QAAA,CAAS,OAAA,CAAQ,GAAA,CAAI,sBAAsB,CAAA;AAAA,YACnE,aAAA,EAAe,QAAA,CAAS,OAAA,CAAQ,GAAA,CAAI,aAAa;AAAA;AACnD,SACF;AAAA,MACF,CAAC,CAAA;AAAA,IACH,CAAC,CAAA;AAAA,EACH;AAEA,EAAA,OAAO,eAAA,CAAgB,OAAA,EAAS,WAAA,EAAa,MAAM,CAAA;AACrD;;;;"}

package/build/esm/prod/vite/flueRuntime.js

@@ -1,41 +1,13 @@
-import { createRequire } from 'node:module';
-import { resolve } from 'node:path';
-import MagicString from 'magic-string';
+import { createProvidedModulePlugin } from './providedModulePlugin.js';
 
-const PROVIDER_IDENTIFIER = "__SENTRY_FLUE_RUNTIME__";
-const FLUE_MODULE = "@flue/runtime";
-const FLUE_INTEGRATION_ID = /@sentry\/server-utils\/build\/esm\/integrations\/flue\.js$/;
-function isFlueIntegrationModuleId(id) {
-  const normalizedId = id.replace(/\\/g, "/").replace(/[?#].*$/, "");
-  return FLUE_INTEGRATION_ID.test(normalizedId);
-}
 function sentryFlueRuntimeProviderPlugin() {
-  let providerSnippet;
-  return {
+  return createProvidedModulePlugin({
     name: "sentry-cloudflare-flue-runtime-provider",
-    configResolved(config) {
-      try {
-        createRequire(resolve(config.root, "noop.js")).resolve(FLUE_MODULE);
-      } catch (error) {
-        const code = error?.code;
-        if (code === "MODULE_NOT_FOUND" || code === "ERR_MODULE_NOT_FOUND") {
-          return;
-        }
-      }
-      providerSnippet = `import * as ${PROVIDER_IDENTIFIER} from '${FLUE_MODULE}';
-(globalThis.__SENTRY_ORCHESTRION__ = globalThis.__SENTRY_ORCHESTRION__ || {});
-(globalThis.__SENTRY_ORCHESTRION__.providedModules = globalThis.__SENTRY_ORCHESTRION__.providedModules || {});
-Object.defineProperty(globalThis.__SENTRY_ORCHESTRION__.providedModules, '${FLUE_MODULE}', { configurable: true, enumerable: true, get() { return ${PROVIDER_IDENTIFIER}; } });
-`;
-    },
-    transform(code, id) {
-      if (!providerSnippet || !isFlueIntegrationModuleId(id) || code.includes(PROVIDER_IDENTIFIER)) return void 0;
-      const ms = new MagicString(code);
-      ms.prepend(providerSnippet);
-      return { code: ms.toString(), map: ms.generateMap({ hires: true }) };
-    }
-  };
+    moduleName: "@flue/runtime",
+    identifier: "__SENTRY_FLUE_RUNTIME__",
+    integrationModule: "flue"
+  });
 }
 
-export { isFlueIntegrationModuleId, sentryFlueRuntimeProviderPlugin };
+export { sentryFlueRuntimeProviderPlugin };
 //# sourceMappingURL=flueRuntime.js.map

package/build/esm/prod/vite/flueRuntime.js.map

@@ -1 +1 @@
-{"version":3,"file":"flueRuntime.js","sources":["../../../../src/vite/flueRuntime.ts"],"sourcesContent":["import { createRequire } from 'node:module';\nimport { resolve } from 'node:path';\nimport MagicString from 'magic-string';\n\n// Namespace binding the injected provider import uses; read back by the integration\n// off the global marker.\nconst PROVIDER_IDENTIFIER = '__SENTRY_FLUE_RUNTIME__';\n\nconst FLUE_MODULE = '@flue/runtime';\n\n// The bundled `@sentry/server-utils` Flue integration module (ESM build — the only one a\n// worker loads). It reads `@flue/runtime` off the global marker this provider populates,\n// because `instrument()` registers into module-scope state no channel payload can carry.\nconst FLUE_INTEGRATION_ID = /@sentry\\/server-utils\\/build\\/esm\\/integrations\\/flue\\.js$/;\n\n/** Whether `id` is the Sentry Flue integration module the provider injects into. */\nexport function isFlueIntegrationModuleId(id: string): boolean {\n  const normalizedId = id.replace(/\\\\/g, '/').replace(/[?#].*$/, '');\n  return FLUE_INTEGRATION_ID.test(normalizedId);\n}\n\n/**\n * Splices a static `import * as … from '@flue/runtime'` into Sentry's own Flue integration module\n * and exposes the namespace on the global orchestrion marker.\n *\n * Flue is registered rather than patched — `instrument()` writes into module-scope state — so\n * instrumenting it needs that module's own binding, and no channel payload carries one. On Node the\n * user passes it by calling `instrument()` themselves; a bundled worker has no `node_modules` to\n * resolve from, so it is supplied at build time instead.\n */\nexport function sentryFlueRuntimeProviderPlugin(): {\n  name: string;\n  configResolved(config: { root: string }): void;\n  transform(code: string, id: string): { code: string; map: ReturnType<MagicString['generateMap']> } | undefined;\n} {\n  let providerSnippet: string | undefined;\n\n  return {\n    name: 'sentry-cloudflare-flue-runtime-provider',\n\n    configResolved(config: { root: string }): void {\n      // Build-time only; never ships to the worker. Probed with CJS resolution, which an ESM-only\n      // `@flue/runtime` fails with `ERR_PACKAGE_PATH_NOT_EXPORTED` — so only a module-not-found\n      // counts as absent, and any other failure still injects and lets Vite report it. Not\n      // `import.meta.resolve`: `parentURL` is ignored without a flag, and it is absent from the\n      // CJS build.\n      try {\n        createRequire(resolve(config.root, 'noop.js')).resolve(FLUE_MODULE);\n      } catch (error) {\n        const code = (error as NodeJS.ErrnoException | undefined)?.code;\n        if (code === 'MODULE_NOT_FOUND' || code === 'ERR_MODULE_NOT_FOUND') {\n          return;\n        }\n      }\n      // A getter where Mastra assigns: the bundler may evaluate Sentry's module before\n      // `@flue/runtime` is initialized, and assigning there would store `undefined`.\n      providerSnippet =\n        `import * as ${PROVIDER_IDENTIFIER} from '${FLUE_MODULE}';\\n` +\n        '(globalThis.__SENTRY_ORCHESTRION__ = globalThis.__SENTRY_ORCHESTRION__ || {});\\n' +\n        '(globalThis.__SENTRY_ORCHESTRION__.providedModules = globalThis.__SENTRY_ORCHESTRION__.providedModules || {});\\n' +\n        `Object.defineProperty(globalThis.__SENTRY_ORCHESTRION__.providedModules, '${FLUE_MODULE}', ` +\n        `{ configurable: true, enumerable: true, get() { return ${PROVIDER_IDENTIFIER}; } });\\n`;\n    },\n\n    transform(code: string, id: string): { code: string; map: ReturnType<MagicString['generateMap']> } | undefined {\n      // `code.includes` keeps this idempotent: a second pass over already-injected output would\n      // otherwise emit a duplicate `import * as` binding, which is a syntax error.\n      if (!providerSnippet || !isFlueIntegrationModuleId(id) || code.includes(PROVIDER_IDENTIFIER)) return undefined;\n\n      const ms = new MagicString(code);\n      ms.prepend(providerSnippet);\n      return { code: ms.toString(), map: ms.generateMap({ hires: true }) };\n    },\n  };\n}\n"],"names":[],"mappings":";;;;AAMA,MAAM,mBAAA,GAAsB,yBAAA;AAE5B,MAAM,WAAA,GAAc,eAAA;AAKpB,MAAM,mBAAA,GAAsB,4DAAA;AAGrB,SAAS,0BAA0B,EAAA,EAAqB;AAC7D,EAAA,MAAM,YAAA,GAAe,GAAG,OAAA,CAAQ,KAAA,EAAO,GAAG,CAAA,CAAE,OAAA,CAAQ,WAAW,EAAE,CAAA;AACjE,EAAA,OAAO,mBAAA,CAAoB,KAAK,YAAY,CAAA;AAC9C;AAWO,SAAS,+BAAA,GAId;AACA,EAAA,IAAI,eAAA;AAEJ,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,yCAAA;AAAA,IAEN,eAAe,MAAA,EAAgC;AAM7C,MAAA,IAAI;AACF,QAAA,aAAA,CAAc,QAAQ,MAAA,CAAO,IAAA,EAAM,SAAS,CAAC,CAAA,CAAE,QAAQ,WAAW,CAAA;AAAA,MACpE,SAAS,KAAA,EAAO;AACd,QAAA,MAAM,OAAQ,KAAA,EAA6C,IAAA;AAC3D,QAAA,IAAI,IAAA,KAAS,kBAAA,IAAsB,IAAA,KAAS,sBAAA,EAAwB;AAClE,UAAA;AAAA,QACF;AAAA,MACF;AAGA,MAAA,eAAA,GACE,CAAA,YAAA,EAAe,mBAAmB,CAAA,OAAA,EAAU,WAAW,CAAA;AAAA;AAAA;AAAA,0EAAA,EAGsB,WAAW,6DAC9B,mBAAmB,CAAA;AAAA,CAAA;AAAA,IACjF,CAAA;AAAA,IAEA,SAAA,CAAU,MAAc,EAAA,EAAuF;AAG7G,MAAA,IAAI,CAAC,eAAA,IAAmB,CAAC,yBAAA,CAA0B,EAAE,KAAK,IAAA,CAAK,QAAA,CAAS,mBAAmB,CAAA,EAAG,OAAO,MAAA;AAErG,MAAA,MAAM,EAAA,GAAK,IAAI,WAAA,CAAY,IAAI,CAAA;AAC/B,MAAA,EAAA,CAAG,QAAQ,eAAe,CAAA;AAC1B,MAAA,OAAO,EAAE,IAAA,EAAM,EAAA,CAAG,QAAA,EAAS,EAAG,GAAA,EAAK,EAAA,CAAG,WAAA,CAAY,EAAE,KAAA,EAAO,IAAA,EAAM,CAAA,EAAE;AAAA,IACrE;AAAA,GACF;AACF;;;;"}
+{"version":3,"file":"flueRuntime.js","sources":["../../../../src/vite/flueRuntime.ts"],"sourcesContent":["import type { ProvidedModulePlugin } from './providedModulePlugin';\nimport { createProvidedModulePlugin } from './providedModulePlugin';\n\n/**\n * Splices a static `import * as … from '@flue/runtime'` into Sentry's own Flue integration module\n * and exposes the namespace on the global orchestrion marker.\n *\n * Flue is registered rather than patched — `instrument()` writes into module-scope state — so\n * instrumenting it needs that module's own binding, and no channel payload carries one. On Node the\n * user passes it by calling `instrument()` themselves; a bundled worker has no `node_modules` to\n * resolve from, so it is supplied at build time instead.\n */\nexport function sentryFlueRuntimeProviderPlugin(): ProvidedModulePlugin {\n  return createProvidedModulePlugin({\n    name: 'sentry-cloudflare-flue-runtime-provider',\n    moduleName: '@flue/runtime',\n    identifier: '__SENTRY_FLUE_RUNTIME__',\n    integrationModule: 'flue',\n  });\n}\n"],"names":[],"mappings":";;AAYO,SAAS,+BAAA,GAAwD;AACtE,EAAA,OAAO,0BAAA,CAA2B;AAAA,IAChC,IAAA,EAAM,yCAAA;AAAA,IACN,UAAA,EAAY,eAAA;AAAA,IACZ,UAAA,EAAY,yBAAA;AAAA,IACZ,iBAAA,EAAmB;AAAA,GACpB,CAAA;AACH;;;;"}

package/build/esm/prod/vite/mastraObservability.js

@@ -1,36 +1,13 @@
-import { createRequire } from 'node:module';
-import { resolve } from 'node:path';
-import MagicString from 'magic-string';
+import { createProvidedModulePlugin } from './providedModulePlugin.js';
 
-const PROVIDER_IDENTIFIER = "__SENTRY_MASTRA_OBSERVABILITY__";
-const MASTRA_INTEGRATION_ID = /@sentry\/server-utils\/build\/esm\/integrations\/mastra\.js$/;
-function isMastraIntegrationModuleId(id) {
-  const normalizedId = id.replace(/\\/g, "/").replace(/[?#].*$/, "");
-  return MASTRA_INTEGRATION_ID.test(normalizedId);
-}
 function sentryMastraObservabilityProviderPlugin() {
-  let providerSnippet;
-  return {
+  return createProvidedModulePlugin({
     name: "sentry-cloudflare-mastra-observability-provider",
-    configResolved(config) {
-      try {
-        createRequire(resolve(config.root, "noop.js")).resolve("@mastra/observability");
-      } catch {
-        return;
-      }
-      providerSnippet = `import * as ${PROVIDER_IDENTIFIER} from '@mastra/observability';
-(globalThis.__SENTRY_ORCHESTRION__ = globalThis.__SENTRY_ORCHESTRION__ || {});
-(globalThis.__SENTRY_ORCHESTRION__.providedModules = globalThis.__SENTRY_ORCHESTRION__.providedModules || {})['@mastra/observability'] = ${PROVIDER_IDENTIFIER};
-`;
-    },
-    transform(code, id) {
-      if (!providerSnippet || !isMastraIntegrationModuleId(id)) return void 0;
-      const ms = new MagicString(code);
-      ms.prepend(providerSnippet);
-      return { code: ms.toString(), map: ms.generateMap({ hires: true }) };
-    }
-  };
+    moduleName: "@mastra/observability",
+    identifier: "__SENTRY_MASTRA_OBSERVABILITY__",
+    integrationModule: "mastra"
+  });
 }
 
-export { isMastraIntegrationModuleId, sentryMastraObservabilityProviderPlugin };
+export { sentryMastraObservabilityProviderPlugin };
 //# sourceMappingURL=mastraObservability.js.map

package/build/esm/prod/vite/mastraObservability.js.map

@@ -1 +1 @@
-{"version":3,"file":"mastraObservability.js","sources":["../../../../src/vite/mastraObservability.ts"],"sourcesContent":["import { createRequire } from 'node:module';\nimport { resolve } from 'node:path';\nimport MagicString from 'magic-string';\n\n// Namespace binding the injected provider import uses; read back by the integration\n// off the global marker.\nconst PROVIDER_IDENTIFIER = '__SENTRY_MASTRA_OBSERVABILITY__';\n\n// The bundled `@sentry/server-utils` Mastra integration module (ESM build — the only\n// one a worker loads). Its `loadMastraObservability` reads `@mastra/observability` off\n// the global marker this provider populates, instead of `createRequire`, which cannot\n// resolve a package inside a bundled worker.\nconst MASTRA_INTEGRATION_ID = /@sentry\\/server-utils\\/build\\/esm\\/integrations\\/mastra\\.js$/;\n\n/** Whether `id` is the Sentry Mastra integration module the provider injects into. */\nexport function isMastraIntegrationModuleId(id: string): boolean {\n  const normalizedId = id.replace(/\\\\/g, '/').replace(/[?#].*$/, '');\n  return MASTRA_INTEGRATION_ID.test(normalizedId);\n}\n\n/**\n * Splices a static `import * as … from '@mastra/observability'` into Sentry's own\n * Mastra integration module and stashes the namespace on the global orchestrion\n * marker.\n *\n * On Cloudflare the integration cannot `createRequire('@mastra/observability')` to\n * bootstrap Mastra's observability pipeline — there is no on-disk `node_modules` in\n * workerd — so without this the user has to construct and wire up an `Observability`\n * themselves. The import is static (statically analyzable, no lazy `import()`), lands\n * in Sentry's module rather than the user's code, and is only emitted when the package\n * actually resolves; if it is absent, the integration keeps its Node `createRequire`\n * fallback and the marker stays empty.\n */\nexport function sentryMastraObservabilityProviderPlugin(): {\n  name: string;\n  configResolved(config: { root: string }): void;\n  transform(code: string, id: string): { code: string; map: ReturnType<MagicString['generateMap']> } | undefined;\n} {\n  let providerSnippet: string | undefined;\n\n  return {\n    name: 'sentry-cloudflare-mastra-observability-provider',\n\n    configResolved(config: { root: string }): void {\n      // Resolved at build time (Node), so this `createRequire` never ships to the worker.\n      try {\n        createRequire(resolve(config.root, 'noop.js')).resolve('@mastra/observability');\n      } catch {\n        return;\n      }\n      providerSnippet =\n        `import * as ${PROVIDER_IDENTIFIER} from '@mastra/observability';\\n` +\n        '(globalThis.__SENTRY_ORCHESTRION__ = globalThis.__SENTRY_ORCHESTRION__ || {});\\n' +\n        '(globalThis.__SENTRY_ORCHESTRION__.providedModules = globalThis.__SENTRY_ORCHESTRION__.providedModules || {})' +\n        `['@mastra/observability'] = ${PROVIDER_IDENTIFIER};\\n`;\n    },\n\n    transform(code: string, id: string): { code: string; map: ReturnType<MagicString['generateMap']> } | undefined {\n      if (!providerSnippet || !isMastraIntegrationModuleId(id)) return undefined;\n\n      const ms = new MagicString(code);\n      ms.prepend(providerSnippet);\n      return { code: ms.toString(), map: ms.generateMap({ hires: true }) };\n    },\n  };\n}\n"],"names":[],"mappings":";;;;AAMA,MAAM,mBAAA,GAAsB,iCAAA;AAM5B,MAAM,qBAAA,GAAwB,8DAAA;AAGvB,SAAS,4BAA4B,EAAA,EAAqB;AAC/D,EAAA,MAAM,YAAA,GAAe,GAAG,OAAA,CAAQ,KAAA,EAAO,GAAG,CAAA,CAAE,OAAA,CAAQ,WAAW,EAAE,CAAA;AACjE,EAAA,OAAO,qBAAA,CAAsB,KAAK,YAAY,CAAA;AAChD;AAeO,SAAS,uCAAA,GAId;AACA,EAAA,IAAI,eAAA;AAEJ,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,iDAAA;AAAA,IAEN,eAAe,MAAA,EAAgC;AAE7C,MAAA,IAAI;AACF,QAAA,aAAA,CAAc,QAAQ,MAAA,CAAO,IAAA,EAAM,SAAS,CAAC,CAAA,CAAE,QAAQ,uBAAuB,CAAA;AAAA,MAChF,CAAA,CAAA,MAAQ;AACN,QAAA;AAAA,MACF;AACA,MAAA,eAAA,GACE,eAAe,mBAAmB,CAAA;AAAA;AAAA,yIAAA,EAGH,mBAAmB,CAAA;AAAA,CAAA;AAAA,IACtD,CAAA;AAAA,IAEA,SAAA,CAAU,MAAc,EAAA,EAAuF;AAC7G,MAAA,IAAI,CAAC,eAAA,IAAmB,CAAC,2BAAA,CAA4B,EAAE,GAAG,OAAO,MAAA;AAEjE,MAAA,MAAM,EAAA,GAAK,IAAI,WAAA,CAAY,IAAI,CAAA;AAC/B,MAAA,EAAA,CAAG,QAAQ,eAAe,CAAA;AAC1B,MAAA,OAAO,EAAE,IAAA,EAAM,EAAA,CAAG,QAAA,EAAS,EAAG,GAAA,EAAK,EAAA,CAAG,WAAA,CAAY,EAAE,KAAA,EAAO,IAAA,EAAM,CAAA,EAAE;AAAA,IACrE;AAAA,GACF;AACF;;;;"}
+{"version":3,"file":"mastraObservability.js","sources":["../../../../src/vite/mastraObservability.ts"],"sourcesContent":["import type { ProvidedModulePlugin } from './providedModulePlugin';\nimport { createProvidedModulePlugin } from './providedModulePlugin';\n\n/**\n * Splices a static `import * as … from '@mastra/observability'` into Sentry's own Mastra\n * integration module and stashes the namespace on the global orchestrion marker.\n *\n * On Cloudflare the integration cannot `createRequire('@mastra/observability')` to bootstrap\n * Mastra's observability pipeline — there is no on-disk `node_modules` in workerd — so without\n * this the user has to construct and wire up an `Observability` themselves. If the package is\n * absent, the integration keeps its Node `createRequire` fallback and the marker stays empty.\n */\nexport function sentryMastraObservabilityProviderPlugin(): ProvidedModulePlugin {\n  return createProvidedModulePlugin({\n    name: 'sentry-cloudflare-mastra-observability-provider',\n    moduleName: '@mastra/observability',\n    identifier: '__SENTRY_MASTRA_OBSERVABILITY__',\n    integrationModule: 'mastra',\n  });\n}\n"],"names":[],"mappings":";;AAYO,SAAS,uCAAA,GAAgE;AAC9E,EAAA,OAAO,0BAAA,CAA2B;AAAA,IAChC,IAAA,EAAM,iDAAA;AAAA,IACN,UAAA,EAAY,uBAAA;AAAA,IACZ,UAAA,EAAY,iCAAA;AAAA,IACZ,iBAAA,EAAmB;AAAA,GACpB,CAAA;AACH;;;;"}

package/build/esm/prod/vite/providedModulePlugin.js

@@ -0,0 +1,50 @@
+import { resolve } from 'node:path';
+import MagicString from 'magic-string';
+
+function createIntegrationModuleMatcher(integrationModule) {
+  const suffix = `@sentry/server-utils/build/esm/integrations/${integrationModule}.js`;
+  return (id) => id.replace(/\\/g, "/").replace(/[?#].*$/, "").endsWith(suffix);
+}
+function buildProviderSnippet({ moduleName, identifier }) {
+  const marker = "globalThis.__SENTRY_ORCHESTRION__";
+  return `import * as ${identifier} from '${moduleName}';
+(${marker} = ${marker} || {});
+(${marker}.providedModules = ${marker}.providedModules || {});
+Object.defineProperty(${marker}.providedModules, '${moduleName}', { configurable: true, enumerable: true, get() { return ${identifier}; } });
+`;
+}
+function createProvidedModulePlugin(options) {
+  const isIntegrationModuleId = createIntegrationModuleMatcher(options.integrationModule);
+  let root = process.cwd();
+  let providerSnippet;
+  return {
+    name: options.name,
+    applyToEnvironment(environment) {
+      return environment.config.consumer === "server";
+    },
+    configResolved(config) {
+      root = config.root;
+    },
+    async buildStart() {
+      if (providerSnippet) return;
+      try {
+        const resolved = await this.resolve(options.moduleName, resolve(root, "noop.js"));
+        if (!resolved) return;
+      } catch (error) {
+        this.warn(
+          `[Sentry] could not resolve ${options.moduleName} while probing for it; injecting the provider anyway. ${error?.message ?? error}`
+        );
+      }
+      providerSnippet = buildProviderSnippet(options);
+    },
+    transform(code, id) {
+      if (!providerSnippet || !isIntegrationModuleId(id) || code.includes(options.identifier)) return void 0;
+      const ms = new MagicString(code);
+      ms.prepend(providerSnippet);
+      return { code: ms.toString(), map: ms.generateMap({ hires: true }) };
+    }
+  };
+}
+
+export { createIntegrationModuleMatcher, createProvidedModulePlugin };
+//# sourceMappingURL=providedModulePlugin.js.map

package/build/esm/prod/vite/providedModulePlugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"providedModulePlugin.js","sources":["../../../../src/vite/providedModulePlugin.ts"],"sourcesContent":["import { resolve } from 'node:path';\nimport MagicString from 'magic-string';\n\n/**\n * The slice of the Rollup plugin context the probe needs. Declared here rather than imported so\n * this file carries no Rollup or Vite type dependency.\n */\ninterface ResolveContext {\n  resolve(\n    source: string,\n    importer?: string,\n    options?: { skipSelf?: boolean },\n  ): Promise<{ id: string; external?: boolean | string } | null>;\n  warn(message: string): void;\n}\n\n/** The plugin shape `sentryCloudflareVitePlugin` composes. */\nexport interface ProvidedModulePlugin {\n  name: string;\n  applyToEnvironment(environment: { config: { consumer: string } }): boolean;\n  configResolved(config: { root: string }): void;\n  buildStart(this: ResolveContext): Promise<void>;\n  transform(code: string, id: string): { code: string; map: ReturnType<MagicString['generateMap']> } | undefined;\n}\n\nexport interface ProvidedModulePluginOptions {\n  /** Vite plugin name, e.g. `sentry-cloudflare-flue-runtime-provider`. */\n  name: string;\n  /** Bare specifier of the package to provide, e.g. `@flue/runtime`. */\n  moduleName: string;\n  /** Namespace binding the injected import uses, e.g. `__SENTRY_FLUE_RUNTIME__`. */\n  identifier: string;\n  /** Basename of the `@sentry/server-utils` integration module to inject into, e.g. `flue`. */\n  integrationModule: string;\n}\n\n/**\n * Build the matcher for one `@sentry/server-utils` integration module.\n *\n * Plain `endsWith`, not a `RegExp`: nothing here needs pattern matching, and building one from\n * a caller-supplied string would need escaping, which is the only reason this file would have to\n * import from `@sentry/core`. A build-time plugin should not drag the SDK into the build.\n */\nexport function createIntegrationModuleMatcher(integrationModule: string): (id: string) => boolean {\n  // The ESM build only: a worker never loads the CJS one.\n  const suffix = `@sentry/server-utils/build/esm/integrations/${integrationModule}.js`;\n\n  return (id: string): boolean =>\n    id\n      .replace(/\\\\/g, '/')\n      .replace(/[?#].*$/, '')\n      .endsWith(suffix);\n}\n\nfunction buildProviderSnippet({ moduleName, identifier }: ProvidedModulePluginOptions): string {\n  const marker = 'globalThis.__SENTRY_ORCHESTRION__';\n\n  // A getter, not an assignment: assigning reads the binding at injection time, so it stores\n  // `undefined` whenever the bundler evaluates Sentry's module before the provided package\n  // finished initializing. Enumerable so the entry shows up in `Object.keys` and a spread.\n  return (\n    `import * as ${identifier} from '${moduleName}';\\n` +\n    `(${marker} = ${marker} || {});\\n` +\n    `(${marker}.providedModules = ${marker}.providedModules || {});\\n` +\n    `Object.defineProperty(${marker}.providedModules, '${moduleName}', ` +\n    `{ configurable: true, enumerable: true, get() { return ${identifier}; } });\\n`\n  );\n}\n\n/**\n * Build a Vite plugin that splices a static `import * as … from '<moduleName>'` into one of\n * Sentry's own integration modules and exposes the namespace on the global orchestrion marker.\n *\n * Some packages are instrumented by registration rather than by patching, so instrumenting them\n * needs a reference to that module's own binding and no channel payload carries one. On Node the\n * integration resolves it itself; a bundled worker has no `node_modules` to resolve from, so the\n * binding is supplied at build time instead. The import is static, lands in Sentry's module rather\n * than the user's code, and is only emitted when the package actually resolves.\n */\nexport function createProvidedModulePlugin(options: ProvidedModulePluginOptions): ProvidedModulePlugin {\n  const isIntegrationModuleId = createIntegrationModuleMatcher(options.integrationModule);\n\n  let root = process.cwd();\n  let providerSnippet: string | undefined;\n\n  return {\n    name: options.name,\n\n    applyToEnvironment(environment: { config: { consumer: string } }): boolean {\n      // Server environments only. `buildStart` runs per environment against one shared plugin\n      // instance, so without this a `client` build resolves first, under browser conditions, and\n      // answers on the worker's behalf. That defeats the point of probing with `this.resolve`.\n      // Same gate the orchestrion plugin uses.\n      return environment.config.consumer === 'server';\n    },\n\n    configResolved(config: { root: string }): void {\n      root = config.root;\n    },\n\n    async buildStart(this: ResolveContext): Promise<void> {\n      // Already answered by an earlier server environment. A build with several worker\n      // environments shares the answer: they resolve under the same conditions.\n      if (providerSnippet) return;\n\n      try {\n        // The environment's own resolver, so the probe uses the conditions the injected import\n        // will. That is what a `require.resolve` probe cannot do: an ESM-only package has no\n        // `require` condition and reads as missing. Resolved from the app root, not from Sentry's\n        // own install.\n        const resolved = await this.resolve(options.moduleName, resolve(root, 'noop.js'));\n        if (!resolved) return;\n      } catch (error) {\n        // Present but unresolvable for some other reason. Inject anyway so the build fails loudly\n        // rather than silently shipping a worker with no instrumentation, and surface the original\n        // cause: the import error Vite raises next says nothing about why resolution broke.\n        this.warn(\n          `[Sentry] could not resolve ${options.moduleName} while probing for it; injecting the provider anyway. ${\n            (error as Error | undefined)?.message ?? error\n          }`,\n        );\n      }\n\n      providerSnippet = buildProviderSnippet(options);\n    },\n\n    transform(code: string, id: string): { code: string; map: ReturnType<MagicString['generateMap']> } | undefined {\n      // `code.includes` keeps this idempotent: a second pass over already-injected output would\n      // otherwise emit a duplicate `import * as` binding, which is a syntax error.\n      if (!providerSnippet || !isIntegrationModuleId(id) || code.includes(options.identifier)) return undefined;\n\n      const ms = new MagicString(code);\n      ms.prepend(providerSnippet);\n      return { code: ms.toString(), map: ms.generateMap({ hires: true }) };\n    },\n  };\n}\n"],"names":[],"mappings":";;;AA2CO,SAAS,+BAA+B,iBAAA,EAAoD;AAEjG,EAAA,MAAM,MAAA,GAAS,+CAA+C,iBAAiB,CAAA,GAAA,CAAA;AAE/E,EAAA,OAAO,CAAC,EAAA,KACN,EAAA,CACG,OAAA,CAAQ,KAAA,EAAO,GAAG,CAAA,CAClB,OAAA,CAAQ,SAAA,EAAW,EAAE,CAAA,CACrB,QAAA,CAAS,MAAM,CAAA;AACtB;AAEA,SAAS,oBAAA,CAAqB,EAAE,UAAA,EAAY,UAAA,EAAW,EAAwC;AAC7F,EAAA,MAAM,MAAA,GAAS,mCAAA;AAKf,EAAA,OACE,CAAA,YAAA,EAAe,UAAU,CAAA,OAAA,EAAU,UAAU,CAAA;AAAA,CAAA,EACzC,MAAM,MAAM,MAAM,CAAA;AAAA,CAAA,EAClB,MAAM,sBAAsB,MAAM,CAAA;AAAA,sBAAA,EACb,MAAM,CAAA,mBAAA,EAAsB,UAAU,CAAA,0DAAA,EACL,UAAU,CAAA;AAAA,CAAA;AAExE;AAYO,SAAS,2BAA2B,OAAA,EAA4D;AACrG,EAAA,MAAM,qBAAA,GAAwB,8BAAA,CAA+B,OAAA,CAAQ,iBAAiB,CAAA;AAEtF,EAAA,IAAI,IAAA,GAAO,QAAQ,GAAA,EAAI;AACvB,EAAA,IAAI,eAAA;AAEJ,EAAA,OAAO;AAAA,IACL,MAAM,OAAA,CAAQ,IAAA;AAAA,IAEd,mBAAmB,WAAA,EAAwD;AAKzE,MAAA,OAAO,WAAA,CAAY,OAAO,QAAA,KAAa,QAAA;AAAA,IACzC,CAAA;AAAA,IAEA,eAAe,MAAA,EAAgC;AAC7C,MAAA,IAAA,GAAO,MAAA,CAAO,IAAA;AAAA,IAChB,CAAA;AAAA,IAEA,MAAM,UAAA,GAAgD;AAGpD,MAAA,IAAI,eAAA,EAAiB;AAErB,MAAA,IAAI;AAKF,QAAA,MAAM,QAAA,GAAW,MAAM,IAAA,CAAK,OAAA,CAAQ,QAAQ,UAAA,EAAY,OAAA,CAAQ,IAAA,EAAM,SAAS,CAAC,CAAA;AAChF,QAAA,IAAI,CAAC,QAAA,EAAU;AAAA,MACjB,SAAS,KAAA,EAAO;AAId,QAAA,IAAA,CAAK,IAAA;AAAA,UACH,8BAA8B,OAAA,CAAQ,UAAU,CAAA,sDAAA,EAC7C,KAAA,EAA6B,WAAW,KAC3C,CAAA;AAAA,SACF;AAAA,MACF;AAEA,MAAA,eAAA,GAAkB,qBAAqB,OAAO,CAAA;AAAA,IAChD,CAAA;AAAA,IAEA,SAAA,CAAU,MAAc,EAAA,EAAuF;AAG7G,MAAA,IAAI,CAAC,eAAA,IAAmB,CAAC,qBAAA,CAAsB,EAAE,CAAA,IAAK,IAAA,CAAK,QAAA,CAAS,OAAA,CAAQ,UAAU,CAAA,EAAG,OAAO,MAAA;AAEhG,MAAA,MAAM,EAAA,GAAK,IAAI,WAAA,CAAY,IAAI,CAAA;AAC/B,MAAA,EAAA,CAAG,QAAQ,eAAe,CAAA;AAC1B,MAAA,OAAO,EAAE,IAAA,EAAM,EAAA,CAAG,QAAA,EAAS,EAAG,GAAA,EAAK,EAAA,CAAG,WAAA,CAAY,EAAE,KAAA,EAAO,IAAA,EAAM,CAAA,EAAE;AAAA,IACrE;AAAA,GACF;AACF;;;;"}

package/build/esm/prod/vite/transform.js

@@ -26,7 +26,7 @@ function applyAutoInstrumentTransforms(code, ast, ctx) {
     needsImport: false,
     wrappedClasses: /* @__PURE__ */ new Set(),
     topLevelClasses,
-    renamedLocals: /* @__PURE__ */ new Set(),
+    wrappedLocals: /* @__PURE__ */ new Map(),
     classWrappers: ctx.classWrappers,
     agentClasses: ctx.agentClasses ?? /* @__PURE__ */ new Set(),
     workerEntrypointClasses: detectWorkerEntrypointClasses(ast),
@@ -107,9 +107,13 @@ function collectTopLevelClasses(ast) {
 function wrapDefaultExport(node, ctx, state) {
   const decl = node.declaration;
   if (isCallToMethod(decl, "withSentry")) return;
-  if (decl.type === "Identifier" && state.renamedLocals.has(decl.name)) {
-    state.autoWrapped.add(DEFAULT_EXPORT);
-    return;
+  if (decl.type === "Identifier") {
+    const wrappedName = state.wrappedLocals.get(decl.name);
+    if (wrappedName) {
+      state.ms.overwrite(decl.start, decl.end, wrappedName);
+      state.autoWrapped.add(DEFAULT_EXPORT);
+      return;
+    }
   }
   state.ms.overwrite(node.start, decl.start, "const __SENTRY_DEFAULT_EXPORT__ = ");
   state.ms.append(`
@@ -146,19 +150,26 @@ function wrapInlineClassExport(exportNode, classDecl, ctx, state) {
   const kind = classId ? resolveWrapperKind(classId.name, classId.name, state) : void 0;
   if (!classId || !kind) return;
   const className = classId.name;
-  const renamedClass = `__SENTRY_ORIGINAL_${className}__`;
   state.ms.overwrite(exportNode.start, classDecl.start, "");
-  state.ms.overwrite(classId.start, classId.end, renamedClass);
+  const wrappedName = wrapLocalClass(className, classDecl, kind, state);
+  state.ms.appendLeft(exportNode.end, `export { ${wrappedName} as ${className} };
+`);
+  state.wrappedClasses.add(className);
+  state.autoWrapped.add(className);
+}
+function wrapLocalClass(localName, localClass, kind, state) {
+  const existing = state.wrappedLocals.get(localName);
+  if (existing) return existing;
+  const wrappedName = `__SENTRY_WRAPPED_${localName}__`;
+  state.wrappedLocals.set(localName, wrappedName);
   state.ms.appendLeft(
-    exportNode.end,
+    localClass.end,
     `
-export const ${className} = __SENTRY__.${WRAPPER_METHODS[kind]}(${state.optionsFn}, ${renamedClass});
+const ${wrappedName} = __SENTRY__.${WRAPPER_METHODS[kind]}(${state.optionsFn}, ${localName});
 `
   );
-  state.wrappedClasses.add(className);
-  state.autoWrapped.add(className);
-  state.renamedLocals.add(className);
   state.needsImport = true;
+  return wrappedName;
 }
 function wrapSpecifierExports(node, ctx, state) {
   const specifiers = node.specifiers ?? [];
@@ -168,7 +179,7 @@ function wrapSpecifierExports(node, ctx, state) {
   const wrappedPairs = [];
   const kept = [];
   for (const specifier of specifiers) {
-    const pair = wrapCrossModuleSpecifier(specifier, sourceLiteral, ctx, state, prelude);
+    const pair = wrapSpecifier(specifier, sourceLiteral, ctx, state, prelude);
     if (pair) {
       wrappedPairs.push(pair);
     } else {
@@ -183,7 +194,7 @@ function wrapSpecifierExports(node, ctx, state) {
   }
   state.ms.overwrite(node.start, node.end, statements.join("\n"));
 }
-function wrapCrossModuleSpecifier(specifier, sourceLiteral, ctx, state, prelude) {
+function wrapSpecifier(specifier, sourceLiteral, ctx, state, prelude) {
   const exportedName = specifier.type === "ExportSpecifier" && specifier.exported?.type === "Identifier" ? specifier.exported.name : void 0;
   const localName = specifier.local?.type === "Identifier" ? specifier.local.name : void 0;
   const kind = exportedName ? resolveWrapperKind(exportedName, sourceLiteral ? void 0 : localName, state) : void 0;
@@ -191,10 +202,9 @@ function wrapCrossModuleSpecifier(specifier, sourceLiteral, ctx, state, prelude)
   if (!sourceLiteral) {
     const localClass = state.topLevelClasses.get(localName);
     if (localClass?.id) {
-      wrapLocalClassExport(localName, localClass, kind, ctx, state);
+      const wrappedName2 = wrapLocalClass(localName, localClass, kind, state);
       state.wrappedClasses.add(exportedName);
-      state.needsImport = true;
-      return void 0;
+      return `${wrappedName2} as ${exportedName}`;
     }
     if (state.manuallyWrappedLocals.has(localName)) {
       state.wrappedClasses.add(exportedName);
@@ -217,19 +227,6 @@ function wrapCrossModuleSpecifier(specifier, sourceLiteral, ctx, state, prelude)
   state.needsImport = true;
   return `${wrappedName} as ${exportedName}`;
 }
-function wrapLocalClassExport(localName, localClass, kind, ctx, state) {
-  const classId = localClass.id;
-  if (!classId || state.renamedLocals.has(localName)) return;
-  state.renamedLocals.add(localName);
-  const renamedClass = `__SENTRY_ORIGINAL_${localName}__`;
-  state.ms.overwrite(classId.start, classId.end, renamedClass);
-  state.ms.appendLeft(
-    localClass.end,
-    `
-const ${localName} = __SENTRY__.${WRAPPER_METHODS[kind]}(${state.optionsFn}, ${renamedClass});
-`
-  );
-}
 
 export { applyAutoInstrumentTransforms };
 //# sourceMappingURL=transform.js.map