Merge pull request #172 from DataDog/tyler/benchmark

Improve benchmarks to highlight more interesting differences

Author: realark

dd-java-agent/benchmark/benchmark.gradle

@@ -60,13 +60,12 @@ task jmhAgent(type: JavaExec, dependsOn: project.tasks.jmhCompileGeneratedClasse
   main = "org.openjdk.jmh.Main"
   args += ["-tu", "us"]
   args += ["-bm", "avgt"]
-  args += ["-prof", "stack"]
-//  args += ["-r", "5s"]
-//  args += ["-i", "5"]
+//  args += ["-prof", "stack:lines=5;detailLine=true;period=5;excludePackages=true"]
   args += ["-f", "1"]
   args += ["-foe", "true"]
-//  args += ["-w", "2s"]
+
 //  args += ["-wi", "2"]
+//  args += ["-i", "5"]
 }
 
 tasks.jmhAgent.dependsOn project(':dd-java-agent').shadowJar

dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/ClassRetransformingBenchmark.java

@@ -1,6 +1,7 @@
 package com.datadoghq.benchmark;
 
-import com.datadoghq.trace.Trace;
+import com.datadoghq.benchmark.classes.TracedClass;
+import com.datadoghq.benchmark.classes.UntracedClass;
 import java.lang.instrument.Instrumentation;
 import java.lang.instrument.UnmodifiableClassException;
 import java.lang.reflect.Field;
@@ -53,18 +54,14 @@ public void stopAgent() {
   }
 
   @Benchmark
-  public void testIgnoredRetransform(final BenchmarkState state) throws UnmodifiableClassException {
-    state.inst.retransformClasses(Object.class);
+  public void testUntracedRetransform(final BenchmarkState state)
+      throws UnmodifiableClassException {
+    state.inst.retransformClasses(UntracedClass.class);
   }
 
   @Benchmark
-  public void testSimpleRetransform(final BenchmarkState state) throws UnmodifiableClassException {
-    state.inst.retransformClasses(SimpleClass.class);
-  }
-
-  @Benchmark
-  public void testDeepRetransform(final BenchmarkState state) throws UnmodifiableClassException {
-    state.inst.retransformClasses(DeepClass.class);
+  public void testTracedRetransform(final BenchmarkState state) throws UnmodifiableClassException {
+    state.inst.retransformClasses(TracedClass.class);
   }
 
   @Fork(jvmArgsAppend = "-javaagent:releases/dd-java-agent-0.2.2.jar")
@@ -90,34 +87,4 @@ public static class WithAgent0210 extends ClassRetransformingBenchmark {}
 
   @Fork(jvmArgsAppend = "-javaagent:../build/libs/dd-java-agent.jar")
   public static class WithAgent extends ClassRetransformingBenchmark {}
-
-  public static class SimpleClass {
-    @Trace
-    public void aMethodToTrace() {}
-  }
-
-  public static interface A {
-    @Trace
-    void interfaceTrace();
-  }
-
-  public static interface B extends A {
-    void something();
-  }
-
-  public static interface C extends B {
-    void somethingElse();
-  }
-
-  public static class DeepClass implements C {
-
-    @Override
-    public void interfaceTrace() {}
-
-    @Override
-    public void something() {}
-
-    @Override
-    public void somethingElse() {}
-  }
 }

dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/A.java

@@ -0,0 +1,5 @@
+package com.datadoghq.benchmark.classes;
+
+public interface A {
+  void a();
+}

dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/B.java

@@ -0,0 +1,5 @@
+package com.datadoghq.benchmark.classes;
+
+public interface B extends A {
+  void b();
+}

dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/C.java

@@ -0,0 +1,5 @@
+package com.datadoghq.benchmark.classes;
+
+public interface C extends B {
+  void c();
+}

dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/D.java

@@ -0,0 +1,5 @@
+package com.datadoghq.benchmark.classes;
+
+public interface D extends C {
+  void d();
+}

dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/E.java

@@ -0,0 +1,5 @@
+package com.datadoghq.benchmark.classes;
+
+public interface E extends D {
+  void e();
+}

dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/F.java

@@ -0,0 +1,7 @@
+package com.datadoghq.benchmark.classes;
+
+public abstract class F implements E {
+  public abstract void f();
+
+  public void g() {}
+}

dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/TracedClass.java

@@ -0,0 +1,29 @@
+package com.datadoghq.benchmark.classes;
+
+import com.datadoghq.trace.Trace;
+
+public class TracedClass extends UntracedClass {
+  @Trace
+  @Override
+  public void f() {}
+
+  @Trace
+  @Override
+  public void e() {}
+
+  @Trace
+  @Override
+  public void d() {}
+
+  @Trace
+  @Override
+  public void c() {}
+
+  @Trace
+  @Override
+  public void b() {}
+
+  @Trace
+  @Override
+  public void a() {}
+}

dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/UntracedClass.java

@@ -0,0 +1,21 @@
+package com.datadoghq.benchmark.classes;
+
+public class UntracedClass extends F {
+  @Override
+  public void f() {}
+
+  @Override
+  public void e() {}
+
+  @Override
+  public void d() {}
+
+  @Override
+  public void c() {}
+
+  @Override
+  public void b() {}
+
+  @Override
+  public void a() {}
+}