Skip to content

Commit 661c0a6

Browse files
Move TelemetryReporter initialization to extension activation
1 parent f3a1b15 commit 661c0a6

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@
157157
"windows": {
158158
"program": "./coreclr-debug/debugAdapters/OpenDebugAD7.exe"
159159
},
160-
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
161160
"configurationAttributes": {
162161
"launch": {
163162
"required": [

src/coreclr-debug.ts

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ let _installLog: NodeJS.WritableStream;
1717
let _reporter: TelemetryReporter; // Telemetry reporter
1818
const _completionFileName: string = 'install.complete';
1919

20-
export function installCoreClrDebug(context: vscode.ExtensionContext) {
20+
export function installCoreClrDebug(context: vscode.ExtensionContext, reporter: TelemetryReporter) {
2121
_coreClrDebugDir = path.join(context.extensionPath, 'coreclr-debug');
2222
_debugAdapterDir = path.join(_coreClrDebugDir, 'debugAdapters');
2323

@@ -39,7 +39,7 @@ export function installCoreClrDebug(context: vscode.ExtensionContext) {
3939
return;
4040
}
4141

42-
initializeTelemetry(context);
42+
_reporter = reporter;
4343
_channel = vscode.window.createOutputChannel('coreclr-debug');
4444

4545
// Create our log file and override _channel.append to also outpu to the log
@@ -95,17 +95,6 @@ export function installCoreClrDebug(context: vscode.ExtensionContext) {
9595
});
9696
}
9797

98-
function initializeTelemetry(context: vscode.ExtensionContext) {
99-
// parse our own package.json into json
100-
const packageJson = JSON.parse(fs.readFileSync(path.join(context.extensionPath, 'package.json')).toString());
101-
102-
let extensionId = packageJson["publisher"] + "." + packageJson["name"];
103-
let extensionVersion = packageJson["version"];
104-
let aiKey = packageJson.contributes.debuggers[0]["aiKey"];
105-
106-
_reporter = new TelemetryReporter(extensionId, extensionVersion, aiKey);
107-
}
108-
10998
function logTelemetry(eventName: string, properties?: {[prop: string]: string}) {
11099
if (_reporter)
111100
{

src/omnisharpMain.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,16 @@ import reportStatus from './features/omnisharpStatus';
2525
import {installCoreClrDebug} from './coreclr-debug';
2626
import {promptToAddBuildTaskIfNecessary} from './tasks';
2727
import * as vscode from 'vscode';
28+
import TelemetryReporter from 'vscode-extension-telemetry';
2829

2930
export function activate(context: vscode.ExtensionContext): any {
31+
32+
const extensionId = 'ms-vscode.csharp';
33+
const extension = vscode.extensions.getExtension(extensionId);
34+
const extensionVersion = extension.packageJSON['version'];
35+
const aiKey = 'AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217';
36+
37+
const reporter = new TelemetryReporter(extensionId, extensionVersion, aiKey);
3038

3139
const _selector: vscode.DocumentSelector = {
3240
language: 'csharp',
@@ -81,7 +89,7 @@ export function activate(context: vscode.ExtensionContext): any {
8189
promptToAddBuildTaskIfNecessary();
8290

8391
// install coreclr-debug
84-
installCoreClrDebug(context);
92+
installCoreClrDebug(context, reporter);
8593

8694
context.subscriptions.push(...disposables);
8795
}

0 commit comments

Comments
 (0)