Skip to content

Commit e4e9d2e

Browse files
committed
ref: Move integrations to defaulIntegrations
1 parent 289e2be commit e4e9d2e

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

packages/core/src/integration.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ function filterDuplicates(integrations: Integration[]): Integration[] {
2323

2424
/** Gets integration to install */
2525
export function getIntegrationsToSetup(options: Options): Integration[] {
26-
const carrier = getMainCarrier();
27-
const autoloadedIntegrations = carrier.__SENTRY__?.integrations || [];
2826
const defaultIntegrations = (options.defaultIntegrations && [...options.defaultIntegrations]) || [];
2927
const userIntegrations = options.integrations;
3028

31-
let integrations: Integration[] = [...filterDuplicates(defaultIntegrations), ...autoloadedIntegrations];
29+
let integrations: Integration[] = [...filterDuplicates(defaultIntegrations)];
3230

3331
if (Array.isArray(userIntegrations)) {
3432
// Filter out integrations that are also included in user options

packages/node/src/sdk.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,11 @@ export const defaultIntegrations = [
7777
* @see {@link NodeOptions} for documentation on configuration options.
7878
*/
7979
export function init(options: NodeOptions = {}): void {
80+
const carrier = getMainCarrier();
81+
const autoloadedIntegrations = carrier.__SENTRY__?.integrations || [];
82+
8083
if (options.defaultIntegrations === undefined) {
81-
options.defaultIntegrations = defaultIntegrations;
84+
options.defaultIntegrations = [...defaultIntegrations, ...autoloadedIntegrations];
8285
}
8386

8487
if (options.dsn === undefined && process.env.SENTRY_DSN) {

0 commit comments

Comments
 (0)