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

Use .isolated instead of .jar

This commit is contained in:
Laplie Anderson 2019-08-30 14:06:51 -04:00
parent 5994fa8734
commit ac2087eb4a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dd-java-agent/dd-java-agent.gradle
View File

@ -58,8 +58,8 @@ def includeShadowJar(subproject, jarname) {
} }
} }
includeShadowJar(project(':dd-java-agent:instrumentation'), 'agent-tooling-and-instrumentation.jar') includeShadowJar(project(':dd-java-agent:instrumentation'), 'agent-tooling-and-instrumentation.isolated')
includeShadowJar(project(':dd-java-agent:agent-jmxfetch'), 'agent-jmxfetch.jar') includeShadowJar(project(':dd-java-agent:agent-jmxfetch'), 'agent-jmxfetch.isolated')
jar { jar {
classifier = 'unbundled' classifier = 'unbundled'

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

@ -94,7 +94,7 @@ public class TracingAgent {
if (AGENT_CLASSLOADER == null) { if (AGENT_CLASSLOADER == null) {
final ClassLoader agentClassLoader = final ClassLoader agentClassLoader =
createDatadogClassLoader("agent-tooling-and-instrumentation.jar", bootstrapURL); createDatadogClassLoader("agent-tooling-and-instrumentation.isolated", bootstrapURL);
final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader(); final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
try { try {
Thread.currentThread().setContextClassLoader(agentClassLoader); Thread.currentThread().setContextClassLoader(agentClassLoader);
@ -126,7 +126,7 @@ public class TracingAgent {
throws Exception { throws Exception {
if (JMXFETCH_CLASSLOADER == null) { if (JMXFETCH_CLASSLOADER == null) {
final ClassLoader jmxFetchClassLoader = final ClassLoader jmxFetchClassLoader =
createDatadogClassLoader("agent-jmxfetch.jar", bootstrapURL); createDatadogClassLoader("agent-jmxfetch.isolated", bootstrapURL);
final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader(); final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
try { try {
Thread.currentThread().setContextClassLoader(jmxFetchClassLoader); Thread.currentThread().setContextClassLoader(jmxFetchClassLoader);