Skip to content

Commit 7bbbf8b

Browse files
Merge pull request github#1942 from github/robertbrignull/telemetryListener_undefined
Acknowledge that telemetryListener may be undefined
2 parents 8346eda + f977701 commit 7bbbf8b

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

extensions/ql-vscode/src/commandRunner.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export function commandRunner(
147147
return undefined;
148148
} finally {
149149
const executionTime = Date.now() - startTime;
150-
telemetryListener.sendCommandUsage(commandId, executionTime, error);
150+
telemetryListener?.sendCommandUsage(commandId, executionTime, error);
151151
}
152152
});
153153
}
@@ -201,7 +201,7 @@ export function commandRunnerWithProgress<R>(
201201
return undefined;
202202
} finally {
203203
const executionTime = Date.now() - startTime;
204-
telemetryListener.sendCommandUsage(commandId, executionTime, error);
204+
telemetryListener?.sendCommandUsage(commandId, executionTime, error);
205205
}
206206
});
207207
}

extensions/ql-vscode/src/telemetry.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,15 @@ export class TelemetryListener extends ConfigListener {
227227
/**
228228
* The global Telemetry instance
229229
*/
230-
export let telemetryListener: TelemetryListener;
230+
export let telemetryListener: TelemetryListener | undefined;
231231

232232
export async function initializeTelemetry(
233233
extension: Extension<any>,
234234
ctx: ExtensionContext,
235235
): Promise<void> {
236+
if (telemetryListener !== undefined) {
237+
throw new Error("Telemetry is already initialized");
238+
}
236239
telemetryListener = new TelemetryListener(
237240
extension.id,
238241
extension.packageJSON.version,

0 commit comments

Comments
 (0)