Refactor and specific agent classes bootdelegation (#376)

* Test public API in app server integration test (fails on WildFly, Payara and WebSphere Liberty) * Refactor so that all agent implementation classes are under a common root, separate from APIs * Update WildFly system packages setting and OSGi bootdelegation
elastic · Dec 10, 2018 · 5de1437 · 5de1437
1 parent 702d130
commit 5de1437
Show file tree

Hide file tree

Showing 357 changed files with 1,662 additions and 1,651 deletions.
diff --git a/.ci/run-benchmarks.sh b/.ci/run-benchmarks.sh
@@ -69,7 +69,7 @@ function benchmark() {
     sudo cset proc --exec /benchmark -- \
         $JAVA_HOME/bin/java -jar apm-agent-benchmarks/target/benchmarks.jar ".*ContinuousBenchmark" \
         -prof gc \
-        -prof co.elastic.apm.benchmark.profiler.ReporterProfiler \
+        -prof co.elastic.apm.agent.benchmark.profiler.ReporterProfiler \
         -rf json \
         -rff ${RESULT_FILE}
 
@@ -78,7 +78,7 @@ function benchmark() {
     rm -f ${RESULT_FILE}
     mv "${RESULT_FILE}.clean" ${RESULT_FILE}
 
-    $JAVA_HOME/bin/java -cp apm-agent-benchmarks/target/benchmarks.jar co.elastic.apm.benchmark.PostProcessBenchmarkResults ${RESULT_FILE} ${BULK_UPLOAD_FILE} ${COMMIT_UNIX}
+    $JAVA_HOME/bin/java -cp apm-agent-benchmarks/target/benchmarks.jar co.elastic.apm.agent.benchmark.PostProcessBenchmarkResults ${RESULT_FILE} ${BULK_UPLOAD_FILE} ${COMMIT_UNIX}
     setCloudCredentials
     curl --user ${CLOUD_USERNAME}:${CLOUD_PASSWORD} -XPOST 'https://1ec92c339f616ca43771bff669cc419c.europe-west3.gcp.cloud.es.io:9243/_bulk' -H 'Content-Type: application/json'  --data-binary @${BULK_UPLOAD_FILE}
     unset CLOUD_USERNAME

diff --git a/apm-agent-api/src/main/java/co/elastic/apm/api/NoopSpan.java b/apm-agent-api/src/main/java/co/elastic/apm/api/NoopSpan.java
@@ -46,7 +46,7 @@ public void end() {
 
     @Override
     public void captureException(Throwable throwable) {
-        // co.elastic.apm.plugin.api.CaptureExceptionInstrumentation
+        // co.elastic.apm.agent.plugin.api.CaptureExceptionInstrumentation
     }
 
     @Nonnull

diff --git a/apm-agent-api/src/main/java/co/elastic/apm/api/NoopTransaction.java b/apm-agent-api/src/main/java/co/elastic/apm/api/NoopTransaction.java
@@ -57,7 +57,7 @@ public void end() {
 
     @Override
     public void captureException(Throwable throwable) {
-        // co.elastic.apm.plugin.api.CaptureExceptionInstrumentation
+        // co.elastic.apm.agent.plugin.api.CaptureExceptionInstrumentation
     }
 
     @Nonnull

diff --git a/apm-agent-api/src/main/java/co/elastic/apm/api/ScopeImpl.java b/apm-agent-api/src/main/java/co/elastic/apm/api/ScopeImpl.java
@@ -33,6 +33,6 @@ public class ScopeImpl implements Scope {
 
     @Override
     public void close() {
-        // co.elastic.apm.plugin.api.ApiScopeInstrumentation
+        // co.elastic.apm.agent.plugin.api.ApiScopeInstrumentation
     }
 }
diff --git a/apm-agent-api/src/main/java/co/elastic/apm/api/SpanImpl.java b/apm-agent-api/src/main/java/co/elastic/apm/api/SpanImpl.java
@@ -23,7 +23,7 @@
 
 /**
  * If the agent is active, it injects the implementation from
- * co.elastic.apm.plugin.api.SpanInstrumentation
+ * co.elastic.apm.agent.plugin.api.SpanInstrumentation
  * into this class.
  * <p>
  * Otherwise, this class is a noop.
@@ -32,7 +32,7 @@
 class SpanImpl implements Span {
 
     @Nonnull
-    // co.elastic.apm.impl.transaction.AbstractSpan
+    // co.elastic.apm.agent.impl.transaction.AbstractSpan
     protected final Object span;
 
     SpanImpl(@Nonnull Object span) {
@@ -41,17 +41,17 @@ class SpanImpl implements Span {
 
     @Override
     public void setName(String name) {
-        // co.elastic.apm.plugin.api.SpanInstrumentation$SetNameInstrumentation.setName
+        // co.elastic.apm.agent.plugin.api.SpanInstrumentation$SetNameInstrumentation.setName
     }
 
     @Override
     public void setType(String type) {
-        // co.elastic.apm.plugin.api.SpanInstrumentation$SetTypeInstrumentation.setType
+        // co.elastic.apm.agent.plugin.api.SpanInstrumentation$SetTypeInstrumentation.setType
     }
 
     @Override
     public void addTag(String key, String value) {
-        // co.elastic.apm.plugin.api.SpanInstrumentation$AddTagInstrumentation.addTag
+        // co.elastic.apm.agent.plugin.api.SpanInstrumentation$AddTagInstrumentation.addTag
     }
 
     @Override
@@ -61,43 +61,43 @@ public Span createSpan() {
     }
 
     private Object doCreateSpan() {
-        // co.elastic.apm.plugin.api.SpanInstrumentation$DoCreateSpanInstrumentation.doCreateSpan
+        // co.elastic.apm.agent.plugin.api.SpanInstrumentation$DoCreateSpanInstrumentation.doCreateSpan
         return null;
     }
 
     @Override
     public void end() {
-        // co.elastic.apm.plugin.api.SpanInstrumentation$EndInstrumentation.end
+        // co.elastic.apm.agent.plugin.api.SpanInstrumentation$EndInstrumentation.end
     }
 
     @Override
     public void captureException(Throwable throwable) {
-        // co.elastic.apm.plugin.api.SpanInstrumentation.CaptureExceptionInstrumentation
+        // co.elastic.apm.agent.plugin.api.SpanInstrumentation.CaptureExceptionInstrumentation
     }
 
     @Nonnull
     @Override
     public String getId() {
-        // co.elastic.apm.plugin.api.SpanInstrumentation.GetIdInstrumentation
+        // co.elastic.apm.agent.plugin.api.SpanInstrumentation.GetIdInstrumentation
         return "";
     }
 
     @Nonnull
     @Override
     public String getTraceId() {
-        // co.elastic.apm.plugin.api.SpanInstrumentation.GetTraceIdInstrumentation
+        // co.elastic.apm.agent.plugin.api.SpanInstrumentation.GetTraceIdInstrumentation
         return "";
     }
 
     @Override
     public Scope activate() {
-        // co.elastic.apm.plugin.api.SpanInstrumentation.ActivateInstrumentation
+        // co.elastic.apm.agent.plugin.api.SpanInstrumentation.ActivateInstrumentation
         return new ScopeImpl(span);
     }
 
     @Override
     public boolean isSampled() {
-        // co.elastic.apm.plugin.api.SpanInstrumentation.IsSampledInstrumentation
+        // co.elastic.apm.agent.plugin.api.SpanInstrumentation.IsSampledInstrumentation
         return false;
     }
 

diff --git a/apm-agent-api/src/main/java/co/elastic/apm/api/TransactionImpl.java b/apm-agent-api/src/main/java/co/elastic/apm/api/TransactionImpl.java
@@ -23,7 +23,7 @@
 
 /**
  * If the agent is active, it injects the implementation from
- * co.elastic.apm.plugin.api.TransactionInstrumentation
+ * co.elastic.apm.agent.plugin.api.TransactionInstrumentation
  * into this class.
  * <p>
  * Otherwise, this class is a noop.
@@ -37,7 +37,7 @@ class TransactionImpl extends SpanImpl implements Transaction {
 
     @Override
     public void setUser(String id, String email, String username) {
-        // co.elastic.apm.plugin.api.TransactionInstrumentation$SetUserInstrumentation.setUser
+        // co.elastic.apm.agent.plugin.api.TransactionInstrumentation$SetUserInstrumentation.setUser
     }
 
     @Override
@@ -48,7 +48,7 @@ public void setResult(String result) {
     @Nonnull
     @Override
     public String ensureParentId() {
-        // co.elastic.apm.plugin.api.TransactionInstrumentation.EnsureParentIdInstrumentation
+        // co.elastic.apm.agent.plugin.api.TransactionInstrumentation.EnsureParentIdInstrumentation
         return "";
     }
 

diff --git a/apm-agent-benchmarks/pom.xml b/apm-agent-benchmarks/pom.xml
@@ -20,7 +20,7 @@
         </dependency>
         <!--
         we can't add elastic-apm-agent as it causes shading problems:
-        java.util.ServiceConfigurationError: org.stagemonitor.configuration.ConfigurationOptionProvider: co.elastic.apm.web.WebConfiguration not a subtype
+        java.util.ServiceConfigurationError: org.stagemonitor.configuration.ConfigurationOptionProvider: co.elastic.apm.agent.web.WebConfiguration not a subtype
         -->
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/...stic/apm/benchmark/AbstractBenchmark.java → ...pm/agent/benchmark/AbstractBenchmark.java b/...stic/apm/benchmark/AbstractBenchmark.java → ...pm/agent/benchmark/AbstractBenchmark.java
@@ -17,10 +17,10 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark;
+package co.elastic.apm.agent.benchmark;
 
-import co.elastic.apm.benchmark.profiler.CpuProfiler;
-import co.elastic.apm.benchmark.profiler.ReporterProfiler;
+import co.elastic.apm.agent.benchmark.profiler.CpuProfiler;
+import co.elastic.apm.agent.benchmark.profiler.ReporterProfiler;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;

diff --git a/.../ElasticApmActiveContinuousBenchmark.java → .../ElasticApmActiveContinuousBenchmark.java b/.../ElasticApmActiveContinuousBenchmark.java → .../ElasticApmActiveContinuousBenchmark.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark;
+package co.elastic.apm.agent.benchmark;
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.runner.RunnerException;

diff --git a/...chmark/ElasticApmContinuousBenchmark.java → ...chmark/ElasticApmContinuousBenchmark.java b/...chmark/ElasticApmContinuousBenchmark.java → ...chmark/ElasticApmContinuousBenchmark.java
@@ -17,14 +17,14 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark;
-
-import co.elastic.apm.bci.ElasticApmAgent;
-import co.elastic.apm.benchmark.sql.BlackholeConnection;
-import co.elastic.apm.configuration.CoreConfiguration;
-import co.elastic.apm.impl.ElasticApmTracer;
-import co.elastic.apm.impl.ElasticApmTracerBuilder;
-import co.elastic.apm.report.Reporter;
+package co.elastic.apm.agent.benchmark;
+
+import co.elastic.apm.agent.bci.ElasticApmAgent;
+import co.elastic.apm.agent.benchmark.sql.BlackholeConnection;
+import co.elastic.apm.agent.configuration.CoreConfiguration;
+import co.elastic.apm.agent.impl.ElasticApmTracer;
+import co.elastic.apm.agent.impl.ElasticApmTracerBuilder;
+import co.elastic.apm.agent.report.Reporter;
 import io.undertow.Undertow;
 import io.undertow.server.handlers.BlockingHandler;
 import net.bytebuddy.agent.ByteBuddyAgent;

diff --git a/...asticApmNotActiveContinuousBenchmark.java → ...asticApmNotActiveContinuousBenchmark.java b/...asticApmNotActiveContinuousBenchmark.java → ...asticApmNotActiveContinuousBenchmark.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark;
+package co.elastic.apm.agent.benchmark;
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.runner.RunnerException;

diff --git a/...apm/benchmark/MockHttpServletRequest.java → ...ent/benchmark/MockHttpServletRequest.java b/...apm/benchmark/MockHttpServletRequest.java → ...ent/benchmark/MockHttpServletRequest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark;
+package co.elastic.apm.agent.benchmark;
 
 import javax.servlet.AsyncContext;
 import javax.servlet.DispatcherType;

diff --git a/...pm/benchmark/MockHttpServletResponse.java → ...nt/benchmark/MockHttpServletResponse.java b/...pm/benchmark/MockHttpServletResponse.java → ...nt/benchmark/MockHttpServletResponse.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark;
+package co.elastic.apm.agent.benchmark;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.Cookie;

diff --git a/...enchmark/PostProcessBenchmarkResults.java → ...enchmark/PostProcessBenchmarkResults.java b/...enchmark/PostProcessBenchmarkResults.java → ...enchmark/PostProcessBenchmarkResults.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark;
+package co.elastic.apm.agent.benchmark;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/.../co/elastic/apm/benchmark/SizeOfSpan.java → ...astic/apm/agent/benchmark/SizeOfSpan.java b/.../co/elastic/apm/benchmark/SizeOfSpan.java → ...astic/apm/agent/benchmark/SizeOfSpan.java
@@ -17,15 +17,15 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark;
+package co.elastic.apm.agent.benchmark;
 
-import co.elastic.apm.impl.ElasticApmTracer;
-import co.elastic.apm.impl.ElasticApmTracerBuilder;
-import co.elastic.apm.impl.error.ErrorCapture;
-import co.elastic.apm.impl.transaction.Span;
-import co.elastic.apm.impl.transaction.Transaction;
-import co.elastic.apm.report.ReporterConfiguration;
-import co.elastic.apm.util.MathUtils;
+import co.elastic.apm.agent.impl.ElasticApmTracer;
+import co.elastic.apm.agent.impl.ElasticApmTracerBuilder;
+import co.elastic.apm.agent.impl.error.ErrorCapture;
+import co.elastic.apm.agent.impl.transaction.Span;
+import co.elastic.apm.agent.impl.transaction.Transaction;
+import co.elastic.apm.agent.report.ReporterConfiguration;
+import co.elastic.apm.agent.util.MathUtils;
 import org.ehcache.sizeof.SizeOf;
 
 public class SizeOfSpan {

diff --git a/...hmark/objectpool/ObjectPoolBenchmark.java → ...hmark/objectpool/ObjectPoolBenchmark.java b/...hmark/objectpool/ObjectPoolBenchmark.java → ...hmark/objectpool/ObjectPoolBenchmark.java
@@ -17,15 +17,15 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark.objectpool;
+package co.elastic.apm.agent.benchmark.objectpool;
 
-import co.elastic.apm.benchmark.AbstractBenchmark;
-import co.elastic.apm.impl.ElasticApmTracer;
-import co.elastic.apm.impl.ElasticApmTracerBuilder;
-import co.elastic.apm.impl.transaction.Transaction;
-import co.elastic.apm.objectpool.impl.MixedObjectPool;
-import co.elastic.apm.objectpool.impl.QueueBasedObjectPool;
-import co.elastic.apm.objectpool.impl.ThreadLocalObjectPool;
+import co.elastic.apm.agent.benchmark.AbstractBenchmark;
+import co.elastic.apm.agent.impl.ElasticApmTracer;
+import co.elastic.apm.agent.impl.ElasticApmTracerBuilder;
+import co.elastic.apm.agent.impl.transaction.Transaction;
+import co.elastic.apm.agent.objectpool.impl.MixedObjectPool;
+import co.elastic.apm.agent.objectpool.impl.QueueBasedObjectPool;
+import co.elastic.apm.agent.objectpool.impl.ThreadLocalObjectPool;
 import org.agrona.concurrent.ManyToManyConcurrentArrayQueue;
 import org.jctools.queues.MpmcArrayQueue;
 import org.jctools.queues.atomic.MpmcAtomicArrayQueue;

diff --git a/...c/apm/benchmark/profiler/CpuProfiler.java → ...agent/benchmark/profiler/CpuProfiler.java b/...c/apm/benchmark/profiler/CpuProfiler.java → ...agent/benchmark/profiler/CpuProfiler.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark.profiler;
+package co.elastic.apm.agent.benchmark.profiler;
 
 import com.sun.management.OperatingSystemMXBean;
 import org.openjdk.jmh.infra.BenchmarkParams;

diff --git a/.../benchmark/profiler/ReporterProfiler.java → .../benchmark/profiler/ReporterProfiler.java b/.../benchmark/profiler/ReporterProfiler.java → .../benchmark/profiler/ReporterProfiler.java
@@ -17,9 +17,9 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark.profiler;
+package co.elastic.apm.agent.benchmark.profiler;
 
-import co.elastic.apm.report.Reporter;
+import co.elastic.apm.agent.report.Reporter;
 import org.openjdk.jmh.infra.BenchmarkParams;
 import org.openjdk.jmh.infra.IterationParams;
 import org.openjdk.jmh.profile.InternalProfiler;

diff --git a/...pm/benchmark/sql/BlackholeConnection.java → ...nt/benchmark/sql/BlackholeConnection.java b/...pm/benchmark/sql/BlackholeConnection.java → ...nt/benchmark/sql/BlackholeConnection.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark.sql;
+package co.elastic.apm.agent.benchmark.sql;
 
 import org.openjdk.jmh.infra.Blackhole;
 

diff --git a/...hmark/sql/BlackholePreparedStatement.java → ...hmark/sql/BlackholePreparedStatement.java b/...hmark/sql/BlackholePreparedStatement.java → ...hmark/sql/BlackholePreparedStatement.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark.sql;
+package co.elastic.apm.agent.benchmark.sql;
 
 import org.openjdk.jmh.infra.Blackhole;
 

diff --git a/...apm/benchmark/sql/BlackholeResultSet.java → ...ent/benchmark/sql/BlackholeResultSet.java b/...apm/benchmark/sql/BlackholeResultSet.java → ...ent/benchmark/sql/BlackholeResultSet.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark.sql;
+package co.elastic.apm.agent.benchmark.sql;
 
 import org.openjdk.jmh.infra.Blackhole;
 

diff --git a/...apm/benchmark/sql/BlackholeStatement.java → ...ent/benchmark/sql/BlackholeStatement.java b/...apm/benchmark/sql/BlackholeStatement.java → ...ent/benchmark/sql/BlackholeStatement.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.benchmark.sql;
+package co.elastic.apm.agent.benchmark.sql;
 
 import org.openjdk.jmh.infra.Blackhole;
 

diff --git a/apm-agent-benchmarks/src/main/resources/META-INF/services/org.openjdk.jmh.profile.Profiler b/apm-agent-benchmarks/src/main/resources/META-INF/services/org.openjdk.jmh.profile.Profiler
@@ -1 +1 @@
-co.elastic.apm.benchmark.profiler.ReporterProfiler
+co.elastic.apm.agent.benchmark.profiler.ReporterProfiler
diff --git a/apm-agent-core/README.md b/apm-agent-core/README.md
@@ -16,10 +16,10 @@ It provides access to all fields available in the APM server intake api: https:/
 The Reporter is responsible for sending Transactions to the APM server.
 
 It's based on a Disruptor/ring buffer and receives finished transactions potentially from multiple threads.
-The ring buffer decouples the transaction-producing threads from the co.elastic.apm.report.ReportingEventHandler,
+The ring buffer decouples the transaction-producing threads from the co.elastic.apm.agent.report.ReportingEventHandler,
 which is single-threaded and sends the transactions to the APM server via HTTP.
 
-The class co.elastic.apm.report.ReporterConfiguration contains all relevant configuration options for the reporter.
+The class co.elastic.apm.agent.report.ReporterConfiguration contains all relevant configuration options for the reporter.
 
 ## Lifecycle
 

diff --git a/apm-agent-core/pom.xml b/apm-agent-core/pom.xml
@@ -22,7 +22,7 @@
                 <version>0.5.1</version>
                 <configuration>
                     <sourceDirectory>${basedir}/src/main/resources/schema</sourceDirectory>
-                    <targetPackage>co.elastic.apm.impl.intake</targetPackage>
+                    <targetPackage>co.elastic.apm.agent.impl.intake</targetPackage>
                     <usePrimitives>true</usePrimitives>
                     <useLongIntegers>true</useLongIntegers>
                     <includeAdditionalProperties>false</includeAdditionalProperties>

diff --git a/...co/elastic/apm/annotation/NonnullApi.java → ...stic/apm/agent/annotation/NonnullApi.java b/...co/elastic/apm/annotation/NonnullApi.java → ...stic/apm/agent/annotation/NonnullApi.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package co.elastic.apm.annotation;
+package co.elastic.apm.agent.annotation;
 
 import javax.annotation.Nonnull;
 import javax.annotation.meta.TypeQualifierDefault;

diff --git a/.../elastic/apm/annotation/package-info.java → ...ic/apm/agent/annotation/package-info.java b/.../elastic/apm/annotation/package-info.java → ...ic/apm/agent/annotation/package-info.java
@@ -18,4 +18,4 @@
  * #L%
  */
 @NonnullApi
-package co.elastic.apm.annotation;
+package co.elastic.apm.agent.annotation;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		co.elastic.apm.benchmark.profiler.ReporterProfiler
		co.elastic.apm.agent.benchmark.profiler.ReporterProfiler