Fix microsoft#82298, this.getConnection is not a function

Rachel Macfarlane · Rachel Macfarlane · commit 988077fc2cee · 2019-10-11T11:56:11.000-07:00
diff --git a/src/vs/workbench/services/telemetry/browser/telemetryService.ts b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
@@ -19,20 +19,20 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA
 
 export class WebTelemetryAppender implements ITelemetryAppender {
 
-	constructor(private _logService: ILogService, private _appender: ITelemetryAppender) { }
+	constructor(private _logService: ILogService, private _appender: IRemoteAgentService) { }
 
 	log(eventName: string, data: any): void {
 		data = validateTelemetryData(data);
 		this._logService.trace(`telemetry/${eventName}`, data);
 
-		this._appender.log('/monacoworkbench/' + eventName, {
+		this._appender.logTelemetry('/monacoworkbench/' + eventName, {
 			properties: data.properties,
 			measurements: data.measurements
 		});
 	}
 
 	flush(): Promise<void> {
-		return this._appender.flush();
+		return this._appender.flushTelemetry();
 	}
 }
 
@@ -53,9 +53,8 @@ export class TelemetryService extends Disposable implements ITelemetryService {
 		super();
 
 		if (!environmentService.args['disable-telemetry'] && !!productService.enableTelemetry) {
-			const telemetryProvider = environmentService.options && environmentService.options.telemetryAppender || { log: remoteAgentService.logTelemetry, flush: remoteAgentService.flushTelemetry };
 			const config: ITelemetryServiceConfig = {
-				appender: combinedAppender(new WebTelemetryAppender(logService, telemetryProvider), new LogAppender(logService)),
+				appender: combinedAppender(new WebTelemetryAppender(logService, remoteAgentService), new LogAppender(logService)),
 				commonProperties: resolveWorkbenchCommonProperties(storageService, productService.commit, productService.version, environmentService.configuration.machineId, environmentService.configuration.remoteAuthority),
 				piiPaths: [environmentService.appRoot]
 			};
diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts
@@ -15,7 +15,6 @@ import { LogLevel } from 'vs/platform/log/common/log';
 import { IUpdateProvider, IUpdate } from 'vs/workbench/services/update/browser/updateService';
 import { Event, Emitter } from 'vs/base/common/event';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IWorkspaceProvider, IWorkspace } from 'vs/workbench/services/host/browser/browserHostService';
 
 interface IWorkbenchConstructionOptions {
@@ -89,12 +88,6 @@ interface IWorkbenchConstructionOptions {
 	 */
 	updateProvider?: IUpdateProvider;
 
-	/**
-	 * Experimental: If provided, will be called when logging telemetry events.
-	 */
-	telemetryAppender?: ITelemetryAppender;
-
-
 	/**
 	 * Experimental: Support adding additional properties to telemetry.
 	 */
@@ -159,7 +152,4 @@ export {
 	// Updates
 	IUpdateProvider,
 	IUpdate,
-
-	// Telemetry
-	ITelemetryAppender
 };
