open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix how we evaluate if customlogger is on classpath 

Resources must replace `.` -> `/` and add `.class` to the end.
This commit is contained in:
Tyler Benson 2019-02-15 15:00:25 -08:00
parent 2d0636e158
commit 8512b841e6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java
View File

@ -276,7 +276,8 @@ public class TracingAgent {
final String logManagerProp = System.getProperty("java.util.logging.manager");
if (logManagerProp != null) {
final boolean onSysClasspath = ClassLoader.getSystemResource(logManagerProp) != null;
final boolean onSysClasspath =
ClassLoader.getSystemResource(logManagerProp.replaceAll("\\.", "/") + ".class") != null;
if (debugEnabled) {
System.out.println("Prop - logging.manager: " + logManagerProp);
System.out.println("logging.manager on system classpath: " + onSysClasspath);

4
dd-java-agent/src/test/java/jvmbootstraptest/LogManagerSetter.java
View File

@ -20,7 +20,9 @@ public class LogManagerSetter {
"jmxfetch should start in premain when customlogmanager=false.");
}
} else if (System.getProperty("java.util.logging.manager") != null) {
if (ClassLoader.getSystemResource(System.getProperty("java.util.logging.manager")) == null) {
if (ClassLoader.getSystemResource(
System.getProperty("java.util.logging.manager").replaceAll("\\.", "/") + ".class")
== null) {
customAssert(
isJmxfetchStarted(),
false,