Use latest version of TAS package (#2052)

* Use new TAS package * Comment changes
microsoft · Jun 11, 2020 · 718d393 · 718d393
1 parent a20502b
commit 718d393
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 44 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2662,7 +2662,7 @@
         "vscode-azureextensionui": "^0.31.2",
         "vscode-languageclient": "^6.1.3",
         "vscode-nls": "^4.1.2",
-        "vscode-tas-client": "^0.0.757",
+        "vscode-tas-client": "^0.0.864",
         "xml2js": "^0.4.23"
     }
 }
diff --git a/src/extension.ts b/src/extension.ts
@@ -66,17 +66,6 @@ function initializeExtensionVariables(ctx: vscode.ExtensionContext): void {
         ext.terminalProvider = new DefaultTerminalProvider();
     }
 
-    // Activity measurement service internally handles telemetry opt-in
-    ext.activityMeasurementService = new ActivityMeasurementService(ctx.globalState);
-
-    // Experimentation service internally handles telemetry opt-in
-    const experimentationTelemetry = new ExperimentationTelemetry();
-    ctx.subscriptions.push(registerTelemetryHandler(async (context: IActionContext) => experimentationTelemetry.handleTelemetry(context)));
-    ext.experimentationService = new ExperimentationServiceAdapter(ctx.globalState, experimentationTelemetry);
-
-    // Survey manager internally handles telemetry opt-in
-    (new SurveyManager()).activate();
-
     if (!ext.keytar) {
         ext.keytar = Keytar.tryCreate();
     }
@@ -94,6 +83,13 @@ export async function activateInternal(ctx: vscode.ExtensionContext, perfStats:
         activateContext.telemetry.measurements.mainFileLoad = (perfStats.loadEndTime - perfStats.loadStartTime) / 1000;
         activateContext.telemetry.properties.dockerInstallationID = await getDockerInstallationID();
 
+        // All of these internally handle telemetry opt-in
+        ext.activityMeasurementService = new ActivityMeasurementService(ctx.globalState);
+        const experimentationTelemetry = new ExperimentationTelemetry();
+        ctx.subscriptions.push(registerTelemetryHandler(async (context: IActionContext) => experimentationTelemetry.handleTelemetry(context)));
+        ext.experimentationService = await ExperimentationServiceAdapter.create(ctx.globalState, experimentationTelemetry);
+        (new SurveyManager()).activate();
+
         validateOldPublisher(activateContext);
 
         ctx.subscriptions.push(

diff --git a/src/telemetry/ExperimentationServiceAdapter.ts b/src/telemetry/ExperimentationServiceAdapter.ts
@@ -14,33 +14,37 @@ export interface IExperimentationServiceAdapter {
 }
 
 export class ExperimentationServiceAdapter implements IExperimentationServiceAdapter {
-    private readonly wrappedExperimentationService: IExperimentationService;
-
-    public constructor(globalState: vscode.Memento, reporter: tas.IExperimentationTelemetry) {
-        if (!ext.telemetryOptIn) {
-            return;
+    private wrappedExperimentationService: IExperimentationService;
+
+    private constructor() { }
+
+    public static async create(globalState: vscode.Memento, reporter: tas.IExperimentationTelemetry): Promise<IExperimentationServiceAdapter> {
+        const result = new ExperimentationServiceAdapter();
+
+        if (ext.telemetryOptIn) {
+            try {
+                const version = extensionVersion.value ?? '1';
+                let targetPopulation: tas.TargetPopulation;
+
+                if (ext.runningTests || process.env.DEBUGTELEMETRY || process.env.VSCODE_DOCKER_TEAM === '1') {
+                    targetPopulation = tas.TargetPopulation.Team;
+                } else if (/alpha/ig.test(version)) {
+                    targetPopulation = tas.TargetPopulation.Insiders;
+                } else {
+                    targetPopulation = tas.TargetPopulation.Public;
+                }
+
+                result.wrappedExperimentationService = await tas.getExperimentationServiceAsync(
+                    extensionId,
+                    version,
+                    targetPopulation,
+                    reporter,
+                    globalState,
+                );
+            } catch { } // Best effort
         }
 
-        try {
-            const version = extensionVersion.value ?? '1';
-            let targetPopulation: tas.TargetPopulation;
-
-            if (ext.runningTests || process.env.DEBUGTELEMETRY || process.env.VSCODE_DOCKER_TEAM === '1') {
-                targetPopulation = tas.TargetPopulation.Team;
-            } else if (/alpha/ig.test(version)) {
-                targetPopulation = tas.TargetPopulation.Insiders;
-            } else {
-                targetPopulation = tas.TargetPopulation.Public;
-            }
-
-            this.wrappedExperimentationService = tas.getExperimentationService(
-                extensionId,
-                version,
-                targetPopulation,
-                reporter,
-                globalState,
-            );
-        } catch { } // Best effort
+        return result;
     }
 
     public async isFlightEnabled(flight: string): Promise<boolean> {