synchronize repo unshallow with future, avoids performing several times

DataDog · daniel-mohedano · Jun 26, 2025 · May 16, 2025 · May 20, 2025 · May 20, 2025
commit a1238c034b3b54deec20a700ab5c9f2e785dd6de
@@ -213,7 +213,7 @@ private Map<String, ExecutionSettings> doCreate(
                 getTestManagementTestsByModule(
                     tracerEnvironment, testManagementSettings.isEnabled()));
     Future<Diff> pullRequestDiffFuture =
-        executor.submit(() -> getPullRequestDiff(tracerEnvironment, impactedTestsEnabled));
+        executor.submit(() -> getPullRequestDiff(impactedTestsEnabled));
 
     SkippableTests skippableTests = skippableTestsFuture.get();
     Map<String, Collection<TestFQN>> flakyTestsByModule = flakyTestsFuture.get();
@@ -402,16 +402,15 @@ private Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTest
   }
 
   @Nonnull
-  private Diff getPullRequestDiff(
-      TracerEnvironment tracerEnvironment, boolean impactedTestsDetectionEnabled) {
+  private Diff getPullRequestDiff(boolean impactedTestsDetectionEnabled) {
     if (!impactedTestsDetectionEnabled) {
       return LineDiff.EMPTY;
     }
 
     try {
       if (repositoryRoot != null) {
         // ensure repo is not shallow before attempting to get git diff
-        gitRepoUnshallow.unshallow();
+        gitRepoUnshallow.startOrObserveUnshallow().get();
         Diff diff =
             gitClient.getGitDiff(
                 pullRequestInfo.getPullRequestBaseBranchSha(),

diff --git a/...-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java b/...-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java
@@ -91,7 +91,7 @@ private void uploadGitData() {
       LOGGER.debug("Starting git data upload, {}", gitClient);
 
       if (!config.isCiVisibilityGitUnshallowDefer()) {
-        gitRepoUnshallow.unshallow();
+        gitRepoUnshallow.startOrObserveUnshallow().get();
       }
 
       GitInfo gitInfo = gitInfoProvider.getGitInfo(repoRoot);
@@ -112,7 +112,8 @@ private void uploadGitData() {
         return;
       }
 
-      if (config.isCiVisibilityGitUnshallowDefer() && gitRepoUnshallow.unshallow()) {
+      if (config.isCiVisibilityGitUnshallowDefer()
+          && gitRepoUnshallow.startOrObserveUnshallow().get()) {
         latestCommits = gitClient.getLatestCommits();
         commitsToSkip = gitDataApi.searchCommits(remoteUrl, latestCommits);
       }

@@ -3,6 +3,8 @@
 import datadog.trace.api.Config;
 import datadog.trace.civisibility.utils.ShellCommandExecutor;
 import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeoutException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,13 +15,30 @@ public class GitRepoUnshallow {
 
   private final Config config;
   private final GitClient gitClient;
+  private volatile CompletableFuture<Boolean> callback;
 
   public GitRepoUnshallow(Config config, GitClient gitClient) {
     this.config = config;
     this.gitClient = gitClient;
   }
 
-  public boolean unshallow() throws IOException, InterruptedException, TimeoutException {
+  public Future<Boolean> startOrObserveUnshallow() {
+    if (callback == null) {
+      synchronized (this) {
+        if (callback == null) {
+          callback = new CompletableFuture<>();
+          try {
+            callback.complete(unshallow());
+          } catch (Exception e) {
+            callback.completeExceptionally(e);
+          }
+        }
+      }
+    }
+    return callback;
+  }
+
+  private boolean unshallow() throws IOException, InterruptedException, TimeoutException {
     if (!config.isCiVisibilityGitUnshallowEnabled() || !gitClient.isShallow()) {
       return false;
     }