Address PR feedback: refactor telemetry, fix defaults, use configured hasher

Co-authored-by: baronfel <[email protected]>

Author: Copilot

src/Cli/dotnet/Commands/Run/RunCommand.cs

@@ -773,91 +773,114 @@ private void SendRunTelemetry(
         try
         {
             bool isFileBased = EntryPointFileFullPath is not null;
-            string projectIdentifier;
-            int sdkCount = 1; // Default assumption
-            int packageReferenceCount = 0;
-            int projectReferenceCount = 0;
-            int additionalPropertiesCount = 0;
-            bool? usedMSBuild = null;
-            bool? usedRoslynCompiler = null;
 
             if (isFileBased)
             {
-                // File-based app telemetry
-                projectIdentifier = RunTelemetry.GetFileBasedIdentifier(EntryPointFileFullPath!);
-                
-                var virtualCommand = CreateVirtualCommand();
-                var directives = virtualCommand.Directives;
-                
-                sdkCount = RunTelemetry.CountSdks(directives: directives);
-                packageReferenceCount = RunTelemetry.CountPackageReferences(directives: directives);
-                projectReferenceCount = RunTelemetry.CountProjectReferences(directives: directives);
-                additionalPropertiesCount = RunTelemetry.CountAdditionalProperties(directives);
-                
-                // Determine if MSBuild or Roslyn compiler was used
-                if (cachedRunProperties != null)
-                {
-                    // If we have cached properties, we used the optimized path
-                    usedRoslynCompiler = projectFactory == null;
-                    usedMSBuild = projectFactory != null;
-                }
-                else if (ShouldBuild)
-                {
-                    // Fresh build - check if we used MSBuild optimization
-                    usedMSBuild = !directives.IsDefaultOrEmpty || projectFactory != null;
-                    usedRoslynCompiler = directives.IsDefaultOrEmpty && projectFactory == null;
-                }
+                SendFileBasedTelemetry(launchSettings, projectFactory, cachedRunProperties);
             }
             else
             {
-                // Project-based app telemetry
-                projectIdentifier = RunTelemetry.GetProjectBasedIdentifier(ProjectFileFullPath!, GetRepositoryRoot());
-                
-                // Try to get project information for telemetry
-                // We need to evaluate the project to get accurate counts
-                if (ShouldBuild)
-                {
-                    // We built the project, so we can evaluate it for telemetry
-                    try
-                    {
-                        var globalProperties = MSBuildArgs.GlobalProperties?.ToDictionary() ?? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-                        globalProperties[Constants.EnableDefaultItems] = "false";
-                        globalProperties[Constants.MSBuildExtensionsPath] = AppContext.BaseDirectory;
-                        
-                        using var collection = new ProjectCollection(globalProperties: globalProperties);
-                        var project = collection.LoadProject(ProjectFileFullPath!).CreateProjectInstance();
-                        
-                        sdkCount = RunTelemetry.CountSdks(project);
-                        packageReferenceCount = RunTelemetry.CountPackageReferences(project);
-                        projectReferenceCount = RunTelemetry.CountProjectReferences(project);
-                    }
-                    catch
-                    {
-                        // If project evaluation fails for telemetry, use defaults
-                        // We don't want telemetry collection to affect the run operation
-                    }
-                }
+                SendProjectBasedTelemetry(launchSettings);
             }
-
-            RunTelemetry.TrackRunEvent(
-                isFileBased: isFileBased,
-                launchProfile: LaunchProfile,
-                noLaunchProfile: NoLaunchProfile,
-                launchSettings: launchSettings,
-                projectIdentifier: projectIdentifier,
-                sdkCount: sdkCount,
-                packageReferenceCount: packageReferenceCount,
-                projectReferenceCount: projectReferenceCount,
-                additionalPropertiesCount: additionalPropertiesCount,
-                usedMSBuild: usedMSBuild,
-                usedRoslynCompiler: usedRoslynCompiler);
         }
         catch
         {
             // Silently ignore telemetry errors to not affect the run operation
         }
     }
 
+    /// <summary>
+    /// Builds and sends telemetry data for file-based app runs.
+    /// </summary>
+    private void SendFileBasedTelemetry(
+        ProjectLaunchSettingsModel? launchSettings,
+        Func<ProjectCollection, ProjectInstance>? projectFactory,
+        RunProperties? cachedRunProperties)
+    {
+        var projectIdentifier = RunTelemetry.GetFileBasedIdentifier(EntryPointFileFullPath!, Sha256Hasher.Hash);
+        
+        var virtualCommand = CreateVirtualCommand();
+        var directives = virtualCommand.Directives;
+        
+        var sdkCount = RunTelemetry.CountSdks(directives);
+        var packageReferenceCount = RunTelemetry.CountPackageReferences(directives);
+        var projectReferenceCount = RunTelemetry.CountProjectReferences(directives);
+        var additionalPropertiesCount = RunTelemetry.CountAdditionalProperties(directives);
+        
+        // Determine if MSBuild or Roslyn compiler was used
+        bool? usedMSBuild = null;
+        bool? usedRoslynCompiler = null;
+        
+        if (cachedRunProperties != null)
+        {
+            // If we have cached properties, we used the optimized path
+            usedRoslynCompiler = projectFactory == null;
+            usedMSBuild = projectFactory != null;
+        }
+        else if (ShouldBuild)
+        {
+            // Fresh build - check if we used MSBuild optimization
+            usedMSBuild = !directives.IsDefaultOrEmpty || projectFactory != null;
+            usedRoslynCompiler = directives.IsDefaultOrEmpty && projectFactory == null;
+        }
+
+        RunTelemetry.TrackRunEvent(
+            isFileBased: true,
+            projectIdentifier: projectIdentifier,
+            launchProfile: LaunchProfile,
+            noLaunchProfile: NoLaunchProfile,
+            launchSettings: launchSettings,
+            sdkCount: sdkCount,
+            packageReferenceCount: packageReferenceCount,
+            projectReferenceCount: projectReferenceCount,
+            additionalPropertiesCount: additionalPropertiesCount,
+            usedMSBuild: usedMSBuild,
+            usedRoslynCompiler: usedRoslynCompiler);
+    }
+
+    /// <summary>
+    /// Builds and sends telemetry data for project-based app runs.
+    /// </summary>
+    private void SendProjectBasedTelemetry(ProjectLaunchSettingsModel? launchSettings)
+    {
+        var projectIdentifier = RunTelemetry.GetProjectBasedIdentifier(ProjectFileFullPath!, GetRepositoryRoot(), Sha256Hasher.Hash);
+        
+        // Get package and project reference counts for project-based apps
+        int packageReferenceCount = 0;
+        int projectReferenceCount = 0;
+        
+        // Try to get project information for telemetry if we built the project
+        if (ShouldBuild)
+        {
+            try
+            {
+                var globalProperties = MSBuildArgs.GlobalProperties?.ToDictionary() ?? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                globalProperties[Constants.EnableDefaultItems] = "false";
+                globalProperties[Constants.MSBuildExtensionsPath] = AppContext.BaseDirectory;
+                
+                using var collection = new ProjectCollection(globalProperties: globalProperties);
+                var project = collection.LoadProject(ProjectFileFullPath!).CreateProjectInstance();
+                
+                packageReferenceCount = RunTelemetry.CountPackageReferences(project);
+                projectReferenceCount = RunTelemetry.CountProjectReferences(project);
+            }
+            catch
+            {
+                // If project evaluation fails for telemetry, use defaults
+                // We don't want telemetry collection to affect the run operation
+            }
+        }
+
+        RunTelemetry.TrackRunEvent(
+            isFileBased: false,
+            projectIdentifier: projectIdentifier,
+            launchProfile: LaunchProfile,
+            noLaunchProfile: NoLaunchProfile,
+            launchSettings: launchSettings,
+            packageReferenceCount: packageReferenceCount,
+            projectReferenceCount: projectReferenceCount);
+    }
+
     /// <summary>
     /// Attempts to find the repository root directory.
     /// </summary>