refactor(core): Make Logger a service (no-changelog) (#7494)

2025-12-18 02:21:13 +00:00 · 2023-10-25 16:35:22 +02:00
parent db4e61ba24
commit 05586a900d
131 changed files with 761 additions and 919 deletions
--- a/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts
+++ b/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts
@@ -5,7 +5,7 @@ import * as utils from '../shared/utils/';
 import type { ExternalSecretsSettings, SecretsProviderState } from '@/Interfaces';
 import { Cipher } from 'n8n-core';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
-import Container from 'typedi';
+import { Container } from 'typedi';
 import { ExternalSecretsProviders } from '@/ExternalSecrets/ExternalSecretsProviders.ee';
 import {
 	DummyProvider,
@@ -17,6 +17,7 @@ import config from '@/config';
 import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
 import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import { jsonParse, type IDataObject } from 'n8n-workflow';
+import { mock } from 'jest-mock-extended';

 let authOwnerAgent: SuperAgentTest;
 let authMemberAgent: SuperAgentTest;
@@ -52,6 +53,7 @@ const resetManager = async () => {
 	Container.set(
 		ExternalSecretsManager,
 		new ExternalSecretsManager(
+			mock(),
 			Container.get(SettingsRepository),
 			licenseLike,
 			mockProvidersInstance,
--- a/packages/cli/test/integration/audit/credentials.risk.test.ts
+++ b/packages/cli/test/integration/audit/credentials.risk.test.ts
@@ -7,11 +7,6 @@ import { getRiskSection } from './utils';
 import * as testDb from '../shared/testDb';
 import { generateNanoId } from '@db/utils/generators';

-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
-
-LoggerProxy.init(getLogger());
-
 beforeAll(async () => {
 	await testDb.init();
 });
--- a/packages/cli/test/integration/audit/database.risk.test.ts
+++ b/packages/cli/test/integration/audit/database.risk.test.ts
@@ -10,11 +10,6 @@ import { getRiskSection, saveManualTriggerWorkflow } from './utils';
 import * as testDb from '../shared/testDb';
 import { generateNanoId } from '@db/utils/generators';

-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
-
-LoggerProxy.init(getLogger());
-
 beforeAll(async () => {
 	await testDb.init();
 });
--- a/packages/cli/test/integration/audit/filesystem.risk.test.ts
+++ b/packages/cli/test/integration/audit/filesystem.risk.test.ts
@@ -5,11 +5,6 @@ import { FILESYSTEM_INTERACTION_NODE_TYPES, FILESYSTEM_REPORT } from '@/audit/co
 import { getRiskSection, saveManualTriggerWorkflow } from './utils';
 import * as testDb from '../shared/testDb';

-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
-
-LoggerProxy.init(getLogger());
-
 beforeAll(async () => {
 	await testDb.init();
 });
--- a/packages/cli/test/integration/audit/instance.risk.test.ts
+++ b/packages/cli/test/integration/audit/instance.risk.test.ts
@@ -14,11 +14,6 @@ import { toReportTitle } from '@/audit/utils';
 import config from '@/config';
 import { generateNanoId } from '@db/utils/generators';

-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
-
-LoggerProxy.init(getLogger());
-
 beforeAll(async () => {
 	await testDb.init();

--- a/packages/cli/test/integration/audit/nodes.risk.test.ts
+++ b/packages/cli/test/integration/audit/nodes.risk.test.ts
@@ -1,4 +1,5 @@
 import { v4 as uuid } from 'uuid';
+import { Container } from 'typedi';
 import * as Db from '@/Db';
 import { audit } from '@/audit';
 import { OFFICIAL_RISKY_NODE_TYPES, NODES_REPORT } from '@/audit/constants';
@@ -9,12 +10,6 @@ import { mockInstance } from '../shared/utils/';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { NodeTypes } from '@/NodeTypes';
 import { CommunityPackagesService } from '@/services/communityPackages.service';
-import Container from 'typedi';
-
-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
-
-LoggerProxy.init(getLogger());

 const nodesAndCredentials = mockInstance(LoadNodesAndCredentials);
 nodesAndCredentials.getCustomDirectories.mockReturnValue([]);
--- a/packages/cli/test/integration/commands/import.cmd.test.ts
+++ b/packages/cli/test/integration/commands/import.cmd.test.ts
@@ -1,6 +1,4 @@
 import * as Config from '@oclif/config';
-import { mock } from 'jest-mock-extended';
-import { type ILogger, LoggerProxy } from 'n8n-workflow';

 import { InternalHooks } from '@/InternalHooks';
 import { ImportWorkflowsCommand } from '@/commands/import/workflow';
@@ -8,8 +6,6 @@ import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import * as testDb from '../shared/testDb';
 import { mockInstance } from '../shared/utils/';

-LoggerProxy.init(mock<ILogger>());
-
 beforeAll(async () => {
 	mockInstance(InternalHooks);
 	mockInstance(LoadNodesAndCredentials);
--- a/packages/cli/test/integration/commands/worker.cmd.test.ts
+++ b/packages/cli/test/integration/commands/worker.cmd.test.ts
@@ -2,9 +2,7 @@ import { mockInstance } from '../shared/utils/';
 import { Worker } from '@/commands/worker';
 import * as Config from '@oclif/config';
 import config from '@/config';
-import { LoggerProxy } from 'n8n-workflow';
 import { Telemetry } from '@/telemetry';
-import { getLogger } from '@/Logger';
 import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
 import { BinaryDataService } from 'n8n-core';
 import { CacheService } from '@/services/cache.service';
@@ -23,7 +21,6 @@ import { OrchestrationWorkerService } from '@/services/orchestration/worker/orch
 const oclifConfig: Config.IConfig = new Config.Config({ root: __dirname });

 beforeAll(async () => {
-	LoggerProxy.init(getLogger());
 	config.set('executions.mode', 'queue');
 	config.set('binaryDataManager.availableModes', 'filesystem');
 	mockInstance(Telemetry);
--- a/packages/cli/test/integration/ldap/ldap.api.test.ts
+++ b/packages/cli/test/integration/ldap/ldap.api.test.ts
@@ -1,8 +1,7 @@
 import type { SuperAgentTest } from 'supertest';
 import type { Entry as LdapUser } from 'ldapts';
 import { Not } from 'typeorm';
-import { type ILogger, jsonParse, LoggerProxy } from 'n8n-workflow';
-import { mock } from 'jest-mock-extended';
+import { jsonParse } from 'n8n-workflow';

 import config from '@/config';
 import * as Db from '@/Db';
@@ -27,8 +26,6 @@ let globalMemberRole: Role;
 let owner: User;
 let authOwnerAgent: SuperAgentTest;

-LoggerProxy.init(mock<ILogger>());
-
 const defaultLdapConfig = {
 	...LDAP_DEFAULT_CONFIGURATION,
 	loginEnabled: true,
--- a/packages/cli/test/integration/metrics.test.ts
+++ b/packages/cli/test/integration/metrics.test.ts
@@ -2,8 +2,8 @@ import { setupTestServer } from './shared/utils';
 import config from '@/config';
 import request from 'supertest';
 import Container from 'typedi';
-import { MetricsService } from '../../src/services/metrics.service';
-import { N8N_VERSION } from '../../src/constants';
+import { MetricsService } from '@/services/metrics.service';
+import { N8N_VERSION } from '@/constants';
 import { parse as semverParse } from 'semver';

 jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
--- a/packages/cli/test/integration/publicApi/executions.test.ts
+++ b/packages/cli/test/integration/publicApi/executions.test.ts
@@ -5,8 +5,6 @@ import type { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import { randomApiKey } from '../shared/random';
 import * as utils from '../shared/utils/';
 import * as testDb from '../shared/testDb';
-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';

 let owner: User;
 let user1: User;
@@ -16,8 +14,6 @@ let authUser1Agent: SuperAgentTest;
 let authUser2Agent: SuperAgentTest;
 let workflowRunner: ActiveWorkflowRunner;

-LoggerProxy.init(getLogger());
-
 const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });

 beforeAll(async () => {
--- a/packages/cli/test/integration/repositories/execution.repository.test.ts
+++ b/packages/cli/test/integration/repositories/execution.repository.test.ts
@@ -3,11 +3,9 @@ import * as Db from '@/Db';

 import * as testDb from '../shared/testDb';
 import type { ExecutionStatus } from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
-import type { ExecutionRepository } from '../../../src/databases/repositories';
-import type { ExecutionEntity } from '../../../src/databases/entities/ExecutionEntity';
-import { TIME } from '../../../src/constants';
+import type { ExecutionRepository } from '@/databases/repositories';
+import type { ExecutionEntity } from '@/databases/entities/ExecutionEntity';
+import { TIME } from '@/constants';

 describe('softDeleteOnPruningCycle()', () => {
 	const now = new Date();
@@ -16,7 +14,6 @@ describe('softDeleteOnPruningCycle()', () => {
 	let workflow: Awaited<ReturnType<typeof testDb.createWorkflow>>;

 	beforeAll(async () => {
-		LoggerProxy.init(getLogger());
 		await testDb.init();

 		const { Execution } = Db.collections;
--- a/packages/cli/test/integration/shared/utils/testServer.ts
+++ b/packages/cli/test/integration/shared/utils/testServer.ts
@@ -1,7 +1,6 @@
 import { Container } from 'typedi';
 import cookieParser from 'cookie-parser';
 import express from 'express';
-import { LoggerProxy } from 'n8n-workflow';
 import type superagent from 'superagent';
 import request from 'supertest';
 import { URL } from 'url';
@@ -13,7 +12,6 @@ import { workflowsController } from '@/workflows/workflows.controller';
 import { AUTH_COOKIE_NAME } from '@/constants';
 import { credentialsController } from '@/credentials/credentials.controller';
 import type { User } from '@db/entities/User';
-import { getLogger } from '@/Logger';
 import { loadPublicApiVersions } from '@/PublicApi/';
 import { issueJWT } from '@/auth/jwt';
 import { UserManagementMailer } from '@/UserManagement/email/UserManagementMailer';
@@ -61,6 +59,7 @@ import { UserService } from '@/services/user.service';
 import { executionsController } from '@/executions/executions.controller';
 import { WorkflowHistoryController } from '@/workflows/workflowHistory/workflowHistory.controller.ee';
 import { BinaryDataController } from '@/controllers/binaryData.controller';
+import { Logger } from '@/Logger';

 /**
 * Plugin to prefix a path segment into a request URL pathname.
@@ -137,8 +136,10 @@ export const setupTestServer = ({
 	app.use(rawBodyReader);
 	app.use(cookieParser());

-	const logger = getLogger();
-	LoggerProxy.init(logger);
+	// Mock all telemetry and logging
+	const logger = mockInstance(Logger);
+	mockInstance(InternalHooks);
+	mockInstance(PostHogClient);

 	const testServer: TestServer = {
 		app,
@@ -151,10 +152,6 @@ export const setupTestServer = ({
 	beforeAll(async () => {
 		await testDb.init();

-		// Mock all telemetry.
-		mockInstance(InternalHooks);
-		mockInstance(PostHogClient);
-
 		config.set('userManagement.jwtSecret', 'My JWT secret');
 		config.set('userManagement.isInstanceOwnerSetUp', true);

@@ -213,11 +210,7 @@ export const setupTestServer = ({
 						registerController(app, config, new EventBusControllerEE());
 						break;
 					case 'auth':
-						registerController(
-							app,
-							config,
-							new AuthController(config, logger, internalHooks, mfaService, userService),
-						);
+						registerController(app, config, Container.get(AuthController));
 						break;
 					case 'mfa':
 						registerController(app, config, new MFAController(mfaService));
@@ -240,11 +233,7 @@ export const setupTestServer = ({
 						);
 						registerController(app, config, Container.get(CommunityPackagesController));
 					case 'me':
-						registerController(
-							app,
-							config,
-							new MeController(logger, externalHooks, internalHooks, userService),
-						);
+						registerController(app, config, Container.get(MeController));
 						break;
 					case 'passwordReset':
 						registerController(
--- a/packages/cli/test/integration/webhooks.api.test.ts
+++ b/packages/cli/test/integration/webhooks.api.test.ts
@@ -2,12 +2,10 @@ import { readFileSync } from 'fs';
 import type { SuperAgentTest } from 'supertest';
 import { agent as testAgent } from 'supertest';
 import type { INodeType, INodeTypeDescription, IWebhookFunctions } from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';

 import { AbstractServer } from '@/AbstractServer';
 import { ExternalHooks } from '@/ExternalHooks';
 import { InternalHooks } from '@/InternalHooks';
-import { getLogger } from '@/Logger';
 import { NodeTypes } from '@/NodeTypes';
 import { Push } from '@/push';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
@@ -19,7 +17,6 @@ describe('Webhook API', () => {
 	mockInstance(ExternalHooks);
 	mockInstance(InternalHooks);
 	mockInstance(Push);
-	LoggerProxy.init(getLogger());

 	let agent: SuperAgentTest;

--- a/packages/cli/test/unit/ActiveExecutions.test.ts
+++ b/packages/cli/test/unit/ActiveExecutions.test.ts
@@ -6,6 +6,7 @@ import type { IExecuteResponsePromiseData, IRun } from 'n8n-workflow';
 import { createDeferredPromise } from 'n8n-workflow';
 import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
 import { ExecutionRepository } from '@db/repositories';
+import { mock } from 'jest-mock-extended';

 const FAKE_EXECUTION_ID = '15';
 const FAKE_SECOND_EXECUTION_ID = '20';
@@ -24,7 +25,7 @@ describe('ActiveExecutions', () => {
 	let activeExecutions: ActiveExecutions;

 	beforeEach(() => {
-		activeExecutions = new ActiveExecutions();
+		activeExecutions = new ActiveExecutions(mock());
 	});

 	afterEach(() => {
--- a/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
+++ b/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
@@ -3,7 +3,7 @@ import { mocked } from 'jest-mock';
 import { Container } from 'typedi';

 import type { INode } from 'n8n-workflow';
-import { LoggerProxy, NodeApiError, NodeOperationError, Workflow } from 'n8n-workflow';
+import { NodeApiError, NodeOperationError, Workflow } from 'n8n-workflow';

 import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import * as Db from '@/Db';
@@ -11,7 +11,6 @@ import { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { SharedWorkflow } from '@db/entities/SharedWorkflow';
 import { Role } from '@db/entities/Role';
 import { User } from '@db/entities/User';
-import { getLogger } from '@/Logger';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import { ExternalHooks } from '@/ExternalHooks';
@@ -147,7 +146,6 @@ describe('ActiveWorkflowRunner', () => {
 	const activeWorkflowRunner = Container.get(ActiveWorkflowRunner);

 	beforeAll(async () => {
-		LoggerProxy.init(getLogger());
 		variablesService.getAllCached.mockResolvedValue([]);
 	});

--- a/packages/cli/test/unit/ExternalSecrets/ExternalSecretsManager.test.ts
+++ b/packages/cli/test/unit/ExternalSecrets/ExternalSecretsManager.test.ts
@@ -13,6 +13,7 @@ import {
 	FailedProvider,
 	MockProviders,
 } from '../../shared/ExternalSecrets/utils';
+import { mock } from 'jest-mock-extended';

 describe('External Secrets Manager', () => {
 	const connectedDate = '2023-08-01T12:32:29.000Z';
@@ -48,7 +49,7 @@ describe('External Secrets Manager', () => {
 		});
 		license.isExternalSecretsEnabled.mockReturnValue(true);
 		settingsRepo.getEncryptedSecretsProviderSettings.mockResolvedValue(settings);
-		manager = new ExternalSecretsManager(settingsRepo, license, providersMock, cipher);
+		manager = new ExternalSecretsManager(mock(), settingsRepo, license, providersMock, cipher);
 	});

 	afterEach(() => {
--- a/packages/cli/test/unit/InternalHooks.test.ts
+++ b/packages/cli/test/unit/InternalHooks.test.ts
@@ -1,11 +1,8 @@
 import { Telemetry } from '@/telemetry';
-import { RoleService } from '@/services/role.service';
 import { InternalHooks } from '@/InternalHooks';
-import { NodeTypes } from '@/NodeTypes';
-import { ExecutionRepository } from '@/databases/repositories';
-import { EventsService } from '@/services/events.service';
 import { mockInstance } from '../integration/shared/utils';
 import type { IDiagnosticInfo } from '@/Interfaces';
+import { mock } from 'jest-mock-extended';

 jest.mock('@/telemetry');

@@ -15,13 +12,7 @@ let telemetry: Telemetry;
 describe('InternalHooks', () => {
 	beforeAll(() => {
 		telemetry = mockInstance(Telemetry);
-		internalHooks = new InternalHooks(
-			telemetry,
-			mockInstance(NodeTypes),
-			mockInstance(RoleService),
-			mockInstance(ExecutionRepository),
-			mockInstance(EventsService),
-		);
+		internalHooks = new InternalHooks(telemetry, mock(), mock(), mock(), mock(), mock());
 	});

 	it('Should be defined', () => {
@@ -49,6 +40,7 @@ describe('InternalHooks', () => {
 			saml_enabled: true,
 			licensePlanName,
 			licenseTenantId,
+			binary_data_s3: false,
 		};

 		const parameters = {
--- a/packages/cli/test/unit/License.test.ts
+++ b/packages/cli/test/unit/License.test.ts
@@ -2,6 +2,7 @@ import { LicenseManager } from '@n8n_io/license-sdk';
 import { InstanceSettings } from 'n8n-core';
 import config from '@/config';
 import { License } from '@/License';
+import { Logger } from '@/Logger';
 import { N8N_VERSION } from '@/constants';
 import { mockInstance } from '../integration/shared/utils';

@@ -23,10 +24,11 @@ describe('License', () => {
 	});

 	let license: License;
+	const logger = mockInstance(Logger);
 	const instanceSettings = mockInstance(InstanceSettings, { instanceId: MOCK_INSTANCE_ID });

 	beforeEach(async () => {
-		license = new License(instanceSettings);
+		license = new License(logger, instanceSettings);
 		await license.init();
 	});

@@ -38,7 +40,7 @@ describe('License', () => {
 			renewOnInit: true,
 			deviceFingerprint: expect.any(Function),
 			productIdentifier: `n8n-${N8N_VERSION}`,
-			logger: expect.anything(),
+			logger,
 			loadCertStr: expect.any(Function),
 			saveCertStr: expect.any(Function),
 			onFeatureChange: expect.any(Function),
@@ -49,7 +51,7 @@ describe('License', () => {
 	});

 	test('initializes license manager for worker', async () => {
-		license = new License(instanceSettings);
+		license = new License(logger, instanceSettings);
 		await license.init('worker');
 		expect(LicenseManager).toHaveBeenCalledWith({
 			autoRenewEnabled: false,
@@ -58,7 +60,7 @@ describe('License', () => {
 			renewOnInit: false,
 			deviceFingerprint: expect.any(Function),
 			productIdentifier: `n8n-${N8N_VERSION}`,
-			logger: expect.anything(),
+			logger,
 			loadCertStr: expect.any(Function),
 			saveCertStr: expect.any(Function),
 			onFeatureChange: expect.any(Function),
--- a/packages/cli/test/unit/PermissionChecker.test.ts
+++ b/packages/cli/test/unit/PermissionChecker.test.ts
@@ -1,8 +1,7 @@
 import { v4 as uuid } from 'uuid';
 import { Container } from 'typedi';
-import { mock } from 'jest-mock-extended';
-import type { ILogger, INodeTypes } from 'n8n-workflow';
-import { LoggerProxy, SubworkflowOperationError, Workflow } from 'n8n-workflow';
+import type { INodeTypes } from 'n8n-workflow';
+import { SubworkflowOperationError, Workflow } from 'n8n-workflow';

 import config from '@/config';
 import * as Db from '@/Db';
@@ -26,8 +25,6 @@ import * as testDb from '../integration/shared/testDb';
 import type { SaveCredentialFunction } from '../integration/shared/types';
 import { mockNodeTypesData } from './Helpers';

-LoggerProxy.init(mock<ILogger>());
-
 let mockNodeTypes: INodeTypes;
 let credentialOwnerRole: Role;
 let workflowOwnerRole: Role;
--- a/packages/cli/test/unit/SourceControl.test.ts
+++ b/packages/cli/test/unit/SourceControl.test.ts
@@ -15,8 +15,6 @@ import {
 	SOURCE_CONTROL_SSH_FOLDER,
 	SOURCE_CONTROL_GIT_FOLDER,
 } from '@/environments/sourceControl/constants';
-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
 import { constants as fsConstants, accessSync } from 'fs';
 import type { SourceControlledFile } from '@/environments/sourceControl/types/sourceControlledFile';
 import type { SourceControlPreferences } from '@/environments/sourceControl/types/sourceControlPreferences';
@@ -152,7 +150,6 @@ const pullResult: SourceControlledFile[] = [
 ];

 beforeAll(async () => {
-	LoggerProxy.init(getLogger());
 	Container.get(License).isSourceControlLicensed = () => true;
 	Container.get(SourceControlPreferencesService).getPreferences = () => ({
 		branchName: 'main',
--- a/packages/cli/test/unit/Telemetry.test.ts
+++ b/packages/cli/test/unit/Telemetry.test.ts
@@ -55,7 +55,7 @@ describe('Telemetry', () => {
 		const postHog = new PostHogClient(instanceSettings);
 		await postHog.init();

-		telemetry = new Telemetry(postHog, mock(), instanceSettings);
+		telemetry = new Telemetry(mock(), postHog, mock(), instanceSettings);
 		(telemetry as any).rudderStack = mockRudderStack;
 	});

--- a/packages/cli/test/unit/WorkflowHelpers.test.ts
+++ b/packages/cli/test/unit/WorkflowHelpers.test.ts
@@ -1,5 +1,5 @@
 import type { INode } from 'n8n-workflow';
-import { LoggerProxy, type Workflow } from 'n8n-workflow';
+import { type Workflow } from 'n8n-workflow';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import {
@@ -7,8 +7,7 @@ import {
 	getNodesWithInaccessibleCreds,
 	validateWorkflowCredentialUsage,
 } from '@/WorkflowHelpers';
-import { getLogger } from '@/Logger';
-import type { IWorkflowExecutionDataProcess } from '../../src/Interfaces';
+import type { IWorkflowExecutionDataProcess } from '@/Interfaces';

 const FIRST_CREDENTIAL_ID = '1';
 const SECOND_CREDENTIAL_ID = '2';
@@ -18,10 +17,6 @@ const NODE_WITH_NO_CRED = '0133467b-df4a-473d-9295-fdd9d01fa45a';
 const NODE_WITH_ONE_CRED = '4673f869-f2dc-4a33-b053-ca3193bc5226';
 const NODE_WITH_TWO_CRED = '9b4208bd-8f10-4a6a-ad3b-da47a326f7da';

-beforeAll(() => {
-	LoggerProxy.init(getLogger());
-});
-
 describe('WorkflowHelpers', () => {
 	describe('getNodesWithInaccessibleCreds', () => {
 		test('Should return an empty list for a workflow without nodes', () => {
--- a/packages/cli/test/unit/WorkflowRunner.test.ts
+++ b/packages/cli/test/unit/WorkflowRunner.test.ts
@@ -4,10 +4,10 @@ import * as utils from '../integration/shared/utils/';
 import { createWorkflow, createExecution } from '../integration/shared/testDb';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import { WorkflowHooks, type ExecutionError, type IWorkflowExecuteHooks } from 'n8n-workflow';
-import { Push } from '../../src/push';
+import { Push } from '@/push';
 import { mockInstance } from '../integration/shared/utils';
 import Container from 'typedi';
-import config from '../../src/config';
+import config from '@/config';

 let owner: User;
 let runner: WorkflowRunner;
--- a/packages/cli/test/unit/controllers/me.controller.test.ts
+++ b/packages/cli/test/unit/controllers/me.controller.test.ts
@@ -1,22 +1,24 @@
 import type { CookieOptions, Response } from 'express';
+import { Container } from 'typedi';
 import jwt from 'jsonwebtoken';
 import { mock, anyObject, captor } from 'jest-mock-extended';
-import type { ILogger } from 'n8n-workflow';
-import type { IExternalHooksClass, IInternalHooksClass, PublicUser } from '@/Interfaces';
+import type { PublicUser } from '@/Interfaces';
 import type { User } from '@db/entities/User';
 import { MeController } from '@/controllers';
 import { AUTH_COOKIE_NAME } from '@/constants';
 import { BadRequestError } from '@/ResponseHelper';
 import type { AuthenticatedRequest, MeRequest } from '@/requests';
+import { UserService } from '@/services/user.service';
+import { ExternalHooks } from '@/ExternalHooks';
+import { InternalHooks } from '@/InternalHooks';
 import { badPasswords } from '../shared/testData';
-import type { UserService } from '@/services/user.service';
+import { mockInstance } from '../../integration/shared/utils';

 describe('MeController', () => {
-	const logger = mock<ILogger>();
-	const externalHooks = mock<IExternalHooksClass>();
-	const internalHooks = mock<IInternalHooksClass>();
-	const userService = mock<UserService>();
-	const controller = new MeController(logger, externalHooks, internalHooks, userService);
+	const externalHooks = mockInstance(ExternalHooks);
+	const internalHooks = mockInstance(InternalHooks);
+	const userService = mockInstance(UserService);
+	const controller = Container.get(MeController);

 	describe('updateCurrentUser', () => {
 		it('should throw BadRequestError if email is missing in the payload', async () => {
--- a/packages/cli/test/unit/controllers/owner.controller.test.ts
+++ b/packages/cli/test/unit/controllers/owner.controller.test.ts
@@ -1,6 +1,5 @@
 import type { CookieOptions, Response } from 'express';
 import { anyObject, captor, mock } from 'jest-mock-extended';
-import type { ILogger } from 'n8n-workflow';
 import jwt from 'jsonwebtoken';
 import type { IInternalHooksClass } from '@/Interfaces';
 import type { User } from '@db/entities/User';
@@ -16,13 +15,12 @@ import { mockInstance } from '../../integration/shared/utils';

 describe('OwnerController', () => {
 	const config = mock<Config>();
-	const logger = mock<ILogger>();
 	const internalHooks = mock<IInternalHooksClass>();
 	const userService = mockInstance(UserService);
 	const settingsRepository = mock<SettingsRepository>();
 	const controller = new OwnerController(
 		config,
-		logger,
+		mock(),
 		internalHooks,
 		settingsRepository,
 		userService,
--- a/packages/cli/test/unit/middleware/listQuery.test.ts
+++ b/packages/cli/test/unit/middleware/listQuery.test.ts
@@ -1,6 +1,4 @@
 import { filterListQueryMiddleware } from '@/middlewares/listQuery/filter';
-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
 import { selectListQueryMiddleware } from '@/middlewares/listQuery/select';
 import { paginationListQueryMiddleware } from '@/middlewares/listQuery/pagination';
 import * as ResponseHelper from '@/ResponseHelper';
@@ -18,7 +16,6 @@ describe('List query middleware', () => {
 	beforeEach(() => {
 		jest.restoreAllMocks();

-		LoggerProxy.init(getLogger());
 		mockReq = { baseUrl: '/rest/workflows' } as ListQuery.Request;
 		mockRes = { status: () => ({ json: jest.fn() }) } as unknown as Response;
 		args = [mockReq, mockRes, nextFn];
--- a/packages/cli/test/unit/services/cache.service.test.ts
+++ b/packages/cli/test/unit/services/cache.service.test.ts
@@ -3,8 +3,6 @@ import { CacheService } from '@/services/cache.service';
 import type { MemoryCache } from 'cache-manager';
 import type { RedisCache } from 'cache-manager-ioredis-yet';
 import config from '@/config';
-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';

 const cacheService = Container.get(CacheService);

@@ -36,7 +34,6 @@ const testObject: TestObject = {

 describe('cacheService', () => {
 	beforeAll(async () => {
-		LoggerProxy.init(getLogger());
 		jest.mock('ioredis', () => {
 			const Redis = require('ioredis-mock');
 			if (typeof Redis === 'object') {
--- a/packages/cli/test/unit/services/events.service.test.ts
+++ b/packages/cli/test/unit/services/events.service.test.ts
@@ -1,5 +1,4 @@
-import type { IRun, WorkflowExecuteMode, ILogger } from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';
+import type { IRun, WorkflowExecuteMode } from 'n8n-workflow';
 import {
 	QueryFailedError,
 	type DataSource,
@@ -36,13 +35,13 @@ describe('EventsService', () => {
 	});
 	Object.assign(entityManager, { connection: dataSource });

-	LoggerProxy.init(mock<ILogger>());
 	config.set('diagnostics.enabled', true);
 	config.set('deployment.type', 'n8n-testing');
 	mocked(ownershipService.getWorkflowOwnerCached).mockResolvedValue(fakeUser);
 	const updateSettingsMock = jest.spyOn(userService, 'updateSettings').mockImplementation();

 	const eventsService = new EventsService(
+		mock(),
 		new WorkflowStatisticsRepository(dataSource),
 		ownershipService,
 	);
--- a/packages/cli/test/unit/services/orchestration.service.test.ts
+++ b/packages/cli/test/unit/services/orchestration.service.test.ts
@@ -1,7 +1,5 @@
 import Container from 'typedi';
 import config from '@/config';
-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
 import { OrchestrationMainService } from '@/services/orchestration/main/orchestration.main.service';
 import type { RedisServiceWorkerResponseObject } from '@/services/redis/RedisServiceCommands';
 import { eventBus } from '@/eventbus';
@@ -12,6 +10,7 @@ import { handleCommandMessageMain } from '@/services/orchestration/main/handleCo
 import { OrchestrationHandlerMainService } from '@/services/orchestration/main/orchestration.handler.main.service';
 import * as helpers from '@/services/orchestration/helpers';
 import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
+import { Logger } from '@/Logger';

 const os = Container.get(OrchestrationMainService);
 const handler = Container.get(OrchestrationHandlerMainService);
@@ -33,10 +32,10 @@ const workerRestartEventbusResponse: RedisServiceWorkerResponseObject = {
 };

 describe('Orchestration Service', () => {
+	const logger = mockInstance(Logger);
 	beforeAll(async () => {
 		mockInstance(RedisService);
 		mockInstance(ExternalSecretsManager);
-		LoggerProxy.init(getLogger());
 		jest.mock('ioredis', () => {
 			const Redis = require('ioredis-mock');
 			if (typeof Redis === 'object') {
@@ -52,7 +51,7 @@ describe('Orchestration Service', () => {
 				return new Redis(args);
 			};
 		});
-		jest.mock('../../../src/services/redis/RedisServicePubSubPublisher', () => {
+		jest.mock('@/services/redis/RedisServicePubSubPublisher', () => {
 			return jest.fn().mockImplementation(() => {
 				return {
 					init: jest.fn(),
@@ -62,7 +61,7 @@ describe('Orchestration Service', () => {
 				};
 			});
 		});
-		jest.mock('../../../src/services/redis/RedisServicePubSubSubscriber', () => {
+		jest.mock('@/services/redis/RedisServicePubSubSubscriber', () => {
 			return jest.fn().mockImplementation(() => {
 				return {
 					subscribeToCommandChannel: jest.fn(),
@@ -75,8 +74,8 @@ describe('Orchestration Service', () => {
 	});

 	afterAll(async () => {
-		jest.mock('../../../src/services/redis/RedisServicePubSubPublisher').restoreAllMocks();
-		jest.mock('../../../src/services/redis/RedisServicePubSubSubscriber').restoreAllMocks();
+		jest.mock('@/services/redis/RedisServicePubSubPublisher').restoreAllMocks();
+		jest.mock('@/services/redis/RedisServicePubSubSubscriber').restoreAllMocks();
 		await os.shutdown();
 	});

@@ -96,7 +95,6 @@ describe('Orchestration Service', () => {
 	});

 	test('should handle command messages from others', async () => {
-		jest.spyOn(LoggerProxy, 'error');
 		const responseFalseId = await handleCommandMessageMain(
 			JSON.stringify({
 				senderId: 'test',
@@ -106,8 +104,7 @@ describe('Orchestration Service', () => {
 		expect(responseFalseId).toBeDefined();
 		expect(responseFalseId!.command).toEqual('reloadLicense');
 		expect(responseFalseId!.senderId).toEqual('test');
-		expect(LoggerProxy.error).toHaveBeenCalled();
-		jest.spyOn(LoggerProxy, 'error').mockRestore();
+		expect(logger.error).toHaveBeenCalled();
 	});

 	test('should reject command messages from iteslf', async () => {
--- a/packages/cli/test/unit/services/redis.service.test.ts
+++ b/packages/cli/test/unit/services/redis.service.test.ts
@@ -1,41 +1,22 @@
 import Container from 'typedi';
+import { Logger } from '@/Logger';
 import config from '@/config';
-import { LoggerProxy } from 'n8n-workflow';
-import { getLogger } from '@/Logger';
 import { RedisService } from '@/services/redis.service';
+import { mockInstance } from '../../integration/shared/utils';

+mockInstance(Logger);
 const redisService = Container.get(RedisService);

 function setDefaultConfig() {
 	config.set('executions.mode', 'queue');
 }

-interface TestObject {
-	test: string;
-	test2: number;
-	test3?: TestObject & { test4: TestObject };
-}
-
-const testObject: TestObject = {
-	test: 'test',
-	test2: 123,
-	test3: {
-		test: 'test3',
-		test2: 123,
-		test4: {
-			test: 'test4',
-			test2: 123,
-		},
-	},
-};
-
 const PUBSUB_CHANNEL = 'testchannel';
 const LIST_CHANNEL = 'testlist';
 const STREAM_CHANNEL = 'teststream';

-describe('cacheService', () => {
+describe('RedisService', () => {
 	beforeAll(async () => {
-		LoggerProxy.init(getLogger());
 		jest.mock('ioredis', () => {
 			const Redis = require('ioredis-mock');
 			if (typeof Redis === 'object') {
--- a/packages/cli/test/unit/utils.test.ts
+++ b/packages/cli/test/unit/utils.test.ts
@@ -1,4 +1,4 @@
-import { webhookNotFoundErrorMessage } from '../../src/utils';
+import { webhookNotFoundErrorMessage } from '@/utils';

 describe('utils test webhookNotFoundErrorMessage ', () => {
 	it('should return a message with path and method', () => {