Skip to content

Commit 84563e6

Browse files
authored
fix: review comments
1 parent 05234ed commit 84563e6

7 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎packages/cloudflare/src/baseSdk.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export function initWithDefaultIntegrations(
109109

110110
// `false` or a custom list turns off the SDK defaults, late-loaded ones
111111
// included, unless an SDK built the list from the defaults.
112-
const usesSdkDefaults = options.defaultIntegrations === undefined || !!options.extendsDefaultIntegrations;
112+
const usesSdkDefaults = options.defaultIntegrations === undefined || !!options._extendsDefaultIntegrations;
113113
if (options.defaultIntegrations === undefined) {
114114
options.defaultIntegrations = getDefaultIntegrationsImpl(options);
115115
}

‎packages/cloudflare/src/client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ interface BaseCloudflareOptions {
359359
* the integrations of instrumented modules that load after `init()`.
360360
* @default false
361361
*/
362-
extendsDefaultIntegrations?: boolean;
362+
_extendsDefaultIntegrations?: boolean;
363363

364364
/**
365365
* The Cloudflare SDK is not OpenTelemetry native. By default (`false`) it does not set up a tracer

‎packages/cloudflare/test/sdk.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ describe('getDefaultIntegrations', () => {
526526

527527
test('adds it when a custom defaultIntegrations list extends the SDK defaults', async () => {
528528
resetSdk();
529-
const client = init({ dsn: DSN, defaultIntegrations: [], extendsDefaultIntegrations: true });
529+
const client = init({ dsn: DSN, defaultIntegrations: [], _extendsDefaultIntegrations: true });
530530

531531
await loadMysqlLate(client);
532532

@@ -538,7 +538,7 @@ describe('getDefaultIntegrations', () => {
538538
const client = init({
539539
dsn: DSN,
540540
defaultIntegrations: [],
541-
extendsDefaultIntegrations: true,
541+
_extendsDefaultIntegrations: true,
542542
integrations: defaults => defaults.filter(integration => integration.name !== 'Mysql'),
543543
});
544544

‎packages/nuxt/src/runtime/plugins/sentry-cloudflare.server.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export const sentryCloudflareNitroPlugin =
7373
// Nitro's Cloudflare presets require the flag anyway, so opt into the full set.
7474
options: {
7575
defaultIntegrations: getDefaultIntegrations(cloudflareOptions),
76-
extendsDefaultIntegrations: cloudflareOptions.defaultIntegrations === undefined,
76+
_extendsDefaultIntegrations: cloudflareOptions.defaultIntegrations === undefined,
7777
...cloudflareOptions,
7878
},
7979
request,

‎packages/nuxt/test/runtime/plugins/sentry-cloudflare.server.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ describe('sentryCloudflareNitroPlugin', () => {
3636
expect.objectContaining({
3737
options: expect.objectContaining({
3838
defaultIntegrations: expect.any(Array),
39-
extendsDefaultIntegrations: true,
39+
_extendsDefaultIntegrations: true,
4040
}),
4141
}),
4242
expect.any(Function),
@@ -48,7 +48,7 @@ describe('sentryCloudflareNitroPlugin', () => {
4848

4949
expect(wrapRequestHandler).toHaveBeenCalledWith(
5050
expect.objectContaining({
51-
options: expect.objectContaining({ defaultIntegrations: [], extendsDefaultIntegrations: false }),
51+
options: expect.objectContaining({ defaultIntegrations: [], _extendsDefaultIntegrations: false }),
5252
}),
5353
expect.any(Function),
5454
);

‎packages/sveltekit/src/worker/cloudflare.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function initCloudflareSentryHandle(options: CloudflareOptions): Handle {
2323
rewriteFramesIntegration(),
2424
svelteKitSpansIntegration(),
2525
],
26-
extendsDefaultIntegrations: options.defaultIntegrations === undefined,
26+
_extendsDefaultIntegrations: options.defaultIntegrations === undefined,
2727
// SvelteKit emits its own OpenTelemetry spans (Kit tracing), so, like the Node SvelteKit SDK, it
2828
// defaults to registering the tracer provider instead of inheriting Cloudflare's no-provider default.
2929
// Only the `init`-backed wrapper from the main entry point honors this; `@sentry/cloudflare/request`

‎packages/sveltekit/test/worker/cloudflare.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe('initCloudflareSentryHandle', () => {
6666
options: expect.objectContaining({
6767
dsn: options.dsn,
6868
enableOpenTelemetrySetup: true,
69-
extendsDefaultIntegrations: true,
69+
_extendsDefaultIntegrations: true,
7070
}),
7171
request,
7272
context,
@@ -91,7 +91,7 @@ describe('initCloudflareSentryHandle', () => {
9191

9292
expect(wrapRequestHandler).toHaveBeenCalledWith(
9393
expect.objectContaining({
94-
options: expect.objectContaining({ defaultIntegrations: [], extendsDefaultIntegrations: false }),
94+
options: expect.objectContaining({ defaultIntegrations: [], _extendsDefaultIntegrations: false }),
9595
}),
9696
expect.any(Function),
9797
);

0 commit comments

Comments
 (0)