Skip to content

Include all candidate paths for duplicate keys in coverage reports #10997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 9 commits into from
Apr 6, 2026
Merged

Include all candidate paths for duplicate keys in coverage reports #10997

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b177da4
fix: report duplicate entries in coverage instead of nulling the report
daniel-mohedano Mar 30, 2026
74ea9f5
fix: refactor source path resolvers to always return collections
daniel-mohedano Mar 30, 2026
0367988
fix: remove unused variable
daniel-mohedano Mar 30, 2026
51cb4ce
fix: pre-size structures
daniel-mohedano Mar 30, 2026
4f10a8a
nit: add @Nonnull annotations to overriden methods
daniel-mohedano Mar 30, 2026
78672aa
style: spotless
daniel-mohedano Mar 30, 2026
a3d3997
fix: remove unused logging
daniel-mohedano Mar 31, 2026
e6eca50
Merge branch 'master' into daniel.mohedano/coverage-report-duplicate-…
daniel-mohedano Apr 1, 2026
a819948
Merge branch 'master' into daniel.mohedano/coverage-report-duplicate-…
daniel-mohedano Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: remove unused variable
  • Loading branch information
@daniel-mohedano
daniel-mohedano committed Mar 30, 2026
commit 036798858544965c2dfd3f613afea3d337b476ba
7 changes: 2 additions & 5 deletions ...ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndexBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ private static final class RepoIndexingFileVisitor implements FileVisitor<Path>
private final PackageResolver packageResolver;
private final ResourceResolver resourceResolver;
private final ClassNameTrie.Builder trieBuilder;
private final Map<String, String> trieKeyToPath;
private final Map<String, Integer> trieKeyToSourceRootIdx;
private final Map<String, List<Integer>> duplicateSourceRootIndices;
private final Map<RepoIndex.SourceRoot, Integer> sourceRoots;
Expand All @@ -116,7 +115,6 @@ private RepoIndexingFileVisitor(
this.resourceResolver = resourceResolver;
this.repoRoot = repoRoot;
trieBuilder = new ClassNameTrie.Builder();
trieKeyToPath = new HashMap<>();
trieKeyToSourceRootIdx = new HashMap<>();
duplicateSourceRootIndices = new HashMap<>();
sourceRoots = new HashMap<>();
Expand Down Expand Up @@ -179,10 +177,9 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
String key = Utils.toTrieKey(relativePath);
trieBuilder.put(key, sourceRootIdx);

String existingPath = trieKeyToPath.put(key, file.toString());
Integer existingSourceRootIdx = trieKeyToSourceRootIdx.put(key, sourceRootIdx);
if (existingPath != null) {
log.debug("Duplicate repo index key: {} - {}", existingPath, file);
if (existingSourceRootIdx != null) {
log.debug("Duplicate repo index key: {}", key);
duplicateSourceRootIndices
.computeIfAbsent(
key,
Expand Down