Resolving feedback

Tyriar · Tyriar · commit a794e6999af2 · 2019-09-25T17:13:53.000-07:00
diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
@@ -559,18 +559,25 @@ export class DiagnosticsService implements IDiagnosticsService {
 						name: string;
 						count: number;
 					};
-					const eventMapping = {
-						'workspace.stats.file': stats.fileTypes,
-						'workspace.stats.launchConfigFile': stats.launchConfigFiles,
-						'workspace.stats.configFile': stats.configFiles
-					};
-					Object.keys(eventMapping).forEach((eventName: 'workspace.stats.file' | 'workspace.stats.launchConfigFile' | 'workspace.stats.configFile') => {
-						eventMapping[eventName].forEach(e => {
-							this.telemetryService.publicLog2<WorkspaceStatsFileEvent, WorkspaceStatsFileClassification>(eventName, {
-								rendererSessionId: workspace.rendererSessionId,
-								name: e.name,
-								count: e.count
-							});
+					stats.fileTypes.forEach(e => {
+						this.telemetryService.publicLog2<WorkspaceStatsFileEvent, WorkspaceStatsFileClassification>('workspace.stats.file', {
+							rendererSessionId: workspace.rendererSessionId,
+							name: e.name,
+							count: e.count
+						});
+					});
+					stats.launchConfigFiles.forEach(e => {
+						this.telemetryService.publicLog2<WorkspaceStatsFileEvent, WorkspaceStatsFileClassification>('workspace.stats.launchConfigFile', {
+							rendererSessionId: workspace.rendererSessionId,
+							name: e.name,
+							count: e.count
+						});
+					});
+					stats.configFiles.forEach(e => {
+						this.telemetryService.publicLog2<WorkspaceStatsFileEvent, WorkspaceStatsFileClassification>('workspace.stats.configFiles', {
+							rendererSessionId: workspace.rendererSessionId,
+							name: e.name,
+							count: e.count
 						});
 					});
 				}).catch(_ => {
diff --git a/src/vs/workbench/contrib/stats/electron-browser/workspaceStats.ts b/src/vs/workbench/contrib/stats/electron-browser/workspaceStats.ts
@@ -164,23 +164,22 @@ export class WorkspaceStats implements IWorkbenchContribution {
 		this.reportProxyStats();
 
 		const diagnosticsChannel = this.sharedProcessService.getChannel('diagnostics');
-		const stats: IWorkspaceInformation = await this.getWorkspaceInformation();
-
-		diagnosticsChannel.call('reportWorkspaceStats', stats);
+		this.getWorkspaceInformation().then(stats => diagnosticsChannel.call('reportWorkspaceStats', stats));
 	}
 
 	private async getWorkspaceInformation(): Promise<IWorkspaceInformation> {
 		const workspace = this.contextService.getWorkspace();
 		const state = this.contextService.getWorkbenchState();
 		const telemetryId = this.workspaceStatsService.getTelemetryWorkspaceId(workspace, state);
-		const rendererSessionId = (await this.telemetryService.getTelemetryInfo()).sessionId;
-		return {
-			id: workspace.id,
-			telemetryId,
-			rendererSessionId,
-			folders: workspace.folders,
-			configuration: workspace.configuration
-		};
+		return this.telemetryService.getTelemetryInfo().then(info => {
+			return {
+				id: workspace.id,
+				telemetryId,
+				rendererSessionId: info.sessionId,
+				folders: workspace.folders,
+				configuration: workspace.configuration
+			};
+		});
 	}
 
 	private reportWorkspaceTags(tags: Tags): void {
