Call flush instead of dispose for flushing telemetry appenders

Wait until data is flushed in cli

src/vs/code/node/cliProcessMain.ts

@@ -354,8 +354,6 @@ export async function main(argv: ParsedArgs): Promise<void> {
 
 			services.set(ITelemetryService, new SyncDescriptor(TelemetryService, [config]));
 
-			// Dispose the AI adapter so that remaining data gets flushed.
-			disposables.add(combinedAppender(...appenders));
 		} else {
 			services.set(ITelemetryService, NullTelemetryService);
 		}
@@ -365,6 +363,8 @@ export async function main(argv: ParsedArgs): Promise<void> {
 
 		try {
 			await main.run(argv);
+			// Flush the remaining data in AI adapter.
+			await combinedAppender(...appenders).flush();
 		} finally {
 			disposables.dispose();
 		}

src/vs/platform/telemetry/common/telemetryUtils.ts

@@ -33,17 +33,17 @@ export const NullTelemetryService = new class implements ITelemetryService {
 
 export interface ITelemetryAppender {
 	log(eventName: string, data: any): void;
-	dispose(): Promise<any> | undefined;
+	flush(): Promise<any>;
 }
 
 export function combinedAppender(...appenders: ITelemetryAppender[]): ITelemetryAppender {
 	return {
 		log: (e, d) => appenders.forEach(a => a.log(e, d)),
-		dispose: () => Promise.all(appenders.map(a => a.dispose()))
+		flush: () => Promise.all(appenders.map(a => a.flush()))
 	};
 }
 
-export const NullAppender: ITelemetryAppender = { log: () => null, dispose: () => Promise.resolve(null) };
+export const NullAppender: ITelemetryAppender = { log: () => null, flush: () => Promise.resolve(null) };
 
 
 export class LogAppender implements ITelemetryAppender {
@@ -51,7 +51,7 @@ export class LogAppender implements ITelemetryAppender {
 	private commonPropertiesRegex = /^sessionID$|^version$|^timestamp$|^commitHash$|^common\./;
 	constructor(@ILogService private readonly _logService: ILogService) { }
 
-	dispose(): Promise<any> {
+	flush(): Promise<any> {
 		return Promise.resolve(undefined);
 	}
 

src/vs/platform/telemetry/node/appInsightsAppender.ts

@@ -73,7 +73,7 @@ export class AppInsightsAppender implements ITelemetryAppender {
 		});
 	}
 
-	dispose(): Promise<any> | undefined {
+	flush(): Promise<any> {
 		if (this._aiClient) {
 			return new Promise(resolve => {
 				this._aiClient!.flush({
@@ -85,6 +85,6 @@ export class AppInsightsAppender implements ITelemetryAppender {
 				});
 			});
 		}
-		return undefined;
+		return Promise.resolve(undefined);
 	}
 }

src/vs/platform/telemetry/node/telemetryIpc.ts

@@ -37,7 +37,8 @@ export class TelemetryAppenderClient implements ITelemetryAppender {
 		return Promise.resolve(null);
 	}
 
-	dispose(): any {
+	flush(): Promise<void> {
 		// TODO
+		return Promise.resolve();
 	}
 }

src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts

@@ -84,7 +84,7 @@ suite('AIAdapter', () => {
 	});
 
 	teardown(() => {
-		adapter.dispose();
+		return adapter.flush();
 	});
 
 	test('Simple event', () => {

src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts

@@ -30,7 +30,7 @@ class TestTelemetryAppender implements ITelemetryAppender {
 		return this.events.length;
 	}
 
-	public dispose(): Promise<any> {
+	public flush(): Promise<any> {
 		this.isDisposed = true;
 		return Promise.resolve(null);
 	}

src/vs/workbench/contrib/debug/node/telemetryApp.ts

@@ -8,7 +8,7 @@ import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppen
 import { TelemetryAppenderChannel } from 'vs/platform/telemetry/node/telemetryIpc';
 
 const appender = new AppInsightsAppender(process.argv[2], JSON.parse(process.argv[3]), process.argv[4]);
-process.once('exit', () => appender.dispose());
+process.once('exit', () => appender.flush());
 
 const channel = new TelemetryAppenderChannel(appender);
 const server = new Server('telemetry');

src/vs/workbench/services/telemetry/browser/telemetryService.ts

@@ -104,7 +104,7 @@ export class WebTelemetryAppender implements ITelemetryAppender {
 		this._aiClient.trackEvent('monacoworkbench/' + eventName, data.properties, data.measurements);
 	}
 
-	dispose(): Promise<any> | undefined {
+	flush(): Promise<void> {
 		if (this._aiClient) {
 			return new Promise(resolve => {
 				this._aiClient!.flush();
@@ -113,7 +113,7 @@ export class WebTelemetryAppender implements ITelemetryAppender {
 			});
 		}
 
-		return undefined;
+		return Promise.resolve();
 	}
 }