Upgrade Byte-buddy to 1.8.8
Also remove some erronously checked in files.
MODIFY
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExceptionHandlers.java
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExceptionHandlers.java
package datadog.trace.agent.tooling;
import datadog.trace.bootstrap.ExceptionLogger;
+import net.bytebuddy.asm.Advice.ExceptionHandler;
import net.bytebuddy.implementation.Implementation;
import net.bytebuddy.implementation.bytecode.StackManipulation;
import net.bytebuddy.jar.asm.Label;
@@ -16,7 +17,8 @@ public class ExceptionHandlers {
// Bootstrap ExceptionHandler.class will always be resolvable, so we'll use it in the log name
private static final String HANDLER_NAME = ExceptionLogger.class.getName().replace('.', '/');
- private static final StackManipulation EXCEPTION_STACK_HANDLER =
+ private static final ExceptionHandler EXCEPTION_STACK_HANDLER =
+ new ExceptionHandler.Simple(
new StackManipulation() {
// Pops one Throwable off the stack. Maxes the stack to at least 3.
private final Size size = new StackManipulation.Size(-1, 3);
@@ -27,16 +29,16 @@ public class ExceptionHandlers {
}
@Override
- public Size apply(MethodVisitor mv, Implementation.Context context) {
+ public Size apply(final MethodVisitor mv, final Implementation.Context context) {
// writes the following bytecode:
// try {
// org.slf4j.LoggerFactory.getLogger((Class)ExceptionLogger.class).debug("exception in instrumentation", t);
// } catch (Throwable t2) {
// }
- Label logStart = new Label();
- Label logEnd = new Label();
- Label eatException = new Label();
- Label handlerExit = new Label();
+ final Label logStart = new Label();
+ final Label logEnd = new Label();
+ final Label eatException = new Label();
+ final Label handlerExit = new Label();
mv.visitTryCatchBlock(logStart, logEnd, eatException, "java/lang/Throwable");
@@ -72,9 +74,9 @@ public class ExceptionHandlers {
return size;
}
- };
+ });
- public static StackManipulation defaultExceptionHandler() {
+ public static ExceptionHandler defaultExceptionHandler() {
return EXCEPTION_STACK_HANDLER;
}
}

DELETE
dd-java-agent/benchmark/out/jmh/resources/dd-trace.yaml
-enableCustomAnnotationTracingOver: ["datadog.benchmark"]

DELETE
examples/dropwizard-mongo-client/out/production/resources/configuration.yaml
-logging:
- level: INFO
- loggers:
- "datadog.trace": DEBUG
- "io.opentracing": DEBUG

DELETE
examples/rest-spark/out/production/resources/configuration.yaml
-logging:
- level: INFO
- loggers:
- "datadog.trace": DEBUG
- "io.opentracing": DEBUG

MODIFY
gradle/dependencies.gradle
gradle/dependencies.gradle
@@ -14,7 +14,7 @@ ext {
groovy : groovyVer,
junit : "4.12",
logback : "1.2.3",
- bytebuddy : "1.8.1",
+ bytebuddy : "1.8.8",
]
deps = [

Upgrade Byte-buddy to 1.8.8

Also remove some erronously checked in files.