Upgrade Byte Buddy to 1.9.0

tylerbenson · tylerbenson · commit 6b8eb60ca247 · 2018-10-01T13:31:03.000-04:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -182,7 +182,6 @@ jobs:
         # Reset the cache approx every release
         keys:
         - dd-trace-java-version-scan-{{ checksum "dd-trace-java.gradle" }}
-        - dd-trace-java-version-scan
 
     - run:
         name: Verify Version Scan and Muzzle
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -13,5 +13,6 @@ dependencies {
   compile group: 'org.apache.maven', name: 'maven-aether-provider', version: '3.3.9'
 
   compile group: 'com.google.guava', name: 'guava', version: '20.0'
-  compile group: 'org.ow2.asm', name: 'asm-all', version: '5.2'
+  compile group: 'org.ow2.asm', name: 'asm', version: '7.0-beta'
+  compile group: 'org.ow2.asm', name: 'asm-tree', version: '7.0-beta'
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/DDCachingPoolStrategy.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/DDCachingPoolStrategy.java
@@ -90,7 +90,7 @@ public void clear() {
       cache.invalidateAll();
     }
 
-    private class ResolutionProvider implements Callable<TypePool.Resolution> {
+    private static class ResolutionProvider implements Callable<TypePool.Resolution> {
       private final TypePool.Resolution value;
 
       private ResolutionProvider(final TypePool.Resolution value) {
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java
@@ -96,7 +96,7 @@ public AgentBuilder instrument(final AgentBuilder parentAgentBuilder) {
               .transform(DDTransformers.defaultTransformers());
       agentBuilder = injectHelperClasses(agentBuilder);
       agentBuilder = applyInstrumentationTransformers(agentBuilder);
-      return agentBuilder.asDecorator();
+      return agentBuilder;
     }
 
     private AgentBuilder.Identified.Extendable injectHelperClasses(
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Utils.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Utils.java
@@ -31,7 +31,9 @@ public class Utils {
     // jackson
     "org.msgpack",
     "com.fasterxml.jackson",
-    "org.yaml.snakeyaml"
+    "org.yaml.snakeyaml",
+    // modules
+    "module-info",
   };
 
   private static Method findLoadedClassMethod = null;
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleGradlePlugin.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleGradlePlugin.java
@@ -1,9 +1,11 @@
 package datadog.trace.agent.tooling.muzzle;
 
 import datadog.trace.agent.tooling.Instrumenter;
+import java.io.IOException;
 import net.bytebuddy.build.Plugin;
 import net.bytebuddy.description.type.TypeDefinition;
 import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.dynamic.ClassFileLocator;
 import net.bytebuddy.dynamic.DynamicType.Builder;
 
 /** Bytebuddy gradle plugin which creates muzzle-references at compile time. */
@@ -30,10 +32,16 @@ public boolean matches(final TypeDescription target) {
   }
 
   @Override
-  public Builder<?> apply(final Builder<?> builder, final TypeDescription typeDescription) {
+  public Builder<?> apply(
+      final Builder<?> builder,
+      final TypeDescription typeDescription,
+      final ClassFileLocator classFileLocator) {
     return builder.visit(new MuzzleVisitor());
   }
 
+  @Override
+  public void close() throws IOException {}
+
   /** Compile-time Optimization used by gradle buildscripts. */
   public static class NoOp implements Plugin {
     @Override
@@ -42,8 +50,14 @@ public boolean matches(final TypeDescription target) {
     }
 
     @Override
-    public Builder<?> apply(final Builder<?> builder, final TypeDescription typeDescription) {
+    public Builder<?> apply(
+        final Builder<?> builder,
+        final TypeDescription typeDescription,
+        final ClassFileLocator classFileLocator) {
       return builder;
     }
+
+    @Override
+    public void close() throws IOException {}
   }
 }
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVisitor.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVisitor.java
@@ -54,7 +54,7 @@ public static class InsertSafetyMatcher extends ClassVisitor {
     private Instrumenter.Default instrumenter;
 
     public InsertSafetyMatcher(ClassVisitor classVisitor) {
-      super(Opcodes.ASM6, classVisitor);
+      super(Opcodes.ASM7, classVisitor);
     }
 
     @Override
@@ -461,7 +461,7 @@ public void visitEnd() {
     /** Append a field initializer to the end of a method. */
     public class InitializeFieldVisitor extends MethodVisitor {
       public InitializeFieldVisitor(MethodVisitor methodVisitor) {
-        super(Opcodes.ASM6, methodVisitor);
+        super(Opcodes.ASM7, methodVisitor);
       }
 
       @Override
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceCreator.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceCreator.java
@@ -169,7 +169,7 @@ private static Type underlyingType(Type type) {
   private boolean createFromMethodBodiesOnly;
 
   private ReferenceCreator(ClassVisitor classVisitor, boolean createFromMethodBodiesOnly) {
-    super(Opcodes.ASM6, classVisitor);
+    super(Opcodes.ASM7, classVisitor);
     this.createFromMethodBodiesOnly = createFromMethodBodiesOnly;
   }
 
@@ -229,7 +229,7 @@ private class AdviceReferenceMethodVisitor extends MethodVisitor {
     private int currentLineNumber = -1;
 
     public AdviceReferenceMethodVisitor(MethodVisitor methodVisitor) {
-      super(Opcodes.ASM6, methodVisitor);
+      super(Opcodes.ASM7, methodVisitor);
     }
 
     @Override
diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ExceptionHandlerTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ExceptionHandlerTest.groovy
@@ -38,7 +38,6 @@ class ExceptionHandlerTest extends Specification {
         .advice(
         isMethod().and(named("smallStack").or(named("largeStack"))),
         BadAdvice.NoOpAdvice.getName()))
-      .asDecorator()
 
     ByteBuddyAgent.install()
     builder.installOn(ByteBuddyAgent.getInstrumentation())
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -15,7 +15,7 @@ ext {
     junit      : "4.12",
     logback    : "1.2.3",
     lombok     : "1.18.0",
-    bytebuddy  : "1.8.14",
+    bytebuddy  : "1.9.0",
   ]
 
   deps = [

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ dependencies {`
`13`	`13`	`compile group: 'org.apache.maven', name: 'maven-aether-provider', version: '3.3.9'`
`14`	`14`
`15`	`15`	`compile group: 'com.google.guava', name: 'guava', version: '20.0'`
`16`		`- compile group: 'org.ow2.asm', name: 'asm-all', version: '5.2'`
	`16`	`+ compile group: 'org.ow2.asm', name: 'asm', version: '7.0-beta'`
	`17`	`+ compile group: 'org.ow2.asm', name: 'asm-tree', version: '7.0-beta'`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public void clear() {`
`90`	`90`	`cache.invalidateAll();`
`91`	`91`	`}`
`92`	`92`
`93`		`- private class ResolutionProvider implements Callable<TypePool.Resolution> {`
	`93`	`+ private static class ResolutionProvider implements Callable<TypePool.Resolution> {`
`94`	`94`	`private final TypePool.Resolution value;`
`95`	`95`
`96`	`96`	`private ResolutionProvider(final TypePool.Resolution value) {`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public AgentBuilder instrument(final AgentBuilder parentAgentBuilder) {`
`96`	`96`	`.transform(DDTransformers.defaultTransformers());`
`97`	`97`	`agentBuilder = injectHelperClasses(agentBuilder);`
`98`	`98`	`agentBuilder = applyInstrumentationTransformers(agentBuilder);`
`99`		`- return agentBuilder.asDecorator();`
	`99`	`+ return agentBuilder;`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`private AgentBuilder.Identified.Extendable injectHelperClasses(`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static class InsertSafetyMatcher extends ClassVisitor {`
`54`	`54`	`private Instrumenter.Default instrumenter;`
`55`	`55`
`56`	`56`	`public InsertSafetyMatcher(ClassVisitor classVisitor) {`
`57`		`- super(Opcodes.ASM6, classVisitor);`
	`57`	`+ super(Opcodes.ASM7, classVisitor);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`@@ -461,7 +461,7 @@ public void visitEnd() {`
`461`	`461`	`/** Append a field initializer to the end of a method. */`
`462`	`462`	`public class InitializeFieldVisitor extends MethodVisitor {`
`463`	`463`	`public InitializeFieldVisitor(MethodVisitor methodVisitor) {`
`464`		`- super(Opcodes.ASM6, methodVisitor);`
	`464`	`+ super(Opcodes.ASM7, methodVisitor);`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ private static Type underlyingType(Type type) {`
`169`	`169`	`private boolean createFromMethodBodiesOnly;`
`170`	`170`
`171`	`171`	`private ReferenceCreator(ClassVisitor classVisitor, boolean createFromMethodBodiesOnly) {`
`172`		`- super(Opcodes.ASM6, classVisitor);`
	`172`	`+ super(Opcodes.ASM7, classVisitor);`
`173`	`173`	`this.createFromMethodBodiesOnly = createFromMethodBodiesOnly;`
`174`	`174`	`}`
`175`	`175`
`@@ -229,7 +229,7 @@ private class AdviceReferenceMethodVisitor extends MethodVisitor {`
`229`	`229`	`private int currentLineNumber = -1;`
`230`	`230`
`231`	`231`	`public AdviceReferenceMethodVisitor(MethodVisitor methodVisitor) {`
`232`		`- super(Opcodes.ASM6, methodVisitor);`
	`232`	`+ super(Opcodes.ASM7, methodVisitor);`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ ext {`
`15`	`15`	`junit : "4.12",`
`16`	`16`	`logback : "1.2.3",`
`17`	`17`	`lombok : "1.18.0",`
`18`		`- bytebuddy : "1.8.14",`
	`18`	`+ bytebuddy : "1.9.0",`
`19`	`19`	`]`
`20`	`20`
`21`	`21`	`deps = [`