window vs global loggers

src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts

@@ -217,7 +217,7 @@ class SharedProcessMain extends Disposable {
 		services.set(INativeEnvironmentService, environmentService);
 
 		// Logger
-		const loggerService = new LoggerChannelClient(undefined, this.configuration.logLevel, this.configuration.loggers, mainProcessService.getChannel('logger'));
+		const loggerService = new LoggerChannelClient(undefined, this.configuration.logLevel, this.configuration.loggers.map(loggerResource => ({ ...loggerResource, resource: URI.revive(loggerResource.resource) })), mainProcessService.getChannel('logger'));
 		services.set(ILoggerService, loggerService);
 
 		// Log

src/vs/platform/log/common/log.ts

@@ -562,13 +562,13 @@ export abstract class AbstractLoggerService extends Disposable implements ILogge
 
 	createLogger(resource: URI, options?: ILoggerOptions, donotRegister?: boolean): ILogger {
 		let logger = this._loggers.get(resource);
+		const logLevel = options?.logLevel === 'always' ? LogLevel.Trace : options?.logLevel;
 		if (!logger) {
-			const logLevel = options?.logLevel === 'always' ? LogLevel.Trace : options?.logLevel;
 			logger = this.doCreateLogger(resource, logLevel ?? this.getLogLevel(resource) ?? this.logLevel, options);
 			this._loggers.set(resource, logger);
-			if (!donotRegister) {
-				this.registerLogger({ resource, id: options?.id ?? resource.toString(), logLevel, name: options?.name, hidden: options?.hidden, extensionId: options?.extensionId });
-			}
+		}
+		if (!donotRegister) {
+			this.registerLogger({ resource, id: options?.id ?? resource.toString(), logLevel, name: options?.name, hidden: options?.hidden, extensionId: options?.extensionId });
 		}
 		return logger;
 	}

src/vs/platform/log/common/logIpc.ts

@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI, UriDto } from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
 import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
 import { AbstractLoggerService, AbstractMessageLogger, AdapterLogger, DidChangeLoggersEvent, ILogger, ILoggerOptions, ILoggerResource, ILoggerService, isLogLevel, LogLevel } from 'vs/platform/log/common/log';
 import { Disposable } from 'vs/base/common/lifecycle';
 
 export class LoggerChannelClient extends AbstractLoggerService implements ILoggerService {
 
-	constructor(private readonly windowId: number | undefined, logLevel: LogLevel, loggers: UriDto<ILoggerResource>[], private readonly channel: IChannel) {
-		super(logLevel, loggers.map(loggerResource => ({ ...loggerResource, resource: URI.revive(loggerResource.resource), hidden: loggerResource.hidden || !!loggerResource.extensionId })));
+	constructor(private readonly windowId: number | undefined, logLevel: LogLevel, loggers: ILoggerResource[], private readonly channel: IChannel) {
+		super(logLevel, loggers);
 		this._register(channel.listen<LogLevel | [URI, LogLevel]>('onDidChangeLogLevel', windowId)(arg => {
 			if (isLogLevel(arg)) {
 				super.setLogLevel(arg);

src/vs/platform/log/electron-main/loggerService.ts

@@ -47,7 +47,7 @@ export class LoggerMainService extends LoggerService implements ILoggerMainServi
 	override getRegisteredLoggers(windowId?: number): ILoggerResource[] {
 		const resources: ILoggerResource[] = [];
 		for (const resource of super.getRegisteredLoggers()) {
-			if (this.isInterestedLoggerResource(resource.resource, windowId)) {
+			if (windowId === this.loggerResourcesByWindow.get(resource.resource)) {
 				resources.push(resource);
 			}
 		}

src/vs/platform/window/common/window.ts

@@ -299,7 +299,10 @@ export interface INativeWindowConfiguration extends IWindowConfiguration, Native
 
 	isInitialStartup?: boolean;
 	logLevel: LogLevel;
-	loggers: UriDto<ILoggerResource>[];
+	loggers: {
+		global: UriDto<ILoggerResource>[];
+		window: UriDto<ILoggerResource>[];
+	};
 
 	fullscreen?: boolean;
 	maximized?: boolean;

src/vs/platform/windows/electron-main/windowImpl.ts

@@ -1089,7 +1089,10 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			profile: this.profile || this.userDataProfilesService.defaultProfile
 		};
 		configuration.logLevel = this.logService.getLevel();
-		configuration.loggers = this.loggerMainService.getRegisteredLoggers(this.id);
+		configuration.loggers = {
+			window: this.loggerMainService.getRegisteredLoggers(this.id),
+			global: this.loggerMainService.getRegisteredLoggers()
+		};
 
 		// Load config
 		this.load(configuration, { isReload: true, disableExtensions: cli?.['disable-extensions'] });

src/vs/platform/windows/electron-main/windowsMainService.ts

@@ -1372,7 +1372,10 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			filesToWait: options.filesToOpen?.filesToWait,
 
 			logLevel: this.logService.getLevel(),
-			loggers: this.loggerService.getRegisteredLoggers(),
+			loggers: {
+				window: [],
+				global: this.loggerService.getRegisteredLoggers()
+			},
 			logsPath: this.environmentMainService.logsPath,
 
 			product,

src/vs/workbench/electron-sandbox/desktop.main.ts

@@ -170,7 +170,11 @@ export class DesktopMain extends Disposable {
 		serviceCollection.set(INativeWorkbenchEnvironmentService, environmentService);
 
 		// Logger
-		const loggerService = new LoggerChannelClient(this.configuration.windowId, this.configuration.logLevel, this.configuration.loggers, mainProcessService.getChannel('logger'));
+		const loggers = [
+			...this.configuration.loggers.global.map(loggerResource => ({ ...loggerResource, resource: URI.revive(loggerResource.resource) })),
+			...this.configuration.loggers.window.map(loggerResource => ({ ...loggerResource, resource: URI.revive(loggerResource.resource), hidden: true })),
+		];
+		const loggerService = new LoggerChannelClient(this.configuration.windowId, this.configuration.logLevel, loggers, mainProcessService.getChannel('logger'));
 		serviceCollection.set(ILoggerService, loggerService);
 
 		// Log

src/vs/workbench/test/electron-browser/workbenchTestServices.ts

@@ -75,7 +75,7 @@ export const TestNativeWindowConfiguration: INativeWindowConfiguration = {
 	windowId: 0,
 	machineId: 'testMachineId',
 	logLevel: LogLevel.Error,
-	loggers: [],
+	loggers: { global: [], window: [] },
 	mainPid: 0,
 	appRoot: '',
 	userEnv: {},