From 404f8361e061e6f2ddc455196839f2f3fe7ccddc Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Wed, 26 Apr 2023 12:49:43 +0200
Subject: [PATCH 1/2] feat(node): Make Undici a default integration.

---
 packages/nextjs/src/server/index.ts        |  2 --
 packages/nextjs/test/serverSdk.test.ts     |  9 ---------
 packages/node/src/sdk.ts                   |  2 ++
 packages/sveltekit/src/server/sdk.ts       |  1 -
 packages/sveltekit/test/server/sdk.test.ts | 15 ---------------
 5 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts
index b22a6c977a78..dc036921e436 100644
--- a/packages/nextjs/src/server/index.ts
+++ b/packages/nextjs/src/server/index.ts
@@ -146,8 +146,6 @@ function addServerIntegrations(options: NodeOptions): void {
     });
   }
 
-  integrations = addOrUpdateIntegration(new Integrations.Undici(), integrations);
-
   options.integrations = integrations;
 }
 
diff --git a/packages/nextjs/test/serverSdk.test.ts b/packages/nextjs/test/serverSdk.test.ts
index 5867132075fd..1d2dd60d053c 100644
--- a/packages/nextjs/test/serverSdk.test.ts
+++ b/packages/nextjs/test/serverSdk.test.ts
@@ -164,15 +164,6 @@ describe('Server init()', () => {
       expect(consoleIntegration).toBeDefined();
     });
 
-    it('adds the Undici integration', () => {
-      init({});
-
-      const nodeInitOptions = nodeInit.mock.calls[0][0] as ModifiedInitOptions;
-      const undiciIntegration = findIntegrationByName(nodeInitOptions.integrations, 'Undici');
-
-      expect(undiciIntegration).toBeDefined();
-    });
-
     describe('`Http` integration', () => {
       it('adds `Http` integration with tracing enabled if `tracesSampleRate` is set', () => {
         init({ tracesSampleRate: 1.0 });
diff --git a/packages/node/src/sdk.ts b/packages/node/src/sdk.ts
index 2f6ec6787655..d0a02c746247 100644
--- a/packages/node/src/sdk.ts
+++ b/packages/node/src/sdk.ts
@@ -28,6 +28,7 @@ import {
   OnUncaughtException,
   OnUnhandledRejection,
   RequestData,
+  Undici,
 } from './integrations';
 import { getModule } from './module';
 import { makeNodeTransport } from './transports';
@@ -40,6 +41,7 @@ export const defaultIntegrations = [
   // Native Wrappers
   new Console(),
   new Http(),
+  new Undici(),
   // Global Handlers
   new OnUncaughtException(),
   new OnUnhandledRejection(),
diff --git a/packages/sveltekit/src/server/sdk.ts b/packages/sveltekit/src/server/sdk.ts
index 670f7879e7ba..276511c86e62 100644
--- a/packages/sveltekit/src/server/sdk.ts
+++ b/packages/sveltekit/src/server/sdk.ts
@@ -24,7 +24,6 @@ export function init(options: NodeOptions): void {
 }
 
 function addServerIntegrations(options: NodeOptions): void {
-  options.integrations = addOrUpdateIntegration(new Integrations.Undici(), options.integrations || []);
   options.integrations = addOrUpdateIntegration(
     new RewriteFrames({ iteratee: rewriteFramesIteratee }),
     options.integrations || [],
diff --git a/packages/sveltekit/test/server/sdk.test.ts b/packages/sveltekit/test/server/sdk.test.ts
index 5b1a924b6f1a..c68be548c91c 100644
--- a/packages/sveltekit/test/server/sdk.test.ts
+++ b/packages/sveltekit/test/server/sdk.test.ts
@@ -47,20 +47,5 @@ describe('Sentry server SDK', () => {
       // @ts-ignore need access to protected _tags attribute
       expect(currentScope._tags).toEqual({ runtime: 'node' });
     });
-
-    it('adds the Undici integration', () => {
-      init({});
-
-      expect(nodeInit).toHaveBeenCalledTimes(1);
-      expect(nodeInit).toHaveBeenCalledWith(
-        expect.objectContaining({
-          integrations: expect.arrayContaining([
-            expect.objectContaining({
-              name: 'Undici',
-            }),
-          ]),
-        }),
-      );
-    });
   });
 });

From fadd7955d04d23d512be8fe9644c390e153d77f3 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Wed, 26 Apr 2023 14:04:12 +0200
Subject: [PATCH 2/2] yarn fix

---
 packages/sveltekit/src/server/sdk.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sveltekit/src/server/sdk.ts b/packages/sveltekit/src/server/sdk.ts
index 276511c86e62..613fe8d834f0 100644
--- a/packages/sveltekit/src/server/sdk.ts
+++ b/packages/sveltekit/src/server/sdk.ts
@@ -1,7 +1,7 @@
 import { configureScope } from '@sentry/core';
 import { RewriteFrames } from '@sentry/integrations';
 import type { NodeOptions } from '@sentry/node';
-import { init as initNodeSdk, Integrations } from '@sentry/node';
+import { init as initNodeSdk } from '@sentry/node';
 import { addOrUpdateIntegration } from '@sentry/utils';
 
 import { applySdkMetadata } from '../common/metadata';