Merge pull request microsoft#187187 from microsoft/tyriar/187080

Add workspace id to terminal logs

Author: Tyriar

src/vs/platform/terminal/common/terminalLogService.ts

@@ -8,26 +8,49 @@ import { Event } from 'vs/base/common/event';
 import { localize } from 'vs/nls';
 import { ILogger, ILoggerService, LogLevel } from 'vs/platform/log/common/log';
 import { ITerminalLogService } from 'vs/platform/terminal/common/terminal';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 
 export class TerminalLogService extends Disposable implements ITerminalLogService {
 	declare _serviceBrand: undefined;
 	declare _logBrand: undefined;
 
 	private readonly _logger: ILogger;
 
+	private _workspaceId!: string;
+
 	get onDidChangeLogLevel(): Event<LogLevel> { return this._logger.onDidChangeLogLevel; }
 
-	constructor(@ILoggerService private readonly _loggerService: ILoggerService) {
+	constructor(
+		@ILoggerService private readonly _loggerService: ILoggerService,
+		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService
+	) {
 		super();
 		this._logger = this._loggerService.createLogger('terminal', { name: localize('terminalLoggerName', 'Terminal') });
+		this._register(Event.runAndSubscribe(workspaceContextService.onDidChangeWorkspaceFolders, () => {
+			this._workspaceId = workspaceContextService.getWorkspace().id.substring(0, 7);
+		}));
 	}
 
 	getLevel(): LogLevel { return this._logger.getLevel(); }
 	setLevel(level: LogLevel): void { this._logger.setLevel(level); }
-	trace(message: string, ...args: any[]): void { this._logger.trace(message, args); }
-	debug(message: string, ...args: any[]): void { this._logger.debug(message, args); }
-	info(message: string, ...args: any[]): void { this._logger.info(message, args); }
-	warn(message: string, ...args: any[]): void { this._logger.warn(message, args); }
-	error(message: string | Error, ...args: any[]): void { this._logger.error(message, args); }
 	flush(): void { this._logger.flush(); }
+
+	trace(message: string, ...args: any[]): void { this._logger.trace(this._formatMessage(message), args); }
+	debug(message: string, ...args: any[]): void { this._logger.debug(this._formatMessage(message), args); }
+	info(message: string, ...args: any[]): void { this._logger.info(this._formatMessage(message), args); }
+	warn(message: string, ...args: any[]): void { this._logger.warn(this._formatMessage(message), args); }
+	error(message: string | Error, ...args: any[]): void {
+		if (message instanceof Error) {
+			this._logger.error(this._formatMessage(''), message, args);
+			return;
+		}
+		this._logger.error(this._formatMessage(message), args);
+	}
+
+	private _formatMessage(message: string): string {
+		if (this._logger.getLevel() === LogLevel.Trace) {
+			return `[${this._workspaceId}] ${message}`;
+		}
+		return message;
+	}
 }