add subscriptionId, swaCliVersion to telemetry reporting. add encrypted aiKey

Author: Timothy Wang

src/config.ts

@@ -83,3 +83,12 @@ export const DEFAULT_CONFIG: SWACLIConfig = {
   // swa db options
   folderName: SWA_CLI_DATA_API_FOLDER || "swa-db-connections",
 };
+
+export const getEnvVariablesForTelemetry = (): SWACLIEnv => {
+  const { AZURE_SUBSCRIPTION_ID, SWA_CLI_VERSION } = swaCLIEnv();
+
+  return {
+    AZURE_SUBSCRIPTION_ID,
+    SWA_CLI_VERSION,
+  };
+};

src/core/constants.ts

@@ -291,3 +291,7 @@ export const TELEMETRY_RESPONSE_TYPES = {
   Failure: "Failure",
   Success: "Success",
 };
+
+export const TELEMETRY_AI_KEY =
+  "9928d14e7b98b148bdf662c107ad83a7:a52ec390fdb8602f2ae0f0d9d32f1a35ff925dad278eedb854ac0d00f8e77819abe0b37424fe536f160f8cc4142f77392d20e7d035134b2d23e03af772491a9749e9571300f86102c41b9bf8726814427db2a0f25926b743c83cddefd71ffa4cc8e77a9a1a214b14a323e5924a01c82664ee88387ae0a21f3d4ad78c86af45f161872b50671e032f28e849de2614de22c7b0497550a8cbdc64630528c6fb74865772774ec5370d5b8bdb1831e5a6bbfc10bd2b982da89e0d0f3915b7b60299fa7afd15bdd01dbc8ae7611f84b2b0845ad62f31b5082c7c9385bbb577aae8f1e1b239788ee363c8494d4c0e15ae735cf391cfce1086627440cd5cff912df384b3";
+export const TELEMETRY_SERVICE_HASH = "b5335dd37f994c4e2c5b4a78f7fc95e4";

src/core/telemetry/utils.ts

@@ -4,18 +4,21 @@ dotenv.config();
 import TelemetryReporter from "./telemetryReporter.js";
 import type { TelemetryEventMeasurements, TelemetryEventProperties } from "./telemetryReporterTypes.js";
 import { readCLIEnvFile } from "../utils/file.js";
-import { DEFAULT_CONFIG } from "../../config.js";
+import { getEnvVariablesForTelemetry } from "../../config.js";
 import { logger } from "../utils/logger.js";
 import crypto from "crypto";
-
-const aiKey = "TODO";
+import { CryptoService } from "../swa-cli-persistence-plugin/impl/crypto.js";
+import { TELEMETRY_AI_KEY, TELEMETRY_SERVICE_HASH } from "../constants.js";
 
 export async function collectTelemetryEvent(event: string, properties?: TelemetryEventProperties, measurements?: TelemetryEventMeasurements) {
   const reporter = await GetTelemetryReporter();
 
   if (reporter) {
+    let environmentVariables = getEnvVariablesForTelemetry();
+
     let extendedTelemetryEventProperties = {
-      subscriptionId: DEFAULT_CONFIG.subscriptionId!,
+      subscriptionId: environmentVariables.AZURE_SUBSCRIPTION_ID!,
+      swaCliVersion: environmentVariables.SWA_CLI_VERSION!,
     } as TelemetryEventProperties;
 
     logger.silly(`TELEMETRY REPORTING: ${event}, ${JSON.stringify({ ...properties, ...extendedTelemetryEventProperties })}, ${measurements}`);
@@ -26,8 +29,11 @@ export async function collectTelemetryEvent(event: string, properties?: Telemetr
 export async function collectTelemetryException(exception: Error, properties?: TelemetryEventProperties, measurements?: TelemetryEventMeasurements) {
   const reporter = await GetTelemetryReporter();
   if (reporter) {
+    let environmentVariables = getEnvVariablesForTelemetry();
+
     let extendedTelemetryEventProperties = {
-      subscriptionId: DEFAULT_CONFIG.subscriptionId!,
+      subscriptionId: environmentVariables.AZURE_SUBSCRIPTION_ID!,
+      swaCliVersion: environmentVariables.SWA_CLI_VERSION!,
     } as TelemetryEventProperties;
 
     logger.silly(
@@ -40,7 +46,9 @@ export async function collectTelemetryException(exception: Error, properties?: T
 export async function GetTelemetryReporter() {
   const config = await readCLIEnvFile();
   if (!config["SWA_CLI_CAPTURE_TELEMETRY"] || config["SWA_CLI_CAPTURE_TELEMETRY"].toLowerCase() === "true") {
-    const reporter: TelemetryReporter = new TelemetryReporter(aiKey);
+    const cryptoService = new CryptoService(TELEMETRY_SERVICE_HASH);
+    const decryptedAiKey = await cryptoService.decrypt(TELEMETRY_AI_KEY);
+    const reporter: TelemetryReporter = new TelemetryReporter(decryptedAiKey);
     return reporter;
   }
   return undefined;