Merge pull request #74688 from dibarbet/project_load_telemetry

Only report project load events for initial load in VSCode
dotnet · Aug 8, 2024 · c098e96 · c098e96
2 parents 3acf211 + 045ae70
commit c098e96
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...Server/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/LanguageServerProjectSystem.cs b/...Server/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/LanguageServerProjectSystem.cs
@@ -115,7 +115,7 @@ public async Task OpenSolutionAsync(string solutionFilePath)
 
             foreach (var project in await buildHost.GetProjectsInSolutionAsync(solutionFilePath, CancellationToken.None))
             {
-                _projectsToLoadAndReload.AddWork(new ProjectToLoad(project.ProjectPath, project.ProjectGuid));
+                _projectsToLoadAndReload.AddWork(new ProjectToLoad(project.ProjectPath, project.ProjectGuid, ReportTelemetry: true));
             }
 
             // Wait for the in progress batch to complete and send a project initialized notification to the client.
@@ -131,7 +131,7 @@ public async Task OpenProjectsAsync(ImmutableArray<string> projectFilePaths)
 
         using (await _gate.DisposableWaitAsync())
         {
-            _projectsToLoadAndReload.AddWork(projectFilePaths.Select(p => new ProjectToLoad(p, ProjectGuid: null)));
+            _projectsToLoadAndReload.AddWork(projectFilePaths.Select(p => new ProjectToLoad(p, ProjectGuid: null, ReportTelemetry: true)));
 
             // Wait for the in progress batch to complete and send a project initialized notification to the client.
             await _projectsToLoadAndReload.WaitUntilCurrentBatchCompletesAsync();
@@ -278,7 +278,7 @@ private async Task<bool> LoadOrReloadProjectAsync(ProjectToLoad projectToLoad, T
                         _workspaceFactory.ProjectSystemHostInfo);
 
                     var loadedProject = new LoadedProject(projectSystemProject, _workspaceFactory.Workspace.Services.SolutionServices, _fileChangeWatcher, _workspaceFactory.TargetFrameworkManager);
-                    loadedProject.NeedsReload += (_, _) => _projectsToLoadAndReload.AddWork(projectToLoad);
+                    loadedProject.NeedsReload += (_, _) => _projectsToLoadAndReload.AddWork(projectToLoad with { ReportTelemetry = false });
                     existingProjects.Add(loadedProject);
 
                     (targetTelemetryInfo, targetNeedsRestore) = await loadedProject.UpdateWithNewProjectInfoAsync(loadedProjectInfo, _logger);
@@ -288,7 +288,11 @@ private async Task<bool> LoadOrReloadProjectAsync(ProjectToLoad projectToLoad, T
                 }
             }
 
-            await _projectLoadTelemetryReporter.ReportProjectLoadTelemetryAsync(telemetryInfos, projectToLoad, cancellationToken);
+            if (projectToLoad.ReportTelemetry)
+            {
+                await _projectLoadTelemetryReporter.ReportProjectLoadTelemetryAsync(telemetryInfos, projectToLoad, cancellationToken);
+            }
+
             diagnosticLogItems = await loadedFile.GetDiagnosticLogItemsAsync(cancellationToken);
             if (diagnosticLogItems.Any())
             {

diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/ProjectToLoad.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/ProjectToLoad.cs
@@ -9,7 +9,7 @@ namespace Microsoft.CodeAnalysis.LanguageServer.HostWorkspace;
 /// <summary>
 /// The project path (and the guid if it game from a solution) of the project to load.
 /// </summary>
-internal record ProjectToLoad(string Path, string? ProjectGuid)
+internal record ProjectToLoad(string Path, string? ProjectGuid, bool ReportTelemetry)
 {
     public static IEqualityComparer<ProjectToLoad> Comparer = new ProjectToLoadComparer();