Merge from vscode 591842cc4b71958c81947b254924a215fe3edcbd (#4886)

src/vs/platform/diagnostics/electron-main/diagnosticsService.ts

@@ -15,7 +15,7 @@ import { app } from 'electron';
 import { basename } from 'vs/base/common/path';
 import { URI } from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { WorkspaceStats, SystemInfo } from 'vs/platform/diagnostics/common/diagnosticsService';
+import { IMachineInfo, WorkspaceStats, SystemInfo } from 'vs/platform/diagnostics/common/diagnosticsService';
 import { collectWorkspaceStats, getMachineInfo } from 'vs/platform/diagnostics/node/diagnosticsService';
 import { ProcessItem } from 'vs/base/common/processes';
 
@@ -46,12 +46,21 @@ export interface PerformanceInfo {
 	processInfo?: string;
 	workspaceInfo?: string;
 }
-
 export class DiagnosticsService implements IDiagnosticsService {
 
 	_serviceBrand: any;
 
-	formatEnvironment(info: IMainProcessInfo): string {
+	private formatMachineInfo(info: IMachineInfo): string {
+		const output: string[] = [];
+		output.push(`OS Version:       ${info.os}`);
+		output.push(`CPUs:             ${info.cpus}`);
+		output.push(`Memory (System):  ${info.memory}`);
+		output.push(`VM:               ${info.vmHint}`);
+
+		return output.join('\n');
+	}
+
+	private formatEnvironment(info: IMainProcessInfo): string {
 		const MB = 1024 * 1024;
 		const GB = 1024 * MB;
 
@@ -76,10 +85,40 @@ export class DiagnosticsService implements IDiagnosticsService {
 
 	async getPerformanceInfo(launchService: ILaunchService): Promise<PerformanceInfo> {
 		const info = await launchService.getMainProcessInfo();
-		return Promise.all<ProcessItem, string>([listProcesses(info.mainPID), this.formatWorkspaceMetadata(info)]).then(result => {
-			const [rootProcess, workspaceInfo] = result;
+		return Promise.all<ProcessItem, string>([listProcesses(info.mainPID), this.formatWorkspaceMetadata(info)]).then(async result => {
+			let [rootProcess, workspaceInfo] = result;
+			let processInfo = this.formatProcessList(info, rootProcess);
+
+			try {
+				const remoteData = await launchService.getRemoteDiagnostics({ includeProcesses: true, includeWorkspaceMetadata: true });
+				remoteData.forEach(diagnostics => {
+					processInfo += `\n\nRemote: ${diagnostics.hostName}`;
+					if (diagnostics.processes) {
+						processInfo += `\n${this.formatProcessList(info, diagnostics.processes)}`;
+					}
+
+					if (diagnostics.workspaceMetadata) {
+						workspaceInfo += `\n|  Remote: ${diagnostics.hostName}`;
+						for (const folder of Object.keys(diagnostics.workspaceMetadata)) {
+							const metadata = diagnostics.workspaceMetadata[folder];
+
+							let countMessage = `${metadata.fileCount} files`;
+							if (metadata.maxFilesReached) {
+								countMessage = `more than ${countMessage}`;
+							}
+
+							workspaceInfo += `|    Folder (${folder}): ${countMessage}`;
+							workspaceInfo += this.formatWorkspaceStats(metadata);
+						}
+					}
+				});
+			} catch (e) {
+				processInfo += `\nFetching remote data failed: ${e}`;
+				workspaceInfo += `\nFetching remote data failed: ${e}`;
+			}
+
 			return {
-				processInfo: this.formatProcessList(info, rootProcess),
+				processInfo,
 				workspaceInfo
 			};
 		});
@@ -95,7 +134,8 @@ export class DiagnosticsService implements IDiagnosticsService {
 			vmHint,
 			processArgs: `${info.mainArguments.join(' ')}`,
 			gpuStatus: app.getGPUFeatureStatus(),
-			screenReader: `${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`
+			screenReader: `${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`,
+			remoteData: await launchService.getRemoteDiagnostics({ includeProcesses: false, includeWorkspaceMetadata: false })
 		};
 
 
@@ -120,12 +160,42 @@ export class DiagnosticsService implements IDiagnosticsService {
 			output.push(this.formatProcessList(info, rootProcess));
 
 			// Workspace Stats
-			if (info.windows.some(window => window.folderURIs && window.folderURIs.length > 0)) {
+			if (info.windows.some(window => window.folderURIs && window.folderURIs.length > 0 && !window.remoteAuthority)) {
 				output.push('');
 				output.push('Workspace Stats: ');
 				output.push(await this.formatWorkspaceMetadata(info));
 			}
 
+			try {
+				const data = await launchService.getRemoteDiagnostics({ includeProcesses: true, includeWorkspaceMetadata: true });
+				data.forEach(diagnostics => {
+					output.push('\n\n');
+					output.push(`Remote:           ${diagnostics.hostName}`);
+					output.push(this.formatMachineInfo(diagnostics.machineInfo));
+
+					if (diagnostics.processes) {
+						output.push(this.formatProcessList(info, diagnostics.processes));
+					}
+
+					if (diagnostics.workspaceMetadata) {
+						for (const folder of Object.keys(diagnostics.workspaceMetadata)) {
+							const metadata = diagnostics.workspaceMetadata[folder];
+
+							let countMessage = `${metadata.fileCount} files`;
+							if (metadata.maxFilesReached) {
+								countMessage = `more than ${countMessage}`;
+							}
+
+							output.push(`Folder (${folder}): ${countMessage}`);
+							output.push(this.formatWorkspaceStats(metadata));
+						}
+					}
+				});
+			} catch (e) {
+				output.push('\n\n');
+				output.push(`Fetching status information from remotes failed: ${e.message}`);
+			}
+
 			output.push('');
 			output.push('');
 
@@ -195,7 +265,7 @@ export class DiagnosticsService implements IDiagnosticsService {
 		const workspaceStatPromises: Promise<void>[] = [];
 
 		info.windows.forEach(window => {
-			if (window.folderURIs.length === 0) {
+			if (window.folderURIs.length === 0 || !!window.remoteAuthority) {
 				return;
 			}