Share telemetry central logger instance between ProjectCollection and…

… Build calls

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

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

@@ -470,31 +470,36 @@ internal ICommand GetTargetCommand(Func<ProjectCollection, ProjectInstance>? pro
 
         Reporter.Verbose.WriteLine("Getting target command: evaluating project.");
         FacadeLogger? logger = LoggerUtility.DetermineBinlogger([.. MSBuildArgs.OtherMSBuildArgs], "dotnet-run");
-        var project = EvaluateProject(ProjectFileFullPath, projectFactory, MSBuildArgs, logger);
+        var (project, telemetryCentralLogger) = EvaluateProject(ProjectFileFullPath, projectFactory, MSBuildArgs, logger);
         ValidatePreconditions(project);
-        InvokeRunArgumentsTarget(project, NoBuild, logger, MSBuildArgs);
+        InvokeRunArgumentsTarget(project, NoBuild, logger, MSBuildArgs, telemetryCentralLogger);
         logger?.ReallyShutdown();
         var runProperties = RunProperties.FromProject(project).WithApplicationArguments(ApplicationArgs);
         var command = CreateCommandFromRunProperties(runProperties);
         return command;
 
-        static ProjectInstance EvaluateProject(string? projectFilePath, Func<ProjectCollection, ProjectInstance>? projectFactory, MSBuildArgs msbuildArgs, ILogger? binaryLogger)
+        static (ProjectInstance project, ILogger? telemetryCentralLogger) EvaluateProject(string? projectFilePath, Func<ProjectCollection, ProjectInstance>? projectFactory, MSBuildArgs msbuildArgs, ILogger? binaryLogger)
         {
             Debug.Assert(projectFilePath is not null || projectFactory is not null);
 
             var globalProperties = CommonRunHelpers.GetGlobalPropertiesFromArgs(msbuildArgs);
 
-            // Include telemetry logger for evaluation
-            var loggers = ProjectInstanceExtensions.CreateLoggersWithTelemetry(binaryLogger is null ? null : [binaryLogger]);
+            // Include telemetry logger for evaluation and capture it for reuse in builds
+            var (loggers, telemetryCentralLogger) = ProjectInstanceExtensions.CreateLoggersWithTelemetry(binaryLogger is null ? null : [binaryLogger]);
             var collection = new ProjectCollection(globalProperties: globalProperties, loggers: loggers, toolsetDefinitionLocations: ToolsetDefinitionLocations.Default);
 
+            ProjectInstance projectInstance;
             if (projectFilePath is not null)
             {
-                return collection.LoadProject(projectFilePath).CreateProjectInstance();
+                projectInstance = collection.LoadProject(projectFilePath).CreateProjectInstance();
+            }
+            else
+            {
+                Debug.Assert(projectFactory is not null);
+                projectInstance = projectFactory(collection);
             }
 
-            Debug.Assert(projectFactory is not null);
-            return projectFactory(collection);
+            return (projectInstance, telemetryCentralLogger);
         }
 
         static void ValidatePreconditions(ProjectInstance project)
@@ -550,7 +555,7 @@ static ICommand CreateCommandForCscBuiltProgram(string entryPointFileFullPath, s
             return command;
         }
 
-        static void InvokeRunArgumentsTarget(ProjectInstance project, bool noBuild, FacadeLogger? binaryLogger, MSBuildArgs buildArgs)
+        static void InvokeRunArgumentsTarget(ProjectInstance project, bool noBuild, FacadeLogger? binaryLogger, MSBuildArgs buildArgs, ILogger? telemetryCentralLogger)
         {
             List<ILogger> loggersForBuild = [
                 CommonRunHelpers.GetConsoleLogger(
@@ -562,7 +567,7 @@ static void InvokeRunArgumentsTarget(ProjectInstance project, bool noBuild, Faca
                 loggersForBuild.Add(binaryLogger);
             }
 
-            if (!project.BuildWithTelemetry([Constants.ComputeRunArguments], loggersForBuild, null, out _))
+            if (!project.BuildWithTelemetry([Constants.ComputeRunArguments], loggersForBuild, null, out _, telemetryCentralLogger))
             {
                 throw new GracefulException(CliCommandStrings.RunCommandEvaluationExceptionBuildFailed, Constants.ComputeRunArguments);
             }

src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs

@@ -8,6 +8,7 @@
 using Microsoft.Build.Evaluation;
 using Microsoft.Build.Evaluation.Context;
 using Microsoft.Build.Execution;
+using Microsoft.Build.Framework;
 using Microsoft.DotNet.Cli.Commands.Restore;
 using Microsoft.DotNet.Cli.Commands.Run;
 using Microsoft.DotNet.Cli.CommandLine;
@@ -67,11 +68,11 @@ public static (IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModul
 
         FacadeLogger? logger = LoggerUtility.DetermineBinlogger([.. buildOptions.MSBuildArgs], dotnetTestVerb);
 
-        // Include telemetry logger for evaluation
-        var loggers = ProjectInstanceExtensions.CreateLoggersWithTelemetry(logger is null ? null : [logger]);
+        // Include telemetry logger for evaluation and capture it for reuse in builds
+        var (loggers, telemetryCentralLogger) = ProjectInstanceExtensions.CreateLoggersWithTelemetry(logger is null ? null : [logger]);
         using var collection = new ProjectCollection(globalProperties: globalProperties, loggers: loggers, toolsetDefinitionLocations: ToolsetDefinitionLocations.Default);
         var evaluationContext = EvaluationContext.Create(EvaluationContext.SharingPolicy.Shared);
-        ConcurrentBag<ParallelizableTestModuleGroupWithSequentialInnerModules> projects = GetProjectsProperties(collection, evaluationContext, projectPaths, buildOptions);
+        ConcurrentBag<ParallelizableTestModuleGroupWithSequentialInnerModules> projects = GetProjectsProperties(collection, evaluationContext, projectPaths, buildOptions, telemetryCentralLogger);
         logger?.ReallyShutdown();
         collection.UnloadAllProjects();
 
@@ -91,11 +92,11 @@ public static (IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModul
 
         var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(buildOptions.MSBuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.VerbosityOption(), CommonOptions.NoLogoOption());
 
-        // Include telemetry logger for evaluation
-        var loggers = ProjectInstanceExtensions.CreateLoggersWithTelemetry(logger is null ? null : [logger]);
+        // Include telemetry logger for evaluation and capture it for reuse in builds
+        var (loggers, telemetryCentralLogger) = ProjectInstanceExtensions.CreateLoggersWithTelemetry(logger is null ? null : [logger]);
         using var collection = new ProjectCollection(globalProperties: CommonRunHelpers.GetGlobalPropertiesFromArgs(msbuildArgs), loggers, toolsetDefinitionLocations: ToolsetDefinitionLocations.Default);
         var evaluationContext = EvaluationContext.Create(EvaluationContext.SharingPolicy.Shared);
-        IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModules> projects = SolutionAndProjectUtility.GetProjectProperties(projectFilePath, collection, evaluationContext, buildOptions, configuration: null, platform: null);
+        IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModules> projects = SolutionAndProjectUtility.GetProjectProperties(projectFilePath, collection, evaluationContext, buildOptions, telemetryCentralLogger, configuration: null, platform: null);
         logger?.ReallyShutdown();
         collection.UnloadAllProjects();
         return (projects, isBuiltOrRestored);
@@ -168,7 +169,8 @@ private static ConcurrentBag<ParallelizableTestModuleGroupWithSequentialInnerMod
         ProjectCollection projectCollection,
         EvaluationContext evaluationContext,
         IEnumerable<(string ProjectFilePath, string? Configuration, string? Platform)> projects,
-        BuildOptions buildOptions)
+        BuildOptions buildOptions,
+        ILogger? telemetryCentralLogger)
     {
         var allProjects = new ConcurrentBag<ParallelizableTestModuleGroupWithSequentialInnerModules>();
 
@@ -179,7 +181,7 @@ private static ConcurrentBag<ParallelizableTestModuleGroupWithSequentialInnerMod
             new ParallelOptions { MaxDegreeOfParallelism = Environment.ProcessorCount },
             (project) =>
             {
-                IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModules> projectsMetadata = SolutionAndProjectUtility.GetProjectProperties(project.ProjectFilePath, projectCollection, evaluationContext, buildOptions, project.Configuration, project.Platform);
+                IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModules> projectsMetadata = SolutionAndProjectUtility.GetProjectProperties(project.ProjectFilePath, projectCollection, evaluationContext, buildOptions, telemetryCentralLogger, project.Configuration, project.Platform);
                 foreach (var projectMetadata in projectsMetadata)
                 {
                     allProjects.Add(projectMetadata);

src/Cli/dotnet/Commands/Test/MTP/SolutionAndProjectUtility.cs

@@ -6,6 +6,7 @@
 using Microsoft.Build.Evaluation;
 using Microsoft.Build.Evaluation.Context;
 using Microsoft.Build.Execution;
+using Microsoft.Build.Framework;
 using Microsoft.DotNet.Cli.Commands.Run;
 using Microsoft.DotNet.Cli.Commands.Run.LaunchSettings;
 using Microsoft.DotNet.Cli.Extensions;
@@ -220,13 +221,21 @@ private static ProjectInstance EvaluateProject(
         });
     }
 
+    public static string GetRootDirectory(string solutionOrProjectFilePath)
+    {
+        string? fileDirectory = Path.GetDirectoryName(solutionOrProjectFilePath);
+        Debug.Assert(fileDirectory is not null);
+        return string.IsNullOrEmpty(fileDirectory) ? Directory.GetCurrentDirectory() : fileDirectory;
+    }
+
     public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModules> GetProjectProperties(
         string projectFilePath,
         ProjectCollection projectCollection,
         EvaluationContext evaluationContext,
         BuildOptions buildOptions,
-        string? configuration,
-        string? platform)
+        ILogger? telemetryCentralLogger = null,
+        string? configuration = null,
+        string? platform = null)
     {
         var projects = new List<ParallelizableTestModuleGroupWithSequentialInnerModules>();
         ProjectInstance projectInstance = EvaluateProject(projectCollection, evaluationContext, projectFilePath, tfm: null, configuration, platform);
@@ -238,7 +247,7 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
 
         if (!string.IsNullOrEmpty(targetFramework) || string.IsNullOrEmpty(targetFrameworks))
         {
-            if (GetModuleFromProject(projectInstance, buildOptions) is { } module)
+            if (GetModuleFromProject(projectInstance, buildOptions, telemetryCentralLogger) is { } module)
             {
                 projects.Add(new ParallelizableTestModuleGroupWithSequentialInnerModules(module));
             }
@@ -266,7 +275,7 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
                     projectInstance = EvaluateProject(projectCollection, evaluationContext, projectFilePath, framework, configuration, platform);
                     Logger.LogTrace($"Loaded inner project '{Path.GetFileName(projectFilePath)}' has '{ProjectProperties.IsTestingPlatformApplication}' = '{projectInstance.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication)}' (TFM: '{framework}').");
 
-                    if (GetModuleFromProject(projectInstance, buildOptions) is { } module)
+                    if (GetModuleFromProject(projectInstance, buildOptions, telemetryCentralLogger) is { } module)
                     {
                         projects.Add(new ParallelizableTestModuleGroupWithSequentialInnerModules(module));
                     }
@@ -280,7 +289,7 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
                     projectInstance = EvaluateProject(projectCollection, evaluationContext, projectFilePath, framework, configuration, platform);
                     Logger.LogTrace($"Loaded inner project '{Path.GetFileName(projectFilePath)}' has '{ProjectProperties.IsTestingPlatformApplication}' = '{projectInstance.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication)}' (TFM: '{framework}').");
 
-                    if (GetModuleFromProject(projectInstance, buildOptions) is { } module)
+                    if (GetModuleFromProject(projectInstance, buildOptions, telemetryCentralLogger) is { } module)
                     {
                         innerModules ??= new List<TestModule>();
                         innerModules.Add(module);
@@ -297,7 +306,7 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
         return projects;
     }
 
-    private static TestModule? GetModuleFromProject(ProjectInstance project, BuildOptions buildOptions)
+    private static TestModule? GetModuleFromProject(ProjectInstance project, BuildOptions buildOptions, ILogger? telemetryCentralLogger = null)
     {
         _ = bool.TryParse(project.GetPropertyValue(ProjectProperties.IsTestProject), out bool isTestProject);
         _ = bool.TryParse(project.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication), out bool isTestingPlatformApplication);
@@ -315,7 +324,7 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
         RunProperties runProperties;
         if (isTestingPlatformApplication)
         {
-            runProperties = GetRunProperties(project);
+            runProperties = GetRunProperties(project, telemetryCentralLogger);
 
             // dotnet run throws the same if RunCommand is null or empty.
             // In dotnet test, we are additionally checking that RunCommand is not dll.
@@ -355,15 +364,15 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
 
         return new TestModule(runProperties, PathUtility.FixFilePath(projectFullPath), targetFramework, isTestingPlatformApplication, launchSettings, project.GetPropertyValue(ProjectProperties.TargetPath), rootVariableName);
 
-        static RunProperties GetRunProperties(ProjectInstance project)
+        static RunProperties GetRunProperties(ProjectInstance project, ILogger? telemetryCentralLogger)
         {
             // Build API cannot be called in parallel, even if the projects are different.
             // Otherwise, BuildManager in MSBuild will fail:
             // System.InvalidOperationException: The operation cannot be completed because a build is already in progress.
             // NOTE: BuildManager is singleton.
             lock (s_buildLock)
             {
-                if (!project.BuildWithTelemetry(s_computeRunArgumentsTarget))
+                if (!project.BuildWithTelemetry(s_computeRunArgumentsTarget, telemetryCentralLogger: telemetryCentralLogger))
                 {
                     throw new GracefulException(CliCommandStrings.RunCommandEvaluationExceptionBuildFailed, s_computeRunArgumentsTarget[0]);
                 }