Adopt new APIs from vscode-tas-client (microsoft#477)

jdneo · web-flow · commit 4d1554882861 · 2021-04-06T10:13:03.000+08:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -607,6 +607,6 @@
     "lodash": "^4.17.21",
     "minimatch": "^3.0.4",
     "vscode-extension-telemetry-wrapper": "0.9.0",
-    "vscode-tas-client": "^0.1.17"
+    "vscode-tas-client": "^0.1.22"
   }
 }
diff --git a/src/ExperimentationService.ts b/src/ExperimentationService.ts
@@ -3,7 +3,7 @@
 
 import * as vscode from "vscode";
 import { addContextProperty, sendInfo } from "vscode-extension-telemetry-wrapper";
-import { getExperimentationService, IExperimentationService, IExperimentationTelemetry, TargetPopulation } from "vscode-tas-client";
+import { getExperimentationServiceAsync, IExperimentationService, IExperimentationTelemetry, TargetPopulation } from "vscode-tas-client";
 
 class ExperimentationTelemetry implements IExperimentationTelemetry {
 
@@ -27,12 +27,12 @@ export function getExpService() {
     return expService;
 }
 
-export function init(context: vscode.ExtensionContext): void {
+export async function init(context: vscode.ExtensionContext): Promise<void> {
     const packageJson: {[key: string]: any} = require("../package.json");
     // tslint:disable: no-string-literal
     const extensionName = `${packageJson["publisher"]}.${packageJson["name"]}`;
     const extensionVersion = packageJson["version"];
     // tslint:enable: no-string-literal
-    expService = getExperimentationService(extensionName, extensionVersion,
+    expService = await getExperimentationServiceAsync(extensionName, extensionVersion,
         TargetPopulation.Public, new ExperimentationTelemetry(), context.globalState);
 }
diff --git a/src/extension.ts b/src/extension.ts
@@ -15,6 +15,7 @@ import { EventCounter } from "./utility";
 import { DependencyExplorer } from "./views/dependencyExplorer";
 
 export async function activate(context: ExtensionContext): Promise<void> {
+    await initExpService(context);
     contextManager.initialize(context);
     await initializeFromJsonFile(context.asAbsolutePath("./package.json"), { firstParty: true });
     await instrumentOperation("activation", activateExtension)(context);
@@ -30,7 +31,6 @@ async function activateExtension(_operationId: string, context: ExtensionContext
     context.subscriptions.push(contextManager);
     context.subscriptions.push(syncHandler);
     context.subscriptions.push(tasks.registerTaskProvider(ExportJarTaskProvider.exportJarType, new ExportJarTaskProvider()));
-    initExpService(context);
 }
 
 // this method is called when your extension is deactivated

Original file line number	Diff line number	Diff line change
`@@ -607,6 +607,6 @@`
`607`	`607`	`"lodash": "^4.17.21",`
`608`	`608`	`"minimatch": "^3.0.4",`
`609`	`609`	`"vscode-extension-telemetry-wrapper": "0.9.0",`
`610`		`- "vscode-tas-client": "^0.1.17"`
	`610`	`+ "vscode-tas-client": "^0.1.22"`
`611`	`611`	`}`
`612`	`612`	`}`