Skip to content

Commit bf1697d

Browse files
authored
Consume proposed telemetry API (microsoft#165862)
* Consume proposed telemetry API * Update webpack
1 parent fd5edb9 commit bf1697d

File tree

28 files changed

+4023
-372
lines changed

28 files changed

+4023
-372
lines changed

extensions/git/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
},
1111
"aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
1212
"enabledApiProposals": [
13+
"telemetryLogger",
1314
"diffCommand",
1415
"contribEditorContentMenu",
1516
"contribViewsWelcome",
@@ -2740,7 +2741,7 @@
27402741
},
27412742
"dependencies": {
27422743
"@joaomoreno/unique-names-generator": "^5.1.0",
2743-
"@vscode/extension-telemetry": "0.6.2",
2744+
"@vscode/extension-telemetry": "0.7.0-preview",
27442745
"@vscode/iconv-lite-umd": "0.7.0",
27452746
"byline": "^5.0.0",
27462747
"file-type": "16.5.4",

extensions/git/src/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ export async function _activate(context: ExtensionContext): Promise<GitExtension
178178
const logger = window.createOutputChannel('Git', { log: true });
179179
disposables.push(logger);
180180

181-
const { name, version, aiKey } = require('../package.json') as { name: string; version: string; aiKey: string };
182-
const telemetryReporter = new TelemetryReporter(name, version, aiKey);
181+
const { aiKey } = require('../package.json') as { aiKey: string };
182+
const telemetryReporter = new TelemetryReporter(aiKey);
183183
deactivateTasks.push(() => telemetryReporter.dispose());
184184

185185
const config = workspace.getConfiguration('git', null);

extensions/git/yarn.lock

Lines changed: 447 additions & 34 deletions
Large diffs are not rendered by default.

extensions/github-authentication/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
}
5353
},
5454
"enabledApiProposals": [
55+
"telemetryLogger",
5556
"extensionLog"
5657
],
5758
"aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
@@ -67,7 +68,7 @@
6768
"dependencies": {
6869
"node-fetch": "2.6.7",
6970
"uuid": "8.1.0",
70-
"@vscode/extension-telemetry": "0.6.2",
71+
"@vscode/extension-telemetry": "0.7.0-preview",
7172
"vscode-tas-client": "^0.1.47"
7273
},
7374
"devDependencies": {

extensions/github-authentication/src/github.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
5050
uriHandler: UriEventHandler,
5151
ghesUri?: vscode.Uri
5252
) {
53-
const { name, version, aiKey } = context.extension.packageJSON as { name: string; version: string; aiKey: string };
54-
this._telemetryReporter = new ExperimentationTelemetry(context, new TelemetryReporter(name, version, aiKey));
53+
const { aiKey } = context.extension.packageJSON as { name: string; version: string; aiKey: string };
54+
this._telemetryReporter = new ExperimentationTelemetry(context, new TelemetryReporter(aiKey));
5555

5656
const type = ghesUri ? AuthProviderType.githubEnterprise : AuthProviderType.github;
5757

extensions/github-authentication/yarn.lock

Lines changed: 392 additions & 42 deletions
Large diffs are not rendered by default.

extensions/html-language-features/client/src/node/htmlClientMain.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ let client: AsyncDisposable | undefined;
1919
export async function activate(context: ExtensionContext) {
2020

2121
const clientPackageJSON = getPackageInfo(context);
22-
telemetry = new TelemetryReporter(clientPackageJSON.name, clientPackageJSON.version, clientPackageJSON.aiKey);
22+
telemetry = new TelemetryReporter(clientPackageJSON.aiKey);
2323

2424
const serverMain = `./server/${clientPackageJSON.main.indexOf('/dist/') !== -1 ? 'dist' : 'out'}/node/htmlServerMain`;
2525
const serverModule = context.asAbsolutePath(serverMain);

extensions/html-language-features/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"onLanguage:handlebars"
1616
],
1717
"enabledApiProposals": [
18+
"telemetryLogger",
1819
"extensionsAny"
1920
],
2021
"main": "./client/out/node/htmlClientMain",
@@ -258,7 +259,7 @@
258259
]
259260
},
260261
"dependencies": {
261-
"@vscode/extension-telemetry": "0.6.2",
262+
"@vscode/extension-telemetry": "0.7.0-preview",
262263
"vscode-languageclient": "^8.1.0-next.1",
263264
"vscode-uri": "^3.0.6"
264265
},

extensions/html-language-features/yarn.lock

Lines changed: 452 additions & 34 deletions
Large diffs are not rendered by default.

extensions/json-language-features/client/src/node/jsonClientMain.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ let client: BaseLanguageClient | undefined;
2020
// this method is called when vs code is activated
2121
export async function activate(context: ExtensionContext) {
2222
const clientPackageJSON = await getPackageInfo(context);
23-
telemetry = new TelemetryReporter(clientPackageJSON.name, clientPackageJSON.version, clientPackageJSON.aiKey);
23+
telemetry = new TelemetryReporter(clientPackageJSON.aiKey);
2424

2525
const outputChannel = window.createOutputChannel(languageServerDescription);
2626

0 commit comments

Comments
 (0)