From 4127be29056d0883d54eed52c353dc99afd29089 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 27 Feb 2023 13:04:28 +0000 Subject: [PATCH 1/3] Enable new telemetry by default --- extensions/ql-vscode/src/config.ts | 7 +------ .../test/vscode-tests/no-workspace/telemetry.test.ts | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/extensions/ql-vscode/src/config.ts b/extensions/ql-vscode/src/config.ts index b32519a1a68..a50594463b2 100644 --- a/extensions/ql-vscode/src/config.ts +++ b/extensions/ql-vscode/src/config.ts @@ -83,13 +83,8 @@ export const GLOBAL_ENABLE_TELEMETRY = new Setting( GLOBAL_TELEMETRY_SETTING, ); -const ENABLE_NEW_TELEMETRY = new Setting( - "enableNewTelemetry", - TELEMETRY_SETTING, -); - export function newTelemetryEnabled(): boolean { - return ENABLE_NEW_TELEMETRY.getValue(); + return true; } // Distribution configuration diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts index 41cd1873911..77bb14a0697 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts @@ -394,6 +394,10 @@ describe("telemetry reporting", () => { }); describe("when new telementry is not enabled", () => { + beforeEach(async () => { + jest.spyOn(Config, "newTelemetryEnabled").mockReturnValue(false); + }); + it("should not send a ui-interaction telementry event", async () => { await telemetryListener.initialize(); From c37096bf2cda2c79e7fc1e9398a3bfca67d2f77e Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 27 Feb 2023 13:12:28 +0000 Subject: [PATCH 2/3] Update changelog --- extensions/ql-vscode/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 3605d2cf676..41eff1d5dbc 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -2,7 +2,7 @@ ## [UNRELEASED] -## [UNRELEASED] +- Enable collection of telemetry for UI interactions in webviews. [#2114](https://github.com/github/vscode-codeql/pull/2114) # 1.7.10 - 23 February 2023 From b1ddf89fe3202b36b134156d786110d1bdd9d4c2 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 27 Feb 2023 15:23:36 +0000 Subject: [PATCH 3/3] Update CHANGELOG.md --- extensions/ql-vscode/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 41eff1d5dbc..fa07fc5159c 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -2,7 +2,7 @@ ## [UNRELEASED] -- Enable collection of telemetry for UI interactions in webviews. [#2114](https://github.com/github/vscode-codeql/pull/2114) +- Enable collection of telemetry concerning interactions with UI elements, including buttons, links, and other inputs. [#2114](https://github.com/github/vscode-codeql/pull/2114) # 1.7.10 - 23 February 2023