elastic · felixbarny · Apr 18, 2018 · Apr 18, 2018
diff --git a/apm-agent-benchmarks/pom.xml b/apm-agent-benchmarks/pom.xml
@@ -119,6 +119,7 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.openjdk.jmh.Main</mainClass>
                                 </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                             </transformers>
                             <filters>
                                 <filter>

diff --git a/...o/elastic/apm/impl/AbstractBenchmark.java → ...stic/apm/benchmark/AbstractBenchmark.java b/...o/elastic/apm/impl/AbstractBenchmark.java → ...stic/apm/benchmark/AbstractBenchmark.java
@@ -7,19 +7,19 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.impl;
+package co.elastic.apm.benchmark;
 
-import co.elastic.apm.CpuProfiler;
+import co.elastic.apm.benchmark.profiler.CpuProfiler;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;

diff --git a/...a/co/elastic/apm/ElasticApmBenchmark.java → ...chmark/ElasticApmContinuousBenchmark.java b/...a/co/elastic/apm/ElasticApmBenchmark.java → ...chmark/ElasticApmContinuousBenchmark.java
@@ -7,20 +7,19 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm;
+package co.elastic.apm.benchmark;
 
 import co.elastic.apm.configuration.CoreConfiguration;
-import co.elastic.apm.impl.AbstractBenchmark;
 import co.elastic.apm.impl.ElasticApmTracer;
 import co.elastic.apm.report.Reporter;
 import co.elastic.apm.servlet.ApmFilter;
@@ -88,7 +87,7 @@
 @BenchmarkMode(Mode.SampleTime)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @State(Scope.Thread)
-public class ElasticApmBenchmark extends AbstractBenchmark {
+public class ElasticApmContinuousBenchmark extends AbstractBenchmark {
 
     private ApmFilter apmFilter;
     private MockHttpServletRequest request;
@@ -101,7 +100,7 @@ public class ElasticApmBenchmark extends AbstractBenchmark {
     private FilterChain filterChainWithoutApm;
 
     public static void main(String[] args) throws RunnerException {
-        run(ElasticApmBenchmark.class);
+        run(ElasticApmContinuousBenchmark.class);
     }
 
     @Setup

diff --git a/...elastic/apm/impl/ObjectPoolBenchmark.java → ...hmark/objectpool/ObjectPoolBenchmark.java b/...elastic/apm/impl/ObjectPoolBenchmark.java → ...hmark/objectpool/ObjectPoolBenchmark.java
@@ -7,18 +7,19 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.impl;
+package co.elastic.apm.benchmark.objectpool;
 
+import co.elastic.apm.benchmark.AbstractBenchmark;
 import co.elastic.apm.impl.transaction.Transaction;
 import co.elastic.apm.objectpool.impl.BlockingQueueObjectPool;
 import co.elastic.apm.objectpool.impl.MixedObjectPool;
@@ -28,39 +29,24 @@
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
-import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Threads;
-import org.openjdk.jmh.profile.GCProfiler;
-import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
-import org.openjdk.jmh.runner.options.Options;
-import org.openjdk.jmh.runner.options.OptionsBuilder;
 
 import java.util.concurrent.TimeUnit;
 
-@State(Scope.Benchmark)
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-public class ObjectPoolBenchmark {
+public class ObjectPoolBenchmark extends AbstractBenchmark {
 
     private RingBufferObjectPool<Transaction> ringBufferObjectPool;
     private BlockingQueueObjectPool<Transaction> blockingQueueObjectPool;
     private MixedObjectPool<Transaction> mixedObjectPool;
     private ThreadLocalObjectPool<Transaction> threadLocalObjectPool;
 
     public static void main(String[] args) throws RunnerException {
-        Options opt = new OptionsBuilder()
-            .include(ObjectPoolBenchmark.class.getSimpleName())
-            .warmupIterations(2)
-            .measurementIterations(2)
-            .forks(1)
-            .addProfiler(GCProfiler.class)
-            .build();
-
-        new Runner(opt).run();
+        run(ObjectPoolBenchmark.class);
     }
 
     @Setup

diff --git a/...main/java/co/elastic/apm/CpuProfiler.java → ...c/apm/benchmark/profiler/CpuProfiler.java b/...main/java/co/elastic/apm/CpuProfiler.java → ...c/apm/benchmark/profiler/CpuProfiler.java
@@ -7,17 +7,17 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm;
+package co.elastic.apm.benchmark.profiler;
 
 import com.sun.management.OperatingSystemMXBean;
 import org.openjdk.jmh.infra.BenchmarkParams;

diff --git a/...AbstractHttpJacksonReporterBenchmark.java → ...AbstractHttpJacksonReporterBenchmark.java b/...AbstractHttpJacksonReporterBenchmark.java → ...AbstractHttpJacksonReporterBenchmark.java
@@ -17,9 +17,9 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.impl;
+package co.elastic.apm.benchmark.reporter;
 
-import co.elastic.apm.CpuProfiler;
+import co.elastic.apm.benchmark.profiler.CpuProfiler;
 import co.elastic.apm.report.serialize.JacksonPayloadSerializer;
 import co.elastic.apm.report.serialize.PayloadSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...m/impl/AbstractHttpReporterBenchmark.java → ...porter/AbstractHttpReporterBenchmark.java b/...m/impl/AbstractHttpReporterBenchmark.java → ...porter/AbstractHttpReporterBenchmark.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.impl;
+package co.elastic.apm.benchmark.reporter;
 
 import co.elastic.apm.report.ApmServerHttpPayloadSender;
 import co.elastic.apm.report.PayloadSender;

diff --git a/...c/apm/impl/AbstractReporterBenchmark.java → ...k/reporter/AbstractReporterBenchmark.java b/...c/apm/impl/AbstractReporterBenchmark.java → ...k/reporter/AbstractReporterBenchmark.java
@@ -17,8 +17,10 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.impl;
+package co.elastic.apm.benchmark.reporter;
 
+import co.elastic.apm.benchmark.AbstractBenchmark;
+import co.elastic.apm.impl.ElasticApmTracer;
 import co.elastic.apm.impl.context.Context;
 import co.elastic.apm.impl.context.Request;
 import co.elastic.apm.impl.payload.Agent;

diff --git a/...mpl/HttpCborJacksonReporterBenchmark.java → ...ter/HttpCborJacksonReporterBenchmark.java b/...mpl/HttpCborJacksonReporterBenchmark.java → ...ter/HttpCborJacksonReporterBenchmark.java
@@ -17,15 +17,11 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.impl;
+package co.elastic.apm.benchmark.reporter;
 
-import co.elastic.apm.CpuProfiler;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
-import org.openjdk.jmh.profile.GCProfiler;
-import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
-import org.openjdk.jmh.runner.options.OptionsBuilder;
 
 public class HttpCborJacksonReporterBenchmark extends AbstractHttpJacksonReporterBenchmark {
 
@@ -36,12 +32,7 @@ public class HttpCborJacksonReporterBenchmark extends AbstractHttpJacksonReporte
      * {@code java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc}
      */
     public static void main(String[] args) throws RunnerException {
-        new Runner(new OptionsBuilder()
-            .include(HttpCborJacksonReporterBenchmark.class.getSimpleName())
-            .addProfiler(GCProfiler.class)
-            .addProfiler(CpuProfiler.class)
-            .build())
-            .run();
+        run(HttpCborJacksonReporterBenchmark.class);
     }
 
     protected ObjectMapper getObjectMapper() {

diff --git a/.../HttpVanillaJacksonReporterBenchmark.java → ...tpJacksonReporterContinuousBenchmark.java b/.../HttpVanillaJacksonReporterBenchmark.java → ...tpJacksonReporterContinuousBenchmark.java
@@ -17,16 +17,16 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.impl;
+package co.elastic.apm.benchmark.reporter;
 
-import co.elastic.apm.CpuProfiler;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openjdk.jmh.profile.GCProfiler;
-import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
-import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-public class HttpVanillaJacksonReporterBenchmark extends AbstractHttpJacksonReporterBenchmark {
+/**
+ * Measures the performance of the actually used reporter implementation
+ * including JSON serialization and reporting payloads over HTTP
+ */
+public class HttpJacksonReporterContinuousBenchmark extends AbstractHttpJacksonReporterBenchmark {
 
     /**
      * Convenience benchmark run method
@@ -35,12 +35,7 @@ public class HttpVanillaJacksonReporterBenchmark extends AbstractHttpJacksonRepo
      * {@code java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc}
      */
     public static void main(String[] args) throws RunnerException {
-        new Runner(new OptionsBuilder()
-            .include(HttpVanillaJacksonReporterBenchmark.class.getSimpleName())
-            .addProfiler(GCProfiler.class)
-            .addProfiler(CpuProfiler.class)
-            .build())
-            .run();
+        run(HttpJacksonReporterContinuousBenchmark.class);
     }
 
     protected ObjectMapper getObjectMapper() {

diff --git a/.../apm/impl/HttpMoshiReporterBenchmark.java → .../reporter/HttpMoshiReporterBenchmark.java b/.../apm/impl/HttpMoshiReporterBenchmark.java → .../reporter/HttpMoshiReporterBenchmark.java
@@ -17,14 +17,11 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.impl;
+package co.elastic.apm.benchmark.reporter;
 
-import co.elastic.apm.report.serialize.MoshiPayloadSerializer;
+import co.elastic.apm.benchmark.serializer.MoshiPayloadSerializer;
 import co.elastic.apm.report.serialize.PayloadSerializer;
-import org.openjdk.jmh.profile.GCProfiler;
-import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
-import org.openjdk.jmh.runner.options.OptionsBuilder;
 
 public class HttpMoshiReporterBenchmark extends AbstractHttpReporterBenchmark {
 
@@ -35,11 +32,7 @@ public class HttpMoshiReporterBenchmark extends AbstractHttpReporterBenchmark {
      * {@code java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc}
      */
     public static void main(String[] args) throws RunnerException {
-        new Runner(new OptionsBuilder()
-            .include(HttpMoshiReporterBenchmark.class.getSimpleName())
-            .addProfiler(GCProfiler.class)
-            .build())
-            .run();
+        run(HttpMoshiReporterBenchmark.class);
     }
 
     @Override

diff --git a/...m/impl/HttpNoopJsonReporterBenchmark.java → ...porter/HttpNoopJsonReporterBenchmark.java b/...m/impl/HttpNoopJsonReporterBenchmark.java → ...porter/HttpNoopJsonReporterBenchmark.java
@@ -17,13 +17,10 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.impl;
+package co.elastic.apm.benchmark.reporter;
 
 import co.elastic.apm.report.serialize.PayloadSerializer;
-import org.openjdk.jmh.profile.GCProfiler;
-import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
-import org.openjdk.jmh.runner.options.OptionsBuilder;
 
 public class HttpNoopJsonReporterBenchmark extends AbstractHttpReporterBenchmark {
 
@@ -34,11 +31,7 @@ public class HttpNoopJsonReporterBenchmark extends AbstractHttpReporterBenchmark
      * {@code java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc}
      */
     public static void main(String[] args) throws RunnerException {
-        new Runner(new OptionsBuilder()
-            .include(HttpNoopJsonReporterBenchmark.class.getSimpleName())
-            .addProfiler(GCProfiler.class)
-            .build())
-            .run();
+        run(HttpNoopJsonReporterBenchmark.class);
     }
 
     @Override

diff --git a/...astic/apm/impl/NoopReporterBenchmark.java → ...hmark/reporter/NoopReporterBenchmark.java b/...astic/apm/impl/NoopReporterBenchmark.java → ...hmark/reporter/NoopReporterBenchmark.java
@@ -17,15 +17,16 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.impl;
+package co.elastic.apm.benchmark.reporter;
 
 import co.elastic.apm.impl.payload.Payload;
 import co.elastic.apm.report.PayloadSender;
-import org.openjdk.jmh.profile.GCProfiler;
-import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
-import org.openjdk.jmh.runner.options.OptionsBuilder;
 
+/**
+ * Measures how many events the reporter can handle,
+ * not accounting for JSON serialization and sending payloads over HTTP.
+ */
 public class NoopReporterBenchmark extends AbstractReporterBenchmark {
 
     /**
@@ -35,11 +36,7 @@ public class NoopReporterBenchmark extends AbstractReporterBenchmark {
      * {@code java -jar apm-agent-benchmarks/target/benchmarks.jar -prof gc}
      */
     public static void main(String[] args) throws RunnerException {
-        new Runner(new OptionsBuilder()
-            .include(NoopReporterBenchmark.class.getSimpleName())
-            .addProfiler(GCProfiler.class)
-            .build())
-            .run();
+        run(NoopReporterBenchmark.class);
     }
 
     protected PayloadSender getPayloadSender() {

diff --git a/...ort/serialize/MoshiPayloadSerializer.java → ...rk/serializer/MoshiPayloadSerializer.java b/...ort/serialize/MoshiPayloadSerializer.java → ...rk/serializer/MoshiPayloadSerializer.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.report.serialize;
+package co.elastic.apm.benchmark.serializer;
 
 import co.elastic.apm.impl.payload.Payload;
 import co.elastic.apm.report.serialize.PayloadSerializer;