Skip to content

Adopt new APIs from vscode-tas-client #974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
testforstephen merged 3 commits into from
Apr 6, 2021
Merged

Adopt new APIs from vscode-tas-client #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e67d039
Adopt new APIs from vscode-tas-client
jdneo Apr 1, 2021
304dffb
Initialize the exp service after telemetry wrapper's initialization
jdneo Apr 6, 2021
7ea7d5d
Merge branch 'master' into cs/initializeExpService
jdneo Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,6 @@
"uuid": "^8.3.1",
"vscode-extension-telemetry": "^0.1.6",
"vscode-extension-telemetry-wrapper": "^0.9.0",
"vscode-tas-client": "^0.1.17"
"vscode-tas-client": "^0.1.22"
}
}
8 changes: 5 additions & 3 deletions src/experimentationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -27,12 +27,14 @@ export function getExpService() {
return expService;
}

export function initExpService(context: vscode.ExtensionContext): void {
export async function initExpService(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,

// The async version will await the initializePromise to make sure shared property is set
expService = await getExperimentationServiceAsync(extensionName, extensionVersion,
TargetPopulation.Public, new ExperimentationTelemetry(), context.globalState);
}
2 changes: 1 addition & 1 deletion src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
await initializeFromJsonFile(context.asAbsolutePath("./package.json"), {
firstParty: true,
});
await initExpService(context);
return instrumentOperation("activation", initializeExtension)(context);
}

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

initExpService(context);
registerDebugEventListener(context);
context.subscriptions.push(logger);
context.subscriptions.push(vscode.window.registerTerminalLinkProvider(new JavaTerminalLinkProvder()));
Expand Down