getsentry · mydea · Jan 19, 2024 · Jan 18, 2024
diff --git a/packages/angular-ivy/src/sdk.ts b/packages/angular-ivy/src/sdk.ts
@@ -1,6 +1,7 @@
 import { VERSION } from '@angular/core';
 import type { BrowserOptions } from '@sentry/browser';
-import { SDK_VERSION, defaultIntegrations, init as browserInit, setContext } from '@sentry/browser';
+import { getDefaultIntegrations } from '@sentry/browser';
+import { SDK_VERSION, init as browserInit, setContext } from '@sentry/browser';
 import type { SdkMetadata } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
@@ -18,7 +19,7 @@ export function init(options: BrowserOptions): void {
     // see:
     //  - https://github.com/getsentry/sentry-javascript/issues/5417#issuecomment-1453407097
     //  - https://github.com/getsentry/sentry-javascript/issues/2744
-    defaultIntegrations: defaultIntegrations.filter(integration => {
+    defaultIntegrations: getDefaultIntegrations(options).filter(integration => {
       return integration.name !== 'TryCatch';
     }),
     ...options,

diff --git a/packages/angular/src/sdk.ts b/packages/angular/src/sdk.ts
@@ -1,6 +1,7 @@
 import { VERSION } from '@angular/core';
 import type { BrowserOptions } from '@sentry/browser';
-import { SDK_VERSION, defaultIntegrations, init as browserInit, setContext } from '@sentry/browser';
+import { getDefaultIntegrations } from '@sentry/browser';
+import { SDK_VERSION, init as browserInit, setContext } from '@sentry/browser';
 import type { SdkMetadata } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
@@ -18,7 +19,7 @@ export function init(options: BrowserOptions): void {
     // see:
     //  - https://github.com/getsentry/sentry-javascript/issues/5417#issuecomment-1453407097
     //  - https://github.com/getsentry/sentry-javascript/issues/2744
-    defaultIntegrations: defaultIntegrations.filter(integration => {
+    defaultIntegrations: getDefaultIntegrations(options).filter(integration => {
       return integration.name !== 'TryCatch';
     }),
     ...options,

diff --git a/packages/angular/test/sdk.test.ts b/packages/angular/test/sdk.test.ts
@@ -1,6 +1,6 @@
 import * as SentryBrowser from '@sentry/browser';
 
-import { defaultIntegrations, init } from '../src/index';
+import { getDefaultIntegrations, init } from '../src/index';
 
 describe('init', () => {
   it('sets the Angular version (if available) in the global scope', () => {
@@ -30,16 +30,23 @@ describe('init', () => {
       expect(options.defaultIntegrations).not.toContainEqual(expect.objectContaining({ name: 'TryCatch' }));
     });
 
-    it.each([false as const, defaultIntegrations])(
-      "doesn't filter if `defaultIntegrations` is set to %s",
-      defaultIntegrations => {
-        init({ defaultIntegrations });
+    it("doesn't filter if `defaultIntegrations` is set to `false`", () => {
+      init({ defaultIntegrations: false });
 
-        expect(browserInitSpy).toHaveBeenCalledTimes(1);
+      expect(browserInitSpy).toHaveBeenCalledTimes(1);
+
+      const options = browserInitSpy.mock.calls[0][0] || {};
+      expect(options.defaultIntegrations).toEqual(false);
+    });
+
+    it("doesn't filter if `defaultIntegrations` is overwritten", () => {
+      const defaultIntegrations = getDefaultIntegrations({});
+      init({ defaultIntegrations });
 
-        const options = browserInitSpy.mock.calls[0][0] || {};
-        expect(options.defaultIntegrations).toEqual(defaultIntegrations);
-      },
-    );
+      expect(browserInitSpy).toHaveBeenCalledTimes(1);
+
+      const options = browserInitSpy.mock.calls[0][0] || {};
+      expect(options.defaultIntegrations).toEqual(defaultIntegrations);
+    });
   });
 });
diff --git a/packages/astro/src/index.server.ts b/packages/astro/src/index.server.ts
@@ -52,7 +52,9 @@ export {
   withIsolationScope,
   autoDiscoverNodePerformanceMonitoringIntegrations,
   makeNodeTransport,
+  // eslint-disable-next-line deprecation/deprecation
   defaultIntegrations,
+  getDefaultIntegrations,
   defaultStackParser,
   // eslint-disable-next-line deprecation/deprecation
   lastEventId,

diff --git a/packages/astro/src/index.types.ts b/packages/astro/src/index.types.ts
@@ -17,6 +17,7 @@ export declare function init(options: Options | clientSdk.BrowserOptions | serve
 export declare const Integrations: typeof clientSdk.Integrations & typeof serverSdk.Integrations;
 
 export declare const defaultIntegrations: Integration[];
+export declare const getDefaultIntegrations: (options: Options) => Integration[];
 export declare const defaultStackParser: StackParser;
 
 export declare function close(timeout?: number | undefined): PromiseLike<boolean>;

diff --git a/packages/browser/src/exports.ts b/packages/browser/src/exports.ts
@@ -89,7 +89,9 @@ export {
 export { eventFromException, eventFromMessage, exceptionFromError } from './eventbuilder';
 export { createUserFeedbackEnvelope } from './userfeedback';
 export {
+  // eslint-disable-next-line deprecation/deprecation
   defaultIntegrations,
+  getDefaultIntegrations,
   forceLoad,
   init,
   onLoad,

diff --git a/packages/browser/src/sdk.ts b/packages/browser/src/sdk.ts
@@ -10,7 +10,7 @@ import {
   initAndBind,
   startSession,
 } from '@sentry/core';
-import type { UserFeedback } from '@sentry/types';
+import type { Integration, Options, UserFeedback } from '@sentry/types';
 import {
   addHistoryInstrumentationHandler,
   logger,
@@ -27,18 +27,28 @@ import { Breadcrumbs, Dedupe, GlobalHandlers, HttpContext, LinkedErrors, TryCatc
 import { defaultStackParser } from './stack-parsers';
 import { makeFetchTransport, makeXHRTransport } from './transports';
 
-/* eslint-disable deprecation/deprecation */
+/** @deprecated Use `getDefaultIntegrations(options)` instead. */
 export const defaultIntegrations = [
+  /* eslint-disable deprecation/deprecation */
   new InboundFilters(),
   new FunctionToString(),
+  /* eslint-enable deprecation/deprecation */
   new TryCatch(),
   new Breadcrumbs(),
   new GlobalHandlers(),
   new LinkedErrors(),
   new Dedupe(),
   new HttpContext(),
 ];
-/* eslint-enable deprecation/deprecation */
+
+/** Get the default integrations for the browser SDK. */
+export function getDefaultIntegrations(_options: Options): Integration[] {
+  // We return a copy of the defaultIntegrations here to avoid mutating this
+  return [
+    // eslint-disable-next-line deprecation/deprecation
+    ...defaultIntegrations,
+  ];
+}
 
 /**
  * A magic string that build tooling can leverage in order to inject a release value into the SDK.
@@ -104,7 +114,7 @@ declare const __SENTRY_RELEASE__: string | undefined;
  */
 export function init(options: BrowserOptions = {}): void {
   if (options.defaultIntegrations === undefined) {
-    options.defaultIntegrations = defaultIntegrations;
+    options.defaultIntegrations = getDefaultIntegrations(options);
   }
   if (options.release === undefined) {
     // This allows build tooling to find-and-replace __SENTRY_RELEASE__ to inject a release value

diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts
@@ -88,7 +88,12 @@ export type { SpanStatusType } from '@sentry/core';
 export { autoDiscoverNodePerformanceMonitoringIntegrations, cron } from '@sentry/node';
 
 export { BunClient } from './client';
-export { defaultIntegrations, init } from './sdk';
+export {
+  // eslint-disable-next-line deprecation/deprecation
+  defaultIntegrations,
+  getDefaultIntegrations,
+  init,
+} from './sdk';
 
 import { Integrations as CoreIntegrations } from '@sentry/core';
 import { Integrations as NodeIntegrations } from '@sentry/node';

diff --git a/packages/bun/src/sdk.ts b/packages/bun/src/sdk.ts
@@ -1,18 +1,21 @@
 /* eslint-disable max-lines */
 import { FunctionToString, InboundFilters, LinkedErrors } from '@sentry/core';
 import { Integrations as NodeIntegrations, init as initNode } from '@sentry/node';
+import type { Integration, Options } from '@sentry/types';
 
 import { BunClient } from './client';
 import { BunServer } from './integrations';
 import { makeFetchTransport } from './transports';
 import type { BunOptions } from './types';
 
-/* eslint-disable deprecation/deprecation */
+/** @deprecated Use `getDefaultIntegrations(options)` instead. */
 export const defaultIntegrations = [
+  /* eslint-disable deprecation/deprecation */
   // Common
   new InboundFilters(),
   new FunctionToString(),
   new LinkedErrors(),
+  /* eslint-enable deprecation/deprecation */
   // Native Wrappers
   new NodeIntegrations.Console(),
   new NodeIntegrations.Http(),
@@ -29,7 +32,15 @@ export const defaultIntegrations = [
   // Bun Specific
   new BunServer(),
 ];
-/* eslint-enable deprecation/deprecation */
+
+/** Get the default integrations for the Bun SDK. */
+export function getDefaultIntegrations(_options: Options): Integration[] {
+  // We return a copy of the defaultIntegrations here to avoid mutating this
+  return [
+    // eslint-disable-next-line deprecation/deprecation
+    ...defaultIntegrations,
+  ];
+}
 
 /**
  * The Sentry Bun SDK Client.
@@ -90,9 +101,9 @@ export function init(options: BunOptions = {}): void {
   options.clientClass = BunClient;
   options.transport = options.transport || makeFetchTransport;
 
-  options.defaultIntegrations =
-    options.defaultIntegrations === false
-      ? []
-      : [...(Array.isArray(options.defaultIntegrations) ? options.defaultIntegrations : defaultIntegrations)];
+  if (options.defaultIntegrations === undefined) {
+    options.defaultIntegrations = getDefaultIntegrations(options);
+  }
+
   initNode(options);
 }
diff --git a/packages/deno/src/index.ts b/packages/deno/src/index.ts
@@ -86,7 +86,12 @@ export type { SpanStatusType } from '@sentry/core';
 
 export { DenoClient } from './client';
 
-export { defaultIntegrations, init } from './sdk';
+export {
+  // eslint-disable-next-line deprecation/deprecation
+  defaultIntegrations,
+  getDefaultIntegrations,
+  init,
+} from './sdk';
 
 import { Integrations as CoreIntegrations } from '@sentry/core';
 

diff --git a/packages/deno/src/sdk.ts b/packages/deno/src/sdk.ts
@@ -2,20 +2,22 @@ import { Breadcrumbs, Dedupe } from '@sentry/browser';
 import type { ServerRuntimeClientOptions } from '@sentry/core';
 import { FunctionToString, InboundFilters, LinkedErrors } from '@sentry/core';
 import { getIntegrationsToSetup, initAndBind } from '@sentry/core';
-import type { StackParser } from '@sentry/types';
+import type { Integration, Options, StackParser } from '@sentry/types';
 import { createStackParser, nodeStackLineParser, stackParserFromStackParserOptions } from '@sentry/utils';
 
 import { DenoClient } from './client';
 import { ContextLines, DenoContext, GlobalHandlers, NormalizePaths } from './integrations';
 import { makeFetchTransport } from './transports';
 import type { DenoOptions } from './types';
 
-/* eslint-disable deprecation/deprecation */
+/** @deprecated Use `getDefaultIntegrations(options)` instead. */
 export const defaultIntegrations = [
+  /* eslint-disable deprecation/deprecation */
   // Common
   new InboundFilters(),
   new FunctionToString(),
   new LinkedErrors(),
+  /* eslint-enable deprecation/deprecation */
   // From Browser
   new Dedupe(),
   new Breadcrumbs({
@@ -29,7 +31,15 @@ export const defaultIntegrations = [
   new NormalizePaths(),
   new GlobalHandlers(),
 ];
-/* eslint-enable deprecation/deprecation */
+
+/** Get the default integrations for the Deno SDK. */
+export function getDefaultIntegrations(_options: Options): Integration[] {
+  // We return a copy of the defaultIntegrations here to avoid mutating this
+  return [
+    // eslint-disable-next-line deprecation/deprecation
+    ...defaultIntegrations,
+  ];
+}
 
 const defaultStackParser: StackParser = createStackParser(nodeStackLineParser());
 
@@ -89,10 +99,9 @@ const defaultStackParser: StackParser = createStackParser(nodeStackLineParser())
  * @see {@link DenoOptions} for documentation on configuration options.
  */
 export function init(options: DenoOptions = {}): void {
-  options.defaultIntegrations =
-    options.defaultIntegrations === false
-      ? []
-      : [...(Array.isArray(options.defaultIntegrations) ? options.defaultIntegrations : defaultIntegrations)];
+  if (options.defaultIntegrations === undefined) {
+    options.defaultIntegrations = getDefaultIntegrations(options);
+  }
 
   const clientOptions: ServerRuntimeClientOptions = {
     ...options,

diff --git a/packages/deno/test/mod.test.ts b/packages/deno/test/mod.test.ts
@@ -3,7 +3,7 @@ import { assertSnapshot } from 'https://deno.land/[email protected]/testing/snapshot.t
 
 import type { sentryTypes } from '../build-test/index.js';
 import { sentryUtils } from '../build-test/index.js';
-import { DenoClient, Hub, Scope, defaultIntegrations } from '../build/index.mjs';
+import { DenoClient, Hub, Scope, getDefaultIntegrations } from '../build/index.mjs';
 import { getNormalizedEvent } from './normalize.ts';
 import { makeTestTransport } from './transport.ts';
 
@@ -14,7 +14,7 @@ function getTestClient(
   const client = new DenoClient({
     dsn: 'https://[email protected]/5650507',
     debug: true,
-    integrations: [...defaultIntegrations, ...integrations],
+    integrations: [...getDefaultIntegrations({}), ...integrations],
     stackParser: sentryUtils.createStackParser(sentryUtils.nodeStackLineParser()),
     transport: makeTestTransport(envelope => {
       callback(getNormalizedEvent(envelope));

diff --git a/packages/nextjs/src/index.types.ts b/packages/nextjs/src/index.types.ts
@@ -25,6 +25,7 @@ export declare const Integrations: typeof clientSdk.Integrations &
   typeof edgeSdk.Integrations;
 
 export declare const defaultIntegrations: Integration[];
+export declare const getDefaultIntegrations: (options: Options) => Integration[];
 export declare const defaultStackParser: StackParser;
 
 export declare function getSentryRelease(fallback?: string): string | undefined;

diff --git a/packages/nextjs/test/clientSdk.test.ts b/packages/nextjs/test/clientSdk.test.ts
@@ -184,7 +184,7 @@ describe('Client init()', () => {
         });
 
         const reactInitOptions = reactInit.mock.calls[0][0] as ModifiedInitOptionsIntegrationFunction;
-        const materializedIntegrations = reactInitOptions.integrations(SentryReact.defaultIntegrations);
+        const materializedIntegrations = reactInitOptions.integrations(SentryReact.getDefaultIntegrations({}));
         const browserTracingIntegration = findIntegrationByName(materializedIntegrations, 'BrowserTracing');
 
         expect(browserTracingIntegration).toEqual(

diff --git a/packages/node-experimental/src/integrations/node-fetch.ts b/packages/node-experimental/src/integrations/node-fetch.ts
@@ -4,11 +4,14 @@ import type { Instrumentation } from '@opentelemetry/instrumentation';
 import { addBreadcrumb, hasTracingEnabled } from '@sentry/core';
 import { _INTERNAL, getClient, getSpanKind } from '@sentry/opentelemetry';
 import type { Integration } from '@sentry/types';
+import { parseSemver } from '@sentry/utils';
 
 import type { NodeExperimentalClient } from '../types';
 import { addOriginToSpan } from '../utils/addOriginToSpan';
 import { NodePerformanceIntegration } from './NodePerformanceIntegration';
 
+const NODE_VERSION: ReturnType<typeof parseSemver> = parseSemver(process.versions.node);
+
 interface NodeFetchOptions {
   /**
    * Whether breadcrumbs should be recorded for requests
@@ -65,6 +68,11 @@ export class NodeFetch extends NodePerformanceIntegration<NodeFetchOptions> impl
 
   /** @inheritDoc */
   public setupInstrumentation(): void | Instrumentation[] {
+    // Only add NodeFetch if Node >= 16, as previous versions do not support it
+    if (!NODE_VERSION.major || NODE_VERSION.major < 16) {
+      return;
+    }
+
     try {
       // eslint-disable-next-line @typescript-eslint/no-var-requires
       const { FetchInstrumentation } = require('opentelemetry-instrumentation-fetch-node');