@sentry/cloudflare 11.10.0 → 11.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (196) hide show
  1. package/build/cjs/dev/baseSdk.js +4 -8
  2. package/build/cjs/dev/baseSdk.js.map +1 -1
  3. package/build/cjs/dev/client.js.map +1 -1
  4. package/build/cjs/dev/durableobject.js +20 -4
  5. package/build/cjs/dev/durableobject.js.map +1 -1
  6. package/build/cjs/dev/index.js +2 -1
  7. package/build/cjs/dev/index.js.map +1 -1
  8. package/build/cjs/dev/instrumentations/instrumentDurableObjectStorage.js +2 -2
  9. package/build/cjs/dev/instrumentations/instrumentDurableObjectStorage.js.map +1 -1
  10. package/build/cjs/dev/instrumentations/instrumentDurableObjectSyncKvStorage.js +2 -2
  11. package/build/cjs/dev/instrumentations/instrumentDurableObjectSyncKvStorage.js.map +1 -1
  12. package/build/cjs/dev/instrumentations/instrumentSqlStorage.js +5 -5
  13. package/build/cjs/dev/instrumentations/instrumentSqlStorage.js.map +1 -1
  14. package/build/cjs/dev/instrumentations/worker/instrumentD1.js +12 -12
  15. package/build/cjs/dev/instrumentations/worker/instrumentD1.js.map +1 -1
  16. package/build/cjs/dev/instrumentations/worker/instrumentEnv.js +4 -3
  17. package/build/cjs/dev/instrumentations/worker/instrumentEnv.js.map +1 -1
  18. package/build/cjs/dev/instrumentations/worker/instrumentQueue.js +38 -7
  19. package/build/cjs/dev/instrumentations/worker/instrumentQueue.js.map +1 -1
  20. package/build/cjs/dev/instrumentations/worker/instrumentQueueProducer.js +44 -22
  21. package/build/cjs/dev/instrumentations/worker/instrumentQueueProducer.js.map +1 -1
  22. package/build/cjs/dev/instrumentations/worker/instrumentR2.js +1 -1
  23. package/build/cjs/dev/instrumentations/worker/instrumentR2.js.map +1 -1
  24. package/build/cjs/dev/integrations/httpServer.js +15 -72
  25. package/build/cjs/dev/integrations/httpServer.js.map +1 -1
  26. package/build/cjs/dev/request.js.map +1 -1
  27. package/build/cjs/dev/scope-utils.js +2 -6
  28. package/build/cjs/dev/scope-utils.js.map +1 -1
  29. package/build/cjs/dev/sdk.js +2 -5
  30. package/build/cjs/dev/sdk.js.map +1 -1
  31. package/build/cjs/dev/utils/{rpcPropagation.js → bindingPropagation.js} +6 -3
  32. package/build/cjs/dev/utils/bindingPropagation.js.map +1 -0
  33. package/build/cjs/dev/utils/queueTraceMeta.js +44 -0
  34. package/build/cjs/dev/utils/queueTraceMeta.js.map +1 -0
  35. package/build/cjs/dev/vite/index.js +2 -1
  36. package/build/cjs/dev/vite/index.js.map +1 -1
  37. package/build/cjs/dev/workflows.js +9 -6
  38. package/build/cjs/dev/workflows.js.map +1 -1
  39. package/build/cjs/dev/wrapRequestHandlerWithInit.js +36 -110
  40. package/build/cjs/dev/wrapRequestHandlerWithInit.js.map +1 -1
  41. package/build/cjs/prod/baseSdk.js +4 -8
  42. package/build/cjs/prod/baseSdk.js.map +1 -1
  43. package/build/cjs/prod/client.js.map +1 -1
  44. package/build/cjs/prod/durableobject.js +20 -4
  45. package/build/cjs/prod/durableobject.js.map +1 -1
  46. package/build/cjs/prod/index.js +2 -1
  47. package/build/cjs/prod/index.js.map +1 -1
  48. package/build/cjs/prod/instrumentations/instrumentDurableObjectStorage.js +2 -2
  49. package/build/cjs/prod/instrumentations/instrumentDurableObjectStorage.js.map +1 -1
  50. package/build/cjs/prod/instrumentations/instrumentDurableObjectSyncKvStorage.js +2 -2
  51. package/build/cjs/prod/instrumentations/instrumentDurableObjectSyncKvStorage.js.map +1 -1
  52. package/build/cjs/prod/instrumentations/instrumentSqlStorage.js +5 -5
  53. package/build/cjs/prod/instrumentations/instrumentSqlStorage.js.map +1 -1
  54. package/build/cjs/prod/instrumentations/worker/instrumentD1.js +12 -12
  55. package/build/cjs/prod/instrumentations/worker/instrumentD1.js.map +1 -1
  56. package/build/cjs/prod/instrumentations/worker/instrumentEnv.js +4 -3
  57. package/build/cjs/prod/instrumentations/worker/instrumentEnv.js.map +1 -1
  58. package/build/cjs/prod/instrumentations/worker/instrumentQueue.js +38 -7
  59. package/build/cjs/prod/instrumentations/worker/instrumentQueue.js.map +1 -1
  60. package/build/cjs/prod/instrumentations/worker/instrumentQueueProducer.js +44 -22
  61. package/build/cjs/prod/instrumentations/worker/instrumentQueueProducer.js.map +1 -1
  62. package/build/cjs/prod/instrumentations/worker/instrumentR2.js +1 -1
  63. package/build/cjs/prod/instrumentations/worker/instrumentR2.js.map +1 -1
  64. package/build/cjs/prod/integrations/httpServer.js +15 -72
  65. package/build/cjs/prod/integrations/httpServer.js.map +1 -1
  66. package/build/cjs/prod/request.js.map +1 -1
  67. package/build/cjs/prod/scope-utils.js +2 -6
  68. package/build/cjs/prod/scope-utils.js.map +1 -1
  69. package/build/cjs/prod/sdk.js +2 -5
  70. package/build/cjs/prod/sdk.js.map +1 -1
  71. package/build/cjs/prod/utils/{rpcPropagation.js → bindingPropagation.js} +6 -3
  72. package/build/cjs/prod/utils/bindingPropagation.js.map +1 -0
  73. package/build/cjs/prod/utils/queueTraceMeta.js +44 -0
  74. package/build/cjs/prod/utils/queueTraceMeta.js.map +1 -0
  75. package/build/cjs/prod/vite/index.js +2 -1
  76. package/build/cjs/prod/vite/index.js.map +1 -1
  77. package/build/cjs/prod/workflows.js +9 -6
  78. package/build/cjs/prod/workflows.js.map +1 -1
  79. package/build/cjs/prod/wrapRequestHandlerWithInit.js +36 -110
  80. package/build/cjs/prod/wrapRequestHandlerWithInit.js.map +1 -1
  81. package/build/esm/dev/baseSdk.js +4 -7
  82. package/build/esm/dev/baseSdk.js.map +1 -1
  83. package/build/esm/dev/client.js.map +1 -1
  84. package/build/esm/dev/durableobject.js +20 -4
  85. package/build/esm/dev/durableobject.js.map +1 -1
  86. package/build/esm/dev/index.js +2 -1
  87. package/build/esm/dev/index.js.map +1 -1
  88. package/build/esm/dev/instrumentations/instrumentDurableObjectStorage.js +3 -3
  89. package/build/esm/dev/instrumentations/instrumentDurableObjectStorage.js.map +1 -1
  90. package/build/esm/dev/instrumentations/instrumentDurableObjectSyncKvStorage.js +3 -3
  91. package/build/esm/dev/instrumentations/instrumentDurableObjectSyncKvStorage.js.map +1 -1
  92. package/build/esm/dev/instrumentations/instrumentSqlStorage.js +6 -6
  93. package/build/esm/dev/instrumentations/instrumentSqlStorage.js.map +1 -1
  94. package/build/esm/dev/instrumentations/worker/instrumentD1.js +13 -13
  95. package/build/esm/dev/instrumentations/worker/instrumentD1.js.map +1 -1
  96. package/build/esm/dev/instrumentations/worker/instrumentEnv.js +3 -2
  97. package/build/esm/dev/instrumentations/worker/instrumentEnv.js.map +1 -1
  98. package/build/esm/dev/instrumentations/worker/instrumentQueue.js +39 -8
  99. package/build/esm/dev/instrumentations/worker/instrumentQueue.js.map +1 -1
  100. package/build/esm/dev/instrumentations/worker/instrumentQueueProducer.js +46 -24
  101. package/build/esm/dev/instrumentations/worker/instrumentQueueProducer.js.map +1 -1
  102. package/build/esm/dev/instrumentations/worker/instrumentR2.js +1 -1
  103. package/build/esm/dev/instrumentations/worker/instrumentR2.js.map +1 -1
  104. package/build/esm/dev/integrations/httpServer.js +16 -71
  105. package/build/esm/dev/integrations/httpServer.js.map +1 -1
  106. package/build/esm/dev/package.json +1 -1
  107. package/build/esm/dev/request.js.map +1 -1
  108. package/build/esm/dev/scope-utils.js +3 -6
  109. package/build/esm/dev/scope-utils.js.map +1 -1
  110. package/build/esm/dev/sdk.js +4 -6
  111. package/build/esm/dev/sdk.js.map +1 -1
  112. package/build/esm/dev/utils/{rpcPropagation.js → bindingPropagation.js} +6 -4
  113. package/build/esm/dev/utils/bindingPropagation.js.map +1 -0
  114. package/build/esm/dev/utils/queueTraceMeta.js +41 -0
  115. package/build/esm/dev/utils/queueTraceMeta.js.map +1 -0
  116. package/build/esm/dev/vite/index.js +2 -1
  117. package/build/esm/dev/vite/index.js.map +1 -1
  118. package/build/esm/dev/workflows.js +11 -8
  119. package/build/esm/dev/workflows.js.map +1 -1
  120. package/build/esm/dev/wrapRequestHandlerWithInit.js +41 -115
  121. package/build/esm/dev/wrapRequestHandlerWithInit.js.map +1 -1
  122. package/build/esm/prod/baseSdk.js +4 -7
  123. package/build/esm/prod/baseSdk.js.map +1 -1
  124. package/build/esm/prod/client.js.map +1 -1
  125. package/build/esm/prod/durableobject.js +20 -4
  126. package/build/esm/prod/durableobject.js.map +1 -1
  127. package/build/esm/prod/index.js +2 -1
  128. package/build/esm/prod/index.js.map +1 -1
  129. package/build/esm/prod/instrumentations/instrumentDurableObjectStorage.js +3 -3
  130. package/build/esm/prod/instrumentations/instrumentDurableObjectStorage.js.map +1 -1
  131. package/build/esm/prod/instrumentations/instrumentDurableObjectSyncKvStorage.js +3 -3
  132. package/build/esm/prod/instrumentations/instrumentDurableObjectSyncKvStorage.js.map +1 -1
  133. package/build/esm/prod/instrumentations/instrumentSqlStorage.js +6 -6
  134. package/build/esm/prod/instrumentations/instrumentSqlStorage.js.map +1 -1
  135. package/build/esm/prod/instrumentations/worker/instrumentD1.js +13 -13
  136. package/build/esm/prod/instrumentations/worker/instrumentD1.js.map +1 -1
  137. package/build/esm/prod/instrumentations/worker/instrumentEnv.js +3 -2
  138. package/build/esm/prod/instrumentations/worker/instrumentEnv.js.map +1 -1
  139. package/build/esm/prod/instrumentations/worker/instrumentQueue.js +39 -8
  140. package/build/esm/prod/instrumentations/worker/instrumentQueue.js.map +1 -1
  141. package/build/esm/prod/instrumentations/worker/instrumentQueueProducer.js +46 -24
  142. package/build/esm/prod/instrumentations/worker/instrumentQueueProducer.js.map +1 -1
  143. package/build/esm/prod/instrumentations/worker/instrumentR2.js +1 -1
  144. package/build/esm/prod/instrumentations/worker/instrumentR2.js.map +1 -1
  145. package/build/esm/prod/integrations/httpServer.js +16 -71
  146. package/build/esm/prod/integrations/httpServer.js.map +1 -1
  147. package/build/esm/prod/package.json +1 -1
  148. package/build/esm/prod/request.js.map +1 -1
  149. package/build/esm/prod/scope-utils.js +3 -6
  150. package/build/esm/prod/scope-utils.js.map +1 -1
  151. package/build/esm/prod/sdk.js +4 -6
  152. package/build/esm/prod/sdk.js.map +1 -1
  153. package/build/esm/prod/utils/{rpcPropagation.js → bindingPropagation.js} +6 -4
  154. package/build/esm/prod/utils/bindingPropagation.js.map +1 -0
  155. package/build/esm/prod/utils/queueTraceMeta.js +41 -0
  156. package/build/esm/prod/utils/queueTraceMeta.js.map +1 -0
  157. package/build/esm/prod/vite/index.js +2 -1
  158. package/build/esm/prod/vite/index.js.map +1 -1
  159. package/build/esm/prod/workflows.js +11 -8
  160. package/build/esm/prod/workflows.js.map +1 -1
  161. package/build/esm/prod/wrapRequestHandlerWithInit.js +41 -115
  162. package/build/esm/prod/wrapRequestHandlerWithInit.js.map +1 -1
  163. package/build/types/baseSdk.d.ts +6 -18
  164. package/build/types/baseSdk.d.ts.map +1 -1
  165. package/build/types/client.d.ts +30 -0
  166. package/build/types/client.d.ts.map +1 -1
  167. package/build/types/durableobject.d.ts.map +1 -1
  168. package/build/types/instrumentations/instrumentSqlStorage.d.ts.map +1 -1
  169. package/build/types/instrumentations/worker/instrumentD1.d.ts.map +1 -1
  170. package/build/types/instrumentations/worker/instrumentEnv.d.ts +1 -1
  171. package/build/types/instrumentations/worker/instrumentEnv.d.ts.map +1 -1
  172. package/build/types/instrumentations/worker/instrumentQueue.d.ts.map +1 -1
  173. package/build/types/instrumentations/worker/instrumentQueueProducer.d.ts +1 -1
  174. package/build/types/instrumentations/worker/instrumentQueueProducer.d.ts.map +1 -1
  175. package/build/types/integrations/httpServer.d.ts +9 -20
  176. package/build/types/integrations/httpServer.d.ts.map +1 -1
  177. package/build/types/request.d.ts +3 -4
  178. package/build/types/request.d.ts.map +1 -1
  179. package/build/types/scope-utils.d.ts +0 -4
  180. package/build/types/scope-utils.d.ts.map +1 -1
  181. package/build/types/sdk.d.ts +3 -8
  182. package/build/types/sdk.d.ts.map +1 -1
  183. package/build/types/utils/{rpcPropagation.d.ts → bindingPropagation.d.ts} +6 -1
  184. package/build/types/utils/bindingPropagation.d.ts.map +1 -0
  185. package/build/types/utils/queueTraceMeta.d.ts +7 -0
  186. package/build/types/utils/queueTraceMeta.d.ts.map +1 -0
  187. package/build/types/vite/index.d.ts.map +1 -1
  188. package/build/types/workflows.d.ts.map +1 -1
  189. package/build/types/wrapRequestHandlerWithInit.d.ts +1 -1
  190. package/build/types/wrapRequestHandlerWithInit.d.ts.map +1 -1
  191. package/package.json +17 -14
  192. package/build/cjs/dev/utils/rpcPropagation.js.map +0 -1
  193. package/build/cjs/prod/utils/rpcPropagation.js.map +0 -1
  194. package/build/esm/dev/utils/rpcPropagation.js.map +0 -1
  195. package/build/esm/prod/utils/rpcPropagation.js.map +0 -1
  196. package/build/types/utils/rpcPropagation.d.ts.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentQueue.js","sources":["../../../../../src/instrumentations/worker/instrumentQueue.ts"],"sourcesContent":["import type { MessageBatch } from '@cloudflare/workers-types';\nimport type { AnyExportedHandler } from '../../types';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport { SENTRY_SEGMENT_NAME_SOURCE, SENTRY_OP, SENTRY_ORIGIN } from '@sentry/conventions/attributes';\nimport { QUEUE_PROCESS } from '@sentry/conventions/op';\nimport { captureException, startSpan, withIsolationScope } from '@sentry/core';\nimport type { CloudflareOptions } from '../../client';\nimport { flushAndDispose } from '../../flush';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { addCloudResourceContext } from '../../scope-utils';\nimport { init } from '../../sdk';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { setInvocationState } from '../../utils/invocationContext';\nimport { instrumentEnv } from './instrumentEnv';\n\n/**\n * Core queue handler logic - wraps execution with Sentry instrumentation.\n */\nfunction wrapQueueHandler(\n batch: MessageBatch,\n options: CloudflareOptions,\n context: ExecutionContext,\n fn: () => unknown,\n): unknown {\n return withIsolationScope(isolationScope => {\n const waitUntil = context.waitUntil.bind(context);\n\n setInvocationState(isolationScope, { ctx: context });\n\n const client = init({ ...options, ctx: context });\n isolationScope.setClient(client);\n\n addCloudResourceContext(isolationScope);\n\n return startSpan(\n {\n name: `process ${batch.queue}`,\n attributes: {\n [SENTRY_OP]: QUEUE_PROCESS,\n 'faas.trigger': 'pubsub',\n 'messaging.destination.name': batch.queue,\n 'messaging.system': 'cloudflare',\n 'messaging.operation.type': 'process',\n 'messaging.operation.name': 'process',\n 'messaging.batch.message_count': batch.messages.length,\n 'messaging.message.retry.count': batch.messages.reduce((acc, message) => acc + message.attempts - 1, 0),\n [SENTRY_ORIGIN]: 'auto.faas.cloudflare.queue',\n [SENTRY_SEGMENT_NAME_SOURCE]: 'task',\n },\n },\n async () => {\n try {\n return await fn();\n } catch (e) {\n captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.queue' } });\n throw e;\n } finally {\n waitUntil(flushAndDispose(client));\n }\n },\n );\n });\n}\n\n/**\n * Instruments a queue handler for ExportedHandler (env/ctx come from args).\n */\nexport function instrumentExportedHandlerQueue<T extends AnyExportedHandler>(\n handler: T,\n optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n if (!('queue' in handler) || typeof handler.queue !== 'function') {\n return;\n }\n\n handler.queue = ensureInstrumented(\n handler.queue,\n original =>\n new Proxy(original, {\n apply(target, thisArg, args: Parameters<NonNullable<T['queue']>>) {\n const [batch, env, ctx] = args;\n const context = instrumentContext(ctx);\n const options = getFinalOptions(optionsCallback(env), env);\n args[1] = instrumentEnv(env, options);\n args[2] = context;\n\n return wrapQueueHandler(batch, options, context, () => target.apply(thisArg, args));\n },\n }),\n );\n}\n\n/**\n * Instruments a queue method for WorkerEntrypoint (options/context already available).\n */\nexport function instrumentWorkerEntrypointQueue<T extends WorkerEntrypoint>(\n instance: T,\n options: CloudflareOptions,\n context: ExecutionContext,\n): void {\n if (!instance.queue) {\n return;\n }\n\n const original = instance.queue.bind(instance);\n instance.queue = new Proxy(original, {\n apply(target, thisArg, args: [MessageBatch]) {\n const [batch] = args;\n\n return wrapQueueHandler(batch, options, context, () => Reflect.apply(target, thisArg, args));\n },\n });\n}\n"],"names":["withIsolationScope","setInvocationState","init","addCloudResourceContext","startSpan","SENTRY_OP","QUEUE_PROCESS","SENTRY_ORIGIN","SENTRY_SEGMENT_NAME_SOURCE","captureException","flushAndDispose","ensureInstrumented","instrumentContext","options","getFinalOptions","instrumentEnv"],"mappings":"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"}
1
+ {"version":3,"file":"instrumentQueue.js","sources":["../../../../../src/instrumentations/worker/instrumentQueue.ts"],"sourcesContent":["import type { MessageBatch } from '@cloudflare/workers-types';\nimport type { AnyExportedHandler } from '../../types';\nimport { TraceFlags } from '@opentelemetry/api';\nimport type { env as cloudflareEnv, WorkerEntrypoint } from 'cloudflare:workers';\nimport {\n SENTRY_LINK_TYPE,\n SENTRY_SEGMENT_NAME_SOURCE,\n SENTRY_OP,\n SENTRY_ORIGIN,\n FAAS_TRIGGER,\n MESSAGING_BATCH_MESSAGE_COUNT,\n MESSAGING_DESTINATION_NAME,\n MESSAGING_MESSAGE_RETRY_COUNT,\n MESSAGING_OPERATION_NAME,\n MESSAGING_OPERATION_TYPE,\n MESSAGING_SYSTEM,\n} from '@sentry/conventions/attributes';\nimport { QUEUE_PROCESS } from '@sentry/conventions/op';\nimport type { SpanLink } from '@sentry/core';\nimport { captureException, startSpan, withIsolationScope } from '@sentry/core';\nimport type { CloudflareOptions } from '../../client';\nimport { flushAndDispose } from '../../flush';\nimport { ensureInstrumented } from '../../instrument';\nimport { getFinalOptions } from '../../options';\nimport { addCloudResourceContext } from '../../scope-utils';\nimport { init } from '../../sdk';\nimport { instrumentContext } from '../../utils/instrumentContext';\nimport { setInvocationState } from '../../utils/invocationContext';\nimport { extractQueueTraceContext } from '../../utils/queueTraceMeta';\nimport { instrumentEnv } from './instrumentEnv';\n\nfunction extractQueueTraceLinks(batch: MessageBatch): SpanLink[] {\n const linkedSpans = new Set<string>();\n const links: SpanLink[] = [];\n\n for (const message of batch.messages) {\n const producerContext = extractQueueTraceContext(message.body);\n if (!producerContext) {\n continue;\n }\n\n // `sendBatch` stamps every message with the same publish span, so link each producer only once.\n const spanKey = `${producerContext.traceId}-${producerContext.spanId}`;\n if (linkedSpans.has(spanKey)) {\n continue;\n }\n linkedSpans.add(spanKey);\n\n links.push({\n context: {\n traceId: producerContext.traceId,\n spanId: producerContext.spanId,\n traceFlags: producerContext.sampled ? TraceFlags.SAMPLED : TraceFlags.NONE,\n },\n attributes: {\n [SENTRY_LINK_TYPE]: 'message_origin',\n },\n });\n }\n\n return links;\n}\n\n/**\n * Core queue handler logic - wraps execution with Sentry instrumentation.\n */\nfunction wrapQueueHandler(\n batch: MessageBatch,\n options: CloudflareOptions,\n context: ExecutionContext,\n fn: () => unknown,\n): unknown {\n return withIsolationScope(isolationScope => {\n const waitUntil = context.waitUntil.bind(context);\n\n setInvocationState(isolationScope, { ctx: context });\n\n const client = init({ ...options, ctx: context });\n isolationScope.setClient(client);\n\n addCloudResourceContext(isolationScope);\n\n return startSpan(\n {\n name: `process ${batch.queue}`,\n // A batch can mix messages from unrelated traces, so continuing any one of them would invent\n // a false parent. Keep queue.process as a root span and link every producer instead.\n links: extractQueueTraceLinks(batch),\n attributes: {\n [SENTRY_OP]: QUEUE_PROCESS,\n [FAAS_TRIGGER]: 'pubsub',\n [MESSAGING_DESTINATION_NAME]: batch.queue,\n [MESSAGING_SYSTEM]: 'cloudflare',\n [MESSAGING_OPERATION_TYPE]: 'process',\n [MESSAGING_OPERATION_NAME]: 'process',\n [MESSAGING_BATCH_MESSAGE_COUNT]: batch.messages.length,\n [MESSAGING_MESSAGE_RETRY_COUNT]: batch.messages.reduce((acc, message) => acc + message.attempts - 1, 0),\n [SENTRY_ORIGIN]: 'auto.faas.cloudflare.queue',\n [SENTRY_SEGMENT_NAME_SOURCE]: 'task',\n },\n },\n async () => {\n try {\n return await fn();\n } catch (e) {\n captureException(e, { mechanism: { handled: false, type: 'auto.faas.cloudflare.queue' } });\n throw e;\n } finally {\n waitUntil(flushAndDispose(client));\n }\n },\n );\n });\n}\n\n/**\n * Instruments a queue handler for ExportedHandler (env/ctx come from args).\n */\nexport function instrumentExportedHandlerQueue<T extends AnyExportedHandler>(\n handler: T,\n optionsCallback: (env: typeof cloudflareEnv) => CloudflareOptions | undefined,\n): void {\n if (!('queue' in handler) || typeof handler.queue !== 'function') {\n return;\n }\n\n handler.queue = ensureInstrumented(\n handler.queue,\n original =>\n new Proxy(original, {\n apply(target, thisArg, args: Parameters<NonNullable<T['queue']>>) {\n const [batch, env, ctx] = args;\n const context = instrumentContext(ctx);\n const options = getFinalOptions(optionsCallback(env), env);\n args[1] = instrumentEnv(env, options);\n args[2] = context;\n\n return wrapQueueHandler(batch, options, context, () => target.apply(thisArg, args));\n },\n }),\n );\n}\n\n/**\n * Instruments a queue method for WorkerEntrypoint (options/context already available).\n */\nexport function instrumentWorkerEntrypointQueue<T extends WorkerEntrypoint>(\n instance: T,\n options: CloudflareOptions,\n context: ExecutionContext,\n): void {\n if (!instance.queue) {\n return;\n }\n\n const original = instance.queue.bind(instance);\n instance.queue = new Proxy(original, {\n apply(target, thisArg, args: [MessageBatch]) {\n const [batch] = args;\n\n return wrapQueueHandler(batch, options, context, () => Reflect.apply(target, thisArg, args));\n },\n });\n}\n"],"names":["extractQueueTraceContext","TraceFlags","SENTRY_LINK_TYPE","withIsolationScope","setInvocationState","init","addCloudResourceContext","startSpan","SENTRY_OP","QUEUE_PROCESS","FAAS_TRIGGER","MESSAGING_DESTINATION_NAME","MESSAGING_SYSTEM","MESSAGING_OPERATION_TYPE","MESSAGING_OPERATION_NAME","MESSAGING_BATCH_MESSAGE_COUNT","MESSAGING_MESSAGE_RETRY_COUNT","SENTRY_ORIGIN","SENTRY_SEGMENT_NAME_SOURCE","captureException","flushAndDispose","ensureInstrumented","instrumentContext","options","getFinalOptions","instrumentEnv"],"mappings":"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"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
3
3
  const attributes = require('@sentry/conventions/attributes');
4
4
  const op = require('@sentry/conventions/op');
5
5
  const core = require('@sentry/core');
6
+ const queueTraceMeta = require('../../utils/queueTraceMeta.js');
6
7
 
7
8
  const ORIGIN = "auto.faas.cloudflare.queue";
8
9
  function startPublishSpan(options, callback) {
@@ -11,12 +12,12 @@ function startPublishSpan(options, callback) {
11
12
  {
12
13
  name: `send ${bindingName}`,
13
14
  attributes: {
14
- "messaging.system": "cloudflare",
15
- "messaging.destination.name": bindingName,
16
- "messaging.operation.type": "send",
17
- "messaging.operation.name": "send",
18
- ...messageCount !== void 0 && { "messaging.batch.message_count": messageCount },
19
- "messaging.message.body.size": bodySize,
15
+ [attributes.MESSAGING_SYSTEM]: "cloudflare",
16
+ [attributes.MESSAGING_DESTINATION_NAME]: bindingName,
17
+ [attributes.MESSAGING_OPERATION_TYPE]: "send",
18
+ [attributes.MESSAGING_OPERATION_NAME]: "send",
19
+ [attributes.MESSAGING_BATCH_MESSAGE_COUNT]: messageCount,
20
+ [attributes.MESSAGING_MESSAGE_BODY_SIZE]: bodySize,
20
21
  [attributes.SENTRY_OP]: op.QUEUE_PUBLISH,
21
22
  [attributes.SENTRY_ORIGIN]: ORIGIN
22
23
  }
@@ -43,33 +44,54 @@ function getBodySize(body) {
43
44
  return void 0;
44
45
  }
45
46
  }
46
- function instrumentQueueProducer(queue, bindingName) {
47
+ function getBatchBodySize(messages) {
48
+ return messages.reduce((acc, message) => {
49
+ const size = getBodySize(message.body);
50
+ if (size === void 0) {
51
+ return acc;
52
+ }
53
+ return (acc ?? 0) + size;
54
+ }, void 0);
55
+ }
56
+ function instrumentQueueProducer(queue, bindingName, enableTracePropagation = false) {
47
57
  return new Proxy(queue, {
48
58
  get(target, prop, receiver) {
49
59
  if (prop === "send") {
50
60
  const original = Reflect.get(target, prop, receiver);
51
61
  return function(message, options) {
52
- return startPublishSpan(
53
- { bindingName, bodySize: getBodySize(message) },
54
- () => Reflect.apply(original, target, [message, options])
55
- );
62
+ if (!enableTracePropagation) {
63
+ return startPublishSpan(
64
+ { bindingName, bodySize: getBodySize(message) },
65
+ () => Reflect.apply(original, target, [message, options])
66
+ );
67
+ }
68
+ return startPublishSpan({ bindingName, bodySize: void 0 }, (span) => {
69
+ const tracedMessage = queueTraceMeta.addQueueTraceContext(message, core.getTraceData()["sentry-trace"]);
70
+ span.setAttribute(attributes.MESSAGING_MESSAGE_BODY_SIZE, getBodySize(tracedMessage));
71
+ return Reflect.apply(original, target, [tracedMessage, options]);
72
+ });
56
73
  };
57
74
  }
58
75
  if (prop === "sendBatch") {
59
76
  const original = Reflect.get(target, prop, receiver);
60
77
  return function(messages, options) {
61
78
  const messageArray = Array.from(messages);
62
- const totalBodySize = messageArray.reduce((acc, m) => {
63
- const size = getBodySize(m.body);
64
- if (size === void 0) {
65
- return acc;
66
- }
67
- return (acc ?? 0) + size;
68
- }, void 0);
69
- return startPublishSpan(
70
- { bindingName, bodySize: totalBodySize, messageCount: messageArray.length },
71
- () => Reflect.apply(original, target, [messageArray, options])
72
- );
79
+ const messageCount = messageArray.length;
80
+ if (!enableTracePropagation) {
81
+ return startPublishSpan(
82
+ { bindingName, bodySize: getBatchBodySize(messageArray), messageCount },
83
+ () => Reflect.apply(original, target, [messageArray, options])
84
+ );
85
+ }
86
+ return startPublishSpan({ bindingName, bodySize: void 0, messageCount }, (span) => {
87
+ const sentryTrace = core.getTraceData()["sentry-trace"];
88
+ const tracedMessages = messageArray.map((message) => ({
89
+ ...message,
90
+ body: queueTraceMeta.addQueueTraceContext(message.body, sentryTrace)
91
+ }));
92
+ span.setAttribute(attributes.MESSAGING_MESSAGE_BODY_SIZE, getBatchBodySize(tracedMessages));
93
+ return Reflect.apply(original, target, [tracedMessages, options]);
94
+ });
73
95
  };
74
96
  }
75
97
  const value = Reflect.get(target, prop);
@@ -1 +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, SENTRY_ORIGIN } from '@sentry/conventions/attributes';\nimport { QUEUE_PUBLISH } from '@sentry/conventions/op';\nimport { 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 [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":["startSpan","SENTRY_OP","QUEUE_PUBLISH","SENTRY_ORIGIN"],"mappings":"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"}
1
+ {"version":3,"file":"instrumentQueueProducer.js","sources":["../../../../../src/instrumentations/worker/instrumentQueueProducer.ts"],"sourcesContent":["import type { MessageSendRequest, Queue, QueueSendBatchOptions, QueueSendOptions } from '@cloudflare/workers-types';\nimport {\n SENTRY_OP,\n SENTRY_ORIGIN,\n MESSAGING_BATCH_MESSAGE_COUNT,\n MESSAGING_DESTINATION_NAME,\n MESSAGING_MESSAGE_BODY_SIZE,\n MESSAGING_OPERATION_NAME,\n MESSAGING_OPERATION_TYPE,\n MESSAGING_SYSTEM,\n} from '@sentry/conventions/attributes';\nimport { QUEUE_PUBLISH } from '@sentry/conventions/op';\nimport { getTraceData, startSpan, type Span } from '@sentry/core';\nimport { addQueueTraceContext } from '../../utils/queueTraceMeta';\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: (span: Span) => 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 [MESSAGING_BATCH_MESSAGE_COUNT]: messageCount,\n [MESSAGING_MESSAGE_BODY_SIZE]: bodySize,\n [SENTRY_OP]: QUEUE_PUBLISH,\n [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\nfunction getBatchBodySize(messages: MessageSendRequest[]): number | undefined {\n return messages.reduce<number | undefined>((acc, message) => {\n const size = getBodySize(message.body);\n if (size === undefined) {\n return acc;\n }\n return (acc ?? 0) + size;\n }, undefined);\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>(\n queue: T,\n bindingName: string,\n enableTracePropagation = false,\n): 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 if (!enableTracePropagation) {\n return startPublishSpan({ bindingName, bodySize: getBodySize(message) }, () =>\n Reflect.apply(original, target, [message, options]),\n );\n }\n\n // The body size is only known once the trace context is injected, which must happen inside\n // the span so the carrier points to queue.publish rather than its parent.\n return startPublishSpan({ bindingName, bodySize: undefined }, span => {\n const tracedMessage = addQueueTraceContext(message, getTraceData()['sentry-trace']);\n span.setAttribute(MESSAGING_MESSAGE_BODY_SIZE, getBodySize(tracedMessage));\n return Reflect.apply(original, target, [tracedMessage, 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 messageCount = messageArray.length;\n\n if (!enableTracePropagation) {\n return startPublishSpan({ bindingName, bodySize: getBatchBodySize(messageArray), messageCount }, () =>\n Reflect.apply(original, target, [messageArray, options]),\n );\n }\n\n return startPublishSpan({ bindingName, bodySize: undefined, messageCount }, span => {\n // Every message is published by this one span, so they all share its trace context.\n const sentryTrace = getTraceData()['sentry-trace'];\n const tracedMessages = messageArray.map(message => ({\n ...message,\n body: addQueueTraceContext(message.body, sentryTrace),\n }));\n\n span.setAttribute(MESSAGING_MESSAGE_BODY_SIZE, getBatchBodySize(tracedMessages));\n return Reflect.apply(original, target, [tracedMessages, 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":["startSpan","MESSAGING_SYSTEM","MESSAGING_DESTINATION_NAME","MESSAGING_OPERATION_TYPE","MESSAGING_OPERATION_NAME","MESSAGING_BATCH_MESSAGE_COUNT","MESSAGING_MESSAGE_BODY_SIZE","SENTRY_OP","QUEUE_PUBLISH","SENTRY_ORIGIN","addQueueTraceContext","getTraceData"],"mappings":"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"}
@@ -40,7 +40,7 @@ function createSpanOptions(bindingName, r2Op, key) {
40
40
  attributes: {
41
41
  [attributes.CLOUDFLARE_R2_OPERATION]: operation,
42
42
  [attributes.CLOUDFLARE_R2_BUCKET]: bindingName,
43
- ...requestKey !== void 0 && { [attributes.CLOUDFLARE_R2_REQUEST_KEY]: requestKey },
43
+ [attributes.CLOUDFLARE_R2_REQUEST_KEY]: requestKey,
44
44
  ...isR2ListOptions(key) && key.prefix !== void 0 && { [attributes.CLOUDFLARE_R2_REQUEST_PREFIX]: key.prefix },
45
45
  ...isR2ListOptions(key) && key.delimiter !== void 0 && { [attributes.CLOUDFLARE_R2_REQUEST_DELIMITER]: key.delimiter },
46
46
  [attributes.SENTRY_OP]: op,
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentR2.js","sources":["../../../../../src/instrumentations/worker/instrumentR2.ts"],"sourcesContent":["import type { R2Bucket, R2ListOptions, R2MultipartUpload } from '@cloudflare/workers-types';\nimport {\n CLOUDFLARE_R2_BUCKET,\n CLOUDFLARE_R2_OPERATION,\n CLOUDFLARE_R2_REQUEST_DELIMITER,\n CLOUDFLARE_R2_REQUEST_KEY,\n CLOUDFLARE_R2_REQUEST_PART_NUMBER,\n CLOUDFLARE_R2_REQUEST_PREFIX,\n SENTRY_OP,\n SENTRY_ORIGIN,\n} from '@sentry/conventions/attributes';\nimport {\n OBJECT_DELETE,\n OBJECT_GET,\n OBJECT_HEAD,\n OBJECT_LIST,\n OBJECT_MULTIPART_UPLOAD_ABORT,\n OBJECT_MULTIPART_UPLOAD_COMPLETE,\n OBJECT_MULTIPART_UPLOAD_CREATE,\n OBJECT_PUT,\n OBJECT_UPLOAD_PART,\n} from '@sentry/conventions/op';\nimport { isObjectLike, startSpan } from '@sentry/core';\n\nconst ORIGIN = 'auto.faas.cloudflare.r2';\n\nconst R2_OPERATIONS = {\n get: { spanName: 'r2_get', op: OBJECT_GET, operation: 'GetObject' },\n head: { spanName: 'r2_head', op: OBJECT_HEAD, operation: 'HeadObject' },\n put: { spanName: 'r2_put', op: OBJECT_PUT, operation: 'PutObject' },\n delete: { spanName: 'r2_delete', op: OBJECT_DELETE, operation: 'DeleteObject' },\n list: { spanName: 'r2_list', op: OBJECT_LIST, operation: 'ListObjects' },\n uploadPart: { spanName: 'r2_uploadPart', op: OBJECT_UPLOAD_PART, operation: 'UploadPart' },\n abortMultipartUpload: {\n spanName: 'r2_abortMultipartUpload',\n op: OBJECT_MULTIPART_UPLOAD_ABORT,\n operation: 'AbortMultipartUpload',\n },\n createMultipartUpload: {\n spanName: 'r2_createMultipartUpload',\n op: OBJECT_MULTIPART_UPLOAD_CREATE,\n operation: 'CreateMultipartUpload',\n },\n completeMultipartUpload: {\n spanName: 'r2_completeMultipartUpload',\n op: OBJECT_MULTIPART_UPLOAD_COMPLETE,\n operation: 'CompleteMultipartUpload',\n },\n} as const;\n\ntype R2OperationKey = keyof typeof R2_OPERATIONS;\n\nfunction isR2ListOptions(key: unknown): key is R2ListOptions {\n return isObjectLike(key) && !Array.isArray(key);\n}\n\nfunction createSpanOptions(bindingName: string, r2Op: R2OperationKey, key?: string | string[] | R2ListOptions) {\n const { spanName, op, operation } = R2_OPERATIONS[r2Op];\n const requestKey = Array.isArray(key) ? key.join(', ') : typeof key === 'string' ? key : undefined;\n\n return {\n op,\n name: spanName,\n attributes: {\n [CLOUDFLARE_R2_OPERATION]: operation,\n [CLOUDFLARE_R2_BUCKET]: bindingName,\n ...(requestKey !== undefined && { [CLOUDFLARE_R2_REQUEST_KEY]: requestKey }),\n ...(isR2ListOptions(key) && key.prefix !== undefined && { [CLOUDFLARE_R2_REQUEST_PREFIX]: key.prefix }),\n ...(isR2ListOptions(key) && key.delimiter !== undefined && { [CLOUDFLARE_R2_REQUEST_DELIMITER]: key.delimiter }),\n [SENTRY_OP]: op,\n [SENTRY_ORIGIN]: ORIGIN,\n },\n };\n}\n\nfunction instrumentR2MultipartUpload(upload: R2MultipartUpload, bindingName: string): R2MultipartUpload {\n const { key } = upload;\n\n return new Proxy(upload, {\n get(target, prop, receiver) {\n if (prop === 'uploadPart') {\n const original = Reflect.get(target, prop, receiver);\n\n return function (this: unknown, ...args: Parameters<R2MultipartUpload['uploadPart']>) {\n const [partNumber] = args;\n const spanOptions = createSpanOptions(bindingName, 'uploadPart', key);\n\n return startSpan(\n {\n ...spanOptions,\n attributes: {\n ...spanOptions.attributes,\n [CLOUDFLARE_R2_REQUEST_PART_NUMBER]: partNumber,\n },\n },\n () => Reflect.apply(original, target, args),\n );\n };\n }\n\n if (prop === 'abort') {\n const original = Reflect.get(target, prop, receiver);\n\n return function (this: unknown) {\n return startSpan(createSpanOptions(bindingName, 'abortMultipartUpload', key), () =>\n Reflect.apply(original, target, []),\n );\n };\n }\n\n if (prop === 'complete') {\n const original = Reflect.get(target, prop, receiver);\n\n return function (this: unknown, ...args: Parameters<R2MultipartUpload['complete']>) {\n return startSpan(createSpanOptions(bindingName, 'completeMultipartUpload', key), () =>\n Reflect.apply(original, target, args),\n );\n };\n }\n\n return Reflect.get(target, prop, receiver);\n },\n });\n}\n\n/**\n * Wraps a Cloudflare R2 Bucket binding to create spans on bucket operations.\n *\n * Instrumented methods: get, head, put, delete, list, createMultipartUpload,\n * resumeMultipartUpload (and the resulting multipart upload operations).\n */\nexport function instrumentR2Bucket<T extends R2Bucket>(bucket: T, bindingName: string): T {\n return new Proxy(bucket, {\n get(target, prop, receiver) {\n if (prop === 'get' || prop === 'head' || prop === 'put' || prop === 'delete' || prop === 'list') {\n const original = Reflect.get(target, prop, receiver);\n\n return function (this: unknown, ...args: Parameters<R2Bucket[typeof prop]>) {\n const [key] = args;\n\n return startSpan(createSpanOptions(bindingName, prop, key), () => Reflect.apply(original, target, args));\n };\n }\n\n if (prop === 'createMultipartUpload') {\n const original = Reflect.get(target, prop, receiver) as R2Bucket['createMultipartUpload'];\n\n return function (this: unknown, ...args: Parameters<R2Bucket['createMultipartUpload']>) {\n const [key] = args;\n\n return startSpan(createSpanOptions(bindingName, 'createMultipartUpload', key), async () => {\n const upload = await Reflect.apply(original, target, args);\n return instrumentR2MultipartUpload(upload, bindingName);\n });\n };\n }\n\n if (prop === 'resumeMultipartUpload') {\n const original = Reflect.get(target, prop, receiver);\n\n return function (this: unknown, ...args: Parameters<R2Bucket['resumeMultipartUpload']>) {\n const upload = Reflect.apply(original, target, args);\n\n return instrumentR2MultipartUpload(upload, bindingName);\n };\n }\n\n return Reflect.get(target, prop, receiver);\n },\n });\n}\n"],"names":["OBJECT_GET","OBJECT_HEAD","OBJECT_PUT","OBJECT_DELETE","OBJECT_LIST","OBJECT_UPLOAD_PART","OBJECT_MULTIPART_UPLOAD_ABORT","OBJECT_MULTIPART_UPLOAD_CREATE","OBJECT_MULTIPART_UPLOAD_COMPLETE","isObjectLike","CLOUDFLARE_R2_OPERATION","CLOUDFLARE_R2_BUCKET","CLOUDFLARE_R2_REQUEST_KEY","CLOUDFLARE_R2_REQUEST_PREFIX","CLOUDFLARE_R2_REQUEST_DELIMITER","SENTRY_OP","SENTRY_ORIGIN","startSpan","CLOUDFLARE_R2_REQUEST_PART_NUMBER"],"mappings":"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"}
1
+ {"version":3,"file":"instrumentR2.js","sources":["../../../../../src/instrumentations/worker/instrumentR2.ts"],"sourcesContent":["import type { R2Bucket, R2ListOptions, R2MultipartUpload } from '@cloudflare/workers-types';\nimport {\n CLOUDFLARE_R2_BUCKET,\n CLOUDFLARE_R2_OPERATION,\n CLOUDFLARE_R2_REQUEST_DELIMITER,\n CLOUDFLARE_R2_REQUEST_KEY,\n CLOUDFLARE_R2_REQUEST_PART_NUMBER,\n CLOUDFLARE_R2_REQUEST_PREFIX,\n SENTRY_OP,\n SENTRY_ORIGIN,\n} from '@sentry/conventions/attributes';\nimport {\n OBJECT_DELETE,\n OBJECT_GET,\n OBJECT_HEAD,\n OBJECT_LIST,\n OBJECT_MULTIPART_UPLOAD_ABORT,\n OBJECT_MULTIPART_UPLOAD_COMPLETE,\n OBJECT_MULTIPART_UPLOAD_CREATE,\n OBJECT_PUT,\n OBJECT_UPLOAD_PART,\n} from '@sentry/conventions/op';\nimport { isObjectLike, startSpan } from '@sentry/core';\n\nconst ORIGIN = 'auto.faas.cloudflare.r2';\n\nconst R2_OPERATIONS = {\n get: { spanName: 'r2_get', op: OBJECT_GET, operation: 'GetObject' },\n head: { spanName: 'r2_head', op: OBJECT_HEAD, operation: 'HeadObject' },\n put: { spanName: 'r2_put', op: OBJECT_PUT, operation: 'PutObject' },\n delete: { spanName: 'r2_delete', op: OBJECT_DELETE, operation: 'DeleteObject' },\n list: { spanName: 'r2_list', op: OBJECT_LIST, operation: 'ListObjects' },\n uploadPart: { spanName: 'r2_uploadPart', op: OBJECT_UPLOAD_PART, operation: 'UploadPart' },\n abortMultipartUpload: {\n spanName: 'r2_abortMultipartUpload',\n op: OBJECT_MULTIPART_UPLOAD_ABORT,\n operation: 'AbortMultipartUpload',\n },\n createMultipartUpload: {\n spanName: 'r2_createMultipartUpload',\n op: OBJECT_MULTIPART_UPLOAD_CREATE,\n operation: 'CreateMultipartUpload',\n },\n completeMultipartUpload: {\n spanName: 'r2_completeMultipartUpload',\n op: OBJECT_MULTIPART_UPLOAD_COMPLETE,\n operation: 'CompleteMultipartUpload',\n },\n} as const;\n\ntype R2OperationKey = keyof typeof R2_OPERATIONS;\n\nfunction isR2ListOptions(key: unknown): key is R2ListOptions {\n return isObjectLike(key) && !Array.isArray(key);\n}\n\nfunction createSpanOptions(bindingName: string, r2Op: R2OperationKey, key?: string | string[] | R2ListOptions) {\n const { spanName, op, operation } = R2_OPERATIONS[r2Op];\n const requestKey = Array.isArray(key) ? key.join(', ') : typeof key === 'string' ? key : undefined;\n\n return {\n op,\n name: spanName,\n attributes: {\n [CLOUDFLARE_R2_OPERATION]: operation,\n [CLOUDFLARE_R2_BUCKET]: bindingName,\n [CLOUDFLARE_R2_REQUEST_KEY]: requestKey,\n ...(isR2ListOptions(key) && key.prefix !== undefined && { [CLOUDFLARE_R2_REQUEST_PREFIX]: key.prefix }),\n ...(isR2ListOptions(key) && key.delimiter !== undefined && { [CLOUDFLARE_R2_REQUEST_DELIMITER]: key.delimiter }),\n [SENTRY_OP]: op,\n [SENTRY_ORIGIN]: ORIGIN,\n },\n };\n}\n\nfunction instrumentR2MultipartUpload(upload: R2MultipartUpload, bindingName: string): R2MultipartUpload {\n const { key } = upload;\n\n return new Proxy(upload, {\n get(target, prop, receiver) {\n if (prop === 'uploadPart') {\n const original = Reflect.get(target, prop, receiver);\n\n return function (this: unknown, ...args: Parameters<R2MultipartUpload['uploadPart']>) {\n const [partNumber] = args;\n const spanOptions = createSpanOptions(bindingName, 'uploadPart', key);\n\n return startSpan(\n {\n ...spanOptions,\n attributes: {\n ...spanOptions.attributes,\n [CLOUDFLARE_R2_REQUEST_PART_NUMBER]: partNumber,\n },\n },\n () => Reflect.apply(original, target, args),\n );\n };\n }\n\n if (prop === 'abort') {\n const original = Reflect.get(target, prop, receiver);\n\n return function (this: unknown) {\n return startSpan(createSpanOptions(bindingName, 'abortMultipartUpload', key), () =>\n Reflect.apply(original, target, []),\n );\n };\n }\n\n if (prop === 'complete') {\n const original = Reflect.get(target, prop, receiver);\n\n return function (this: unknown, ...args: Parameters<R2MultipartUpload['complete']>) {\n return startSpan(createSpanOptions(bindingName, 'completeMultipartUpload', key), () =>\n Reflect.apply(original, target, args),\n );\n };\n }\n\n return Reflect.get(target, prop, receiver);\n },\n });\n}\n\n/**\n * Wraps a Cloudflare R2 Bucket binding to create spans on bucket operations.\n *\n * Instrumented methods: get, head, put, delete, list, createMultipartUpload,\n * resumeMultipartUpload (and the resulting multipart upload operations).\n */\nexport function instrumentR2Bucket<T extends R2Bucket>(bucket: T, bindingName: string): T {\n return new Proxy(bucket, {\n get(target, prop, receiver) {\n if (prop === 'get' || prop === 'head' || prop === 'put' || prop === 'delete' || prop === 'list') {\n const original = Reflect.get(target, prop, receiver);\n\n return function (this: unknown, ...args: Parameters<R2Bucket[typeof prop]>) {\n const [key] = args;\n\n return startSpan(createSpanOptions(bindingName, prop, key), () => Reflect.apply(original, target, args));\n };\n }\n\n if (prop === 'createMultipartUpload') {\n const original = Reflect.get(target, prop, receiver) as R2Bucket['createMultipartUpload'];\n\n return function (this: unknown, ...args: Parameters<R2Bucket['createMultipartUpload']>) {\n const [key] = args;\n\n return startSpan(createSpanOptions(bindingName, 'createMultipartUpload', key), async () => {\n const upload = await Reflect.apply(original, target, args);\n return instrumentR2MultipartUpload(upload, bindingName);\n });\n };\n }\n\n if (prop === 'resumeMultipartUpload') {\n const original = Reflect.get(target, prop, receiver);\n\n return function (this: unknown, ...args: Parameters<R2Bucket['resumeMultipartUpload']>) {\n const upload = Reflect.apply(original, target, args);\n\n return instrumentR2MultipartUpload(upload, bindingName);\n };\n }\n\n return Reflect.get(target, prop, receiver);\n },\n });\n}\n"],"names":["OBJECT_GET","OBJECT_HEAD","OBJECT_PUT","OBJECT_DELETE","OBJECT_LIST","OBJECT_UPLOAD_PART","OBJECT_MULTIPART_UPLOAD_ABORT","OBJECT_MULTIPART_UPLOAD_CREATE","OBJECT_MULTIPART_UPLOAD_COMPLETE","isObjectLike","CLOUDFLARE_R2_OPERATION","CLOUDFLARE_R2_BUCKET","CLOUDFLARE_R2_REQUEST_KEY","CLOUDFLARE_R2_REQUEST_PREFIX","CLOUDFLARE_R2_REQUEST_DELIMITER","SENTRY_OP","SENTRY_ORIGIN","startSpan","CLOUDFLARE_R2_REQUEST_PART_NUMBER"],"mappings":"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"}
@@ -1,86 +1,29 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
2
2
 
3
3
  const core = require('@sentry/core');
4
- const server = require('@sentry/core/server');
5
- const debugBuild = require('../debug-build.js');
6
4
 
7
5
  const INTEGRATION_NAME = "HttpServer";
6
+ function getHttpServerRequestOptions(client) {
7
+ return client.getIntegrationByName(INTEGRATION_NAME)?.requestOptions ?? {
8
+ maxRequestBodySize: "none"
9
+ };
10
+ }
8
11
  const _httpServerIntegration = ((options = {}) => {
9
12
  return {
10
13
  name: INTEGRATION_NAME,
11
- maxRequestBodySize: options.maxRequestBodySize,
12
- ignoreRequestBody: options.ignoreRequestBody,
13
- ignoreIncomingRequests: options.ignoreIncomingRequests,
14
- ignoreStaticAssets: options.ignoreStaticAssets ?? true,
15
- spans: options.spans,
16
- onSpanCreated: options.onSpanCreated,
17
- onSpanEnd: options.onSpanEnd
14
+ requestOptions: {
15
+ maxRequestBodySize: options.maxRequestBodySize,
16
+ ignoreRequestBody: options.ignoreRequestBody,
17
+ ignoreIncomingRequests: options.ignoreIncomingRequests,
18
+ ignoreStaticAssets: options.ignoreStaticAssets ?? true,
19
+ spans: options.spans,
20
+ onSpanCreated: options.onSpanCreated,
21
+ onSpanEnd: options.onSpanEnd
22
+ }
18
23
  };
19
24
  });
20
25
  const httpServerIntegration = core.defineIntegration(_httpServerIntegration);
21
- async function captureIncomingRequestBody(client, request) {
22
- const integration = client.getIntegrationByName(INTEGRATION_NAME);
23
- if (!integration) {
24
- return;
25
- }
26
- const configuredBodySize = integration.maxRequestBodySize;
27
- const effectiveBodySize = configuredBodySize ?? (client.getDataCollectionOptions().httpBodies.includes("incomingRequest") ? "medium" : "none");
28
- if (effectiveBodySize === "none") {
29
- return;
30
- }
31
- if (request.method === "GET" || request.method === "HEAD" || request.method === "OPTIONS") {
32
- return;
33
- }
34
- const ignoreRequestBody = integration.ignoreRequestBody;
35
- if (ignoreRequestBody && // If the filter throws, skip the body so it cannot leak data the filter was meant to hide.
36
- core.safeCallback(
37
- debugBuild.DEBUG_BUILD ? "Error in `ignoreRequestBody`, skipping the body:" : "",
38
- () => ignoreRequestBody(request.url, request),
39
- () => true
40
- )) {
41
- return;
42
- }
43
- const isolationScope = core.getIsolationScope();
44
- await core.captureBodyFromWinterCGRequest(request, isolationScope, effectiveBodySize);
45
- }
46
- function shouldCreateIncomingRequestSpan(client, request) {
47
- if (!client) {
48
- return false;
49
- }
50
- const integration = client.getIntegrationByName(INTEGRATION_NAME);
51
- if (!(integration?.spans ?? core.hasSpansEnabled(client.getOptions()))) {
52
- return false;
53
- }
54
- const urlObject = core.parseStringToURLObject(request.url);
55
- const urlPath = urlObject ? `${urlObject.pathname}${urlObject.search}` : "/";
56
- if (integration?.ignoreStaticAssets && request.method === "GET" && server.isStaticAssetRequest(urlPath)) {
57
- return false;
58
- }
59
- const ignoreIncomingRequests = integration?.ignoreIncomingRequests;
60
- return !(ignoreIncomingRequests && core.safeCallback(
61
- debugBuild.DEBUG_BUILD ? "Error in `ignoreIncomingRequests`, creating the span:" : "",
62
- () => ignoreIncomingRequests(urlPath, request),
63
- () => false
64
- ));
65
- }
66
- function getIncomingRequestSpanHooks(client) {
67
- const integration = client?.getIntegrationByName(INTEGRATION_NAME);
68
- return {
69
- onSpanCreated: (span, request) => core.safeCallback(
70
- debugBuild.DEBUG_BUILD ? "Error in `onSpanCreated`:" : "",
71
- () => integration?.onSpanCreated?.(span, request),
72
- () => void 0
73
- ),
74
- onSpanEnd: (span, request, response) => core.safeCallback(
75
- debugBuild.DEBUG_BUILD ? "Error in `onSpanEnd`:" : "",
76
- () => integration?.onSpanEnd?.(span, request, response),
77
- () => void 0
78
- )
79
- };
80
- }
81
26
 
82
- exports.captureIncomingRequestBody = captureIncomingRequestBody;
83
- exports.getIncomingRequestSpanHooks = getIncomingRequestSpanHooks;
27
+ exports.getHttpServerRequestOptions = getHttpServerRequestOptions;
84
28
  exports.httpServerIntegration = httpServerIntegration;
85
- exports.shouldCreateIncomingRequestSpan = shouldCreateIncomingRequestSpan;
86
29
  //# sourceMappingURL=httpServer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"httpServer.js","sources":["../../../../src/integrations/httpServer.ts"],"sourcesContent":["import type { Client, IntegrationFn, MaxRequestBodySize, Span } from '@sentry/core';\nimport {\n captureBodyFromWinterCGRequest,\n defineIntegration,\n getIsolationScope,\n hasSpansEnabled,\n parseStringToURLObject,\n safeCallback,\n} from '@sentry/core';\nimport type { AssertTrue, CheckServerRequestOptions } from '@sentry/core/server';\nimport { isStaticAssetRequest } from '@sentry/core/server';\nimport { DEBUG_BUILD } from '../debug-build';\n\nconst INTEGRATION_NAME = 'HttpServer' as const;\n\nexport interface HttpServerIntegrationOptions {\n /**\n * Controls the maximum size of incoming request bodies attached to events.\n *\n * Only applies to requests with textual content types (text/*, application/json,\n * application/x-www-form-urlencoded, application/xml, application/graphql).\n * Binary data is not captured.\n *\n * Available options:\n * - `'none'`: No request bodies will be attached\n * - `'small'`: Request bodies up to 1,000 bytes will be attached\n * - `'medium'`: Request bodies up to 10,000 bytes will be attached (default)\n * - `'always'`: Request bodies will always be attached (up to 1MB limit)\n *\n * @default 'medium'\n */\n maxRequestBodySize?: MaxRequestBodySize;\n\n /**\n * Do not capture the request body for incoming HTTP requests to URLs where the given callback returns `true`.\n * This can be useful for long running requests where the body is not needed, health check endpoints,\n * or requests containing sensitive data that should not be captured.\n *\n * @param url The full URL of the incoming request, including query string, protocol, host, etc.\n * @param request The incoming Request object.\n * @returns `true` to skip body capture for this request, `false` to capture normally.\n *\n * @example\n * ```ts\n * Sentry.httpServerIntegration({\n * ignoreRequestBody: (url) => url.includes('/health') || url.includes('/upload'),\n * })\n * ```\n */\n ignoreRequestBody?: (url: string, request: Request) => boolean;\n\n /**\n * Do not create spans for incoming requests whose URL path makes the given callback return `true`.\n *\n * `urlPath` is the path of the request, including the query string. `request` is the incoming\n * {@link Request}. Errors thrown by the handler are still captured.\n */\n ignoreIncomingRequests?: (urlPath: string, request: Request) => boolean;\n\n /**\n * Whether to automatically ignore common static asset requests (favicon.ico, robots.txt, etc.)\n * when creating spans.\n *\n * @default `true`\n */\n ignoreStaticAssets?: boolean;\n\n /**\n * Whether to create spans for incoming requests.\n * Errors are still captured and request data is still attached when this is `false`.\n * Defaults to the client's tracing configuration (`hasSpansEnabled`).\n */\n spans?: boolean;\n\n /**\n * A hook that can be used to mutate the span for incoming requests.\n * This is triggered after the span is created, before the request handler runs.\n */\n onSpanCreated?: (span: Span, request: Request) => void;\n\n /**\n * A hook that can be used to mutate the span one last time before it ends.\n * For a streamed response, this runs when the stream finishes.\n * It is not called when the request handler throws.\n */\n onSpanEnd?: (span: Span, request: Request, response: Response) => void;\n}\n\n// Checks these options against the shared `ServerRequestOptions`. A new\n// shared field fails to compile here, until this integration supports\n// it or lists it as unsupported.\ntype _ServerRequestOptionsCheck = AssertTrue<\n CheckServerRequestOptions<\n HttpServerIntegrationOptions,\n Request,\n Response,\n // Not supported. A worker has no long-lived process to run the timer\n // that flushes session aggregates.\n 'sessions' | 'sessionFlushingDelayMS'\n >\n>;\n\ninterface HttpServerIntegrationInstance extends HttpServerIntegrationOptions {\n name: string;\n maxRequestBodySize: MaxRequestBodySize | undefined;\n}\n\nconst _httpServerIntegration = ((options: HttpServerIntegrationOptions = {}): HttpServerIntegrationInstance => {\n return {\n name: INTEGRATION_NAME,\n maxRequestBodySize: options.maxRequestBodySize,\n ignoreRequestBody: options.ignoreRequestBody,\n ignoreIncomingRequests: options.ignoreIncomingRequests,\n ignoreStaticAssets: options.ignoreStaticAssets ?? true,\n spans: options.spans,\n onSpanCreated: options.onSpanCreated,\n onSpanEnd: options.onSpanEnd,\n };\n}) satisfies IntegrationFn;\n\n/**\n * Configures incoming HTTP request handling for Cloudflare Workers.\n *\n * This integration controls how incoming HTTP request data is captured,\n * matching the API of `httpServerIntegration` in Node.js.\n *\n * @example\n * ```ts\n * Sentry.init({\n * integrations: [\n * Sentry.httpServerIntegration({\n * maxRequestBodySize: 'medium',\n * ignoreRequestBody: (url) => url.includes('/health'),\n * }),\n * ],\n * });\n * ```\n */\nexport const httpServerIntegration = defineIntegration(_httpServerIntegration);\n\n/**\n * Capture the request body based on the HttpServer integration config.\n * Called internally by `wrapRequestHandler`.\n */\nexport async function captureIncomingRequestBody(client: Client, request: Request): Promise<void> {\n const integration = client.getIntegrationByName<HttpServerIntegrationInstance>(INTEGRATION_NAME);\n\n if (!integration) {\n return;\n }\n\n const configuredBodySize = integration.maxRequestBodySize;\n const effectiveBodySize: MaxRequestBodySize =\n configuredBodySize ??\n (client.getDataCollectionOptions().httpBodies.includes('incomingRequest') ? 'medium' : 'none');\n\n if (effectiveBodySize === 'none') {\n return;\n }\n\n // Skip GET and HEAD requests - they don't have bodies\n // Also skip OPTIONS, even if they may have a body, they might not give a lot of extra value\n if (request.method === 'GET' || request.method === 'HEAD' || request.method === 'OPTIONS') {\n return;\n }\n\n const ignoreRequestBody = integration.ignoreRequestBody;\n if (\n ignoreRequestBody &&\n // If the filter throws, skip the body so it cannot leak data the filter was meant to hide.\n safeCallback(\n DEBUG_BUILD ? 'Error in `ignoreRequestBody`, skipping the body:' : '',\n () => ignoreRequestBody(request.url, request),\n () => true,\n )\n ) {\n return;\n }\n\n const isolationScope = getIsolationScope();\n await captureBodyFromWinterCGRequest(request, isolationScope, effectiveBodySize);\n}\n\n/**\n * Whether to create a span for the incoming request, based on the HttpServer integration config.\n * Called internally by `wrapRequestHandler`.\n */\nexport function shouldCreateIncomingRequestSpan(client: Client | undefined, request: Request): boolean {\n if (!client) {\n return false;\n }\n\n const integration = client.getIntegrationByName<HttpServerIntegrationInstance>(INTEGRATION_NAME);\n if (!(integration?.spans ?? hasSpansEnabled(client.getOptions()))) {\n return false;\n }\n\n const urlObject = parseStringToURLObject(request.url);\n const urlPath = urlObject ? `${urlObject.pathname}${urlObject.search}` : '/';\n if (integration?.ignoreStaticAssets && request.method === 'GET' && isStaticAssetRequest(urlPath)) {\n return false;\n }\n\n const ignoreIncomingRequests = integration?.ignoreIncomingRequests;\n return !(\n ignoreIncomingRequests &&\n safeCallback(\n DEBUG_BUILD ? 'Error in `ignoreIncomingRequests`, creating the span:' : '',\n () => ignoreIncomingRequests(urlPath, request),\n () => false,\n )\n );\n}\n\n/**\n * The `onSpanCreated` and `onSpanEnd` hooks of the HttpServer integration, guarded so that a hook\n * that throws does not fail the request. Called internally by `wrapRequestHandler`.\n */\nexport function getIncomingRequestSpanHooks(client: Client | undefined): {\n onSpanCreated: (span: Span, request: Request) => void;\n onSpanEnd: (span: Span, request: Request, response: Response) => void;\n} {\n const integration = client?.getIntegrationByName<HttpServerIntegrationInstance>(INTEGRATION_NAME);\n return {\n onSpanCreated: (span, request) =>\n safeCallback(\n DEBUG_BUILD ? 'Error in `onSpanCreated`:' : '',\n () => integration?.onSpanCreated?.(span, request),\n () => undefined,\n ),\n onSpanEnd: (span, request, response) =>\n safeCallback(\n DEBUG_BUILD ? 'Error in `onSpanEnd`:' : '',\n () => integration?.onSpanEnd?.(span, request, response),\n () => undefined,\n ),\n };\n}\n"],"names":["defineIntegration","safeCallback","DEBUG_BUILD","getIsolationScope","captureBodyFromWinterCGRequest","hasSpansEnabled","parseStringToURLObject","isStaticAssetRequest"],"mappings":"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"}
1
+ {"version":3,"file":"httpServer.js","sources":["../../../../src/integrations/httpServer.ts"],"sourcesContent":["import type { Client, Integration, IntegrationFn, MaxRequestBodySize, Span } from '@sentry/core';\nimport { defineIntegration } from '@sentry/core';\nimport type { AssertTrue, CheckServerRequestOptions, ServerRequestOptions } from '@sentry/core/server';\n\nconst INTEGRATION_NAME = 'HttpServer' as const;\n\nexport interface HttpServerIntegrationOptions {\n /**\n * Controls the maximum size of incoming request bodies attached to events.\n *\n * Only applies to requests with textual content types (text/*, application/json,\n * application/x-www-form-urlencoded, application/xml, application/graphql).\n * Binary data is not captured.\n *\n * Available options:\n * - `'none'`: No request bodies will be attached\n * - `'small'`: Request bodies up to 1,000 bytes will be attached\n * - `'medium'`: Request bodies up to 10,000 bytes will be attached (default)\n * - `'always'`: Request bodies will always be attached (up to 1MB limit)\n *\n * @default 'medium'\n */\n maxRequestBodySize?: MaxRequestBodySize;\n\n /**\n * Do not capture the request body for incoming HTTP requests to URLs where the given callback returns `true`.\n * This can be useful for long running requests where the body is not needed, health check endpoints,\n * or requests containing sensitive data that should not be captured.\n *\n * @param url The full URL of the incoming request, including query string, protocol, host, etc.\n * @param request The incoming Request object.\n * @returns `true` to skip body capture for this request, `false` to capture normally.\n *\n * @example\n * ```ts\n * Sentry.httpServerIntegration({\n * ignoreRequestBody: (url) => url.includes('/health') || url.includes('/upload'),\n * })\n * ```\n */\n ignoreRequestBody?: (url: string, request: Request) => boolean;\n\n /**\n * Do not create spans for incoming requests whose URL path makes the given callback return `true`.\n *\n * `urlPath` is the path of the request, including the query string. `request` is the incoming\n * {@link Request}. Errors thrown by the handler are still captured.\n */\n ignoreIncomingRequests?: (urlPath: string, request: Request) => boolean;\n\n /**\n * Whether to automatically ignore common static asset requests (favicon.ico, robots.txt, etc.)\n * when creating spans.\n *\n * @default `true`\n */\n ignoreStaticAssets?: boolean;\n\n /**\n * Whether to create spans for incoming requests.\n * Errors are still captured and request data is still attached when this is `false`.\n * Defaults to the client's tracing configuration (`hasSpansEnabled`).\n */\n spans?: boolean;\n\n /**\n * A hook that can be used to mutate the span for incoming requests.\n * This is triggered after the span is created, before the request handler runs.\n */\n onSpanCreated?: (span: Span, request: Request) => void;\n\n /**\n * A hook that can be used to mutate the span one last time before it ends.\n * For a streamed response, this runs when the stream finishes.\n * It is not called when the request handler throws.\n */\n onSpanEnd?: (span: Span, request: Request, response: Response) => void;\n}\n\n// Checks these options against the shared `ServerRequestOptions`. A new\n// shared field fails to compile here, until this integration supports\n// it or lists it as unsupported.\ntype _ServerRequestOptionsCheck = AssertTrue<\n CheckServerRequestOptions<\n HttpServerIntegrationOptions,\n Request,\n Response,\n // Not supported. A worker has no long-lived process to run the timer\n // that flushes session aggregates.\n 'sessions' | 'sessionFlushingDelayMS'\n >\n>;\n\ntype SupportedServerRequestOptions = Omit<\n ServerRequestOptions<Request, Response>,\n 'sessions' | 'sessionFlushingDelayMS'\n>;\n\n// Every supported shared option is a required key, so a new one fails to compile below until the\n// integration passes it on.\ntype HttpServerRequestOptions = {\n [K in keyof Required<SupportedServerRequestOptions>]: SupportedServerRequestOptions[K];\n};\n\ninterface HttpServerIntegration extends Integration {\n requestOptions: HttpServerRequestOptions;\n}\n\n/**\n * The incoming request options of the client's `httpServerIntegration`. If the integration does not\n * set `maxRequestBodySize`, `dataCollection.httpBodies` decides. Without the integration, the SDK\n * attaches no request body.\n */\nexport function getHttpServerRequestOptions(client: Client): ServerRequestOptions<Request, Response> {\n return (\n client.getIntegrationByName<HttpServerIntegration>(INTEGRATION_NAME)?.requestOptions ?? {\n maxRequestBodySize: 'none',\n }\n );\n}\n\nconst _httpServerIntegration = ((options: HttpServerIntegrationOptions = {}): HttpServerIntegration => {\n return {\n name: INTEGRATION_NAME,\n requestOptions: {\n maxRequestBodySize: options.maxRequestBodySize,\n ignoreRequestBody: options.ignoreRequestBody,\n ignoreIncomingRequests: options.ignoreIncomingRequests,\n ignoreStaticAssets: options.ignoreStaticAssets ?? true,\n spans: options.spans,\n onSpanCreated: options.onSpanCreated,\n onSpanEnd: options.onSpanEnd,\n },\n };\n}) satisfies IntegrationFn;\n\n/**\n * Configures incoming HTTP request handling for Cloudflare Workers.\n *\n * This integration controls how incoming HTTP request data is captured,\n * matching the API of `httpServerIntegration` in Node.js.\n *\n * @example\n * ```ts\n * Sentry.init({\n * integrations: [\n * Sentry.httpServerIntegration({\n * maxRequestBodySize: 'medium',\n * ignoreRequestBody: (url) => url.includes('/health'),\n * }),\n * ],\n * });\n * ```\n */\nexport const httpServerIntegration = defineIntegration(_httpServerIntegration);\n"],"names":["defineIntegration"],"mappings":";;;;AAIA,MAAM,gBAAA,GAAmB,YAAA;AA6GlB,SAAS,4BAA4B,MAAA,EAAyD;AACnG,EAAA,OACE,MAAA,CAAO,oBAAA,CAA4C,gBAAgB,CAAA,EAAG,cAAA,IAAkB;AAAA,IACtF,kBAAA,EAAoB;AAAA,GACtB;AAEJ;AAEA,MAAM,sBAAA,IAA0B,CAAC,OAAA,GAAwC,EAAC,KAA6B;AACrG,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,gBAAA;AAAA,IACN,cAAA,EAAgB;AAAA,MACd,oBAAoB,OAAA,CAAQ,kBAAA;AAAA,MAC5B,mBAAmB,OAAA,CAAQ,iBAAA;AAAA,MAC3B,wBAAwB,OAAA,CAAQ,sBAAA;AAAA,MAChC,kBAAA,EAAoB,QAAQ,kBAAA,IAAsB,IAAA;AAAA,MAClD,OAAO,OAAA,CAAQ,KAAA;AAAA,MACf,eAAe,OAAA,CAAQ,aAAA;AAAA,MACvB,WAAW,OAAA,CAAQ;AAAA;AACrB,GACF;AACF,CAAA,CAAA;AAoBO,MAAM,qBAAA,GAAwBA,uBAAkB,sBAAsB;;;;;"}
@@ -1 +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\nexport { httpServerIntegration } from './integrations/httpServer';\n"],"names":["wrapRequestHandlerWithInit","initBaseSdk"],"mappings":";;;;;;AAYO,SAAS,kBAAA,CACd,gBAKA,OAAA,EACmB;AACnB,EAAA,OAAOA,qDAAA,CAA2B,cAAA,EAAgB,OAAA,EAASC,mBAAW,CAAA;AACxE;;;;;"}
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 uses the same default integrations as `init`, without setting up an OpenTelemetry\n * tracer provider. This entry point also works on runtimes that cannot enable the `nodejs_compat`\n * compatibility flag, such as Shopify Oxygen.\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":["wrapRequestHandlerWithInit","initBaseSdk"],"mappings":";;;;;;AAWO,SAAS,kBAAA,CACd,gBAKA,OAAA,EACmB;AACnB,EAAA,OAAOA,qDAAA,CAA2B,cAAA,EAAgB,OAAA,EAASC,mBAAW,CAAA;AACxE;;;;;"}
@@ -1,10 +1,10 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
2
2
 
3
- const core = require('@sentry/core');
3
+ const attributes = require('@sentry/conventions/attributes');
4
4
 
5
5
  function addCloudResourceContext(scope) {
6
6
  scope.setContext("cloud_resource", {
7
- "cloud.provider": "cloudflare"
7
+ [attributes.CLOUD_PROVIDER]: "cloudflare"
8
8
  });
9
9
  }
10
10
  function addCultureContext(scope, cf) {
@@ -12,11 +12,7 @@ function addCultureContext(scope, cf) {
12
12
  timezone: cf.timezone
13
13
  });
14
14
  }
15
- function addRequest(scope, request) {
16
- scope.setSDKProcessingMetadata({ normalizedRequest: core.winterCGRequestToRequestData(request) });
17
- }
18
15
 
19
16
  exports.addCloudResourceContext = addCloudResourceContext;
20
17
  exports.addCultureContext = addCultureContext;
21
- exports.addRequest = addRequest;
22
18
  //# sourceMappingURL=scope-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"scope-utils.js","sources":["../../../src/scope-utils.ts"],"sourcesContent":["import type { CfProperties, IncomingRequestCfProperties } from '@cloudflare/workers-types';\nimport type { Scope } from '@sentry/core';\nimport { winterCGRequestToRequestData } from '@sentry/core';\n\n/**\n * Set cloud resource context on scope.\n */\nexport function addCloudResourceContext(scope: Scope): void {\n scope.setContext('cloud_resource', {\n 'cloud.provider': 'cloudflare',\n });\n}\n\n/**\n * Set culture context on scope\n */\nexport function addCultureContext(scope: Scope, cf: IncomingRequestCfProperties | CfProperties): void {\n scope.setContext('culture', {\n timezone: cf.timezone,\n });\n}\n\n/**\n * Set request data on scope\n */\nexport function addRequest(scope: Scope, request: Request): void {\n scope.setSDKProcessingMetadata({ normalizedRequest: winterCGRequestToRequestData(request) });\n}\n"],"names":["winterCGRequestToRequestData"],"mappings":";;;;AAOO,SAAS,wBAAwB,KAAA,EAAoB;AAC1D,EAAA,KAAA,CAAM,WAAW,gBAAA,EAAkB;AAAA,IACjC,gBAAA,EAAkB;AAAA,GACnB,CAAA;AACH;AAKO,SAAS,iBAAA,CAAkB,OAAc,EAAA,EAAsD;AACpG,EAAA,KAAA,CAAM,WAAW,SAAA,EAAW;AAAA,IAC1B,UAAU,EAAA,CAAG;AAAA,GACd,CAAA;AACH;AAKO,SAAS,UAAA,CAAW,OAAc,OAAA,EAAwB;AAC/D,EAAA,KAAA,CAAM,yBAAyB,EAAE,iBAAA,EAAmBA,iCAAA,CAA6B,OAAO,GAAG,CAAA;AAC7F;;;;;;"}
1
+ {"version":3,"file":"scope-utils.js","sources":["../../../src/scope-utils.ts"],"sourcesContent":["import { CLOUD_PROVIDER } from '@sentry/conventions/attributes';\nimport type { CfProperties, IncomingRequestCfProperties } from '@cloudflare/workers-types';\nimport type { Scope } from '@sentry/core';\n\n/**\n * Set cloud resource context on scope.\n */\nexport function addCloudResourceContext(scope: Scope): void {\n scope.setContext('cloud_resource', {\n [CLOUD_PROVIDER]: 'cloudflare',\n });\n}\n\n/**\n * Set culture context on scope\n */\nexport function addCultureContext(scope: Scope, cf: IncomingRequestCfProperties | CfProperties): void {\n scope.setContext('culture', {\n timezone: cf.timezone,\n });\n}\n"],"names":["CLOUD_PROVIDER"],"mappings":";;;;AAOO,SAAS,wBAAwB,KAAA,EAAoB;AAC1D,EAAA,KAAA,CAAM,WAAW,gBAAA,EAAkB;AAAA,IACjC,CAACA,yBAAc,GAAG;AAAA,GACnB,CAAA;AACH;AAKO,SAAS,iBAAA,CAAkB,OAAc,EAAA,EAAsD;AACpG,EAAA,KAAA,CAAM,WAAW,SAAA,EAAW;AAAA,IAC1B,UAAU,EAAA,CAAG;AAAA,GACd,CAAA;AACH;;;;;"}
@@ -4,21 +4,18 @@ const baseSdk = require('./baseSdk.js');
4
4
  const tracer = require('./opentelemetry/tracer.js');
5
5
  const wrapRequestHandlerWithInit = require('./wrapRequestHandlerWithInit.js');
6
6
 
7
- function getDefaultIntegrations(options) {
8
- return baseSdk.getBaseDefaultIntegrations(options);
9
- }
10
7
  function init(options) {
11
8
  options.enableOpenTelemetrySetup ?? (options.enableOpenTelemetrySetup = false);
12
9
  if (options.enableOpenTelemetrySetup) {
13
10
  tracer.setupOpenTelemetryTracer();
14
11
  }
15
- return baseSdk.initWithDefaultIntegrations(options, getDefaultIntegrations);
12
+ return baseSdk.initBaseSdk(options);
16
13
  }
17
14
  function _INTERNAL_wrapRequestHandler(wrapperOptions, handler) {
18
15
  return wrapRequestHandlerWithInit.wrapRequestHandlerWithInit(wrapperOptions, handler, init);
19
16
  }
20
17
 
18
+ exports.getDefaultIntegrations = baseSdk.getDefaultIntegrations;
21
19
  exports._INTERNAL_wrapRequestHandler = _INTERNAL_wrapRequestHandler;
22
- exports.getDefaultIntegrations = getDefaultIntegrations;
23
20
  exports.init = init;
24
21
  //# sourceMappingURL=sdk.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"sdk.js","sources":["../../../src/sdk.ts"],"sourcesContent":["import type { Integration } from '@sentry/core';\nimport { getBaseDefaultIntegrations, initWithDefaultIntegrations } from './baseSdk';\nimport type { CloudflareClient, CloudflareOptions } from './client';\nimport { setupOpenTelemetryTracer } from './opentelemetry/tracer';\nimport { type RequestHandlerWrapperOptions, wrapRequestHandlerWithInit } from './wrapRequestHandlerWithInit';\n\n// Test-only helper, re-exported here so tests can reset the global client cache.\nexport { _clearGlobalClientCache } from './clientCache';\n\n/**\n * Get the default integrations for the Cloudflare SDK.\n */\nexport function getDefaultIntegrations(options: CloudflareOptions): Integration[] {\n return getBaseDefaultIntegrations(options);\n}\n\n/**\n * Initializes the cloudflare SDK.\n */\nexport function init(options: CloudflareOptions): CloudflareClient | undefined {\n // Like most Node-based SDKs, Cloudflare defaults to running without a Sentry OpenTelemetry tracer\n // provider. Scope isolation is handled by the entrypoint wrappers' AsyncLocalStorage strategy.\n options.enableOpenTelemetrySetup ??= false;\n\n // Opt-in only: when `enableOpenTelemetrySetup` is `true`, set up a custom trace provider so spans\n // emitted via `@opentelemetry/api` are captured by Sentry. See the option's docs for the caveats.\n if (options.enableOpenTelemetrySetup) {\n setupOpenTelemetryTracer();\n }\n\n return initWithDefaultIntegrations(options, getDefaultIntegrations);\n}\n\n/**\n * `wrapRequestHandler` backed by `init`, so the request gets the full default integrations and\n * honors `enableOpenTelemetrySetup`. The `@sentry/cloudflare/request` variant deliberately skips\n * both to stay usable without `nodejs_compat`.\n *\n * For framework SDKs building on the main entry point, e.g. SvelteKit, whose OpenTelemetry spans\n * need the tracer provider.\n *\n * @internal\n */\nexport function _INTERNAL_wrapRequestHandler(\n wrapperOptions: RequestHandlerWrapperOptions,\n handler: (...args: unknown[]) => Response | Promise<Response>,\n): Promise<Response> {\n return wrapRequestHandlerWithInit(wrapperOptions, handler, init);\n}\n"],"names":["getBaseDefaultIntegrations","setupOpenTelemetryTracer","initWithDefaultIntegrations","wrapRequestHandlerWithInit"],"mappings":";;;;;;AAYO,SAAS,uBAAuB,OAAA,EAA2C;AAChF,EAAA,OAAOA,mCAA2B,OAAO,CAAA;AAC3C;AAKO,SAAS,KAAK,OAAA,EAA0D;AAG7E,EAAA,OAAA,CAAQ,wBAAA,KAAR,QAAQ,wBAAA,GAA6B,KAAA,CAAA;AAIrC,EAAA,IAAI,QAAQ,wBAAA,EAA0B;AACpC,IAAAC,+BAAA,EAAyB;AAAA,EAC3B;AAEA,EAAA,OAAOC,mCAAA,CAA4B,SAAS,sBAAsB,CAAA;AACpE;AAYO,SAAS,4BAAA,CACd,gBACA,OAAA,EACmB;AACnB,EAAA,OAAOC,qDAAA,CAA2B,cAAA,EAAgB,OAAA,EAAS,IAAI,CAAA;AACjE;;;;;;"}
1
+ {"version":3,"file":"sdk.js","sources":["../../../src/sdk.ts"],"sourcesContent":["import { initBaseSdk } from './baseSdk';\nimport type { CloudflareClient, CloudflareOptions } from './client';\nimport { setupOpenTelemetryTracer } from './opentelemetry/tracer';\nimport { type RequestHandlerWrapperOptions, wrapRequestHandlerWithInit } from './wrapRequestHandlerWithInit';\n\n// Test-only helper, re-exported here so tests can reset the global client cache.\nexport { _clearGlobalClientCache } from './clientCache';\n\nexport { getDefaultIntegrations } from './baseSdk';\n\n/**\n * Initializes the cloudflare SDK.\n */\nexport function init(options: CloudflareOptions): CloudflareClient | undefined {\n // Like most Node-based SDKs, Cloudflare defaults to running without a Sentry OpenTelemetry tracer\n // provider. Scope isolation is handled by the entrypoint wrappers' AsyncLocalStorage strategy.\n options.enableOpenTelemetrySetup ??= false;\n\n // Opt-in only: when `enableOpenTelemetrySetup` is `true`, set up a custom trace provider so spans\n // emitted via `@opentelemetry/api` are captured by Sentry. See the option's docs for the caveats.\n if (options.enableOpenTelemetrySetup) {\n setupOpenTelemetryTracer();\n }\n\n return initBaseSdk(options);\n}\n\n/**\n * `wrapRequestHandler` backed by `init`, so the request honors `enableOpenTelemetrySetup`. The\n * `@sentry/cloudflare/request` variant deliberately skips it to stay usable without `nodejs_compat`.\n *\n * For framework SDKs building on the main entry point, e.g. SvelteKit, whose OpenTelemetry spans\n * need the tracer provider.\n *\n * @internal\n */\nexport function _INTERNAL_wrapRequestHandler(\n wrapperOptions: RequestHandlerWrapperOptions,\n handler: (...args: unknown[]) => Response | Promise<Response>,\n): Promise<Response> {\n return wrapRequestHandlerWithInit(wrapperOptions, handler, init);\n}\n"],"names":["setupOpenTelemetryTracer","initBaseSdk","wrapRequestHandlerWithInit"],"mappings":";;;;;;AAaO,SAAS,KAAK,OAAA,EAA0D;AAG7E,EAAA,OAAA,CAAQ,wBAAA,KAAR,QAAQ,wBAAA,GAA6B,KAAA,CAAA;AAIrC,EAAA,IAAI,QAAQ,wBAAA,EAA0B;AACpC,IAAAA,+BAAA,EAAyB;AAAA,EAC3B;AAEA,EAAA,OAAOC,oBAAY,OAAO,CAAA;AAC5B;AAWO,SAAS,4BAAA,CACd,gBACA,OAAA,EACmB;AACnB,EAAA,OAAOC,qDAAA,CAA2B,cAAA,EAAgB,OAAA,EAAS,IAAI,CAAA;AACjE;;;;;;"}
@@ -3,13 +3,16 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
3
3
  const core = require('@sentry/core');
4
4
 
5
5
  const PROPAGATE_TO_NONE = () => false;
6
- function createRpcPropagationResolver(options) {
7
- const bindings = options?.rpcTracePropagationBindings;
6
+ function createBindingPropagationResolver(bindings) {
8
7
  if (!bindings?.length) {
9
8
  return PROPAGATE_TO_NONE;
10
9
  }
11
10
  return (bindingName) => core.matchesTracePropagationTargets(bindingName, bindings, true);
12
11
  }
12
+ function createRpcPropagationResolver(options) {
13
+ return createBindingPropagationResolver(options?.rpcTracePropagationBindings);
14
+ }
13
15
 
16
+ exports.createBindingPropagationResolver = createBindingPropagationResolver;
14
17
  exports.createRpcPropagationResolver = createRpcPropagationResolver;
15
- //# sourceMappingURL=rpcPropagation.js.map
18
+ //# sourceMappingURL=bindingPropagation.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"bindingPropagation.js","sources":["../../../../src/utils/bindingPropagation.ts"],"sourcesContent":["import { matchesTracePropagationTargets, type TracePropagationTargets } from '@sentry/core';\nimport type { CloudflareOptions } from '../client';\n\nconst PROPAGATE_TO_NONE = () => false;\n\n/**\n * Builds the per-binding predicate that decides whether a binding takes part in trace propagation.\n */\nexport function createBindingPropagationResolver(\n bindings: TracePropagationTargets | undefined,\n): (bindingName: string) => boolean {\n if (!bindings?.length) {\n return PROPAGATE_TO_NONE;\n }\n\n // Strings must match a binding name exactly, without this, an entry of `DB` would also enable\n // propagation for a binding named `MY_DB`. Regular expressions still give pattern matching.\n return (bindingName: string) => matchesTracePropagationTargets(bindingName, bindings, true);\n}\n\n/**\n * Builds the per-binding predicate that decides whether a binding takes part in RPC trace\n * propagation.\n *\n * Callers only. Receivers continue an incoming trace whenever one arrives, so they have nothing to\n * match against.\n */\nexport function createRpcPropagationResolver(options: CloudflareOptions | undefined): (bindingName: string) => boolean {\n return createBindingPropagationResolver(options?.rpcTracePropagationBindings);\n}\n"],"names":["matchesTracePropagationTargets"],"mappings":";;;;AAGA,MAAM,oBAAoB,MAAM,KAAA;AAKzB,SAAS,iCACd,QAAA,EACkC;AAClC,EAAA,IAAI,CAAC,UAAU,MAAA,EAAQ;AACrB,IAAA,OAAO,iBAAA;AAAA,EACT;AAIA,EAAA,OAAO,CAAC,WAAA,KAAwBA,mCAAA,CAA+B,WAAA,EAAa,UAAU,IAAI,CAAA;AAC5F;AASO,SAAS,6BAA6B,OAAA,EAA0E;AACrH,EAAA,OAAO,gCAAA,CAAiC,SAAS,2BAA2B,CAAA;AAC9E;;;;;"}
@@ -0,0 +1,44 @@
1
+ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
2
+
3
+ const core = require('@sentry/core');
4
+
5
+ const SENTRY_QUEUE_TRACE_KEY = "__sentry_queue_trace__";
6
+ function isQueueTraceCarrier(body) {
7
+ if (typeof body !== "object" || body === null || Array.isArray(body)) {
8
+ return false;
9
+ }
10
+ const prototype = Object.getPrototypeOf(body);
11
+ return prototype === Object.prototype || prototype === null;
12
+ }
13
+ function addQueueTraceContext(body, sentryTrace) {
14
+ if (!isQueueTraceCarrier(body) || !sentryTrace || Object.prototype.hasOwnProperty.call(body, SENTRY_QUEUE_TRACE_KEY)) {
15
+ return body;
16
+ }
17
+ return { ...body, [SENTRY_QUEUE_TRACE_KEY]: sentryTrace };
18
+ }
19
+ function extractQueueTraceContext(body) {
20
+ if (!isQueueTraceCarrier(body)) {
21
+ return void 0;
22
+ }
23
+ if (!Object.prototype.hasOwnProperty.call(body, SENTRY_QUEUE_TRACE_KEY)) {
24
+ return void 0;
25
+ }
26
+ const sentryTrace = body[SENTRY_QUEUE_TRACE_KEY];
27
+ Reflect.deleteProperty(body, SENTRY_QUEUE_TRACE_KEY);
28
+ if (typeof sentryTrace !== "string") {
29
+ return void 0;
30
+ }
31
+ const traceparentData = core.extractTraceparentData(sentryTrace);
32
+ if (!traceparentData?.traceId || !traceparentData.parentSpanId) {
33
+ return void 0;
34
+ }
35
+ return {
36
+ traceId: traceparentData.traceId,
37
+ spanId: traceparentData.parentSpanId,
38
+ sampled: traceparentData.parentSampled
39
+ };
40
+ }
41
+
42
+ exports.addQueueTraceContext = addQueueTraceContext;
43
+ exports.extractQueueTraceContext = extractQueueTraceContext;
44
+ //# sourceMappingURL=queueTraceMeta.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"queueTraceMeta.js","sources":["../../../../src/utils/queueTraceMeta.ts"],"sourcesContent":["import { extractTraceparentData } from '@sentry/core';\n\nconst SENTRY_QUEUE_TRACE_KEY = '__sentry_queue_trace__';\n\nfunction isQueueTraceCarrier(body: unknown): body is Record<string, unknown> {\n if (typeof body !== 'object' || body === null || Array.isArray(body)) {\n return false;\n }\n\n // Cloudflare Queues has no message-header API. Only record-like bodies can carry a named field; binary data and\n // other structured-clone values must pass through untouched.\n const prototype = Object.getPrototypeOf(body);\n return prototype === Object.prototype || prototype === null;\n}\n\nexport function addQueueTraceContext(body: unknown, sentryTrace: string | undefined): unknown {\n if (\n !isQueueTraceCarrier(body) ||\n !sentryTrace ||\n Object.prototype.hasOwnProperty.call(body, SENTRY_QUEUE_TRACE_KEY)\n ) {\n return body;\n }\n\n // Cloudflare rejects messages over 128 KB (https://developers.cloudflare.com/queues/platform/limits/),\n // and the field adds about 80 bytes, so a payload right under the limit can start failing to send.\n // Span links only need `sentry-trace`, so baggage would only cost more of that budget. Copy instead\n // of mutating, because callers may reuse a payload after enqueueing it.\n return { ...body, [SENTRY_QUEUE_TRACE_KEY]: sentryTrace };\n}\n\nexport function extractQueueTraceContext(\n body: unknown,\n): { traceId: string; spanId: string; sampled: boolean | undefined } | undefined {\n if (!isQueueTraceCarrier(body)) {\n return undefined;\n }\n\n if (!Object.prototype.hasOwnProperty.call(body, SENTRY_QUEUE_TRACE_KEY)) {\n return undefined;\n }\n\n const sentryTrace = body[SENTRY_QUEUE_TRACE_KEY];\n\n // The key is reserved transport metadata, so strip it even if its value is not a valid trace.\n // Unlike `delete`, this returns false instead of throwing on frozen bodies, which keep the field.\n Reflect.deleteProperty(body, SENTRY_QUEUE_TRACE_KEY);\n\n if (typeof sentryTrace !== 'string') {\n return undefined;\n }\n\n const traceparentData = extractTraceparentData(sentryTrace);\n if (!traceparentData?.traceId || !traceparentData.parentSpanId) {\n return undefined;\n }\n\n return {\n traceId: traceparentData.traceId,\n spanId: traceparentData.parentSpanId,\n sampled: traceparentData.parentSampled,\n };\n}\n"],"names":["extractTraceparentData"],"mappings":";;;;AAEA,MAAM,sBAAA,GAAyB,wBAAA;AAE/B,SAAS,oBAAoB,IAAA,EAAgD;AAC3E,EAAA,IAAI,OAAO,SAAS,QAAA,IAAY,IAAA,KAAS,QAAQ,KAAA,CAAM,OAAA,CAAQ,IAAI,CAAA,EAAG;AACpE,IAAA,OAAO,KAAA;AAAA,EACT;AAIA,EAAA,MAAM,SAAA,GAAY,MAAA,CAAO,cAAA,CAAe,IAAI,CAAA;AAC5C,EAAA,OAAO,SAAA,KAAc,MAAA,CAAO,SAAA,IAAa,SAAA,KAAc,IAAA;AACzD;AAEO,SAAS,oBAAA,CAAqB,MAAe,WAAA,EAA0C;AAC5F,EAAA,IACE,CAAC,mBAAA,CAAoB,IAAI,CAAA,IACzB,CAAC,WAAA,IACD,MAAA,CAAO,SAAA,CAAU,cAAA,CAAe,IAAA,CAAK,IAAA,EAAM,sBAAsB,CAAA,EACjE;AACA,IAAA,OAAO,IAAA;AAAA,EACT;AAMA,EAAA,OAAO,EAAE,GAAG,IAAA,EAAM,CAAC,sBAAsB,GAAG,WAAA,EAAY;AAC1D;AAEO,SAAS,yBACd,IAAA,EAC+E;AAC/E,EAAA,IAAI,CAAC,mBAAA,CAAoB,IAAI,CAAA,EAAG;AAC9B,IAAA,OAAO,MAAA;AAAA,EACT;AAEA,EAAA,IAAI,CAAC,MAAA,CAAO,SAAA,CAAU,eAAe,IAAA,CAAK,IAAA,EAAM,sBAAsB,CAAA,EAAG;AACvE,IAAA,OAAO,MAAA;AAAA,EACT;AAEA,EAAA,MAAM,WAAA,GAAc,KAAK,sBAAsB,CAAA;AAI/C,EAAA,OAAA,CAAQ,cAAA,CAAe,MAAM,sBAAsB,CAAA;AAEnD,EAAA,IAAI,OAAO,gBAAgB,QAAA,EAAU;AACnC,IAAA,OAAO,MAAA;AAAA,EACT;AAEA,EAAA,MAAM,eAAA,GAAkBA,4BAAuB,WAAW,CAAA;AAC1D,EAAA,IAAI,CAAC,eAAA,EAAiB,OAAA,IAAW,CAAC,gBAAgB,YAAA,EAAc;AAC9D,IAAA,OAAO,MAAA;AAAA,EACT;AAEA,EAAA,OAAO;AAAA,IACL,SAAS,eAAA,CAAgB,OAAA;AAAA,IACzB,QAAQ,eAAA,CAAgB,YAAA;AAAA,IACxB,SAAS,eAAA,CAAgB;AAAA,GAC3B;AACF;;;;;"}
@@ -11,7 +11,8 @@ function sentryCloudflareVitePlugin(options = {}) {
11
11
  buildTimeInstrumentation: options.buildTimeInstrumentation,
12
12
  // Route the injected `tracingChannel` imports through the workerd-safe façade so a
13
13
  // dependency wrapped at module scope (`const app = new Hono()`) doesn't throw on workerd.
14
- dcModule: "@sentry/cloudflare/orchestrion-diagnostics-channel"
14
+ dcModule: "@sentry/cloudflare/orchestrion-diagnostics-channel",
15
+ transformOptimizedDeps: true
15
16
  }),
16
17
  mastraObservability.sentryMastraObservabilityProviderPlugin(),
17
18
  flueRuntime.sentryFlueRuntimeProviderPlugin(),