feat: update soft unshallow to use --no-write-fetch

daniel-mohedano · daniel-mohedano · commit bef1740144fe · 2025-07-22T13:19:49.000+02:00
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java
@@ -6,7 +6,6 @@
 import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfoProvider;
-import datadog.trace.api.git.PersonInfo;
 import datadog.trace.civisibility.ci.CIInfo;
 import datadog.trace.civisibility.ci.CIProviderInfo;
 import datadog.trace.civisibility.ci.CITagsProvider;
@@ -127,23 +126,13 @@ static PullRequestInfo buildPullRequestInfo(
 
     // complete with CI vars if user didn't provide all information
     PullRequestInfo ciInfo = PullRequestInfo.merge(userInfo, ciProviderInfo.buildPullRequestInfo());
-    if (Strings.isNotBlank(ciInfo.getGitCommitHead().getSha())) {
+    String headSha = ciInfo.getGitCommitHead().getSha();
+    if (Strings.isNotBlank(headSha)) {
       // if head sha present try to populate author, committer and message info through git client
       try {
-        gitRepoUnshallow.unshallow(true);
-        String headSha = ciInfo.getGitCommitHead().getSha();
-        PersonInfo authorInfo =
-            new PersonInfo(
-                gitClient.getAuthorName(headSha),
-                gitClient.getAuthorEmail(headSha),
-                gitClient.getAuthorDate(headSha));
-        PersonInfo committerInfo =
-            new PersonInfo(
-                gitClient.getCommitterName(headSha),
-                gitClient.getCommitterEmail(headSha),
-                gitClient.getCommitterDate(headSha));
+        gitRepoUnshallow.unshallow(headSha);
         CommitInfo commitInfo =
-            new CommitInfo(headSha, authorInfo, committerInfo, gitClient.getFullMessage(headSha));
+            gitClient.getCommitInfo(headSha);
         return PullRequestInfo.merge(ciInfo, new PullRequestInfo(null, null, commitInfo, null));
       } catch (Exception ignored) {
       }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java
@@ -421,7 +421,7 @@ private Diff getPullRequestDiff(boolean impactedTestsDetectionEnabled, String de
     try {
       if (repositoryRoot != null) {
         // ensure repo is not shallow before attempting to get git diff
-        gitRepoUnshallow.unshallow(false);
+        gitRepoUnshallow.unshallow(null);
 
         String baseCommitSha = pullRequestInfo.getPullRequestBaseBranchSha();
         if (baseCommitSha == null) {
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitClient.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitClient.java
@@ -17,7 +17,7 @@ public interface GitClient {
 
   boolean isShallow() throws IOException, TimeoutException, InterruptedException;
 
-  void unshallow(@Nullable String remoteCommitReference, boolean parentOnly)
+  void unshallow(@Nullable String remoteCommitReference, boolean onlyFetchCommit)
       throws IOException, TimeoutException, InterruptedException;
 
   @Nullable
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java b/dd-java-agent/agent-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(false);
+        gitRepoUnshallow.unshallow(null);
       }
 
       GitInfo gitInfo = gitInfoProvider.getGitInfo(repoRoot);
@@ -112,7 +112,7 @@ private void uploadGitData() {
         return;
       }
 
-      if (config.isCiVisibilityGitUnshallowDefer() && gitRepoUnshallow.unshallow(false)) {
+      if (config.isCiVisibilityGitUnshallowDefer() && gitRepoUnshallow.unshallow(null)) {
         latestCommits = gitClient.getLatestCommits();
         commitsToSkip = gitDataApi.searchCommits(remoteUrl, latestCommits);
       }
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitRepoUnshallow.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitRepoUnshallow.java
@@ -4,6 +4,7 @@
 import datadog.trace.civisibility.utils.ShellCommandExecutor;
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -19,29 +20,37 @@ public GitRepoUnshallow(Config config, GitClient gitClient) {
     this.gitClient = gitClient;
   }
 
-  public synchronized boolean unshallow(boolean parentOnly)
+  public synchronized boolean unshallow(@Nullable String commit)
       throws IOException, InterruptedException, TimeoutException {
     if (!config.isCiVisibilityGitUnshallowEnabled() || !gitClient.isShallow()) {
       return false;
     }
 
     long unshallowStart = System.currentTimeMillis();
-    try {
-      gitClient.unshallow(GitClient.HEAD, parentOnly);
-    } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-      LOGGER.debug(
-          "Could not unshallow using HEAD - assuming HEAD points to a local commit that does not exist in the remote repo",
-          e);
-    }
-
-    try {
-      String upstreamBranch = gitClient.getUpstreamBranchSha();
-      gitClient.unshallow(upstreamBranch, parentOnly);
-    } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-      LOGGER.debug(
-          "Could not unshallow using upstream branch - assuming currently checked out local branch does not track any remote branch",
-          e);
-      gitClient.unshallow(null, parentOnly);
+    if (commit == null) {
+      try {
+        gitClient.unshallow(GitClient.HEAD, false);
+      } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+        LOGGER.debug(
+            "Could not unshallow using HEAD - assuming HEAD points to a local commit that does not exist in the remote repo",
+            e);
+      }
+
+      try {
+        String upstreamBranch = gitClient.getUpstreamBranchSha();
+        gitClient.unshallow(upstreamBranch, false);
+      } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+        LOGGER.debug(
+            "Could not unshallow using upstream branch - assuming currently checked out local branch does not track any remote branch",
+            e);
+        gitClient.unshallow(null, false);
+      }
+    } else {
+      try {
+        gitClient.unshallow(commit, true);
+      } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+        LOGGER.debug("Could not unshallow specific commit {}", commit, e);
+      }
     }
     LOGGER.debug("Repository unshallowing took {} ms", System.currentTimeMillis() - unshallowStart);
     return true;
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/NoOpGitClient.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/NoOpGitClient.java
@@ -21,7 +21,7 @@ public boolean isShallow() {
   }
 
   @Override
-  public void unshallow(@Nullable String remoteCommitReference, boolean parentOnly) {
+  public void unshallow(@Nullable String remoteCommitReference, boolean onlyFetchCommit) {
     // no op
   }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/ShellGitClient.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/ShellGitClient.java
@@ -129,55 +129,46 @@ public String getUpstreamBranchSha() throws IOException, TimeoutException, Inter
    *
    * @param remoteCommitReference The commit to fetch from the remote repository, so local repo will
    *     be updated with this commit and its ancestors. If {@code null}, everything will be fetched.
-   * @param parentOnly If only the parent commit should be unshallowed or the full {@code
-   *     latestCommitsSince}
+   * @param onlyFetchCommit Only fetch the specific commit provided.
    * @throws IOException If an error was encountered while writing command input or reading output
    * @throws TimeoutException If timeout was reached while waiting for Git command to finish
    * @throws InterruptedException If current thread was interrupted while waiting for Git command to
    *     finish
    */
   @Override
-  public void unshallow(@Nullable String remoteCommitReference, boolean parentOnly)
+  public void unshallow(@Nullable String remoteCommitReference, boolean onlyFetchCommit)
       throws IOException, TimeoutException, InterruptedException {
     executeCommand(
         Command.UNSHALLOW,
         () -> {
-          String remote =
-              commandExecutor
-                  .executeCommand(
-                      IOUtils::readFully,
-                      "git",
-                      "config",
-                      "--default",
-                      "origin",
-                      "--get",
-                      "clone.defaultRemoteName")
-                  .trim();
+          String remote = getRemoteName();
 
           // refetch data from the server for the given period of time
-          String depth =
-              parentOnly ? "--deepen=1" : String.format("--shallow-since='%s'", latestCommitsSince);
           if (remoteCommitReference != null && GitUtils.isValidRef(remoteCommitReference)) {
-            String headSha = getSha(remoteCommitReference);
+            String onlyFetchCommitArg =
+                onlyFetchCommit
+                    ? "--no-write-fetch-head"
+                    : String.format("--shallow-since='%s'", latestCommitsSince);
+            String commitSha = getSha(remoteCommitReference);
             commandExecutor.executeCommand(
                 ShellCommandExecutor.OutputParser.IGNORE,
                 "git",
                 "fetch",
-                depth,
                 "--update-shallow",
                 "--filter=blob:none",
                 "--recurse-submodules=no",
+                onlyFetchCommitArg,
                 remote,
-                headSha);
+                commitSha);
           } else {
             commandExecutor.executeCommand(
                 ShellCommandExecutor.OutputParser.IGNORE,
                 "git",
                 "fetch",
-                depth,
                 "--update-shallow",
                 "--filter=blob:none",
                 "--recurse-submodules=no",
+                String.format("--shallow-since='%s'", latestCommitsSince),
                 remote);
           }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/tree/GitClientTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/tree/GitClientTest.groovy
@@ -70,7 +70,7 @@ class GitClientTest extends Specification {
     upstreamBranch == "98b944cc44f18bfb78e3021de2999cdcda8efdf6"
   }
 
-  def "test unshallow: sha-#remoteSha parentOnly-#parentOnly"() {
+  def "test unshallow: sha-#remoteSha fetchOnlyCommit-#fetchOnlyCommit"() {
     given:
     givenGitRepo("ci/git/shallow/git")
 
@@ -84,7 +84,7 @@ class GitClientTest extends Specification {
     commits.size() == 1
 
     when:
-    gitClient.unshallow(remoteSha, parentOnly)
+    gitClient.unshallow(remoteSha, fetchOnlyCommit)
     shallow = gitClient.isShallow()
     commits = gitClient.getLatestCommits()
 
@@ -93,11 +93,11 @@ class GitClientTest extends Specification {
     commits.size() == numCommits
 
     where:
-    remoteSha      | parentOnly | isShallow | numCommits
-    GitClient.HEAD | false      | false     | 10
-    null           | false      | false     | 10
-    GitClient.HEAD | true       | true      | 2
-    null           | true       | true      | 2
+    remoteSha                                  | fetchOnlyCommit | isShallow | numCommits
+    GitClient.HEAD                             | false           | false     | 10
+    null                                       | false           | false     | 10
+    "f4377e97f10c2d58696192b170b2fef2a8464b04" | true            | true      | 1
+    null                                       | true            | false     | 10
   }
 
   def "test get git folder"() {

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ private void uploadGitData() {`
`91`	`91`	`LOGGER.debug("Starting git data upload, {}", gitClient);`
`92`	`92`
`93`	`93`	`if (!config.isCiVisibilityGitUnshallowDefer()) {`
`94`		`- gitRepoUnshallow.unshallow(false);`
	`94`	`+ gitRepoUnshallow.unshallow(null);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`GitInfo gitInfo = gitInfoProvider.getGitInfo(repoRoot);`
`@@ -112,7 +112,7 @@ private void uploadGitData() {`
`112`	`112`	`return;`
`113`	`113`	`}`
`114`	`114`
`115`		`- if (config.isCiVisibilityGitUnshallowDefer() && gitRepoUnshallow.unshallow(false)) {`
	`115`	`+ if (config.isCiVisibilityGitUnshallowDefer() && gitRepoUnshallow.unshallow(null)) {`
`116`	`116`	`latestCommits = gitClient.getLatestCommits();`
`117`	`117`	`commitsToSkip = gitDataApi.searchCommits(remoteUrl, latestCommits);`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public boolean isShallow() {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`@Override`
`24`		`- public void unshallow(@Nullable String remoteCommitReference, boolean parentOnly) {`
	`24`	`+ public void unshallow(@Nullable String remoteCommitReference, boolean onlyFetchCommit) {`
`25`	`25`	`// no op`
`26`	`26`	`}`
`27`	`27`