Fix incorrect current source root in RepoIndexSourcePathResolver (#5545)

Author: hisener

dd-java-agent/agent-ci-visibility/build.gradle

@@ -47,6 +47,7 @@ excludedClassesCoverage += [
   "datadog.trace.civisibility.ipc.SignalType",
   "datadog.trace.civisibility.ipc.SignalClient",
   "datadog.trace.civisibility.source.MethodLinesResolver.MethodLines",
+  "datadog.trace.civisibility.source.RepoIndexSourcePathResolver.RepoIndexingFileVisitor",
   "datadog.trace.civisibility.utils.ShellCommandExecutor",
   "datadog.trace.civisibility.utils.ShellCommandExecutor.OutputParser",
 ]

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/RepoIndexSourcePathResolver.java

@@ -21,6 +21,7 @@
 import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -235,17 +236,15 @@ private static final class RepoIndexingFileVisitor implements FileVisitor<Path>
 
     private final SourceRootResolver sourceRootResolver;
     private final ClassNameTrie.Builder trieBuilder;
-    private final List<String> sourceRoots;
+    private final LinkedHashSet<String> sourceRoots;
     private final RepoIndexingStats indexingStats;
     private final Path repoRoot;
 
-    private Path currentSourceRoot;
-
     private RepoIndexingFileVisitor(SourceRootResolver sourceRootResolver, Path repoRoot) {
       this.sourceRootResolver = sourceRootResolver;
       this.repoRoot = repoRoot;
       trieBuilder = new ClassNameTrie.Builder();
-      sourceRoots = new ArrayList<>();
+      sourceRoots = new LinkedHashSet<>();
       indexingStats = new RepoIndexingStats();
     }
 
@@ -264,10 +263,8 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
         if (sourceType != null) {
           indexingStats.sourceFilesVisited++;
 
-          if (currentSourceRoot == null) {
-            currentSourceRoot = sourceRootResolver.getSourceRoot(file);
-            sourceRoots.add(repoRoot.relativize(currentSourceRoot).toString());
-          }
+          Path currentSourceRoot = sourceRootResolver.getSourceRoot(file);
+          sourceRoots.add(repoRoot.relativize(currentSourceRoot).toString());
 
           Path relativePath = currentSourceRoot.relativize(file);
           String classNameWithExtension = relativePath.toString().replace(File.separatorChar, '.');
@@ -294,14 +291,11 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
       if (exc != null) {
         log.error("Failed to visit directory: {}", dir, exc);
       }
-      if (dir.equals(currentSourceRoot)) {
-        currentSourceRoot = null;
-      }
       return FileVisitResult.CONTINUE;
     }
 
     public RepoIndex getIndex() {
-      return new RepoIndex(trieBuilder.buildTrie(), sourceRoots);
+      return new RepoIndex(trieBuilder.buildTrie(), new ArrayList<>(sourceRoots));
     }
   }