support passing extension log level from cli (#163566)

Author: sandy081

src/vs/platform/environment/common/argv.ts

@@ -48,7 +48,7 @@ export interface NativeParsedArgs {
 	'trace-category-filter'?: string;
 	'trace-options'?: string;
 	'open-devtools'?: boolean;
-	log?: string;
+	log?: string[];
 	logExtensionHostCommunication?: boolean;
 	'extensions-dir'?: string;
 	'extensions-download-dir'?: string;

src/vs/platform/environment/common/environment.ts

@@ -81,6 +81,7 @@ export interface IEnvironmentService {
 	// --- logging
 	logsPath: string;
 	logLevel?: string;
+	extensionLogLevel?: [string, string][];
 	verbose: boolean;
 	isBuilt: boolean;
 

src/vs/platform/environment/common/environmentService.ts

@@ -14,6 +14,8 @@ import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { ExtensionKind, IDebugParams, IExtensionHostDebugParams, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IProductService } from 'vs/platform/product/common/productService';
 
+export const EXTENSION_IDENTIFIER_WITH_LOG_REGEX = /^([^.]+\..+):(.+)$/;
+
 export interface INativeEnvironmentPaths {
 
 	/**
@@ -216,7 +218,20 @@ export abstract class AbstractNativeEnvironmentService implements INativeEnviron
 
 	get isBuilt(): boolean { return !env['VSCODE_DEV']; }
 	get verbose(): boolean { return !!this.args.verbose; }
-	get logLevel(): string | undefined { return this.args.log; }
+
+	@memoize
+	get logLevel(): string | undefined { return this.args.log?.find(entry => !EXTENSION_IDENTIFIER_WITH_LOG_REGEX.test(entry)); }
+	@memoize
+	get extensionLogLevel(): [string, string][] | undefined {
+		const result: [string, string][] = [];
+		for (const entry of this.args.log || []) {
+			const matches = EXTENSION_IDENTIFIER_WITH_LOG_REGEX.exec(entry);
+			if (matches && matches[1] && matches[2]) {
+				result.push([matches[1], matches[2]]);
+			}
+		}
+		return result.length ? result : undefined;
+	}
 
 	@memoize
 	get serviceMachineIdResource(): URI { return joinPath(URI.file(this.userDataPath), 'machineid'); }

src/vs/platform/environment/node/argv.ts

@@ -93,7 +93,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 
 	'version': { type: 'boolean', cat: 't', alias: 'v', description: localize('version', "Print version.") },
 	'verbose': { type: 'boolean', cat: 't', global: true, description: localize('verbose', "Print verbose output (implies --wait).") },
-	'log': { type: 'string', cat: 't', args: 'level', global: true, description: localize('log', "Log level to use. Default is 'info'. Allowed values are 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.") },
+	'log': { type: 'string[]', cat: 't', args: 'level', global: true, description: localize('log', "Log level to use. Default is 'info'. Allowed values are 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'. You can also configure the log level of an extension by passing extension id and log level in the following format: '${publisher}.${name}:${logLevel}'. For example: 'vscode.csharp:trace'. Can receive one or more such entries.") },
 	'status': { type: 'boolean', alias: 's', cat: 't', description: localize('status', "Print process usage and diagnostics information.") },
 	'prof-startup': { type: 'boolean', cat: 't', description: localize('prof-startup', "Run CPU profiler during startup.") },
 	'prof-append-timers': { type: 'string' },

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

@@ -147,7 +147,7 @@ export class FileLoggerService extends AbstractLoggerService implements ILoggerS
 		@ILogService logService: ILogService,
 		@IFileService private readonly fileService: IFileService,
 	) {
-		super(logService.getLevel(), logService.onDidChangeLogLevel, []);
+		super(logService.getLevel(), logService.onDidChangeLogLevel);
 	}
 
 	protected doCreateLogger(resource: URI, logLevel: LogLevel, options?: ILoggerOptions): ILogger {

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

@@ -112,7 +112,7 @@ export interface ILoggerService {
 	/**
 	 * Creates a logger, or gets one if it already exists.
 	 */
-	createLogger(resource: URI, options?: ILoggerOptions): ILogger;
+	createLogger(resource: URI, options?: ILoggerOptions, logLevel?: LogLevel): ILogger;
 
 	/**
 	 * Gets an existing logger, if any.
@@ -128,12 +128,6 @@ export interface ILoggerService {
 	 * Get log level for a logger.
 	 */
 	getLogLevel(resource: URI): LogLevel | undefined;
-
-	/**
-	 * Get default log level for a logger with given name.
-	 * @param name logger name
-	 */
-	getDefaultLogLevel(name: string): LogLevel;
 }
 
 export abstract class AbstractLogger extends Disposable {
@@ -535,7 +529,6 @@ export abstract class AbstractLoggerService extends Disposable implements ILogge
 	constructor(
 		private logLevel: LogLevel,
 		onDidChangeLogLevel: Event<LogLevel>,
-		private readonly defaultLogLevels: [string, LogLevel][]
 	) {
 		super();
 		this._register(onDidChangeLogLevel(logLevel => this.setLevel(logLevel)));
@@ -549,11 +542,11 @@ export abstract class AbstractLoggerService extends Disposable implements ILogge
 		return this.loggerItems.get(resource)?.logger;
 	}
 
-	createLogger(resource: URI, options?: ILoggerOptions): ILogger {
+	createLogger(resource: URI, options?: ILoggerOptions, logLevel?: LogLevel): ILogger {
 		let logger = this.loggerItems.get(resource)?.logger;
 		if (!logger) {
-			const logLevel = options?.always ? LogLevel.Trace : undefined;
-			logger = this.doCreateLogger(resource, logLevel ?? (options?.name ? this.getDefaultLogLevel(options?.name) : this.logLevel), options);
+			logLevel = options?.always ? LogLevel.Trace : logLevel;
+			logger = this.doCreateLogger(resource, logLevel ?? this.logLevel, options);
 			this.loggerItems.set(resource, { logger, logLevel });
 		}
 		return logger;
@@ -587,10 +580,6 @@ export abstract class AbstractLoggerService extends Disposable implements ILogge
 		return logger?.logLevel;
 	}
 
-	getDefaultLogLevel(name: string): LogLevel {
-		return this.defaultLogLevels.find(([loggerName]) => loggerName === name)?.[1] ?? this.logLevel;
-	}
-
 	override dispose(): void {
 		this.loggerItems.forEach(({ logger }) => logger.dispose());
 		this.loggerItems.clear();

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

@@ -111,7 +111,7 @@ export class LoggerChannel implements IServerChannel {
 export class LoggerChannelClient extends AbstractLoggerService implements ILoggerService {
 
 	constructor(logLevel: LogLevel, onDidChangeLogLevel: Event<LogLevel>, private readonly channel: IChannel) {
-		super(logLevel, onDidChangeLogLevel, []);
+		super(logLevel, onDidChangeLogLevel);
 	}
 
 	createConsoleMainLogger(): ILogger {

src/vs/platform/log/node/loggerService.ts

@@ -13,7 +13,7 @@ export class LoggerService extends AbstractLoggerService implements ILoggerServi
 	constructor(
 		@ILogService logService: ILogService
 	) {
-		super(logService.getLevel(), logService.onDidChangeLogLevel, []);
+		super(logService.getLevel(), logService.onDidChangeLogLevel);
 	}
 
 	protected doCreateLogger(resource: URI, logLevel: LogLevel, options?: ILoggerOptions): ILogger {

src/vs/server/node/serverEnvironmentService.ts

@@ -147,7 +147,7 @@ export interface ServerParsedArgs {
 	'disable-telemetry'?: boolean;
 	'file-watcher-polling'?: string;
 
-	'log'?: string;
+	'log'?: string[];
 	'logsPath'?: string;
 
 	'force-disable-user-env'?: boolean;

src/vs/workbench/api/common/extHostLoggerService.ts

@@ -20,7 +20,7 @@ export class ExtHostLoggerService extends AbstractLoggerService implements ExtHo
 		@IExtHostRpcService rpc: IExtHostRpcService,
 		@IExtHostInitDataService initData: IExtHostInitDataService,
 	) {
-		super(initData.logLevel, Event.None, []);
+		super(initData.logLevel, Event.None);
 		this._proxy = rpc.getProxy(MainContext.MainThreadLogger);
 	}
 

src/vs/workbench/api/common/extHostOutput.ts

@@ -8,8 +8,8 @@ import type * as vscode from 'vscode';
 import { URI } from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { AbstractMessageLogger, ILogger, ILoggerService, ILogService, log, LogLevel } from 'vs/platform/log/common/log';
+import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { AbstractMessageLogger, ILogger, ILoggerService, ILogService, log, LogLevel, parseLogLevel } from 'vs/platform/log/common/log';
 import { OutputChannelUpdateMode } from 'vs/workbench/services/output/common/output';
 import { IExtHostConsumerFileSystem } from 'vs/workbench/api/common/extHostFileSystemConsumer';
 import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
@@ -151,12 +151,13 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 		if (isString(languageId) && !languageId.trim()) {
 			throw new Error('illegal argument `languageId`. must not be empty');
 		}
-		const extHostOutputChannel = log ? this.doCreateLogOutputChannel(name, extension) : this.doCreateOutputChannel(name, languageId, extension);
+		const logLevel = this.getDefaultLogLevel(extension);
+		const extHostOutputChannel = log ? this.doCreateLogOutputChannel(name, logLevel, extension) : this.doCreateOutputChannel(name, languageId, extension);
 		extHostOutputChannel.then(channel => {
 			this.channels.set(channel.id, channel);
 			channel.visible = channel.id === this.visibleChannelId;
 		});
-		return log ? this.createExtHostLogOutputChannel(name, <Promise<ExtHostOutputChannel>>extHostOutputChannel) : this.createExtHostOutputChannel(name, <Promise<ExtHostOutputChannel>>extHostOutputChannel);
+		return log ? this.createExtHostLogOutputChannel(name, logLevel, <Promise<ExtHostOutputChannel>>extHostOutputChannel) : this.createExtHostOutputChannel(name, <Promise<ExtHostOutputChannel>>extHostOutputChannel);
 	}
 
 	private async doCreateOutputChannel(name: string, languageId: string | undefined, extension: IExtensionDescription): Promise<ExtHostOutputChannel> {
@@ -170,14 +171,23 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 		return new ExtHostOutputChannel(id, name, logger, this.proxy, extension);
 	}
 
-	private async doCreateLogOutputChannel(name: string, extension: IExtensionDescription): Promise<ExtHostLogOutputChannel> {
+	private async doCreateLogOutputChannel(name: string, logLevel: LogLevel, extension: IExtensionDescription): Promise<ExtHostLogOutputChannel> {
 		const extensionLogDir = await this.createExtensionLogDirectory(extension);
 		const file = this.extHostFileSystemInfo.extUri.joinPath(extensionLogDir, `${name.replace(/[\\/:\*\?"<>\|]/g, '')}.log`);
-		const logger = this.loggerService.createLogger(file, { name });
+		const logger = this.loggerService.createLogger(file, { name }, logLevel);
 		const id = await this.proxy.$register(name, file, true, undefined, extension.identifier.value);
 		return new ExtHostLogOutputChannel(id, name, logger, this.proxy, extension);
 	}
 
+	private getDefaultLogLevel(extension: IExtensionDescription): LogLevel {
+		let logLevel: LogLevel | undefined;
+		const logLevelValue = this.initData.environment.extensionLogLevel?.find(([identifier]) => ExtensionIdentifier.equals(extension.identifier, identifier))?.[1];
+		if (logLevelValue) {
+			logLevel = parseLogLevel(logLevelValue);
+		}
+		return logLevel ?? this.logService.getLevel();
+	}
+
 	private createExtensionLogDirectory(extension: IExtensionDescription): Thenable<URI> {
 		let extensionLogDirectoryPromise = this.extensionLogDirectoryPromise.get(extension.identifier.value);
 		if (!extensionLogDirectoryPromise) {
@@ -236,14 +246,13 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 		};
 	}
 
-	private createExtHostLogOutputChannel(name: string, channelPromise: Promise<ExtHostOutputChannel>): vscode.LogOutputChannel {
+	private createExtHostLogOutputChannel(name: string, logLevel: LogLevel, channelPromise: Promise<ExtHostOutputChannel>): vscode.LogOutputChannel {
 		const disposables = new DisposableStore();
 		const validate = () => {
 			if (disposables.isDisposed) {
 				throw new Error('Channel has been closed');
 			}
 		};
-		let logLevel = this.logService.getLevel();
 		const onDidChangeLogLevel = disposables.add(new Emitter<LogLevel>());
 		channelPromise.then(channel => {
 			disposables.add(channel);

src/vs/workbench/browser/web.api.ts

@@ -697,6 +697,11 @@ export interface IDevelopmentOptions {
 	 */
 	readonly logLevel?: LogLevel;
 
+	/**
+	 * Extension log level.
+	 */
+	readonly extensionLogLevel?: [string, LogLevel][];
+
 	/**
 	 * Location of a module containing extension tests to run once the workbench is open.
 	 */