Merge pull request #3961 from continuedev/dallin/unsetup-analytics

Fix: Shut down team analytics on config change

Author: sestinj

core/config/profile/doLoadConfig.ts

@@ -124,12 +124,14 @@ export default async function doLoadConfig(
 
   if (newConfig.analytics) {
     await TeamAnalytics.setup(
-      newConfig.analytics as any, // TODO: Need to get rid of index.d.ts once and for all
+      newConfig.analytics,
       uniqueId,
       ideInfo.extensionVersion,
       controlPlaneClient,
       controlPlaneProxyInfo,
     );
+  } else {
+    await TeamAnalytics.shutdown();
   }
 
   newConfig = await injectControlPlaneProxyInfo(

core/control-plane/TeamAnalytics.ts

@@ -1,7 +1,5 @@
 import os from "node:os";
 
-import { Analytics } from "@continuedev/config-types";
-
 import ContinueProxyAnalyticsProvider from "./analytics/ContinueProxyAnalyticsProvider.js";
 import {
   ControlPlaneProxyInfo,
@@ -10,9 +8,10 @@ import {
 import LogStashAnalyticsProvider from "./analytics/LogStashAnalyticsProvider.js";
 import PostHogAnalyticsProvider from "./analytics/PostHogAnalyticsProvider.js";
 import { ControlPlaneClient } from "./client.js";
+import { AnalyticsConfig } from "../index.js";
 
 function createAnalyticsProvider(
-  config: Analytics,
+  config: AnalyticsConfig,
 ): IAnalyticsProvider | undefined {
   // @ts-ignore
   switch (config.provider) {
@@ -42,7 +41,7 @@ export class TeamAnalytics {
   }
 
   static async setup(
-    config: Analytics,
+    config: AnalyticsConfig,
     uniqueId: string,
     extensionVersion: string,
     controlPlaneClient: ControlPlaneClient,
@@ -52,22 +51,27 @@ export class TeamAnalytics {
     TeamAnalytics.os = os.platform();
     TeamAnalytics.extensionVersion = extensionVersion;
 
-    if (!config) {
-      await TeamAnalytics.provider?.shutdown();
-      TeamAnalytics.provider = undefined;
-    } else {
-      TeamAnalytics.provider = createAnalyticsProvider(config);
-      await TeamAnalytics.provider?.setup(
-        config,
-        uniqueId,
-        controlPlaneProxyInfo,
-      );
+    TeamAnalytics.provider = createAnalyticsProvider(config);
+    await TeamAnalytics.provider?.setup(
+      config,
+      uniqueId,
+      controlPlaneProxyInfo,
+    );
+
+    if (config.provider === "continue-proxy") {
+      (
+        TeamAnalytics.provider as ContinueProxyAnalyticsProvider
+      ).controlPlaneClient = controlPlaneClient;
+    }
+  }
 
-      if (config.provider === "continue-proxy") {
-        (
-          TeamAnalytics.provider as ContinueProxyAnalyticsProvider
-        ).controlPlaneClient = controlPlaneClient;
-      }
+  static async shutdown() {
+    if (TeamAnalytics.provider) {
+      await TeamAnalytics.provider.shutdown();
+      TeamAnalytics.provider = undefined;
+      TeamAnalytics.os = undefined;
+      TeamAnalytics.extensionVersion = undefined;
+      TeamAnalytics.uniqueId = "NOT_UNIQUE";
     }
   }
 }

core/control-plane/analytics/IAnalyticsProvider.ts

@@ -1,4 +1,4 @@
-import { Analytics } from "@continuedev/config-types";
+import { AnalyticsConfig } from "../..";
 
 export interface AnalyticsMetadata {
   extensionVersion: string;
@@ -13,7 +13,7 @@ export interface ControlPlaneProxyInfo {
 export interface IAnalyticsProvider {
   capture(event: string, properties: { [key: string]: any }): Promise<void>;
   setup(
-    config: Analytics,
+    config: AnalyticsConfig,
     uniqueId: string,
     controlPlaneProxyInfo?: ControlPlaneProxyInfo,
   ): Promise<void>;

core/index.d.ts

@@ -1105,7 +1105,7 @@ export interface ExperimentalConfig {
 }
 
 export interface AnalyticsConfig {
-  type: string;
+  provider: string;
   url?: string;
   clientKey?: string;
 }