diff --git a/extensions/telemetry/src/tracker.ts b/extensions/telemetry/src/tracker.ts index ed23253bd6..d5f16334b2 100644 --- a/extensions/telemetry/src/tracker.ts +++ b/extensions/telemetry/src/tracker.ts @@ -1,4 +1,4 @@ -import { EventBus, Util } from "@k8slens/extensions" +import { EventBus, Util, Store, App } from "@k8slens/extensions" import ua from "universal-analytics" import { machineIdSync } from "node-machine-id" import { telemetryPreferencesStore } from "./telemetry-preferences-store" @@ -15,6 +15,8 @@ export class Tracker extends Util.Singleton { protected locale: string; protected electronUA: string; + protected reportInterval: NodeJS.Timeout + private constructor() { super(); try { @@ -23,7 +25,7 @@ export class Tracker extends Util.Singleton { this.visitor = ua(Tracker.GA_ID) } this.visitor.set("dl", "https://telemetry.k8slens.dev") - + this.visitor.set("ua", `Lens ${App.version} (${this.getOS()})`) } start() { @@ -36,6 +38,8 @@ export class Tracker extends Util.Singleton { } this.eventHandlers.push(handler) EventBus.appEventBus.addListener(handler) + + this.reportInterval = setInterval(this.reportData, 60 * 60 * 1000) // report every 1h } stop() { @@ -46,12 +50,59 @@ export class Tracker extends Util.Singleton { for (const handler of this.eventHandlers) { EventBus.appEventBus.removeListener(handler) } + if (this.reportInterval) { + clearInterval(this.reportInterval) + } } protected async isTelemetryAllowed(): Promise { return telemetryPreferencesStore.enabled } + protected reportData() { + const clustersList = Store.clusterStore.clustersList + + this.event("generic-data", "report", { + appVersion: App.version, + clustersCount: clustersList.length, + workspacesCount: Store.workspaceStore.workspacesList.length + }) + + clustersList.forEach((cluster) => { + if (!cluster?.metadata.lastSeen) { return } + this.reportClusterData(cluster) + }) + } + + protected reportClusterData(cluster: Store.ClusterModel) { + this.event("cluster-data", "report", { + id: cluster.metadata.id, + kubernetesVersion: cluster.metadata.version, + distribution: cluster.metadata.distribution, + nodesCount: cluster.metadata.nodes, + lastSeen: cluster.metadata.lastSeen + }) + } + + protected getOS() { + let os = "" + if (App.isMac) { + os = "MacOS" + } else if(App.isWindows) { + os = "Windows" + } else if (App.isLinux) { + os = "Linux" + if (App.isSnap) { + os += "; Snap" + } else { + os += "; AppImage" + } + } else { + os = "Unknown" + } + return os + } + protected async event(eventCategory: string, eventAction: string, otherParams = {}) { try { const allowed = await this.isTelemetryAllowed(); diff --git a/src/common/vars.ts b/src/common/vars.ts index 78fe4db13c..dbf9b95bd7 100644 --- a/src/common/vars.ts +++ b/src/common/vars.ts @@ -5,7 +5,9 @@ import { defineGlobal } from "./utils/defineGlobal"; export const isMac = process.platform === "darwin" export const isWindows = process.platform === "win32" +export const isLinux = process.platform === "linux" export const isDebugging = process.env.DEBUG === "true"; +export const isSnap = !!process.env["SNAP"] export const isProduction = process.env.NODE_ENV === "production" export const isTestEnv = !!process.env.JEST_WORKER_ID; export const isDevelopment = !isTestEnv && !isProduction; diff --git a/src/extensions/core-api/app.ts b/src/extensions/core-api/app.ts new file mode 100644 index 0000000000..192a3222af --- /dev/null +++ b/src/extensions/core-api/app.ts @@ -0,0 +1,5 @@ +import { app } from "electron"; +import { getAppVersion } from "../../common/utils"; + +export const version = getAppVersion() +export { isSnap, isWindows, isMac, isLinux, appName } from "../../common/vars" \ No newline at end of file diff --git a/src/extensions/core-api/stores.ts b/src/extensions/core-api/stores.ts index c8405bd67f..1b6a9bc09d 100644 --- a/src/extensions/core-api/stores.ts +++ b/src/extensions/core-api/stores.ts @@ -1 +1,3 @@ export { ExtensionStore } from "../extension-store" +export { clusterStore, ClusterModel } from "../../common/cluster-store" +export { workspaceStore} from "../../common/workspace-store" diff --git a/src/extensions/core-extension-api.ts b/src/extensions/core-extension-api.ts index 2dcce47178..1f7f2db065 100644 --- a/src/extensions/core-extension-api.ts +++ b/src/extensions/core-extension-api.ts @@ -7,9 +7,11 @@ export * from "./lens-renderer-extension" import * as EventBus from "./core-api/event-bus" import * as Store from "./core-api/stores" import * as Util from "./core-api/utils" +import * as App from "./core-api/app" import * as Registry from "./core-api/registries" export { + App, EventBus, Registry, Store,