chore(core): Upgrade backend @sentry packages to 8.42.0 (#12061)

n8n-io · Dec 10, 2024 · db09d0e · db09d0e
1 parent 43009b6
commit db09d0e
Show file tree

Hide file tree

Showing 10 changed files with 705 additions and 108 deletions.
diff --git a/packages/@n8n/task-runner/package.json b/packages/@n8n/task-runner/package.json
@@ -35,7 +35,6 @@
   },
   "dependencies": {
     "@n8n/config": "workspace:*",
-    "@sentry/integrations": "catalog:",
     "@sentry/node": "catalog:",
     "acorn": "8.14.0",
     "acorn-walk": "8.3.4",

diff --git a/packages/@n8n/task-runner/src/error-reporter.ts b/packages/@n8n/task-runner/src/error-reporter.ts
@@ -1,6 +1,12 @@
-import { RewriteFrames } from '@sentry/integrations';
-import { init, setTag, captureException, close } from '@sentry/node';
-import type { ErrorEvent, EventHint } from '@sentry/types';
+import {
+	init,
+	setTag,
+	captureException,
+	close,
+	rewriteFramesIntegration,
+	type EventHint,
+	type ErrorEvent,
+} from '@sentry/node';
 import * as a from 'assert/strict';
 import { createHash } from 'crypto';
 import { ApplicationError } from 'n8n-workflow';
@@ -52,7 +58,7 @@ export class ErrorReporter {
 			beforeSend: async (event, hint) => await this.beforeSend(event, hint),
 			integrations: (integrations) => [
 				...integrations.filter(({ name }) => ENABLED_INTEGRATIONS.includes(name)),
-				new RewriteFrames({ root: process.cwd() }),
+				rewriteFramesIntegration({ root: process.cwd() }),
 			],
 		});
 

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -98,7 +98,6 @@
     "@n8n_io/license-sdk": "2.13.1",
     "@oclif/core": "4.0.7",
     "@rudderstack/rudder-sdk-node": "2.0.9",
-    "@sentry/integrations": "catalog:",
     "@sentry/node": "catalog:",
     "aws4": "1.11.0",
     "axios": "catalog:",

diff --git a/packages/cli/src/__tests__/error-reporting.test.ts b/packages/cli/src/__tests__/error-reporting.test.ts
@@ -7,7 +7,6 @@ import { InternalServerError } from '@/errors/response-errors/internal-server.er
 
 const init = jest.fn();
 
-jest.mock('@sentry/integrations');
 jest.mock('@sentry/node', () => ({
 	init,
 	setTag: jest.fn(),

diff --git a/packages/cli/src/abstract-server.ts b/packages/cli/src/abstract-server.ts
@@ -94,11 +94,8 @@ export abstract class AbstractServer {
 		const { app } = this;
 
 		// Augment errors sent to Sentry
-		const {
-			Handlers: { requestHandler, errorHandler },
-		} = await import('@sentry/node');
-		app.use(requestHandler());
-		app.use(errorHandler());
+		const { setupExpressErrorHandler } = await import('@sentry/node');
+		setupExpressErrorHandler(app);
 	}
 
 	private setupCommonMiddlewares() {

diff --git a/packages/cli/src/error-reporting.ts b/packages/cli/src/error-reporting.ts
@@ -33,8 +33,7 @@ export const initErrorHandling = async () => {
 
 	const { init, captureException, setTag } = await import('@sentry/node');
 
-	const { RewriteFrames } = await import('@sentry/integrations');
-	const { Integrations } = await import('@sentry/node');
+	const { requestDataIntegration, rewriteFramesIntegration } = await import('@sentry/node');
 
 	const enabledIntegrations = [
 		'InboundFilters',
@@ -54,8 +53,8 @@ export const initErrorHandling = async () => {
 		beforeBreadcrumb: () => null,
 		integrations: (integrations) => [
 			...integrations.filter(({ name }) => enabledIntegrations.includes(name)),
-			new RewriteFrames({ root: process.cwd() }),
-			new Integrations.RequestData({
+			rewriteFramesIntegration({ root: process.cwd() }),
+			requestDataIntegration({
 				include: {
 					cookies: false,
 					data: false,

diff --git a/...cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.ts b/...cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.ts
@@ -48,7 +48,7 @@ export class MessageEventBusDestinationSentry
 			environment,
 			release: N8N_VERSION,
 			transport: Sentry.makeNodeTransport,
-			integrations: Sentry.defaultIntegrations,
+			integrations: Sentry.getDefaultIntegrations({}),
 			stackParser: Sentry.defaultStackParser,
 		});
 	}

diff --git a/packages/cli/src/runners/task-runner-server.ts b/packages/cli/src/runners/task-runner-server.ts
@@ -133,11 +133,8 @@ export class TaskRunnerServer {
 
 		// Augment errors sent to Sentry
 		if (this.globalConfig.sentry.backendDsn) {
-			const {
-				Handlers: { requestHandler, errorHandler },
-			} = await import('@sentry/node');
-			app.use(requestHandler());
-			app.use(errorHandler());
+			const { setupExpressErrorHandler } = await import('@sentry/node');
+			setupExpressErrorHandler(app);
 		}
 	}