-
Notifications
You must be signed in to change notification settings - Fork 303
Add support for scanning jar from loaded class #8370
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.
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
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
56 changes: 56 additions & 0 deletions
56
dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/BasicSymDBReport.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package com.datadog.debugger.symbol; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class BasicSymDBReport implements SymDBReport { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(BasicSymDBReport.class); | ||
|
|
||
| private final Set<String> missingJars = new HashSet<>(); | ||
| private final Map<String, String> ioExceptions = new HashMap<>(); | ||
| private final List<String> locationErrors = new ArrayList<>(); | ||
| private final Map<String, Integer> classCountByJar = new HashMap<>(); | ||
| private final List<String> scannedJars = new ArrayList<>(); | ||
|
|
||
| public void addMissingJar(String jarPath) { | ||
| missingJars.add(jarPath); | ||
| } | ||
|
|
||
| public void addIOException(String jarPath, IOException e) { | ||
| ioExceptions.put(jarPath, e.toString()); | ||
| } | ||
|
|
||
| public void addLocationError(String locationStr) { | ||
| locationErrors.add(locationStr); | ||
| } | ||
|
|
||
| public void incClassCount(String jarPath) { | ||
| classCountByJar.compute(jarPath, (k, v) -> v == null ? 1 : v + 1); | ||
| } | ||
|
|
||
| public void addScannedJar(String jarPath) { | ||
| scannedJars.add(jarPath); | ||
| } | ||
|
|
||
| public void report() { | ||
| int totalClasses = classCountByJar.values().stream().mapToInt(Integer::intValue).sum(); | ||
| String content = | ||
| String.format( | ||
| "SymDB Report: Scanned jar count=%d, Total class count=%d, class count by jar: %s, Scanned jars: %s, Location errors: %s Missing jars: %s IOExceptions: %s", | ||
| scannedJars.size(), | ||
| totalClasses, | ||
| classCountByJar, | ||
| scannedJars, | ||
| locationErrors, | ||
| missingJars, | ||
| ioExceptions); | ||
| LOGGER.info(content); | ||
| } | ||
| } |
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
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
73 changes: 35 additions & 38 deletions
73
dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/symbol/SymDBReport.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,39 @@ | ||
| package com.datadog.debugger.symbol; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class SymDBReport { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(SymDBReport.class); | ||
|
|
||
| private final Set<String> missingJars = new HashSet<>(); | ||
| private final Map<String, String> ioExceptions = new HashMap<>(); | ||
| private final List<String> locationErrors = new ArrayList<>(); | ||
|
|
||
| public void addMissingJar(String jarPath) { | ||
| missingJars.add(jarPath); | ||
| } | ||
|
|
||
| public void addIOException(String jarPath, IOException e) { | ||
| ioExceptions.put(jarPath, e.toString()); | ||
| } | ||
|
|
||
| public void addLocationError(String locationStr) { | ||
| locationErrors.add(locationStr); | ||
| } | ||
|
|
||
| public void report() { | ||
| String content = | ||
| "== SymDB Report == Location errors:" | ||
| + locationErrors | ||
| + " Missing jars: " | ||
| + missingJars | ||
| + " IOExceptions: " | ||
| + ioExceptions; | ||
| LOGGER.info(content); | ||
| } | ||
|
|
||
| public interface SymDBReport { | ||
|
|
||
| void addMissingJar(String jarPath); | ||
|
|
||
| void addIOException(String jarPath, IOException e); | ||
|
|
||
| void addLocationError(String locationStr); | ||
|
|
||
| void incClassCount(String jarPath); | ||
|
|
||
| void addScannedJar(String jarPath); | ||
|
|
||
| void report(); | ||
|
|
||
| SymDBReport NO_OP = | ||
| new SymDBReport() { | ||
| @Override | ||
| public void addMissingJar(String jarPath) {} | ||
|
|
||
| @Override | ||
| public void addIOException(String jarPath, IOException e) {} | ||
|
|
||
| @Override | ||
| public void addLocationError(String locationStr) {} | ||
|
|
||
| @Override | ||
| public void incClassCount(String jarPath) {} | ||
|
|
||
| @Override | ||
| public void addScannedJar(String jarPath) {} | ||
|
|
||
| @Override | ||
| public void report() {} | ||
| }; | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So by the usage of the NO_OP report, I assume we only want a symdb report on the initial scan, not on the continuous ones? I think it might be cool if we had a periodic report as well. Not required, just nice to have.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes I focus on the initial process. It would be interesting to have it periodically, but not sure if relevant right now as the usage of logs in the wild is pretty heterogeneous.
will consider it if we still have issues with the coutnuous scan process