feat: Stop passing defaultIntegrations as client option

getsentry · Feb 6, 2025 · 10b494b · 10b494b
1 parent 24409e3
commit 10b494b
Show file tree

Hide file tree

Showing 56 changed files with 439 additions and 320 deletions.
diff --git a/.size-limit.js b/.size-limit.js
@@ -30,7 +30,13 @@ module.exports = [
       );
 
       config.optimization.minimize = true;
-      config.optimization.minimizer = [new TerserPlugin()];
+      config.optimization.minimizer = [
+        new TerserPlugin({
+          terserOptions: {
+            ecma: 'es2020',
+          },
+        }),
+      ];
 
       return config;
     },
@@ -69,7 +75,13 @@ module.exports = [
       );
 
       config.optimization.minimize = true;
-      config.optimization.minimizer = [new TerserPlugin()];
+      config.optimization.minimizer = [
+        new TerserPlugin({
+          terserOptions: {
+            ecma: 'es2020',
+          },
+        }),
+      ];
 
       return config;
     },
@@ -248,7 +260,13 @@ module.exports = [
       );
 
       config.optimization.minimize = true;
-      config.optimization.minimizer = [new TerserPlugin()];
+      config.optimization.minimizer = [
+        new TerserPlugin({
+          terserOptions: {
+            ecma: 'es2020',
+          },
+        }),
+      ];
 
       return config;
     },

diff --git a/packages/angular/src/sdk.ts b/packages/angular/src/sdk.ts
@@ -5,7 +5,7 @@ import {
   browserSessionIntegration,
   globalHandlersIntegration,
   httpContextIntegration,
-  init as browserInit,
+  initWithDefaultIntegrations,
   linkedErrorsIntegration,
   setContext,
 } from '@sentry/browser';
@@ -49,14 +49,14 @@ export function getDefaultIntegrations(_options: BrowserOptions = {}): Integrati
  */
 export function init(options: BrowserOptions): Client | undefined {
   const opts = {
-    defaultIntegrations: getDefaultIntegrations(),
     ...options,
   };
 
   applySdkMetadata(opts, 'angular');
 
   checkAndSetAngularVersion();
-  return browserInit(opts);
+
+  return initWithDefaultIntegrations(opts, getDefaultIntegrations);
 }
 
 function checkAndSetAngularVersion(): void {

diff --git a/packages/astro/src/client/sdk.ts b/packages/astro/src/client/sdk.ts
@@ -2,10 +2,10 @@ import type { BrowserOptions } from '@sentry/browser';
 import {
   browserTracingIntegration,
   getDefaultIntegrations as getBrowserDefaultIntegrations,
-  init as initBrowserSdk,
+  initWithDefaultIntegrations,
 } from '@sentry/browser';
-import { applySdkMetadata } from '@sentry/core';
 import type { Client, Integration } from '@sentry/core';
+import { applySdkMetadata } from '@sentry/core';
 
 // Tree-shakable guard to remove all code related to tracing
 declare const __SENTRY_TRACING__: boolean;
@@ -17,13 +17,12 @@ declare const __SENTRY_TRACING__: boolean;
  */
 export function init(options: BrowserOptions): Client | undefined {
   const opts = {
-    defaultIntegrations: getDefaultIntegrations(options),
     ...options,
   };
 
   applySdkMetadata(opts, 'astro', ['astro', 'browser']);
 
-  return initBrowserSdk(opts);
+  return initWithDefaultIntegrations(opts, getDefaultIntegrations);
 }
 
 function getDefaultIntegrations(options: BrowserOptions): Integration[] {

diff --git a/packages/astro/src/index.types.ts b/packages/astro/src/index.types.ts
@@ -14,6 +14,10 @@ import sentryAstro from './index.server';
 
 /** Initializes Sentry Astro SDK */
 export declare function init(options: Options | clientSdk.BrowserOptions | NodeOptions): Client | undefined;
+export declare function initWithDefaultIntegrations(
+  options: Options | clientSdk.BrowserOptions | NodeOptions,
+  getDefaultIntegrations: (options: Options) => Integration[],
+): Client | undefined;
 
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
 export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;

diff --git a/packages/astro/test/client/sdk.test.ts b/packages/astro/test/client/sdk.test.ts
@@ -1,6 +1,5 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
-import type { BrowserClient } from '@sentry/browser';
 import {
   browserTracingIntegration,
   getActiveSpan,
@@ -9,11 +8,11 @@ import {
   getIsolationScope,
 } from '@sentry/browser';
 import * as SentryBrowser from '@sentry/browser';
-import { SDK_VERSION, getClient } from '@sentry/browser';
+import { SDK_VERSION } from '@sentry/browser';
 
 import { init } from '../../src/client/sdk';
 
-const browserInit = vi.spyOn(SentryBrowser, 'init');
+const browserInit = vi.spyOn(SentryBrowser, 'initWithDefaultIntegrations');
 
 describe('Sentry client SDK', () => {
   describe('init', () => {
@@ -45,6 +44,7 @@ describe('Sentry client SDK', () => {
             },
           },
         }),
+        expect.any(Function),
       );
     });
 
@@ -54,45 +54,39 @@ describe('Sentry client SDK', () => {
         ['tracesSampler', { tracesSampler: () => 1.0 }],
         ['no tracing option set', {}],
       ])('adds browserTracingIntegration if tracing is enabled via %s', (_, tracingOptions) => {
-        init({
+        const client = init({
           dsn: 'https://[email protected]/1337',
           ...tracingOptions,
         });
 
-        const integrationsToInit = browserInit.mock.calls[0]![0]?.defaultIntegrations;
-        const browserTracing = getClient<BrowserClient>()?.getIntegrationByName('BrowserTracing');
-
-        expect(integrationsToInit).toContainEqual(expect.objectContaining({ name: 'BrowserTracing' }));
+        const browserTracing = client?.getIntegrationByName('BrowserTracing');
         expect(browserTracing).toBeDefined();
       });
 
       it("doesn't add browserTracingIntegration if `__SENTRY_TRACING__` is set to false", () => {
         (globalThis as any).__SENTRY_TRACING__ = false;
 
-        init({
+        const client = init({
           dsn: 'https://[email protected]/1337',
           tracesSampleRate: 1,
         });
 
-        const integrationsToInit = browserInit.mock.calls[0]![0]?.defaultIntegrations || [];
-        const browserTracing = getClient<BrowserClient>()?.getIntegrationByName('BrowserTracing');
-
-        expect(integrationsToInit).not.toContainEqual(expect.objectContaining({ name: 'BrowserTracing' }));
+        const browserTracing = client?.getIntegrationByName('BrowserTracing');
         expect(browserTracing).toBeUndefined();
 
         delete (globalThis as any).__SENTRY_TRACING__;
       });
 
       it('Overrides the automatically default browserTracingIntegration instance with a a user-provided browserTracingIntegration instance', () => {
-        init({
+        const client = init({
           dsn: 'https://[email protected]/1337',
           integrations: [
             browserTracingIntegration({ finalTimeout: 10, instrumentNavigation: false, instrumentPageLoad: false }),
           ],
           tracesSampleRate: 1,
         });
 
-        const browserTracing = getClient<BrowserClient>()?.getIntegrationByName('BrowserTracing');
+        const browserTracing = client?.getIntegrationByName('BrowserTracing');
         expect(browserTracing).toBeDefined();
 
         // no active span means the settings were respected

diff --git a/packages/aws-serverless/src/sdk.ts b/packages/aws-serverless/src/sdk.ts
@@ -17,7 +17,7 @@ import {
   flush,
   getCurrentScope,
   getDefaultIntegrationsWithoutPerformance,
-  initWithoutDefaultIntegrations,
+  initWithDefaultIntegrations,
   startSpanManual,
   withScope,
 } from '@sentry/node';
@@ -77,13 +77,12 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
  */
 export function init(options: NodeOptions = {}): NodeClient | undefined {
   const opts = {
-    defaultIntegrations: getDefaultIntegrations(options),
     ...options,
   };
 
   applySdkMetadata(opts, 'aws-serverless');
 
-  return initWithoutDefaultIntegrations(opts);
+  return initWithDefaultIntegrations(opts, getDefaultIntegrations);
 }
 
 /** */

diff --git a/packages/aws-serverless/test/sdk.test.ts b/packages/aws-serverless/test/sdk.test.ts
@@ -25,7 +25,7 @@ jest.mock('@sentry/node', () => {
   const original = jest.requireActual('@sentry/node');
   return {
     ...original,
-    initWithoutDefaultIntegrations: (options: unknown) => {
+    initWithDefaultIntegrations: (options: unknown) => {
       mockInit(options);
     },
     startInactiveSpan: (...args: unknown[]) => {

diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts
@@ -1,5 +1,7 @@
 export * from './exports';
 
+export { initWithDefaultIntegrations } from './sdk';
+
 export { reportingObserverIntegration } from './integrations/reportingobserver';
 export { httpClientIntegration } from './integrations/httpclient';
 export { contextLinesIntegration } from './integrations/contextlines';