Skip to content

Commit abef713

Browse files
authored
Adopt new APIs from vscode-tas-client (#974)
* Adopt new APIs from vscode-tas-client Signed-off-by: Sheng Chen <[email protected]>
1 parent 79102df commit abef713

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,6 @@
787787
"uuid": "^8.3.1",
788788
"vscode-extension-telemetry": "^0.1.6",
789789
"vscode-extension-telemetry-wrapper": "^0.9.0",
790-
"vscode-tas-client": "^0.1.17"
790+
"vscode-tas-client": "^0.1.22"
791791
}
792792
}

src/experimentationService.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import * as vscode from "vscode";
55
import { addContextProperty, sendInfo } from "vscode-extension-telemetry-wrapper";
6-
import { getExperimentationService, IExperimentationService, IExperimentationTelemetry, TargetPopulation } from "vscode-tas-client";
6+
import { getExperimentationServiceAsync, IExperimentationService, IExperimentationTelemetry, TargetPopulation } from "vscode-tas-client";
77

88
class ExperimentationTelemetry implements IExperimentationTelemetry {
99

@@ -27,12 +27,14 @@ export function getExpService() {
2727
return expService;
2828
}
2929

30-
export function initExpService(context: vscode.ExtensionContext): void {
30+
export async function initExpService(context: vscode.ExtensionContext): Promise<void> {
3131
const packageJson: {[key: string]: any} = require("../package.json");
3232
// tslint:disable: no-string-literal
3333
const extensionName = `${packageJson["publisher"]}.${packageJson["name"]}`;
3434
const extensionVersion = packageJson["version"];
3535
// tslint:enable: no-string-literal
36-
expService = getExperimentationService(extensionName, extensionVersion,
36+
37+
// The async version will await the initializePromise to make sure shared property is set
38+
expService = await getExperimentationServiceAsync(extensionName, extensionVersion,
3739
TargetPopulation.Public, new ExperimentationTelemetry(), context.globalState);
3840
}

src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
3030
await initializeFromJsonFile(context.asAbsolutePath("./package.json"), {
3131
firstParty: true,
3232
});
33+
await initExpService(context);
3334
return instrumentOperation("activation", initializeExtension)(context);
3435
}
3536

3637
function initializeExtension(_operationId: string, context: vscode.ExtensionContext): any {
3738
// Deprecated
3839
logger.initialize(context, true);
3940

40-
initExpService(context);
4141
registerDebugEventListener(context);
4242
context.subscriptions.push(logger);
4343
context.subscriptions.push(vscode.window.registerTerminalLinkProvider(new JavaTerminalLinkProvder()));

0 commit comments

Comments
 (0)