feat: Move LinkedErrors integration to @sentry/core (#9404)

- Remove LinkedErrors from Node SDK and use Core SDK LinkedErrors instead - Use LinkedErrors integration in Vercel Edge SDK - Update Deno SDK to use LinkedErrors integration from Core instead of Browser In a future PR I'm going to remove browser specific `LinkedErrors` integration and make everything rely on implementation in Core SDK. This refactor came from two places 1. We noticed the Deno SDK relies on the browser SDK. This is not ideal, so this helps with that 2. We got feedback via customer that `LinkedErrors` was not available in `@sentry/vercel-edge`
getsentry · Oct 30, 2023 · 89a4d42 · 89a4d42
1 parent 4fc18b9
commit 89a4d42
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/packages/bun/src/sdk.ts b/packages/bun/src/sdk.ts
@@ -11,6 +11,7 @@ export const defaultIntegrations = [
   // Common
   new CoreIntegrations.InboundFilters(),
   new CoreIntegrations.FunctionToString(),
+  new CoreIntegrations.LinkedErrors(),
   // Native Wrappers
   new NodeIntegrations.Console(),
   new NodeIntegrations.Http(),
@@ -24,8 +25,6 @@ export const defaultIntegrations = [
   new NodeIntegrations.Context(),
   new NodeIntegrations.Modules(),
   new NodeIntegrations.RequestData(),
-  // Misc
-  new NodeIntegrations.LinkedErrors(),
   // Bun Specific
   new BunServer(),
 ];

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -48,7 +48,7 @@ export { makeOfflineTransport } from './transports/offline';
 export { makeMultiplexedTransport } from './transports/multiplexed';
 export { SDK_VERSION } from './version';
 export { getIntegrationsToSetup, addIntegration } from './integration';
-export { FunctionToString, InboundFilters } from './integrations';
+export { FunctionToString, InboundFilters, LinkedErrors } from './integrations';
 export { prepareEvent } from './utils/prepareEvent';
 export { createCheckInEnvelope } from './checkin';
 export { hasTracingEnabled } from './utils/hasTracingEnabled';

diff --git a/packages/core/src/integrations/index.ts b/packages/core/src/integrations/index.ts
@@ -1,2 +1,3 @@
 export { FunctionToString } from './functiontostring';
 export { InboundFilters } from './inboundfilters';
+export { LinkedErrors } from './linkederrors';
diff --git a/...ges/node/src/integrations/linkederrors.ts → ...ges/core/src/integrations/linkederrors.ts b/...ges/node/src/integrations/linkederrors.ts → ...ges/core/src/integrations/linkederrors.ts
@@ -14,7 +14,7 @@ export class LinkedErrors implements Integration {
   /**
    * @inheritDoc
    */
-  public readonly name: string = LinkedErrors.id;
+  public readonly name: string;
 
   /**
    * @inheritDoc
@@ -32,6 +32,7 @@ export class LinkedErrors implements Integration {
   public constructor(options: { key?: string; limit?: number } = {}) {
     this._key = options.key || DEFAULT_KEY;
     this._limit = options.limit || DEFAULT_LIMIT;
+    this.name = LinkedErrors.id;
   }
 
   /** @inheritdoc */

diff --git a/packages/deno/src/sdk.ts b/packages/deno/src/sdk.ts
@@ -1,4 +1,4 @@
-import { Breadcrumbs, Dedupe, LinkedErrors } from '@sentry/browser';
+import { Breadcrumbs, Dedupe } from '@sentry/browser';
 import type { ServerRuntimeClientOptions } from '@sentry/core';
 import { getIntegrationsToSetup, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
 import type { StackParser } from '@sentry/types';
@@ -13,9 +13,9 @@ export const defaultIntegrations = [
   // Common
   new CoreIntegrations.InboundFilters(),
   new CoreIntegrations.FunctionToString(),
+  new CoreIntegrations.LinkedErrors(),
   // From Browser
   new Dedupe(),
-  new LinkedErrors(),
   new Breadcrumbs({
     dom: false,
     history: false,

diff --git a/packages/deno/test/__snapshots__/mod.test.ts.snap b/packages/deno/test/__snapshots__/mod.test.ts.snap
@@ -140,8 +140,8 @@ snapshot[`captureException 1`] = `
     integrations: [
       "InboundFilters",
       "FunctionToString",
-      "Dedupe",
       "LinkedErrors",
+      "Dedupe",
       "Breadcrumbs",
       "DenoContext",
       "ContextLines",
@@ -200,8 +200,8 @@ snapshot[`captureMessage 1`] = `
     integrations: [
       "InboundFilters",
       "FunctionToString",
-      "Dedupe",
       "LinkedErrors",
+      "Dedupe",
       "Breadcrumbs",
       "DenoContext",
       "ContextLines",

diff --git a/packages/node-experimental/src/integrations/index.ts b/packages/node-experimental/src/integrations/index.ts
@@ -4,7 +4,6 @@ const {
   Console,
   OnUncaughtException,
   OnUnhandledRejection,
-  LinkedErrors,
   Modules,
   ContextLines,
   Context,
@@ -16,7 +15,6 @@ export {
   Console,
   OnUncaughtException,
   OnUnhandledRejection,
-  LinkedErrors,
   Modules,
   ContextLines,
   Context,

diff --git a/packages/node/src/integrations/index.ts b/packages/node/src/integrations/index.ts
@@ -2,7 +2,6 @@ export { Console } from './console';
 export { Http } from './http';
 export { OnUncaughtException } from './onuncaughtexception';
 export { OnUnhandledRejection } from './onunhandledrejection';
-export { LinkedErrors } from './linkederrors';
 export { Modules } from './modules';
 export { ContextLines } from './contextlines';
 export { Context } from './context';

diff --git a/packages/node/src/sdk.ts b/packages/node/src/sdk.ts
@@ -23,7 +23,6 @@ import {
   Context,
   ContextLines,
   Http,
-  LinkedErrors,
   LocalVariables,
   Modules,
   OnUncaughtException,
@@ -39,6 +38,7 @@ export const defaultIntegrations = [
   // Common
   new CoreIntegrations.InboundFilters(),
   new CoreIntegrations.FunctionToString(),
+  new CoreIntegrations.LinkedErrors(),
   // Native Wrappers
   new Console(),
   new Http(),
@@ -52,8 +52,6 @@ export const defaultIntegrations = [
   new Context(),
   new Modules(),
   new RequestData(),
-  // Misc
-  new LinkedErrors(),
 ];
 
 /**

diff --git a/packages/node/test/index.test.ts b/packages/node/test/index.test.ts
@@ -1,4 +1,4 @@
-import { getMainCarrier, initAndBind, runWithAsyncContext, SDK_VERSION } from '@sentry/core';
+import { getMainCarrier, initAndBind, LinkedErrors, runWithAsyncContext, SDK_VERSION } from '@sentry/core';
 import type { EventHint, Integration } from '@sentry/types';
 
 import type { Event, Scope } from '../src';
@@ -13,7 +13,7 @@ import {
   NodeClient,
 } from '../src';
 import { setNodeAsyncContextStrategy } from '../src/async';
-import { ContextLines, LinkedErrors } from '../src/integrations';
+import { ContextLines } from '../src/integrations';
 import { defaultStackParser } from '../src/sdk';
 import type { NodeClientOptions } from '../src/types';
 import { getDefaultNodeClientOptions } from './helper/node-client-options';

diff --git a/packages/vercel-edge/src/sdk.ts b/packages/vercel-edge/src/sdk.ts
@@ -13,7 +13,11 @@ declare const process: {
 
 const nodeStackParser = createStackParser(nodeStackLineParser());
 
-export const defaultIntegrations = [new CoreIntegrations.InboundFilters(), new CoreIntegrations.FunctionToString()];
+export const defaultIntegrations = [
+  new CoreIntegrations.InboundFilters(),
+  new CoreIntegrations.FunctionToString(),
+  new CoreIntegrations.LinkedErrors(),
+];
 
 /** Inits the Sentry NextJS SDK on the Edge Runtime. */
 export function init(options: VercelEdgeOptions = {}): void {