address code review feedback

Author: Saurabh7019

docs/src/content/docs/about/telemetry.mdx

@@ -4,11 +4,29 @@ title: Telemetry
 
 The SPFx Toolkit collects basic usage telemetry to help us understand how the extension is used and improve its features. We follow the VS Code Telemetry extension authors guide and use the recommended `@vscode/extension-telemetry` package to send anonymized telemetry data to Azure Application Insights.
 
+## Privacy and Data Protection
+
+- All telemetry data is anonymized and does not contain personal information
+- No code, file paths, or project-specific data is collected
+- Data is used solely to understand feature usage and prioritize improvements
+- We comply with relevant privacy regulations and Microsoft's privacy policies
+- You can disable telemetry through VS Code's standard telemetry settings
+
+## How to Disable Telemetry
+
+To disable telemetry collection, you can use VS Code's built-in telemetry settings:
+1. Open VS Code Settings (File > Preferences > Settings)
+2. Search for "Telemetry"
+3. Set "Telemetry: Telemetry Level" to "off"
+
+This will disable telemetry for all VS Code extensions that respect the standard telemetry settings, including the SharePoint Framework Toolkit.
+
 ## What We Track
 
 We collect anonymized usage data for the following actions:
 
 ### Actions View
+
 - Create New Project
 - Add Component to Project
 - Upgrade Project
@@ -25,18 +43,32 @@ We collect anonymized usage data for the following actions:
 - Install Dependencies
 
 ### Tasks View
-- Build Project
-- Bundle Project
-- Clean Project
-- Deploy to Azure Storage
-- Package Project
-- Publish Project
-- Serve Project
-- Test Project
-- Trust Dev Cert
+
+**Gulp Tasks:**
+- gulp build
+- gulp bundle
+- gulp clean
+- gulp package-solution
+- gulp serve
+- gulp test
+- gulp trust-dev-cert
+- gulp deploy-azure-storage
+
+**Heft Tasks:**
+- heft build
+- heft clean
+- heft start
+- heft package
+- heft test
+- heft trust-dev-cert
+- heft deploy-azure-storage
+- heft eject
+
+**NPM Scripts:**
 - Execute Terminal Command (for NPM scripts with script name tracking)
 
 ### App Management (Environment View)
+
 - Add Tenant App Catalog
 - Add Site App Catalog
 - Remove Site App Catalog
@@ -53,24 +85,4 @@ We collect anonymized usage data for the following actions:
 - Remove Tenant Wide Extension
 - Enable Tenant Wide Extension
 - Disable Tenant Wide Extension
-- Update Tenant Wide Extension
-
-### Authentication
-- Microsoft 365 login and logout actions
-
-## Privacy and Data Protection
-
-- All telemetry data is anonymized and does not contain personal information
-- No code, file paths, or project-specific data is collected
-- Data is used solely to understand feature usage and prioritize improvements
-- We comply with relevant privacy regulations and Microsoft's privacy policies
-- You can disable telemetry through VS Code's standard telemetry settings
-
-## How to Disable Telemetry
-
-To disable telemetry collection, you can use VS Code's built-in telemetry settings:
-1. Open VS Code Settings (File > Preferences > Settings)
-2. Search for "Telemetry"
-3. Set "Telemetry: Telemetry Level" to "off"
-
-This will disable telemetry for all VS Code extensions that respect the standard telemetry settings, including the SharePoint Framework Toolkit.
+- Update Tenant Wide Extension

package.json

@@ -46,7 +46,7 @@
 	],
 	"license": "MIT",
 	"main": "./dist/extension.js",
-	"aiConnectionString": "InstrumentationKey=137865b8-3555-4866-a2c9-7e35ead3d578;IngestionEndpoint=https://northeurope-2.in.applicationinsights.azure.com/;LiveEndpoint=https://northeurope.livediagnostics.monitor.azure.com/;ApplicationId=d253fe5b-d38c-41f5-841d-afed5bcd9557",
+	"aiConnectionString": "",
 	"contributes": {
 		"chatParticipants": [
 			{

src/extension.ts

@@ -56,18 +56,21 @@ 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,
 			platform: process.platform
 		}, {
 			activationTimeMs: activationDuration
 		});
+	} else {
+		Logger.channel?.appendLine('No telemetry connection string configured.');
 	}
 
 	scheduleFeedbackChecks(

src/providers/AuthProvider.ts

@@ -12,7 +12,6 @@ import { TerminalCommandExecuter } from '../services/executeWrappers/TerminalCom
 import { isValidGUID } from '../utils/validateGuid';
 import { CliExecuter } from '../services/executeWrappers/CliCommandExecuter';
 import { EntraAppRegistration } from '../services/actions/EntraAppRegistration';
-import { TelemetryService } from '../utils/telemetry';
 
 
 export class M365AuthenticationSession implements AuthenticationSession {
@@ -53,10 +52,10 @@ export class AuthProvider implements AuthenticationProvider, Disposable {
     );
 
     subscriptions.push(
-      commands.registerCommand(Commands.login, TelemetryService.withTelemetry(Commands.login, AuthProvider.signIn))
+      commands.registerCommand(Commands.login, AuthProvider.signIn)
     );
     subscriptions.push(
-      commands.registerCommand(Commands.logout, TelemetryService.withTelemetry(Commands.logout, AuthProvider.logout))
+      commands.registerCommand(Commands.logout, AuthProvider.logout)
     );
   }
 

src/utils/telemetry.ts

@@ -1,12 +1,9 @@
-import { ExtensionContext, commands, env } from 'vscode';
+import { ExtensionContext, env } from 'vscode';
 import { TelemetryReporter } from '@vscode/extension-telemetry';
 import { Commands } from '../constants';
 
-export const TELEMETRY_EVENTS = {
-    // accountTreeView
-    [Commands.login]: 'Login',
-    [Commands.logout]: 'Logout',
 
+export const TELEMETRY_EVENTS = {
     // tasksTreeView
     [Commands.gulpBuildProject]: 'Gulp Build Project',
     [Commands.gulpBundleProject]: 'Gulp Bundle Project',
@@ -68,7 +65,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 +116,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 +133,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);
             }
         };
     }