Move telemetry to common/vscode

extensions/ql-vscode/src/common/vscode/commands.ts

@@ -12,7 +12,7 @@ import {
 } from "../../pure/helpers-pure";
 import { redactableError } from "../../pure/errors";
 import { UserCancellationException } from "./progress";
-import { telemetryListener } from "../../telemetry";
+import { telemetryListener } from "./telemetry";
 import { showAndLogExceptionWithTelemetry } from "./logging";
 
 /**

extensions/ql-vscode/src/common/vscode/logging.ts

@@ -4,7 +4,7 @@ import {
   ShowAndLogOptions,
 } from "../logging";
 import { RedactableError } from "../../pure/errors";
-import { telemetryListener } from "../../telemetry";
+import { telemetryListener } from "./telemetry";
 
 interface ShowAndLogExceptionOptions extends ShowAndLogOptions {
   /** Custom properties to include in the telemetry report. */

extensions/ql-vscode/src/common/vscode/telemetry.ts

@@ -13,12 +13,12 @@ import {
   LOG_TELEMETRY,
   isIntegrationTestMode,
   isCanary,
-} from "./config";
+} from "../../config";
 import * as appInsights from "applicationinsights";
-import { extLogger } from "./common";
-import { UserCancellationException } from "./common/vscode/progress";
-import { showBinaryChoiceWithUrlDialog } from "./common/vscode/dialog";
-import { RedactableError } from "./pure/errors";
+import { extLogger } from "../index";
+import { UserCancellationException } from "./progress";
+import { showBinaryChoiceWithUrlDialog } from "./dialog";
+import { RedactableError } from "../../pure/errors";
 import { SemVer } from "semver";
 
 // Key is injected at build time through the APP_INSIGHTS_KEY environment variable.

extensions/ql-vscode/src/compare/compare-view.ts

@@ -23,7 +23,7 @@ import {
   AbstractWebview,
   WebviewPanelConfig,
 } from "../common/vscode/abstract-webview";
-import { telemetryListener } from "../telemetry";
+import { telemetryListener } from "../common/vscode/telemetry";
 import { redactableError } from "../pure/errors";
 
 interface ComparePair {

extensions/ql-vscode/src/extension.ts

@@ -90,7 +90,7 @@ import {
 import { QLTestAdapterFactory } from "./query-testing/test-adapter";
 import { TestUIService } from "./query-testing/test-ui";
 import { CompareView } from "./compare/compare-view";
-import { initializeTelemetry } from "./telemetry";
+import { initializeTelemetry } from "./common/vscode/telemetry";
 import { ProgressCallback, withProgress } from "./common/vscode/progress";
 import { CodeQlStatusBarHandler } from "./status-bar";
 import { getPackagingCommands } from "./packaging";

extensions/ql-vscode/src/local-queries/results-view.ts

@@ -71,7 +71,7 @@ import {
 } from "../common/vscode/abstract-webview";
 import { isCanary, PAGE_SIZE } from "../config";
 import { HistoryItemLabelProvider } from "../query-history/history-item-label-provider";
-import { telemetryListener } from "../telemetry";
+import { telemetryListener } from "../common/vscode/telemetry";
 import { redactableError } from "../pure/errors";
 import { ResultsViewCommands } from "../common/commands";
 

extensions/ql-vscode/src/variant-analysis/data-flow-paths-view.ts

@@ -4,7 +4,7 @@ import {
   WebviewPanelConfig,
 } from "../common/vscode/abstract-webview";
 import { assertNever } from "../pure/helpers-pure";
-import { telemetryListener } from "../telemetry";
+import { telemetryListener } from "../common/vscode/telemetry";
 import {
   FromDataFlowPathsMessage,
   ToDataFlowPathsMessage,

extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts

@@ -18,7 +18,7 @@ import {
   VariantAnalysisViewInterface,
   VariantAnalysisViewManager,
 } from "./variant-analysis-view-manager";
-import { telemetryListener } from "../telemetry";
+import { telemetryListener } from "../common/vscode/telemetry";
 import { redactableError } from "../pure/errors";
 import { DataFlowPathsView } from "./data-flow-paths-view";
 import { DataFlowPaths } from "./shared/data-flow-paths";

extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts

@@ -8,7 +8,7 @@ import {
 import {
   TelemetryListener,
   telemetryListener as globalTelemetryListener,
-} from "../../../src/telemetry";
+} from "../../../src/common/vscode/telemetry";
 import { UserCancellationException } from "../../../src/common/vscode/progress";
 import { ENABLE_TELEMETRY } from "../../../src/config";
 import { createMockExtensionContext } from "./index";