diff --git a/.ci/run-benchmarks.sh b/.ci/run-benchmarks.sh index 72cd263415..5781c69fbd 100755 --- 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 index 7993014b61..848fe7b8fd 100644 --- 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 index c3c2b6a620..6f20422a69 100644 --- 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 index c37175c011..e42d2a6982 100644 --- 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 index c180a842c7..28c92c62e5 100644 --- 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. *

* 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 index acefa4aa49..3f25667536 100644 --- 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. *

* 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 index cff61e8a0b..92e06292aa 100644 --- a/apm-agent-benchmarks/pom.xml +++ b/apm-agent-benchmarks/pom.xml @@ -20,7 +20,7 @@ ${project.groupId} diff --git a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/AbstractBenchmark.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/AbstractBenchmark.java index 777359c6c3..7972a9aaec 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/AbstractBenchmark.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/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/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/ElasticApmActiveContinuousBenchmark.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/ElasticApmActiveContinuousBenchmark.java index 4384e06f64..a99315baad 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/ElasticApmActiveContinuousBenchmark.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/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/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/ElasticApmContinuousBenchmark.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/ElasticApmContinuousBenchmark.java index ade6fef1dc..315e25a3ce 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/ElasticApmContinuousBenchmark.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/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/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/ElasticApmNotActiveContinuousBenchmark.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/ElasticApmNotActiveContinuousBenchmark.java index 42d602fd49..2e95201264 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/ElasticApmNotActiveContinuousBenchmark.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/ElasticApmNotActiveContinuousBenchmark.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-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/MockHttpServletRequest.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/MockHttpServletRequest.java index 3ac83d70ad..dea20cef81 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/MockHttpServletRequest.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/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/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/MockHttpServletResponse.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/MockHttpServletResponse.java index 43ca6cc796..839952c486 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/MockHttpServletResponse.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/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/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/PostProcessBenchmarkResults.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/PostProcessBenchmarkResults.java index 431f927c51..a54d724296 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/PostProcessBenchmarkResults.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/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/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/SizeOfSpan.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/SizeOfSpan.java index ce4b73d054..2f9974e8e9 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/SizeOfSpan.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/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/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/objectpool/ObjectPoolBenchmark.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/objectpool/ObjectPoolBenchmark.java index 8d92e07d31..7ed3685dd7 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/objectpool/ObjectPoolBenchmark.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/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/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/profiler/CpuProfiler.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/profiler/CpuProfiler.java index 7d51d7f0cc..15f1142e4f 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/profiler/CpuProfiler.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/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/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/profiler/ReporterProfiler.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/profiler/ReporterProfiler.java index 0638e1ef44..be7dc14419 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/profiler/ReporterProfiler.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/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/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/BlackholeConnection.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/BlackholeConnection.java index 9e90bb7381..670c3c0808 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/BlackholeConnection.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/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/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/BlackholePreparedStatement.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/BlackholePreparedStatement.java index 0f379650de..d521fed8e2 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/BlackholePreparedStatement.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/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-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/BlackholeResultSet.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/BlackholeResultSet.java index 8337f5e5c4..66686789bf 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/BlackholeResultSet.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/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-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/BlackholeStatement.java b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/BlackholeStatement.java index c41b219748..c857bfa02a 100644 --- a/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/BlackholeStatement.java +++ b/apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/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 index 82110fc8ed..9b47e4bd8f 100644 --- 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 index 9b7e13f87d..d2c704efd0 100644 --- 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 index 5f8a5dd8f6..a40dd0ea69 100644 --- a/apm-agent-core/pom.xml +++ b/apm-agent-core/pom.xml @@ -22,7 +22,7 @@ 0.5.1 ${basedir}/src/main/resources/schema - co.elastic.apm.impl.intake + co.elastic.apm.agent.impl.intake true true false diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/annotation/NonnullApi.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/annotation/NonnullApi.java index bda7790c16..df44929379 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/annotation/NonnullApi.java +++ b/apm-agent-core/src/main/java/co/elastic/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/apm-agent-core/src/main/java/co/elastic/apm/agent/annotation/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/annotation/package-info.java index b8e31bcaee..d66846ca42 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/annotation/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/annotation/package-info.java @@ -18,4 +18,4 @@ * #L% */ @NonnullApi -package co.elastic.apm.annotation; +package co.elastic.apm.agent.annotation; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/AgentMain.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/AgentMain.java index ec963e4d37..9c08376e38 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/AgentMain.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/AgentMain.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci; +package co.elastic.apm.agent.bci; import java.io.File; import java.lang.instrument.Instrumentation; @@ -65,7 +65,7 @@ public static void init(Instrumentation instrumentation) { instrumentation.appendToBootstrapClassLoaderSearch(new JarFile(agentJarFile)); // invoking via reflection to make sure the class is not loaded by the system classloader, // but only from the bootstrap classloader - Class.forName("co.elastic.apm.bci.ElasticApmAgent", true, null) + Class.forName("co.elastic.apm.agent.bci.ElasticApmAgent", true, null) .getMethod("initialize", Instrumentation.class, File.class) .invoke(null, instrumentation, agentJarFile); } catch (Exception e) { diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/ElasticApmAgent.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/ElasticApmAgent.java index 647cb4f294..870935afc4 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/ElasticApmAgent.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/ElasticApmAgent.java @@ -17,18 +17,18 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci; +package co.elastic.apm.agent.bci; -import co.elastic.apm.bci.bytebuddy.AnnotationValueOffsetMappingFactory; -import co.elastic.apm.bci.bytebuddy.ErrorLoggingListener; -import co.elastic.apm.bci.bytebuddy.MatcherTimer; -import co.elastic.apm.bci.bytebuddy.MinimumClassFileVersionValidator; -import co.elastic.apm.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory; -import co.elastic.apm.bci.bytebuddy.SoftlyReferencingTypePoolCache; -import co.elastic.apm.configuration.CoreConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.ElasticApmTracerBuilder; -import co.elastic.apm.matcher.WildcardMatcher; +import co.elastic.apm.agent.bci.bytebuddy.AnnotationValueOffsetMappingFactory; +import co.elastic.apm.agent.bci.bytebuddy.ErrorLoggingListener; +import co.elastic.apm.agent.bci.bytebuddy.MatcherTimer; +import co.elastic.apm.agent.bci.bytebuddy.MinimumClassFileVersionValidator; +import co.elastic.apm.agent.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory; +import co.elastic.apm.agent.bci.bytebuddy.SoftlyReferencingTypePoolCache; +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.matcher.WildcardMatcher; import net.bytebuddy.ByteBuddy; import net.bytebuddy.agent.builder.AgentBuilder; import net.bytebuddy.agent.builder.ResettableClassFileTransformer; @@ -54,8 +54,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import static co.elastic.apm.bci.bytebuddy.ClassLoaderNameMatcher.classLoaderWithName; -import static co.elastic.apm.bci.bytebuddy.ClassLoaderNameMatcher.isReflectionClassLoader; +import static co.elastic.apm.agent.bci.bytebuddy.ClassLoaderNameMatcher.classLoaderWithName; +import static co.elastic.apm.agent.bci.bytebuddy.ClassLoaderNameMatcher.isReflectionClassLoader; import static net.bytebuddy.asm.Advice.ExceptionHandler.Default.PRINTING; import static net.bytebuddy.matcher.ElementMatchers.any; import static net.bytebuddy.matcher.ElementMatchers.nameContains; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/ElasticApmInstrumentation.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/ElasticApmInstrumentation.java index 552a6f8bab..dbb8def4f8 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/ElasticApmInstrumentation.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/ElasticApmInstrumentation.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci; +package co.elastic.apm.agent.bci; -import co.elastic.apm.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.ElasticApmTracer; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; @@ -48,8 +48,8 @@ public abstract class ElasticApmInstrumentation { /** * Initializes the advice with the {@link ElasticApmTracer} *

- * This enables tests to register a custom instance with a {@link co.elastic.apm.impl.ElasticApmTracerBuilder#configurationRegistry} - * and {@link co.elastic.apm.impl.ElasticApmTracerBuilder#reporter} which is specific to a particular test or test class. + * This enables tests to register a custom instance with a {@link co.elastic.apm.agent.impl.ElasticApmTracerBuilder#configurationRegistry} + * and {@link co.elastic.apm.agent.impl.ElasticApmTracerBuilder#reporter} which is specific to a particular test or test class. *

* * @param tracer the tracer to use for this advice. @@ -111,7 +111,7 @@ public Class getAdviceClass() { /** * Return {@code true}, * if this instrumentation should even be applied when - * {@link co.elastic.apm.configuration.CoreConfiguration#instrument} is set to {@code false}. + * {@link co.elastic.apm.agent.configuration.CoreConfiguration#instrument} is set to {@code false}. */ public boolean includeWhenInstrumentationIsDisabled() { return false; @@ -120,7 +120,7 @@ public boolean includeWhenInstrumentationIsDisabled() { /** * Returns a name which groups several instrumentations into a logical group. *

- * This name is used in {@link co.elastic.apm.configuration.CoreConfiguration#disabledInstrumentations} to exclude a logical group + * This name is used in {@link co.elastic.apm.agent.configuration.CoreConfiguration#disabledInstrumentations} to exclude a logical group * of instrumentations. *

* diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/HelperClassManager.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/HelperClassManager.java index ec0a540438..e80f7e55ad 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/HelperClassManager.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/HelperClassManager.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci; +package co.elastic.apm.agent.bci; -import co.elastic.apm.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.ElasticApmTracer; import net.bytebuddy.dynamic.ClassFileLocator; import net.bytebuddy.dynamic.loading.ByteArrayClassLoader; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/MatcherTimerLifecycleListener.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/MatcherTimerLifecycleListener.java index 3f82c32fb8..2ff12e7e22 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/MatcherTimerLifecycleListener.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/MatcherTimerLifecycleListener.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci; +package co.elastic.apm.agent.bci; -import co.elastic.apm.bci.bytebuddy.MatcherTimer; -import co.elastic.apm.context.LifecycleListener; -import co.elastic.apm.impl.ElasticApmTracer; +import co.elastic.apm.agent.bci.bytebuddy.MatcherTimer; +import co.elastic.apm.agent.context.LifecycleListener; +import co.elastic.apm.agent.impl.ElasticApmTracer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/OsgiBootDelegationEnabler.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/OsgiBootDelegationEnabler.java index 39ce43739c..f9f3225100 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/OsgiBootDelegationEnabler.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/OsgiBootDelegationEnabler.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci; +package co.elastic.apm.agent.bci; -import co.elastic.apm.context.LifecycleListener; -import co.elastic.apm.impl.ElasticApmTracer; +import co.elastic.apm.agent.context.LifecycleListener; +import co.elastic.apm.agent.impl.ElasticApmTracer; import java.util.Arrays; import java.util.List; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/VisibleForAdvice.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/VisibleForAdvice.java index 90701d4924..346a58744d 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/VisibleForAdvice.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/VisibleForAdvice.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci; +package co.elastic.apm.agent.bci; import net.bytebuddy.asm.Advice; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/AnnotationValueOffsetMappingFactory.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/AnnotationValueOffsetMappingFactory.java index 4e1164c218..93818211a5 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/AnnotationValueOffsetMappingFactory.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/AnnotationValueOffsetMappingFactory.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.annotation.AnnotationDescription; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/ClassLoaderNameMatcher.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/ClassLoaderNameMatcher.java index 662c972464..49a78707a7 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/ClassLoaderNameMatcher.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/ClassLoaderNameMatcher.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/CustomElementMatchers.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/CustomElementMatchers.java index a1468102a0..c8a6594bf6 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/CustomElementMatchers.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/CustomElementMatchers.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; import com.blogspot.mydailyjava.weaklockfree.WeakConcurrentMap; import net.bytebuddy.description.NamedElement; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/ErrorLoggingListener.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/ErrorLoggingListener.java index 2dbe51f656..9725e4f34b 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/ErrorLoggingListener.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/ErrorLoggingListener.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; import net.bytebuddy.agent.builder.AgentBuilder; import net.bytebuddy.utility.JavaModule; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/MatcherTimer.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/MatcherTimer.java index 642530d126..ab110c7be5 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/MatcherTimer.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/MatcherTimer.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; import javax.annotation.Nonnull; import java.util.concurrent.atomic.AtomicLong; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/MethodHierarchyMatcher.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/MethodHierarchyMatcher.java index b52629e5bf..2b7430730d 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/MethodHierarchyMatcher.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/MethodHierarchyMatcher.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/MinimumClassFileVersionValidator.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/MinimumClassFileVersionValidator.java index 2d5a8e31db..7244b0c975 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/MinimumClassFileVersionValidator.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/MinimumClassFileVersionValidator.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; import net.bytebuddy.ClassFileVersion; import net.bytebuddy.asm.AsmVisitorWrapper; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/SimpleMethodSignatureOffsetMappingFactory.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/SimpleMethodSignatureOffsetMappingFactory.java index d8cca52da5..f8f8cb49ac 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/SimpleMethodSignatureOffsetMappingFactory.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/SimpleMethodSignatureOffsetMappingFactory.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.annotation.AnnotationDescription; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/SoftlyReferencingTypePoolCache.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/SoftlyReferencingTypePoolCache.java index e784442f70..4ff8538979 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/SoftlyReferencingTypePoolCache.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/SoftlyReferencingTypePoolCache.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; -import co.elastic.apm.util.ExecutorUtils; +import co.elastic.apm.agent.util.ExecutorUtils; import com.blogspot.mydailyjava.weaklockfree.WeakConcurrentMap; import net.bytebuddy.agent.builder.AgentBuilder; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/package-info.java index c49de6019e..bcf4da87e7 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/package-info.java index c184789295..3a039e7cfa 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/bci/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.bci; +package co.elastic.apm.agent.bci; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/cache/WeakKeySoftValueLoadingCache.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/cache/WeakKeySoftValueLoadingCache.java index ce0ce7e6ed..b72773c448 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/cache/WeakKeySoftValueLoadingCache.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/cache/WeakKeySoftValueLoadingCache.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.cache; +package co.elastic.apm.agent.cache; import com.blogspot.mydailyjava.weaklockfree.WeakConcurrentMap; import org.slf4j.Logger; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/cache/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/cache/package-info.java index 301b984c42..5762096114 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/cache/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/cache/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.cache; +package co.elastic.apm.agent.cache; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/CoreConfiguration.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/CoreConfiguration.java index ec2a6725b6..4ced9c72d3 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/CoreConfiguration.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/CoreConfiguration.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration; +package co.elastic.apm.agent.configuration; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.configuration.validation.RegexValidator; -import co.elastic.apm.matcher.WildcardMatcher; -import co.elastic.apm.matcher.WildcardMatcherValueConverter; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.configuration.validation.RegexValidator; +import co.elastic.apm.agent.matcher.WildcardMatcher; +import co.elastic.apm.agent.matcher.WildcardMatcherValueConverter; import org.stagemonitor.configuration.ConfigurationOption; import org.stagemonitor.configuration.ConfigurationOptionProvider; import org.stagemonitor.configuration.converter.ListValueConverter; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/PrefixingConfigurationSourceWrapper.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/PrefixingConfigurationSourceWrapper.java index 6bf73f40b3..520fcb3c1a 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/PrefixingConfigurationSourceWrapper.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/PrefixingConfigurationSourceWrapper.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration; +package co.elastic.apm.agent.configuration; import org.stagemonitor.configuration.source.ConfigurationSource; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/ServiceNameUtil.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/ServiceNameUtil.java index 28256e78b0..74e0aa61a0 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/ServiceNameUtil.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/ServiceNameUtil.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration; +package co.elastic.apm.agent.configuration; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/StartupInfo.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/StartupInfo.java index 97a399abb4..9cc5afacfe 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/StartupInfo.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/StartupInfo.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration; +package co.elastic.apm.agent.configuration; -import co.elastic.apm.configuration.converter.TimeDuration; -import co.elastic.apm.context.LifecycleListener; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.util.VersionUtils; +import co.elastic.apm.agent.configuration.converter.TimeDuration; +import co.elastic.apm.agent.context.LifecycleListener; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.util.VersionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.stagemonitor.configuration.ConfigurationOption; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/ByteValue.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/ByteValue.java index d3ae70144b..c903f482af 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/ByteValue.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/ByteValue.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration.converter; +package co.elastic.apm.agent.configuration.converter; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/ByteValueConverter.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/ByteValueConverter.java index 949e349eda..65c1a782dd 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/ByteValueConverter.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/ByteValueConverter.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration.converter; +package co.elastic.apm.agent.configuration.converter; import org.stagemonitor.configuration.ConfigurationOption; import org.stagemonitor.configuration.converter.AbstractValueConverter; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/TimeDuration.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/TimeDuration.java index 560bc80949..f7779e11c1 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/TimeDuration.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/TimeDuration.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration.converter; +package co.elastic.apm.agent.configuration.converter; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/TimeDurationValueConverter.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/TimeDurationValueConverter.java index 1f81a80239..af8268be2a 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/TimeDurationValueConverter.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/TimeDurationValueConverter.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration.converter; +package co.elastic.apm.agent.configuration.converter; import org.stagemonitor.configuration.ConfigurationOption; import org.stagemonitor.configuration.converter.AbstractValueConverter; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/package-info.java index 416410e33e..71724a7951 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/converter/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.configuration.converter; +package co.elastic.apm.agent.configuration.converter; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/package-info.java index 14ea1e721f..59419524f2 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.configuration; +package co.elastic.apm.agent.configuration; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/source/PropertyFileConfigurationSource.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/source/PropertyFileConfigurationSource.java index 5b44399a82..8ac4fc002b 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/source/PropertyFileConfigurationSource.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/source/PropertyFileConfigurationSource.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration.source; +package co.elastic.apm.agent.configuration.source; import org.stagemonitor.configuration.source.AbstractConfigurationSource; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/source/SystemPropertyConfigurationSource.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/source/SystemPropertyConfigurationSource.java index 27038eba47..d9519b77f7 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/source/SystemPropertyConfigurationSource.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/source/SystemPropertyConfigurationSource.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration.source; +package co.elastic.apm.agent.configuration.source; import org.stagemonitor.configuration.source.AbstractConfigurationSource; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/validation/RegexValidator.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/validation/RegexValidator.java index 6651919e06..2cedb87b3c 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/validation/RegexValidator.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/validation/RegexValidator.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration.validation; +package co.elastic.apm.agent.configuration.validation; import org.stagemonitor.configuration.ConfigurationOption; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/validation/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/validation/package-info.java index eab99e1b21..b7dc6b8c58 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/validation/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/validation/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.configuration.validation; +package co.elastic.apm.agent.configuration.validation; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/context/LifecycleListener.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/context/LifecycleListener.java index a9e529877b..898c75a783 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/context/LifecycleListener.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/context/LifecycleListener.java @@ -17,15 +17,15 @@ * limitations under the License. * #L% */ -package co.elastic.apm.context; +package co.elastic.apm.agent.context; -import co.elastic.apm.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.ElasticApmTracer; /** * A {@link LifecycleListener} notifies about the start and stop event of the {@link ElasticApmTracer}. *

* Implement this interface and register it as a {@linkplain java.util.ServiceLoader service} under - * {@code src/main/resources/META-INF/services/co.elastic.apm.context.LifecycleListener}. + * {@code src/main/resources/META-INF/services/co.elastic.apm.agent.context.LifecycleListener}. *

*/ public interface LifecycleListener { diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/context/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/context/package-info.java index 739d09f2b7..aa73b2a2c7 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/context/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/context/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.context; +package co.elastic.apm.agent.context; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracer.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracer.java index b10861d01d..1028b691fd 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracer.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracer.java @@ -17,23 +17,23 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl; - -import co.elastic.apm.configuration.CoreConfiguration; -import co.elastic.apm.context.LifecycleListener; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.sampling.ProbabilitySampler; -import co.elastic.apm.impl.sampling.Sampler; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.TraceContext; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.objectpool.ObjectPool; -import co.elastic.apm.objectpool.Allocator; -import co.elastic.apm.objectpool.impl.QueueBasedObjectPool; -import co.elastic.apm.report.Reporter; -import co.elastic.apm.report.ReporterConfiguration; +package co.elastic.apm.agent.impl; + +import co.elastic.apm.agent.configuration.CoreConfiguration; +import co.elastic.apm.agent.context.LifecycleListener; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.sampling.ProbabilitySampler; +import co.elastic.apm.agent.impl.sampling.Sampler; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.TraceContext; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.objectpool.ObjectPool; +import co.elastic.apm.agent.objectpool.Allocator; +import co.elastic.apm.agent.objectpool.impl.QueueBasedObjectPool; +import co.elastic.apm.agent.report.Reporter; +import co.elastic.apm.agent.report.ReporterConfiguration; import org.jctools.queues.atomic.AtomicQueueFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracerBuilder.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracerBuilder.java index 0bbb43ca51..b6dc21d9de 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracerBuilder.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracerBuilder.java @@ -17,17 +17,17 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl; +package co.elastic.apm.agent.impl; -import co.elastic.apm.bci.ElasticApmAgent; -import co.elastic.apm.configuration.CoreConfiguration; -import co.elastic.apm.configuration.PrefixingConfigurationSourceWrapper; -import co.elastic.apm.configuration.source.PropertyFileConfigurationSource; -import co.elastic.apm.configuration.source.SystemPropertyConfigurationSource; -import co.elastic.apm.context.LifecycleListener; -import co.elastic.apm.logging.LoggingConfiguration; -import co.elastic.apm.report.Reporter; -import co.elastic.apm.report.ReporterFactory; +import co.elastic.apm.agent.bci.ElasticApmAgent; +import co.elastic.apm.agent.configuration.CoreConfiguration; +import co.elastic.apm.agent.configuration.PrefixingConfigurationSourceWrapper; +import co.elastic.apm.agent.configuration.source.PropertyFileConfigurationSource; +import co.elastic.apm.agent.configuration.source.SystemPropertyConfigurationSource; +import co.elastic.apm.agent.context.LifecycleListener; +import co.elastic.apm.agent.logging.LoggingConfiguration; +import co.elastic.apm.agent.report.Reporter; +import co.elastic.apm.agent.report.ReporterFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.stagemonitor.configuration.ConfigurationOptionProvider; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/MetaData.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/MetaData.java index f672367407..bd80af1cff 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/MetaData.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/MetaData.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl; +package co.elastic.apm.agent.impl; -import co.elastic.apm.impl.payload.ProcessInfo; -import co.elastic.apm.impl.payload.Service; -import co.elastic.apm.impl.payload.SystemInfo; +import co.elastic.apm.agent.impl.payload.ProcessInfo; +import co.elastic.apm.agent.impl.payload.Service; +import co.elastic.apm.agent.impl.payload.SystemInfo; public class MetaData { diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/Scope.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/Scope.java index f67b15747f..9fa4754864 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/Scope.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/Scope.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl; +package co.elastic.apm.agent.impl; -import co.elastic.apm.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; /** * Within a scope, a {@link AbstractSpan} is active on the current thread. diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/SpanListener.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/SpanListener.java index 21aa540d04..cc40e212f2 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/SpanListener.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/SpanListener.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl; +package co.elastic.apm.agent.impl; -import co.elastic.apm.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; public interface SpanListener { diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/AbstractContext.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/AbstractContext.java index 3dfd5c43ce..a458d8fdd4 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/AbstractContext.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/AbstractContext.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.context; +package co.elastic.apm.agent.impl.context; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Recyclable; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Request.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Request.java index bbf809183b..423f455999 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Request.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Request.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.context; +package co.elastic.apm.agent.impl.context; -import co.elastic.apm.objectpool.Recyclable; -import co.elastic.apm.util.PotentiallyMultiValuedMap; +import co.elastic.apm.agent.objectpool.Recyclable; +import co.elastic.apm.agent.util.PotentiallyMultiValuedMap; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Response.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Response.java index 5966624c6b..599ada155f 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Response.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Response.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.context; +package co.elastic.apm.agent.impl.context; -import co.elastic.apm.objectpool.Recyclable; -import co.elastic.apm.util.PotentiallyMultiValuedMap; +import co.elastic.apm.agent.objectpool.Recyclable; +import co.elastic.apm.agent.util.PotentiallyMultiValuedMap; public class Response implements Recyclable { diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Socket.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Socket.java index deae4eb70a..6be48231eb 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Socket.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Socket.java @@ -18,9 +18,9 @@ * #L% */ -package co.elastic.apm.impl.context; +package co.elastic.apm.agent.impl.context; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Recyclable; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/SpanContext.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/SpanContext.java index 9886b0cdde..f79551d341 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/SpanContext.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/SpanContext.java @@ -18,10 +18,10 @@ * #L% */ -package co.elastic.apm.impl.context; +package co.elastic.apm.agent.impl.context; -import co.elastic.apm.impl.transaction.Db; -import co.elastic.apm.impl.transaction.Http; +import co.elastic.apm.agent.impl.transaction.Db; +import co.elastic.apm.agent.impl.transaction.Http; /** diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/TransactionContext.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/TransactionContext.java index d611ab2136..6d0c19488a 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/TransactionContext.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/TransactionContext.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.context; +package co.elastic.apm.agent.impl.context; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Url.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Url.java index 5fcea11b95..39740b3fcb 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Url.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/Url.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.context; +package co.elastic.apm.agent.impl.context; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Recyclable; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/User.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/User.java index 0f8d76d9f7..49baa43797 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/User.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/User.java @@ -18,9 +18,9 @@ * #L% */ -package co.elastic.apm.impl.context; +package co.elastic.apm.agent.impl.context; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Recyclable; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/package-info.java index e0c8c9d064..dbf9d77da5 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.impl.context; +package co.elastic.apm.agent.impl.context; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/ErrorCapture.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/ErrorCapture.java index 13f3518057..8261b54768 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/ErrorCapture.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/ErrorCapture.java @@ -17,16 +17,16 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.error; +package co.elastic.apm.agent.impl.error; -import co.elastic.apm.configuration.CoreConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.context.TransactionContext; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.TraceContext; -import co.elastic.apm.matcher.WildcardMatcher; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.configuration.CoreConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.context.TransactionContext; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.TraceContext; +import co.elastic.apm.agent.matcher.WildcardMatcher; +import co.elastic.apm.agent.objectpool.Recyclable; import javax.annotation.Nullable; import java.util.Collection; @@ -106,7 +106,7 @@ public void recycle() { } /** - * Creates a reference to a {@link co.elastic.apm.impl.transaction.Span} or {@link co.elastic.apm.impl.transaction.Transaction} + * Creates a reference to a {@link co.elastic.apm.agent.impl.transaction.Span} or {@link co.elastic.apm.agent.impl.transaction.Transaction} * * @param parent * @return {@code this}, for chaining diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/ErrorPayload.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/ErrorPayload.java index e9eb446579..b162594b9b 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/ErrorPayload.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/ErrorPayload.java @@ -18,13 +18,13 @@ * #L% */ -package co.elastic.apm.impl.error; +package co.elastic.apm.agent.impl.error; -import co.elastic.apm.impl.payload.Payload; -import co.elastic.apm.impl.payload.ProcessInfo; -import co.elastic.apm.impl.payload.Service; -import co.elastic.apm.impl.payload.SystemInfo; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.impl.payload.Payload; +import co.elastic.apm.agent.impl.payload.ProcessInfo; +import co.elastic.apm.agent.impl.payload.Service; +import co.elastic.apm.agent.impl.payload.SystemInfo; +import co.elastic.apm.agent.objectpool.Recyclable; import java.util.ArrayList; import java.util.List; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/Log.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/Log.java index 63ca5195dd..259dbfca41 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/Log.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/Log.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.error; +package co.elastic.apm.agent.impl.error; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Recyclable; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/package-info.java index a4f578c207..50ce46176e 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.impl.error; +package co.elastic.apm.agent.impl.error; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/package-info.java index 263f4a757b..64fe398472 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.impl; +package co.elastic.apm.agent.impl; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Agent.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Agent.java index 6470db5e32..c8aa45324b 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Agent.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Agent.java @@ -18,7 +18,7 @@ * #L% */ -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; /** diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Framework.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Framework.java index 8d0225243b..7a6a5cf866 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Framework.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Framework.java @@ -18,7 +18,7 @@ * #L% */ -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; /** diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Language.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Language.java index 3f0d21a81b..876be3fca1 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Language.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Language.java @@ -18,7 +18,7 @@ * #L% */ -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; /** diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Payload.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Payload.java index 054cba0f99..19a6270228 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Payload.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Payload.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Recyclable; import java.util.List; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/ProcessFactory.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/ProcessFactory.java index 921e67bc2d..08834f3223 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/ProcessFactory.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/ProcessFactory.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/ProcessInfo.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/ProcessInfo.java index 1e8d1ae380..f6762aa47e 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/ProcessInfo.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/ProcessInfo.java @@ -18,7 +18,7 @@ * #L% */ -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/RuntimeInfo.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/RuntimeInfo.java index 9fa9f34664..fe14e39ca5 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/RuntimeInfo.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/RuntimeInfo.java @@ -18,7 +18,7 @@ * #L% */ -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; /** diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Service.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Service.java index 635edaf79b..5d9da7e7f3 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Service.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/Service.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/ServiceFactory.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/ServiceFactory.java index 17350103d4..94ae402dd5 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/ServiceFactory.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/ServiceFactory.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; -import co.elastic.apm.configuration.CoreConfiguration; -import co.elastic.apm.util.VersionUtils; +import co.elastic.apm.agent.configuration.CoreConfiguration; +import co.elastic.apm.agent.util.VersionUtils; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/SystemInfo.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/SystemInfo.java index 3584b1af98..a90e18c9e8 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/SystemInfo.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/SystemInfo.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; import java.net.InetAddress; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/TransactionPayload.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/TransactionPayload.java index 5b3b2b86c1..a6243b34ed 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/TransactionPayload.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/TransactionPayload.java @@ -18,11 +18,11 @@ * #L% */ -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.objectpool.Recyclable; import java.util.ArrayList; import java.util.List; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/package-info.java index 6c9b92ae98..a603d15ea1 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/payload/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/ConstantSampler.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/ConstantSampler.java index 63d20cf15e..3af3ab9144 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/ConstantSampler.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/ConstantSampler.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.sampling; +package co.elastic.apm.agent.impl.sampling; -import co.elastic.apm.impl.transaction.Id; +import co.elastic.apm.agent.impl.transaction.Id; /** * This is a implementation of {@link Sampler} which always returns the same sampling decision. diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/ProbabilitySampler.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/ProbabilitySampler.java index 3437e17869..3b1dd6d38e 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/ProbabilitySampler.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/ProbabilitySampler.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.sampling; +package co.elastic.apm.agent.impl.sampling; -import co.elastic.apm.impl.transaction.Id; +import co.elastic.apm.agent.impl.transaction.Id; /** * This implementation of {@link Sampler} samples based on a sampling probability (or sampling rate) between 0.0 and 1.0. diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/Sampler.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/Sampler.java index 974fa4c088..cfdcc97b10 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/Sampler.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/Sampler.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.sampling; +package co.elastic.apm.agent.impl.sampling; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.Id; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Id; +import co.elastic.apm.agent.impl.transaction.Transaction; /** * A sampler is responsible for determining whether a {@link Transaction} should be sampled. diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/package-info.java index c7af9801b7..6cdd1216cf 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/sampling/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.impl.sampling; +package co.elastic.apm.agent.impl.sampling; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/stacktrace/StacktraceConfiguration.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/stacktrace/StacktraceConfiguration.java index d3b7927e89..b67beb6397 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/stacktrace/StacktraceConfiguration.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/stacktrace/StacktraceConfiguration.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.stacktrace; +package co.elastic.apm.agent.impl.stacktrace; -import co.elastic.apm.configuration.converter.TimeDuration; -import co.elastic.apm.configuration.converter.TimeDurationValueConverter; +import co.elastic.apm.agent.configuration.converter.TimeDuration; +import co.elastic.apm.agent.configuration.converter.TimeDurationValueConverter; import org.stagemonitor.configuration.ConfigurationOption; import org.stagemonitor.configuration.ConfigurationOptionProvider; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/stacktrace/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/stacktrace/package-info.java index c5698c643e..b728f00629 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/stacktrace/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/stacktrace/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.impl.stacktrace; +package co.elastic.apm.agent.impl.stacktrace; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/AbstractSpan.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/AbstractSpan.java index 3aa8593752..5ea22f5d0a 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/AbstractSpan.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/AbstractSpan.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.Scope; -import co.elastic.apm.impl.SpanListener; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.Scope; +import co.elastic.apm.agent.impl.SpanListener; +import co.elastic.apm.agent.objectpool.Recyclable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Db.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Db.java index d49016c0d2..41c6363b4c 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Db.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Db.java @@ -18,14 +18,14 @@ * #L% */ -package co.elastic.apm.impl.transaction; - -import co.elastic.apm.objectpool.Allocator; -import co.elastic.apm.objectpool.ObjectPool; -import co.elastic.apm.objectpool.Recyclable; -import co.elastic.apm.objectpool.impl.QueueBasedObjectPool; -import co.elastic.apm.objectpool.impl.Resetter; -import co.elastic.apm.report.serialize.DslJsonSerializer; +package co.elastic.apm.agent.impl.transaction; + +import co.elastic.apm.agent.objectpool.Allocator; +import co.elastic.apm.agent.objectpool.ObjectPool; +import co.elastic.apm.agent.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.impl.QueueBasedObjectPool; +import co.elastic.apm.agent.objectpool.impl.Resetter; +import co.elastic.apm.agent.report.serialize.DslJsonSerializer; import org.jctools.queues.atomic.MpmcAtomicArrayQueue; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/EpochTickClock.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/EpochTickClock.java index a63c3ae45f..da34087d9d 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/EpochTickClock.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/EpochTickClock.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Recyclable; /** * This clock makes sure that each {@link Span} and {@link Transaction} uses a consistent clock diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Http.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Http.java index 2b31dc9275..32063b4114 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Http.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Http.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Recyclable; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Id.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Id.java index e0852754f4..753636db77 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Id.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Id.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.objectpool.Recyclable; -import co.elastic.apm.util.HexUtils; +import co.elastic.apm.agent.objectpool.Recyclable; +import co.elastic.apm.agent.util.HexUtils; import com.dslplatform.json.JsonWriter; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Span.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Span.java index 600eeb9430..9ae04215f0 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Span.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Span.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.context.SpanContext; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.context.SpanContext; +import co.elastic.apm.agent.objectpool.Recyclable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/SpanCount.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/SpanCount.java index ca00eed293..9a1e5e9520 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/SpanCount.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/SpanCount.java @@ -18,9 +18,9 @@ * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Recyclable; import java.util.concurrent.atomic.AtomicInteger; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/TraceContext.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/TraceContext.java index 9f36586b95..855915507a 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/TraceContext.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/TraceContext.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.sampling.Sampler; -import co.elastic.apm.objectpool.Recyclable; -import co.elastic.apm.util.HexUtils; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.sampling.Sampler; +import co.elastic.apm.agent.objectpool.Recyclable; +import co.elastic.apm.agent.util.HexUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Transaction.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Transaction.java index f2d97963c6..62535076c3 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Transaction.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/Transaction.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.context.TransactionContext; -import co.elastic.apm.impl.sampling.Sampler; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.context.TransactionContext; +import co.elastic.apm.agent.impl.sampling.Sampler; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/package-info.java index 95d94b413e..aa842abf3f 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/logging/JulBridgeLogger.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/logging/JulBridgeLogger.java index a124aff1ec..6050c86abc 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/logging/JulBridgeLogger.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/logging/JulBridgeLogger.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.logging; +package co.elastic.apm.agent.logging; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/logging/LoggingConfiguration.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/logging/LoggingConfiguration.java index 8a47871770..579bf69a03 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/logging/LoggingConfiguration.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/logging/LoggingConfiguration.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.logging; +package co.elastic.apm.agent.logging; -import co.elastic.apm.bci.ElasticApmAgent; +import co.elastic.apm.agent.bci.ElasticApmAgent; import org.slf4j.event.Level; import org.slf4j.impl.SimpleLogger; import org.stagemonitor.configuration.ConfigurationOption; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/logging/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/logging/package-info.java index af9de71004..f24b2b2394 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/logging/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/logging/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.logging; +package co.elastic.apm.agent.logging; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/matcher/WildcardMatcher.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/matcher/WildcardMatcher.java index 9a09c95ca2..6c7f83f1c8 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/matcher/WildcardMatcher.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/matcher/WildcardMatcher.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.matcher; +package co.elastic.apm.agent.matcher; import org.stagemonitor.util.StringUtils; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/matcher/WildcardMatcherValueConverter.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/matcher/WildcardMatcherValueConverter.java index cc3d517b79..65b30b8288 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/matcher/WildcardMatcherValueConverter.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/matcher/WildcardMatcherValueConverter.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.matcher; +package co.elastic.apm.agent.matcher; import org.stagemonitor.configuration.converter.ValueConverter; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/matcher/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/matcher/package-info.java index 3c44fb644a..79a3590e3e 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/matcher/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/matcher/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.matcher; +package co.elastic.apm.agent.matcher; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/Allocator.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/Allocator.java index 23aaf6f1fe..faf9a42095 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/Allocator.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/Allocator.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.objectpool; +package co.elastic.apm.agent.objectpool; public interface Allocator { diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/NoopObjectPool.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/NoopObjectPool.java index 2fd6f1ed1c..f4d3f9dba7 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/NoopObjectPool.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/NoopObjectPool.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.objectpool; +package co.elastic.apm.agent.objectpool; import javax.annotation.Nullable; import java.io.IOException; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/ObjectPool.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/ObjectPool.java index 734b40cf71..2926447da3 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/ObjectPool.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/ObjectPool.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.objectpool; +package co.elastic.apm.agent.objectpool; import javax.annotation.Nullable; import java.io.Closeable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/Recyclable.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/Recyclable.java index 5ae71ebe32..94853a704f 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/Recyclable.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/Recyclable.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.objectpool; +package co.elastic.apm.agent.objectpool; public interface Recyclable { diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/AbstractObjectPool.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/AbstractObjectPool.java index bdb170f938..6aaa1e7850 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/AbstractObjectPool.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/AbstractObjectPool.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.objectpool.impl; +package co.elastic.apm.agent.objectpool.impl; -import co.elastic.apm.objectpool.ObjectPool; -import co.elastic.apm.objectpool.Allocator; +import co.elastic.apm.agent.objectpool.ObjectPool; +import co.elastic.apm.agent.objectpool.Allocator; import java.util.concurrent.atomic.AtomicInteger; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/MixedObjectPool.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/MixedObjectPool.java index 3b80f64f06..d3f3a78f03 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/MixedObjectPool.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/MixedObjectPool.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.objectpool.impl; +package co.elastic.apm.agent.objectpool.impl; -import co.elastic.apm.objectpool.ObjectPool; -import co.elastic.apm.objectpool.Allocator; +import co.elastic.apm.agent.objectpool.ObjectPool; +import co.elastic.apm.agent.objectpool.Allocator; import javax.annotation.Nullable; import java.io.IOException; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/QueueBasedObjectPool.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/QueueBasedObjectPool.java index d42b05f056..eb760bc3bd 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/QueueBasedObjectPool.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/QueueBasedObjectPool.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.objectpool.impl; +package co.elastic.apm.agent.objectpool.impl; -import co.elastic.apm.objectpool.Allocator; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Allocator; +import co.elastic.apm.agent.objectpool.Recyclable; import com.lmax.disruptor.EventFactory; import javax.annotation.Nullable; @@ -28,10 +28,10 @@ import java.util.Iterator; import java.util.Queue; -public class QueueBasedObjectPool extends AbstractObjectPool implements Collection { +public class QueueBasedObjectPool extends co.elastic.apm.agent.objectpool.impl.AbstractObjectPool implements Collection { private final Queue queue; - private final Resetter resetter; + private final co.elastic.apm.agent.objectpool.impl.Resetter resetter; /** * @param queue the underlying queue @@ -41,14 +41,14 @@ public class QueueBasedObjectPool extends AbstractObjectPool implements Co * used when there are no objects in the queue and to preallocate the queue. */ public static QueueBasedObjectPool ofRecyclable(Queue queue, boolean preAllocate, Allocator allocator) { - return new QueueBasedObjectPool<>(queue, preAllocate, allocator, Resetter.ForRecyclable.get()); + return new QueueBasedObjectPool<>(queue, preAllocate, allocator, co.elastic.apm.agent.objectpool.impl.Resetter.ForRecyclable.get()); } - public static QueueBasedObjectPool of(Queue queue, boolean preAllocate, Allocator allocator, Resetter resetter) { + public static QueueBasedObjectPool of(Queue queue, boolean preAllocate, Allocator allocator, co.elastic.apm.agent.objectpool.impl.Resetter resetter) { return new QueueBasedObjectPool<>(queue, preAllocate, allocator, resetter); } - private QueueBasedObjectPool(Queue queue, boolean preAllocate, Allocator allocator, Resetter resetter) { + private QueueBasedObjectPool(Queue queue, boolean preAllocate, Allocator allocator, co.elastic.apm.agent.objectpool.impl.Resetter resetter) { super(allocator); this.queue = queue; this.resetter = resetter; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/Resetter.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/Resetter.java index 9577220570..5d679d6b66 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/Resetter.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/Resetter.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.objectpool.impl; +package co.elastic.apm.agent.objectpool.impl; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Recyclable; public interface Resetter { diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/ThreadLocalObjectPool.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/ThreadLocalObjectPool.java index 9d7588ebc1..5f336d31a6 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/ThreadLocalObjectPool.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/ThreadLocalObjectPool.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.objectpool.impl; +package co.elastic.apm.agent.objectpool.impl; -import co.elastic.apm.objectpool.Recyclable; -import co.elastic.apm.objectpool.Allocator; +import co.elastic.apm.agent.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Allocator; import javax.annotation.Nullable; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/package-info.java index edfa03f019..5c71f05b27 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/impl/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.objectpool.impl; +package co.elastic.apm.agent.objectpool.impl; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/package-info.java index 4084900cbc..d218a92285 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/objectpool/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.objectpool; +package co.elastic.apm.agent.objectpool; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/package-info.java index 633d0262bf..9814a96385 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm; +package co.elastic.apm.agent; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ApmServerHealthChecker.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ApmServerHealthChecker.java index b2a2a99a43..37563f5daa 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ApmServerHealthChecker.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ApmServerHealthChecker.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ApmServerReporter.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ApmServerReporter.java index 68d181737e..a2089ea1a5 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ApmServerReporter.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ApmServerReporter.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; -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.objectpool.Recyclable; -import co.elastic.apm.util.MathUtils; +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.objectpool.Recyclable; +import co.elastic.apm.agent.util.MathUtils; import com.lmax.disruptor.EventFactory; import com.lmax.disruptor.EventTranslator; import com.lmax.disruptor.EventTranslatorOneArg; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/HttpUtils.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/HttpUtils.java index ff1442888f..4400bbf106 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/HttpUtils.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/HttpUtils.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/IntakeV2ReportingEventHandler.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/IntakeV2ReportingEventHandler.java index 27f3a794aa..ae29163fb7 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/IntakeV2ReportingEventHandler.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/IntakeV2ReportingEventHandler.java @@ -17,16 +17,16 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; - -import co.elastic.apm.impl.MetaData; -import co.elastic.apm.impl.payload.ProcessInfo; -import co.elastic.apm.impl.payload.Service; -import co.elastic.apm.impl.payload.SystemInfo; -import co.elastic.apm.report.processor.ProcessorEventHandler; -import co.elastic.apm.report.serialize.DslJsonSerializer; -import co.elastic.apm.report.serialize.PayloadSerializer; -import co.elastic.apm.util.VersionUtils; +package co.elastic.apm.agent.report; + +import co.elastic.apm.agent.impl.MetaData; +import co.elastic.apm.agent.impl.payload.ProcessInfo; +import co.elastic.apm.agent.impl.payload.Service; +import co.elastic.apm.agent.impl.payload.SystemInfo; +import co.elastic.apm.agent.report.processor.ProcessorEventHandler; +import co.elastic.apm.agent.report.serialize.DslJsonSerializer; +import co.elastic.apm.agent.report.serialize.PayloadSerializer; +import co.elastic.apm.agent.util.VersionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.stagemonitor.util.IOUtils; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/PayloadSender.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/PayloadSender.java index 80419bf0cd..5cde3cbc17 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/PayloadSender.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/PayloadSender.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; -import co.elastic.apm.impl.payload.Payload; +import co.elastic.apm.agent.impl.payload.Payload; public interface PayloadSender { void sendPayload(Payload payload); diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/Reporter.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/Reporter.java index b48ddacef7..ffe07eff35 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/Reporter.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/Reporter.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; -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.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Transaction; import java.io.Closeable; import java.util.concurrent.Future; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReporterConfiguration.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReporterConfiguration.java index b4722446c8..27a0c0d9a2 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReporterConfiguration.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReporterConfiguration.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; -import co.elastic.apm.configuration.converter.ByteValue; -import co.elastic.apm.configuration.converter.ByteValueConverter; -import co.elastic.apm.configuration.converter.TimeDuration; -import co.elastic.apm.configuration.converter.TimeDurationValueConverter; +import co.elastic.apm.agent.configuration.converter.ByteValue; +import co.elastic.apm.agent.configuration.converter.ByteValueConverter; +import co.elastic.apm.agent.configuration.converter.TimeDuration; +import co.elastic.apm.agent.configuration.converter.TimeDurationValueConverter; import org.stagemonitor.configuration.ConfigurationOption; import org.stagemonitor.configuration.ConfigurationOptionProvider; import org.stagemonitor.configuration.converter.UrlValueConverter; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReporterFactory.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReporterFactory.java index 13e1c4026c..d7a6a9df85 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReporterFactory.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReporterFactory.java @@ -17,17 +17,17 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; -import co.elastic.apm.configuration.CoreConfiguration; -import co.elastic.apm.impl.payload.ProcessFactory; -import co.elastic.apm.impl.payload.ProcessInfo; -import co.elastic.apm.impl.payload.ServiceFactory; -import co.elastic.apm.impl.payload.SystemInfo; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.report.processor.ProcessorEventHandler; -import co.elastic.apm.report.serialize.DslJsonSerializer; -import co.elastic.apm.util.VersionUtils; +import co.elastic.apm.agent.configuration.CoreConfiguration; +import co.elastic.apm.agent.impl.payload.ProcessFactory; +import co.elastic.apm.agent.impl.payload.ProcessInfo; +import co.elastic.apm.agent.impl.payload.ServiceFactory; +import co.elastic.apm.agent.impl.payload.SystemInfo; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.report.processor.ProcessorEventHandler; +import co.elastic.apm.agent.report.serialize.DslJsonSerializer; +import co.elastic.apm.agent.util.VersionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.stagemonitor.configuration.ConfigurationRegistry; @@ -68,7 +68,7 @@ private ReportingEventHandler getReportingEventHandler(ConfigurationRegistry con final DslJsonSerializer payloadSerializer = new DslJsonSerializer( configurationRegistry.getConfig(StacktraceConfiguration.class)); - final co.elastic.apm.impl.payload.Service service = new ServiceFactory().createService(configurationRegistry.getConfig(CoreConfiguration.class), frameworkName, frameworkVersion); + final co.elastic.apm.agent.impl.payload.Service service = new ServiceFactory().createService(configurationRegistry.getConfig(CoreConfiguration.class), frameworkName, frameworkVersion); final ProcessInfo processInformation = ProcessFactory.ForCurrentVM.INSTANCE.getProcessInformation(); final ProcessorEventHandler processorEventHandler = ProcessorEventHandler.loadProcessors(configurationRegistry); if (!reporterConfiguration.isIncludeProcessArguments()) { diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReportingEvent.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReportingEvent.java index 47fd3cebff..fe85decf76 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReportingEvent.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReportingEvent.java @@ -17,18 +17,18 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; -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.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Transaction; import javax.annotation.Nullable; -import static co.elastic.apm.report.ReportingEvent.ReportingEventType.ERROR; -import static co.elastic.apm.report.ReportingEvent.ReportingEventType.FLUSH; -import static co.elastic.apm.report.ReportingEvent.ReportingEventType.SPAN; -import static co.elastic.apm.report.ReportingEvent.ReportingEventType.TRANSACTION; +import static co.elastic.apm.agent.report.ReportingEvent.ReportingEventType.ERROR; +import static co.elastic.apm.agent.report.ReportingEvent.ReportingEventType.FLUSH; +import static co.elastic.apm.agent.report.ReportingEvent.ReportingEventType.SPAN; +import static co.elastic.apm.agent.report.ReportingEvent.ReportingEventType.TRANSACTION; public class ReportingEvent { @Nullable diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReportingEventHandler.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReportingEventHandler.java index 27ce5d3f4c..44f7939bb9 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReportingEventHandler.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/ReportingEventHandler.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; import com.lmax.disruptor.EventHandler; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/SslUtils.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/SslUtils.java index d56a5dffb7..e569877ec7 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/SslUtils.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/SslUtils.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/package-info.java index 5b433f58bd..e5316404c6 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.report; +package co.elastic.apm.agent.report; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/processor/Processor.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/processor/Processor.java index 331151de20..0e918b0305 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/processor/Processor.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/processor/Processor.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report.processor; +package co.elastic.apm.agent.report.processor; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.transaction.Transaction; import org.stagemonitor.configuration.ConfigurationRegistry; /** diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/processor/ProcessorEventHandler.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/processor/ProcessorEventHandler.java index 9579c80102..5f88b21a97 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/processor/ProcessorEventHandler.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/processor/ProcessorEventHandler.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report.processor; +package co.elastic.apm.agent.report.processor; -import co.elastic.apm.report.ReportingEvent; +import co.elastic.apm.agent.report.ReportingEvent; import com.lmax.disruptor.EventHandler; import org.stagemonitor.configuration.ConfigurationRegistry; @@ -29,7 +29,7 @@ /** * Invokes all registered {@link Processor}s before a {@link ReportingEvent} is processed by - * the {@link co.elastic.apm.report.ReportingEventHandler}. + * the {@link co.elastic.apm.agent.report.ReportingEventHandler}. */ public class ProcessorEventHandler implements EventHandler { diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/processor/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/processor/package-info.java index 2bc3f265c3..ee5d5009f2 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/processor/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/processor/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.report.processor; +package co.elastic.apm.agent.report.processor; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java index 6e8ea8cbe2..4d25f8480f 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java @@ -17,36 +17,36 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report.serialize; - -import co.elastic.apm.impl.MetaData; -import co.elastic.apm.impl.context.Request; -import co.elastic.apm.impl.context.Response; -import co.elastic.apm.impl.context.Socket; -import co.elastic.apm.impl.context.SpanContext; -import co.elastic.apm.impl.context.TransactionContext; -import co.elastic.apm.impl.context.Url; -import co.elastic.apm.impl.context.User; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.error.ErrorPayload; -import co.elastic.apm.impl.payload.Agent; -import co.elastic.apm.impl.payload.Framework; -import co.elastic.apm.impl.payload.Language; -import co.elastic.apm.impl.payload.Payload; -import co.elastic.apm.impl.payload.ProcessInfo; -import co.elastic.apm.impl.payload.RuntimeInfo; -import co.elastic.apm.impl.payload.Service; -import co.elastic.apm.impl.payload.SystemInfo; -import co.elastic.apm.impl.payload.TransactionPayload; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.Db; -import co.elastic.apm.impl.transaction.Http; -import co.elastic.apm.impl.transaction.Id; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.SpanCount; -import co.elastic.apm.impl.transaction.TraceContext; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.util.PotentiallyMultiValuedMap; +package co.elastic.apm.agent.report.serialize; + +import co.elastic.apm.agent.impl.MetaData; +import co.elastic.apm.agent.impl.context.Request; +import co.elastic.apm.agent.impl.context.Response; +import co.elastic.apm.agent.impl.context.Socket; +import co.elastic.apm.agent.impl.context.SpanContext; +import co.elastic.apm.agent.impl.context.TransactionContext; +import co.elastic.apm.agent.impl.context.Url; +import co.elastic.apm.agent.impl.context.User; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.error.ErrorPayload; +import co.elastic.apm.agent.impl.payload.Agent; +import co.elastic.apm.agent.impl.payload.Framework; +import co.elastic.apm.agent.impl.payload.Language; +import co.elastic.apm.agent.impl.payload.Payload; +import co.elastic.apm.agent.impl.payload.ProcessInfo; +import co.elastic.apm.agent.impl.payload.RuntimeInfo; +import co.elastic.apm.agent.impl.payload.Service; +import co.elastic.apm.agent.impl.payload.SystemInfo; +import co.elastic.apm.agent.impl.payload.TransactionPayload; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.Db; +import co.elastic.apm.agent.impl.transaction.Http; +import co.elastic.apm.agent.impl.transaction.Id; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.SpanCount; +import co.elastic.apm.agent.impl.transaction.TraceContext; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.util.PotentiallyMultiValuedMap; import com.dslplatform.json.BoolConverter; import com.dslplatform.json.DslJson; import com.dslplatform.json.JsonWriter; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/PayloadSerializer.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/PayloadSerializer.java index 6e2c8204dd..7a2b059354 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/PayloadSerializer.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/PayloadSerializer.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report.serialize; +package co.elastic.apm.agent.report.serialize; -import co.elastic.apm.impl.MetaData; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.payload.Payload; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.impl.MetaData; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.payload.Payload; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Transaction; import java.io.IOException; import java.io.OutputStream; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/package-info.java index 7ddd2f525d..b9fdb78b0f 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.report.serialize; +package co.elastic.apm.agent.report.serialize; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/ExecutorUtils.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/ExecutorUtils.java index 32fd0e270f..bce5769ed6 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/ExecutorUtils.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/ExecutorUtils.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.util; +package co.elastic.apm.agent.util; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/HexUtils.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/HexUtils.java index ddf41e2520..a7618749d0 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/HexUtils.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/HexUtils.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.util; +package co.elastic.apm.agent.util; import com.dslplatform.json.JsonWriter; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/IOUtils.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/IOUtils.java index e67e41b618..be996da1f1 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/IOUtils.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/IOUtils.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.util; +package co.elastic.apm.agent.util; -import co.elastic.apm.bci.VisibleForAdvice; +import co.elastic.apm.agent.bci.VisibleForAdvice; import java.io.IOException; import java.io.InputStream; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/MathUtils.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/MathUtils.java index be0e907d0f..f82fbe1c6e 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/MathUtils.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/MathUtils.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.util; +package co.elastic.apm.agent.util; public class MathUtils { public static int getNextPowerOf2(int i) { diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/PotentiallyMultiValuedMap.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/PotentiallyMultiValuedMap.java index 921d0a141b..84bbb252e4 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/PotentiallyMultiValuedMap.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/PotentiallyMultiValuedMap.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.util; +package co.elastic.apm.agent.util; -import co.elastic.apm.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.Recyclable; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/VersionUtils.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/VersionUtils.java index 13b82fe2b0..cfeb1673e8 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/VersionUtils.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/VersionUtils.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.util; +package co.elastic.apm.agent.util; import javax.annotation.Nullable; import java.io.IOException; diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/package-info.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/package-info.java index 2bb54b889e..79553031e9 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/util/package-info.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/util/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.util; +package co.elastic.apm.agent.util; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-core/src/main/resources/META-INF/NOTICE b/apm-agent-core/src/main/resources/META-INF/NOTICE index 6d56cbaed8..f5aa88113d 100644 --- a/apm-agent-core/src/main/resources/META-INF/NOTICE +++ b/apm-agent-core/src/main/resources/META-INF/NOTICE @@ -1,6 +1,6 @@ This product includes software from stagemonitor, under the Apache License 2.0. See: - - co.elastic.apm.configuration.source.PropertyFileConfigurationSource - - co.elastic.apm.configuration.source.SystemPropertyConfigurationSource - - co.elastic.apm.configuration.StartupInfo - - co.elastic.apm.bci.bytebuddy.MethodHierarchyMatcher + - co.elastic.apm.agent.configuration.source.PropertyFileConfigurationSource + - co.elastic.apm.agent.configuration.source.SystemPropertyConfigurationSource + - co.elastic.apm.agent.configuration.StartupInfo + - co.elastic.apm.agent.bci.bytebuddy.MethodHierarchyMatcher diff --git a/apm-agent-core/src/main/resources/META-INF/services/co.elastic.apm.context.LifecycleListener b/apm-agent-core/src/main/resources/META-INF/services/co.elastic.apm.context.LifecycleListener index cbc2dc1f1b..f4ceb91105 100644 --- a/apm-agent-core/src/main/resources/META-INF/services/co.elastic.apm.context.LifecycleListener +++ b/apm-agent-core/src/main/resources/META-INF/services/co.elastic.apm.context.LifecycleListener @@ -1,3 +1,3 @@ -co.elastic.apm.configuration.StartupInfo -co.elastic.apm.bci.OsgiBootDelegationEnabler -co.elastic.apm.bci.MatcherTimerLifecycleListener +co.elastic.apm.agent.configuration.StartupInfo +co.elastic.apm.agent.bci.OsgiBootDelegationEnabler +co.elastic.apm.agent.bci.MatcherTimerLifecycleListener diff --git a/apm-agent-core/src/main/resources/META-INF/services/org.stagemonitor.configuration.ConfigurationOptionProvider b/apm-agent-core/src/main/resources/META-INF/services/org.stagemonitor.configuration.ConfigurationOptionProvider index b9ef9395b4..f2b178eca2 100644 --- a/apm-agent-core/src/main/resources/META-INF/services/org.stagemonitor.configuration.ConfigurationOptionProvider +++ b/apm-agent-core/src/main/resources/META-INF/services/org.stagemonitor.configuration.ConfigurationOptionProvider @@ -1,4 +1,4 @@ -co.elastic.apm.configuration.CoreConfiguration -co.elastic.apm.report.ReporterConfiguration -co.elastic.apm.impl.stacktrace.StacktraceConfiguration -co.elastic.apm.logging.LoggingConfiguration +co.elastic.apm.agent.configuration.CoreConfiguration +co.elastic.apm.agent.report.ReporterConfiguration +co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration +co.elastic.apm.agent.logging.LoggingConfiguration diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/AbstractInstrumentationTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/AbstractInstrumentationTest.java index 2ef3670be5..231232351a 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/AbstractInstrumentationTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/AbstractInstrumentationTest.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm; +package co.elastic.apm.agent; -import co.elastic.apm.bci.ElasticApmAgent; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.ElasticApmTracerBuilder; +import co.elastic.apm.agent.bci.ElasticApmAgent; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.ElasticApmTracerBuilder; import net.bytebuddy.agent.ByteBuddyAgent; import org.junit.After; import org.junit.AfterClass; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/AbstractServletTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/AbstractServletTest.java index a412d843a1..61baaa221f 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/AbstractServletTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/AbstractServletTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm; +package co.elastic.apm.agent; import okhttp3.OkHttpClient; import okhttp3.Response; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/JsonUtils.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/JsonUtils.java index 571cc2e6e0..1fabee80db 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/JsonUtils.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/JsonUtils.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm; +package co.elastic.apm.agent; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/MockReporter.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/MockReporter.java index ce4cc9f189..8a842de9c6 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/MockReporter.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/MockReporter.java @@ -17,17 +17,17 @@ * limitations under the License. * #L% */ -package co.elastic.apm; - -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.error.ErrorPayload; -import co.elastic.apm.impl.payload.PayloadUtils; -import co.elastic.apm.impl.payload.TransactionPayload; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.report.Reporter; -import co.elastic.apm.report.serialize.DslJsonSerializer; +package co.elastic.apm.agent; + +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.error.ErrorPayload; +import co.elastic.apm.agent.impl.payload.PayloadUtils; +import co.elastic.apm.agent.impl.payload.TransactionPayload; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.report.Reporter; +import co.elastic.apm.agent.report.serialize.DslJsonSerializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.networknt.schema.JsonSchema; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/MockTracer.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/MockTracer.java index 0f7f41cebb..9484dd38ee 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/MockTracer.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/MockTracer.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm; +package co.elastic.apm.agent; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.ElasticApmTracerBuilder; -import co.elastic.apm.report.Reporter; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.ElasticApmTracerBuilder; +import co.elastic.apm.agent.report.Reporter; import org.stagemonitor.configuration.ConfigurationRegistry; import static org.mockito.ArgumentMatchers.any; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/TransactionUtils.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/TransactionUtils.java index a2c3445e61..67a5e490a8 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/TransactionUtils.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/TransactionUtils.java @@ -17,15 +17,15 @@ * limitations under the License. * #L% */ -package co.elastic.apm; +package co.elastic.apm.agent; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.context.Request; -import co.elastic.apm.impl.context.TransactionContext; -import co.elastic.apm.impl.sampling.ConstantSampler; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.TraceContext; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.context.Request; +import co.elastic.apm.agent.impl.context.TransactionContext; +import co.elastic.apm.agent.impl.sampling.ConstantSampler; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.TraceContext; +import co.elastic.apm.agent.impl.transaction.Transaction; import java.util.ArrayList; import java.util.Arrays; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/HelperClassManagerTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/HelperClassManagerTest.java index a30198aa86..53e8d7b9ab 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/HelperClassManagerTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/HelperClassManagerTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci; +package co.elastic.apm.agent.bci; -import co.elastic.apm.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.ElasticApmTracer; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -30,8 +30,8 @@ class HelperClassManagerTest { @Test void testLoadHelperClass() { final HelperClassManager helperClassManager = HelperClassManager.ForSingleClassLoader.of(mock(ElasticApmTracer.class), - "co.elastic.apm.bci.HelperClassManagerTest$HelperClassImpl", - "co.elastic.apm.bci.HelperClassManagerTest$AdditionalHelper"); + "co.elastic.apm.agent.bci.HelperClassManagerTest$HelperClassImpl", + "co.elastic.apm.agent.bci.HelperClassManagerTest$AdditionalHelper"); final HelperClassInterface helper = helperClassManager.getForClassLoaderOfClass(HelperClassManagerTest.class); assertThat(helper.helpMe()).isTrue(); diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/InstrumentationTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/InstrumentationTest.java index f5d81fe9be..5bb12e837f 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/InstrumentationTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/InstrumentationTest.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci; +package co.elastic.apm.agent.bci; -import co.elastic.apm.MockTracer; -import co.elastic.apm.configuration.CoreConfiguration; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracerBuilder; +import co.elastic.apm.agent.MockTracer; +import co.elastic.apm.agent.configuration.CoreConfiguration; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracerBuilder; import net.bytebuddy.agent.ByteBuddyAgent; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; @@ -92,7 +92,7 @@ public static void onMethodExit(@Advice.Return(readOnly = false) String returnVa @Override public ElementMatcher getTypeMatcher() { - return ElementMatchers.named("co.elastic.apm.bci.InstrumentationTest"); + return ElementMatchers.named("co.elastic.apm.agent.bci.InstrumentationTest"); } @Override diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/OsgiBootDelegationEnablerTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/OsgiBootDelegationEnablerTest.java index 2ab5aeaf07..a622086d12 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/OsgiBootDelegationEnablerTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/OsgiBootDelegationEnablerTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci; +package co.elastic.apm.agent.bci; -import co.elastic.apm.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.ElasticApmTracer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/bytebuddy/CustomElementMatchersTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/bytebuddy/CustomElementMatchersTest.java index e25e3be206..2117a9877f 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/bytebuddy/CustomElementMatchersTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/bytebuddy/CustomElementMatchersTest.java @@ -17,15 +17,15 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; import net.bytebuddy.description.type.TypeDescription; import org.junit.jupiter.api.Test; import java.util.List; -import static co.elastic.apm.bci.bytebuddy.CustomElementMatchers.classLoaderCanLoadClass; -import static co.elastic.apm.bci.bytebuddy.CustomElementMatchers.isInAnyPackage; +import static co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers.classLoaderCanLoadClass; +import static co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers.isInAnyPackage; import static net.bytebuddy.matcher.ElementMatchers.none; import static org.assertj.core.api.Assertions.assertThat; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/bytebuddy/MethodHierarchyMatcherTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/bytebuddy/MethodHierarchyMatcherTest.java index dae48e500a..cf55167954 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/bytebuddy/MethodHierarchyMatcherTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/bytebuddy/MethodHierarchyMatcherTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; import net.bytebuddy.description.method.MethodDescription; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/bytebuddy/SoftlyReferencingTypePoolCacheTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/bytebuddy/SoftlyReferencingTypePoolCacheTest.java index 2e05530b69..1253892392 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/bytebuddy/SoftlyReferencingTypePoolCacheTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/bci/bytebuddy/SoftlyReferencingTypePoolCacheTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.bci.bytebuddy; +package co.elastic.apm.agent.bci.bytebuddy; import net.bytebuddy.matcher.ElementMatchers; import net.bytebuddy.pool.TypePool; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/cache/WeakKeySoftValueLoadingCacheTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/cache/WeakKeySoftValueLoadingCacheTest.java index 145206e7a9..1545f2cbda 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/cache/WeakKeySoftValueLoadingCacheTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/cache/WeakKeySoftValueLoadingCacheTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.cache; +package co.elastic.apm.agent.cache; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/PrefixingConfigurationSourceWrapperTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/PrefixingConfigurationSourceWrapperTest.java index 4ca20100d7..0e1ef4b0db 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/PrefixingConfigurationSourceWrapperTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/PrefixingConfigurationSourceWrapperTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration; +package co.elastic.apm.agent.configuration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/ServiceNameUtilTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/ServiceNameUtilTest.java index 0fc57727c3..9543571067 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/ServiceNameUtilTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/ServiceNameUtilTest.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration; +package co.elastic.apm.agent.configuration; import org.junit.jupiter.api.Test; -import static co.elastic.apm.configuration.ServiceNameUtil.parseSunJavaCommand; +import static co.elastic.apm.agent.configuration.ServiceNameUtil.parseSunJavaCommand; import static org.assertj.core.api.SoftAssertions.assertSoftly; class ServiceNameUtilTest { diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/SpyConfiguration.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/SpyConfiguration.java index 519e60bda0..aca5801b84 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/SpyConfiguration.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/SpyConfiguration.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration; +package co.elastic.apm.agent.configuration; -import co.elastic.apm.configuration.source.PropertyFileConfigurationSource; +import co.elastic.apm.agent.configuration.source.PropertyFileConfigurationSource; import org.mockito.Mockito; import org.stagemonitor.configuration.ConfigurationOptionProvider; import org.stagemonitor.configuration.ConfigurationRegistry; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/StartupInfoTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/StartupInfoTest.java index f71a422578..70d1285cf2 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/StartupInfoTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/StartupInfoTest.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration; +package co.elastic.apm.agent.configuration; -import co.elastic.apm.configuration.converter.TimeDuration; -import co.elastic.apm.configuration.converter.TimeDurationValueConverter; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.configuration.converter.TimeDuration; +import co.elastic.apm.agent.configuration.converter.TimeDurationValueConverter; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/converter/ByteValueTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/converter/ByteValueTest.java index 2806d3fde7..e5a976c4ce 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/converter/ByteValueTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/converter/ByteValueTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration.converter; +package co.elastic.apm.agent.configuration.converter; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/converter/TimeDurationTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/converter/TimeDurationTest.java index 31e03430fc..1f12d3916e 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/converter/TimeDurationTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/converter/TimeDurationTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration.converter; +package co.elastic.apm.agent.configuration.converter; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/converter/TimeDurationValueConverterTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/converter/TimeDurationValueConverterTest.java index c3930a9871..4ebdfb5cf3 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/converter/TimeDurationValueConverterTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/converter/TimeDurationValueConverterTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration.converter; +package co.elastic.apm.agent.configuration.converter; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/validation/RegexValidatorTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/validation/RegexValidatorTest.java index baf95debaf..d031bb1106 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/validation/RegexValidatorTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/configuration/validation/RegexValidatorTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration.validation; +package co.elastic.apm.agent.configuration.validation; import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/ElasticApmTracerTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/ElasticApmTracerTest.java index 011cb0aaa8..f9347d3f0c 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/ElasticApmTracerTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/ElasticApmTracerTest.java @@ -17,18 +17,18 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl; +package co.elastic.apm.agent.impl; -import co.elastic.apm.MockReporter; -import co.elastic.apm.configuration.CoreConfiguration; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.context.LifecycleListener; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.sampling.ConstantSampler; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.TraceContext; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.MockReporter; +import co.elastic.apm.agent.configuration.CoreConfiguration; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.context.LifecycleListener; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.sampling.ConstantSampler; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.TraceContext; +import co.elastic.apm.agent.impl.transaction.Transaction; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.stagemonitor.configuration.ConfigurationRegistry; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/ProcessFactoryTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/ProcessFactoryTest.java index 8418b39058..c8ca52f278 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/ProcessFactoryTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/ProcessFactoryTest.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl; +package co.elastic.apm.agent.impl; -import co.elastic.apm.impl.payload.ProcessFactory; -import co.elastic.apm.impl.payload.ProcessInfo; +import co.elastic.apm.agent.impl.payload.ProcessFactory; +import co.elastic.apm.agent.impl.payload.ProcessInfo; import org.junit.jupiter.api.Test; import static org.assertj.core.api.SoftAssertions.assertSoftly; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/context/TransactionContextTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/context/TransactionContextTest.java index 5c566acbc8..dc1e505501 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/context/TransactionContextTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/context/TransactionContextTest.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.context; +package co.elastic.apm.agent.impl.context; import org.junit.jupiter.api.Test; -import static co.elastic.apm.JsonUtils.toJson; +import static co.elastic.apm.agent.JsonUtils.toJson; import static org.assertj.core.api.Assertions.assertThat; class TransactionContextTest { diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/context/UrlTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/context/UrlTest.java index 382c194c7e..ca2007fd5f 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/context/UrlTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/context/UrlTest.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.context; +package co.elastic.apm.agent.impl.context; import org.junit.jupiter.api.Test; -import static co.elastic.apm.JsonUtils.toJson; +import static co.elastic.apm.agent.JsonUtils.toJson; import static org.assertj.core.api.Assertions.assertThat; class UrlTest { diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/payload/PayloadUtils.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/payload/PayloadUtils.java index d36dbd642e..58ef7dbf2d 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/payload/PayloadUtils.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/payload/PayloadUtils.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.payload; +package co.elastic.apm.agent.impl.payload; -import co.elastic.apm.TransactionUtils; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.error.ErrorPayload; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.TransactionUtils; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.error.ErrorPayload; +import co.elastic.apm.agent.impl.transaction.Transaction; import static org.mockito.Mockito.mock; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/payload/TransactionPayloadJsonSchemaTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/payload/TransactionPayloadJsonSchemaTest.java index 6ac767c6ec..e7140fdc17 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/payload/TransactionPayloadJsonSchemaTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/payload/TransactionPayloadJsonSchemaTest.java @@ -17,16 +17,16 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.payload; - -import co.elastic.apm.TransactionUtils; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.sampling.ConstantSampler; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.TraceContext; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.report.serialize.DslJsonSerializer; +package co.elastic.apm.agent.impl.payload; + +import co.elastic.apm.agent.TransactionUtils; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.sampling.ConstantSampler; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.TraceContext; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.report.serialize.DslJsonSerializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.networknt.schema.JsonSchema; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/sampling/ProbabilitySamplerTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/sampling/ProbabilitySamplerTest.java index 5c66b24275..83c1e48297 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/sampling/ProbabilitySamplerTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/sampling/ProbabilitySamplerTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.sampling; +package co.elastic.apm.agent.impl.sampling; -import co.elastic.apm.impl.transaction.Id; +import co.elastic.apm.agent.impl.transaction.Id; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/EpochTickClockTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/EpochTickClockTest.java index 6e59537747..a197d687df 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/EpochTickClockTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/EpochTickClockTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/IdTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/IdTest.java index 716aa93618..b44f508c40 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/IdTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/IdTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/SpanTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/SpanTest.java index 79c58a2e56..b8c58dd007 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/SpanTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/SpanTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.ElasticApmTracer; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/TraceContextTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/TraceContextTest.java index 2ea2e2970f..d38465b462 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/TraceContextTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/TraceContextTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.impl.sampling.ConstantSampler; +import co.elastic.apm.agent.impl.sampling.ConstantSampler; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/TraceContextW3CTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/TraceContextW3CTest.java index 3e8ef310e7..a288c56456 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/TraceContextW3CTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/TraceContextW3CTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.util.PotentiallyMultiValuedMap; +import co.elastic.apm.agent.util.PotentiallyMultiValuedMap; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/TransactionTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/TransactionTest.java index 1fa076ead2..5c4a571bd2 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/TransactionTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/transaction/TransactionTest.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm.impl.transaction; +package co.elastic.apm.agent.impl.transaction; -import co.elastic.apm.TransactionUtils; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.report.serialize.DslJsonSerializer; +import co.elastic.apm.agent.TransactionUtils; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.report.serialize.DslJsonSerializer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/logging/JulBridgeLoggerTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/logging/JulBridgeLoggerTest.java index 9c9c38a715..4e20e99be1 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/logging/JulBridgeLoggerTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/logging/JulBridgeLoggerTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.logging; +package co.elastic.apm.agent.logging; -import co.elastic.apm.impl.ElasticApmTracerBuilder; +import co.elastic.apm.agent.impl.ElasticApmTracerBuilder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/logging/LoggingConfigurationTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/logging/LoggingConfigurationTest.java index 78f1359c3d..59ccf975b2 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/logging/LoggingConfigurationTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/logging/LoggingConfigurationTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.logging; +package co.elastic.apm.agent.logging; import org.junit.jupiter.api.Test; import org.slf4j.impl.SimpleLogger; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/matcher/WildcardMatcherTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/matcher/WildcardMatcherTest.java index be544c8b2a..8f0063def2 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/matcher/WildcardMatcherTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/matcher/WildcardMatcherTest.java @@ -17,14 +17,14 @@ * limitations under the License. * #L% */ -package co.elastic.apm.matcher; +package co.elastic.apm.agent.matcher; import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static co.elastic.apm.matcher.WildcardMatcher.indexOfIgnoreCase; +import static co.elastic.apm.agent.matcher.WildcardMatcher.indexOfIgnoreCase; import static org.assertj.core.api.SoftAssertions.assertSoftly; class WildcardMatcherTest { diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/matcher/WildcardMatcherValueConverterTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/matcher/WildcardMatcherValueConverterTest.java index e3bf2b9834..f7b57702e8 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/matcher/WildcardMatcherValueConverterTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/matcher/WildcardMatcherValueConverterTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.matcher; +package co.elastic.apm.agent.matcher; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/objectpool/ObjectPoolTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/objectpool/ObjectPoolTest.java index 4ca54ce0bb..f41b6f1906 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/objectpool/ObjectPoolTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/objectpool/ObjectPoolTest.java @@ -17,9 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.objectpool; +package co.elastic.apm.agent.objectpool; -import co.elastic.apm.objectpool.impl.QueueBasedObjectPool; +import co.elastic.apm.agent.objectpool.Recyclable; +import co.elastic.apm.agent.objectpool.impl.QueueBasedObjectPool; import org.jctools.queues.atomic.MpmcAtomicArrayQueue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/report/ApmServerReporterIntegrationTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/report/ApmServerReporterIntegrationTest.java index 0713bef256..3cca3ac591 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/report/ApmServerReporterIntegrationTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/report/ApmServerReporterIntegrationTest.java @@ -17,20 +17,20 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; -import co.elastic.apm.MockTracer; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.configuration.converter.TimeDuration; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.payload.ProcessInfo; -import co.elastic.apm.impl.payload.Service; -import co.elastic.apm.impl.payload.SystemInfo; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.report.processor.ProcessorEventHandler; -import co.elastic.apm.report.serialize.DslJsonSerializer; +import co.elastic.apm.agent.MockTracer; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.configuration.converter.TimeDuration; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.payload.ProcessInfo; +import co.elastic.apm.agent.impl.payload.Service; +import co.elastic.apm.agent.impl.payload.SystemInfo; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.report.processor.ProcessorEventHandler; +import co.elastic.apm.agent.report.serialize.DslJsonSerializer; import io.undertow.Undertow; import io.undertow.server.HttpHandler; import org.junit.jupiter.api.AfterAll; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/report/ApmServerReporterTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/report/ApmServerReporterTest.java index d186ba9130..7552788acc 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/report/ApmServerReporterTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/report/ApmServerReporterTest.java @@ -17,14 +17,14 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; -import co.elastic.apm.MockTracer; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.configuration.converter.TimeDuration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.MockTracer; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.configuration.converter.TimeDuration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.transaction.Transaction; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.stagemonitor.configuration.ConfigurationRegistry; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/report/IntakeV2ReportingEventHandlerTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/report/IntakeV2ReportingEventHandlerTest.java index 882f748a55..98578010eb 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/report/IntakeV2ReportingEventHandlerTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/report/IntakeV2ReportingEventHandlerTest.java @@ -17,20 +17,20 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; - -import co.elastic.apm.MockTracer; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.payload.ProcessInfo; -import co.elastic.apm.impl.payload.Service; -import co.elastic.apm.impl.payload.SystemInfo; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.report.processor.ProcessorEventHandler; -import co.elastic.apm.report.serialize.DslJsonSerializer; +package co.elastic.apm.agent.report; + +import co.elastic.apm.agent.MockTracer; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.payload.ProcessInfo; +import co.elastic.apm.agent.impl.payload.Service; +import co.elastic.apm.agent.impl.payload.SystemInfo; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.report.processor.ProcessorEventHandler; +import co.elastic.apm.agent.report.serialize.DslJsonSerializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.tomakehurst.wiremock.WireMockServer; @@ -54,7 +54,7 @@ import java.util.stream.Stream; import java.util.zip.InflaterInputStream; -import static co.elastic.apm.report.IntakeV2ReportingEventHandler.INTAKE_V2_URL; +import static co.elastic.apm.agent.report.IntakeV2ReportingEventHandler.INTAKE_V2_URL; import static com.github.tomakehurst.wiremock.client.WireMock.ok; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/report/ReporterFactoryTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/report/ReporterFactoryTest.java index 90a7c8c744..92d399d0ec 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/report/ReporterFactoryTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/report/ReporterFactoryTest.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.transaction.Transaction; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/report/TestProcessor.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/report/TestProcessor.java index cb98d9d6ac..d4500e5e42 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/report/TestProcessor.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/report/TestProcessor.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report; +package co.elastic.apm.agent.report; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.report.processor.Processor; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.report.processor.Processor; import org.stagemonitor.configuration.ConfigurationRegistry; import java.util.concurrent.atomic.AtomicInteger; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/report/serialize/DslJsonSerializerTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/report/serialize/DslJsonSerializerTest.java index d130ab9891..66aadc81a6 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/report/serialize/DslJsonSerializerTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/report/serialize/DslJsonSerializerTest.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.report.serialize; +package co.elastic.apm.agent.report.serialize; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.Transaction; import com.dslplatform.json.JsonWriter; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/util/HexUtilsTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/util/HexUtilsTest.java index 8476478ca5..061c5cc56b 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/util/HexUtilsTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/util/HexUtilsTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.util; +package co.elastic.apm.agent.util; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/util/IOUtilsTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/util/IOUtilsTest.java index 161dfab9b9..86f59f6f1e 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/util/IOUtilsTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/util/IOUtilsTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.util; +package co.elastic.apm.agent.util; -import co.elastic.apm.objectpool.impl.QueueBasedObjectPool; +import co.elastic.apm.agent.objectpool.impl.QueueBasedObjectPool; import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/util/MathUtilsTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/util/MathUtilsTest.java index 800cd135e6..25fb0aaf8c 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/util/MathUtilsTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/util/MathUtilsTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.util; +package co.elastic.apm.agent.util; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/util/PotentiallyMultiValuedMapTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/util/PotentiallyMultiValuedMapTest.java index 6b33973e18..174ac4b017 100644 --- a/apm-agent-core/src/test/java/co/elastic/apm/agent/util/PotentiallyMultiValuedMapTest.java +++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/util/PotentiallyMultiValuedMapTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.util; +package co.elastic.apm.agent.util; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/apm-agent-core/src/test/java/org/example/stacktrace/ErrorCaptureTest.java b/apm-agent-core/src/test/java/org/example/stacktrace/ErrorCaptureTest.java index 5aa3ecb404..4cf9487698 100644 --- a/apm-agent-core/src/test/java/org/example/stacktrace/ErrorCaptureTest.java +++ b/apm-agent-core/src/test/java/org/example/stacktrace/ErrorCaptureTest.java @@ -19,11 +19,11 @@ */ package org.example.stacktrace; -import co.elastic.apm.MockTracer; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.MockTracer; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.stagemonitor.configuration.ConfigurationRegistry; diff --git a/apm-agent-core/src/test/java/org/example/stacktrace/StacktraceSerializationTest.java b/apm-agent-core/src/test/java/org/example/stacktrace/StacktraceSerializationTest.java index 420fb6ab63..9e5a4827ee 100644 --- a/apm-agent-core/src/test/java/org/example/stacktrace/StacktraceSerializationTest.java +++ b/apm-agent-core/src/test/java/org/example/stacktrace/StacktraceSerializationTest.java @@ -19,12 +19,12 @@ */ package org.example.stacktrace; -import co.elastic.apm.MockTracer; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.report.serialize.DslJsonSerializer; +import co.elastic.apm.agent.MockTracer; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.report.serialize.DslJsonSerializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; diff --git a/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/ApacheHttpClientInstrumentation.java b/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/ApacheHttpClientInstrumentation.java index 1604d8680e..5b6a3eabfc 100644 --- a/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/ApacheHttpClientInstrumentation.java +++ b/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/ApacheHttpClientInstrumentation.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.httpclient; +package co.elastic.apm.agent.httpclient; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.http.client.HttpClientHelper; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.TraceContext; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.http.client.HttpClientHelper; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.TraceContext; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.method.MethodDescription; @@ -37,7 +37,7 @@ import java.util.Arrays; import java.util.Collection; -import static co.elastic.apm.http.client.HttpClientHelper.HTTP_CLIENT_SPAN_TYPE_PREFIX; +import static co.elastic.apm.agent.http.client.HttpClientHelper.HTTP_CLIENT_SPAN_TYPE_PREFIX; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.nameContains; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/package-info.java b/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/package-info.java index 0c9f195f07..e8a498ac1d 100644 --- a/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/package-info.java +++ b/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.httpclient; +package co.elastic.apm.agent.httpclient; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation b/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation index 390b326975..0550cd87d2 100644 --- a/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation +++ b/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation @@ -1 +1 @@ -co.elastic.apm.httpclient.ApacheHttpClientInstrumentation +co.elastic.apm.agent.httpclient.ApacheHttpClientInstrumentation diff --git a/apm-agent-plugins/apm-apache-httpclient-plugin/src/test/java/co/elastic/apm/agent/httpclient/ApacheHttpClientInstrumentationTest.java b/apm-agent-plugins/apm-apache-httpclient-plugin/src/test/java/co/elastic/apm/agent/httpclient/ApacheHttpClientInstrumentationTest.java index d0f483fc83..bf7d392c5d 100644 --- a/apm-agent-plugins/apm-apache-httpclient-plugin/src/test/java/co/elastic/apm/agent/httpclient/ApacheHttpClientInstrumentationTest.java +++ b/apm-agent-plugins/apm-apache-httpclient-plugin/src/test/java/co/elastic/apm/agent/httpclient/ApacheHttpClientInstrumentationTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.httpclient; +package co.elastic.apm.agent.httpclient; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; diff --git a/apm-agent-plugins/apm-api-plugin/README.md b/apm-agent-plugins/apm-api-plugin/README.md index 0572e3e7b1..1670d7f4d3 100644 --- a/apm-agent-plugins/apm-api-plugin/README.md +++ b/apm-agent-plugins/apm-api-plugin/README.md @@ -27,6 +27,6 @@ it injects the actual implementation of the API, turning the noop into an actual working implementation. This magic is implemented in the following classes: - - co.elastic.apm.plugin.api.ElasticApmApiInstrumentation - - co.elastic.apm.plugin.api.SpanInstrumentation - - co.elastic.apm.plugin.api.TransactionInstrumentation + - co.elastic.apm.agent.plugin.api.ElasticApmApiInstrumentation + - co.elastic.apm.agent.plugin.api.SpanInstrumentation + - co.elastic.apm.agent.plugin.api.TransactionInstrumentation diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/ApiInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/ApiInstrumentation.java index c0d84cea8b..9f90218fdd 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/ApiInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/ApiInstrumentation.java @@ -17,14 +17,14 @@ * limitations under the License. * #L% */ -package co.elastic.apm.plugin.api; +package co.elastic.apm.agent.plugin.api; -import co.elastic.apm.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; import java.util.Collection; import java.util.Collections; -import static co.elastic.apm.plugin.api.ElasticApmApiInstrumentation.PUBLIC_API_INSTRUMENTATION_GROUP; +import static co.elastic.apm.agent.plugin.api.ElasticApmApiInstrumentation.PUBLIC_API_INSTRUMENTATION_GROUP; public abstract class ApiInstrumentation extends ElasticApmInstrumentation { @Override diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/ApiScopeInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/ApiScopeInstrumentation.java index 198207545f..2cf246d1f2 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/ApiScopeInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/ApiScopeInstrumentation.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.plugin.api; +package co.elastic.apm.agent.plugin.api; -import co.elastic.apm.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/CaptureExceptionInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/CaptureExceptionInstrumentation.java index ebcf365457..f31c2df6c3 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/CaptureExceptionInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/CaptureExceptionInstrumentation.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.plugin.api; +package co.elastic.apm.agent.plugin.api; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; @@ -27,7 +27,7 @@ import java.util.Collection; import java.util.Collections; -import static co.elastic.apm.plugin.api.ElasticApmApiInstrumentation.PUBLIC_API_INSTRUMENTATION_GROUP; +import static co.elastic.apm.agent.plugin.api.ElasticApmApiInstrumentation.PUBLIC_API_INSTRUMENTATION_GROUP; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/CaptureSpanInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/CaptureSpanInstrumentation.java index 4df044ef7b..39ac442dfd 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/CaptureSpanInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/CaptureSpanInstrumentation.java @@ -17,16 +17,16 @@ * limitations under the License. * #L% */ -package co.elastic.apm.plugin.api; - -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.bci.bytebuddy.AnnotationValueOffsetMappingFactory; -import co.elastic.apm.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.Span; +package co.elastic.apm.agent.plugin.api; + +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.bci.bytebuddy.AnnotationValueOffsetMappingFactory; +import co.elastic.apm.agent.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.Span; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.method.MethodDescription; @@ -40,9 +40,9 @@ import java.util.Arrays; import java.util.Collection; -import static co.elastic.apm.bci.bytebuddy.CustomElementMatchers.classLoaderCanLoadClass; -import static co.elastic.apm.bci.bytebuddy.CustomElementMatchers.isInAnyPackage; -import static co.elastic.apm.plugin.api.ElasticApmApiInstrumentation.PUBLIC_API_INSTRUMENTATION_GROUP; +import static co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers.classLoaderCanLoadClass; +import static co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers.isInAnyPackage; +import static co.elastic.apm.agent.plugin.api.ElasticApmApiInstrumentation.PUBLIC_API_INSTRUMENTATION_GROUP; import static net.bytebuddy.matcher.ElementMatchers.declaresMethod; import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/CaptureTransactionInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/CaptureTransactionInstrumentation.java index 178620b879..24e7455c4c 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/CaptureTransactionInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/CaptureTransactionInstrumentation.java @@ -17,15 +17,15 @@ * limitations under the License. * #L% */ -package co.elastic.apm.plugin.api; +package co.elastic.apm.agent.plugin.api; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.bci.bytebuddy.AnnotationValueOffsetMappingFactory.AnnotationValueExtractor; -import co.elastic.apm.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory.SimpleMethodSignature; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.bci.bytebuddy.AnnotationValueOffsetMappingFactory.AnnotationValueExtractor; +import co.elastic.apm.agent.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory.SimpleMethodSignature; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.Transaction; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.method.MethodDescription; @@ -39,9 +39,9 @@ import java.util.Arrays; import java.util.Collection; -import static co.elastic.apm.bci.bytebuddy.CustomElementMatchers.classLoaderCanLoadClass; -import static co.elastic.apm.bci.bytebuddy.CustomElementMatchers.isInAnyPackage; -import static co.elastic.apm.plugin.api.ElasticApmApiInstrumentation.PUBLIC_API_INSTRUMENTATION_GROUP; +import static co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers.classLoaderCanLoadClass; +import static co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers.isInAnyPackage; +import static co.elastic.apm.agent.plugin.api.ElasticApmApiInstrumentation.PUBLIC_API_INSTRUMENTATION_GROUP; import static net.bytebuddy.matcher.ElementMatchers.declaresMethod; import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/ElasticApmApiInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/ElasticApmApiInstrumentation.java index b0f07e112b..32501ac583 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/ElasticApmApiInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/ElasticApmApiInstrumentation.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.plugin.api; +package co.elastic.apm.agent.plugin.api; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.VisibleForAdvice; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.VisibleForAdvice; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/SpanInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/SpanInstrumentation.java index 72d6a6005d..b2819c39f6 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/SpanInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/SpanInstrumentation.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.plugin.api; +package co.elastic.apm.agent.plugin.api; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/TransactionInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/TransactionInstrumentation.java index 065eaef586..514fed4f11 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/TransactionInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/TransactionInstrumentation.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.plugin.api; +package co.elastic.apm.agent.plugin.api; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.transaction.TraceContext; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.transaction.TraceContext; +import co.elastic.apm.agent.impl.transaction.Transaction; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/package-info.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/package-info.java index 9b146df232..4149d8e549 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/package-info.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/plugin/api/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.plugin.api; +package co.elastic.apm.agent.plugin.api; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation b/apm-agent-plugins/apm-api-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation index a7f09c960e..01941e79d9 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation +++ b/apm-agent-plugins/apm-api-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation @@ -1,21 +1,21 @@ -co.elastic.apm.plugin.api.ElasticApmApiInstrumentation$StartTransactionInstrumentation -co.elastic.apm.plugin.api.ElasticApmApiInstrumentation$CurrentTransactionInstrumentation -co.elastic.apm.plugin.api.ElasticApmApiInstrumentation$CurrentSpanInstrumentation -co.elastic.apm.plugin.api.ElasticApmApiInstrumentation$CaptureExceptionInstrumentation -co.elastic.apm.plugin.api.TransactionInstrumentation$SetUserInstrumentation -co.elastic.apm.plugin.api.TransactionInstrumentation$EnsureParentIdInstrumentation -co.elastic.apm.plugin.api.TransactionInstrumentation$SetResultInstrumentation -co.elastic.apm.plugin.api.SpanInstrumentation$SetNameInstrumentation -co.elastic.apm.plugin.api.SpanInstrumentation$SetTypeInstrumentation -co.elastic.apm.plugin.api.SpanInstrumentation$DoCreateSpanInstrumentation -co.elastic.apm.plugin.api.SpanInstrumentation$EndInstrumentation -co.elastic.apm.plugin.api.SpanInstrumentation$CaptureExceptionInstrumentation -co.elastic.apm.plugin.api.SpanInstrumentation$GetIdInstrumentation -co.elastic.apm.plugin.api.SpanInstrumentation$GetTraceIdInstrumentation -co.elastic.apm.plugin.api.SpanInstrumentation$AddTagInstrumentation -co.elastic.apm.plugin.api.SpanInstrumentation$ActivateInstrumentation -co.elastic.apm.plugin.api.SpanInstrumentation$IsSampledInstrumentation -co.elastic.apm.plugin.api.CaptureExceptionInstrumentation -co.elastic.apm.plugin.api.ApiScopeInstrumentation -co.elastic.apm.plugin.api.CaptureTransactionInstrumentation -co.elastic.apm.plugin.api.CaptureSpanInstrumentation +co.elastic.apm.agent.plugin.api.ElasticApmApiInstrumentation$StartTransactionInstrumentation +co.elastic.apm.agent.plugin.api.ElasticApmApiInstrumentation$CurrentTransactionInstrumentation +co.elastic.apm.agent.plugin.api.ElasticApmApiInstrumentation$CurrentSpanInstrumentation +co.elastic.apm.agent.plugin.api.ElasticApmApiInstrumentation$CaptureExceptionInstrumentation +co.elastic.apm.agent.plugin.api.TransactionInstrumentation$SetUserInstrumentation +co.elastic.apm.agent.plugin.api.TransactionInstrumentation$EnsureParentIdInstrumentation +co.elastic.apm.agent.plugin.api.TransactionInstrumentation$SetResultInstrumentation +co.elastic.apm.agent.plugin.api.SpanInstrumentation$SetNameInstrumentation +co.elastic.apm.agent.plugin.api.SpanInstrumentation$SetTypeInstrumentation +co.elastic.apm.agent.plugin.api.SpanInstrumentation$DoCreateSpanInstrumentation +co.elastic.apm.agent.plugin.api.SpanInstrumentation$EndInstrumentation +co.elastic.apm.agent.plugin.api.SpanInstrumentation$CaptureExceptionInstrumentation +co.elastic.apm.agent.plugin.api.SpanInstrumentation$GetIdInstrumentation +co.elastic.apm.agent.plugin.api.SpanInstrumentation$GetTraceIdInstrumentation +co.elastic.apm.agent.plugin.api.SpanInstrumentation$AddTagInstrumentation +co.elastic.apm.agent.plugin.api.SpanInstrumentation$ActivateInstrumentation +co.elastic.apm.agent.plugin.api.SpanInstrumentation$IsSampledInstrumentation +co.elastic.apm.agent.plugin.api.CaptureExceptionInstrumentation +co.elastic.apm.agent.plugin.api.ApiScopeInstrumentation +co.elastic.apm.agent.plugin.api.CaptureTransactionInstrumentation +co.elastic.apm.agent.plugin.api.CaptureSpanInstrumentation diff --git a/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/agent/plugin/api/SpanInstrumentationTest.java b/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/agent/plugin/api/SpanInstrumentationTest.java index a0e560ef19..51a753de7a 100644 --- a/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/agent/plugin/api/SpanInstrumentationTest.java +++ b/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/agent/plugin/api/SpanInstrumentationTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.plugin.api; +package co.elastic.apm.agent.plugin.api; -import co.elastic.apm.AbstractInstrumentationTest; +import co.elastic.apm.agent.AbstractInstrumentationTest; import co.elastic.apm.api.ElasticApm; import co.elastic.apm.api.Scope; import co.elastic.apm.api.Span; diff --git a/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/agent/plugin/api/TransactionInstrumentationTest.java b/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/agent/plugin/api/TransactionInstrumentationTest.java index dffb8675ea..ecc6502841 100644 --- a/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/agent/plugin/api/TransactionInstrumentationTest.java +++ b/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/agent/plugin/api/TransactionInstrumentationTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.plugin.api; +package co.elastic.apm.agent.plugin.api; -import co.elastic.apm.AbstractInstrumentationTest; +import co.elastic.apm.agent.AbstractInstrumentationTest; import co.elastic.apm.api.ElasticApm; import co.elastic.apm.api.Span; import co.elastic.apm.api.Transaction; diff --git a/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/api/AnnotationApiTest.java b/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/api/AnnotationApiTest.java index 1cf03b6682..3624fcb1d6 100644 --- a/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/api/AnnotationApiTest.java +++ b/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/api/AnnotationApiTest.java @@ -19,7 +19,7 @@ */ package co.elastic.apm.api; -import co.elastic.apm.AbstractInstrumentationTest; +import co.elastic.apm.agent.AbstractInstrumentationTest; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/api/ElasticApmApiInstrumentationTest.java b/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/api/ElasticApmApiInstrumentationTest.java index 17539da31d..bb2e6553bb 100644 --- a/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/api/ElasticApmApiInstrumentationTest.java +++ b/apm-agent-plugins/apm-api-plugin/src/test/java/co/elastic/apm/api/ElasticApmApiInstrumentationTest.java @@ -19,9 +19,9 @@ */ package co.elastic.apm.api; -import co.elastic.apm.AbstractInstrumentationTest; -import co.elastic.apm.impl.Scope; -import org.junit.jupiter.api.AfterEach; +import co.elastic.apm.agent.AbstractInstrumentationTest; +import co.elastic.apm.agent.impl.Scope; + import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -75,7 +75,7 @@ void testTransactionWithError() { @Test void testCreateChildSpanOfCurrentTransaction() { - final co.elastic.apm.impl.transaction.Transaction transaction = tracer.startTransaction().withType("request").withName("transaction").activate(); + final co.elastic.apm.agent.impl.transaction.Transaction transaction = tracer.startTransaction().withType("request").withName("transaction").activate(); final Span span = ElasticApm.currentSpan().createSpan(); span.setName("span"); span.setType("db"); @@ -89,7 +89,7 @@ void testCreateChildSpanOfCurrentTransaction() { // https://github.com/elastic/apm-agent-java/issues/132 @Test void testAutomaticAndManualTransactions() { - final co.elastic.apm.impl.transaction.Transaction transaction = tracer.startTransaction().withType("request").withName("transaction").activate(); + final co.elastic.apm.agent.impl.transaction.Transaction transaction = tracer.startTransaction().withType("request").withName("transaction").activate(); final Transaction manualTransaction = ElasticApm.startTransaction(); manualTransaction.setName("manual transaction"); manualTransaction.setType("request"); @@ -100,13 +100,13 @@ void testAutomaticAndManualTransactions() { @Test void testGetId_distributedTracingEnabled() { - co.elastic.apm.impl.transaction.Transaction transaction = tracer.startTransaction().withType(Transaction.TYPE_REQUEST); + co.elastic.apm.agent.impl.transaction.Transaction transaction = tracer.startTransaction().withType(Transaction.TYPE_REQUEST); try (Scope scope = transaction.activateInScope()) { assertThat(ElasticApm.currentTransaction().getId()).isEqualTo(transaction.getTraceContext().getId().toString()); assertThat(ElasticApm.currentTransaction().getTraceId()).isEqualTo(transaction.getTraceContext().getTraceId().toString()); assertThat(ElasticApm.currentSpan().getId()).isEqualTo(transaction.getTraceContext().getId().toString()); assertThat(ElasticApm.currentSpan().getTraceId()).isEqualTo(transaction.getTraceContext().getTraceId().toString()); - co.elastic.apm.impl.transaction.Span span = transaction.createSpan().withType("db").withName("SELECT"); + co.elastic.apm.agent.impl.transaction.Span span = transaction.createSpan().withType("db").withName("SELECT"); try (Scope spanScope = span.activateInScope()) { assertThat(ElasticApm.currentSpan().getId()).isEqualTo(span.getTraceContext().getId().toString()); assertThat(ElasticApm.currentSpan().getTraceId()).isEqualTo(span.getTraceContext().getTraceId().toString()); diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/main/java/co/elastic/apm/agent/es/restclient/v5_6/ElasticsearchRestClientInstrumentation.java b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/main/java/co/elastic/apm/agent/es/restclient/v5_6/ElasticsearchRestClientInstrumentation.java index e24ee5b24c..2a8dbd51b6 100644 --- a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/main/java/co/elastic/apm/agent/es/restclient/v5_6/ElasticsearchRestClientInstrumentation.java +++ b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/main/java/co/elastic/apm/agent/es/restclient/v5_6/ElasticsearchRestClientInstrumentation.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.es.restclient.v5_6; +package co.elastic.apm.agent.es.restclient.v5_6; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.util.IOUtils; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.util.IOUtils; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/main/java/co/elastic/apm/agent/es/restclient/v5_6/package-info.java b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/main/java/co/elastic/apm/agent/es/restclient/v5_6/package-info.java index 8e7ab29086..6b906bd61b 100644 --- a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/main/java/co/elastic/apm/agent/es/restclient/v5_6/package-info.java +++ b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/main/java/co/elastic/apm/agent/es/restclient/v5_6/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.es.restclient.v5_6; +package co.elastic.apm.agent.es.restclient.v5_6; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation index 7977689b3f..887a4a074a 100644 --- a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation +++ b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation @@ -1 +1 @@ -co.elastic.apm.es.restclient.v5_6.ElasticsearchRestClientInstrumentation +co.elastic.apm.agent.es.restclient.v5_6.ElasticsearchRestClientInstrumentation diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/test/java/co/elastic/apm/agent/es/restclient/v5_6/ElasticsearchRestClientInstrumentationIT.java b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/test/java/co/elastic/apm/agent/es/restclient/v5_6/ElasticsearchRestClientInstrumentationIT.java index af3e9c2f92..bdc7d7ea91 100644 --- a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/test/java/co/elastic/apm/agent/es/restclient/v5_6/ElasticsearchRestClientInstrumentationIT.java +++ b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/src/test/java/co/elastic/apm/agent/es/restclient/v5_6/ElasticsearchRestClientInstrumentationIT.java @@ -17,14 +17,14 @@ * limitations under the License. * #L% */ -package co.elastic.apm.es.restclient.v5_6; - -import co.elastic.apm.AbstractInstrumentationTest; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.transaction.Db; -import co.elastic.apm.impl.transaction.Http; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.Transaction; +package co.elastic.apm.agent.es.restclient.v5_6; + +import co.elastic.apm.agent.AbstractInstrumentationTest; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.transaction.Db; +import co.elastic.apm.agent.impl.transaction.Http; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Transaction; import org.apache.http.HttpHost; import org.testcontainers.elasticsearch.ElasticsearchContainer; import org.apache.http.auth.AuthScope; @@ -58,9 +58,9 @@ import java.util.List; import java.util.Map; -import static co.elastic.apm.es.restclient.v5_6.ElasticsearchRestClientInstrumentation.DB_CONTEXT_TYPE; -import static co.elastic.apm.es.restclient.v5_6.ElasticsearchRestClientInstrumentation.SEARCH_QUERY_PATH_SUFFIX; -import static co.elastic.apm.es.restclient.v5_6.ElasticsearchRestClientInstrumentation.SPAN_TYPE; +import static co.elastic.apm.agent.es.restclient.v5_6.ElasticsearchRestClientInstrumentation.DB_CONTEXT_TYPE; +import static co.elastic.apm.agent.es.restclient.v5_6.ElasticsearchRestClientInstrumentation.SEARCH_QUERY_PATH_SUFFIX; +import static co.elastic.apm.agent.es.restclient.v5_6.ElasticsearchRestClientInstrumentation.SPAN_TYPE; import static org.assertj.core.api.Assertions.assertThat; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/main/java/co/elastic/apm/agent/es/restclient/v6_4/ElasticsearchRestClientInstrumentation.java b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/main/java/co/elastic/apm/agent/es/restclient/v6_4/ElasticsearchRestClientInstrumentation.java index ed972d4157..f442aff3bc 100644 --- a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/main/java/co/elastic/apm/agent/es/restclient/v6_4/ElasticsearchRestClientInstrumentation.java +++ b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/main/java/co/elastic/apm/agent/es/restclient/v6_4/ElasticsearchRestClientInstrumentation.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.es.restclient.v6_4; +package co.elastic.apm.agent.es.restclient.v6_4; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.util.IOUtils; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.util.IOUtils; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/main/java/co/elastic/apm/agent/es/restclient/v6_4/package-info.java b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/main/java/co/elastic/apm/agent/es/restclient/v6_4/package-info.java index cde3b1be0d..e571e95b7f 100644 --- a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/main/java/co/elastic/apm/agent/es/restclient/v6_4/package-info.java +++ b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/main/java/co/elastic/apm/agent/es/restclient/v6_4/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.es.restclient.v6_4; +package co.elastic.apm.agent.es.restclient.v6_4; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation index b3ee759511..d5e4f5225c 100644 --- a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation +++ b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation @@ -1 +1 @@ -co.elastic.apm.es.restclient.v6_4.ElasticsearchRestClientInstrumentation +co.elastic.apm.agent.es.restclient.v6_4.ElasticsearchRestClientInstrumentation diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/test/java/co/elastic/apm/agent/es/restclient/v6_4/ElasticsearchRestClientInstrumentationIT.java b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/test/java/co/elastic/apm/agent/es/restclient/v6_4/ElasticsearchRestClientInstrumentationIT.java index ee645ea700..442311f549 100644 --- a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/test/java/co/elastic/apm/agent/es/restclient/v6_4/ElasticsearchRestClientInstrumentationIT.java +++ b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/test/java/co/elastic/apm/agent/es/restclient/v6_4/ElasticsearchRestClientInstrumentationIT.java @@ -17,14 +17,14 @@ * limitations under the License. * #L% */ -package co.elastic.apm.es.restclient.v6_4; - -import co.elastic.apm.AbstractInstrumentationTest; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.transaction.Db; -import co.elastic.apm.impl.transaction.Http; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.Transaction; +package co.elastic.apm.agent.es.restclient.v6_4; + +import co.elastic.apm.agent.AbstractInstrumentationTest; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.transaction.Db; +import co.elastic.apm.agent.impl.transaction.Http; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Transaction; import org.apache.http.HttpHost; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestClient; @@ -63,9 +63,9 @@ import java.util.List; import java.util.Map; -import static co.elastic.apm.es.restclient.v6_4.ElasticsearchRestClientInstrumentation.DB_CONTEXT_TYPE; -import static co.elastic.apm.es.restclient.v6_4.ElasticsearchRestClientInstrumentation.SEARCH_QUERY_PATH_SUFFIX; -import static co.elastic.apm.es.restclient.v6_4.ElasticsearchRestClientInstrumentation.SPAN_TYPE; +import static co.elastic.apm.agent.es.restclient.v6_4.ElasticsearchRestClientInstrumentation.DB_CONTEXT_TYPE; +import static co.elastic.apm.agent.es.restclient.v6_4.ElasticsearchRestClientInstrumentation.SEARCH_QUERY_PATH_SUFFIX; +import static co.elastic.apm.agent.es.restclient.v6_4.ElasticsearchRestClientInstrumentation.SPAN_TYPE; import static org.assertj.core.api.Assertions.assertThat; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/test/java/co/elastic/apm/agent/es/restclient/v6_4/ElasticsearchRestClientInstrumentationIT_RealReporter.java b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/test/java/co/elastic/apm/agent/es/restclient/v6_4/ElasticsearchRestClientInstrumentationIT_RealReporter.java index b36143a388..e9406681cd 100644 --- a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/test/java/co/elastic/apm/agent/es/restclient/v6_4/ElasticsearchRestClientInstrumentationIT_RealReporter.java +++ b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/src/test/java/co/elastic/apm/agent/es/restclient/v6_4/ElasticsearchRestClientInstrumentationIT_RealReporter.java @@ -17,25 +17,25 @@ * limitations under the License. * #L% */ -package co.elastic.apm.es.restclient.v6_4; - -import co.elastic.apm.bci.ElasticApmAgent; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.configuration.converter.TimeDuration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.ElasticApmTracerBuilder; -import co.elastic.apm.impl.payload.Agent; -import co.elastic.apm.impl.payload.ProcessInfo; -import co.elastic.apm.impl.payload.Service; -import co.elastic.apm.impl.payload.SystemInfo; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.report.ApmServerReporter; -import co.elastic.apm.report.IntakeV2ReportingEventHandler; -import co.elastic.apm.report.Reporter; -import co.elastic.apm.report.ReporterConfiguration; -import co.elastic.apm.report.processor.ProcessorEventHandler; -import co.elastic.apm.report.serialize.DslJsonSerializer; +package co.elastic.apm.agent.es.restclient.v6_4; + +import co.elastic.apm.agent.bci.ElasticApmAgent; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.configuration.converter.TimeDuration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.ElasticApmTracerBuilder; +import co.elastic.apm.agent.impl.payload.Agent; +import co.elastic.apm.agent.impl.payload.ProcessInfo; +import co.elastic.apm.agent.impl.payload.Service; +import co.elastic.apm.agent.impl.payload.SystemInfo; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.report.ApmServerReporter; +import co.elastic.apm.agent.report.IntakeV2ReportingEventHandler; +import co.elastic.apm.agent.report.Reporter; +import co.elastic.apm.agent.report.ReporterConfiguration; +import co.elastic.apm.agent.report.processor.ProcessorEventHandler; +import co.elastic.apm.agent.report.serialize.DslJsonSerializer; import org.testcontainers.elasticsearch.ElasticsearchContainer; import net.bytebuddy.agent.ByteBuddyAgent; import org.apache.http.HttpHost; diff --git a/apm-agent-plugins/apm-httpclient-core/src/main/java/co/elastic/apm/agent/http/client/HttpClientHelper.java b/apm-agent-plugins/apm-httpclient-core/src/main/java/co/elastic/apm/agent/http/client/HttpClientHelper.java index 5e463f4c49..059ff238aa 100644 --- a/apm-agent-plugins/apm-httpclient-core/src/main/java/co/elastic/apm/agent/http/client/HttpClientHelper.java +++ b/apm-agent-plugins/apm-httpclient-core/src/main/java/co/elastic/apm/agent/http/client/HttpClientHelper.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.http.client; +package co.elastic.apm.agent.http.client; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.Span; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.Span; import javax.annotation.Nullable; import java.net.URI; diff --git a/apm-agent-plugins/apm-httpclient-core/src/test/java/co/elastic/apm/agent/httpclient/AbstractHttpClientInstrumentationTest.java b/apm-agent-plugins/apm-httpclient-core/src/test/java/co/elastic/apm/agent/httpclient/AbstractHttpClientInstrumentationTest.java index b5f45eec2d..0a61e323bb 100644 --- a/apm-agent-plugins/apm-httpclient-core/src/test/java/co/elastic/apm/agent/httpclient/AbstractHttpClientInstrumentationTest.java +++ b/apm-agent-plugins/apm-httpclient-core/src/test/java/co/elastic/apm/agent/httpclient/AbstractHttpClientInstrumentationTest.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm.httpclient; +package co.elastic.apm.agent.httpclient; -import co.elastic.apm.AbstractInstrumentationTest; -import co.elastic.apm.impl.Scope; -import co.elastic.apm.impl.transaction.TraceContext; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.AbstractInstrumentationTest; +import co.elastic.apm.agent.impl.Scope; +import co.elastic.apm.agent.impl.transaction.TraceContext; +import co.elastic.apm.agent.impl.transaction.Transaction; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; import com.github.tomakehurst.wiremock.junit.WireMockRule; import org.junit.Before; diff --git a/apm-agent-plugins/apm-jaxrs-plugin/src/main/java/co/elastic/apm/agent/jaxrs/JaxRsTransactionNameInstrumentation.java b/apm-agent-plugins/apm-jaxrs-plugin/src/main/java/co/elastic/apm/agent/jaxrs/JaxRsTransactionNameInstrumentation.java index d04448901d..ecd5d96fb4 100644 --- a/apm-agent-plugins/apm-jaxrs-plugin/src/main/java/co/elastic/apm/agent/jaxrs/JaxRsTransactionNameInstrumentation.java +++ b/apm-agent-plugins/apm-jaxrs-plugin/src/main/java/co/elastic/apm/agent/jaxrs/JaxRsTransactionNameInstrumentation.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.jaxrs; +package co.elastic.apm.agent.jaxrs; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory.SimpleMethodSignature; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.stacktrace.StacktraceConfiguration; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory.SimpleMethodSignature; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration; +import co.elastic.apm.agent.impl.transaction.Transaction; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.method.MethodDescription; @@ -35,9 +35,9 @@ import java.util.Collection; import java.util.Collections; -import static co.elastic.apm.bci.bytebuddy.CustomElementMatchers.classLoaderCanLoadClass; -import static co.elastic.apm.bci.bytebuddy.CustomElementMatchers.isInAnyPackage; -import static co.elastic.apm.bci.bytebuddy.CustomElementMatchers.overridesOrImplementsMethodThat; +import static co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers.classLoaderCanLoadClass; +import static co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers.isInAnyPackage; +import static co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers.overridesOrImplementsMethodThat; import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith; import static net.bytebuddy.matcher.ElementMatchers.isBootstrapClassLoader; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/apm-agent-plugins/apm-jaxrs-plugin/src/main/java/co/elastic/apm/agent/jaxrs/package-info.java b/apm-agent-plugins/apm-jaxrs-plugin/src/main/java/co/elastic/apm/agent/jaxrs/package-info.java index dc1b898a4b..bd5943e772 100644 --- a/apm-agent-plugins/apm-jaxrs-plugin/src/main/java/co/elastic/apm/agent/jaxrs/package-info.java +++ b/apm-agent-plugins/apm-jaxrs-plugin/src/main/java/co/elastic/apm/agent/jaxrs/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.jaxrs; +package co.elastic.apm.agent.jaxrs; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-jaxrs-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation b/apm-agent-plugins/apm-jaxrs-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation index 4536a909ed..4c043ec043 100644 --- a/apm-agent-plugins/apm-jaxrs-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation +++ b/apm-agent-plugins/apm-jaxrs-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation @@ -1 +1 @@ -co.elastic.apm.jaxrs.JaxRsTransactionNameInstrumentation +co.elastic.apm.agent.jaxrs.JaxRsTransactionNameInstrumentation diff --git a/apm-agent-plugins/apm-jaxrs-plugin/src/test/java/co/elastic/apm/agent/jaxrs/JaxRsTransactionNameInstrumentationTest.java b/apm-agent-plugins/apm-jaxrs-plugin/src/test/java/co/elastic/apm/agent/jaxrs/JaxRsTransactionNameInstrumentationTest.java index 38f7788824..e43625c183 100644 --- a/apm-agent-plugins/apm-jaxrs-plugin/src/test/java/co/elastic/apm/agent/jaxrs/JaxRsTransactionNameInstrumentationTest.java +++ b/apm-agent-plugins/apm-jaxrs-plugin/src/test/java/co/elastic/apm/agent/jaxrs/JaxRsTransactionNameInstrumentationTest.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.jaxrs; +package co.elastic.apm.agent.jaxrs; -import co.elastic.apm.AbstractInstrumentationTest; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.AbstractInstrumentationTest; +import co.elastic.apm.agent.impl.transaction.Transaction; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.JerseyTest; import org.junit.AfterClass; diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/ConnectionInstrumentation.java b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/ConnectionInstrumentation.java index f12e6c448e..11319f4df8 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/ConnectionInstrumentation.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/ConnectionInstrumentation.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.jdbc; +package co.elastic.apm.agent.jdbc; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.VisibleForAdvice; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.VisibleForAdvice; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.method.MethodDescription; diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/JdbcUtils.java b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/JdbcUtils.java index 633c999c75..342c16d5c5 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/JdbcUtils.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/JdbcUtils.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.jdbc; +package co.elastic.apm.agent.jdbc; public class JdbcUtils { public static final String DB_SPAN_TYPE_PREFIX = "db."; diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/PreparedStatementInstrumentation.java b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/PreparedStatementInstrumentation.java index e24e2a0710..b2928cbc14 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/PreparedStatementInstrumentation.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/PreparedStatementInstrumentation.java @@ -17,14 +17,14 @@ * limitations under the License. * #L% */ -package co.elastic.apm.jdbc; +package co.elastic.apm.agent.jdbc; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.HelperClassManager; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.jdbc.helper.JdbcHelper; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.HelperClassManager; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.jdbc.helper.JdbcHelper; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.method.MethodDescription; @@ -38,7 +38,7 @@ import java.util.Collection; import java.util.Collections; -import static co.elastic.apm.jdbc.ConnectionInstrumentation.JDBC_INSTRUMENTATION_GROUP; +import static co.elastic.apm.agent.jdbc.ConnectionInstrumentation.JDBC_INSTRUMENTATION_GROUP; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -80,8 +80,8 @@ public static void onAfterExecute(@Advice.Enter @Nullable Span span, @Advice.Thr @Override public void init(ElasticApmTracer tracer) { - jdbcHelper = HelperClassManager.ForSingleClassLoader.of(tracer, "co.elastic.apm.jdbc.helper.JdbcHelperImpl", - "co.elastic.apm.jdbc.helper.JdbcHelperImpl$ConnectionMetaData"); + jdbcHelper = HelperClassManager.ForSingleClassLoader.of(tracer, "co.elastic.apm.agent.jdbc.helper.JdbcHelperImpl", + "co.elastic.apm.agent.jdbc.helper.JdbcHelperImpl$ConnectionMetaData"); } @Override diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/StatementInstrumentation.java b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/StatementInstrumentation.java index c2c07e4397..816d9c19f1 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/StatementInstrumentation.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/StatementInstrumentation.java @@ -17,14 +17,14 @@ * limitations under the License. * #L% */ -package co.elastic.apm.jdbc; +package co.elastic.apm.agent.jdbc; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.HelperClassManager; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.jdbc.helper.JdbcHelper; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.HelperClassManager; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.jdbc.helper.JdbcHelper; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.method.MethodDescription; @@ -37,7 +37,7 @@ import java.util.Collection; import java.util.Collections; -import static co.elastic.apm.jdbc.ConnectionInstrumentation.JDBC_INSTRUMENTATION_GROUP; +import static co.elastic.apm.agent.jdbc.ConnectionInstrumentation.JDBC_INSTRUMENTATION_GROUP; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -79,8 +79,8 @@ public static void onAfterExecute(@Advice.Enter @Nullable Span span, @Advice.Thr @Override public void init(ElasticApmTracer tracer) { - jdbcHelper = HelperClassManager.ForSingleClassLoader.of(tracer, "co.elastic.apm.jdbc.helper.JdbcHelperImpl", - "co.elastic.apm.jdbc.helper.JdbcHelperImpl$ConnectionMetaData"); + jdbcHelper = HelperClassManager.ForSingleClassLoader.of(tracer, "co.elastic.apm.agent.jdbc.helper.JdbcHelperImpl", + "co.elastic.apm.agent.jdbc.helper.JdbcHelperImpl$ConnectionMetaData"); } @Override diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/JdbcHelper.java b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/JdbcHelper.java index d0fed2b8dd..391a6e078d 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/JdbcHelper.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/JdbcHelper.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.jdbc.helper; +package co.elastic.apm.agent.jdbc.helper; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.Span; import javax.annotation.Nullable; import java.sql.Connection; diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/JdbcHelperImpl.java b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/JdbcHelperImpl.java index 1dc79d66c2..d7ed52f6da 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/JdbcHelperImpl.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/JdbcHelperImpl.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.jdbc.helper; +package co.elastic.apm.agent.jdbc.helper; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.Span; import com.google.common.collect.MapMaker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,8 +33,8 @@ import java.util.Map; import java.util.WeakHashMap; -import static co.elastic.apm.jdbc.JdbcUtils.DB_SPAN_TYPE_PREFIX; -import static co.elastic.apm.jdbc.JdbcUtils.computeJdbcSpanTypeName; +import static co.elastic.apm.agent.jdbc.JdbcUtils.DB_SPAN_TYPE_PREFIX; +import static co.elastic.apm.agent.jdbc.JdbcUtils.computeJdbcSpanTypeName; public class JdbcHelperImpl implements JdbcHelper { diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/package-info.java b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/package-info.java index efeb8fcfde..f12dadc3aa 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/package-info.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/package-info.java @@ -23,6 +23,6 @@ * but has to inject a helper class in order to do so. */ @NonnullApi -package co.elastic.apm.jdbc; +package co.elastic.apm.agent.jdbc; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation b/apm-agent-plugins/apm-jdbc-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation index fd31c2eb32..d7ddae52a7 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation +++ b/apm-agent-plugins/apm-jdbc-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation @@ -1,3 +1,3 @@ -co.elastic.apm.jdbc.ConnectionInstrumentation -co.elastic.apm.jdbc.StatementInstrumentation -co.elastic.apm.jdbc.PreparedStatementInstrumentation +co.elastic.apm.agent.jdbc.ConnectionInstrumentation +co.elastic.apm.agent.jdbc.StatementInstrumentation +co.elastic.apm.agent.jdbc.PreparedStatementInstrumentation diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/AbstractJdbcInstrumentationTest.java b/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/AbstractJdbcInstrumentationTest.java index f5d083b1f4..efe4bfa063 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/AbstractJdbcInstrumentationTest.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/AbstractJdbcInstrumentationTest.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm.jdbc; +package co.elastic.apm.agent.jdbc; -import co.elastic.apm.AbstractInstrumentationTest; -import co.elastic.apm.impl.transaction.Db; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.AbstractInstrumentationTest; +import co.elastic.apm.agent.impl.transaction.Db; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Transaction; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/DataSourceIT.java b/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/DataSourceIT.java index 3e2ba6354a..bada81d7c8 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/DataSourceIT.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/DataSourceIT.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.jdbc; +package co.elastic.apm.agent.jdbc; import com.alibaba.druid.pool.DruidDataSource; import com.mchange.v2.c3p0.ComboPooledDataSource; @@ -31,7 +31,7 @@ import javax.sql.DataSource; import java.util.function.Supplier; -import static co.elastic.apm.jdbc.JdbcUtils.computeJdbcSpanTypeName; +import static co.elastic.apm.agent.jdbc.JdbcUtils.computeJdbcSpanTypeName; import static java.util.Arrays.asList; // inspired by https://github.com/testcontainers/testcontainers-java/blob/master/modules/jdbc-test/src/test/java/org/testcontainers/jdbc/JDBCDriverWithPoolTest.java diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/JdbcDbIT.java b/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/JdbcDbIT.java index 8cb9bf105b..2a9ed3fde8 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/JdbcDbIT.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/JdbcDbIT.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.jdbc; +package co.elastic.apm.agent.jdbc; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -25,7 +25,7 @@ import java.sql.DriverManager; import java.util.Arrays; -import static co.elastic.apm.jdbc.JdbcUtils.computeJdbcSpanTypeName; +import static co.elastic.apm.agent.jdbc.JdbcUtils.computeJdbcSpanTypeName; @RunWith(Parameterized.class) public class JdbcDbIT extends AbstractJdbcInstrumentationTest { diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/JdbcInstrumentationTest.java b/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/JdbcInstrumentationTest.java index 34ca005a06..89e33efb3e 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/JdbcInstrumentationTest.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/JdbcInstrumentationTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.jdbc; +package co.elastic.apm.agent.jdbc; -import static co.elastic.apm.jdbc.JdbcUtils.computeJdbcSpanTypeName; +import static co.elastic.apm.agent.jdbc.JdbcUtils.computeJdbcSpanTypeName; import java.sql.DriverManager; diff --git a/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ApmScopeInstrumentation.java b/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ApmScopeInstrumentation.java index a27e0cabf6..2c1201e3a5 100644 --- a/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ApmScopeInstrumentation.java +++ b/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ApmScopeInstrumentation.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm.opentracing.impl; +package co.elastic.apm.agent.opentracing.impl; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.TraceContext; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.TraceContext; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; @@ -33,7 +33,7 @@ import java.util.Collection; import java.util.Collections; -import static co.elastic.apm.opentracing.impl.ApmSpanInstrumentation.OPENTRACING_INSTRUMENTATION_GROUP; +import static co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation.OPENTRACING_INSTRUMENTATION_GROUP; import static net.bytebuddy.matcher.ElementMatchers.named; public class ApmScopeInstrumentation extends ElasticApmInstrumentation { diff --git a/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ApmSpanBuilderInstrumentation.java b/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ApmSpanBuilderInstrumentation.java index bb121dd2d3..36bf06fe36 100644 --- a/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ApmSpanBuilderInstrumentation.java +++ b/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ApmSpanBuilderInstrumentation.java @@ -17,15 +17,15 @@ * limitations under the License. * #L% */ -package co.elastic.apm.opentracing.impl; - -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.sampling.ConstantSampler; -import co.elastic.apm.impl.sampling.Sampler; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.TraceContext; +package co.elastic.apm.agent.opentracing.impl; + +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.sampling.ConstantSampler; +import co.elastic.apm.agent.impl.sampling.Sampler; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.TraceContext; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; @@ -40,7 +40,7 @@ import java.util.Collections; import java.util.Map; -import static co.elastic.apm.opentracing.impl.ApmSpanInstrumentation.OPENTRACING_INSTRUMENTATION_GROUP; +import static co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation.OPENTRACING_INSTRUMENTATION_GROUP; import static net.bytebuddy.matcher.ElementMatchers.named; public class ApmSpanBuilderInstrumentation extends ElasticApmInstrumentation { diff --git a/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ApmSpanInstrumentation.java b/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ApmSpanInstrumentation.java index 3c9347ead2..07e4958d57 100644 --- a/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ApmSpanInstrumentation.java +++ b/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ApmSpanInstrumentation.java @@ -17,14 +17,14 @@ * limitations under the License. * #L% */ -package co.elastic.apm.opentracing.impl; - -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.web.ResultUtil; +package co.elastic.apm.agent.opentracing.impl; + +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.web.ResultUtil; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ScopeManagerInstrumentation.java b/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ScopeManagerInstrumentation.java index b1c2cf68fa..94d30f64a5 100644 --- a/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ScopeManagerInstrumentation.java +++ b/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/ScopeManagerInstrumentation.java @@ -17,12 +17,12 @@ * limitations under the License. * #L% */ -package co.elastic.apm.opentracing.impl; +package co.elastic.apm.agent.opentracing.impl; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.TraceContext; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.TraceContext; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; @@ -33,7 +33,7 @@ import java.util.Collection; import java.util.Collections; -import static co.elastic.apm.opentracing.impl.ApmSpanInstrumentation.OPENTRACING_INSTRUMENTATION_GROUP; +import static co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation.OPENTRACING_INSTRUMENTATION_GROUP; import static net.bytebuddy.matcher.ElementMatchers.named; public class ScopeManagerInstrumentation extends ElasticApmInstrumentation { diff --git a/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/SpanContextInstrumentation.java b/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/SpanContextInstrumentation.java index 6e55036e50..8268b07f06 100644 --- a/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/SpanContextInstrumentation.java +++ b/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/SpanContextInstrumentation.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.opentracing.impl; +package co.elastic.apm.agent.opentracing.impl; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.transaction.TraceContext; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.transaction.TraceContext; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; @@ -33,7 +33,7 @@ import java.util.Collections; import java.util.Map; -import static co.elastic.apm.opentracing.impl.ApmSpanInstrumentation.OPENTRACING_INSTRUMENTATION_GROUP; +import static co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation.OPENTRACING_INSTRUMENTATION_GROUP; import static net.bytebuddy.matcher.ElementMatchers.named; public class SpanContextInstrumentation extends ElasticApmInstrumentation { diff --git a/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/package-info.java b/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/package-info.java index 375ec787f2..52155184a3 100644 --- a/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/package-info.java +++ b/apm-agent-plugins/apm-opentracing-plugin/src/main/java/co/elastic/apm/agent/opentracing/impl/package-info.java @@ -22,6 +22,6 @@ * Injects the actual implementation of the OpenTracing API at runtime. */ @NonnullApi -package co.elastic.apm.opentracing.impl; +package co.elastic.apm.agent.opentracing.impl; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-opentracing-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation b/apm-agent-plugins/apm-opentracing-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation index c001861e69..f1327a190c 100644 --- a/apm-agent-plugins/apm-opentracing-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation +++ b/apm-agent-plugins/apm-opentracing-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation @@ -1,11 +1,11 @@ -co.elastic.apm.opentracing.impl.ApmSpanInstrumentation$FinishInstrumentation -co.elastic.apm.opentracing.impl.ApmSpanInstrumentation$LogInstrumentation -co.elastic.apm.opentracing.impl.ApmSpanInstrumentation$TagInstrumentation -co.elastic.apm.opentracing.impl.ApmSpanInstrumentation$SetOperationName -co.elastic.apm.opentracing.impl.ApmSpanInstrumentation$GetTraceContextInstrumentation -co.elastic.apm.opentracing.impl.ApmSpanBuilderInstrumentation$CreateSpanInstrumentation -co.elastic.apm.opentracing.impl.ScopeManagerInstrumentation$ActivateInstrumentation -co.elastic.apm.opentracing.impl.ScopeManagerInstrumentation$CurrentSpanInstrumentation -co.elastic.apm.opentracing.impl.ScopeManagerInstrumentation$CurrentTraceContextInstrumentation -co.elastic.apm.opentracing.impl.ApmScopeInstrumentation -co.elastic.apm.opentracing.impl.SpanContextInstrumentation +co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation$FinishInstrumentation +co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation$LogInstrumentation +co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation$TagInstrumentation +co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation$SetOperationName +co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation$GetTraceContextInstrumentation +co.elastic.apm.agent.opentracing.impl.ApmSpanBuilderInstrumentation$CreateSpanInstrumentation +co.elastic.apm.agent.opentracing.impl.ScopeManagerInstrumentation$ActivateInstrumentation +co.elastic.apm.agent.opentracing.impl.ScopeManagerInstrumentation$CurrentSpanInstrumentation +co.elastic.apm.agent.opentracing.impl.ScopeManagerInstrumentation$CurrentTraceContextInstrumentation +co.elastic.apm.agent.opentracing.impl.ApmScopeInstrumentation +co.elastic.apm.agent.opentracing.impl.SpanContextInstrumentation diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/AsyncInstrumentation.java b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/AsyncInstrumentation.java index 51666f7d49..25e10186c1 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/AsyncInstrumentation.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/AsyncInstrumentation.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.servlet; +package co.elastic.apm.agent.servlet; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.HelperClassManager; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.HelperClassManager; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.transaction.Transaction; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.method.MethodDescription; @@ -38,7 +38,7 @@ import java.util.Arrays; import java.util.Collection; -import static co.elastic.apm.servlet.ServletApiAdvice.TRANSACTION_ATTRIBUTE; +import static co.elastic.apm.agent.servlet.ServletApiAdvice.TRANSACTION_ATTRIBUTE; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -69,8 +69,8 @@ public class AsyncInstrumentation extends ElasticApmInstrumentation { @Override public void init(ElasticApmTracer tracer) { asyncHelper = HelperClassManager.ForSingleClassLoader.of(tracer, - "co.elastic.apm.servlet.helper.StartAsyncAdviceHelperImpl", - "co.elastic.apm.servlet.helper.ApmAsyncListener"); + "co.elastic.apm.agent.servlet.helper.StartAsyncAdviceHelperImpl", + "co.elastic.apm.agent.servlet.helper.ApmAsyncListener"); } @Override diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/FilterChainInstrumentation.java b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/FilterChainInstrumentation.java index a13e7d646b..10150615ac 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/FilterChainInstrumentation.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/FilterChainInstrumentation.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.servlet; +package co.elastic.apm.agent.servlet; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.impl.ElasticApmTracer; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.impl.ElasticApmTracer; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; @@ -29,7 +29,7 @@ import java.util.Collection; import java.util.Collections; -import static co.elastic.apm.servlet.ServletInstrumentation.SERVLET_API; +import static co.elastic.apm.agent.servlet.ServletInstrumentation.SERVLET_API; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.nameContains; diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletApiAdvice.java b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletApiAdvice.java index bf4a9d824e..2f64b62d9e 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletApiAdvice.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletApiAdvice.java @@ -17,15 +17,15 @@ * limitations under the License. * #L% */ -package co.elastic.apm.servlet; +package co.elastic.apm.agent.servlet; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.Scope; -import co.elastic.apm.impl.context.Request; -import co.elastic.apm.impl.context.Response; -import co.elastic.apm.impl.transaction.TraceContext; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.Scope; +import co.elastic.apm.agent.impl.context.Request; +import co.elastic.apm.agent.impl.context.Response; +import co.elastic.apm.agent.impl.transaction.TraceContext; +import co.elastic.apm.agent.impl.transaction.Transaction; import net.bytebuddy.asm.Advice; import javax.annotation.Nullable; diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletInstrumentation.java b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletInstrumentation.java index eed779a4c1..8d6ff44dc8 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletInstrumentation.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletInstrumentation.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.servlet; +package co.elastic.apm.agent.servlet; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.impl.ElasticApmTracer; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.impl.ElasticApmTracer; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletTransactionHelper.java b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletTransactionHelper.java index bf7db4f9f2..edce425e6a 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletTransactionHelper.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletTransactionHelper.java @@ -17,22 +17,22 @@ * limitations under the License. * #L% */ -package co.elastic.apm.servlet; +package co.elastic.apm.agent.servlet; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.configuration.CoreConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.context.Request; -import co.elastic.apm.impl.context.Response; -import co.elastic.apm.impl.context.TransactionContext; -import co.elastic.apm.impl.context.Url; -import co.elastic.apm.impl.transaction.TraceContext; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.matcher.WildcardMatcher; -import co.elastic.apm.util.PotentiallyMultiValuedMap; -import co.elastic.apm.web.ClientIpUtils; -import co.elastic.apm.web.ResultUtil; -import co.elastic.apm.web.WebConfiguration; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.configuration.CoreConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.context.Request; +import co.elastic.apm.agent.impl.context.Response; +import co.elastic.apm.agent.impl.context.TransactionContext; +import co.elastic.apm.agent.impl.context.Url; +import co.elastic.apm.agent.impl.transaction.TraceContext; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.matcher.WildcardMatcher; +import co.elastic.apm.agent.util.PotentiallyMultiValuedMap; +import co.elastic.apm.agent.web.ClientIpUtils; +import co.elastic.apm.agent.web.ResultUtil; +import co.elastic.apm.agent.web.WebConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +43,7 @@ import java.util.Map; import java.util.Set; -import static co.elastic.apm.web.WebConfiguration.EventType.OFF; +import static co.elastic.apm.agent.web.WebConfiguration.EventType.OFF; /** * This class must not import classes from {@code javax.servlet} due to class loader issues. diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/helper/ApmAsyncListener.java b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/helper/ApmAsyncListener.java index b01a890957..5b0abe05bb 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/helper/ApmAsyncListener.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/helper/ApmAsyncListener.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.servlet.helper; +package co.elastic.apm.agent.servlet.helper; -import co.elastic.apm.impl.context.Response; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.servlet.ServletTransactionHelper; +import co.elastic.apm.agent.impl.context.Response; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.servlet.ServletTransactionHelper; import javax.servlet.AsyncContext; import javax.servlet.AsyncEvent; diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/helper/StartAsyncAdviceHelperImpl.java b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/helper/StartAsyncAdviceHelperImpl.java index 5e8c3e9528..1884bbbd94 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/helper/StartAsyncAdviceHelperImpl.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/helper/StartAsyncAdviceHelperImpl.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.servlet.helper; +package co.elastic.apm.agent.servlet.helper; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.servlet.AsyncInstrumentation; -import co.elastic.apm.servlet.ServletApiAdvice; -import co.elastic.apm.servlet.ServletTransactionHelper; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.servlet.AsyncInstrumentation; +import co.elastic.apm.agent.servlet.ServletApiAdvice; +import co.elastic.apm.agent.servlet.ServletTransactionHelper; import javax.servlet.AsyncContext; import javax.servlet.ServletRequest; diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/helper/package-info.java b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/helper/package-info.java index be07fa66e7..7444df7010 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/helper/package-info.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/helper/package-info.java @@ -43,7 +43,7 @@ * instead of loading them itself so that the helper classes can access the Servlet API. *

*

- * Advices have to manually add their required helper classes to {@link co.elastic.apm.bci.HelperClassManager}, + * Advices have to manually add their required helper classes to {@link co.elastic.apm.agent.bci.HelperClassManager}, * which takes care of creating the helper class loaders. *

* @@ -58,6 +58,6 @@ * */ @NonnullApi -package co.elastic.apm.servlet.helper; +package co.elastic.apm.agent.servlet.helper; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/package-info.java b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/package-info.java index bccfe1997f..013732c436 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/package-info.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.servlet; +package co.elastic.apm.agent.servlet; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/wildfly/WildFlyLifecycleListener.java b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/wildfly/WildFlyLifecycleListener.java index d1ab375251..c902a1516d 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/wildfly/WildFlyLifecycleListener.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/wildfly/WildFlyLifecycleListener.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.servlet.wildfly; +package co.elastic.apm.agent.servlet.wildfly; -import co.elastic.apm.context.LifecycleListener; -import co.elastic.apm.impl.ElasticApmTracer; +import co.elastic.apm.agent.context.LifecycleListener; +import co.elastic.apm.agent.impl.ElasticApmTracer; /** * Makes the {@code co.elastic.apm} package visible from all modules diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/NOTICE b/apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/NOTICE index 6de5b2d624..7a076a4f3d 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/NOTICE +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/NOTICE @@ -1,3 +1,3 @@ This product includes software from openzipkin/brave, under the Apache License 2.0. See: - - co.elastic.apm.servlet.helper.ApmAsyncListener + - co.elastic.apm.agent.servlet.helper.ApmAsyncListener diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation b/apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation index 765743b2e9..67f5189a88 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation @@ -1,3 +1,3 @@ -co.elastic.apm.servlet.ServletInstrumentation -co.elastic.apm.servlet.FilterChainInstrumentation -co.elastic.apm.servlet.AsyncInstrumentation +co.elastic.apm.agent.servlet.ServletInstrumentation +co.elastic.apm.agent.servlet.FilterChainInstrumentation +co.elastic.apm.agent.servlet.AsyncInstrumentation diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.context.LifecycleListener b/apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.context.LifecycleListener index ba952252ea..7280ab0fe5 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.context.LifecycleListener +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.context.LifecycleListener @@ -1 +1 @@ -co.elastic.apm.servlet.wildfly.WildFlyLifecycleListener +co.elastic.apm.agent.servlet.wildfly.WildFlyLifecycleListener diff --git a/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/ApmFilterTest.java b/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/ApmFilterTest.java index dfb5bd8793..098f4410f7 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/ApmFilterTest.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/ApmFilterTest.java @@ -17,14 +17,14 @@ * limitations under the License. * #L% */ -package co.elastic.apm.servlet; - -import co.elastic.apm.AbstractInstrumentationTest; -import co.elastic.apm.configuration.CoreConfiguration; -import co.elastic.apm.impl.context.Url; -import co.elastic.apm.matcher.WildcardMatcher; -import co.elastic.apm.util.PotentiallyMultiValuedMap; -import co.elastic.apm.web.WebConfiguration; +package co.elastic.apm.agent.servlet; + +import co.elastic.apm.agent.AbstractInstrumentationTest; +import co.elastic.apm.agent.configuration.CoreConfiguration; +import co.elastic.apm.agent.impl.context.Url; +import co.elastic.apm.agent.matcher.WildcardMatcher; +import co.elastic.apm.agent.util.PotentiallyMultiValuedMap; +import co.elastic.apm.agent.web.WebConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.HttpHeaders; diff --git a/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/AsyncServletTest.java b/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/AsyncServletTest.java index e33c5edc3b..75732e5cda 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/AsyncServletTest.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/AsyncServletTest.java @@ -17,14 +17,14 @@ * limitations under the License. * #L% */ -package co.elastic.apm.servlet; - -import co.elastic.apm.AbstractServletTest; -import co.elastic.apm.bci.ElasticApmAgent; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.ElasticApmTracerBuilder; -import co.elastic.apm.impl.context.TransactionContext; +package co.elastic.apm.agent.servlet; + +import co.elastic.apm.agent.AbstractServletTest; +import co.elastic.apm.agent.bci.ElasticApmAgent; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.ElasticApmTracerBuilder; +import co.elastic.apm.agent.impl.context.TransactionContext; import net.bytebuddy.agent.ByteBuddyAgent; import org.eclipse.jetty.servlet.ServletContextHandler; import org.junit.jupiter.api.AfterAll; diff --git a/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/ServletInstrumentationTest.java b/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/ServletInstrumentationTest.java index 572579f07b..34bcac5bd3 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/ServletInstrumentationTest.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/ServletInstrumentationTest.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.servlet; +package co.elastic.apm.agent.servlet; -import co.elastic.apm.AbstractServletTest; -import co.elastic.apm.bci.ElasticApmAgent; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracerBuilder; +import co.elastic.apm.agent.AbstractServletTest; +import co.elastic.apm.agent.bci.ElasticApmAgent; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracerBuilder; import net.bytebuddy.agent.ByteBuddyAgent; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/ServletTransactionHelperTest.java b/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/ServletTransactionHelperTest.java index f20ac51c46..0fdf89f0c3 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/ServletTransactionHelperTest.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/test/java/co/elastic/apm/agent/servlet/ServletTransactionHelperTest.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.servlet; +package co.elastic.apm.agent.servlet; -import co.elastic.apm.MockReporter; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracerBuilder; -import co.elastic.apm.matcher.WildcardMatcher; -import co.elastic.apm.web.WebConfiguration; +import co.elastic.apm.agent.MockReporter; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracerBuilder; +import co.elastic.apm.agent.matcher.WildcardMatcher; +import co.elastic.apm.agent.web.WebConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.stagemonitor.configuration.ConfigurationRegistry; diff --git a/apm-agent-plugins/apm-slf4j-plugin/src/main/java/co/elastic/apm/agent/slf4j/Slf4jMdcSpanListener.java b/apm-agent-plugins/apm-slf4j-plugin/src/main/java/co/elastic/apm/agent/slf4j/Slf4jMdcSpanListener.java index 15a6e74e54..37f5c46ec9 100644 --- a/apm-agent-plugins/apm-slf4j-plugin/src/main/java/co/elastic/apm/agent/slf4j/Slf4jMdcSpanListener.java +++ b/apm-agent-plugins/apm-slf4j-plugin/src/main/java/co/elastic/apm/agent/slf4j/Slf4jMdcSpanListener.java @@ -17,15 +17,15 @@ * limitations under the License. * #L% */ -package co.elastic.apm.slf4j; +package co.elastic.apm.agent.slf4j; -import co.elastic.apm.cache.WeakKeySoftValueLoadingCache; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.SpanListener; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.TraceContext; -import co.elastic.apm.logging.LoggingConfiguration; +import co.elastic.apm.agent.cache.WeakKeySoftValueLoadingCache; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.SpanListener; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.TraceContext; +import co.elastic.apm.agent.logging.LoggingConfiguration; import javax.annotation.Nullable; import java.lang.invoke.MethodHandle; diff --git a/apm-agent-plugins/apm-slf4j-plugin/src/main/java/co/elastic/apm/agent/slf4j/package-info.java b/apm-agent-plugins/apm-slf4j-plugin/src/main/java/co/elastic/apm/agent/slf4j/package-info.java index c0a5a739d1..22f71fd701 100644 --- a/apm-agent-plugins/apm-slf4j-plugin/src/main/java/co/elastic/apm/agent/slf4j/package-info.java +++ b/apm-agent-plugins/apm-slf4j-plugin/src/main/java/co/elastic/apm/agent/slf4j/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.slf4j; +package co.elastic.apm.agent.slf4j; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-slf4j-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.impl.SpanListener b/apm-agent-plugins/apm-slf4j-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.impl.SpanListener index f1c3df9f92..ec6941804b 100644 --- a/apm-agent-plugins/apm-slf4j-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.impl.SpanListener +++ b/apm-agent-plugins/apm-slf4j-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.impl.SpanListener @@ -1 +1 @@ -co.elastic.apm.slf4j.Slf4jMdcSpanListener +co.elastic.apm.agent.slf4j.Slf4jMdcSpanListener diff --git a/apm-agent-plugins/apm-slf4j-plugin/src/test/java/co/elastic/apm/agent/slf4j/Slf4JMdcSpanListenerTest.java b/apm-agent-plugins/apm-slf4j-plugin/src/test/java/co/elastic/apm/agent/slf4j/Slf4JMdcSpanListenerTest.java index 9b01b44eb5..0c35c283b7 100644 --- a/apm-agent-plugins/apm-slf4j-plugin/src/test/java/co/elastic/apm/agent/slf4j/Slf4JMdcSpanListenerTest.java +++ b/apm-agent-plugins/apm-slf4j-plugin/src/test/java/co/elastic/apm/agent/slf4j/Slf4JMdcSpanListenerTest.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.slf4j; +package co.elastic.apm.agent.slf4j; -import co.elastic.apm.AbstractInstrumentationTest; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.Scope; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.logging.LoggingConfiguration; +import co.elastic.apm.agent.AbstractInstrumentationTest; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.Scope; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.logging.LoggingConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.MDC; diff --git a/apm-agent-plugins/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateInstrumentation.java b/apm-agent-plugins/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateInstrumentation.java index b0b2b54182..1a098a8334 100644 --- a/apm-agent-plugins/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateInstrumentation.java +++ b/apm-agent-plugins/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateInstrumentation.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.resttemplate; +package co.elastic.apm.agent.resttemplate; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.http.client.HttpClientHelper; -import co.elastic.apm.impl.transaction.AbstractSpan; -import co.elastic.apm.impl.transaction.Span; -import co.elastic.apm.impl.transaction.TraceContext; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.http.client.HttpClientHelper; +import co.elastic.apm.agent.impl.transaction.AbstractSpan; +import co.elastic.apm.agent.impl.transaction.Span; +import co.elastic.apm.agent.impl.transaction.TraceContext; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; @@ -36,7 +36,7 @@ import java.util.Collection; import java.util.Objects; -import static co.elastic.apm.http.client.HttpClientHelper.HTTP_CLIENT_SPAN_TYPE_PREFIX; +import static co.elastic.apm.agent.http.client.HttpClientHelper.HTTP_CLIENT_SPAN_TYPE_PREFIX; import static net.bytebuddy.matcher.ElementMatchers.declaresMethod; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; diff --git a/apm-agent-plugins/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/package-info.java b/apm-agent-plugins/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/package-info.java index 7f2c59c684..87fe20a27e 100644 --- a/apm-agent-plugins/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/package-info.java +++ b/apm-agent-plugins/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.resttemplate; +package co.elastic.apm.agent.resttemplate; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-spring-resttemplate-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation b/apm-agent-plugins/apm-spring-resttemplate-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation index cba17a25a2..c7c1c27ca0 100644 --- a/apm-agent-plugins/apm-spring-resttemplate-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation +++ b/apm-agent-plugins/apm-spring-resttemplate-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation @@ -1 +1 @@ -co.elastic.apm.resttemplate.SpringRestTemplateInstrumentation +co.elastic.apm.agent.resttemplate.SpringRestTemplateInstrumentation diff --git a/apm-agent-plugins/apm-spring-resttemplate-plugin/src/test/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateInstrumentationTest.java b/apm-agent-plugins/apm-spring-resttemplate-plugin/src/test/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateInstrumentationTest.java index e17ff97649..c5e782234e 100644 --- a/apm-agent-plugins/apm-spring-resttemplate-plugin/src/test/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateInstrumentationTest.java +++ b/apm-agent-plugins/apm-spring-resttemplate-plugin/src/test/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateInstrumentationTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.resttemplate; +package co.elastic.apm.agent.resttemplate; -import co.elastic.apm.httpclient.AbstractHttpClientInstrumentationTest; +import co.elastic.apm.agent.httpclient.AbstractHttpClientInstrumentationTest; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.springframework.http.client.ClientHttpRequestFactory; diff --git a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/spring/webmvc/SpringTransactionNameInstrumentation.java b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/spring/webmvc/SpringTransactionNameInstrumentation.java index db5140ee6b..8516855939 100644 --- a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/spring/webmvc/SpringTransactionNameInstrumentation.java +++ b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/spring/webmvc/SpringTransactionNameInstrumentation.java @@ -17,11 +17,11 @@ * limitations under the License. * #L% */ -package co.elastic.apm.spring.webmvc; +package co.elastic.apm.agent.spring.webmvc; -import co.elastic.apm.bci.ElasticApmInstrumentation; -import co.elastic.apm.bci.VisibleForAdvice; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.bci.ElasticApmInstrumentation; +import co.elastic.apm.agent.bci.VisibleForAdvice; +import co.elastic.apm.agent.impl.transaction.Transaction; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/spring/webmvc/package-info.java b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/spring/webmvc/package-info.java index 75b92a4482..1f3284d95d 100644 --- a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/spring/webmvc/package-info.java +++ b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/spring/webmvc/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.spring.webmvc; +package co.elastic.apm.agent.spring.webmvc; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation index 124d11b210..910c9b603c 100644 --- a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation +++ b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.bci.ElasticApmInstrumentation @@ -1 +1 @@ -co.elastic.apm.spring.webmvc.SpringTransactionNameInstrumentation +co.elastic.apm.agent.spring.webmvc.SpringTransactionNameInstrumentation diff --git a/apm-agent-plugins/apm-spring-webmvc-plugin/src/test/java/co/elastic/apm/agent/spring/webmvc/ApmHandlerInterceptorTest.java b/apm-agent-plugins/apm-spring-webmvc-plugin/src/test/java/co/elastic/apm/agent/spring/webmvc/ApmHandlerInterceptorTest.java index f2e5bc65f5..6a85d36e15 100644 --- a/apm-agent-plugins/apm-spring-webmvc-plugin/src/test/java/co/elastic/apm/agent/spring/webmvc/ApmHandlerInterceptorTest.java +++ b/apm-agent-plugins/apm-spring-webmvc-plugin/src/test/java/co/elastic/apm/agent/spring/webmvc/ApmHandlerInterceptorTest.java @@ -17,14 +17,14 @@ * limitations under the License. * #L% */ -package co.elastic.apm.spring.webmvc; +package co.elastic.apm.agent.spring.webmvc; -import co.elastic.apm.bci.ElasticApmAgent; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.ElasticApmTracerBuilder; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.servlet.ServletInstrumentation; +import co.elastic.apm.agent.bci.ElasticApmAgent; +import co.elastic.apm.agent.configuration.SpyConfiguration; +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.servlet.ServletInstrumentation; import net.bytebuddy.agent.ByteBuddyAgent; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/BodyProcessor.java b/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/BodyProcessor.java index d1769b27f9..b4a2ab2c92 100644 --- a/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/BodyProcessor.java +++ b/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/BodyProcessor.java @@ -17,20 +17,20 @@ * limitations under the License. * #L% */ -package co.elastic.apm.web; +package co.elastic.apm.agent.web; -import co.elastic.apm.impl.context.TransactionContext; -import co.elastic.apm.impl.context.Request; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.report.processor.Processor; +import co.elastic.apm.agent.impl.context.TransactionContext; +import co.elastic.apm.agent.impl.context.Request; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.report.processor.Processor; import org.stagemonitor.configuration.ConfigurationRegistry; import javax.annotation.Nullable; -import static co.elastic.apm.web.WebConfiguration.EventType.ALL; -import static co.elastic.apm.web.WebConfiguration.EventType.ERRORS; -import static co.elastic.apm.web.WebConfiguration.EventType.TRANSACTIONS; +import static co.elastic.apm.agent.web.WebConfiguration.EventType.ALL; +import static co.elastic.apm.agent.web.WebConfiguration.EventType.ERRORS; +import static co.elastic.apm.agent.web.WebConfiguration.EventType.TRANSACTIONS; /** * This processor redacts the body according to the {@link WebConfiguration#captureBody} configuration option diff --git a/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/ClientIpUtils.java b/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/ClientIpUtils.java index 35676f30cb..49cc27db18 100644 --- a/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/ClientIpUtils.java +++ b/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/ClientIpUtils.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.web; +package co.elastic.apm.agent.web; -import co.elastic.apm.util.PotentiallyMultiValuedMap; +import co.elastic.apm.agent.util.PotentiallyMultiValuedMap; import javax.annotation.Nullable; diff --git a/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/ResultUtil.java b/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/ResultUtil.java index fc5dbafb82..3f5058cf7a 100644 --- a/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/ResultUtil.java +++ b/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/ResultUtil.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.web; +package co.elastic.apm.agent.web; import javax.annotation.Nullable; diff --git a/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/SanitizingWebProcessor.java b/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/SanitizingWebProcessor.java index ca65cbb344..e5a5f88d00 100644 --- a/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/SanitizingWebProcessor.java +++ b/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/SanitizingWebProcessor.java @@ -17,16 +17,16 @@ * limitations under the License. * #L% */ -package co.elastic.apm.web; +package co.elastic.apm.agent.web; -import co.elastic.apm.configuration.CoreConfiguration; -import co.elastic.apm.impl.context.Request; -import co.elastic.apm.impl.context.TransactionContext; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.matcher.WildcardMatcher; -import co.elastic.apm.report.processor.Processor; -import co.elastic.apm.util.PotentiallyMultiValuedMap; +import co.elastic.apm.agent.configuration.CoreConfiguration; +import co.elastic.apm.agent.impl.context.Request; +import co.elastic.apm.agent.impl.context.TransactionContext; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.transaction.Transaction; +import co.elastic.apm.agent.matcher.WildcardMatcher; +import co.elastic.apm.agent.report.processor.Processor; +import co.elastic.apm.agent.util.PotentiallyMultiValuedMap; import org.stagemonitor.configuration.ConfigurationRegistry; import javax.annotation.Nullable; diff --git a/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/WebConfiguration.java b/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/WebConfiguration.java index 4cdf2e095f..3c9302ee82 100644 --- a/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/WebConfiguration.java +++ b/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/WebConfiguration.java @@ -17,10 +17,10 @@ * limitations under the License. * #L% */ -package co.elastic.apm.web; +package co.elastic.apm.agent.web; -import co.elastic.apm.matcher.WildcardMatcher; -import co.elastic.apm.matcher.WildcardMatcherValueConverter; +import co.elastic.apm.agent.matcher.WildcardMatcher; +import co.elastic.apm.agent.matcher.WildcardMatcherValueConverter; import org.stagemonitor.configuration.ConfigurationOption; import org.stagemonitor.configuration.ConfigurationOptionProvider; import org.stagemonitor.configuration.converter.ListValueConverter; diff --git a/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/package-info.java b/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/package-info.java index 7fc272012c..12d523045d 100644 --- a/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/package-info.java +++ b/apm-agent-plugins/apm-web-plugin/src/main/java/co/elastic/apm/agent/web/package-info.java @@ -18,6 +18,6 @@ * #L% */ @NonnullApi -package co.elastic.apm.web; +package co.elastic.apm.agent.web; -import co.elastic.apm.annotation.NonnullApi; +import co.elastic.apm.agent.annotation.NonnullApi; diff --git a/apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/NOTICE b/apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/NOTICE index a0c961fdbc..c8aa9f8e74 100644 --- a/apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/NOTICE +++ b/apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/NOTICE @@ -1,2 +1,2 @@ This product includes software from stagemonitor, -under the Apache License 2.0 (see: co.elastic.apm.web.ClientIpUtils) +under the Apache License 2.0 (see: co.elastic.apm.agent.web.ClientIpUtils) diff --git a/apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.report.processor.Processor b/apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.report.processor.Processor index 99a55ab283..d3a4fd4085 100644 --- a/apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.report.processor.Processor +++ b/apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.report.processor.Processor @@ -1,2 +1,2 @@ -co.elastic.apm.web.BodyProcessor -co.elastic.apm.web.SanitizingWebProcessor +co.elastic.apm.agent.web.BodyProcessor +co.elastic.apm.agent.web.SanitizingWebProcessor diff --git a/apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/services/org.stagemonitor.configuration.ConfigurationOptionProvider b/apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/services/org.stagemonitor.configuration.ConfigurationOptionProvider index 990f7c7ed5..157f037d9b 100644 --- a/apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/services/org.stagemonitor.configuration.ConfigurationOptionProvider +++ b/apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/services/org.stagemonitor.configuration.ConfigurationOptionProvider @@ -1 +1 @@ -co.elastic.apm.web.WebConfiguration +co.elastic.apm.agent.web.WebConfiguration diff --git a/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/BodyProcessorTest.java b/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/BodyProcessorTest.java index dcf3187ce8..56a194f97d 100644 --- a/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/BodyProcessorTest.java +++ b/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/BodyProcessorTest.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.web; +package co.elastic.apm.agent.web; -import co.elastic.apm.MockTracer; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.MockTracer; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.transaction.Transaction; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.stagemonitor.configuration.ConfigurationRegistry; diff --git a/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/ClientIpUtilsTest.java b/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/ClientIpUtilsTest.java index 19a13e0479..445df32ae1 100644 --- a/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/ClientIpUtilsTest.java +++ b/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/ClientIpUtilsTest.java @@ -17,9 +17,9 @@ * limitations under the License. * #L% */ -package co.elastic.apm.web; +package co.elastic.apm.agent.web; -import co.elastic.apm.util.PotentiallyMultiValuedMap; +import co.elastic.apm.agent.util.PotentiallyMultiValuedMap; import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/ResultUtilTest.java b/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/ResultUtilTest.java index 657533156e..1e68ff9b7f 100644 --- a/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/ResultUtilTest.java +++ b/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/ResultUtilTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.web; +package co.elastic.apm.agent.web; import org.junit.jupiter.api.Test; diff --git a/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/SanitizingWebProcessorTest.java b/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/SanitizingWebProcessorTest.java index fb7a8714f6..74f7d6bdb7 100644 --- a/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/SanitizingWebProcessorTest.java +++ b/apm-agent-plugins/apm-web-plugin/src/test/java/co/elastic/apm/agent/web/SanitizingWebProcessorTest.java @@ -17,13 +17,13 @@ * limitations under the License. * #L% */ -package co.elastic.apm.web; +package co.elastic.apm.agent.web; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.context.TransactionContext; -import co.elastic.apm.impl.error.ErrorCapture; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.context.TransactionContext; +import co.elastic.apm.agent.impl.error.ErrorCapture; +import co.elastic.apm.agent.impl.transaction.Transaction; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmScope.java b/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmScope.java index ac938132e6..3d1009f560 100644 --- a/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmScope.java +++ b/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmScope.java @@ -40,7 +40,7 @@ public void close() { } private void release(Object span, Object traceContext) { - // implementation is injected at runtime via co.elastic.apm.opentracing.impl.ApmScopeInstrumentation + // implementation is injected at runtime via co.elastic.apm.agent.opentracing.impl.ApmScopeInstrumentation } @Override diff --git a/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmScopeManager.java b/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmScopeManager.java index eca8c81979..5580d76459 100644 --- a/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmScopeManager.java +++ b/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmScopeManager.java @@ -45,7 +45,7 @@ public ApmScope activate(@Nonnull Span span, boolean finishSpanOnClose) { } private void doActivate(@Nullable Object span, Object traceContext) { - // implementation is injected at runtime via co.elastic.apm.opentracing.impl.ScopeManagerInstrumentation + // implementation is injected at runtime via co.elastic.apm.agent.opentracing.impl.ScopeManagerInstrumentation } @Override @@ -65,13 +65,13 @@ public ApmScope active() { @Nullable private Object getCurrentSpan() { - // implementation is injected at runtime via co.elastic.apm.opentracing.impl.ScopeManagerInstrumentation + // implementation is injected at runtime via co.elastic.apm.agent.opentracing.impl.ScopeManagerInstrumentation return null; } @Nullable private Object getCurrentTraceContext() { - // implementation is injected at runtime via co.elastic.apm.opentracing.impl.ScopeManagerInstrumentation + // implementation is injected at runtime via co.elastic.apm.agent.opentracing.impl.ScopeManagerInstrumentation return null; } } diff --git a/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmSpan.java b/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmSpan.java index e0480d26ae..a1bfe73134 100644 --- a/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmSpan.java +++ b/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmSpan.java @@ -32,7 +32,7 @@ class ApmSpan implements Span { @Nullable private final TraceContextSpanContext spanContext; @Nullable - // co.elastic.apm.impl.transaction.AbstractSpan in case of unfinished spans + // co.elastic.apm.agent.impl.transaction.AbstractSpan in case of unfinished spans private Object dispatcher; ApmSpan(@Nullable Object dispatcher) { @@ -46,7 +46,7 @@ class ApmSpan implements Span { @Nullable private Object getTraceContext(@Nullable Object dispatcher) { - // co.elastic.apm.opentracing.impl.ApmSpanInstrumentation$GetTraceContextInstrumentation + // co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation$GetTraceContextInstrumentation return null; } @@ -75,7 +75,7 @@ public ApmSpan setTag(String key, Number value) { @Override public ApmSpan setOperationName(String operationName) { - // co.elastic.apm.opentracing.impl.ApmSpanInstrumentation$SetOperationName + // co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation$SetOperationName return this; } @@ -98,7 +98,7 @@ public void finish(long finishMicros) { } private void finishInternal(long finishMicros) { - // implementation injected at runtime by co.elastic.apm.opentracing.impl.ApmSpanInstrumentation.FinishInstrumentation.finishInternal + // implementation injected at runtime by co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation.FinishInstrumentation.finishInternal } @Nullable @@ -125,7 +125,7 @@ public ApmSpan log(long timestampMicroseconds, String event) { @Override public ApmSpan log(long timestampMicroseconds, Map fields) { - // co.elastic.apm.opentracing.impl.ApmSpanInstrumentation.LogInstrumentation + // co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation.LogInstrumentation return this; } @@ -146,7 +146,7 @@ public String getBaggageItem(String key) { } private void handleTag(String key, @Nullable Object value) { - // implementation injected at runtime by co.elastic.apm.opentracing.impl.ApmSpanInstrumentation.TagInstrumentation.handleTag + // implementation injected at runtime by co.elastic.apm.agent.opentracing.impl.ApmSpanInstrumentation.TagInstrumentation.handleTag } @Override diff --git a/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmSpanBuilder.java b/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmSpanBuilder.java index 80e0463c30..553ea726ad 100644 --- a/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmSpanBuilder.java +++ b/apm-opentracing/src/main/java/co/elastic/apm/opentracing/ApmSpanBuilder.java @@ -32,7 +32,7 @@ class ApmSpanBuilder implements Tracer.SpanBuilder { @Nullable private final String operationName; - // co.elastic.apm.impl.ElasticApmTracer + // co.elastic.apm.agent.impl.ElasticApmTracer private final Map tags = new HashMap<>(); private final ApmScopeManager scopeManager; @@ -132,7 +132,7 @@ private ApmSpan startApmSpan() { @Nullable private Object createSpan(Object apmParent, Iterable> baggage) { - // co.elastic.apm.opentracing.impl.ApmSpanBuilderInstrumentation.CreateSpanInstrumentation.createSpan + // co.elastic.apm.agent.opentracing.impl.ApmSpanBuilderInstrumentation.CreateSpanInstrumentation.createSpan return null; } diff --git a/apm-opentracing/src/main/java/co/elastic/apm/opentracing/TraceContextSpanContext.java b/apm-opentracing/src/main/java/co/elastic/apm/opentracing/TraceContextSpanContext.java index aa4d9506b6..9e91bb3125 100644 --- a/apm-opentracing/src/main/java/co/elastic/apm/opentracing/TraceContextSpanContext.java +++ b/apm-opentracing/src/main/java/co/elastic/apm/opentracing/TraceContextSpanContext.java @@ -25,7 +25,7 @@ public class TraceContextSpanContext implements ApmSpanContext { - // co.elastic.apm.impl.transaction.TraceContext + // co.elastic.apm.agent.impl.transaction.TraceContext @Nullable private final Object traceContext; diff --git a/apm-opentracing/src/test/java/co/elastic/apm/opentracing/OpenTracingBridgeTest.java b/apm-opentracing/src/test/java/co/elastic/apm/opentracing/OpenTracingBridgeTest.java index 5badc2da44..960fce32fc 100644 --- a/apm-opentracing/src/test/java/co/elastic/apm/opentracing/OpenTracingBridgeTest.java +++ b/apm-opentracing/src/test/java/co/elastic/apm/opentracing/OpenTracingBridgeTest.java @@ -19,9 +19,9 @@ */ package co.elastic.apm.opentracing; -import co.elastic.apm.AbstractInstrumentationTest; -import co.elastic.apm.impl.transaction.TraceContext; -import co.elastic.apm.impl.transaction.Transaction; +import co.elastic.apm.agent.AbstractInstrumentationTest; +import co.elastic.apm.agent.impl.transaction.TraceContext; +import co.elastic.apm.agent.impl.transaction.Transaction; import io.opentracing.Scope; import io.opentracing.Span; import io.opentracing.SpanContext; @@ -201,8 +201,8 @@ void testCreateActiveTransactionAndSpans() { assertThat(reporter.getTransactions()).hasSize(1); final Transaction transaction = reporter.getFirstTransaction(); - final co.elastic.apm.impl.transaction.Span span = reporter.getSpans().get(1); - final co.elastic.apm.impl.transaction.Span nestedSpan = reporter.getSpans().get(0); + final co.elastic.apm.agent.impl.transaction.Span span = reporter.getSpans().get(1); + final co.elastic.apm.agent.impl.transaction.Span nestedSpan = reporter.getSpans().get(0); assertThat(transaction.getDuration()).isGreaterThan(0); assertThat(transaction.getName().toString()).isEqualTo("transaction"); assertThat(reporter.getSpans()).hasSize(2); @@ -396,7 +396,7 @@ private Transaction createTransactionFromOtTags(Map tags) { return transaction; } - private co.elastic.apm.impl.transaction.Span createSpanFromOtTags(Map tags) { + private co.elastic.apm.agent.impl.transaction.Span createSpanFromOtTags(Map tags) { final Tracer.SpanBuilder transactionSpanBuilder = apmTracer.buildSpan("transaction"); try (Scope transaction = transactionSpanBuilder.startActive(true)) { final Tracer.SpanBuilder spanBuilder = apmTracer.buildSpan("transaction"); @@ -405,7 +405,7 @@ private co.elastic.apm.impl.transaction.Span createSpanFromOtTags(Map 4.0.0 - co.elastic.apm.bci.AgentMain + co.elastic.apm.agent.bci.AgentMain @@ -73,10 +73,10 @@ simplelogger.properties elasticapmlogger.properties - + java.util.logging.Logger - co.elastic.apm.logging.JulBridgeLogger + co.elastic.apm.agent.logging.JulBridgeLogger com.blogspot.mydailyjava.weaklockfree diff --git a/elastic-apm-agent/src/test/java/co/elastic/apm/agent/configuration/ConfigurationExporterTest.java b/elastic-apm-agent/src/test/java/co/elastic/apm/agent/configuration/ConfigurationExporterTest.java index 3fb7b3c824..5360391379 100644 --- a/elastic-apm-agent/src/test/java/co/elastic/apm/agent/configuration/ConfigurationExporterTest.java +++ b/elastic-apm-agent/src/test/java/co/elastic/apm/agent/configuration/ConfigurationExporterTest.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package co.elastic.apm.configuration; +package co.elastic.apm.agent.configuration; import freemarker.template.Configuration; import freemarker.template.Template; diff --git a/integration-tests/simple-webapp-integration-test/src/test/java/co/elastic/apm/servlet/AbstractServletContainerIntegrationTest.java b/integration-tests/simple-webapp-integration-test/src/test/java/co/elastic/apm/servlet/AbstractServletContainerIntegrationTest.java index ea8d3a38f9..95a9292fb4 100644 --- a/integration-tests/simple-webapp-integration-test/src/test/java/co/elastic/apm/servlet/AbstractServletContainerIntegrationTest.java +++ b/integration-tests/simple-webapp-integration-test/src/test/java/co/elastic/apm/servlet/AbstractServletContainerIntegrationTest.java @@ -19,7 +19,7 @@ */ package co.elastic.apm.servlet; -import co.elastic.apm.MockReporter; +import co.elastic.apm.agent.MockReporter; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.networknt.schema.JsonSchema; @@ -55,7 +55,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import static co.elastic.apm.report.IntakeV2ReportingEventHandler.INTAKE_V2_URL; +import static co.elastic.apm.agent.report.IntakeV2ReportingEventHandler.INTAKE_V2_URL; import static org.assertj.core.api.Assertions.assertThat; import static org.mockserver.model.HttpRequest.request; diff --git a/integration-tests/simple-webapp-integration-test/src/test/java/co/elastic/apm/servlet/MockServerContainer.java b/integration-tests/simple-webapp-integration-test/src/test/java/co/elastic/apm/servlet/MockServerContainer.java index 04254dbf46..137acfac5c 100644 --- a/integration-tests/simple-webapp-integration-test/src/test/java/co/elastic/apm/servlet/MockServerContainer.java +++ b/integration-tests/simple-webapp-integration-test/src/test/java/co/elastic/apm/servlet/MockServerContainer.java @@ -27,7 +27,7 @@ /** * Acts as a mock for the APM-server. - * It stores the {@link co.elastic.apm.impl.payload.Payload}s sent to it, + * It stores the {@link co.elastic.apm.agent.impl.payload.Payload}s sent to it, * which can be retrieved via the {@link #client}. */ public class MockServerContainer extends GenericContainer { diff --git a/integration-tests/spring-boot-1-5/src/test/java/co/elastic/apm/spring/boot/SpringBoot1_5IT.java b/integration-tests/spring-boot-1-5/src/test/java/co/elastic/apm/spring/boot/SpringBoot1_5IT.java index 6eda6ee75d..c97fb1c61b 100644 --- a/integration-tests/spring-boot-1-5/src/test/java/co/elastic/apm/spring/boot/SpringBoot1_5IT.java +++ b/integration-tests/spring-boot-1-5/src/test/java/co/elastic/apm/spring/boot/SpringBoot1_5IT.java @@ -19,13 +19,13 @@ */ package co.elastic.apm.spring.boot; -import co.elastic.apm.MockReporter; -import co.elastic.apm.bci.ElasticApmAgent; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.ElasticApmTracerBuilder; -import co.elastic.apm.report.ReporterConfiguration; -import co.elastic.apm.web.WebConfiguration; +import co.elastic.apm.agent.MockReporter; +import co.elastic.apm.agent.bci.ElasticApmAgent; +import co.elastic.apm.agent.configuration.SpyConfiguration; +import co.elastic.apm.agent.impl.ElasticApmTracer; +import co.elastic.apm.agent.impl.ElasticApmTracerBuilder; +import co.elastic.apm.agent.report.ReporterConfiguration; +import co.elastic.apm.agent.web.WebConfiguration; import net.bytebuddy.agent.ByteBuddyAgent; import org.junit.After; import org.junit.Before; diff --git a/integration-tests/spring-boot-2/spring-boot-2-base/src/test/java/co/elastic/apm/spring/boot/AbstractSpringBootTest.java b/integration-tests/spring-boot-2/spring-boot-2-base/src/test/java/co/elastic/apm/spring/boot/AbstractSpringBootTest.java index 04937fb131..dbd83d7e5d 100644 --- a/integration-tests/spring-boot-2/spring-boot-2-base/src/test/java/co/elastic/apm/spring/boot/AbstractSpringBootTest.java +++ b/integration-tests/spring-boot-2/spring-boot-2-base/src/test/java/co/elastic/apm/spring/boot/AbstractSpringBootTest.java @@ -19,15 +19,15 @@ */ package co.elastic.apm.spring.boot; -import co.elastic.apm.MockReporter; +import co.elastic.apm.agent.MockReporter; import co.elastic.apm.api.ElasticApm; -import co.elastic.apm.bci.ElasticApmAgent; -import co.elastic.apm.configuration.SpyConfiguration; -import co.elastic.apm.impl.ElasticApmTracer; -import co.elastic.apm.impl.ElasticApmTracerBuilder; -import co.elastic.apm.impl.transaction.Transaction; -import co.elastic.apm.report.ReporterConfiguration; -import co.elastic.apm.web.WebConfiguration; +import co.elastic.apm.agent.bci.ElasticApmAgent; +import co.elastic.apm.agent.configuration.SpyConfiguration; +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.report.ReporterConfiguration; +import co.elastic.apm.agent.web.WebConfiguration; import net.bytebuddy.agent.ByteBuddyAgent; import org.junit.After; import org.junit.Before;