Skip to content

Add log warning in AgentJarIndex if an entryKey has multiple prefixIds. #8434

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
sarahchen6 merged 4 commits into from
Feb 27, 2025
Merged

Add log warning in AgentJarIndex if an entryKey has multiple prefixIds. #8434

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a76f7b7
Add log warning if entryKey has multiple prefixIds.
sarahchen6 Feb 21, 2025
1174245
Only warn if prefixId changes.
sarahchen6 Feb 21, 2025
a96a95c
Improve log warning to describe the situation instead of the state.
sarahchen6 Feb 26, 2025
30565d7
Update log warning message.
sarahchen6 Feb 27, 2025
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
6 changes: 6 additions & 0 deletions dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/AgentJarIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,12 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
if (null != prefixRoot) {
String entryKey = computeEntryKey(prefixRoot.relativize(file));
if (null != entryKey) {
int existingPrefixId = prefixTrie.apply(entryKey);
if (-1 != existingPrefixId && prefixId != existingPrefixId) {
log.warn(
"Detected duplicate content under '{}'. Ensure your content is under a distinct directory.",
entryKey);
}
prefixTrie.put(entryKey, prefixId);
if (entryKey.endsWith("*")) {
// optimization: wildcard will match everything under here so can skip
Expand Down
Loading