From fd8cb4c63fb641ed7260e2f575f8b10608056e39 Mon Sep 17 00:00:00 2001
From: Sheng Chen <sheche@microsoft.com>
Date: Tue, 6 Apr 2021 09:30:04 +0800
Subject: [PATCH] Adopt new APIs from vscode-tas-client

---
 package-lock.json             | 20 ++++++++++----------
 package.json                  |  2 +-
 src/ExperimentationService.ts |  6 +++---
 src/extension.ts              |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cc54db33..84ad32c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2569,9 +2569,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
-      "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz",
+      "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA=="
     },
     "for-in": {
       "version": "1.0.2",
@@ -5849,9 +5849,9 @@
       }
     },
     "tas-client": {
-      "version": "0.1.16",
-      "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.1.16.tgz",
-      "integrity": "sha512-ZMGg7dGXiYVJHYusDpUb/Ilg+iPNYZdKJSIA2ADn0f2RovHWM0TpNVe2YHPEc0hdFMsUwWKS5pCRzLnlUqcqGg==",
+      "version": "0.1.21",
+      "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.1.21.tgz",
+      "integrity": "sha512-7UuIwOXarCYoCTrQHY5n7M+63XuwMC0sVUdbPQzxqDB9wMjIW0JF39dnp3yoJnxr4jJUVhPtvkkXZbAD0BxCcA==",
       "requires": {
         "axios": "^0.21.1"
       }
@@ -6827,11 +6827,11 @@
       }
     },
     "vscode-tas-client": {
-      "version": "0.1.17",
-      "resolved": "https://registry.npmjs.org/vscode-tas-client/-/vscode-tas-client-0.1.17.tgz",
-      "integrity": "sha512-5uqMeg7sjsu1/QkmuRtBOXtZnnrCXAMEihbOSxan3bk2NdA/nZvhfhfLh8gd9FlBBL56QH69I8Zn25B2yGPRng==",
+      "version": "0.1.22",
+      "resolved": "https://registry.npmjs.org/vscode-tas-client/-/vscode-tas-client-0.1.22.tgz",
+      "integrity": "sha512-1sYH73nhiSRVQgfZkLQNJW7VzhKM9qNbCe8QyXgiKkLhH4GflDXRPAK4yy4P41jUgula+Fc9G7i5imj1dlKfaw==",
       "requires": {
-        "tas-client": "0.1.16"
+        "tas-client": "0.1.21"
       }
     },
     "vscode-test": {
diff --git a/package.json b/package.json
index 7ccc8509..41de08b5 100644
--- 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
index f9fd280b..a76741ea 100644
--- 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
index ceb4349b..678597bb 100644
--- 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