Repository navigation
Exclude Java source trees from instrumentation discovery - #20956
Merged
Merged
Conversation
Pull request dashboard statusMerged · refreshed 2026-10-25 18:29 UTC Status above doesn't look right?
|
Co-authored-by: trask <218610+trask@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix module discovery bug in instrumentation
Exclude Java source trees from instrumentation discovery
Oct 25, 2026
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The narrowly scoped exclusion addresses false module discovery, with focused regression coverage and no unresolved findings.
No open issues 🎉
What changed in this PR
This PR prevents instrumentation catalog discovery from treating Java source-package directories as modules.
Changes:
- Reject normalized paths containing an exact
srcdirectory segment. - Add regression coverage for production and custom test source paths, both separator styles, and discovery of legitimate Spring Integration modules.
| File | Description |
|---|---|
| instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/utils/FileManagerTest.java | Tests source-directory exclusion and preservation of real modules. |
| instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/utils/FileManager.java | Excludes paths containing /src/ after separator normalization. |
Review effort: Balanced
trask
reviewed
Oct 25, 2026
Co-authored-by: trask <218610+trask@users.noreply.github.com>
trask
approved these changes
Oct 25, 2026
jaydeluca
approved these changes
Oct 25, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
From #20927 (comment)
Prevent Java source-package directories ending in
javaagentorlibraryfrom appearing as fictitious instrumentations in the generated catalog. Reject paths containing an exactsrcdirectory segment after separator normalization.