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

Add generic is-before-java9 check

This commit is contained in:
Nikolay Martynov 2019-11-05 13:02:18 -05:00
parent b31778a05e
commit 415a875dfc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,8 +268,7 @@ public class TracingAgent {
private static ClassLoader createDatadogClassLoader( private static ClassLoader createDatadogClassLoader(
final String innerJarFilename, final URL bootstrapURL) throws Exception { final String innerJarFilename, final URL bootstrapURL) throws Exception {
final ClassLoader agentParent; final ClassLoader agentParent;
final String javaVersion = System.getProperty("java.version"); if (isJavaBefore9()) {
if (javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8")) {
agentParent = null; // bootstrap agentParent = null; // bootstrap
} else { } else {
// platform classloader is parent of system in java 9+ // platform classloader is parent of system in java 9+
@ -375,6 +374,10 @@ public class TracingAgent {
return false; return false;
} }
private static boolean isJavaBefore9() {
return System.getProperty("java.version").startsWith("1.");
}
/** /**
* Main entry point. * Main entry point.
* *