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

Upgrade Byte Buddy to 1.9.12 

and a few other minor code changes.
This commit is contained in:
Tyler Benson 2019-04-25 10:36:35 -07:00
parent 03f44bd8b9
commit 179b9b69cb
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
View File

@ -112,6 +112,7 @@ public class AgentInstaller {
.or(nameStartsWith("org.aspectj.")) .or(nameStartsWith("org.aspectj."))
.or(nameStartsWith("org.groovy.")) .or(nameStartsWith("org.groovy."))
.or(nameStartsWith("org.codehaus.groovy.macro.")) .or(nameStartsWith("org.codehaus.groovy.macro."))
.or(nameStartsWith("com.intellij.rt.debugger."))
.or(nameStartsWith("com.p6spy.")) .or(nameStartsWith("com.p6spy."))
.or(nameStartsWith("com.newrelic.")) .or(nameStartsWith("com.newrelic."))
.or(nameContains("javassist")) .or(nameContains("javassist"))
@ -181,7 +182,7 @@ public class AgentInstaller {
final JavaModule module, final JavaModule module,
final boolean loaded, final boolean loaded,
final DynamicType dynamicType) { final DynamicType dynamicType) {
log.debug("Transformed {} -- {}", typeDescription, classLoader); log.debug("Transformed {} -- {}", typeDescription.getName(), classLoader);
} }
@Override @Override
@ -189,21 +190,27 @@ public class AgentInstaller {
final TypeDescription typeDescription, final TypeDescription typeDescription,
final ClassLoader classLoader, final ClassLoader classLoader,
final JavaModule module, final JavaModule module,
final boolean loaded) {} final boolean loaded) {
// log.debug("onIgnored {}", typeDescription.getName());
}
@Override @Override
public void onComplete( public void onComplete(
final String typeName, final String typeName,
final ClassLoader classLoader, final ClassLoader classLoader,
final JavaModule module, final JavaModule module,
final boolean loaded) {} final boolean loaded) {
// log.debug("onComplete {}", typeName);
}
@Override @Override
public void onDiscovery( public void onDiscovery(
final String typeName, final String typeName,
final ClassLoader classLoader, final ClassLoader classLoader,
final JavaModule module, final JavaModule module,
final boolean loaded) {} final boolean loaded) {
// log.debug("onDiscovery {}", typeName);
}
} }
/** /**

2
dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/AdviceUtils.java
View File

@ -3,8 +3,10 @@ package datadog.trace.instrumentation.java.concurrent;
import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.ContextStore;
import datadog.trace.bootstrap.instrumentation.java.concurrent.State; import datadog.trace.bootstrap.instrumentation.java.concurrent.State;
import datadog.trace.context.TraceScope; import datadog.trace.context.TraceScope;
import lombok.extern.slf4j.Slf4j;
/** Helper utils for Runnable/Callable instrumentation */ /** Helper utils for Runnable/Callable instrumentation */
@Slf4j
public class AdviceUtils { public class AdviceUtils {
/** /**

2
dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/JavaExecutorInstrumentation.java
View File

@ -23,12 +23,10 @@ import java.util.concurrent.Callable;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.ForkJoinTask; import java.util.concurrent.ForkJoinTask;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import lombok.extern.slf4j.Slf4j;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher; import net.bytebuddy.matcher.ElementMatcher;
@Slf4j
@AutoService(Instrumenter.class) @AutoService(Instrumenter.class)
public final class JavaExecutorInstrumentation extends AbstractExecutorInstrumentation { public final class JavaExecutorInstrumentation extends AbstractExecutorInstrumentation {

2
gradle/dependencies.gradle
View File

@ -14,7 +14,7 @@ ext {
junit : "4.12", junit : "4.12",
logback : "1.2.3", logback : "1.2.3",
lombok : "1.18.4", lombok : "1.18.4",
bytebuddy : "1.9.9", bytebuddy : "1.9.12",
scala : "2.11.12", // Last version to support Java 7 (2.12+ require Java 8+) scala : "2.11.12", // Last version to support Java 7 (2.12+ require Java 8+)
kotlin : "1.3.11", kotlin : "1.3.11",
coroutines : "1.1.0" coroutines : "1.1.0"