@sentry/cloudflare 8.21.0 → 8.23.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 (51) hide show
  1. package/README.md +132 -8
  2. package/build/cjs/d1.js +157 -0
  3. package/build/cjs/d1.js.map +1 -0
  4. package/build/cjs/handler.js +45 -75
  5. package/build/cjs/handler.js.map +1 -1
  6. package/build/cjs/index.js +7 -0
  7. package/build/cjs/index.js.map +1 -1
  8. package/build/cjs/pages-plugin.js +52 -0
  9. package/build/cjs/pages-plugin.js.map +1 -0
  10. package/build/cjs/request.js +84 -0
  11. package/build/cjs/request.js.map +1 -0
  12. package/build/cjs/scope-utils.js +33 -0
  13. package/build/cjs/scope-utils.js.map +1 -0
  14. package/build/cjs/sdk.js +8 -3
  15. package/build/cjs/sdk.js.map +1 -1
  16. package/build/esm/d1.js +155 -0
  17. package/build/esm/d1.js.map +1 -0
  18. package/build/esm/handler.js +43 -73
  19. package/build/esm/handler.js.map +1 -1
  20. package/build/esm/index.js +4 -1
  21. package/build/esm/index.js.map +1 -1
  22. package/build/esm/pages-plugin.js +50 -0
  23. package/build/esm/pages-plugin.js.map +1 -0
  24. package/build/esm/request.js +82 -0
  25. package/build/esm/request.js.map +1 -0
  26. package/build/esm/scope-utils.js +29 -0
  27. package/build/esm/scope-utils.js.map +1 -0
  28. package/build/esm/sdk.js +5 -3
  29. package/build/esm/sdk.js.map +1 -1
  30. package/build/types/d1.d.ts +17 -0
  31. package/build/types/d1.d.ts.map +1 -0
  32. package/build/types/handler.d.ts +2 -2
  33. package/build/types/handler.d.ts.map +1 -1
  34. package/build/types/index.d.ts +4 -1
  35. package/build/types/index.d.ts.map +1 -1
  36. package/build/types/pages-plugin.d.ts +35 -0
  37. package/build/types/pages-plugin.d.ts.map +1 -0
  38. package/build/types/request.d.ts +13 -0
  39. package/build/types/request.d.ts.map +1 -0
  40. package/build/types/scope-utils.d.ts +15 -0
  41. package/build/types/scope-utils.d.ts.map +1 -0
  42. package/build/types/sdk.d.ts +4 -3
  43. package/build/types/sdk.d.ts.map +1 -1
  44. package/build/types-ts3.8/d1.d.ts +17 -0
  45. package/build/types-ts3.8/handler.d.ts +2 -2
  46. package/build/types-ts3.8/index.d.ts +4 -1
  47. package/build/types-ts3.8/pages-plugin.d.ts +35 -0
  48. package/build/types-ts3.8/request.d.ts +13 -0
  49. package/build/types-ts3.8/scope-utils.d.ts +15 -0
  50. package/build/types-ts3.8/sdk.d.ts +4 -3
  51. package/package.json +6 -7
@@ -0,0 +1,84 @@
1
+ Object.defineProperty(exports, '__esModule', { value: true });
2
+
3
+ const core = require('@sentry/core');
4
+ const utils = require('@sentry/utils');
5
+ const scopeUtils = require('./scope-utils.js');
6
+ const sdk = require('./sdk.js');
7
+
8
+ /**
9
+ * Wraps a cloudflare request handler in Sentry instrumentation
10
+ */
11
+ function wrapRequestHandler(
12
+ wrapperOptions,
13
+ handler,
14
+ ) {
15
+ return core.withIsolationScope(async isolationScope => {
16
+ const { options, request, context } = wrapperOptions;
17
+ const client = sdk.init(options);
18
+ isolationScope.setClient(client);
19
+
20
+ const attributes = {
21
+ [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.cloudflare',
22
+ [core.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
23
+ [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',
24
+ ['http.request.method']: request.method,
25
+ ['url.full']: request.url,
26
+ };
27
+
28
+ const contentLength = request.headers.get('content-length');
29
+ if (contentLength) {
30
+ attributes['http.request.body.size'] = parseInt(contentLength, 10);
31
+ }
32
+
33
+ let pathname = '';
34
+ try {
35
+ const url = new URL(request.url);
36
+ pathname = url.pathname;
37
+ attributes['server.address'] = url.hostname;
38
+ attributes['url.scheme'] = url.protocol.replace(':', '');
39
+ } catch (e2) {
40
+ // skip
41
+ }
42
+
43
+ scopeUtils.addCloudResourceContext(isolationScope);
44
+ if (request) {
45
+ scopeUtils.addRequest(isolationScope, request);
46
+ if (request.cf) {
47
+ scopeUtils.addCultureContext(isolationScope, request.cf);
48
+ attributes['network.protocol.name'] = request.cf.httpProtocol;
49
+ }
50
+ }
51
+
52
+ const routeName = `${request.method} ${pathname ? utils.stripUrlQueryAndFragment(pathname) : '/'}`;
53
+
54
+ return core.continueTrace(
55
+ { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },
56
+ () => {
57
+ // Note: This span will not have a duration unless I/O happens in the handler. This is
58
+ // because of how the cloudflare workers runtime works.
59
+ // See: https://developers.cloudflare.com/workers/runtime-apis/performance/
60
+ return core.startSpan(
61
+ {
62
+ name: routeName,
63
+ attributes,
64
+ },
65
+ async span => {
66
+ try {
67
+ const res = await handler();
68
+ core.setHttpStatus(span, res.status);
69
+ return res;
70
+ } catch (e) {
71
+ core.captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
72
+ throw e;
73
+ } finally {
74
+ context.waitUntil(core.flush(2000));
75
+ }
76
+ },
77
+ );
78
+ },
79
+ );
80
+ });
81
+ }
82
+
83
+ exports.wrapRequestHandler = wrapRequestHandler;
84
+ //# sourceMappingURL=request.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"request.js","sources":["../../src/request.ts"],"sourcesContent":["import type { ExecutionContext, IncomingRequestCfProperties } from '@cloudflare/workers-types';\n\nimport {\n SEMANTIC_ATTRIBUTE_SENTRY_OP,\n SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n captureException,\n continueTrace,\n flush,\n setHttpStatus,\n startSpan,\n withIsolationScope,\n} from '@sentry/core';\nimport type { SpanAttributes } from '@sentry/types';\nimport { stripUrlQueryAndFragment } from '@sentry/utils';\nimport type { CloudflareOptions } from './client';\nimport { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils';\nimport { init } from './sdk';\n\ninterface RequestHandlerWrapperOptions {\n options: CloudflareOptions;\n request: Request<unknown, IncomingRequestCfProperties<unknown>>;\n context: ExecutionContext;\n}\n\n/**\n * Wraps a cloudflare request handler in Sentry instrumentation\n */\nexport function wrapRequestHandler(\n wrapperOptions: RequestHandlerWrapperOptions,\n handler: (...args: unknown[]) => Response | Promise<Response>,\n): Promise<Response> {\n return withIsolationScope(async isolationScope => {\n const { options, request, context } = wrapperOptions;\n const client = init(options);\n isolationScope.setClient(client);\n\n const attributes: SpanAttributes = {\n [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.cloudflare',\n [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',\n ['http.request.method']: request.method,\n ['url.full']: request.url,\n };\n\n const contentLength = request.headers.get('content-length');\n if (contentLength) {\n attributes['http.request.body.size'] = parseInt(contentLength, 10);\n }\n\n let pathname = '';\n try {\n const url = new URL(request.url);\n pathname = url.pathname;\n attributes['server.address'] = url.hostname;\n attributes['url.scheme'] = url.protocol.replace(':', '');\n } catch {\n // skip\n }\n\n addCloudResourceContext(isolationScope);\n if (request) {\n addRequest(isolationScope, request);\n if (request.cf) {\n addCultureContext(isolationScope, request.cf);\n attributes['network.protocol.name'] = request.cf.httpProtocol;\n }\n }\n\n const routeName = `${request.method} ${pathname ? stripUrlQueryAndFragment(pathname) : '/'}`;\n\n return continueTrace(\n { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },\n () => {\n // Note: This span will not have a duration unless I/O happens in the handler. This is\n // because of how the cloudflare workers runtime works.\n // See: https://developers.cloudflare.com/workers/runtime-apis/performance/\n return startSpan(\n {\n name: routeName,\n attributes,\n },\n async span => {\n try {\n const res = await handler();\n setHttpStatus(span, res.status);\n return res;\n } catch (e) {\n captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });\n throw e;\n } finally {\n context.waitUntil(flush(2000));\n }\n },\n );\n },\n );\n });\n}\n"],"names":["withIsolationScope","init","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","SEMANTIC_ATTRIBUTE_SENTRY_OP","addCloudResourceContext","addRequest","addCultureContext","stripUrlQueryAndFragment","continueTrace","startSpan","setHttpStatus","captureException","flush"],"mappings":"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"}
@@ -0,0 +1,33 @@
1
+ Object.defineProperty(exports, '__esModule', { value: true });
2
+
3
+ const utils = require('@sentry/utils');
4
+
5
+ /**
6
+ * Set cloud resource context on scope.
7
+ */
8
+ function addCloudResourceContext(scope) {
9
+ scope.setContext('cloud_resource', {
10
+ 'cloud.provider': 'cloudflare',
11
+ });
12
+ }
13
+
14
+ /**
15
+ * Set culture context on scope
16
+ */
17
+ function addCultureContext(scope, cf) {
18
+ scope.setContext('culture', {
19
+ timezone: cf.timezone,
20
+ });
21
+ }
22
+
23
+ /**
24
+ * Set request data on scope
25
+ */
26
+ function addRequest(scope, request) {
27
+ scope.setSDKProcessingMetadata({ request: utils.winterCGRequestToRequestData(request) });
28
+ }
29
+
30
+ exports.addCloudResourceContext = addCloudResourceContext;
31
+ exports.addCultureContext = addCultureContext;
32
+ exports.addRequest = addRequest;
33
+ //# sourceMappingURL=scope-utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"scope-utils.js","sources":["../../src/scope-utils.ts"],"sourcesContent":["import type { IncomingRequestCfProperties } from '@cloudflare/workers-types';\n\nimport type { Scope } from '@sentry/types';\nimport { winterCGRequestToRequestData } from '@sentry/utils';\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): 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({ request: winterCGRequestToRequestData(request) });\n}\n"],"names":["winterCGRequestToRequestData"],"mappings":";;;;AAKA;AACA;AACA;AACO,SAAS,uBAAuB,CAAC,KAAK,EAAe;AAC5D,EAAE,KAAK,CAAC,UAAU,CAAC,gBAAgB,EAAE;AACrC,IAAI,gBAAgB,EAAE,YAAY;AAClC,GAAG,CAAC,CAAA;AACJ,CAAA;AACA;AACA;AACA;AACA;AACO,SAAS,iBAAiB,CAAC,KAAK,EAAS,EAAE,EAAqC;AACvF,EAAE,KAAK,CAAC,UAAU,CAAC,SAAS,EAAE;AAC9B,IAAI,QAAQ,EAAE,EAAE,CAAC,QAAQ;AACzB,GAAG,CAAC,CAAA;AACJ,CAAA;AACA;AACA;AACA;AACA;AACO,SAAS,UAAU,CAAC,KAAK,EAAS,OAAO,EAAiB;AACjE,EAAE,KAAK,CAAC,wBAAwB,CAAC,EAAE,OAAO,EAAEA,kCAA4B,CAAC,OAAO,CAAE,EAAC,CAAC,CAAA;AACpF;;;;;;"}
package/build/cjs/sdk.js CHANGED
@@ -1,3 +1,7 @@
1
+ var {
2
+ _nullishCoalesce
3
+ } = require('@sentry/utils');
4
+
1
5
  Object.defineProperty(exports, '__esModule', { value: true });
2
6
 
3
7
  const core = require('@sentry/core');
@@ -8,14 +12,15 @@ const transport = require('./transport.js');
8
12
  const stacktrace = require('./vendor/stacktrace.js');
9
13
 
10
14
  /** Get the default integrations for the Cloudflare SDK. */
11
- function getDefaultIntegrations(_options) {
15
+ function getDefaultIntegrations(options) {
16
+ const sendDefaultPii = _nullishCoalesce(options.sendDefaultPii, () => ( false));
12
17
  return [
13
18
  core.dedupeIntegration(),
14
19
  core.inboundFiltersIntegration(),
15
20
  core.functionToStringIntegration(),
16
21
  core.linkedErrorsIntegration(),
17
22
  fetch.fetchIntegration(),
18
- core.requestDataIntegration(),
23
+ core.requestDataIntegration(sendDefaultPii ? undefined : { include: { cookies: false } }),
19
24
  ];
20
25
  }
21
26
 
@@ -24,7 +29,7 @@ function getDefaultIntegrations(_options) {
24
29
  */
25
30
  function init(options) {
26
31
  if (options.defaultIntegrations === undefined) {
27
- options.defaultIntegrations = getDefaultIntegrations();
32
+ options.defaultIntegrations = getDefaultIntegrations(options);
28
33
  }
29
34
 
30
35
  const clientOptions = {
@@ -1 +1 @@
1
- {"version":3,"file":"sdk.js","sources":["../../src/sdk.ts"],"sourcesContent":["import {\n dedupeIntegration,\n functionToStringIntegration,\n getIntegrationsToSetup,\n inboundFiltersIntegration,\n initAndBind,\n linkedErrorsIntegration,\n requestDataIntegration,\n} from '@sentry/core';\nimport type { Integration, Options } from '@sentry/types';\nimport { stackParserFromStackParserOptions } from '@sentry/utils';\nimport type { CloudflareClientOptions } from './client';\nimport { CloudflareClient } from './client';\n\nimport { fetchIntegration } from './integrations/fetch';\nimport { makeCloudflareTransport } from './transport';\nimport { defaultStackParser } from './vendor/stacktrace';\n\n/** Get the default integrations for the Cloudflare SDK. */\nexport function getDefaultIntegrations(_options: Options): Integration[] {\n return [\n dedupeIntegration(),\n inboundFiltersIntegration(),\n functionToStringIntegration(),\n linkedErrorsIntegration(),\n fetchIntegration(),\n requestDataIntegration(),\n ];\n}\n\n/**\n * Initializes the cloudflare SDK.\n */\nexport function init(options: Options): CloudflareClient | undefined {\n if (options.defaultIntegrations === undefined) {\n options.defaultIntegrations = getDefaultIntegrations(options);\n }\n\n const clientOptions: CloudflareClientOptions = {\n ...options,\n stackParser: stackParserFromStackParserOptions(options.stackParser || defaultStackParser),\n integrations: getIntegrationsToSetup(options),\n transport: options.transport || makeCloudflareTransport,\n };\n\n return initAndBind(CloudflareClient, clientOptions) as CloudflareClient;\n}\n"],"names":["dedupeIntegration","inboundFiltersIntegration","functionToStringIntegration","linkedErrorsIntegration","fetchIntegration","requestDataIntegration","stackParserFromStackParserOptions","defaultStackParser","getIntegrationsToSetup","makeCloudflareTransport","initAndBind","CloudflareClient"],"mappings":";;;;;;;;;AAkBA;AACO,SAAS,sBAAsB,CAAC,QAAQ,EAA0B;AACzE,EAAE,OAAO;AACT,IAAIA,sBAAiB,EAAE;AACvB,IAAIC,8BAAyB,EAAE;AAC/B,IAAIC,gCAA2B,EAAE;AACjC,IAAIC,4BAAuB,EAAE;AAC7B,IAAIC,sBAAgB,EAAE;AACtB,IAAIC,2BAAsB,EAAE;AAC5B,GAAG,CAAA;AACH,CAAA;AACA;AACA;AACA;AACA;AACO,SAAS,IAAI,CAAC,OAAO,EAAyC;AACrE,EAAE,IAAI,OAAO,CAAC,mBAAoB,KAAI,SAAS,EAAE;AACjD,IAAI,OAAO,CAAC,mBAAA,GAAsB,sBAAsB,CAAQ,CAAC,CAAA;AACjE,GAAE;AACF;AACA,EAAE,MAAM,aAAa,GAA4B;AACjD,IAAI,GAAG,OAAO;AACd,IAAI,WAAW,EAAEC,uCAAiC,CAAC,OAAO,CAAC,WAAA,IAAeC,6BAAkB,CAAC;AAC7F,IAAI,YAAY,EAAEC,2BAAsB,CAAC,OAAO,CAAC;AACjD,IAAI,SAAS,EAAE,OAAO,CAAC,SAAA,IAAaC,iCAAuB;AAC3D,GAAG,CAAA;AACH;AACA,EAAE,OAAOC,gBAAW,CAACC,uBAAgB,EAAE,aAAa,CAAE,EAAA;AACtD;;;;;"}
1
+ {"version":3,"file":"sdk.js","sources":["../../src/sdk.ts"],"sourcesContent":["import {\n dedupeIntegration,\n functionToStringIntegration,\n getIntegrationsToSetup,\n inboundFiltersIntegration,\n initAndBind,\n linkedErrorsIntegration,\n requestDataIntegration,\n} from '@sentry/core';\nimport type { Integration } from '@sentry/types';\nimport { stackParserFromStackParserOptions } from '@sentry/utils';\nimport type { CloudflareClientOptions, CloudflareOptions } from './client';\nimport { CloudflareClient } from './client';\n\nimport { fetchIntegration } from './integrations/fetch';\nimport { makeCloudflareTransport } from './transport';\nimport { defaultStackParser } from './vendor/stacktrace';\n\n/** Get the default integrations for the Cloudflare SDK. */\nexport function getDefaultIntegrations(options: CloudflareOptions): Integration[] {\n const sendDefaultPii = options.sendDefaultPii ?? false;\n return [\n dedupeIntegration(),\n inboundFiltersIntegration(),\n functionToStringIntegration(),\n linkedErrorsIntegration(),\n fetchIntegration(),\n requestDataIntegration(sendDefaultPii ? undefined : { include: { cookies: false } }),\n ];\n}\n\n/**\n * Initializes the cloudflare SDK.\n */\nexport function init(options: CloudflareOptions): CloudflareClient | undefined {\n if (options.defaultIntegrations === undefined) {\n options.defaultIntegrations = getDefaultIntegrations(options);\n }\n\n const clientOptions: CloudflareClientOptions = {\n ...options,\n stackParser: stackParserFromStackParserOptions(options.stackParser || defaultStackParser),\n integrations: getIntegrationsToSetup(options),\n transport: options.transport || makeCloudflareTransport,\n };\n\n return initAndBind(CloudflareClient, clientOptions) as CloudflareClient;\n}\n"],"names":["dedupeIntegration","inboundFiltersIntegration","functionToStringIntegration","linkedErrorsIntegration","fetchIntegration","requestDataIntegration","stackParserFromStackParserOptions","defaultStackParser","getIntegrationsToSetup","makeCloudflareTransport","initAndBind","CloudflareClient"],"mappings":"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"}
@@ -0,0 +1,155 @@
1
+ import { startSpan, SPAN_STATUS_ERROR, addBreadcrumb, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
2
+
3
+ // Patching is based on internal Cloudflare D1 API
4
+ // https://github.com/cloudflare/workerd/blob/cd5279e7b305003f1d9c851e73efa9d67e4b68b2/src/cloudflare/internal/d1-api.ts
5
+
6
+ const patchedStatement = new WeakSet();
7
+
8
+ /**
9
+ * Patches the query methods of a Cloudflare D1 prepared statement with Sentry.
10
+ */
11
+ function instrumentD1PreparedStatementQueries(statement, query) {
12
+ if (patchedStatement.has(statement)) {
13
+ return statement;
14
+ }
15
+
16
+ // eslint-disable-next-line @typescript-eslint/unbound-method
17
+ statement.first = new Proxy(statement.first, {
18
+ apply(target, thisArg, args) {
19
+ return startSpan(createStartSpanOptions(query, 'first'), async () => {
20
+ const res = await Reflect.apply(target, thisArg, args);
21
+ createD1Breadcrumb(query, 'first');
22
+ return res;
23
+ });
24
+ },
25
+ });
26
+
27
+ // eslint-disable-next-line @typescript-eslint/unbound-method
28
+ statement.run = new Proxy(statement.run, {
29
+ apply(target, thisArg, args) {
30
+ return startSpan(createStartSpanOptions(query, 'run'), async span => {
31
+ const d1Response = await Reflect.apply(target, thisArg, args);
32
+ applyD1ReturnObjectToSpan(span, d1Response);
33
+ createD1Breadcrumb(query, 'run', d1Response);
34
+ return d1Response;
35
+ });
36
+ },
37
+ });
38
+
39
+ // eslint-disable-next-line @typescript-eslint/unbound-method
40
+ statement.all = new Proxy(statement.all, {
41
+ apply(target, thisArg, args) {
42
+ return startSpan(createStartSpanOptions(query, 'all'), async span => {
43
+ const d1Result = await Reflect.apply(target, thisArg, args);
44
+ applyD1ReturnObjectToSpan(span, d1Result);
45
+ createD1Breadcrumb(query, 'all', d1Result);
46
+ return d1Result;
47
+ });
48
+ },
49
+ });
50
+
51
+ // eslint-disable-next-line @typescript-eslint/unbound-method
52
+ statement.raw = new Proxy(statement.raw, {
53
+ apply(target, thisArg, args) {
54
+ return startSpan(createStartSpanOptions(query, 'raw'), async () => {
55
+ const res = await Reflect.apply(target, thisArg, args);
56
+ createD1Breadcrumb(query, 'raw');
57
+ return res;
58
+ });
59
+ },
60
+ });
61
+
62
+ patchedStatement.add(statement);
63
+
64
+ return statement;
65
+ }
66
+
67
+ /**
68
+ * Instruments a Cloudflare D1 prepared statement with Sentry.
69
+ *
70
+ * This is meant to be used as a top-level call, under the hood it calls `instrumentD1PreparedStatementQueries`
71
+ * to patch the query methods. The reason for this abstraction is to ensure that the `bind` method is also patched.
72
+ */
73
+ function instrumentD1PreparedStatement(statement, query) {
74
+ // statement.bind() returns a new instance of D1PreparedStatement, so we have to patch it as well.
75
+ // eslint-disable-next-line @typescript-eslint/unbound-method
76
+ statement.bind = new Proxy(statement.bind, {
77
+ apply(target, thisArg, args) {
78
+ return instrumentD1PreparedStatementQueries(Reflect.apply(target, thisArg, args), query);
79
+ },
80
+ });
81
+
82
+ return instrumentD1PreparedStatementQueries(statement, query);
83
+ }
84
+
85
+ /**
86
+ * Add D1Response meta information to a span.
87
+ *
88
+ * See: https://developers.cloudflare.com/d1/build-with-d1/d1-client-api/#return-object
89
+ */
90
+ function applyD1ReturnObjectToSpan(span, d1Result) {
91
+ if (!d1Result.success) {
92
+ span.setStatus({ code: SPAN_STATUS_ERROR });
93
+ }
94
+
95
+ span.setAttributes(getAttributesFromD1Response(d1Result));
96
+ }
97
+
98
+ function getAttributesFromD1Response(d1Result) {
99
+ return {
100
+ 'cloudflare.d1.duration': d1Result.meta.duration,
101
+ 'cloudflare.d1.rows_read': d1Result.meta.rows_read,
102
+ 'cloudflare.d1.rows_written': d1Result.meta.rows_written,
103
+ };
104
+ }
105
+
106
+ function createD1Breadcrumb(query, type, d1Result) {
107
+ addBreadcrumb({
108
+ category: 'query',
109
+ message: query,
110
+ data: {
111
+ ...(d1Result ? getAttributesFromD1Response(d1Result) : {}),
112
+ 'cloudflare.d1.query_type': type,
113
+ },
114
+ });
115
+ }
116
+
117
+ function createStartSpanOptions(query, type) {
118
+ return {
119
+ op: 'db.query',
120
+ name: query,
121
+ attributes: {
122
+ 'cloudflare.d1.query_type': type,
123
+ [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.cloudflare.d1',
124
+ },
125
+ };
126
+ }
127
+
128
+ /**
129
+ * Instruments Cloudflare D1 bindings with Sentry.
130
+ *
131
+ * Currently, only prepared statements are instrumented. `db.exec` and `db.batch` are not instrumented.
132
+ *
133
+ * @example
134
+ *
135
+ * ```js
136
+ * // env.DB is the D1 DB binding configured in your `wrangler.toml`
137
+ * const db = instrumentD1WithSentry(env.DB);
138
+ * // Now you can use the database as usual
139
+ * await db.prepare('SELECT * FROM table WHERE id = ?').bind(1).run();
140
+ * ```
141
+ */
142
+ function instrumentD1WithSentry(db) {
143
+ // eslint-disable-next-line @typescript-eslint/unbound-method
144
+ db.prepare = new Proxy(db.prepare, {
145
+ apply(target, thisArg, args) {
146
+ const [query] = args;
147
+ return instrumentD1PreparedStatement(Reflect.apply(target, thisArg, args), query);
148
+ },
149
+ });
150
+
151
+ return db;
152
+ }
153
+
154
+ export { instrumentD1WithSentry };
155
+ //# sourceMappingURL=d1.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"d1.js","sources":["../../src/d1.ts"],"sourcesContent":["import type { D1Database, D1PreparedStatement, D1Response } from '@cloudflare/workers-types';\nimport { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR, addBreadcrumb, startSpan } from '@sentry/core';\nimport type { Span, SpanAttributes, StartSpanOptions } from '@sentry/types';\n\n// Patching is based on internal Cloudflare D1 API\n// https://github.com/cloudflare/workerd/blob/cd5279e7b305003f1d9c851e73efa9d67e4b68b2/src/cloudflare/internal/d1-api.ts\n\nconst patchedStatement = new WeakSet<D1PreparedStatement>();\n\n/**\n * Patches the query methods of a Cloudflare D1 prepared statement with Sentry.\n */\nfunction instrumentD1PreparedStatementQueries(statement: D1PreparedStatement, query: string): D1PreparedStatement {\n if (patchedStatement.has(statement)) {\n return statement;\n }\n\n // eslint-disable-next-line @typescript-eslint/unbound-method\n statement.first = new Proxy(statement.first, {\n apply(target, thisArg, args: Parameters<typeof statement.first>) {\n return startSpan(createStartSpanOptions(query, 'first'), async () => {\n const res = await Reflect.apply(target, thisArg, args);\n createD1Breadcrumb(query, 'first');\n return res;\n });\n },\n });\n\n // eslint-disable-next-line @typescript-eslint/unbound-method\n statement.run = new Proxy(statement.run, {\n apply(target, thisArg, args: Parameters<typeof statement.run>) {\n return startSpan(createStartSpanOptions(query, 'run'), async span => {\n const d1Response = await Reflect.apply(target, thisArg, args);\n applyD1ReturnObjectToSpan(span, d1Response);\n createD1Breadcrumb(query, 'run', d1Response);\n return d1Response;\n });\n },\n });\n\n // eslint-disable-next-line @typescript-eslint/unbound-method\n statement.all = new Proxy(statement.all, {\n apply(target, thisArg, args: Parameters<typeof statement.all>) {\n return startSpan(createStartSpanOptions(query, 'all'), async span => {\n const d1Result = await Reflect.apply(target, thisArg, args);\n applyD1ReturnObjectToSpan(span, d1Result);\n createD1Breadcrumb(query, 'all', d1Result);\n return d1Result;\n });\n },\n });\n\n // eslint-disable-next-line @typescript-eslint/unbound-method\n statement.raw = new Proxy(statement.raw, {\n apply(target, thisArg, args: Parameters<typeof statement.raw>) {\n return startSpan(createStartSpanOptions(query, 'raw'), async () => {\n const res = await Reflect.apply(target, thisArg, args);\n createD1Breadcrumb(query, 'raw');\n return res;\n });\n },\n });\n\n patchedStatement.add(statement);\n\n return statement;\n}\n\n/**\n * Instruments a Cloudflare D1 prepared statement with Sentry.\n *\n * This is meant to be used as a top-level call, under the hood it calls `instrumentD1PreparedStatementQueries`\n * to patch the query methods. The reason for this abstraction is to ensure that the `bind` method is also patched.\n */\nfunction instrumentD1PreparedStatement(statement: D1PreparedStatement, query: string): D1PreparedStatement {\n // statement.bind() returns a new instance of D1PreparedStatement, so we have to patch it as well.\n // eslint-disable-next-line @typescript-eslint/unbound-method\n statement.bind = new Proxy(statement.bind, {\n apply(target, thisArg, args: Parameters<typeof statement.bind>) {\n return instrumentD1PreparedStatementQueries(Reflect.apply(target, thisArg, args), query);\n },\n });\n\n return instrumentD1PreparedStatementQueries(statement, query);\n}\n\n/**\n * Add D1Response meta information to a span.\n *\n * See: https://developers.cloudflare.com/d1/build-with-d1/d1-client-api/#return-object\n */\nfunction applyD1ReturnObjectToSpan(span: Span, d1Result: D1Response): void {\n if (!d1Result.success) {\n span.setStatus({ code: SPAN_STATUS_ERROR });\n }\n\n span.setAttributes(getAttributesFromD1Response(d1Result));\n}\n\nfunction getAttributesFromD1Response(d1Result: D1Response): SpanAttributes {\n return {\n 'cloudflare.d1.duration': d1Result.meta.duration,\n 'cloudflare.d1.rows_read': d1Result.meta.rows_read,\n 'cloudflare.d1.rows_written': d1Result.meta.rows_written,\n };\n}\n\nfunction createD1Breadcrumb(query: string, type: 'first' | 'run' | 'all' | 'raw', d1Result?: D1Response): void {\n addBreadcrumb({\n category: 'query',\n message: query,\n data: {\n ...(d1Result ? getAttributesFromD1Response(d1Result) : {}),\n 'cloudflare.d1.query_type': type,\n },\n });\n}\n\nfunction createStartSpanOptions(query: string, type: 'first' | 'run' | 'all' | 'raw'): StartSpanOptions {\n return {\n op: 'db.query',\n name: query,\n attributes: {\n 'cloudflare.d1.query_type': type,\n [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.cloudflare.d1',\n },\n };\n}\n\n/**\n * Instruments Cloudflare D1 bindings with Sentry.\n *\n * Currently, only prepared statements are instrumented. `db.exec` and `db.batch` are not instrumented.\n *\n * @example\n *\n * ```js\n * // env.DB is the D1 DB binding configured in your `wrangler.toml`\n * const db = instrumentD1WithSentry(env.DB);\n * // Now you can use the database as usual\n * await db.prepare('SELECT * FROM table WHERE id = ?').bind(1).run();\n * ```\n */\nexport function instrumentD1WithSentry(db: D1Database): D1Database {\n // eslint-disable-next-line @typescript-eslint/unbound-method\n db.prepare = new Proxy(db.prepare, {\n apply(target, thisArg, args: Parameters<typeof db.prepare>) {\n const [query] = args;\n return instrumentD1PreparedStatement(Reflect.apply(target, thisArg, args), query);\n },\n });\n\n return db;\n}\n"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
- import { withIsolationScope, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, SEMANTIC_ATTRIBUTE_SENTRY_OP, continueTrace, startSpan, setHttpStatus, captureException, flush } from '@sentry/core';
2
- import { stripUrlQueryAndFragment, winterCGRequestToRequestData } from '@sentry/utils';
1
+ import { withIsolationScope, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, captureException, flush } from '@sentry/core';
3
2
  import { setAsyncLocalStorageAsyncContextStrategy } from './async.js';
3
+ import { wrapRequestHandler } from './request.js';
4
+ import { addCloudResourceContext } from './scope-utils.js';
4
5
  import { init } from './sdk.js';
5
6
 
6
7
  /**
@@ -30,67 +31,52 @@ function withSentry(
30
31
  handler.fetch = new Proxy(handler.fetch, {
31
32
  apply(target, thisArg, args) {
32
33
  const [request, env, context] = args;
34
+ const options = optionsCallback(env);
35
+ return wrapRequestHandler({ options, request, context }, () => target.apply(thisArg, args));
36
+ },
37
+ });
38
+
39
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
40
+ (handler.fetch ).__SENTRY_INSTRUMENTED__ = true;
41
+ }
42
+
43
+ if (
44
+ 'scheduled' in handler &&
45
+ typeof handler.scheduled === 'function' &&
46
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
47
+ !(handler.scheduled ).__SENTRY_INSTRUMENTED__
48
+ ) {
49
+ handler.scheduled = new Proxy(handler.scheduled, {
50
+ apply(target, thisArg, args) {
51
+ const [event, env, context] = args;
33
52
  return withIsolationScope(isolationScope => {
34
53
  const options = optionsCallback(env);
35
54
  const client = init(options);
36
55
  isolationScope.setClient(client);
37
56
 
38
- const attributes = {
39
- [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.cloudflare-worker',
40
- [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
41
- [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',
42
- ['http.request.method']: request.method,
43
- ['url.full']: request.url,
44
- };
45
-
46
- const contentLength = request.headers.get('content-length');
47
- if (contentLength) {
48
- attributes['http.request.body.size'] = parseInt(contentLength, 10);
49
- }
50
-
51
- let pathname = '';
52
- try {
53
- const url = new URL(request.url);
54
- pathname = url.pathname;
55
- attributes['server.address'] = url.hostname;
56
- attributes['url.scheme'] = url.protocol.replace(':', '');
57
- } catch (e2) {
58
- // skip
59
- }
60
-
61
- addRequest(isolationScope, request);
62
57
  addCloudResourceContext(isolationScope);
63
- if (request.cf) {
64
- addCultureContext(isolationScope, request.cf);
65
- attributes['network.protocol.name'] = request.cf.httpProtocol;
66
- }
67
-
68
- const routeName = `${request.method} ${pathname ? stripUrlQueryAndFragment(pathname) : '/'}`;
69
58
 
70
- return continueTrace(
71
- { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },
72
- () => {
73
- // Note: This span will not have a duration unless I/O happens in the handler. This is
74
- // because of how the cloudflare workers runtime works.
75
- // See: https://developers.cloudflare.com/workers/runtime-apis/performance/
76
- return startSpan(
77
- {
78
- name: routeName,
79
- attributes,
80
- },
81
- async span => {
82
- try {
83
- const res = await (target.apply(thisArg, args) );
84
- setHttpStatus(span, res.status);
85
- return res;
86
- } catch (e) {
87
- captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
88
- throw e;
89
- } finally {
90
- context.waitUntil(flush(2000));
91
- }
92
- },
93
- );
59
+ return startSpan(
60
+ {
61
+ op: 'faas.cron',
62
+ name: `Scheduled Cron ${event.cron}`,
63
+ attributes: {
64
+ 'faas.cron': event.cron,
65
+ 'faas.time': new Date(event.scheduledTime).toISOString(),
66
+ 'faas.trigger': 'timer',
67
+ [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare',
68
+ [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
69
+ },
70
+ },
71
+ async () => {
72
+ try {
73
+ return await (target.apply(thisArg, args) );
74
+ } catch (e) {
75
+ captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
76
+ throw e;
77
+ } finally {
78
+ context.waitUntil(flush(2000));
79
+ }
94
80
  },
95
81
  );
96
82
  });
@@ -98,27 +84,11 @@ function withSentry(
98
84
  });
99
85
 
100
86
  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
101
- (handler.fetch ).__SENTRY_INSTRUMENTED__ = true;
87
+ (handler.scheduled ).__SENTRY_INSTRUMENTED__ = true;
102
88
  }
103
89
 
104
90
  return handler;
105
91
  }
106
92
 
107
- function addCloudResourceContext(isolationScope) {
108
- isolationScope.setContext('cloud_resource', {
109
- 'cloud.provider': 'cloudflare',
110
- });
111
- }
112
-
113
- function addCultureContext(isolationScope, cf) {
114
- isolationScope.setContext('culture', {
115
- timezone: cf.timezone,
116
- });
117
- }
118
-
119
- function addRequest(isolationScope, request) {
120
- isolationScope.setSDKProcessingMetadata({ request: winterCGRequestToRequestData(request) });
121
- }
122
-
123
93
  export { withSentry };
124
94
  //# sourceMappingURL=handler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"handler.js","sources":["../../src/handler.ts"],"sourcesContent":["import type {\n ExportedHandler,\n ExportedHandlerFetchHandler,\n IncomingRequestCfProperties,\n} from '@cloudflare/workers-types';\nimport {\n SEMANTIC_ATTRIBUTE_SENTRY_OP,\n SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n captureException,\n continueTrace,\n flush,\n setHttpStatus,\n startSpan,\n withIsolationScope,\n} from '@sentry/core';\nimport type { Options, Scope, SpanAttributes } from '@sentry/types';\nimport { stripUrlQueryAndFragment, winterCGRequestToRequestData } from '@sentry/utils';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport { init } from './sdk';\n\n/**\n * Extract environment generic from exported handler.\n */\ntype ExtractEnv<P> = P extends ExportedHandler<infer Env> ? Env : never;\n\n/**\n * Wrapper for Cloudflare handlers.\n *\n * Initializes the SDK and wraps the handler with Sentry instrumentation.\n *\n * Automatically instruments the `fetch` method of the handler.\n *\n * @param optionsCallback Function that returns the options for the SDK initialization.\n * @param handler {ExportedHandler} The handler to wrap.\n * @returns The wrapped handler.\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function withSentry<E extends ExportedHandler<any>>(\n optionsCallback: (env: ExtractEnv<E>) => Options,\n handler: E,\n): E {\n setAsyncLocalStorageAsyncContextStrategy();\n\n // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any\n if ('fetch' in handler && typeof handler.fetch === 'function' && !(handler.fetch as any).__SENTRY_INSTRUMENTED__) {\n handler.fetch = new Proxy(handler.fetch, {\n apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<ExtractEnv<E>>>) {\n const [request, env, context] = args;\n return withIsolationScope(isolationScope => {\n const options = optionsCallback(env);\n const client = init(options);\n isolationScope.setClient(client);\n\n const attributes: SpanAttributes = {\n [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.cloudflare-worker',\n [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',\n ['http.request.method']: request.method,\n ['url.full']: request.url,\n };\n\n const contentLength = request.headers.get('content-length');\n if (contentLength) {\n attributes['http.request.body.size'] = parseInt(contentLength, 10);\n }\n\n let pathname = '';\n try {\n const url = new URL(request.url);\n pathname = url.pathname;\n attributes['server.address'] = url.hostname;\n attributes['url.scheme'] = url.protocol.replace(':', '');\n } catch {\n // skip\n }\n\n addRequest(isolationScope, request);\n addCloudResourceContext(isolationScope);\n if (request.cf) {\n addCultureContext(isolationScope, request.cf);\n attributes['network.protocol.name'] = request.cf.httpProtocol;\n }\n\n const routeName = `${request.method} ${pathname ? stripUrlQueryAndFragment(pathname) : '/'}`;\n\n return continueTrace(\n { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },\n () => {\n // Note: This span will not have a duration unless I/O happens in the handler. This is\n // because of how the cloudflare workers runtime works.\n // See: https://developers.cloudflare.com/workers/runtime-apis/performance/\n return startSpan(\n {\n name: routeName,\n attributes,\n },\n async span => {\n try {\n const res = await (target.apply(thisArg, args) as ReturnType<typeof target>);\n setHttpStatus(span, res.status);\n return res;\n } catch (e) {\n captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });\n throw e;\n } finally {\n context.waitUntil(flush(2000));\n }\n },\n );\n },\n );\n });\n },\n });\n\n // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any\n (handler.fetch as any).__SENTRY_INSTRUMENTED__ = true;\n }\n\n return handler;\n}\n\nfunction addCloudResourceContext(isolationScope: Scope): void {\n isolationScope.setContext('cloud_resource', {\n 'cloud.provider': 'cloudflare',\n });\n}\n\nfunction addCultureContext(isolationScope: Scope, cf: IncomingRequestCfProperties): void {\n isolationScope.setContext('culture', {\n timezone: cf.timezone,\n });\n}\n\nfunction addRequest(isolationScope: Scope, request: Request): void {\n isolationScope.setSDKProcessingMetadata({ request: winterCGRequestToRequestData(request) });\n}\n"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"handler.js","sources":["../../src/handler.ts"],"sourcesContent":["import type {\n ExportedHandler,\n ExportedHandlerFetchHandler,\n ExportedHandlerScheduledHandler,\n} from '@cloudflare/workers-types';\nimport {\n SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n captureException,\n flush,\n startSpan,\n withIsolationScope,\n} from '@sentry/core';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { wrapRequestHandler } from './request';\nimport { addCloudResourceContext } from './scope-utils';\nimport { init } from './sdk';\n\n/**\n * Extract environment generic from exported handler.\n */\ntype ExtractEnv<P> = P extends ExportedHandler<infer Env> ? Env : never;\n\n/**\n * Wrapper for Cloudflare handlers.\n *\n * Initializes the SDK and wraps the handler with Sentry instrumentation.\n *\n * Automatically instruments the `fetch` method of the handler.\n *\n * @param optionsCallback Function that returns the options for the SDK initialization.\n * @param handler {ExportedHandler} The handler to wrap.\n * @returns The wrapped handler.\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function withSentry<E extends ExportedHandler<any>>(\n optionsCallback: (env: ExtractEnv<E>) => CloudflareOptions,\n handler: E,\n): E {\n setAsyncLocalStorageAsyncContextStrategy();\n\n // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any\n if ('fetch' in handler && typeof handler.fetch === 'function' && !(handler.fetch as any).__SENTRY_INSTRUMENTED__) {\n handler.fetch = new Proxy(handler.fetch, {\n apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<ExtractEnv<E>>>) {\n const [request, env, context] = args;\n const options = optionsCallback(env);\n return wrapRequestHandler({ options, request, context }, () => target.apply(thisArg, args));\n },\n });\n\n // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any\n (handler.fetch as any).__SENTRY_INSTRUMENTED__ = true;\n }\n\n if (\n 'scheduled' in handler &&\n typeof handler.scheduled === 'function' &&\n // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any\n !(handler.scheduled as any).__SENTRY_INSTRUMENTED__\n ) {\n handler.scheduled = new Proxy(handler.scheduled, {\n apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<ExtractEnv<E>>>) {\n const [event, env, context] = args;\n return withIsolationScope(isolationScope => {\n const options = optionsCallback(env);\n const client = init(options);\n isolationScope.setClient(client);\n\n addCloudResourceContext(isolationScope);\n\n return startSpan(\n {\n op: 'faas.cron',\n name: `Scheduled Cron ${event.cron}`,\n attributes: {\n 'faas.cron': event.cron,\n 'faas.time': new Date(event.scheduledTime).toISOString(),\n 'faas.trigger': 'timer',\n [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare',\n [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n },\n },\n async () => {\n try {\n return await (target.apply(thisArg, args) as ReturnType<typeof target>);\n } catch (e) {\n captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });\n throw e;\n } finally {\n context.waitUntil(flush(2000));\n }\n },\n );\n });\n },\n });\n\n // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any\n (handler.scheduled as any).__SENTRY_INSTRUMENTED__ = true;\n }\n\n return handler;\n}\n"],"names":[],"mappings":"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"}
@@ -1,6 +1,9 @@
1
- export { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, Scope, addBreadcrumb, addEventProcessor, addIntegration, captureCheckIn, captureConsoleIntegration, captureEvent, captureException, captureFeedback, captureMessage, close, continueTrace, createTransport, debugIntegration, dedupeIntegration, extraErrorDataIntegration, flush, functionToStringIntegration, getActiveSpan, getClient, getCurrentScope, getGlobalScope, getIsolationScope, getRootSpan, getSpanDescendants, getSpanStatusFromHttpCode, inboundFiltersIntegration, isInitialized, lastEventId, linkedErrorsIntegration, metrics, moduleMetadataIntegration, requestDataIntegration, rewriteFramesIntegration, setContext, setCurrentClient, setExtra, setExtras, setHttpStatus, setMeasurement, setTag, setTags, setUser, spanToBaggageHeader, spanToJSON, spanToTraceHeader, startInactiveSpan, startNewTrace, startSpan, startSpanManual, trpcMiddleware, withActiveSpan, withIsolationScope, withMonitor, withScope, zodErrorsIntegration } from '@sentry/core';
1
+ export { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, Scope, addBreadcrumb, addEventProcessor, addIntegration, captureCheckIn, captureConsoleIntegration, captureEvent, captureException, captureFeedback, captureMessage, close, continueTrace, createTransport, debugIntegration, dedupeIntegration, extraErrorDataIntegration, flush, functionToStringIntegration, getActiveSpan, getClient, getCurrentScope, getGlobalScope, getIsolationScope, getRootSpan, getSpanDescendants, getSpanStatusFromHttpCode, getTraceData, inboundFiltersIntegration, isInitialized, lastEventId, linkedErrorsIntegration, metrics, moduleMetadataIntegration, requestDataIntegration, rewriteFramesIntegration, setContext, setCurrentClient, setExtra, setExtras, setHttpStatus, setMeasurement, setTag, setTags, setUser, spanToBaggageHeader, spanToJSON, spanToTraceHeader, startInactiveSpan, startNewTrace, startSpan, startSpanManual, trpcMiddleware, withActiveSpan, withIsolationScope, withMonitor, withScope, zodErrorsIntegration } from '@sentry/core';
2
2
  export { withSentry } from './handler.js';
3
+ export { sentryPagesPlugin } from './pages-plugin.js';
4
+ export { wrapRequestHandler } from './request.js';
3
5
  export { CloudflareClient } from './client.js';
4
6
  export { getDefaultIntegrations } from './sdk.js';
5
7
  export { fetchIntegration } from './integrations/fetch.js';
8
+ export { instrumentD1WithSentry } from './d1.js';
6
9
  //# 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":";;;;;;;"}
@@ -0,0 +1,50 @@
1
+ import { setAsyncLocalStorageAsyncContextStrategy } from './async.js';
2
+ import { wrapRequestHandler } from './request.js';
3
+
4
+ /**
5
+ * Plugin middleware for Cloudflare Pages.
6
+ *
7
+ * Initializes the SDK and wraps cloudflare pages requests with SDK instrumentation.
8
+ *
9
+ * @example Simple usage
10
+ *
11
+ * ```javascript
12
+ * // functions/_middleware.js
13
+ * import * as Sentry from '@sentry/cloudflare';
14
+ *
15
+ * export const onRequest = Sentry.sentryPagesPlugin({
16
+ * dsn: process.env.SENTRY_DSN,
17
+ * tracesSampleRate: 1.0,
18
+ * });
19
+ * ```
20
+ *
21
+ * @example Usage with handler function to access context for environmental variables
22
+ *
23
+ * ```javascript
24
+ * import * as Sentry from '@sentry/cloudflare';
25
+ *
26
+ * const const onRequest = Sentry.sentryPagesPlugin((context) => ({
27
+ * dsn: context.env.SENTRY_DSN,
28
+ * tracesSampleRate: 1.0,
29
+ * })
30
+ * ```
31
+ *
32
+ * @param handlerOrOptions Configuration options or a function that returns configuration options.
33
+ * @returns A plugin function that can be used in Cloudflare Pages.
34
+ */
35
+ function sentryPagesPlugin
36
+
37
+ (
38
+ handlerOrOptions
39
+
40
+ ,
41
+ ) {
42
+ setAsyncLocalStorageAsyncContextStrategy();
43
+ return context => {
44
+ const options = typeof handlerOrOptions === 'function' ? handlerOrOptions(context) : handlerOrOptions;
45
+ return wrapRequestHandler({ options, request: context.request, context }, () => context.next());
46
+ };
47
+ }
48
+
49
+ export { sentryPagesPlugin };
50
+ //# sourceMappingURL=pages-plugin.js.map