Skip to content

Commit f402652

Browse files
AbhiPrasadAbhiPrasad
authored
feat(v8): Remove defaultIntegrations deprecated export (#10691)
ref #10100 Removes deprecated `defaultIntegrations` export everywhere.
1 parent 673f76a commit f402652

File tree

19 files changed

+64
-136
lines changed

19 files changed

+64
-136
lines changed

‎packages/astro/src/index.types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export declare const Integrations: typeof serverSdk.Integrations;
1919

2020
export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
2121

22-
export declare const defaultIntegrations: Integration[];
2322
export declare const getDefaultIntegrations: (options: Options) => Integration[];
2423
export declare const defaultStackParser: StackParser;
2524

‎packages/browser/src/exports.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ export {
9595
export { eventFromException, eventFromMessage, exceptionFromError } from './eventbuilder';
9696
export { createUserFeedbackEnvelope } from './userfeedback';
9797
export {
98-
// eslint-disable-next-line deprecation/deprecation
99-
defaultIntegrations,
10098
getDefaultIntegrations,
10199
forceLoad,
102100
init,

‎packages/browser/src/sdk.ts

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,17 @@ import { browserApiErrorsIntegration } from './integrations/trycatch';
2929
import { defaultStackParser } from './stack-parsers';
3030
import { makeFetchTransport, makeXHRTransport } from './transports';
3131

32-
/** @deprecated Use `getDefaultIntegrations(options)` instead. */
33-
export const defaultIntegrations = [
34-
inboundFiltersIntegration(),
35-
functionToStringIntegration(),
36-
browserApiErrorsIntegration(),
37-
breadcrumbsIntegration(),
38-
globalHandlersIntegration(),
39-
linkedErrorsIntegration(),
40-
dedupeIntegration(),
41-
httpContextIntegration(),
42-
];
43-
4432
/** Get the default integrations for the browser SDK. */
4533
export function getDefaultIntegrations(_options: Options): Integration[] {
46-
// We return a copy of the defaultIntegrations here to avoid mutating this
4734
return [
48-
// eslint-disable-next-line deprecation/deprecation
49-
...defaultIntegrations,
35+
inboundFiltersIntegration(),
36+
functionToStringIntegration(),
37+
browserApiErrorsIntegration(),
38+
breadcrumbsIntegration(),
39+
globalHandlersIntegration(),
40+
linkedErrorsIntegration(),
41+
dedupeIntegration(),
42+
httpContextIntegration(),
5043
];
5144
}
5245

‎packages/bun/src/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ export {
112112

113113
export { BunClient } from './client';
114114
export {
115-
// eslint-disable-next-line deprecation/deprecation
116-
defaultIntegrations,
117115
getDefaultIntegrations,
118116
init,
119117
} from './sdk';

‎packages/bun/src/sdk.ts

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,28 @@ import { bunServerIntegration } from './integrations/bunserver';
2121
import { makeFetchTransport } from './transports';
2222
import type { BunOptions } from './types';
2323

24-
/** @deprecated Use `getDefaultIntegrations(options)` instead. */
25-
export const defaultIntegrations = [
26-
// Common
27-
inboundFiltersIntegration(),
28-
functionToStringIntegration(),
29-
linkedErrorsIntegration(),
30-
requestDataIntegration(),
31-
// Native Wrappers
32-
consoleIntegration(),
33-
httpIntegration(),
34-
nativeNodeFetchintegration(),
35-
// Global Handlers # TODO (waiting for https://github.com/oven-sh/bun/issues/5091)
36-
// new NodeIntegrations.OnUncaughtException(),
37-
// new NodeIntegrations.OnUnhandledRejection(),
38-
// Event Info
39-
contextLinesIntegration(),
40-
nodeContextIntegration(),
41-
modulesIntegration(),
42-
// Bun Specific
43-
bunServerIntegration(),
44-
];
45-
4624
/** Get the default integrations for the Bun SDK. */
4725
export function getDefaultIntegrations(_options: Options): Integration[] {
4826
// We return a copy of the defaultIntegrations here to avoid mutating this
4927
return [
50-
// eslint-disable-next-line deprecation/deprecation
51-
...defaultIntegrations,
28+
// Common
29+
inboundFiltersIntegration(),
30+
functionToStringIntegration(),
31+
linkedErrorsIntegration(),
32+
requestDataIntegration(),
33+
// Native Wrappers
34+
consoleIntegration(),
35+
httpIntegration(),
36+
nativeNodeFetchintegration(),
37+
// Global Handlers # TODO (waiting for https://github.com/oven-sh/bun/issues/5091)
38+
// new NodeIntegrations.OnUncaughtException(),
39+
// new NodeIntegrations.OnUnhandledRejection(),
40+
// Event Info
41+
contextLinesIntegration(),
42+
nodeContextIntegration(),
43+
modulesIntegration(),
44+
// Bun Specific
45+
bunServerIntegration(),
5246
];
5347
}
5448

‎packages/deno/src/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ export type { SpanStatusType } from '@sentry/core';
8787
export { DenoClient } from './client';
8888

8989
export {
90-
// eslint-disable-next-line deprecation/deprecation
91-
defaultIntegrations,
9290
getDefaultIntegrations,
9391
init,
9492
} from './sdk';

‎packages/deno/src/sdk.ts

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,26 @@ import { normalizePathsIntegration } from './integrations/normalizepaths';
1313
import { makeFetchTransport } from './transports';
1414
import type { DenoOptions } from './types';
1515

16-
/** @deprecated Use `getDefaultIntegrations(options)` instead. */
17-
export const defaultIntegrations = [
18-
// Common
19-
inboundFiltersIntegration(),
20-
functionToStringIntegration(),
21-
linkedErrorsIntegration(),
22-
// From Browser
23-
dedupeIntegration(),
24-
breadcrumbsIntegration({
25-
dom: false,
26-
history: false,
27-
xhr: false,
28-
}),
29-
// Deno Specific
30-
denoContextIntegration(),
31-
contextLinesIntegration(),
32-
normalizePathsIntegration(),
33-
globalHandlersIntegration(),
34-
];
35-
3616
/** Get the default integrations for the Deno SDK. */
3717
export function getDefaultIntegrations(_options: Options): Integration[] {
3818
// We return a copy of the defaultIntegrations here to avoid mutating this
3919
return [
40-
// eslint-disable-next-line deprecation/deprecation
41-
...defaultIntegrations,
20+
// Common
21+
inboundFiltersIntegration(),
22+
functionToStringIntegration(),
23+
linkedErrorsIntegration(),
24+
// From Browser
25+
dedupeIntegration(),
26+
breadcrumbsIntegration({
27+
dom: false,
28+
history: false,
29+
xhr: false,
30+
}),
31+
// Deno Specific
32+
denoContextIntegration(),
33+
contextLinesIntegration(),
34+
normalizePathsIntegration(),
35+
globalHandlersIntegration(),
4236
];
4337
}
4438

‎packages/nextjs/src/index.types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export declare const Integrations: undefined; // TODO(v8): Remove this line. Can
2323

2424
export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
2525

26-
export declare const defaultIntegrations: Integration[];
2726
export declare const getDefaultIntegrations: (options: Options) => Integration[];
2827
export declare const defaultStackParser: StackParser;
2928

‎packages/node/src/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ export { autoDiscoverNodePerformanceMonitoringIntegrations } from './tracing';
9494
export { NodeClient } from './client';
9595
export { makeNodeTransport } from './transports';
9696
export {
97-
// eslint-disable-next-line deprecation/deprecation
98-
defaultIntegrations,
9997
getDefaultIntegrations,
10098
init,
10199
defaultStackParser,

‎packages/node/src/sdk.ts

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,36 +37,30 @@ import { createGetModuleFromFilename } from './module';
3737
import { makeNodeTransport } from './transports';
3838
import type { NodeClientOptions, NodeOptions } from './types';
3939

40-
/** @deprecated Use `getDefaultIntegrations(options)` instead. */
41-
export const defaultIntegrations = [
42-
// Common
43-
inboundFiltersIntegration(),
44-
functionToStringIntegration(),
45-
linkedErrorsIntegration(),
46-
requestDataIntegration(),
47-
// Native Wrappers
48-
consoleIntegration(),
49-
httpIntegration(),
50-
nativeNodeFetchintegration(),
51-
// Global Handlers
52-
onUncaughtExceptionIntegration(),
53-
onUnhandledRejectionIntegration(),
54-
// Event Info
55-
contextLinesIntegration(),
56-
localVariablesIntegration(),
57-
nodeContextIntegration(),
58-
modulesIntegration(),
59-
];
60-
6140
/** Get the default integrations for the Node SDK. */
6241
export function getDefaultIntegrations(_options: Options): Integration[] {
6342
const carrier = getMainCarrier();
6443

6544
const autoloadedIntegrations = carrier.__SENTRY__?.integrations || [];
6645

6746
return [
68-
// eslint-disable-next-line deprecation/deprecation
69-
...defaultIntegrations,
47+
// Common
48+
inboundFiltersIntegration(),
49+
functionToStringIntegration(),
50+
linkedErrorsIntegration(),
51+
requestDataIntegration(),
52+
// Native Wrappers
53+
consoleIntegration(),
54+
httpIntegration(),
55+
nativeNodeFetchintegration(),
56+
// Global Handlers
57+
onUncaughtExceptionIntegration(),
58+
onUnhandledRejectionIntegration(),
59+
// Event Info
60+
contextLinesIntegration(),
61+
localVariablesIntegration(),
62+
nodeContextIntegration(),
63+
modulesIntegration(),
7064
...autoloadedIntegrations,
7165
];
7266
}

‎packages/remix/src/index.server.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ export {
5050
withIsolationScope,
5151
autoDiscoverNodePerformanceMonitoringIntegrations,
5252
makeNodeTransport,
53-
// eslint-disable-next-line deprecation/deprecation
54-
defaultIntegrations,
5553
getDefaultIntegrations,
5654
defaultStackParser,
5755
flush,

‎packages/remix/src/index.types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export declare const Integrations: typeof clientSdk.Integrations & typeof server
1818

1919
export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
2020

21-
export declare const defaultIntegrations: Integration[];
2221
export declare const getDefaultIntegrations: (options: Options) => Integration[];
2322
export declare const defaultStackParser: StackParser;
2423

‎packages/serverless/src/awslambda.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
captureException,
99
captureMessage,
1010
continueTrace,
11-
defaultIntegrations as nodeDefaultIntegrations,
1211
flush,
1312
getCurrentScope,
1413
getDefaultIntegrations as getNodeDefaultIntegrations,
@@ -66,13 +65,6 @@ export interface WrapperOptions {
6665
startTrace: boolean;
6766
}
6867

69-
/** @deprecated Use `getDefaultIntegrations(options)` instead. */
70-
export const defaultIntegrations: Integration[] = [
71-
// eslint-disable-next-line deprecation/deprecation
72-
...nodeDefaultIntegrations,
73-
awsServicesIntegration({ optional: true }),
74-
];
75-
7668
/** Get the default integrations for the AWSLambda SDK. */
7769
export function getDefaultIntegrations(options: Options): Integration[] {
7870
return [...getNodeDefaultIntegrations(options), awsServicesIntegration({ optional: true })];

‎packages/serverless/src/gcpfunction/index.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
import type { NodeOptions } from '@sentry/node';
2-
import {
3-
SDK_VERSION,
4-
defaultIntegrations as defaultNodeIntegrations,
5-
getDefaultIntegrations as getDefaultNodeIntegrations,
6-
init as initNode,
7-
} from '@sentry/node';
2+
import { SDK_VERSION, getDefaultIntegrations as getDefaultNodeIntegrations, init as initNode } from '@sentry/node';
83
import type { Integration, Options, SdkMetadata } from '@sentry/types';
94

105
import { googleCloudGrpcIntegration } from '../google-cloud-grpc';
@@ -14,14 +9,6 @@ export * from './http';
149
export * from './events';
1510
export * from './cloud_events';
1611

17-
/** @deprecated Use `getDefaultIntegrations(options)` instead. */
18-
export const defaultIntegrations: Integration[] = [
19-
// eslint-disable-next-line deprecation/deprecation
20-
...defaultNodeIntegrations,
21-
googleCloudHttpIntegration({ optional: true }), // We mark this integration optional since '@google-cloud/common' module could be missing.
22-
googleCloudGrpcIntegration({ optional: true }), // We mark this integration optional since 'google-gax' module could be missing.
23-
];
24-
2512
/** Get the default integrations for the GCP SDK. */
2613
export function getDefaultIntegrations(options: Options): Integration[] {
2714
return [

‎packages/serverless/src/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ export {
5353
NodeClient,
5454
makeNodeTransport,
5555
close,
56-
// eslint-disable-next-line deprecation/deprecation
57-
defaultIntegrations,
5856
getDefaultIntegrations,
5957
defaultStackParser,
6058
flush,

‎packages/sveltekit/src/index.types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ export declare const Integrations: typeof clientSdk.Integrations & typeof server
4242

4343
export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
4444

45-
export declare const defaultIntegrations: Integration[];
4645
export declare const getDefaultIntegrations: (options: Options) => Integration[];
4746
export declare const defaultStackParser: StackParser;
4847

‎packages/sveltekit/src/server/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ export {
4545
withIsolationScope,
4646
autoDiscoverNodePerformanceMonitoringIntegrations,
4747
makeNodeTransport,
48-
// eslint-disable-next-line deprecation/deprecation
49-
defaultIntegrations,
5048
getDefaultIntegrations,
5149
defaultStackParser,
5250
flush,

‎packages/vercel-edge/src/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ export type { SpanStatusType } from '@sentry/core';
8383

8484
export { VercelEdgeClient } from './client';
8585
export {
86-
// eslint-disable-next-line deprecation/deprecation
87-
defaultIntegrations,
8886
getDefaultIntegrations,
8987
init,
9088
} from './sdk';

‎packages/vercel-edge/src/sdk.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,13 @@ declare const process: {
2222

2323
const nodeStackParser = createStackParser(nodeStackLineParser());
2424

25-
/** @deprecated Use `getDefaultIntegrations(options)` instead. */
26-
export const defaultIntegrations = [
27-
inboundFiltersIntegration(),
28-
functionToStringIntegration(),
29-
linkedErrorsIntegration(),
30-
winterCGFetchIntegration(),
31-
];
32-
3325
/** Get the default integrations for the browser SDK. */
3426
export function getDefaultIntegrations(options: Options): Integration[] {
3527
return [
36-
// eslint-disable-next-line deprecation/deprecation
37-
...defaultIntegrations,
28+
inboundFiltersIntegration(),
29+
functionToStringIntegration(),
30+
linkedErrorsIntegration(),
31+
winterCGFetchIntegration(),
3832
...(options.sendDefaultPii ? [requestDataIntegration()] : []),
3933
];
4034
}

0 commit comments

Comments
 (0)