feat: Export pluggable integrations from SDK packages (#11723)

This exports the functional integrations from `@sentry/integrations` from each package. In v8, the `@sentry/integrations` package will be gone, and the migration path is to just use it from the SDK package itself.
getsentry · Apr 23, 2024 · da5ba09 · da5ba09
1 parent 8be252e
commit da5ba09
Show file tree

Hide file tree

Showing 20 changed files with 97 additions and 3 deletions.
diff --git a/packages/astro/src/index.server.ts b/packages/astro/src/index.server.ts
@@ -83,6 +83,14 @@ export {
   functionToStringIntegration,
   inboundFiltersIntegration,
   linkedErrorsIntegration,
+  captureConsoleIntegration,
+  dedupeIntegration,
+  debugIntegration,
+  extraErrorDataIntegration,
+  reportingObserverIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
+  httpClientIntegration,
   Handlers,
   trpcMiddleware,
   setMeasurement,

diff --git a/packages/astro/src/index.types.ts b/packages/astro/src/index.types.ts
@@ -18,6 +18,7 @@ export declare function init(options: Options | clientSdk.BrowserOptions | serve
 export declare const Integrations: typeof clientSdk.Integrations & typeof serverSdk.Integrations;
 
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
+export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
 
 export declare const defaultIntegrations: Integration[];
 export declare const getDefaultIntegrations: (options: Options) => Integration[];

diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -33,6 +33,7 @@
     "@sentry-internal/replay-canvas": "7.111.0",
     "@sentry-internal/tracing": "7.111.0",
     "@sentry/core": "7.111.0",
+    "@sentry/integrations": "7.111.0",
     "@sentry/replay": "7.111.0",
     "@sentry/types": "7.111.0",
     "@sentry/utils": "7.111.0"

diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts
@@ -54,6 +54,18 @@ export {
   sendFeedback,
 } from '@sentry-internal/feedback';
 
+export {
+  captureConsoleIntegration,
+  dedupeIntegration,
+  debugIntegration,
+  extraErrorDataIntegration,
+  reportingObserverIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
+  httpClientIntegration,
+  contextLinesIntegration,
+} from '@sentry/integrations';
+
 export {
   // eslint-disable-next-line deprecation/deprecation
   BrowserTracing,

diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts
@@ -122,6 +122,14 @@ export {
   onUncaughtExceptionIntegration,
   onUnhandledRejectionIntegration,
   spotlightIntegration,
+  captureConsoleIntegration,
+  dedupeIntegration,
+  debugIntegration,
+  extraErrorDataIntegration,
+  reportingObserverIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
+  httpClientIntegration,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,

diff --git a/packages/deno/package.json b/packages/deno/package.json
@@ -19,6 +19,7 @@
   "dependencies": {
     "@sentry/browser": "7.111.0",
     "@sentry/core": "7.111.0",
+    "@sentry/integrations": "7.111.0",
     "@sentry/types": "7.111.0",
     "@sentry/utils": "7.111.0"
   },

diff --git a/packages/deno/src/index.ts b/packages/deno/src/index.ts
@@ -109,6 +109,16 @@ export {
 export { breadcrumbsIntegration, dedupeIntegration } from '@sentry/browser';
 import { Integrations as CoreIntegrations } from '@sentry/core';
 
+export {
+  captureConsoleIntegration,
+  debugIntegration,
+  extraErrorDataIntegration,
+  reportingObserverIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
+  httpClientIntegration,
+} from '@sentry/integrations';
+
 export { denoContextIntegration } from './integrations/context';
 export { globalHandlersIntegration } from './integrations/globalhandlers';
 export { normalizePathsIntegration } from './integrations/normalizepaths';

diff --git a/packages/integrations/package.json b/packages/integrations/package.json
@@ -35,7 +35,6 @@
     "localforage": "^1.8.1"
   },
   "devDependencies": {
-    "@sentry/browser": "7.111.0",
     "chai": "^4.1.2"
   },
   "scripts": {

diff --git a/packages/integrations/src/offline.ts b/packages/integrations/src/offline.ts
@@ -3,7 +3,7 @@
 /* eslint-disable deprecation/deprecation */
 import type { Event, EventProcessor, Hub, Integration } from '@sentry/types';
 import { GLOBAL_OBJ, logger, normalize, uuid4 } from '@sentry/utils';
-import localForage from 'localforage';
+import * as localForage from 'localforage';
 
 import { DEBUG_BUILD } from './debug-build';
 

diff --git a/packages/integrations/test/offline.test.ts b/packages/integrations/test/offline.test.ts
@@ -1,10 +1,12 @@
 /* eslint-disable deprecation/deprecation */
-import { WINDOW } from '@sentry/browser';
 import type { Event, EventProcessor, Hub, Integration, IntegrationClass } from '@sentry/types';
+import { GLOBAL_OBJ } from '@sentry/utils';
 
 import type { Item } from '../src/offline';
 import { Offline } from '../src/offline';
 
+const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;
+
 // mock localforage methods
 jest.mock('localforage', () => ({
   createInstance(_options: { name: string }): any {

diff --git a/packages/nextjs/src/index.types.ts b/packages/nextjs/src/index.types.ts
@@ -27,6 +27,7 @@ export declare const Integrations: typeof clientSdk.Integrations &
   typeof edgeSdk.Integrations;
 
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
+export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
 
 export declare const defaultIntegrations: Integration[];
 export declare const getDefaultIntegrations: (options: Options) => Integration[];

diff --git a/packages/node/package.json b/packages/node/package.json
@@ -31,6 +31,7 @@
   "dependencies": {
     "@sentry-internal/tracing": "7.111.0",
     "@sentry/core": "7.111.0",
+    "@sentry/integrations": "7.111.0",
     "@sentry/types": "7.111.0",
     "@sentry/utils": "7.111.0"
   },

diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
@@ -145,6 +145,17 @@ export const Integrations = {
   ...TracingIntegrations,
 };
 
+export {
+  captureConsoleIntegration,
+  dedupeIntegration,
+  debugIntegration,
+  extraErrorDataIntegration,
+  reportingObserverIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
+  httpClientIntegration,
+} from '@sentry/integrations';
+
 export { consoleIntegration } from './integrations/console';
 export { onUncaughtExceptionIntegration } from './integrations/onuncaughtexception';
 export { onUnhandledRejectionIntegration } from './integrations/onunhandledrejection';

diff --git a/packages/remix/src/index.server.ts b/packages/remix/src/index.server.ts
@@ -87,6 +87,14 @@ export {
   functionToStringIntegration,
   inboundFiltersIntegration,
   linkedErrorsIntegration,
+  captureConsoleIntegration,
+  dedupeIntegration,
+  debugIntegration,
+  extraErrorDataIntegration,
+  reportingObserverIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
+  httpClientIntegration,
   Handlers,
   trpcMiddleware,
   setMeasurement,

diff --git a/packages/remix/src/index.types.ts b/packages/remix/src/index.types.ts
@@ -17,6 +17,7 @@ export declare function init(options: RemixOptions): void;
 export declare const Integrations: typeof clientSdk.Integrations & typeof serverSdk.Integrations;
 
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
+export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
 
 export declare const defaultIntegrations: Integration[];
 export declare const getDefaultIntegrations: (options: Options) => Integration[];

diff --git a/packages/serverless/src/index.ts b/packages/serverless/src/index.ts
@@ -110,6 +110,14 @@ export {
   httpIntegration,
   nativeNodeFetchintegration,
   spotlightIntegration,
+  captureConsoleIntegration,
+  dedupeIntegration,
+  debugIntegration,
+  extraErrorDataIntegration,
+  reportingObserverIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
+  httpClientIntegration,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,

diff --git a/packages/sveltekit/src/index.types.ts b/packages/sveltekit/src/index.types.ts
@@ -41,6 +41,7 @@ export declare function wrapLoadWithSentry<T extends (...args: any) => any>(orig
 export declare const Integrations: typeof clientSdk.Integrations & typeof serverSdk.Integrations;
 
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
+export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
 
 export declare const defaultIntegrations: Integration[];
 export declare const getDefaultIntegrations: (options: Options) => Integration[];

diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
@@ -81,6 +81,14 @@ export {
   functionToStringIntegration,
   inboundFiltersIntegration,
   linkedErrorsIntegration,
+  captureConsoleIntegration,
+  dedupeIntegration,
+  debugIntegration,
+  extraErrorDataIntegration,
+  reportingObserverIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
+  httpClientIntegration,
   Handlers,
   trpcMiddleware,
   setMeasurement,

diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json
@@ -31,6 +31,7 @@
   "dependencies": {
     "@sentry-internal/tracing": "7.111.0",
     "@sentry/core": "7.111.0",
+    "@sentry/integrations": "7.111.0",
     "@sentry/types": "7.111.0",
     "@sentry/utils": "7.111.0"
   },

diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts
@@ -103,6 +103,18 @@ export {
   init,
 } from './sdk';
 
+export {
+  captureConsoleIntegration,
+  dedupeIntegration,
+  debugIntegration,
+  extraErrorDataIntegration,
+  reportingObserverIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
+  httpClientIntegration,
+  contextLinesIntegration,
+} from '@sentry/integrations';
+
 import { Integrations as CoreIntegrations, RequestData } from '@sentry/core';
 
 import { WinterCGFetch } from './integrations/wintercg-fetch';