Update telemetry import file path

Calvinn Ng · Calvinn Ng · commit 29de263f5295 · 2024-07-24T18:07:00.000+08:00
diff --git a/binary/src/core.ts b/binary/src/core.ts
@@ -8,7 +8,7 @@ import { CodebaseIndexer, PauseToken } from "core/indexing/indexCodebase";
 import { logDevData } from "core/util/devdata";
 import historyManager from "core/util/history";
 import { Message } from "core/util/messenger";
-import { Telemetry } from "core/util/posthog";
+import { Telemetry } from "core/util/logging";
 import { streamDiffLines } from "core/util/verticalEdit";
 import { v4 as uuidv4 } from "uuid";
 import { IpcMessenger } from "./messenger";
diff --git a/core/autocomplete/completionProvider.ts b/core/autocomplete/completionProvider.ts
@@ -20,7 +20,7 @@ import {
   COUNT_COMPLETION_REJECTED_AFTER,
   DEFAULT_AUTOCOMPLETE_OPTS,
 } from "../util/parameters.js";
-import { Telemetry } from "../util/posthog.js";
+import { Telemetry } from "../util/logging.js";
 import { getRangeInString } from "../util/ranges.js";
 import { ImportDefinitionsService } from "./ImportDefinitionsService.js";
 import { BracketMatchingService } from "./brackets.js";
@@ -210,8 +210,7 @@ export class CompletionProvider {
           modelProvider: outcome.modelProvider,
           time: outcome.time,
           cacheHit: outcome.cacheHit,
-        },
-        true,
+        }
       );
       this._outcomes.delete(completionId);
 
@@ -367,8 +366,7 @@ export class CompletionProvider {
         "autocomplete",
         {
           ...restOfOutcome,
-        },
-        true,
+        }
       );
       this._logRejectionTimeouts.delete(completionId);
     }, COUNT_COMPLETION_REJECTED_AFTER);
diff --git a/core/config/ConfigHandler.ts b/core/config/ConfigHandler.ts
@@ -7,7 +7,7 @@ import {
     IdeSettings,
     ILLM,
   } from "../index.js";
-  import { Telemetry } from "../util/posthog.js";
+  import { Telemetry } from "../util/logging.js";
   import { IConfigHandler } from "./IConfigHandler.js";
   import { finalToBrowserConfig, loadFullConfigNode } from "./load.js";
   
diff --git a/core/config/profile/ControlPlaneProfileLoader.ts b/core/config/profile/ControlPlaneProfileLoader.ts
@@ -8,7 +8,7 @@ import {
 import { ControlPlaneClient } from "../../control-plane/client";
 import { TeamAnalytics } from "../../control-plane/TeamAnalytics";
 import ContinueProxy from "../../llm/llms/stubs/ContinueProxy";
-import { Telemetry } from "../../util/posthog";
+import { Telemetry } from "../../util/logging";
 import {
   defaultContextProvidersJetBrains,
   defaultContextProvidersVsCode,
diff --git a/core/config/profile/LocalProfileLoader.ts b/core/config/profile/LocalProfileLoader.ts
@@ -1,5 +1,5 @@
 import { ContinueConfig, ContinueRcJson, IDE, IdeSettings } from "../..";
-import { Telemetry } from "../../util/posthog";
+import { Telemetry } from "../../util/logging";
 import { loadFullConfigNode } from "../load";
 import { IProfileLoader } from "./IProfileLoader";
 
diff --git a/core/continueServer/stubs/headers.ts b/core/continueServer/stubs/headers.ts
@@ -1,5 +1,5 @@
 import { constants, getTimestamp } from "../../deploy/constants";
-import { Telemetry } from "../../util/posthog";
+import { Telemetry } from "../../util/logging";
 
 export async function getHeaders() {
   return {
diff --git a/core/core.ts b/core/core.ts
@@ -29,7 +29,7 @@ import { fetchwithRequestOptions } from "./util/fetchWithOptions.js";
 import historyManager from "./util/history.js";
 import type { IMessenger, Message } from "./util/messenger";
 import { editConfigJson } from "./util/paths.js";
-import { Telemetry } from "./util/posthog.js";
+import { Telemetry } from "./util/logging.js";
 import { streamDiffLines } from "./util/verticalEdit.js";
 
 export class Core {
diff --git a/core/llm/index.ts b/core/llm/index.ts
@@ -18,7 +18,7 @@ import { logDevData } from "../util/devdata.js";
 import { DevDataSqliteDb } from "../util/devdataSqlite.js";
 import { fetchwithRequestOptions } from "../util/fetchWithOptions.js";
 import mergeJson from "../util/merge.js";
-import { Telemetry } from "../util/posthog.js";
+import { Telemetry } from "../util/logging.js";
 import { withExponentialBackoff } from "../util/withExponentialBackoff.js";
 import {
   autodetectPromptTemplates,
@@ -246,8 +246,7 @@ ${prompt}`;
         provider: this.providerName,
         promptTokens: promptTokens,
         generatedTokens: generatedTokens,
-      },
-      true,
+      }
     );
     DevDataSqliteDb.logTokensGenerated(
       model,
diff --git a/core/llm/llms/FreeTrial.ts b/core/llm/llms/FreeTrial.ts
@@ -2,7 +2,7 @@ import { TRIAL_FIM_MODEL } from "../../config/onboarding.js";
 import { getHeaders } from "../../continueServer/stubs/headers.js";
 import { constants } from "../../deploy/constants.js";
 import { ChatMessage, CompletionOptions, ModelProvider } from "../../index.js";
-import { Telemetry } from "../../util/posthog.js";
+import { Telemetry } from "../../util/logging.js";
 import { BaseLLM } from "../index.js";
 import { streamResponse } from "../stream.js";
 
@@ -29,11 +29,11 @@ class FreeTrial extends BaseLLM {
   }
 
   private async _countTokens(prompt: string, model: string, isPrompt: boolean) {
-    if (!Telemetry.client) {
-      throw new Error(
-        'In order to use the free trial, telemetry must be enabled so that we can monitor abuse. To enable telemetry, set "allowAnonymousTelemetry": true in config.json and make sure the box is checked in IDE settings. If you use your own model (local or API key), telemetry will never be required.',
-      );
-    }
+    // if (!Telemetry.client) {
+    //   throw new Error(
+    //     'In order to use the free trial, telemetry must be enabled so that we can monitor abuse. To enable telemetry, set "allowAnonymousTelemetry": true in config.json and make sure the box is checked in IDE settings. If you use your own model (local or API key), telemetry will never be required.',
+    //   );
+    // }
     const event = isPrompt
       ? "free_trial_prompt_tokens"
       : "free_trial_completion_tokens";
diff --git a/core/util/verticalEdit.ts b/core/util/verticalEdit.ts
@@ -15,7 +15,7 @@ import {
   LLMFullCompletionOptions,
 } from "../index.js";
 import { gptEditPrompt } from "../llm/templates/edit.js";
-import { Telemetry } from "./posthog.js";
+import { Telemetry } from "./logging.js";
 
 function constructPrompt(
   prefix: string,
@@ -66,7 +66,6 @@ export async function* streamDiffLines(
       model: llm.model,
       provider: llm.providerName,
     },
-    true,
   );
 
   // Strip common indentation for the LLM, then add back after generation
diff --git a/extensions/vscode/src/activation/activate.ts b/extensions/vscode/src/activation/activate.ts
@@ -1,5 +1,5 @@
 import { getTsConfigPath, getContinueRcPath, migrate } from "core/util/paths";
-import { Telemetry } from "core/util/posthog";
+import { Telemetry } from "core/util/logging";
 import path from "node:path";
 import * as vscode from "vscode";
 import { VsCodeExtension } from "../extension/VsCodeExtension";
@@ -44,8 +44,7 @@ export async function activateExtension(context: vscode.ExtensionContext) {
       "install",
       {
         extensionVersion: getExtensionVersion(),
-      },
-      true,
+      }
     );
   }
 
diff --git a/extensions/vscode/src/commands.ts b/extensions/vscode/src/commands.ts
@@ -10,7 +10,7 @@ import { IConfigHandler } from "core/config/IConfigHandler";
 import { ContinueServerClient } from "core/continueServer/stubs/client";
 import { GlobalContext } from "core/util/GlobalContext";
 import { getConfigJsonPath, getDevDataFilePath } from "core/util/paths";
-import { Telemetry } from "core/util/posthog";
+import { Telemetry } from "core/util/logging";
 import readLastLines from "read-last-lines";
 import {
   StatusBarStatus,
diff --git a/extensions/vscode/src/extension.ts b/extensions/vscode/src/extension.ts
@@ -3,7 +3,7 @@
  */
 
 import { setupCa } from "core/util/ca";
-import { Telemetry } from "core/util/posthog";
+import { Telemetry } from "core/util/logging";
 import * as vscode from "vscode";
 import { getExtensionVersion } from "./util/util";
 
@@ -41,8 +41,5 @@ export function deactivate() {
     {
       extensionVersion: getExtensionVersion(),
     },
-    true,
   );
-
-  Telemetry.shutdownPosthogClient();
 }
diff --git a/extensions/vscode/src/lang-server/codeLens/providers/QuickActionsCodeLensProvider.ts b/extensions/vscode/src/lang-server/codeLens/providers/QuickActionsCodeLensProvider.ts
@@ -5,7 +5,7 @@ import {
   getContinueWorkspaceConfig,
 } from "../../../util/workspaceConfig";
 import { isTutorialFile } from "./TutorialCodeLensProvider";
-import { Telemetry } from "core/util/posthog";
+import { Telemetry } from "core/util/logging";
 
 export const ENABLE_QUICK_ACTIONS_KEY = "enableQuickActions";
 
