Remove cached telemetry identity context

Author: yasithrashan

workspaces/ballerina/ballerina-extension/src/extension.ts

@@ -21,7 +21,7 @@ import { BallerinaExtension } from './core';
 import { activate as activateBBE } from './views/bbe';
 import {
     activate as activateTelemetryListener, CMP_EXTENSION_CORE, sendTelemetryEvent,
-    TM_EVENT_EXTENSION_ACTIVATE, initializeTelemetryContext
+    TM_EVENT_EXTENSION_ACTIVATE
 } from './features/telemetry';
 import { activateDebugConfigProvider } from './features/debugger';
 import { activate as activateProjectFeatures } from './features/project';
@@ -125,9 +125,6 @@ export async function activateBallerina(): Promise<BallerinaExtension> {
     try {
         debug('Sending telemetry event.');
         sendTelemetryEvent(ballerinaExtInstance, TM_EVENT_EXTENSION_ACTIVATE, CMP_EXTENSION_CORE);
-
-        // Initialize telemetry identity context
-        initializeTelemetryContext();
     } catch (error) {
         debug('Error sending telemetry event.');
     }

workspaces/ballerina/ballerina-extension/src/features/telemetry/activator.ts

@@ -30,26 +30,25 @@ const schedule = require('node-schedule');
 const TM_EVENT_TYPE_ERROR = "ErrorTelemetryEvent";
 const TM_EVENT_TYPE_FEATURE_USAGE = "FeatureUsageTelemetryEvent";
 
-export async function activate(ballerinaExtInstance: BallerinaExtension) {
-
+export function activate(ballerinaExtInstance: BallerinaExtension) {
     const reporter = ballerinaExtInstance.telemetryReporter;
     const langClient = <ExtendedLangClient>ballerinaExtInstance.langClient;
 
     // Start listening telemtry events from language server
-    langClient.onNotification('telemetry/event', (event: LSTelemetryEvent) => {
+    langClient.onNotification('telemetry/event', async (event: LSTelemetryEvent) => {
         let props: { [key: string]: string; };
         switch (event.type) {
             case TM_EVENT_TYPE_ERROR:
                 const errorEvent: LSErrorTelemetryEvent = <LSErrorTelemetryEvent>event;
-                props = getTelemetryProperties(ballerinaExtInstance, event.component, getMessageObject(TM_EVENT_TYPE_ERROR));
+                props = await getTelemetryProperties(ballerinaExtInstance, event.component, getMessageObject(TM_EVENT_TYPE_ERROR));
                 props["ballerina.langserver.error.description"] = errorEvent.message;
                 props["ballerina.langserver.error.stacktrace"] = errorEvent.errorStackTrace;
                 props["ballerina.langserver.error.message"] = errorEvent.errorMessage;
                 reporter.sendTelemetryEvent(TM_ERROR_LANG_SERVER, props);
                 break;
             case TM_EVENT_TYPE_FEATURE_USAGE:
                 const usageEvent: LSFeatureUsageTelemetryEvent = <LSFeatureUsageTelemetryEvent>event;
-                props = getTelemetryProperties(ballerinaExtInstance, event.component,
+                props = await getTelemetryProperties(ballerinaExtInstance, event.component,
                     getMessageObject(TM_EVENT_TYPE_FEATURE_USAGE));
                 props["ballerina.langserver.feature.name"] = usageEvent.featureName;
                 props["ballerina.langserver.feature.class"] = usageEvent.featureClass;

workspaces/ballerina/ballerina-extension/src/features/telemetry/context.ts

@@ -18,7 +18,7 @@
 
 import TelemetryReporter from "vscode-extension-telemetry";
 import { BallerinaExtension } from "../../core";
-import { getCachedLoginMethod, getCachedBiIntelId } from "./context";
+import { getLoginMethod, getBiIntelId } from "../../utils/ai/auth";
 
 //Ballerina-VSCode-Extention repo key as default
 const DEFAULT_KEY = "3a82b093-5b7b-440c-9aa2-3b8e8e5704e7";
@@ -35,15 +35,14 @@ export function createTelemetryReporter(ext: BallerinaExtension): TelemetryRepor
     if (ext.context) {
         ext.context.subscriptions.push(reporter);
     }
-
     return reporter;
 }
 
-export function sendTelemetryEvent(extension: BallerinaExtension, eventName: string, componentName: string,
+export async function sendTelemetryEvent(extension: BallerinaExtension, eventName: string, componentName: string,
     customDimensions: { [key: string]: string; } = {}, measurements: { [key: string]: number; } = {}) {
     // temporarily disabled in codeserver due to GDPR issue
     if (extension.isTelemetryEnabled() && !extension.getCodeServerContext().codeServerEnv) {
-        extension.telemetryReporter.sendTelemetryEvent(eventName, getTelemetryProperties(extension, componentName,
+        extension.telemetryReporter.sendTelemetryEvent(eventName, await getTelemetryProperties(extension, componentName,
             customDimensions), measurements);
     }
 }
@@ -52,13 +51,16 @@ export async function sendTelemetryException(extension: BallerinaExtension, erro
     params: { [key: string]: string } = {}) {
     // temporarily disabled in codeserver due to GDPR issue
     if (extension.isTelemetryEnabled() && !extension.getCodeServerContext().codeServerEnv) {
-        extension.telemetryReporter.sendTelemetryException(error, getTelemetryProperties(extension, componentName,
+        extension.telemetryReporter.sendTelemetryException(error, await getTelemetryProperties(extension, componentName,
             params));
     }
 }
 
-export function getTelemetryProperties(extension: BallerinaExtension, component: string, params: { [key: string]: string; } = {})
-    : { [key: string]: string; } {
+export async function getTelemetryProperties(extension: BallerinaExtension, component: string, params: { [key: string]: string; } = {})
+    : Promise<{ [key: string]: string; }> {
+
+    const loginType = await getLoginMethod();
+    const biIntelId = await getBiIntelId();
 
     return {
         ...params,
@@ -72,11 +74,10 @@ export function getTelemetryProperties(extension: BallerinaExtension, component:
         'component': CHOREO_COMPONENT_ID,
         'project': CHOREO_PROJECT_ID,
         'org': CHOREO_ORG_ID,
-        'loginType': getCachedLoginMethod() !== undefined ? getCachedLoginMethod() : 'undefined',
-        'biIntelId': getCachedBiIntelId() !== undefined ? getCachedBiIntelId() : 'undefined',
-    };
+        'loginType': loginType,
+        'biIntelId': biIntelId,
+    }
 }
-
 export function getMessageObject(message?: string): { [key: string]: string; } {
     if (message) {
         return { 'ballerina.message': message };
@@ -88,4 +89,3 @@ export * from "./events";
 export * from "./exceptions";
 export * from "./components";
 export * from "./activator";
-export * from "./context";

workspaces/ballerina/ballerina-extension/src/features/telemetry/index.ts

@@ -22,7 +22,6 @@ import { AUTH_CLIENT_ID, AUTH_ORG } from '../../features/ai/utils';
 import axios from 'axios';
 import { jwtDecode, JwtPayload } from 'jwt-decode';
 import { AuthCredentials, LoginMethod } from '@wso2/ballerina-core';
-import { initializeTelemetryContext } from '../../features/telemetry';
 
 export const REFRESH_TOKEN_NOT_AVAILABLE_ERROR_MESSAGE = "Refresh token is not available.";
 export const TOKEN_REFRESH_ONLY_SUPPORTED_FOR_BI_INTEL = "Token refresh is only supported for BI Intelligence authentication";
@@ -125,8 +124,6 @@ async function copilotTokenExists() {
 export const storeAuthCredentials = async (credentials: AuthCredentials): Promise<void> => {
     const credentialsJson = JSON.stringify(credentials);
     await extension.context.secrets.store(AUTH_CREDENTIALS_SECRET_KEY, credentialsJson);
-    // Refresh telemetry identity after storing new credentials
-    initializeTelemetryContext();
 };
 
 export const getAuthCredentials = async (): Promise<AuthCredentials | undefined> => {