[CI Visibility] - Defer await for git upload task (#3825)

* [CI Visibility] - Defer await for git upload

* Changes

* changes from review.

Author: tonyredondo

tracer/src/Datadog.Trace.Tools.Runner/RunCiCommand.cs

@@ -82,6 +82,8 @@ public override async Task<int> ExecuteAsync(CommandContext context, RunCiSettin
                 }
             }
 
+            var uploadRepositoryChangesTask = Task.CompletedTask;
+
             // Set Agentless configuration from the command line options
             ciVisibilitySettings.SetAgentlessConfiguration(agentless, apiKey, applicationKey, ciVisibilitySettings.AgentlessUrl);
 
@@ -103,7 +105,8 @@ public override async Task<int> ExecuteAsync(CommandContext context, RunCiSettin
                 var lazyItrClient = new Lazy<IntelligentTestRunnerClient>(() => new(CIEnvironmentValues.Instance.WorkspacePath, ciVisibilitySettings));
                 if (ciVisibilitySettings.GitUploadEnabled != false || ciVisibilitySettings.IntelligentTestRunnerEnabled)
                 {
-                    await lazyItrClient.Value.UploadRepositoryChangesAsync().ConfigureAwait(false);
+                    // If we are in git upload only then we can defer the await until the child command exits.
+                    uploadRepositoryChangesTask = Task.Run(() => lazyItrClient.Value.UploadRepositoryChangesAsync());
 
                     // Once the repository has been uploaded we switch off the git upload in children processes
                     profilerEnvironmentVariables[Configuration.ConfigurationKeys.CIVisibility.GitUploadEnabled] = "0";
@@ -241,9 +244,16 @@ public override async Task<int> ExecuteAsync(CommandContext context, RunCiSettin
             {
                 AnsiConsole.WriteLine("Running: " + command);
 
-                if (Program.CallbackForTests != null)
+                if (ciVisibilitySettings.IntelligentTestRunnerEnabled || Program.CallbackForTests is not null)
+                {
+                    // Awaiting git repository task before running the command if ITR is enabled.
+                    Log.Debug("RunCiCommand: Awaiting for the Git repository upload.");
+                    await uploadRepositoryChangesTask.ConfigureAwait(false);
+                }
+
+                if (Program.CallbackForTests is { } callbackForTests)
                 {
-                    Program.CallbackForTests(program, arguments, profilerEnvironmentVariables);
+                    callbackForTests(program, arguments, profilerEnvironmentVariables);
                     return 0;
                 }
 
@@ -257,6 +267,14 @@ public override async Task<int> ExecuteAsync(CommandContext context, RunCiSettin
                 exitCode = Utils.RunProcess(processInfo, _applicationContext.TokenSource.Token);
                 session?.SetTag(TestTags.CommandExitCode, exitCode);
                 Log.Debug<int>("RunCiCommand: Finished with exit code: {Value}", exitCode);
+
+                if (!ciVisibilitySettings.IntelligentTestRunnerEnabled)
+                {
+                    // Awaiting git repository task after running the command if ITR is disabled.
+                    Log.Debug("RunCiCommand: Awaiting for the Git repository upload.");
+                    await uploadRepositoryChangesTask.ConfigureAwait(false);
+                }
+
                 return exitCode;
             }
             catch (Exception ex)

tracer/src/Datadog.Trace/Ci/CIVisibility.cs

@@ -493,10 +493,11 @@ private static async Task GetIntelligentTestRunnerSkippableTestsAsync()
             {
                 var lazyItrClient = new Lazy<IntelligentTestRunnerClient>(() => new(CIEnvironmentValues.Instance.WorkspacePath, _settings));
 
+                Task? uploadRepositoryChangesTask = null;
                 if (_settings.GitUploadEnabled != false)
                 {
                     // Upload the git metadata
-                    await lazyItrClient.Value.UploadRepositoryChangesAsync().ConfigureAwait(false);
+                    uploadRepositoryChangesTask = Task.Run(() => lazyItrClient.Value.UploadRepositoryChangesAsync());
                 }
 
                 if (!_settings.Agentless || !string.IsNullOrEmpty(_settings.ApplicationKey))
@@ -524,6 +525,13 @@ private static async Task GetIntelligentTestRunnerSkippableTestsAsync()
                 // Log code coverage status
                 Log.Information("{V}", _settings.CodeCoverageEnabled == true ? "ITR: Tests code coverage is enabled." : "ITR: Tests code coverage is disabled.");
 
+                // For ITR we need the git metadata upload before consulting the skippable tests.
+                // If ITR is disable we just need to make sure the git upload task has completed before leaving this method.
+                if (uploadRepositoryChangesTask is not null)
+                {
+                    await uploadRepositoryChangesTask.ConfigureAwait(false);
+                }
+
                 // If the tests skipping feature is enabled we query the api for the tests we have to skip
                 if (_settings.TestsSkippingEnabled == true)
                 {