Address feedback

n8n-io · Jan 8, 2025 · 6fae9e4 · 6fae9e4
1 parent 6b63020
commit 6fae9e4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/packages/@n8n/task-runner/src/start.ts b/packages/@n8n/task-runner/src/start.ts
@@ -59,7 +59,14 @@ void (async function start() {
 	if (dsn) {
 		const { ErrorReporter } = await import('n8n-core');
 		errorReporter = Container.get(ErrorReporter);
-		await errorReporter.init({ serverType: 'task_runner', ...config.sentryConfig });
+		const { deploymentName, environment, n8nVersion } = config.sentryConfig;
+		await errorReporter.init({
+			serverType: 'task_runner',
+			dsn,
+			serverName: deploymentName,
+			environment,
+			release: n8nVersion,
+		});
 	}
 
 	runner = new JsTaskRunner(config);

diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts
@@ -64,6 +64,9 @@ export abstract class BaseCommand extends Command {
 		await this.errorReporter.init({
 			serverType: this.instanceSettings.instanceType,
 			dsn: this.globalConfig.sentry.backendDsn,
+			environment: process.env.ENVIRONMENT ?? '',
+			release: process.env.N8N_VERSION ?? '',
+			serverName: process.env.DEPLOYMENT_NAME ?? '',
 		});
 		initExpressionEvaluator();
 

diff --git a/packages/core/src/error-reporter.ts b/packages/core/src/error-reporter.ts
@@ -12,9 +12,9 @@ import { Logger } from './logging/logger';
 type ErrorReporterInitOptions = {
 	serverType: InstanceType | 'task_runner';
 	dsn: string;
-	release?: string;
-	environment?: string;
-	serverName?: string;
+	release: string;
+	environment: string;
+	serverName: string;
 };
 
 @Service()
@@ -52,12 +52,12 @@ export class ErrorReporter {
 		await close(timeoutInMs);
 	}
 
-	async init(opts: ErrorReporterInitOptions) {
+	async init({ dsn, serverType, release, environment, serverName }: ErrorReporterInitOptions) {
 		process.on('uncaughtException', (error) => {
 			this.error(error);
 		});
 
-		if (!opts.dsn) return;
+		if (!dsn) return;
 
 		// Collect longer stacktraces
 		Error.stackTraceLimit = 50;
@@ -74,11 +74,11 @@ export class ErrorReporter {
 		];
 
 		init({
-			dsn: opts.dsn,
-			release: opts.release ?? process.env.N8N_VERSION,
-			environment: opts.environment ?? process.env.ENVIRONMENT,
+			dsn,
+			release,
+			environment,
 			enableTracing: false,
-			serverName: opts.serverName ?? process.env.DEPLOYMENT_NAME,
+			serverName,
 			beforeBreadcrumb: () => null,
 			beforeSend: this.beforeSend.bind(this) as NodeOptions['beforeSend'],
 			integrations: (integrations) => [
@@ -97,7 +97,7 @@ export class ErrorReporter {
 			],
 		});
 
-		setTag('server_type', opts.serverType);
+		setTag('server_type', serverType);
 
 		this.report = (error, options) => captureException(error, options);
 	}