address code review feedback

Author: Saurabh7019

src/extension.ts

@@ -56,11 +56,12 @@ export async function activate(context: vscode.ExtensionContext) {
 	telemetryService = TelemetryService.getInstance();
 	const packageJson = context.extension?.packageJSON;
 	const connectionString = packageJson?.aiConnectionString;
+
+	const activationDuration = Date.now() - activationStartTime;
+
 	if (connectionString) {
 		telemetryService.initialize(context, connectionString);
 
-		const activationDuration = Date.now() - activationStartTime;
-
 		telemetryService.sendEvent('Extension Activated', {
 			version: context.extension.packageJSON.version,
 			nodeVersion: process.version,

src/utils/telemetry.ts

@@ -1,4 +1,4 @@
-import { ExtensionContext, commands, env } from 'vscode';
+import { ExtensionContext, env } from 'vscode';
 import { TelemetryReporter } from '@vscode/extension-telemetry';
 import { Commands } from '../constants';
 
@@ -68,7 +68,7 @@ export const TELEMETRY_EVENTS = {
 export class TelemetryService {
     private static instance: TelemetryService;
     public reporter: TelemetryReporter | undefined;
-    private static isInternalCall: boolean = false;
+    private static activeExecutions: Set<string> = new Set();
 
     private constructor() { }
 
@@ -119,7 +119,10 @@ export class TelemetryService {
         return async (...args: any[]) => {
             const telemetryService = TelemetryService.getInstance();
 
-            if (telemetryService.reporter && !TelemetryService.isInternalCall) {
+            // consider this an internal call if there are ANY active executions
+            const isInternalCall = TelemetryService.activeExecutions.size > 0;
+
+            if (telemetryService.reporter && !isInternalCall) {
                 const telemetryProperties: Record<string, string> = { ...properties };
 
                 // additional properties for npm scripts
@@ -133,12 +136,14 @@ export class TelemetryService {
                 telemetryService.sendEvent(eventName, telemetryProperties, measurements);
             }
 
-            // to avoid twice tracking triggered by clean, build, bundle, etc. which internally calls executeTerminalCommand
-            TelemetryService.isInternalCall = true;
+            // Track this execution
+            const executionId = Math.random().toString(36).substring(7);
+            TelemetryService.activeExecutions.add(executionId);
+
             try {
                 return await originalCommand(...args);
             } finally {
-                TelemetryService.isInternalCall = false;
+                TelemetryService.activeExecutions.delete(executionId);
             }
         };
     }