From 43748a33aae39c379cdd713f497d4e0178170777 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Wed, 31 Jan 2024 13:00:07 +0100
Subject: [PATCH] feat(bun): Export `bunServerIntegration()`

And deprecate `new BunServer()`
---
 packages/bun/src/index.ts                  | 6 +++---
 packages/bun/src/integrations/bunserver.ts | 7 ++++++-
 packages/bun/src/integrations/index.ts     | 1 -
 packages/bun/src/sdk.ts                    | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 packages/bun/src/integrations/index.ts

diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts
index d793a1a93551..ffe316fd30ec 100644
--- a/packages/bun/src/index.ts
+++ b/packages/bun/src/index.ts
@@ -128,15 +128,15 @@ export {
 
 import { Integrations as CoreIntegrations } from '@sentry/core';
 import { Integrations as NodeIntegrations } from '@sentry/node';
-
-import * as BunIntegrations from './integrations';
+import { BunServer } from './integrations/bunserver';
+export { bunServerIntegration } from './integrations/bunserver';
 
 const INTEGRATIONS = {
   // eslint-disable-next-line deprecation/deprecation
   ...CoreIntegrations,
   // eslint-disable-next-line deprecation/deprecation
   ...NodeIntegrations,
-  ...BunIntegrations,
+  BunServer,
 };
 
 export { INTEGRATIONS as Integrations };
diff --git a/packages/bun/src/integrations/bunserver.ts b/packages/bun/src/integrations/bunserver.ts
index b1dc4c6892e0..e262cd4e70a4 100644
--- a/packages/bun/src/integrations/bunserver.ts
+++ b/packages/bun/src/integrations/bunserver.ts
@@ -5,6 +5,7 @@ import {
   captureException,
   continueTrace,
   convertIntegrationFnToClass,
+  defineIntegration,
   getCurrentScope,
   runWithAsyncContext,
   setHttpStatus,
@@ -15,7 +16,7 @@ import { getSanitizedUrlString, parseUrl } from '@sentry/utils';
 
 const INTEGRATION_NAME = 'BunServer';
 
-const bunServerIntegration = (() => {
+const _bunServerIntegration = (() => {
   return {
     name: INTEGRATION_NAME,
     setupOnce() {
@@ -24,8 +25,12 @@ const bunServerIntegration = (() => {
   };
 }) satisfies IntegrationFn;
 
+export const bunServerIntegration = defineIntegration(_bunServerIntegration);
+
 /**
  * Instruments `Bun.serve` to automatically create transactions and capture errors.
+ *
+ * @deprecated Use `bunServerIntegration()` instead.
  */
 // eslint-disable-next-line deprecation/deprecation
 export const BunServer = convertIntegrationFnToClass(INTEGRATION_NAME, bunServerIntegration);
diff --git a/packages/bun/src/integrations/index.ts b/packages/bun/src/integrations/index.ts
deleted file mode 100644
index 95d17cf80e66..000000000000
--- a/packages/bun/src/integrations/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { BunServer } from './bunserver';
diff --git a/packages/bun/src/sdk.ts b/packages/bun/src/sdk.ts
index 74150b72ef6f..f8dbcb99c0df 100644
--- a/packages/bun/src/sdk.ts
+++ b/packages/bun/src/sdk.ts
@@ -17,7 +17,7 @@ import {
 import type { Integration, Options } from '@sentry/types';
 
 import { BunClient } from './client';
-import { BunServer } from './integrations';
+import { bunServerIntegration } from './integrations/bunserver';
 import { makeFetchTransport } from './transports';
 import type { BunOptions } from './types';
 
@@ -41,7 +41,7 @@ export const defaultIntegrations = [
   nodeContextIntegration(),
   modulesIntegration(),
   // Bun Specific
-  new BunServer(),
+  bunServerIntegration(),
 ];
 
 /** Get the default integrations for the Bun SDK. */