Add additional cases for benchmarking.

Author: tylerbenson

.gitignore

@@ -52,3 +52,5 @@ Thumbs.db
 dd-java-agent/integrations/*/out
 dd-trace-examples/*/out
 derby.log
+
+!dd-java-agent/benchmark/releases/*.jar

dd-java-agent/benchmark/benchmark.gradle

@@ -7,6 +7,20 @@ apply from: "${rootDir}/gradle/java.gradle"
 dependencies {
   jmh project(':dd-trace-annotations')
   jmh group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.7.6'
+
+  // Add a bunch of dependencies so instrumentation is not disabled.
+  jmh group: 'javax.jms', name: 'javax.jms-api', version: '2.0.1'
+  jmh group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
+  jmh group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'
+  jmh group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2'
+  jmh(group: 'com.amazonaws', name: 'aws-java-sdk', version: '1.11.119') {
+    exclude(module: 'httpclient')
+    exclude(module: 'jackson-databind')
+    exclude(module: 'jackson-dataformat-cbor')
+  }
+  jmh group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
+  jmh group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'
+  jmh(group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0')
 }
 
 configurations.testRuntimeClasspath.dependencies.clear()
@@ -15,14 +29,14 @@ configurations.testRuntimeClasspath.dependencies.clear()
 jmh {
   timeUnit = 'us' // Output time unit. Available time units are: [m, s, ms, us, ns].
   benchmarkMode = ['thrpt', 'avgt']
-  timeOnIteration = '1s'
-  iterations = 1 // Number of measurement iterations to do.
-  fork = 2 // How many times to forks a single benchmark. Use 0 to disable forking altogether
+//  timeOnIteration = '5s'
+  iterations = 5 // Number of measurement iterations to do.
+  fork = 1 // How many times to forks a single benchmark. Use 0 to disable forking altogether
 //  jvmArgs = ["-Dasdf=123"]
 //  jvmArgs = ["-javaagent:${project(':dd-java-agent').shadowJar.archivePath}"]
   failOnError = true // Should JMH fail immediately if any benchmark had experienced the unrecoverable error?
-  warmup = '2s' // Time to spend at each warmup iteration.
-  warmupIterations = 1 // Number of warmup iterations to do.
+//  warmup = '2s' // Time to spend at each warmup iteration.
+//  warmupIterations = 2 // Number of warmup iterations to do.
 //  warmupForks = 0 // How many warmup forks to make for a single benchmark. 0 to disable warmup forks.
 
 //  profilers = ['stack']
@@ -31,7 +45,7 @@ jmh {
 //  humanOutputFile = project.file("${project.buildDir}/reports/jmh/human.txt") // human-readable output file
 //  operationsPerInvocation = 10 // Operations per invocation.
 //  synchronizeIterations = false // Synchronize iterations?
-//  timeout = '1s' // Timeout for benchmark iteration.
+  timeout = '1s' // Timeout for benchmark iteration.
   includeTests = false
   // Allows to include test sources into generate JMH jar, i.e. use it when benchmarks depend on the test classes.
 
@@ -46,13 +60,13 @@ task jmhAgent(type: JavaExec, dependsOn: project.tasks.jmhCompileGeneratedClasse
   main = "org.openjdk.jmh.Main"
   args += ["-tu", "us"]
   args += ["-bm", "avgt"]
-  args += ["-r", "1s"]
-  args += ["-i", "1"]
-  args += ["-f", "2"]
+  args += ["-prof", "stack"]
+//  args += ["-r", "5s"]
+//  args += ["-i", "5"]
+  args += ["-f", "1"]
   args += ["-foe", "true"]
-  args += ["-w", "2s"]
-  args += ["-wi", "1"]
-//  jvmArgs = ["-javaagent:${project(':dd-java-agent').shadowJar.archivePath}"]
+//  args += ["-w", "2s"]
+//  args += ["-wi", "2"]
 }
 
 tasks.jmhAgent.dependsOn project(':dd-java-agent').shadowJar