@sentry/cloudflare 11.10.0 → 11.11.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 (145) 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/index.js +2 -1
  4. package/build/cjs/dev/index.js.map +1 -1
  5. package/build/cjs/dev/instrumentations/instrumentDurableObjectStorage.js +2 -2
  6. package/build/cjs/dev/instrumentations/instrumentDurableObjectStorage.js.map +1 -1
  7. package/build/cjs/dev/instrumentations/instrumentDurableObjectSyncKvStorage.js +2 -2
  8. package/build/cjs/dev/instrumentations/instrumentDurableObjectSyncKvStorage.js.map +1 -1
  9. package/build/cjs/dev/instrumentations/instrumentSqlStorage.js +5 -5
  10. package/build/cjs/dev/instrumentations/instrumentSqlStorage.js.map +1 -1
  11. package/build/cjs/dev/instrumentations/worker/instrumentD1.js +12 -12
  12. package/build/cjs/dev/instrumentations/worker/instrumentD1.js.map +1 -1
  13. package/build/cjs/dev/instrumentations/worker/instrumentQueue.js +7 -7
  14. package/build/cjs/dev/instrumentations/worker/instrumentQueue.js.map +1 -1
  15. package/build/cjs/dev/instrumentations/worker/instrumentQueueProducer.js +6 -6
  16. package/build/cjs/dev/instrumentations/worker/instrumentQueueProducer.js.map +1 -1
  17. package/build/cjs/dev/instrumentations/worker/instrumentR2.js +1 -1
  18. package/build/cjs/dev/instrumentations/worker/instrumentR2.js.map +1 -1
  19. package/build/cjs/dev/integrations/httpServer.js +15 -72
  20. package/build/cjs/dev/integrations/httpServer.js.map +1 -1
  21. package/build/cjs/dev/request.js.map +1 -1
  22. package/build/cjs/dev/scope-utils.js +2 -6
  23. package/build/cjs/dev/scope-utils.js.map +1 -1
  24. package/build/cjs/dev/sdk.js +2 -5
  25. package/build/cjs/dev/sdk.js.map +1 -1
  26. package/build/cjs/dev/vite/index.js +2 -1
  27. package/build/cjs/dev/vite/index.js.map +1 -1
  28. package/build/cjs/dev/workflows.js +5 -5
  29. package/build/cjs/dev/workflows.js.map +1 -1
  30. package/build/cjs/dev/wrapRequestHandlerWithInit.js +29 -111
  31. package/build/cjs/dev/wrapRequestHandlerWithInit.js.map +1 -1
  32. package/build/cjs/prod/baseSdk.js +4 -8
  33. package/build/cjs/prod/baseSdk.js.map +1 -1
  34. package/build/cjs/prod/index.js +2 -1
  35. package/build/cjs/prod/index.js.map +1 -1
  36. package/build/cjs/prod/instrumentations/instrumentDurableObjectStorage.js +2 -2
  37. package/build/cjs/prod/instrumentations/instrumentDurableObjectStorage.js.map +1 -1
  38. package/build/cjs/prod/instrumentations/instrumentDurableObjectSyncKvStorage.js +2 -2
  39. package/build/cjs/prod/instrumentations/instrumentDurableObjectSyncKvStorage.js.map +1 -1
  40. package/build/cjs/prod/instrumentations/instrumentSqlStorage.js +5 -5
  41. package/build/cjs/prod/instrumentations/instrumentSqlStorage.js.map +1 -1
  42. package/build/cjs/prod/instrumentations/worker/instrumentD1.js +12 -12
  43. package/build/cjs/prod/instrumentations/worker/instrumentD1.js.map +1 -1
  44. package/build/cjs/prod/instrumentations/worker/instrumentQueue.js +7 -7
  45. package/build/cjs/prod/instrumentations/worker/instrumentQueue.js.map +1 -1
  46. package/build/cjs/prod/instrumentations/worker/instrumentQueueProducer.js +6 -6
  47. package/build/cjs/prod/instrumentations/worker/instrumentQueueProducer.js.map +1 -1
  48. package/build/cjs/prod/instrumentations/worker/instrumentR2.js +1 -1
  49. package/build/cjs/prod/instrumentations/worker/instrumentR2.js.map +1 -1
  50. package/build/cjs/prod/integrations/httpServer.js +15 -72
  51. package/build/cjs/prod/integrations/httpServer.js.map +1 -1
  52. package/build/cjs/prod/request.js.map +1 -1
  53. package/build/cjs/prod/scope-utils.js +2 -6
  54. package/build/cjs/prod/scope-utils.js.map +1 -1
  55. package/build/cjs/prod/sdk.js +2 -5
  56. package/build/cjs/prod/sdk.js.map +1 -1
  57. package/build/cjs/prod/vite/index.js +2 -1
  58. package/build/cjs/prod/vite/index.js.map +1 -1
  59. package/build/cjs/prod/workflows.js +5 -5
  60. package/build/cjs/prod/workflows.js.map +1 -1
  61. package/build/cjs/prod/wrapRequestHandlerWithInit.js +29 -111
  62. package/build/cjs/prod/wrapRequestHandlerWithInit.js.map +1 -1
  63. package/build/esm/dev/baseSdk.js +4 -7
  64. package/build/esm/dev/baseSdk.js.map +1 -1
  65. package/build/esm/dev/index.js +2 -1
  66. package/build/esm/dev/index.js.map +1 -1
  67. package/build/esm/dev/instrumentations/instrumentDurableObjectStorage.js +3 -3
  68. package/build/esm/dev/instrumentations/instrumentDurableObjectStorage.js.map +1 -1
  69. package/build/esm/dev/instrumentations/instrumentDurableObjectSyncKvStorage.js +3 -3
  70. package/build/esm/dev/instrumentations/instrumentDurableObjectSyncKvStorage.js.map +1 -1
  71. package/build/esm/dev/instrumentations/instrumentSqlStorage.js +6 -6
  72. package/build/esm/dev/instrumentations/instrumentSqlStorage.js.map +1 -1
  73. package/build/esm/dev/instrumentations/worker/instrumentD1.js +13 -13
  74. package/build/esm/dev/instrumentations/worker/instrumentD1.js.map +1 -1
  75. package/build/esm/dev/instrumentations/worker/instrumentQueue.js +8 -8
  76. package/build/esm/dev/instrumentations/worker/instrumentQueue.js.map +1 -1
  77. package/build/esm/dev/instrumentations/worker/instrumentQueueProducer.js +7 -7
  78. package/build/esm/dev/instrumentations/worker/instrumentQueueProducer.js.map +1 -1
  79. package/build/esm/dev/instrumentations/worker/instrumentR2.js +1 -1
  80. package/build/esm/dev/instrumentations/worker/instrumentR2.js.map +1 -1
  81. package/build/esm/dev/integrations/httpServer.js +16 -71
  82. package/build/esm/dev/integrations/httpServer.js.map +1 -1
  83. package/build/esm/dev/package.json +1 -1
  84. package/build/esm/dev/request.js.map +1 -1
  85. package/build/esm/dev/scope-utils.js +3 -6
  86. package/build/esm/dev/scope-utils.js.map +1 -1
  87. package/build/esm/dev/sdk.js +4 -6
  88. package/build/esm/dev/sdk.js.map +1 -1
  89. package/build/esm/dev/vite/index.js +2 -1
  90. package/build/esm/dev/vite/index.js.map +1 -1
  91. package/build/esm/dev/workflows.js +6 -6
  92. package/build/esm/dev/workflows.js.map +1 -1
  93. package/build/esm/dev/wrapRequestHandlerWithInit.js +33 -115
  94. package/build/esm/dev/wrapRequestHandlerWithInit.js.map +1 -1
  95. package/build/esm/prod/baseSdk.js +4 -7
  96. package/build/esm/prod/baseSdk.js.map +1 -1
  97. package/build/esm/prod/index.js +2 -1
  98. package/build/esm/prod/index.js.map +1 -1
  99. package/build/esm/prod/instrumentations/instrumentDurableObjectStorage.js +3 -3
  100. package/build/esm/prod/instrumentations/instrumentDurableObjectStorage.js.map +1 -1
  101. package/build/esm/prod/instrumentations/instrumentDurableObjectSyncKvStorage.js +3 -3
  102. package/build/esm/prod/instrumentations/instrumentDurableObjectSyncKvStorage.js.map +1 -1
  103. package/build/esm/prod/instrumentations/instrumentSqlStorage.js +6 -6
  104. package/build/esm/prod/instrumentations/instrumentSqlStorage.js.map +1 -1
  105. package/build/esm/prod/instrumentations/worker/instrumentD1.js +13 -13
  106. package/build/esm/prod/instrumentations/worker/instrumentD1.js.map +1 -1
  107. package/build/esm/prod/instrumentations/worker/instrumentQueue.js +8 -8
  108. package/build/esm/prod/instrumentations/worker/instrumentQueue.js.map +1 -1
  109. package/build/esm/prod/instrumentations/worker/instrumentQueueProducer.js +7 -7
  110. package/build/esm/prod/instrumentations/worker/instrumentQueueProducer.js.map +1 -1
  111. package/build/esm/prod/instrumentations/worker/instrumentR2.js +1 -1
  112. package/build/esm/prod/instrumentations/worker/instrumentR2.js.map +1 -1
  113. package/build/esm/prod/integrations/httpServer.js +16 -71
  114. package/build/esm/prod/integrations/httpServer.js.map +1 -1
  115. package/build/esm/prod/package.json +1 -1
  116. package/build/esm/prod/request.js.map +1 -1
  117. package/build/esm/prod/scope-utils.js +3 -6
  118. package/build/esm/prod/scope-utils.js.map +1 -1
  119. package/build/esm/prod/sdk.js +4 -6
  120. package/build/esm/prod/sdk.js.map +1 -1
  121. package/build/esm/prod/vite/index.js +2 -1
  122. package/build/esm/prod/vite/index.js.map +1 -1
  123. package/build/esm/prod/workflows.js +6 -6
  124. package/build/esm/prod/workflows.js.map +1 -1
  125. package/build/esm/prod/wrapRequestHandlerWithInit.js +33 -115
  126. package/build/esm/prod/wrapRequestHandlerWithInit.js.map +1 -1
  127. package/build/types/baseSdk.d.ts +6 -18
  128. package/build/types/baseSdk.d.ts.map +1 -1
  129. package/build/types/instrumentations/instrumentSqlStorage.d.ts.map +1 -1
  130. package/build/types/instrumentations/worker/instrumentD1.d.ts.map +1 -1
  131. package/build/types/instrumentations/worker/instrumentQueue.d.ts.map +1 -1
  132. package/build/types/instrumentations/worker/instrumentQueueProducer.d.ts.map +1 -1
  133. package/build/types/integrations/httpServer.d.ts +9 -20
  134. package/build/types/integrations/httpServer.d.ts.map +1 -1
  135. package/build/types/request.d.ts +3 -4
  136. package/build/types/request.d.ts.map +1 -1
  137. package/build/types/scope-utils.d.ts +0 -4
  138. package/build/types/scope-utils.d.ts.map +1 -1
  139. package/build/types/sdk.d.ts +3 -8
  140. package/build/types/sdk.d.ts.map +1 -1
  141. package/build/types/vite/index.d.ts.map +1 -1
  142. package/build/types/workflows.d.ts.map +1 -1
  143. package/build/types/wrapRequestHandlerWithInit.d.ts +1 -1
  144. package/build/types/wrapRequestHandlerWithInit.d.ts.map +1 -1
  145. package/package.json +8 -8
@@ -1,9 +1,8 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
2
2
 
3
3
  const attributes = require('@sentry/conventions/attributes');
4
- const op = require('@sentry/conventions/op');
5
4
  const core = require('@sentry/core');
6
- const server = require('@sentry/core/server');
5
+ const requestHandler = require('@sentry/server-utils/request-handler');
7
6
  const debugBuild = require('./debug-build.js');
8
7
  const httpServer = require('./integrations/httpServer.js');
9
8
  const orchestrionDeferredChannels = require('./orchestrion-deferred-channels.js');
@@ -21,37 +20,11 @@ function wrapRequestHandlerWithInit(wrapperOptions, handler, initSdk) {
21
20
  const context = wrapperOptions.context;
22
21
  const invocationState = invocationContext.getInvocationState();
23
22
  const waitUntil = invocationState ? invocationContext.getInvocationWaitUntil(invocationState) : context ? flush.getOriginalWaitUntil(context).bind(context) : void 0;
24
- const errorMechanismType = getRequestErrorMechanismType(context);
25
23
  const client = initSdk({ ...options, ctx: context });
26
24
  isolationScope.setClient(client);
27
25
  orchestrionDeferredChannels.flushDeferredChannelEvents();
28
- const urlObject = core.parseStringToURLObject(request.url);
29
- const [rawName, attributes$1] = core.getHttpSpanDetailsFromUrlObject(
30
- urlObject,
31
- "server",
32
- "auto.http.cloudflare",
33
- request,
34
- void 0,
35
- client
36
- );
37
- const name = attributes$1[attributes.SENTRY_SEGMENT_NAME_SOURCE] === "route" || !client || !core.hasSpanStreamingEnabled(client) ? rawName : request.method?.toUpperCase() || core.HTTP_SPAN_NAME_FALLBACK;
38
- const contentLength = request.headers.get("content-length");
39
- if (contentLength) {
40
- attributes$1["http.request.body.size"] = parseInt(contentLength, 10);
41
- }
42
- const userAgentHeader = request.headers.get("user-agent");
43
- if (userAgentHeader) {
44
- attributes$1["user_agent.original"] = userAgentHeader;
45
- }
46
- if (client) {
47
- Object.assign(
48
- attributes$1,
49
- core.httpHeadersToSpanAttributes(core.winterCGHeadersToDict(request.headers), client.getDataCollectionOptions())
50
- );
51
- }
52
- attributes$1[attributes.SENTRY_OP] = op.HTTP_SERVER;
53
26
  scopeUtils.addCloudResourceContext(isolationScope);
54
- scopeUtils.addRequest(isolationScope, request);
27
+ const attributes$1 = {};
55
28
  if (request.cf) {
56
29
  scopeUtils.addCultureContext(isolationScope, request.cf);
57
30
  if (typeof request.cf.httpProtocol === "string") {
@@ -60,97 +33,42 @@ function wrapRequestHandlerWithInit(wrapperOptions, handler, initSdk) {
60
33
  attributes$1[attributes.NETWORK_PROTOCOL_VERSION] = protocolVersion;
61
34
  }
62
35
  }
63
- if (request.method === "OPTIONS" || request.method === "HEAD") {
36
+ if (!client) {
64
37
  try {
65
38
  return await handler();
66
- } catch (e) {
67
- if (captureErrors) {
68
- core.captureException(e, { mechanism: { handled: false, type: errorMechanismType } });
69
- }
70
- throw e;
71
39
  } finally {
72
40
  waitUntil?.(flush.flushAndDispose(client));
73
41
  }
74
42
  }
75
- if (client) {
76
- await httpServer.captureIncomingRequestBody(client, request);
77
- }
78
- const { onSpanCreated, onSpanEnd } = httpServer.getIncomingRequestSpanHooks(client);
79
- const respond = async (span) => {
80
- let res;
81
- try {
82
- res = await handler();
83
- if (span) {
84
- core.setHttpStatus(span, res.status);
85
- }
86
- } catch (e) {
87
- span?.end();
88
- if (captureErrors) {
89
- core.captureException(e, { mechanism: { handled: false, type: errorMechanismType } });
90
- }
91
- waitUntil?.(flush.flushAndDispose(client));
92
- throw e;
93
- }
94
- let ended = false;
95
- const endSpan = () => {
96
- if (ended) return;
97
- ended = true;
98
- if (span) {
99
- onSpanEnd(span, request, res);
100
- span.end();
101
- }
102
- };
103
- const userClassification = core.safeCallback(
104
- debugBuild.DEBUG_BUILD ? "Error in `isStreamingResponse`, using the default classification:" : "",
105
- () => options.isStreamingResponse?.(res, request),
106
- () => void 0
107
- );
108
- const isStreaming = typeof userClassification === "boolean" ? userClassification : server.classifyResponseStreaming(res).isStreaming;
109
- if (isStreaming && res.body) {
110
- try {
111
- let transformerUsed = false;
112
- const endSpanOnce = () => {
113
- if (ended) return;
114
- endSpan();
43
+ return requestHandler.wrapServerRequestHandler(
44
+ {
45
+ request,
46
+ client,
47
+ // Without `AsyncLocalStorage`, `withInvocationIsolationScope` does not fork, and the scope it
48
+ // passes in is not the current one. The request data has to go on the current scope, where
49
+ // events captured in the handler read it.
50
+ isolationScope: core.getIsolationScope(),
51
+ options: httpServer.getHttpServerRequestOptions(client),
52
+ origin: "auto.http.cloudflare",
53
+ mechanism: captureErrors ? { handled: false, type: getRequestErrorMechanismType(context) } : void 0,
54
+ attributes: attributes$1,
55
+ isStreamingResponse: (response) => {
56
+ const classification = core.safeCallback(
57
+ debugBuild.DEBUG_BUILD ? "Error in `isStreamingResponse`, using the default classification:" : "",
58
+ () => options.isStreamingResponse?.(response, request),
59
+ () => void 0
60
+ );
61
+ return typeof classification === "boolean" ? classification : void 0;
62
+ },
63
+ onDone: (response) => {
64
+ if (response?.status === 101) {
65
+ waitUntil?.(client.flush(2e3));
66
+ } else {
115
67
  waitUntil?.(flush.flushAndDispose(client));
116
- };
117
- const transform = new TransformStream({
118
- start() {
119
- transformerUsed = true;
120
- },
121
- flush() {
122
- endSpanOnce();
123
- },
124
- cancel() {
125
- endSpanOnce();
126
- }
127
- });
128
- if (transformerUsed) {
129
- return new Response(res.body.pipeThrough(transform), res);
130
68
  }
131
- } catch {
132
- }
133
- }
134
- endSpan();
135
- if (res.status === 101) {
136
- waitUntil?.(client?.flush(2e3));
137
- } else {
138
- waitUntil?.(flush.flushAndDispose(client));
139
- }
140
- return res;
141
- };
142
- const createSpan = httpServer.shouldCreateIncomingRequestSpan(client, request);
143
- return core.continueTrace(
144
- { sentryTrace: request.headers.get("sentry-trace") || "", baggage: request.headers.get("baggage") },
145
- () => {
146
- if (!createSpan) {
147
- return respond(void 0);
148
69
  }
149
- return core.startSpanManual({ name, attributes: attributes$1 }, (span) => {
150
- onSpanCreated(span, request);
151
- return respond(span);
152
- });
153
- }
70
+ },
71
+ () => handler()
154
72
  );
155
73
  }, wrapperOptions.context);
156
74
  }
@@ -1 +1 @@
1
- {"version":3,"file":"wrapRequestHandlerWithInit.js","sources":["../../../src/wrapRequestHandlerWithInit.ts"],"sourcesContent":["import type { CfProperties, IncomingRequestCfProperties } from '@cloudflare/workers-types';\nimport {\n NETWORK_PROTOCOL_NAME,\n NETWORK_PROTOCOL_VERSION,\n SENTRY_OP,\n SENTRY_SEGMENT_NAME_SOURCE,\n} from '@sentry/conventions/attributes';\nimport { HTTP_SERVER } from '@sentry/conventions/op';\nimport type { Span } from '@sentry/core';\nimport {\n captureException,\n continueTrace,\n getHttpSpanDetailsFromUrlObject,\n hasSpanStreamingEnabled,\n httpHeadersToSpanAttributes,\n HTTP_SPAN_NAME_FALLBACK,\n parseStringToURLObject,\n safeCallback,\n setHttpStatus,\n startSpanManual,\n winterCGHeadersToDict,\n} from '@sentry/core';\nimport { classifyResponseStreaming } from '@sentry/core/server';\nimport { DEBUG_BUILD } from './debug-build';\nimport {\n captureIncomingRequestBody,\n getIncomingRequestSpanHooks,\n shouldCreateIncomingRequestSpan,\n} from './integrations/httpServer';\nimport { flushDeferredChannelEvents } from './orchestrion-deferred-channels';\nimport type { CloudflareClient, CloudflareOptions } from './client';\nimport type { ExecutionContextCompat } from './executionContext';\nimport { flushAndDispose, getOriginalWaitUntil } from './flush';\nimport { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils';\nimport { getInvocationState, getInvocationWaitUntil } from './utils/invocationContext';\nimport { withInvocationIsolationScope } from './utils/invocationScope';\n\nfunction getRequestErrorMechanismType(context: ExecutionContextCompat | undefined): string {\n // Durable Object fetch handlers use DO state as context (see instrumentDurableObjectWithSentry)\n return context && 'storage' in context ? 'auto.faas.cloudflare.durable_object' : 'auto.http.cloudflare';\n}\n\nexport interface RequestHandlerWrapperOptions {\n options: CloudflareOptions;\n request: Request<unknown, IncomingRequestCfProperties<unknown> | CfProperties<unknown>>;\n context: ExecutionContextCompat | undefined;\n /**\n * If true, errors will be captured, rethrown and sent to Sentry.\n * Otherwise, errors are rethrown but not captured.\n *\n * You most likely don't want to set this to `false`, if you use `wrapRequestHandler` directly.\n * This is primarily meant as an escape hatch for higher-level SDKs relying on additional error\n * capturing mechanisms where this wrapper captures errors too early or too generally.\n *\n * @default true\n */\n captureErrors?: boolean;\n}\n\ntype InitSdk = (options: CloudflareOptions) => CloudflareClient | undefined;\n\n/**\n * Same as {@link wrapRequestHandler}, but with the SDK initialization injected.\n *\n * Wrappers that are only reachable from the main entry point — where `nodejs_compat` is a\n * requirement anyway — pass `init` from `sdk.ts` to get the full default integrations.\n *\n * @internal\n */\nexport function wrapRequestHandlerWithInit(\n wrapperOptions: RequestHandlerWrapperOptions,\n handler: (...args: unknown[]) => Response | Promise<Response>,\n initSdk: InitSdk,\n): Promise<Response> {\n return withInvocationIsolationScope(async isolationScope => {\n const { options, request, captureErrors = true } = wrapperOptions;\n const context = wrapperOptions.context;\n\n // The un-instrumented waitUntil, so flushAndDispose cannot deadlock on the flush\n // lock's own wrapper. Resolved once per invocation and cached on its state; reading\n // `ctx.waitUntil` on a native context is a runtime getter call.\n const invocationState = getInvocationState();\n const waitUntil = invocationState\n ? getInvocationWaitUntil(invocationState)\n : context\n ? getOriginalWaitUntil(context).bind(context)\n : undefined;\n const errorMechanismType = getRequestErrorMechanismType(context);\n\n const client = initSdk({ ...options, ctx: context });\n isolationScope.setClient(client);\n\n // Emit any orchestrion channel events deferred at module scope (e.g. a top-level\n // `const app = new Hono()` wrapped by build-time instrumentation): we're now in a\n // request, where workerd allows publish, and init() above has registered subscribers.\n flushDeferredChannelEvents();\n\n const urlObject = parseStringToURLObject(request.url);\n const [rawName, attributes] = getHttpSpanDetailsFromUrlObject(\n urlObject,\n 'server',\n 'auto.http.cloudflare',\n request,\n undefined,\n client,\n );\n // With span streaming, span names have to be low cardinality, so we can't fall back to the URL.\n // A `route` source means the name already is (e.g. the `/` path), so it is kept as-is.\n const name =\n attributes[SENTRY_SEGMENT_NAME_SOURCE] === 'route' || !client || !hasSpanStreamingEnabled(client)\n ? rawName\n : request.method?.toUpperCase() || HTTP_SPAN_NAME_FALLBACK;\n\n const contentLength = request.headers.get('content-length');\n if (contentLength) {\n attributes['http.request.body.size'] = parseInt(contentLength, 10);\n }\n\n const userAgentHeader = request.headers.get('user-agent');\n if (userAgentHeader) {\n attributes['user_agent.original'] = userAgentHeader;\n }\n\n if (client) {\n Object.assign(\n attributes,\n httpHeadersToSpanAttributes(winterCGHeadersToDict(request.headers), client.getDataCollectionOptions()),\n );\n }\n\n attributes[SENTRY_OP] = HTTP_SERVER;\n\n addCloudResourceContext(isolationScope);\n addRequest(isolationScope, request);\n if (request.cf) {\n addCultureContext(isolationScope, request.cf);\n\n if (typeof request.cf.httpProtocol === 'string') {\n const [protocolName, protocolVersion] = request.cf.httpProtocol.toLowerCase().split('/');\n attributes[NETWORK_PROTOCOL_NAME] = protocolName;\n attributes[NETWORK_PROTOCOL_VERSION] = protocolVersion;\n }\n }\n\n // Do not capture spans for OPTIONS and HEAD requests\n if (request.method === 'OPTIONS' || request.method === 'HEAD') {\n try {\n return await handler();\n } catch (e) {\n if (captureErrors) {\n captureException(e, { mechanism: { handled: false, type: errorMechanismType } });\n }\n throw e;\n } finally {\n waitUntil?.(flushAndDispose(client));\n }\n }\n\n if (client) {\n await captureIncomingRequestBody(client, request);\n }\n\n const { onSpanCreated, onSpanEnd } = getIncomingRequestSpanHooks(client);\n\n // Runs the handler. Ends the span (if any) and flushes when the response is done.\n const respond = async (span: Span | undefined): Promise<Response> => {\n let res: Response;\n\n try {\n res = await handler();\n if (span) {\n setHttpStatus(span, res.status);\n }\n\n // After the handler runs, the span name might have been updated by nested instrumentation\n // (e.g., Remix parameterizing routes). The span should already have the correct name\n // from that instrumentation, so we don't need to do anything here.\n } catch (e) {\n span?.end();\n if (captureErrors) {\n captureException(e, { mechanism: { handled: false, type: errorMechanismType } });\n }\n waitUntil?.(flushAndDispose(client));\n throw e;\n }\n\n let ended = false;\n const endSpan = (): void => {\n if (ended) return;\n\n ended = true;\n if (span) {\n onSpanEnd(span, request, res);\n span.end();\n }\n };\n\n const userClassification = safeCallback(\n DEBUG_BUILD ? 'Error in `isStreamingResponse`, using the default classification:' : '',\n () => options.isStreamingResponse?.(res, request),\n () => undefined,\n );\n // An async callback returns a promise, which would otherwise count as `true`.\n const isStreaming =\n typeof userClassification === 'boolean' ? userClassification : classifyResponseStreaming(res).isStreaming;\n\n if (isStreaming && res.body) {\n try {\n let transformerUsed = false;\n\n const endSpanOnce = (): void => {\n if (ended) return;\n\n endSpan();\n waitUntil?.(flushAndDispose(client));\n };\n\n // Workers with a compatibility date before 2022-11-30 and without the\n // `transformstream_enable_standard_constructor` flag (for example under older mini-oxygen\n // releases) ignore the transformer, so `flush` and `cancel` would never end the span. Only a\n // used transformer runs `start`.\n const transform = new TransformStream({\n start() {\n transformerUsed = true;\n },\n flush() {\n // Source stream completed normally.\n endSpanOnce();\n },\n cancel() {\n // Client disconnected (or downstream cancelled). The `cancel`\n // is being called while the response is still considered\n // active, so this is a safe place to end the span.\n endSpanOnce();\n },\n });\n\n if (transformerUsed) {\n // Passing the original response as the init keeps `encodeBody: 'manual'`, which a\n // Response does not expose as a property. Without it, workerd compresses a\n // pre-compressed body a second time.\n return new Response(res.body.pipeThrough(transform), res);\n }\n } catch {\n // Falls back to ending the span at handler return.\n }\n }\n\n // Non-streaming response - end span immediately and return original\n endSpan();\n\n // Don't dispose for protocol upgrades (101 Switching Protocols) - the connection stays alive.\n // This includes WebSocket upgrades where webSocketMessage/webSocketClose handlers\n // will still be called and may need the client to capture errors.\n if (res.status === 101) {\n waitUntil?.(client?.flush(2000));\n } else {\n waitUntil?.(flushAndDispose(client));\n }\n return res;\n };\n\n const createSpan = shouldCreateIncomingRequestSpan(client, request);\n\n return continueTrace(\n { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },\n () => {\n if (!createSpan) {\n return respond(undefined);\n }\n\n // Note: This span will not have a duration unless I/O happens in the handler. This is\n // because of how the cloudflare workers runtime works.\n // See: https://developers.cloudflare.com/workers/runtime-apis/performance/\n\n // Use startSpanManual to control when span ends (needed for streaming responses)\n return startSpanManual({ name, attributes }, span => {\n onSpanCreated(span, request);\n return respond(span);\n });\n },\n );\n }, wrapperOptions.context);\n}\n"],"names":["withInvocationIsolationScope","getInvocationState","getInvocationWaitUntil","getOriginalWaitUntil","flushDeferredChannelEvents","parseStringToURLObject","attributes","getHttpSpanDetailsFromUrlObject","SENTRY_SEGMENT_NAME_SOURCE","hasSpanStreamingEnabled","HTTP_SPAN_NAME_FALLBACK","httpHeadersToSpanAttributes","winterCGHeadersToDict","SENTRY_OP","HTTP_SERVER","addCloudResourceContext","addRequest","addCultureContext","NETWORK_PROTOCOL_NAME","NETWORK_PROTOCOL_VERSION","captureException","flushAndDispose","captureIncomingRequestBody","getIncomingRequestSpanHooks","setHttpStatus","safeCallback","DEBUG_BUILD","classifyResponseStreaming","shouldCreateIncomingRequestSpan","continueTrace","startSpanManual"],"mappings":"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"}
1
+ {"version":3,"file":"wrapRequestHandlerWithInit.js","sources":["../../../src/wrapRequestHandlerWithInit.ts"],"sourcesContent":["import type { CfProperties, IncomingRequestCfProperties } from '@cloudflare/workers-types';\nimport { NETWORK_PROTOCOL_NAME, NETWORK_PROTOCOL_VERSION } from '@sentry/conventions/attributes';\nimport type { SpanAttributes } from '@sentry/core';\nimport { getIsolationScope, safeCallback } from '@sentry/core';\nimport { wrapServerRequestHandler } from '@sentry/server-utils/request-handler';\nimport { DEBUG_BUILD } from './debug-build';\nimport { getHttpServerRequestOptions } from './integrations/httpServer';\nimport { flushDeferredChannelEvents } from './orchestrion-deferred-channels';\nimport type { CloudflareClient, CloudflareOptions } from './client';\nimport type { ExecutionContextCompat } from './executionContext';\nimport { flushAndDispose, getOriginalWaitUntil } from './flush';\nimport { addCloudResourceContext, addCultureContext } from './scope-utils';\nimport { getInvocationState, getInvocationWaitUntil } from './utils/invocationContext';\nimport { withInvocationIsolationScope } from './utils/invocationScope';\n\nfunction getRequestErrorMechanismType(context: ExecutionContextCompat | undefined): string {\n // Durable Object fetch handlers use DO state as context (see instrumentDurableObjectWithSentry)\n return context && 'storage' in context ? 'auto.faas.cloudflare.durable_object' : 'auto.http.cloudflare';\n}\n\nexport interface RequestHandlerWrapperOptions {\n options: CloudflareOptions;\n request: Request<unknown, IncomingRequestCfProperties<unknown> | CfProperties<unknown>>;\n context: ExecutionContextCompat | undefined;\n /**\n * If true, errors will be captured, rethrown and sent to Sentry.\n * Otherwise, errors are rethrown but not captured.\n *\n * You most likely don't want to set this to `false`, if you use `wrapRequestHandler` directly.\n * This is primarily meant as an escape hatch for higher-level SDKs relying on additional error\n * capturing mechanisms where this wrapper captures errors too early or too generally.\n *\n * @default true\n */\n captureErrors?: boolean;\n}\n\ntype InitSdk = (options: CloudflareOptions) => CloudflareClient | undefined;\n\n/**\n * Same as {@link wrapRequestHandler}, but with the SDK initialization injected.\n *\n * Wrappers that are only reachable from the main entry point — where `nodejs_compat` is a\n * requirement anyway — pass `init` from `sdk.ts` so `enableOpenTelemetrySetup` is honored.\n *\n * @internal\n */\nexport function wrapRequestHandlerWithInit(\n wrapperOptions: RequestHandlerWrapperOptions,\n handler: (...args: unknown[]) => Response | Promise<Response>,\n initSdk: InitSdk,\n): Promise<Response> {\n return withInvocationIsolationScope(async isolationScope => {\n const { options, request, captureErrors = true } = wrapperOptions;\n const context = wrapperOptions.context;\n\n // The un-instrumented waitUntil, so flushAndDispose cannot deadlock on the flush\n // lock's own wrapper. Resolved once per invocation and cached on its state; reading\n // `ctx.waitUntil` on a native context is a runtime getter call.\n const invocationState = getInvocationState();\n const waitUntil = invocationState\n ? getInvocationWaitUntil(invocationState)\n : context\n ? getOriginalWaitUntil(context).bind(context)\n : undefined;\n\n const client = initSdk({ ...options, ctx: context });\n isolationScope.setClient(client);\n\n // Emit any orchestrion channel events deferred at module scope (e.g. a top-level\n // `const app = new Hono()` wrapped by build-time instrumentation): we're now in a\n // request, where workerd allows publish, and init() above has registered subscribers.\n flushDeferredChannelEvents();\n\n addCloudResourceContext(isolationScope);\n const attributes: SpanAttributes = {};\n if (request.cf) {\n addCultureContext(isolationScope, request.cf);\n\n if (typeof request.cf.httpProtocol === 'string') {\n const [protocolName, protocolVersion] = request.cf.httpProtocol.toLowerCase().split('/');\n attributes[NETWORK_PROTOCOL_NAME] = protocolName;\n attributes[NETWORK_PROTOCOL_VERSION] = protocolVersion;\n }\n }\n\n if (!client) {\n try {\n return await handler();\n } finally {\n waitUntil?.(flushAndDispose(client));\n }\n }\n\n // Note: The span will not have a duration unless I/O happens in the handler. This is\n // because of how the cloudflare workers runtime works.\n // See: https://developers.cloudflare.com/workers/runtime-apis/performance/\n return wrapServerRequestHandler(\n {\n request,\n client,\n // Without `AsyncLocalStorage`, `withInvocationIsolationScope` does not fork, and the scope it\n // passes in is not the current one. The request data has to go on the current scope, where\n // events captured in the handler read it.\n isolationScope: getIsolationScope(),\n options: getHttpServerRequestOptions(client),\n origin: 'auto.http.cloudflare',\n mechanism: captureErrors ? { handled: false, type: getRequestErrorMechanismType(context) } : undefined,\n attributes,\n isStreamingResponse: response => {\n const classification = safeCallback(\n DEBUG_BUILD ? 'Error in `isStreamingResponse`, using the default classification:' : '',\n () => options.isStreamingResponse?.(response, request),\n () => undefined,\n );\n // An async callback returns a promise, which would otherwise count as `true`.\n return typeof classification === 'boolean' ? classification : undefined;\n },\n onDone: response => {\n // Don't dispose for protocol upgrades (101 Switching Protocols) - the connection stays alive.\n // This includes WebSocket upgrades where webSocketMessage/webSocketClose handlers\n // will still be called and may need the client to capture errors.\n if (response?.status === 101) {\n waitUntil?.(client.flush(2000));\n } else {\n waitUntil?.(flushAndDispose(client));\n }\n },\n },\n () => handler(),\n );\n }, wrapperOptions.context);\n}\n"],"names":["withInvocationIsolationScope","getInvocationState","getInvocationWaitUntil","getOriginalWaitUntil","flushDeferredChannelEvents","addCloudResourceContext","attributes","addCultureContext","NETWORK_PROTOCOL_NAME","NETWORK_PROTOCOL_VERSION","flushAndDispose","wrapServerRequestHandler","getIsolationScope","getHttpServerRequestOptions","safeCallback","DEBUG_BUILD"],"mappings":"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"}
@@ -13,7 +13,7 @@ function getRegisteredChannelIntegrations() {
13
13
  const registered = GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations;
14
14
  return registered ? [...registered.values()].map((factory) => factory()) : [];
15
15
  }
16
- function getBaseDefaultIntegrations(options) {
16
+ function getDefaultIntegrations(options) {
17
17
  return [
18
18
  // The Dedupe integration should not be used in workflows because we want to
19
19
  // capture all step failures, even if they are the same error.
@@ -35,7 +35,7 @@ function getBaseDefaultIntegrations(options) {
35
35
  ...getRegisteredChannelIntegrations()
36
36
  ];
37
37
  }
38
- function initWithDefaultIntegrations(options, getDefaultIntegrationsImpl) {
38
+ function initBaseSdk(options) {
39
39
  const cached = getCachedClient();
40
40
  const cacheEnabled = options.cacheClient !== false;
41
41
  if (cacheEnabled && cached && !_INTERNAL_isClientClosed(cached)) {
@@ -50,7 +50,7 @@ function initWithDefaultIntegrations(options, getDefaultIntegrationsImpl) {
50
50
  }
51
51
  const usesSdkDefaults = options.defaultIntegrations === void 0 || !!options._extendsDefaultIntegrations;
52
52
  if (options.defaultIntegrations === void 0) {
53
- options.defaultIntegrations = getDefaultIntegrationsImpl(options);
53
+ options.defaultIntegrations = getDefaultIntegrations(options);
54
54
  }
55
55
  const invocationContext = options.ctx;
56
56
  const flushLock = !cacheEnabled && invocationContext ? makeFlushLock(invocationContext) : void 0;
@@ -103,9 +103,6 @@ function initWithDefaultIntegrations(options, getDefaultIntegrationsImpl) {
103
103
  });
104
104
  return client;
105
105
  }
106
- function initBaseSdk(options) {
107
- return initWithDefaultIntegrations(options, getBaseDefaultIntegrations);
108
- }
109
106
 
110
- export { getBaseDefaultIntegrations, initBaseSdk, initWithDefaultIntegrations };
107
+ export { getDefaultIntegrations, initBaseSdk };
111
108
  //# sourceMappingURL=baseSdk.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"baseSdk.js","sources":["../../../src/baseSdk.ts"],"sourcesContent":["import type { Integration } from '@sentry/core';\nimport { _INTERNAL_isClientClosed, debug, getCurrentScope, safeCallback, setCurrentClient } from '@sentry/core';\nimport {\n consoleIntegration,\n conversationIdIntegration,\n dedupeIntegration,\n eventFiltersIntegration,\n functionToStringIntegration,\n getIntegrationsToSetup,\n GLOBAL_OBJ,\n initAndBind,\n linkedErrorsIntegration,\n requestDataIntegration,\n stackParserFromStackParserOptions,\n} from '@sentry/core';\nimport type { CloudflareClientOptions, CloudflareOptions } from './client';\nimport { CloudflareClient } from './client';\nimport { makeFlushLock } from './flush';\nimport { cacheClient, getCachedClient } from './clientCache';\nimport { DEBUG_BUILD } from './debug-build';\nimport { fetchIntegration } from './integrations/fetch';\nimport { httpServerIntegration } from './integrations/httpServer';\nimport { INTEGRATION_NAME as SPOTLIGHT_INTEGRATION_NAME, spotlightIntegration } from './integrations/spotlight';\nimport { makeCloudflareTransport } from './transport';\nimport { defaultStackParser } from './vendor/stacktrace';\n\n/**\n * Instantiate the channel-subscriber factories the `@sentry/cloudflare/vite`\n * plugin registered on the global marker. The plugin splices a small snippet\n * into each instrumented module that `.set`s its factory here (keyed by module\n * name), so the marker holds one factory per package actually bundled.\n *\n * The marker is read directly instead of importing the factories, so a worker\n * built without the plugin — where the channels never fire — ships none of this\n * code.\n */\nfunction getRegisteredChannelIntegrations(): Integration[] {\n const registered = GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations;\n\n return registered ? [...registered.values()].map(factory => factory()) : [];\n}\n\n/**\n * Get the default integrations that run on any Workers-compatible runtime, i.e. without the\n * `nodejs_compat` compatibility flag.\n *\n * `getDefaultIntegrations` in `sdk.ts` extends this set with the integrations that do depend on\n * Node.js APIs. Keeping the two apart is what allows `wrapRequestHandler` to stay usable on runtimes\n * that cannot enable `nodejs_compat`, such as Shopify Oxygen.\n */\nexport function getBaseDefaultIntegrations(options: CloudflareOptions): Integration[] {\n return [\n // The Dedupe integration should not be used in workflows because we want to\n // capture all step failures, even if they are the same error.\n ...(options.enableDedupe === false ? [] : [dedupeIntegration()]),\n eventFiltersIntegration(),\n functionToStringIntegration(),\n conversationIdIntegration(),\n linkedErrorsIntegration(),\n fetchIntegration(),\n httpServerIntegration(),\n requestDataIntegration(),\n consoleIntegration(),\n // The orchestrion diagnostics-channel subscribers (mysql, pg, …). The\n // `@sentry/cloudflare/vite` plugin injects the channels at build time and,\n // next to each, a snippet that registers the matching subscriber factory on\n // the global marker. Read from there instead of importing them so bundles\n // built without the plugin — where the channels would never fire — don't\n // ship the code.\n ...getRegisteredChannelIntegrations(),\n ];\n}\n\n/**\n * Initializes the Cloudflare SDK with the passed default integrations.\n *\n * The default integrations are injected rather than imported so that this module stays free of\n * Node.js-only code. `request.ts` — which backs both `wrapRequestHandler` and the\n * `@sentry/cloudflare/request` entry point, and therefore has to work on runtimes without the\n * `nodejs_compat` compatibility flag — creates its client from here instead of from `sdk.ts`.\n *\n * The client is cached and reused across invocations within the same isolate,\n * unless `cacheClient: false` is passed. This avoids the\n * per-invocation cost of constructing a new client, and it is what makes\n * Durable Object telemetry reliable: a per-invocation client is disposed at\n * the end of the handler, and in a Durable Object there is no `waitUntil`\n * boundary that reliably extends execution, so spans/events that end after\n * disposal would otherwise be lost.\n */\nexport function initWithDefaultIntegrations(\n options: CloudflareOptions,\n getDefaultIntegrationsImpl: (options: CloudflareOptions) => Integration[],\n): CloudflareClient | undefined {\n const cached = getCachedClient();\n const cacheEnabled = options.cacheClient !== false;\n\n // A closed client drops all data. `close()` marks the client before it\n // flushes, so this also skips a client that is still closing.\n if (cacheEnabled && cached && !_INTERNAL_isClientClosed(cached)) {\n if (DEBUG_BUILD && cached.getOptions().dsn !== options.dsn) {\n debug.warn(\n '[Sentry] init() was called with a different DSN than the cached client of this isolate; the cached client keeps its DSN. Pass `cacheClient: false` for per-invocation options.',\n );\n }\n getCurrentScope().update(options.initialScope);\n setCurrentClient(cached);\n return cached;\n }\n\n // `false` or a custom list turns off the SDK defaults, late-loaded ones\n // included, unless an SDK built the list from the defaults.\n const usesSdkDefaults = options.defaultIntegrations === undefined || !!options._extendsDefaultIntegrations;\n if (options.defaultIntegrations === undefined) {\n options.defaultIntegrations = getDefaultIntegrationsImpl(options);\n }\n\n // A cached client outlives any single invocation, so binding it to one\n // invocation's flush lock would make later flushes wait on that invocation's\n // waitUntil work forever. Eager delivery replaces the flush lock's purpose.\n const invocationContext = options.ctx;\n const flushLock = !cacheEnabled && invocationContext ? makeFlushLock(invocationContext) : undefined;\n delete options.ctx;\n\n const clientOptions: CloudflareClientOptions = {\n ...options,\n cacheClient: cacheEnabled,\n stackParser: stackParserFromStackParserOptions(options.stackParser || defaultStackParser),\n integrations: getIntegrationsToSetup(options),\n transport: options.transport || makeCloudflareTransport,\n flushLock,\n };\n\n /*! rollup-include-development-only */\n if (options.spotlight && !clientOptions.integrations.some(({ name }) => name === SPOTLIGHT_INTEGRATION_NAME)) {\n clientOptions.integrations.push(\n spotlightIntegration({\n sidecarUrl: typeof options.spotlight === 'string' ? options.spotlight : undefined,\n }),\n );\n }\n /*! rollup-include-development-only-end */\n\n if (!cacheEnabled) {\n // `cacheClient: false` asks for a new client on each call, so replacing\n // the bound client is expected here and must not warn.\n getCurrentScope().setClient(undefined);\n }\n\n const client = initAndBind(CloudflareClient, clientOptions) as CloudflareClient;\n\n if (cacheEnabled && client) {\n cacheClient(client);\n }\n\n // An instrumented module that first evaluates AFTER this init (e.g. a driver\n // lazily required on first use) stores its subscriber factory on the global\n // marker too late for the default-integrations snapshot above. Its injected\n // snippet emits this event right after storing the factory, so install the\n // integration on the live client here, with the same rules as the defaults.\n // `addIntegration` dedupes by integration name, so an integration the user\n // configured stays in place.\n const userIntegrations = options.integrations;\n client.on('orchestrion.module-injected', moduleName => {\n const factory = GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations?.get(moduleName);\n if (!usesSdkDefaults || !factory) {\n return;\n }\n\n const integration = factory();\n if (typeof userIntegrations !== 'function') {\n client.addIntegration(integration);\n return;\n }\n\n // Pass the late default through the user's `integrations` function, so a\n // filter that removed it at init removes it here too. This calls the\n // function again, once for each late module. If the function throws, skip\n // the integration, so the module load that emitted the event still works.\n const kept = safeCallback(\n DEBUG_BUILD ? 'Error in the `integrations` function, skipping a late-loaded integration:' : '',\n () =>\n getIntegrationsToSetup({ defaultIntegrations: [integration], integrations: userIntegrations }).find(\n ({ name }) => name === integration.name,\n ),\n () => undefined,\n );\n if (kept) {\n client.addIntegration(kept);\n }\n });\n\n return client;\n}\n\n/**\n * Initializes the Cloudflare SDK with only the default integrations from\n * {@link getBaseDefaultIntegrations}, i.e. those that work without the `nodejs_compat`\n * compatibility flag.\n */\nexport function initBaseSdk(options: CloudflareOptions): CloudflareClient | undefined {\n return initWithDefaultIntegrations(options, getBaseDefaultIntegrations);\n}\n"],"names":["SPOTLIGHT_INTEGRATION_NAME"],"mappings":"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"}
1
+ {"version":3,"file":"baseSdk.js","sources":["../../../src/baseSdk.ts"],"sourcesContent":["import type { Integration } from '@sentry/core';\nimport { _INTERNAL_isClientClosed, debug, getCurrentScope, safeCallback, setCurrentClient } from '@sentry/core';\nimport {\n consoleIntegration,\n conversationIdIntegration,\n dedupeIntegration,\n eventFiltersIntegration,\n functionToStringIntegration,\n getIntegrationsToSetup,\n GLOBAL_OBJ,\n initAndBind,\n linkedErrorsIntegration,\n requestDataIntegration,\n stackParserFromStackParserOptions,\n} from '@sentry/core';\nimport type { CloudflareClientOptions, CloudflareOptions } from './client';\nimport { CloudflareClient } from './client';\nimport { makeFlushLock } from './flush';\nimport { cacheClient, getCachedClient } from './clientCache';\nimport { DEBUG_BUILD } from './debug-build';\nimport { fetchIntegration } from './integrations/fetch';\nimport { httpServerIntegration } from './integrations/httpServer';\nimport { INTEGRATION_NAME as SPOTLIGHT_INTEGRATION_NAME, spotlightIntegration } from './integrations/spotlight';\nimport { makeCloudflareTransport } from './transport';\nimport { defaultStackParser } from './vendor/stacktrace';\n\n/**\n * Instantiate the channel-subscriber factories the `@sentry/cloudflare/vite`\n * plugin registered on the global marker. The plugin splices a small snippet\n * into each instrumented module that `.set`s its factory here (keyed by module\n * name), so the marker holds one factory per package actually bundled.\n *\n * The marker is read directly instead of importing the factories, so a worker\n * built without the plugin — where the channels never fire — ships none of this\n * code.\n */\nfunction getRegisteredChannelIntegrations(): Integration[] {\n const registered = GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations;\n\n return registered ? [...registered.values()].map(factory => factory()) : [];\n}\n\n/**\n * Get the default integrations for the Cloudflare SDK.\n * These also work on Workers-compatible runtimes without the `nodejs_compat` compatibility flag.\n */\nexport function getDefaultIntegrations(options: CloudflareOptions): Integration[] {\n return [\n // The Dedupe integration should not be used in workflows because we want to\n // capture all step failures, even if they are the same error.\n ...(options.enableDedupe === false ? [] : [dedupeIntegration()]),\n eventFiltersIntegration(),\n functionToStringIntegration(),\n conversationIdIntegration(),\n linkedErrorsIntegration(),\n fetchIntegration(),\n httpServerIntegration(),\n requestDataIntegration(),\n consoleIntegration(),\n // The orchestrion diagnostics-channel subscribers (mysql, pg, …). The\n // `@sentry/cloudflare/vite` plugin injects the channels at build time and,\n // next to each, a snippet that registers the matching subscriber factory on\n // the global marker. Read from there instead of importing them so bundles\n // built without the plugin — where the channels would never fire — don't\n // ship the code.\n ...getRegisteredChannelIntegrations(),\n ];\n}\n\n/**\n * Initializes the Cloudflare SDK without setting up an OpenTelemetry tracer provider.\n *\n * Kept separate from `sdk.ts` so `@sentry/cloudflare/request` can load without Node.js-only\n * dependencies on runtimes such as Shopify Oxygen.\n *\n * The client is cached and reused across invocations within the same isolate,\n * unless `cacheClient: false` is passed. This avoids the\n * per-invocation cost of constructing a new client, and it is what makes\n * Durable Object telemetry reliable: a per-invocation client is disposed at\n * the end of the handler, and in a Durable Object there is no `waitUntil`\n * boundary that reliably extends execution, so spans/events that end after\n * disposal would otherwise be lost.\n */\nexport function initBaseSdk(options: CloudflareOptions): CloudflareClient | undefined {\n const cached = getCachedClient();\n const cacheEnabled = options.cacheClient !== false;\n\n // A closed client drops all data. `close()` marks the client before it\n // flushes, so this also skips a client that is still closing.\n if (cacheEnabled && cached && !_INTERNAL_isClientClosed(cached)) {\n if (DEBUG_BUILD && cached.getOptions().dsn !== options.dsn) {\n debug.warn(\n '[Sentry] init() was called with a different DSN than the cached client of this isolate; the cached client keeps its DSN. Pass `cacheClient: false` for per-invocation options.',\n );\n }\n getCurrentScope().update(options.initialScope);\n setCurrentClient(cached);\n return cached;\n }\n\n // `false` or a custom list turns off the SDK defaults, late-loaded ones\n // included, unless an SDK built the list from the defaults.\n const usesSdkDefaults = options.defaultIntegrations === undefined || !!options._extendsDefaultIntegrations;\n if (options.defaultIntegrations === undefined) {\n options.defaultIntegrations = getDefaultIntegrations(options);\n }\n\n // A cached client outlives any single invocation, so binding it to one\n // invocation's flush lock would make later flushes wait on that invocation's\n // waitUntil work forever. Eager delivery replaces the flush lock's purpose.\n const invocationContext = options.ctx;\n const flushLock = !cacheEnabled && invocationContext ? makeFlushLock(invocationContext) : undefined;\n delete options.ctx;\n\n const clientOptions: CloudflareClientOptions = {\n ...options,\n cacheClient: cacheEnabled,\n stackParser: stackParserFromStackParserOptions(options.stackParser || defaultStackParser),\n integrations: getIntegrationsToSetup(options),\n transport: options.transport || makeCloudflareTransport,\n flushLock,\n };\n\n /*! rollup-include-development-only */\n if (options.spotlight && !clientOptions.integrations.some(({ name }) => name === SPOTLIGHT_INTEGRATION_NAME)) {\n clientOptions.integrations.push(\n spotlightIntegration({\n sidecarUrl: typeof options.spotlight === 'string' ? options.spotlight : undefined,\n }),\n );\n }\n /*! rollup-include-development-only-end */\n\n if (!cacheEnabled) {\n // `cacheClient: false` asks for a new client on each call, so replacing\n // the bound client is expected here and must not warn.\n getCurrentScope().setClient(undefined);\n }\n\n const client = initAndBind(CloudflareClient, clientOptions) as CloudflareClient;\n\n if (cacheEnabled && client) {\n cacheClient(client);\n }\n\n // An instrumented module that first evaluates AFTER this init (e.g. a driver\n // lazily required on first use) stores its subscriber factory on the global\n // marker too late for the default-integrations snapshot above. Its injected\n // snippet emits this event right after storing the factory, so install the\n // integration on the live client here, with the same rules as the defaults.\n // `addIntegration` dedupes by integration name, so an integration the user\n // configured stays in place.\n const userIntegrations = options.integrations;\n client.on('orchestrion.module-injected', moduleName => {\n const factory = GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations?.get(moduleName);\n if (!usesSdkDefaults || !factory) {\n return;\n }\n\n const integration = factory();\n if (typeof userIntegrations !== 'function') {\n client.addIntegration(integration);\n return;\n }\n\n // Pass the late default through the user's `integrations` function, so a\n // filter that removed it at init removes it here too. This calls the\n // function again, once for each late module. If the function throws, skip\n // the integration, so the module load that emitted the event still works.\n const kept = safeCallback(\n DEBUG_BUILD ? 'Error in the `integrations` function, skipping a late-loaded integration:' : '',\n () =>\n getIntegrationsToSetup({ defaultIntegrations: [integration], integrations: userIntegrations }).find(\n ({ name }) => name === integration.name,\n ),\n () => undefined,\n );\n if (kept) {\n client.addIntegration(kept);\n }\n });\n\n return client;\n}\n"],"names":["SPOTLIGHT_INTEGRATION_NAME"],"mappings":"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"}
@@ -7,11 +7,12 @@ export { instrumentAgentWithSentry, instrumentDurableObjectWithSentry } from './
7
7
  export { _INTERNAL_wrapUnlessInstrumented } from './instrument.js';
8
8
  export { sentryPagesPlugin } from './pages-plugin.js';
9
9
  export { CloudflareClient } from './client.js';
10
- export { _INTERNAL_wrapRequestHandler, getDefaultIntegrations } from './sdk.js';
10
+ export { _INTERNAL_wrapRequestHandler } from './sdk.js';
11
11
  export { httpServerIntegration } from './integrations/httpServer.js';
12
12
  export { fetchIntegration } from './integrations/fetch.js';
13
13
  export { spotlightIntegration } from './integrations/spotlight.js';
14
14
  export { cronTriggersIntegration } from './integrations/cronTriggers.js';
15
15
  export { instrumentWorkflowWithSentry } from './workflows.js';
16
16
  export { setAsyncLocalStorageAsyncContextStrategy } from '@sentry/server-utils/no-diagnostic-channels';
17
+ export { getDefaultIntegrations } from './baseSdk.js';
17
18
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;"}
1
+ {"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;"}
@@ -1,4 +1,4 @@
1
- import { SENTRY_ORIGIN, SENTRY_OP } from '@sentry/conventions/attributes';
1
+ import { DB_OPERATION_NAME, DB_SYSTEM_NAME, SENTRY_ORIGIN, SENTRY_OP } from '@sentry/conventions/attributes';
2
2
  import { DB } from '@sentry/conventions/op';
3
3
  import { getClient, startSpan, isThenable } from '@sentry/core';
4
4
  import { getStorageKeys, targetsCloudflareInternalKey } from '../utils/internalStorageKey.js';
@@ -37,8 +37,8 @@ function instrumentDurableObjectStorage(storage, waitUntil) {
37
37
  attributes: {
38
38
  [SENTRY_OP]: DB,
39
39
  [SENTRY_ORIGIN]: "auto.db.cloudflare.durable_object",
40
- "db.system.name": "cloudflare.durable_object.storage",
41
- "db.operation.name": methodName
40
+ [DB_SYSTEM_NAME]: "cloudflare.durable_object.storage",
41
+ [DB_OPERATION_NAME]: methodName
42
42
  }
43
43
  },
44
44
  () => {
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentDurableObjectStorage.js","sources":["../../../../src/instrumentations/instrumentDurableObjectStorage.ts"],"sourcesContent":["import type { DurableObjectStorage, SyncKvStorage, SqlStorage } from '@cloudflare/workers-types';\nimport { SENTRY_OP, SENTRY_ORIGIN } from '@sentry/conventions/attributes';\nimport { DB } from '@sentry/conventions/op';\nimport { getClient, isThenable, startSpan } from '@sentry/core';\nimport type { CloudflareClientOptions } from '../client';\nimport { getStorageKeys, targetsCloudflareInternalKey } from '../utils/internalStorageKey';\nimport { storeSpanContext } from '../utils/traceLinks';\nimport { instrumentDurableObjectSyncKvStorage } from './instrumentDurableObjectSyncKvStorage';\nimport { instrumentSqlStorage } from './instrumentSqlStorage';\n\nconst STORAGE_METHODS_TO_INSTRUMENT = ['get', 'put', 'delete', 'list', 'setAlarm', 'getAlarm', 'deleteAlarm'] as const;\n\ntype StorageMethod = (typeof STORAGE_METHODS_TO_INSTRUMENT)[number];\n\ntype WaitUntil = (promise: Promise<unknown>) => void;\n\n/**\n * Instruments DurableObjectStorage methods with Sentry spans.\n *\n * Wraps the following async methods:\n * - get, put, delete, list (KV API)\n * - setAlarm, getAlarm, deleteAlarm (Alarm API)\n *\n * When setAlarm is called, it also stores the current span context so that when\n * the alarm fires later, it can link back to the trace that called setAlarm.\n *\n * @param storage - The DurableObjectStorage instance to instrument\n * @param waitUntil - Optional waitUntil function to defer span context storage\n * @returns An instrumented DurableObjectStorage instance\n */\nexport function instrumentDurableObjectStorage(\n storage: DurableObjectStorage,\n waitUntil?: WaitUntil,\n): DurableObjectStorage {\n return new Proxy(storage, {\n get(target, prop, _receiver) {\n // Use `target` as the receiver instead of the proxy (`_receiver`).\n // Native workerd getters (e.g., `storage.sql`) validate `this` via\n // internal slots. Passing the proxy as receiver breaks that check,\n // causing \"Illegal invocation: function called with incorrect `this`\n // reference\" errors.\n const original = Reflect.get(target, prop, target);\n\n if (prop === 'kv' && original != null && 'get' in original && 'put' in original) {\n return instrumentDurableObjectSyncKvStorage(original as SyncKvStorage);\n }\n\n if (prop === 'sql' && original != null && 'databaseSize' in original && 'exec' in original) {\n return instrumentSqlStorage(original as SqlStorage);\n }\n\n if (typeof original !== 'function') {\n return original;\n }\n\n const methodName = prop as string;\n if (!STORAGE_METHODS_TO_INSTRUMENT.includes(methodName as StorageMethod)) {\n return (original as (...args: unknown[]) => unknown).bind(target);\n }\n\n return function (this: unknown, ...args: unknown[]) {\n // KV entries managed by the DO framework itself (agents/partyserver state) are bookkeeping\n // rather than user work — skip the span, mirroring how `cf_` SQL tables are treated.\n // oxlint-disable-next-line typescript/no-unnecessary-type-assertion -- rule false positive: the cast reaches the Cloudflare-only `durableObjectStorageSpanAllowlist`; tsc errors without it\n const allowlist = (getClient()?.getOptions() as CloudflareClientOptions | undefined)\n ?.durableObjectStorageSpanAllowlist;\n const keys = getStorageKeys(methodName, args);\n if (keys && keys.length > 0 && keys.every(key => targetsCloudflareInternalKey(key, allowlist))) {\n return (original as (...a: unknown[]) => unknown).apply(target, args);\n }\n\n return startSpan(\n {\n // Use underscore naming to match Cloudflare's native instrumentation (e.g., \"durable_object_storage_get\")\n name: `durable_object_storage_${methodName}`,\n attributes: {\n [SENTRY_OP]: DB,\n [SENTRY_ORIGIN]: 'auto.db.cloudflare.durable_object',\n 'db.system.name': 'cloudflare.durable_object.storage',\n 'db.operation.name': methodName,\n },\n },\n () => {\n const teardown = async (): Promise<void> => {\n // When setAlarm is called, store the current span context so that when the alarm\n // fires later, it can link back to the trace that called setAlarm.\n // We use the original (uninstrumented) storage (target) to avoid creating a span\n // for this internal operation. The storage is deferred via waitUntil to not block.\n if (methodName === 'setAlarm') {\n storeSpanContext(target, 'alarm');\n }\n };\n\n const result = (original as (...args: unknown[]) => unknown).apply(target, args);\n\n if (!isThenable(result)) {\n waitUntil?.(teardown());\n\n return result;\n }\n\n return result.then(\n res => {\n waitUntil?.(teardown());\n return res;\n },\n e => {\n throw e;\n },\n );\n },\n );\n };\n },\n });\n}\n"],"names":[],"mappings":";;;;;;;;AAUA,MAAM,6BAAA,GAAgC,CAAC,KAAA,EAAO,KAAA,EAAO,UAAU,MAAA,EAAQ,UAAA,EAAY,YAAY,aAAa,CAAA;AAoBrG,SAAS,8BAAA,CACd,SACA,SAAA,EACsB;AACtB,EAAA,OAAO,IAAI,MAAM,OAAA,EAAS;AAAA,IACxB,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAM3B,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,MAAM,CAAA;AAEjD,MAAA,IAAI,SAAS,IAAA,IAAQ,QAAA,IAAY,QAAQ,KAAA,IAAS,QAAA,IAAY,SAAS,QAAA,EAAU;AAC/E,QAAA,OAAO,qCAAqC,QAAyB,CAAA;AAAA,MACvE;AAEA,MAAA,IAAI,SAAS,KAAA,IAAS,QAAA,IAAY,QAAQ,cAAA,IAAkB,QAAA,IAAY,UAAU,QAAA,EAAU;AAC1F,QAAA,OAAO,qBAAqB,QAAsB,CAAA;AAAA,MACpD;AAEA,MAAA,IAAI,OAAO,aAAa,UAAA,EAAY;AAClC,QAAA,OAAO,QAAA;AAAA,MACT;AAEA,MAAA,MAAM,UAAA,GAAa,IAAA;AACnB,MAAA,IAAI,CAAC,6BAAA,CAA8B,QAAA,CAAS,UAA2B,CAAA,EAAG;AACxE,QAAA,OAAQ,QAAA,CAA6C,KAAK,MAAM,CAAA;AAAA,MAClE;AAEA,MAAA,OAAO,YAA4B,IAAA,EAAiB;AAIlD,QAAA,MAAM,SAAA,GAAa,SAAA,EAAU,EAAG,UAAA,EAAW,EACvC,iCAAA;AACJ,QAAA,MAAM,IAAA,GAAO,cAAA,CAAe,UAAA,EAAY,IAAI,CAAA;AAC5C,QAAA,IAAI,IAAA,IAAQ,IAAA,CAAK,MAAA,GAAS,CAAA,IAAK,IAAA,CAAK,KAAA,CAAM,CAAA,GAAA,KAAO,4BAAA,CAA6B,GAAA,EAAK,SAAS,CAAC,CAAA,EAAG;AAC9F,UAAA,OAAQ,QAAA,CAA0C,KAAA,CAAM,MAAA,EAAQ,IAAI,CAAA;AAAA,QACtE;AAEA,QAAA,OAAO,SAAA;AAAA,UACL;AAAA;AAAA,YAEE,IAAA,EAAM,0BAA0B,UAAU,CAAA,CAAA;AAAA,YAC1C,UAAA,EAAY;AAAA,cACV,CAAC,SAAS,GAAG,EAAA;AAAA,cACb,CAAC,aAAa,GAAG,mCAAA;AAAA,cACjB,gBAAA,EAAkB,mCAAA;AAAA,cAClB,mBAAA,EAAqB;AAAA;AACvB,WACF;AAAA,UACA,MAAM;AACJ,YAAA,MAAM,WAAW,YAA2B;AAK1C,cAAA,IAAI,eAAe,UAAA,EAAY;AAC7B,gBAAA,gBAAA,CAAiB,QAAQ,OAAO,CAAA;AAAA,cAClC;AAAA,YACF,CAAA;AAEA,YAAA,MAAM,MAAA,GAAU,QAAA,CAA6C,KAAA,CAAM,MAAA,EAAQ,IAAI,CAAA;AAE/E,YAAA,IAAI,CAAC,UAAA,CAAW,MAAM,CAAA,EAAG;AACvB,cAAA,SAAA,GAAY,UAAU,CAAA;AAEtB,cAAA,OAAO,MAAA;AAAA,YACT;AAEA,YAAA,OAAO,MAAA,CAAO,IAAA;AAAA,cACZ,CAAA,GAAA,KAAO;AACL,gBAAA,SAAA,GAAY,UAAU,CAAA;AACtB,gBAAA,OAAO,GAAA;AAAA,cACT,CAAA;AAAA,cACA,CAAA,CAAA,KAAK;AACH,gBAAA,MAAM,CAAA;AAAA,cACR;AAAA,aACF;AAAA,UACF;AAAA,SACF;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;"}
1
+ {"version":3,"file":"instrumentDurableObjectStorage.js","sources":["../../../../src/instrumentations/instrumentDurableObjectStorage.ts"],"sourcesContent":["import type { DurableObjectStorage, SyncKvStorage, SqlStorage } from '@cloudflare/workers-types';\nimport { SENTRY_OP, SENTRY_ORIGIN, DB_OPERATION_NAME, DB_SYSTEM_NAME } from '@sentry/conventions/attributes';\nimport { DB } from '@sentry/conventions/op';\nimport { getClient, isThenable, startSpan } from '@sentry/core';\nimport type { CloudflareClientOptions } from '../client';\nimport { getStorageKeys, targetsCloudflareInternalKey } from '../utils/internalStorageKey';\nimport { storeSpanContext } from '../utils/traceLinks';\nimport { instrumentDurableObjectSyncKvStorage } from './instrumentDurableObjectSyncKvStorage';\nimport { instrumentSqlStorage } from './instrumentSqlStorage';\n\nconst STORAGE_METHODS_TO_INSTRUMENT = ['get', 'put', 'delete', 'list', 'setAlarm', 'getAlarm', 'deleteAlarm'] as const;\n\ntype StorageMethod = (typeof STORAGE_METHODS_TO_INSTRUMENT)[number];\n\ntype WaitUntil = (promise: Promise<unknown>) => void;\n\n/**\n * Instruments DurableObjectStorage methods with Sentry spans.\n *\n * Wraps the following async methods:\n * - get, put, delete, list (KV API)\n * - setAlarm, getAlarm, deleteAlarm (Alarm API)\n *\n * When setAlarm is called, it also stores the current span context so that when\n * the alarm fires later, it can link back to the trace that called setAlarm.\n *\n * @param storage - The DurableObjectStorage instance to instrument\n * @param waitUntil - Optional waitUntil function to defer span context storage\n * @returns An instrumented DurableObjectStorage instance\n */\nexport function instrumentDurableObjectStorage(\n storage: DurableObjectStorage,\n waitUntil?: WaitUntil,\n): DurableObjectStorage {\n return new Proxy(storage, {\n get(target, prop, _receiver) {\n // Use `target` as the receiver instead of the proxy (`_receiver`).\n // Native workerd getters (e.g., `storage.sql`) validate `this` via\n // internal slots. Passing the proxy as receiver breaks that check,\n // causing \"Illegal invocation: function called with incorrect `this`\n // reference\" errors.\n const original = Reflect.get(target, prop, target);\n\n if (prop === 'kv' && original != null && 'get' in original && 'put' in original) {\n return instrumentDurableObjectSyncKvStorage(original as SyncKvStorage);\n }\n\n if (prop === 'sql' && original != null && 'databaseSize' in original && 'exec' in original) {\n return instrumentSqlStorage(original as SqlStorage);\n }\n\n if (typeof original !== 'function') {\n return original;\n }\n\n const methodName = prop as string;\n if (!STORAGE_METHODS_TO_INSTRUMENT.includes(methodName as StorageMethod)) {\n return (original as (...args: unknown[]) => unknown).bind(target);\n }\n\n return function (this: unknown, ...args: unknown[]) {\n // KV entries managed by the DO framework itself (agents/partyserver state) are bookkeeping\n // rather than user work — skip the span, mirroring how `cf_` SQL tables are treated.\n // oxlint-disable-next-line typescript/no-unnecessary-type-assertion -- rule false positive: the cast reaches the Cloudflare-only `durableObjectStorageSpanAllowlist`; tsc errors without it\n const allowlist = (getClient()?.getOptions() as CloudflareClientOptions | undefined)\n ?.durableObjectStorageSpanAllowlist;\n const keys = getStorageKeys(methodName, args);\n if (keys && keys.length > 0 && keys.every(key => targetsCloudflareInternalKey(key, allowlist))) {\n return (original as (...a: unknown[]) => unknown).apply(target, args);\n }\n\n return startSpan(\n {\n // Use underscore naming to match Cloudflare's native instrumentation (e.g., \"durable_object_storage_get\")\n name: `durable_object_storage_${methodName}`,\n attributes: {\n [SENTRY_OP]: DB,\n [SENTRY_ORIGIN]: 'auto.db.cloudflare.durable_object',\n [DB_SYSTEM_NAME]: 'cloudflare.durable_object.storage',\n [DB_OPERATION_NAME]: methodName,\n },\n },\n () => {\n const teardown = async (): Promise<void> => {\n // When setAlarm is called, store the current span context so that when the alarm\n // fires later, it can link back to the trace that called setAlarm.\n // We use the original (uninstrumented) storage (target) to avoid creating a span\n // for this internal operation. The storage is deferred via waitUntil to not block.\n if (methodName === 'setAlarm') {\n storeSpanContext(target, 'alarm');\n }\n };\n\n const result = (original as (...args: unknown[]) => unknown).apply(target, args);\n\n if (!isThenable(result)) {\n waitUntil?.(teardown());\n\n return result;\n }\n\n return result.then(\n res => {\n waitUntil?.(teardown());\n return res;\n },\n e => {\n throw e;\n },\n );\n },\n );\n };\n },\n });\n}\n"],"names":[],"mappings":";;;;;;;;AAUA,MAAM,6BAAA,GAAgC,CAAC,KAAA,EAAO,KAAA,EAAO,UAAU,MAAA,EAAQ,UAAA,EAAY,YAAY,aAAa,CAAA;AAoBrG,SAAS,8BAAA,CACd,SACA,SAAA,EACsB;AACtB,EAAA,OAAO,IAAI,MAAM,OAAA,EAAS;AAAA,IACxB,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAM3B,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,MAAM,CAAA;AAEjD,MAAA,IAAI,SAAS,IAAA,IAAQ,QAAA,IAAY,QAAQ,KAAA,IAAS,QAAA,IAAY,SAAS,QAAA,EAAU;AAC/E,QAAA,OAAO,qCAAqC,QAAyB,CAAA;AAAA,MACvE;AAEA,MAAA,IAAI,SAAS,KAAA,IAAS,QAAA,IAAY,QAAQ,cAAA,IAAkB,QAAA,IAAY,UAAU,QAAA,EAAU;AAC1F,QAAA,OAAO,qBAAqB,QAAsB,CAAA;AAAA,MACpD;AAEA,MAAA,IAAI,OAAO,aAAa,UAAA,EAAY;AAClC,QAAA,OAAO,QAAA;AAAA,MACT;AAEA,MAAA,MAAM,UAAA,GAAa,IAAA;AACnB,MAAA,IAAI,CAAC,6BAAA,CAA8B,QAAA,CAAS,UAA2B,CAAA,EAAG;AACxE,QAAA,OAAQ,QAAA,CAA6C,KAAK,MAAM,CAAA;AAAA,MAClE;AAEA,MAAA,OAAO,YAA4B,IAAA,EAAiB;AAIlD,QAAA,MAAM,SAAA,GAAa,SAAA,EAAU,EAAG,UAAA,EAAW,EACvC,iCAAA;AACJ,QAAA,MAAM,IAAA,GAAO,cAAA,CAAe,UAAA,EAAY,IAAI,CAAA;AAC5C,QAAA,IAAI,IAAA,IAAQ,IAAA,CAAK,MAAA,GAAS,CAAA,IAAK,IAAA,CAAK,KAAA,CAAM,CAAA,GAAA,KAAO,4BAAA,CAA6B,GAAA,EAAK,SAAS,CAAC,CAAA,EAAG;AAC9F,UAAA,OAAQ,QAAA,CAA0C,KAAA,CAAM,MAAA,EAAQ,IAAI,CAAA;AAAA,QACtE;AAEA,QAAA,OAAO,SAAA;AAAA,UACL;AAAA;AAAA,YAEE,IAAA,EAAM,0BAA0B,UAAU,CAAA,CAAA;AAAA,YAC1C,UAAA,EAAY;AAAA,cACV,CAAC,SAAS,GAAG,EAAA;AAAA,cACb,CAAC,aAAa,GAAG,mCAAA;AAAA,cACjB,CAAC,cAAc,GAAG,mCAAA;AAAA,cAClB,CAAC,iBAAiB,GAAG;AAAA;AACvB,WACF;AAAA,UACA,MAAM;AACJ,YAAA,MAAM,WAAW,YAA2B;AAK1C,cAAA,IAAI,eAAe,UAAA,EAAY;AAC7B,gBAAA,gBAAA,CAAiB,QAAQ,OAAO,CAAA;AAAA,cAClC;AAAA,YACF,CAAA;AAEA,YAAA,MAAM,MAAA,GAAU,QAAA,CAA6C,KAAA,CAAM,MAAA,EAAQ,IAAI,CAAA;AAE/E,YAAA,IAAI,CAAC,UAAA,CAAW,MAAM,CAAA,EAAG;AACvB,cAAA,SAAA,GAAY,UAAU,CAAA;AAEtB,cAAA,OAAO,MAAA;AAAA,YACT;AAEA,YAAA,OAAO,MAAA,CAAO,IAAA;AAAA,cACZ,CAAA,GAAA,KAAO;AACL,gBAAA,SAAA,GAAY,UAAU,CAAA;AACtB,gBAAA,OAAO,GAAA;AAAA,cACT,CAAA;AAAA,cACA,CAAA,CAAA,KAAK;AACH,gBAAA,MAAM,CAAA;AAAA,cACR;AAAA,aACF;AAAA,UACF;AAAA,SACF;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;"}
@@ -1,4 +1,4 @@
1
- import { SENTRY_ORIGIN, SENTRY_OP } from '@sentry/conventions/attributes';
1
+ import { DB_OPERATION_NAME, DB_SYSTEM_NAME, SENTRY_ORIGIN, SENTRY_OP } from '@sentry/conventions/attributes';
2
2
  import { DB } from '@sentry/conventions/op';
3
3
  import { startSpan } from '@sentry/core';
4
4
 
@@ -23,8 +23,8 @@ function instrumentDurableObjectSyncKvStorage(syncKv) {
23
23
  [SENTRY_ORIGIN]: "auto.db.cloudflare.durable_object",
24
24
  // keeping the value as close as possible to the Cloudflare Worker KV instrumentation
25
25
  // https://github.com/cloudflare/workerd/blob/6b8b11787e2b2a800ab0edd0690bfab3857b0529/src/workerd/api/sync-kv.c%2B%2B#L19
26
- "db.system.name": "cloudflare-durable-object-sql",
27
- "db.operation.name": methodName
26
+ [DB_SYSTEM_NAME]: "cloudflare-durable-object-sql",
27
+ [DB_OPERATION_NAME]: methodName
28
28
  }
29
29
  },
30
30
  () => {
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentDurableObjectSyncKvStorage.js","sources":["../../../../src/instrumentations/instrumentDurableObjectSyncKvStorage.ts"],"sourcesContent":["import type { SyncKvStorage } from '@cloudflare/workers-types';\nimport { SENTRY_OP, SENTRY_ORIGIN } from '@sentry/conventions/attributes';\nimport { DB } from '@sentry/conventions/op';\nimport { startSpan } from '@sentry/core';\n\nconst SYNC_KV_METHODS_TO_INSTRUMENT = ['get', 'put', 'delete', 'list'] as const;\n\ntype SyncKvMethod = (typeof SYNC_KV_METHODS_TO_INSTRUMENT)[number];\n\nexport function instrumentDurableObjectSyncKvStorage(syncKv: SyncKvStorage): SyncKvStorage {\n return new Proxy(syncKv, {\n get(target, prop, _receiver) {\n const original = Reflect.get(target, prop, target);\n\n if (typeof original !== 'function') {\n return original;\n }\n\n const methodName = prop as SyncKvMethod;\n\n if (!SYNC_KV_METHODS_TO_INSTRUMENT.includes(methodName)) {\n return (original as (...args: unknown[]) => unknown).bind(target);\n }\n\n return function (this: unknown, ...args: unknown[]) {\n return startSpan(\n {\n name: `durable_object_storage_kv_${methodName}`,\n attributes: {\n [SENTRY_OP]: DB,\n [SENTRY_ORIGIN]: 'auto.db.cloudflare.durable_object',\n // keeping the value as close as possible to the Cloudflare Worker KV instrumentation\n // https://github.com/cloudflare/workerd/blob/6b8b11787e2b2a800ab0edd0690bfab3857b0529/src/workerd/api/sync-kv.c%2B%2B#L19\n 'db.system.name': 'cloudflare-durable-object-sql',\n 'db.operation.name': methodName,\n },\n },\n () => {\n return (original as (...args: unknown[]) => unknown).apply(target, args);\n },\n );\n };\n },\n });\n}\n"],"names":[],"mappings":";;;;AAKA,MAAM,6BAAA,GAAgC,CAAC,KAAA,EAAO,KAAA,EAAO,UAAU,MAAM,CAAA;AAI9D,SAAS,qCAAqC,MAAA,EAAsC;AACzF,EAAA,OAAO,IAAI,MAAM,MAAA,EAAQ;AAAA,IACvB,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAC3B,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,MAAM,CAAA;AAEjD,MAAA,IAAI,OAAO,aAAa,UAAA,EAAY;AAClC,QAAA,OAAO,QAAA;AAAA,MACT;AAEA,MAAA,MAAM,UAAA,GAAa,IAAA;AAEnB,MAAA,IAAI,CAAC,6BAAA,CAA8B,QAAA,CAAS,UAAU,CAAA,EAAG;AACvD,QAAA,OAAQ,QAAA,CAA6C,KAAK,MAAM,CAAA;AAAA,MAClE;AAEA,MAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,QAAA,OAAO,SAAA;AAAA,UACL;AAAA,YACE,IAAA,EAAM,6BAA6B,UAAU,CAAA,CAAA;AAAA,YAC7C,UAAA,EAAY;AAAA,cACV,CAAC,SAAS,GAAG,EAAA;AAAA,cACb,CAAC,aAAa,GAAG,mCAAA;AAAA;AAAA;AAAA,cAGjB,gBAAA,EAAkB,+BAAA;AAAA,cAClB,mBAAA,EAAqB;AAAA;AACvB,WACF;AAAA,UACA,MAAM;AACJ,YAAA,OAAQ,QAAA,CAA6C,KAAA,CAAM,MAAA,EAAQ,IAAI,CAAA;AAAA,UACzE;AAAA,SACF;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;"}
1
+ {"version":3,"file":"instrumentDurableObjectSyncKvStorage.js","sources":["../../../../src/instrumentations/instrumentDurableObjectSyncKvStorage.ts"],"sourcesContent":["import type { SyncKvStorage } from '@cloudflare/workers-types';\nimport { SENTRY_OP, SENTRY_ORIGIN, DB_OPERATION_NAME, DB_SYSTEM_NAME } from '@sentry/conventions/attributes';\nimport { DB } from '@sentry/conventions/op';\nimport { startSpan } from '@sentry/core';\n\nconst SYNC_KV_METHODS_TO_INSTRUMENT = ['get', 'put', 'delete', 'list'] as const;\n\ntype SyncKvMethod = (typeof SYNC_KV_METHODS_TO_INSTRUMENT)[number];\n\nexport function instrumentDurableObjectSyncKvStorage(syncKv: SyncKvStorage): SyncKvStorage {\n return new Proxy(syncKv, {\n get(target, prop, _receiver) {\n const original = Reflect.get(target, prop, target);\n\n if (typeof original !== 'function') {\n return original;\n }\n\n const methodName = prop as SyncKvMethod;\n\n if (!SYNC_KV_METHODS_TO_INSTRUMENT.includes(methodName)) {\n return (original as (...args: unknown[]) => unknown).bind(target);\n }\n\n return function (this: unknown, ...args: unknown[]) {\n return startSpan(\n {\n name: `durable_object_storage_kv_${methodName}`,\n attributes: {\n [SENTRY_OP]: DB,\n [SENTRY_ORIGIN]: 'auto.db.cloudflare.durable_object',\n // keeping the value as close as possible to the Cloudflare Worker KV instrumentation\n // https://github.com/cloudflare/workerd/blob/6b8b11787e2b2a800ab0edd0690bfab3857b0529/src/workerd/api/sync-kv.c%2B%2B#L19\n [DB_SYSTEM_NAME]: 'cloudflare-durable-object-sql',\n [DB_OPERATION_NAME]: methodName,\n },\n },\n () => {\n return (original as (...args: unknown[]) => unknown).apply(target, args);\n },\n );\n };\n },\n });\n}\n"],"names":[],"mappings":";;;;AAKA,MAAM,6BAAA,GAAgC,CAAC,KAAA,EAAO,KAAA,EAAO,UAAU,MAAM,CAAA;AAI9D,SAAS,qCAAqC,MAAA,EAAsC;AACzF,EAAA,OAAO,IAAI,MAAM,MAAA,EAAQ;AAAA,IACvB,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAC3B,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,MAAM,CAAA;AAEjD,MAAA,IAAI,OAAO,aAAa,UAAA,EAAY;AAClC,QAAA,OAAO,QAAA;AAAA,MACT;AAEA,MAAA,MAAM,UAAA,GAAa,IAAA;AAEnB,MAAA,IAAI,CAAC,6BAAA,CAA8B,QAAA,CAAS,UAAU,CAAA,EAAG;AACvD,QAAA,OAAQ,QAAA,CAA6C,KAAK,MAAM,CAAA;AAAA,MAClE;AAEA,MAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,QAAA,OAAO,SAAA;AAAA,UACL;AAAA,YACE,IAAA,EAAM,6BAA6B,UAAU,CAAA,CAAA;AAAA,YAC7C,UAAA,EAAY;AAAA,cACV,CAAC,SAAS,GAAG,EAAA;AAAA,cACb,CAAC,aAAa,GAAG,mCAAA;AAAA;AAAA;AAAA,cAGjB,CAAC,cAAc,GAAG,+BAAA;AAAA,cAClB,CAAC,iBAAiB,GAAG;AAAA;AACvB,WACF;AAAA,UACA,MAAM;AACJ,YAAA,OAAQ,QAAA,CAA6C,KAAA,CAAM,MAAA,EAAQ,IAAI,CAAA;AAAA,UACzE;AAAA,SACF;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;;;;"}
@@ -1,4 +1,4 @@
1
- import { SENTRY_ORIGIN, SENTRY_OP } from '@sentry/conventions/attributes';
1
+ import { CLOUDFLARE_DURABLE_OBJECT_QUERY_BINDINGS, DB_QUERY_SUMMARY, DB_QUERY_TEXT, DB_OPERATION_NAME, DB_SYSTEM_NAME, SENTRY_ORIGIN, SENTRY_OP } from '@sentry/conventions/attributes';
2
2
  import { DB_QUERY } from '@sentry/conventions/op';
3
3
  import { startSpan, getClient, hasSpansEnabled, getActiveSpan, spanIsSampled } from '@sentry/core';
4
4
  import { sanitizeSqlQuery, getSqlQuerySummary } from '@sentry/server-utils';
@@ -7,8 +7,8 @@ import { mayTargetCloudflareInternalTable, targetsCloudflareInternalTable } from
7
7
  const SPAN_ATTRIBUTES = {
8
8
  [SENTRY_OP]: DB_QUERY,
9
9
  [SENTRY_ORIGIN]: "auto.db.cloudflare.durable_object_sql",
10
- "db.system.name": "cloudflare-durable-object-sql",
11
- "db.operation.name": "exec"
10
+ [DB_SYSTEM_NAME]: "cloudflare-durable-object-sql",
11
+ [DB_OPERATION_NAME]: "exec"
12
12
  };
13
13
  function instrumentSqlStorage(sql) {
14
14
  return new Proxy(sql, {
@@ -34,9 +34,9 @@ function instrumentSqlStorage(sql) {
34
34
  name: querySummary || sanitizedQuery,
35
35
  attributes: {
36
36
  ...SPAN_ATTRIBUTES,
37
- "db.query.text": sanitizedQuery,
38
- "db.query.summary": querySummary,
39
- "cloudflare.durable_object.query.bindings": bindings.length
37
+ [DB_QUERY_TEXT]: sanitizedQuery,
38
+ [DB_QUERY_SUMMARY]: querySummary,
39
+ [CLOUDFLARE_DURABLE_OBJECT_QUERY_BINDINGS]: bindings.length
40
40
  }
41
41
  },
42
42
  callOriginal
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentSqlStorage.js","sources":["../../../../src/instrumentations/instrumentSqlStorage.ts"],"sourcesContent":["import type { SqlStorage } from '@cloudflare/workers-types';\nimport { SENTRY_OP, SENTRY_ORIGIN } from '@sentry/conventions/attributes';\nimport { DB_QUERY } from '@sentry/conventions/op';\nimport { getActiveSpan, getClient, hasSpansEnabled, spanIsSampled, startSpan } from '@sentry/core';\nimport { getSqlQuerySummary, sanitizeSqlQuery } from '@sentry/server-utils';\nimport type { CloudflareClientOptions } from '../client';\nimport { mayTargetCloudflareInternalTable, targetsCloudflareInternalTable } from '../utils/internalSqlQuery';\n\nconst SPAN_ATTRIBUTES = {\n [SENTRY_OP]: DB_QUERY,\n [SENTRY_ORIGIN]: 'auto.db.cloudflare.durable_object_sql',\n 'db.system.name': 'cloudflare-durable-object-sql',\n 'db.operation.name': 'exec',\n};\n\n/**\n * Instruments the Durable Object SqlStorage `exec` method with Sentry spans.\n *\n * @param sql - The SqlStorage instance to instrument\n * @returns An instrumented SqlStorage instance\n */\nexport function instrumentSqlStorage(sql: SqlStorage): SqlStorage {\n return new Proxy(sql, {\n get(target, prop, _receiver) {\n const original = Reflect.get(target, prop, target);\n\n if (prop !== 'exec' || typeof original !== 'function') {\n return original;\n }\n\n return function (this: unknown, ...args: unknown[]) {\n const callOriginal = (): ReturnType<SqlStorage['exec']> =>\n (original as (...a: unknown[]) => ReturnType<SqlStorage['exec']>).apply(target, args);\n\n const [query, ...bindings] = args as [string, ...unknown[]];\n\n if (childSpanWillNotBeRecorded() && !mayTargetCloudflareInternalTable(query)) {\n // This span is never sent, so skip the costly sanitize and summary\n // steps. We still start the span so it records its dropped span\n // outcome. A query that may target a `cf_` or `pi_` table takes the full path,\n // because an internal query must start no span.\n return startSpan({ name: 'exec', attributes: SPAN_ATTRIBUTES }, callOriginal);\n }\n\n const sanitizedQuery = sanitizeSqlQuery(query);\n const querySummary = getSqlQuerySummary(sanitizedQuery);\n\n // oxlint-disable-next-line typescript/no-unnecessary-type-assertion -- rule false positive: the cast reaches the Cloudflare-only `durableObjectSqlSpanAllowlist`; tsc errors without it\n const allowlist = (getClient()?.getOptions() as CloudflareClientOptions | undefined)\n ?.durableObjectSqlSpanAllowlist;\n\n if (targetsCloudflareInternalTable(querySummary, allowlist, sanitizedQuery)) {\n return callOriginal();\n }\n\n return startSpan(\n {\n name: querySummary || sanitizedQuery,\n attributes: {\n ...SPAN_ATTRIBUTES,\n 'db.query.text': sanitizedQuery,\n 'db.query.summary': querySummary,\n 'cloudflare.durable_object.query.bindings': bindings.length,\n },\n },\n callOriginal,\n );\n };\n },\n });\n}\n\n/**\n * Returns `true` when `startSpan` creates a non-recording span: spans are disabled, or the active span\n * is not sampled. Must agree with `createChildOrRootSpan` and `_startChildSpan` in `@sentry/core`.\n */\nfunction childSpanWillNotBeRecorded(): boolean {\n if (!hasSpansEnabled()) {\n return true;\n }\n\n const activeSpan = getActiveSpan();\n return !!activeSpan && !spanIsSampled(activeSpan);\n}\n"],"names":[],"mappings":";;;;;;AAQA,MAAM,eAAA,GAAkB;AAAA,EACtB,CAAC,SAAS,GAAG,QAAA;AAAA,EACb,CAAC,aAAa,GAAG,uCAAA;AAAA,EACjB,gBAAA,EAAkB,+BAAA;AAAA,EAClB,mBAAA,EAAqB;AACvB,CAAA;AAQO,SAAS,qBAAqB,GAAA,EAA6B;AAChE,EAAA,OAAO,IAAI,MAAM,GAAA,EAAK;AAAA,IACpB,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAC3B,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,MAAM,CAAA;AAEjD,MAAA,IAAI,IAAA,KAAS,MAAA,IAAU,OAAO,QAAA,KAAa,UAAA,EAAY;AACrD,QAAA,OAAO,QAAA;AAAA,MACT;AAEA,MAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,QAAA,MAAM,YAAA,GAAe,MAClB,QAAA,CAAiE,KAAA,CAAM,QAAQ,IAAI,CAAA;AAEtF,QAAA,MAAM,CAAC,KAAA,EAAO,GAAG,QAAQ,CAAA,GAAI,IAAA;AAE7B,QAAA,IAAI,0BAAA,EAA2B,IAAK,CAAC,gCAAA,CAAiC,KAAK,CAAA,EAAG;AAK5E,UAAA,OAAO,UAAU,EAAE,IAAA,EAAM,QAAQ,UAAA,EAAY,eAAA,IAAmB,YAAY,CAAA;AAAA,QAC9E;AAEA,QAAA,MAAM,cAAA,GAAiB,iBAAiB,KAAK,CAAA;AAC7C,QAAA,MAAM,YAAA,GAAe,mBAAmB,cAAc,CAAA;AAGtD,QAAA,MAAM,SAAA,GAAa,SAAA,EAAU,EAAG,UAAA,EAAW,EACvC,6BAAA;AAEJ,QAAA,IAAI,8BAAA,CAA+B,YAAA,EAAc,SAAA,EAAW,cAAc,CAAA,EAAG;AAC3E,UAAA,OAAO,YAAA,EAAa;AAAA,QACtB;AAEA,QAAA,OAAO,SAAA;AAAA,UACL;AAAA,YACE,MAAM,YAAA,IAAgB,cAAA;AAAA,YACtB,UAAA,EAAY;AAAA,cACV,GAAG,eAAA;AAAA,cACH,eAAA,EAAiB,cAAA;AAAA,cACjB,kBAAA,EAAoB,YAAA;AAAA,cACpB,4CAA4C,QAAA,CAAS;AAAA;AACvD,WACF;AAAA,UACA;AAAA,SACF;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;AAMA,SAAS,0BAAA,GAAsC;AAC7C,EAAA,IAAI,CAAC,iBAAgB,EAAG;AACtB,IAAA,OAAO,IAAA;AAAA,EACT;AAEA,EAAA,MAAM,aAAa,aAAA,EAAc;AACjC,EAAA,OAAO,CAAC,CAAC,UAAA,IAAc,CAAC,cAAc,UAAU,CAAA;AAClD;;;;"}
1
+ {"version":3,"file":"instrumentSqlStorage.js","sources":["../../../../src/instrumentations/instrumentSqlStorage.ts"],"sourcesContent":["import type { SqlStorage } from '@cloudflare/workers-types';\nimport {\n SENTRY_OP,\n SENTRY_ORIGIN,\n CLOUDFLARE_DURABLE_OBJECT_QUERY_BINDINGS,\n DB_OPERATION_NAME,\n DB_QUERY_SUMMARY,\n DB_QUERY_TEXT,\n DB_SYSTEM_NAME,\n} from '@sentry/conventions/attributes';\nimport { DB_QUERY } from '@sentry/conventions/op';\nimport { getActiveSpan, getClient, hasSpansEnabled, spanIsSampled, startSpan } from '@sentry/core';\nimport { getSqlQuerySummary, sanitizeSqlQuery } from '@sentry/server-utils';\nimport type { CloudflareClientOptions } from '../client';\nimport { mayTargetCloudflareInternalTable, targetsCloudflareInternalTable } from '../utils/internalSqlQuery';\n\nconst SPAN_ATTRIBUTES = {\n [SENTRY_OP]: DB_QUERY,\n [SENTRY_ORIGIN]: 'auto.db.cloudflare.durable_object_sql',\n [DB_SYSTEM_NAME]: 'cloudflare-durable-object-sql',\n [DB_OPERATION_NAME]: 'exec',\n};\n\n/**\n * Instruments the Durable Object SqlStorage `exec` method with Sentry spans.\n *\n * @param sql - The SqlStorage instance to instrument\n * @returns An instrumented SqlStorage instance\n */\nexport function instrumentSqlStorage(sql: SqlStorage): SqlStorage {\n return new Proxy(sql, {\n get(target, prop, _receiver) {\n const original = Reflect.get(target, prop, target);\n\n if (prop !== 'exec' || typeof original !== 'function') {\n return original;\n }\n\n return function (this: unknown, ...args: unknown[]) {\n const callOriginal = (): ReturnType<SqlStorage['exec']> =>\n (original as (...a: unknown[]) => ReturnType<SqlStorage['exec']>).apply(target, args);\n\n const [query, ...bindings] = args as [string, ...unknown[]];\n\n if (childSpanWillNotBeRecorded() && !mayTargetCloudflareInternalTable(query)) {\n // This span is never sent, so skip the costly sanitize and summary\n // steps. We still start the span so it records its dropped span\n // outcome. A query that may target a `cf_` or `pi_` table takes the full path,\n // because an internal query must start no span.\n return startSpan({ name: 'exec', attributes: SPAN_ATTRIBUTES }, callOriginal);\n }\n\n const sanitizedQuery = sanitizeSqlQuery(query);\n const querySummary = getSqlQuerySummary(sanitizedQuery);\n\n // oxlint-disable-next-line typescript/no-unnecessary-type-assertion -- rule false positive: the cast reaches the Cloudflare-only `durableObjectSqlSpanAllowlist`; tsc errors without it\n const allowlist = (getClient()?.getOptions() as CloudflareClientOptions | undefined)\n ?.durableObjectSqlSpanAllowlist;\n\n if (targetsCloudflareInternalTable(querySummary, allowlist, sanitizedQuery)) {\n return callOriginal();\n }\n\n return startSpan(\n {\n name: querySummary || sanitizedQuery,\n attributes: {\n ...SPAN_ATTRIBUTES,\n [DB_QUERY_TEXT]: sanitizedQuery,\n [DB_QUERY_SUMMARY]: querySummary,\n [CLOUDFLARE_DURABLE_OBJECT_QUERY_BINDINGS]: bindings.length,\n },\n },\n callOriginal,\n );\n };\n },\n });\n}\n\n/**\n * Returns `true` when `startSpan` creates a non-recording span: spans are disabled, or the active span\n * is not sampled. Must agree with `createChildOrRootSpan` and `_startChildSpan` in `@sentry/core`.\n */\nfunction childSpanWillNotBeRecorded(): boolean {\n if (!hasSpansEnabled()) {\n return true;\n }\n\n const activeSpan = getActiveSpan();\n return !!activeSpan && !spanIsSampled(activeSpan);\n}\n"],"names":[],"mappings":";;;;;;AAgBA,MAAM,eAAA,GAAkB;AAAA,EACtB,CAAC,SAAS,GAAG,QAAA;AAAA,EACb,CAAC,aAAa,GAAG,uCAAA;AAAA,EACjB,CAAC,cAAc,GAAG,+BAAA;AAAA,EAClB,CAAC,iBAAiB,GAAG;AACvB,CAAA;AAQO,SAAS,qBAAqB,GAAA,EAA6B;AAChE,EAAA,OAAO,IAAI,MAAM,GAAA,EAAK;AAAA,IACpB,GAAA,CAAI,MAAA,EAAQ,IAAA,EAAM,SAAA,EAAW;AAC3B,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,MAAM,MAAM,CAAA;AAEjD,MAAA,IAAI,IAAA,KAAS,MAAA,IAAU,OAAO,QAAA,KAAa,UAAA,EAAY;AACrD,QAAA,OAAO,QAAA;AAAA,MACT;AAEA,MAAA,OAAO,YAA4B,IAAA,EAAiB;AAClD,QAAA,MAAM,YAAA,GAAe,MAClB,QAAA,CAAiE,KAAA,CAAM,QAAQ,IAAI,CAAA;AAEtF,QAAA,MAAM,CAAC,KAAA,EAAO,GAAG,QAAQ,CAAA,GAAI,IAAA;AAE7B,QAAA,IAAI,0BAAA,EAA2B,IAAK,CAAC,gCAAA,CAAiC,KAAK,CAAA,EAAG;AAK5E,UAAA,OAAO,UAAU,EAAE,IAAA,EAAM,QAAQ,UAAA,EAAY,eAAA,IAAmB,YAAY,CAAA;AAAA,QAC9E;AAEA,QAAA,MAAM,cAAA,GAAiB,iBAAiB,KAAK,CAAA;AAC7C,QAAA,MAAM,YAAA,GAAe,mBAAmB,cAAc,CAAA;AAGtD,QAAA,MAAM,SAAA,GAAa,SAAA,EAAU,EAAG,UAAA,EAAW,EACvC,6BAAA;AAEJ,QAAA,IAAI,8BAAA,CAA+B,YAAA,EAAc,SAAA,EAAW,cAAc,CAAA,EAAG;AAC3E,UAAA,OAAO,YAAA,EAAa;AAAA,QACtB;AAEA,QAAA,OAAO,SAAA;AAAA,UACL;AAAA,YACE,MAAM,YAAA,IAAgB,cAAA;AAAA,YACtB,UAAA,EAAY;AAAA,cACV,GAAG,eAAA;AAAA,cACH,CAAC,aAAa,GAAG,cAAA;AAAA,cACjB,CAAC,gBAAgB,GAAG,YAAA;AAAA,cACpB,CAAC,wCAAwC,GAAG,QAAA,CAAS;AAAA;AACvD,WACF;AAAA,UACA;AAAA,SACF;AAAA,MACF,CAAA;AAAA,IACF;AAAA,GACD,CAAA;AACH;AAMA,SAAS,0BAAA,GAAsC;AAC7C,EAAA,IAAI,CAAC,iBAAgB,EAAG;AACtB,IAAA,OAAO,IAAA;AAAA,EACT;AAEA,EAAA,MAAM,aAAa,aAAA,EAAc;AACjC,EAAA,OAAO,CAAC,CAAC,UAAA,IAAc,CAAC,cAAc,UAAU,CAAA;AAClD;;;;"}
@@ -1,4 +1,4 @@
1
- import { SENTRY_ORIGIN, SENTRY_OP } from '@sentry/conventions/attributes';
1
+ import { SENTRY_ORIGIN, DB_OPERATION_BATCH_SIZE, DB_QUERY_TEXT, DB_OPERATION_NAME, DB_SYSTEM_NAME, SENTRY_OP, DB_QUERY_SUMMARY, CLOUDFLARE_D1_ROWS_WRITTEN, CLOUDFLARE_D1_ROWS_READ, CLOUDFLARE_D1_DURATION } from '@sentry/conventions/attributes';
2
2
  import { DB_QUERY } from '@sentry/conventions/op';
3
3
  import { startSpan, getClient, hasSpanStreamingEnabled, addBreadcrumb, SPAN_STATUS_ERROR } from '@sentry/core';
4
4
  import { sanitizeSqlQuery, getSqlQuerySummary } from '@sentry/server-utils';
@@ -67,9 +67,9 @@ function applyD1ReturnObjectToSpan(span, d1Result) {
67
67
  }
68
68
  function getAttributesFromD1Response(d1Result) {
69
69
  return {
70
- "cloudflare.d1.duration": d1Result.meta.duration,
71
- "cloudflare.d1.rows_read": d1Result.meta.rows_read,
72
- "cloudflare.d1.rows_written": d1Result.meta.rows_written
70
+ [CLOUDFLARE_D1_DURATION]: d1Result.meta.duration,
71
+ [CLOUDFLARE_D1_ROWS_READ]: d1Result.meta.rows_read,
72
+ [CLOUDFLARE_D1_ROWS_WRITTEN]: d1Result.meta.rows_written
73
73
  };
74
74
  }
75
75
  function createD1Breadcrumb(message, type, d1Result) {
@@ -78,7 +78,7 @@ function createD1Breadcrumb(message, type, d1Result) {
78
78
  message,
79
79
  data: {
80
80
  ...d1Result ? getAttributesFromD1Response(d1Result) : {},
81
- "db.operation.name": type
81
+ [DB_OPERATION_NAME]: type
82
82
  }
83
83
  });
84
84
  }
@@ -90,10 +90,10 @@ function createStartSpanOptions(queryText, type) {
90
90
  name,
91
91
  attributes: {
92
92
  [SENTRY_OP]: DB_QUERY,
93
- "db.system.name": "cloudflare-d1",
94
- "db.operation.name": type,
95
- "db.query.text": queryText,
96
- "db.query.summary": querySummary,
93
+ [DB_SYSTEM_NAME]: "cloudflare-d1",
94
+ [DB_OPERATION_NAME]: type,
95
+ [DB_QUERY_TEXT]: queryText,
96
+ [DB_QUERY_SUMMARY]: querySummary,
97
97
  [SENTRY_ORIGIN]: "auto.db.cloudflare.d1"
98
98
  }
99
99
  };
@@ -116,10 +116,10 @@ function instrumentBatch(batch) {
116
116
  name: "D1 batch",
117
117
  attributes: {
118
118
  [SENTRY_OP]: DB_QUERY,
119
- "db.system.name": "cloudflare-d1",
120
- "db.operation.name": "batch",
121
- "db.query.text": queryText || void 0,
122
- "db.operation.batch.size": statements.length,
119
+ [DB_SYSTEM_NAME]: "cloudflare-d1",
120
+ [DB_OPERATION_NAME]: "batch",
121
+ [DB_QUERY_TEXT]: queryText || void 0,
122
+ [DB_OPERATION_BATCH_SIZE]: statements.length,
123
123
  [SENTRY_ORIGIN]: "auto.db.cloudflare.d1"
124
124
  }
125
125
  },