From b28ae3dfa824d09917661a2f3b86c9a409d16715 Mon Sep 17 00:00:00 2001 From: Rafael Winterhalter Date: Wed, 22 Feb 2023 21:22:54 +0100 Subject: [PATCH] #3030: Rename module for tracer API and depend SDK module on API. Add a new tracer aware plugin class that uses the tracer API only. --- apm-agent-plugin-sdk/pom.xml | 5 ++ .../agent/sdk/TracerAwareInstrumentation.java | 27 +++++++ .../v3/HttpClient3Instrumentation.java | 2 +- .../BaseApacheHttpClientInstrumentation.java | 2 +- .../agent/pluginapi/ApiInstrumentation.java | 2 +- .../pluginapi/CaptureSpanInstrumentation.java | 2 +- .../CaptureTransactionInstrumentation.java | 2 +- .../pluginapi/TracedInstrumentation.java | 2 +- .../pluginapi/TransactionInstrumentation.java | 2 +- ...bstractAsyncHttpClientInstrumentation.java | 2 +- ...MessagingClientWrapperInstrumentation.java | 2 +- ...BaseAsyncClientHandlerInstrumentation.java | 2 +- .../BaseSyncClientHandlerInstrumentation.java | 2 +- .../awssdk/v2/GetMessagesInstrumentation.java | 2 +- .../common/AbstractAwsSdkInstrumentation.java | 2 +- ...stractAwsLambdaHandlerInstrumentation.java | 2 +- .../cassandra3/Cassandra3Instrumentation.java | 2 +- .../cassandra4/Cassandra4Instrumentation.java | 2 +- .../dubbo/AbstractDubboInstrumentation.java | 2 +- .../AbstractLog4j2ServiceInstrumentation.java | 2 +- .../JulEcsFormatterInstrumentation.java | 2 +- ...lasticsearchRestClientInstrumentation.java | 2 +- ...eExceptionSourceFilterInstrumentation.java | 2 +- ...naglePayloadSizeFilterInstrumentation.java | 2 +- .../FinagleTlsFilterInstrumentation.java | 2 +- .../GrailsTransactionNameInstrumentation.java | 2 +- .../apm/agent/grpc/BaseInstrumentation.java | 2 +- .../v5/HibernateSearch5Instrumentation.java | 2 +- .../HibernateSearch6Instrumentation.java | 2 +- .../BaseServerEndpointInstrumentation.java | 2 +- .../concurrent/ExecutorInstrumentation.java | 2 +- .../ForkJoinTaskInstrumentation.java | 2 +- ...leCallableForkJoinTaskInstrumentation.java | 2 +- .../apm/agent/java_ldap/LdapClientAdvice.java | 70 +++++++++---------- .../java_ldap/LdapClientInstrumentation.java | 2 +- .../JavalinHandlerLambdaInstrumentation.java | 2 +- .../agent/javalin/JavalinInstrumentation.java | 2 +- .../javalin/JavalinRenderInstrumentation.java | 2 +- .../JaxRsTransactionNameInstrumentation.java | 2 +- .../JaxWsTransactionNameInstrumentation.java | 2 +- .../apm/agent/jdbc/JdbcInstrumentation.java | 2 +- .../AbstractHttpClientInstrumentation.java | 2 +- .../JdkHttpServerInstrumentation.java | 2 +- .../apm/agent/jms/BaseJmsInstrumentation.java | 2 +- .../AbstractJsfLifecycleInstrumentation.java | 2 +- .../agent/kafka/BaseKafkaInstrumentation.java | 2 +- ...sLogManagerCorrelationInstrumentation.java | 2 +- ...BossLoggingCorrelationInstrumentation.java | 2 +- .../Log4j1LogCorrelationInstrumentation.java | 2 +- .../Log4j2LogCorrelationInstrumentation.java | 2 +- .../LogbackLogCorrelationInstrumentation.java | 2 +- ...AbstractLogIntegrationInstrumentation.java | 2 +- ...ctLoggerErrorCapturingInstrumentation.java | 2 - .../AbstractMicrometerInstrumentation.java | 2 +- .../mongodb/v3/Mongo3Instrumentation.java | 2 +- .../mongodb/v4/Mongo4Instrumentation.java | 2 +- .../AbstractOkHttp3ClientInstrumentation.java | 2 +- .../AbstractOkHttpClientInstrumentation.java | 2 +- .../AbstractOpenTelemetryInstrumentation.java | 2 +- .../process/BaseProcessInstrumentation.java | 2 +- .../CommonsExecAsyncInstrumentation.java | 2 +- ...ractJobTransactionNameInstrumentation.java | 2 +- .../rabbitmq/AbstractBaseInstrumentation.java | 2 +- .../agent/reactor/ReactorInstrumentation.java | 2 +- .../jedis/JedisConnectionInstrumentation.java | 2 +- .../lettuce/Lettuce34Instrumentation.java | 2 +- .../Lettuce5StartSpanInstrumentation.java | 2 +- .../Lettuce5StopSpanInstrumentation.java | 2 +- .../RedisConnectionInstrumentation.java | 2 +- .../FutureInstrumentation.java | 2 +- ...heduledTransactionNameInstrumentation.java | 2 +- .../scheduled/TimerTaskInstrumentation.java | 2 +- .../AbstractServletInstrumentation.java | 2 +- .../sparkjava/RoutesInstrumentation.java | 2 +- .../SpringRestTemplateAdvice.java | 2 +- .../SpringRestTemplateInstrumentation.java | 2 +- ...ClientExchangeFunctionInstrumentation.java | 2 +- .../springwebflux/WebFluxInstrumentation.java | 2 +- .../ExceptionHandlerInstrumentation.java | 2 +- ...trollerTransactionNameInstrumentation.java | 2 +- .../SpringServiceNameInstrumentation.java | 2 +- .../SpringTransactionNameInstrumentation.java | 2 +- .../ViewRenderInstrumentation.java | 2 +- .../agent/struts/StrutsInstrumentation.java | 2 +- .../HttpUrlConnectionInstrumentation.java | 2 +- .../SSLContextInstrumentation.java | 2 +- .../agent/vertx/v3/Vertx3Instrumentation.java | 2 +- .../agent/vertx/v4/Vertx4Instrumentation.java | 2 +- .../pom.xml | 9 +-- .../apm/plugin/spi/AbstractContext.java | 0 .../apm/plugin/spi/AbstractHeaderGetter.java | 0 .../elastic/apm/plugin/spi/AbstractSpan.java | 0 .../co/elastic/apm/plugin/spi/Allocator.java | 0 .../apm/plugin/spi/BinaryHeaderGetter.java | 0 .../apm/plugin/spi/BinaryHeaderSetter.java | 0 .../apm/plugin/spi/ChildContextCreator.java | 0 .../java/co/elastic/apm/plugin/spi/Cloud.java | 0 .../elastic/apm/plugin/spi/CloudOrigin.java | 0 .../apm/plugin/spi/CoreConfiguration.java | 0 .../java/co/elastic/apm/plugin/spi/Db.java | 0 .../apm/plugin/spi/DefaultOutcome.java | 0 .../elastic/apm/plugin/spi/Destination.java | 0 .../apm/plugin/spi/DisabledObjectPool.java | 0 .../plugin/spi/DisabledObjectPoolFactory.java | 0 .../apm/plugin/spi/ElasticContext.java | 0 .../co/elastic/apm/plugin/spi/EmptyCloud.java | 0 .../apm/plugin/spi/EmptyCloudOrigin.java | 0 .../plugin/spi/EmptyCoreConfiguration.java | 0 .../co/elastic/apm/plugin/spi/EmptyDb.java | 0 .../apm/plugin/spi/EmptyDestination.java | 0 .../co/elastic/apm/plugin/spi/EmptyFaas.java | 0 .../co/elastic/apm/plugin/spi/EmptyHttp.java | 0 .../elastic/apm/plugin/spi/EmptyMessage.java | 0 .../spi/EmptyMessagingConfiguration.java | 0 .../spi/EmptyPotentiallyMultiValuedMap.java | 0 .../elastic/apm/plugin/spi/EmptyRequest.java | 0 .../elastic/apm/plugin/spi/EmptyResponse.java | 0 .../elastic/apm/plugin/spi/EmptySocket.java | 0 .../spi/EmptyStacktraceConfiguration.java | 0 .../co/elastic/apm/plugin/spi/EmptyUrl.java | 0 .../co/elastic/apm/plugin/spi/EmptyUser.java | 0 .../apm/plugin/spi/EmptyWebConfiguration.java | 0 .../elastic/apm/plugin/spi/ErrorCapture.java | 0 .../java/co/elastic/apm/plugin/spi/Faas.java | 0 .../elastic/apm/plugin/spi/GlobalTracer.java | 0 .../plugin/spi/HeaderChildContextCreator.java | 0 .../elastic/apm/plugin/spi/HeaderGetter.java | 0 .../elastic/apm/plugin/spi/HeaderRemover.java | 0 .../elastic/apm/plugin/spi/HeaderSetter.java | 0 .../java/co/elastic/apm/plugin/spi/Http.java | 0 .../java/co/elastic/apm/plugin/spi/Id.java | 0 .../co/elastic/apm/plugin/spi/Message.java | 0 .../plugin/spi/MessagingConfiguration.java | 0 .../co/elastic/apm/plugin/spi/NoopTracer.java | 0 .../co/elastic/apm/plugin/spi/ObjectPool.java | 0 .../apm/plugin/spi/ObjectPoolFactory.java | 0 .../co/elastic/apm/plugin/spi/Outcome.java | 0 .../plugin/spi/PotentiallyMultiValuedMap.java | 0 .../co/elastic/apm/plugin/spi/Recyclable.java | 0 .../co/elastic/apm/plugin/spi/Request.java | 0 .../co/elastic/apm/plugin/spi/Response.java | 0 .../co/elastic/apm/plugin/spi/ResultUtil.java | 0 .../java/co/elastic/apm/plugin/spi/Scope.java | 0 .../elastic/apm/plugin/spi/ServiceInfo.java | 0 .../elastic/apm/plugin/spi/ServiceTarget.java | 0 .../co/elastic/apm/plugin/spi/Socket.java | 0 .../java/co/elastic/apm/plugin/spi/Span.java | 0 .../elastic/apm/plugin/spi/SpanContext.java | 0 .../plugin/spi/StacktraceConfiguration.java | 0 .../elastic/apm/plugin/spi/StringUtils.java | 0 .../apm/plugin/spi/TextHeaderGetter.java | 0 .../apm/plugin/spi/TextHeaderSetter.java | 0 .../elastic/apm/plugin/spi/TraceContext.java | 0 .../apm/plugin/spi/TraceContextUtil.java | 0 .../co/elastic/apm/plugin/spi/Tracer.java | 0 .../elastic/apm/plugin/spi/Transaction.java | 0 .../apm/plugin/spi/TransactionContext.java | 0 .../java/co/elastic/apm/plugin/spi/Url.java | 0 .../java/co/elastic/apm/plugin/spi/User.java | 0 .../apm/plugin/spi/WebConfiguration.java | 0 .../apm/plugin/spi/WildcardMatcher.java | 0 .../apm/plugin/spi/WildcardMatcherUtil.java | 0 pom.xml | 2 +- 163 files changed, 153 insertions(+), 130 deletions(-) create mode 100644 apm-agent-plugin-sdk/src/main/java/co/elastic/apm/agent/sdk/TracerAwareInstrumentation.java rename {apm-agent-plugin-spi => apm-agent-tracer-api}/pom.xml (88%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/AbstractContext.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/AbstractHeaderGetter.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/AbstractSpan.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Allocator.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/BinaryHeaderGetter.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/BinaryHeaderSetter.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/ChildContextCreator.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Cloud.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/CloudOrigin.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/CoreConfiguration.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Db.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/DefaultOutcome.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Destination.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/DisabledObjectPool.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/DisabledObjectPoolFactory.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/ElasticContext.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyCloud.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyCloudOrigin.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyCoreConfiguration.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyDb.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyDestination.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyFaas.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyHttp.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyMessage.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyMessagingConfiguration.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyPotentiallyMultiValuedMap.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyRequest.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyResponse.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptySocket.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyStacktraceConfiguration.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyUrl.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyUser.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/EmptyWebConfiguration.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/ErrorCapture.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Faas.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/GlobalTracer.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/HeaderChildContextCreator.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/HeaderGetter.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/HeaderRemover.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/HeaderSetter.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Http.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Id.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Message.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/MessagingConfiguration.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/NoopTracer.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/ObjectPool.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/ObjectPoolFactory.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Outcome.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/PotentiallyMultiValuedMap.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Recyclable.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Request.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Response.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/ResultUtil.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Scope.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/ServiceInfo.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/ServiceTarget.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Socket.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Span.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/SpanContext.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/StacktraceConfiguration.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/StringUtils.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/TextHeaderGetter.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/TextHeaderSetter.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/TraceContext.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/TraceContextUtil.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Tracer.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Transaction.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/TransactionContext.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/Url.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/User.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/WebConfiguration.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/WildcardMatcher.java (100%) rename {apm-agent-plugin-spi => apm-agent-tracer-api}/src/main/java/co/elastic/apm/plugin/spi/WildcardMatcherUtil.java (100%) diff --git a/apm-agent-plugin-sdk/pom.xml b/apm-agent-plugin-sdk/pom.xml index fd3e1cb1d4..f0a6fa79b9 100644 --- a/apm-agent-plugin-sdk/pom.xml +++ b/apm-agent-plugin-sdk/pom.xml @@ -21,6 +21,11 @@ + + ${project.groupId} + apm-agent-tracer-api + ${project.version} + net.bytebuddy byte-buddy-dep diff --git a/apm-agent-plugin-sdk/src/main/java/co/elastic/apm/agent/sdk/TracerAwareInstrumentation.java b/apm-agent-plugin-sdk/src/main/java/co/elastic/apm/agent/sdk/TracerAwareInstrumentation.java new file mode 100644 index 0000000000..e4a0f71197 --- /dev/null +++ b/apm-agent-plugin-sdk/src/main/java/co/elastic/apm/agent/sdk/TracerAwareInstrumentation.java @@ -0,0 +1,27 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package co.elastic.apm.agent.sdk; + +import co.elastic.apm.plugin.spi.GlobalTracer; +import co.elastic.apm.plugin.spi.Tracer; + +public abstract class TracerAwareInstrumentation extends ElasticApmInstrumentation { + + public static final Tracer tracer = GlobalTracer.get(); +} diff --git a/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient3-plugin/src/main/java/co/elastic/apm/agent/httpclient/v3/HttpClient3Instrumentation.java b/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient3-plugin/src/main/java/co/elastic/apm/agent/httpclient/v3/HttpClient3Instrumentation.java index ecbab16d8d..474f9700ad 100644 --- a/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient3-plugin/src/main/java/co/elastic/apm/agent/httpclient/v3/HttpClient3Instrumentation.java +++ b/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient3-plugin/src/main/java/co/elastic/apm/agent/httpclient/v3/HttpClient3Instrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.httpclient.v3; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.httpclient.HttpClientHelper; import co.elastic.apm.plugin.spi.*; import co.elastic.apm.agent.sdk.logging.Logger; diff --git a/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient4-plugin/src/main/java/co/elastic/apm/agent/httpclient/v4/BaseApacheHttpClientInstrumentation.java b/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient4-plugin/src/main/java/co/elastic/apm/agent/httpclient/v4/BaseApacheHttpClientInstrumentation.java index d68d2c82c6..b62f895d11 100644 --- a/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient4-plugin/src/main/java/co/elastic/apm/agent/httpclient/v4/BaseApacheHttpClientInstrumentation.java +++ b/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient4-plugin/src/main/java/co/elastic/apm/agent/httpclient/v4/BaseApacheHttpClientInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.httpclient.v4; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.Arrays; import java.util.Collection; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/ApiInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/ApiInstrumentation.java index 7a759f26ea..be54ca0bbe 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/ApiInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/ApiInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.pluginapi; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.Collection; import java.util.Collections; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/CaptureSpanInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/CaptureSpanInstrumentation.java index fc217622b2..e0812f982b 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/CaptureSpanInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/CaptureSpanInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.pluginapi; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.bci.bytebuddy.AnnotationValueOffsetMappingFactory; import co.elastic.apm.agent.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory; import co.elastic.apm.agent.impl.ElasticApmTracer; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/CaptureTransactionInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/CaptureTransactionInstrumentation.java index bb993f4d62..a07fafc2cb 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/CaptureTransactionInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/CaptureTransactionInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.pluginapi; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; 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; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/TracedInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/TracedInstrumentation.java index a82517c88a..62a4a6a936 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/TracedInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/TracedInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.pluginapi; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.bci.bytebuddy.AnnotationValueOffsetMappingFactory; import co.elastic.apm.agent.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory; import co.elastic.apm.plugin.spi.*; diff --git a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/TransactionInstrumentation.java b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/TransactionInstrumentation.java index 9f3384feb1..12b646dc1c 100644 --- a/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/TransactionInstrumentation.java +++ b/apm-agent-plugins/apm-api-plugin/src/main/java/co/elastic/apm/agent/pluginapi/TransactionInstrumentation.java @@ -18,8 +18,8 @@ */ package co.elastic.apm.agent.pluginapi; -import co.elastic.apm.agent.configuration.ServiceInfo; import co.elastic.apm.plugin.spi.Id; +import co.elastic.apm.plugin.spi.ServiceInfo; import co.elastic.apm.plugin.spi.TraceContext; import co.elastic.apm.plugin.spi.Transaction; import net.bytebuddy.asm.Advice; diff --git a/apm-agent-plugins/apm-asynchttpclient-plugin/src/main/java/co/elastic/apm/agent/asynchttpclient/AbstractAsyncHttpClientInstrumentation.java b/apm-agent-plugins/apm-asynchttpclient-plugin/src/main/java/co/elastic/apm/agent/asynchttpclient/AbstractAsyncHttpClientInstrumentation.java index 6577f9c447..b4113b572b 100644 --- a/apm-agent-plugins/apm-asynchttpclient-plugin/src/main/java/co/elastic/apm/agent/asynchttpclient/AbstractAsyncHttpClientInstrumentation.java +++ b/apm-agent-plugins/apm-asynchttpclient-plugin/src/main/java/co/elastic/apm/agent/asynchttpclient/AbstractAsyncHttpClientInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.asynchttpclient; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.collections.WeakConcurrentProviderImpl; import co.elastic.apm.agent.httpclient.HttpClientHelper; import co.elastic.apm.plugin.spi.*; diff --git a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/AmazonSQSMessagingClientWrapperInstrumentation.java b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/AmazonSQSMessagingClientWrapperInstrumentation.java index f7a2fa5a85..99c282b56c 100644 --- a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/AmazonSQSMessagingClientWrapperInstrumentation.java +++ b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/AmazonSQSMessagingClientWrapperInstrumentation.java @@ -19,7 +19,7 @@ package co.elastic.apm.agent.awssdk.v2; import co.elastic.apm.agent.awssdk.v2.helper.sqs.wrapper.MessageListWrapper; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/BaseAsyncClientHandlerInstrumentation.java b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/BaseAsyncClientHandlerInstrumentation.java index a7429109d8..fbf3e78553 100644 --- a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/BaseAsyncClientHandlerInstrumentation.java +++ b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/BaseAsyncClientHandlerInstrumentation.java @@ -21,7 +21,7 @@ import co.elastic.apm.agent.awssdk.v2.helper.DynamoDbHelper; import co.elastic.apm.agent.awssdk.v2.helper.S3Helper; import co.elastic.apm.agent.awssdk.v2.helper.SQSHelper; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.Span; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; diff --git a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/BaseSyncClientHandlerInstrumentation.java b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/BaseSyncClientHandlerInstrumentation.java index fe411211c5..fe20efbfe4 100644 --- a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/BaseSyncClientHandlerInstrumentation.java +++ b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/BaseSyncClientHandlerInstrumentation.java @@ -22,7 +22,7 @@ import co.elastic.apm.agent.awssdk.v2.helper.S3Helper; import co.elastic.apm.agent.awssdk.v2.helper.SQSHelper; import co.elastic.apm.agent.awssdk.v2.helper.sqs.wrapper.MessageListWrapper; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.common.JvmRuntimeInfo; import co.elastic.apm.plugin.spi.DefaultOutcome; import co.elastic.apm.plugin.spi.Span; diff --git a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/GetMessagesInstrumentation.java b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/GetMessagesInstrumentation.java index 5ce699a5e0..82e2f805f4 100644 --- a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/GetMessagesInstrumentation.java +++ b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/src/main/java/co/elastic/apm/agent/awssdk/v2/GetMessagesInstrumentation.java @@ -19,7 +19,7 @@ package co.elastic.apm.agent.awssdk.v2; import co.elastic.apm.agent.awssdk.v2.helper.sqs.wrapper.MessageListWrapper; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.sdk.state.CallDepth; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; diff --git a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-common/src/main/java/co/elastic/apm/agent/awssdk/common/AbstractAwsSdkInstrumentation.java b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-common/src/main/java/co/elastic/apm/agent/awssdk/common/AbstractAwsSdkInstrumentation.java index 13f02b0704..de9749079f 100644 --- a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-common/src/main/java/co/elastic/apm/agent/awssdk/common/AbstractAwsSdkInstrumentation.java +++ b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-common/src/main/java/co/elastic/apm/agent/awssdk/common/AbstractAwsSdkInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.awssdk.common; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.description.NamedElement; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-agent-plugins/apm-awslambda-plugin/src/main/java/co/elastic/apm/agent/awslambda/AbstractAwsLambdaHandlerInstrumentation.java b/apm-agent-plugins/apm-awslambda-plugin/src/main/java/co/elastic/apm/agent/awslambda/AbstractAwsLambdaHandlerInstrumentation.java index a334dceaf6..a1579bf77b 100644 --- a/apm-agent-plugins/apm-awslambda-plugin/src/main/java/co/elastic/apm/agent/awslambda/AbstractAwsLambdaHandlerInstrumentation.java +++ b/apm-agent-plugins/apm-awslambda-plugin/src/main/java/co/elastic/apm/agent/awslambda/AbstractAwsLambdaHandlerInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.awslambda; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.configuration.ServerlessConfiguration; import co.elastic.apm.agent.impl.Tracer; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-cassandra/apm-cassandra3-plugin/src/main/java/co/elastic/apm/agent/cassandra3/Cassandra3Instrumentation.java b/apm-agent-plugins/apm-cassandra/apm-cassandra3-plugin/src/main/java/co/elastic/apm/agent/cassandra3/Cassandra3Instrumentation.java index e1f0f31304..501280defd 100644 --- a/apm-agent-plugins/apm-cassandra/apm-cassandra3-plugin/src/main/java/co/elastic/apm/agent/cassandra3/Cassandra3Instrumentation.java +++ b/apm-agent-plugins/apm-cassandra/apm-cassandra3-plugin/src/main/java/co/elastic/apm/agent/cassandra3/Cassandra3Instrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.cassandra3; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers; import co.elastic.apm.agent.cassandra.CassandraHelper; import co.elastic.apm.plugin.spi.GlobalTracer; diff --git a/apm-agent-plugins/apm-cassandra/apm-cassandra4-plugin/src/main/java/co/elastic/apm/agent/cassandra4/Cassandra4Instrumentation.java b/apm-agent-plugins/apm-cassandra/apm-cassandra4-plugin/src/main/java/co/elastic/apm/agent/cassandra4/Cassandra4Instrumentation.java index a8332f0d38..e18093d082 100644 --- a/apm-agent-plugins/apm-cassandra/apm-cassandra4-plugin/src/main/java/co/elastic/apm/agent/cassandra4/Cassandra4Instrumentation.java +++ b/apm-agent-plugins/apm-cassandra/apm-cassandra4-plugin/src/main/java/co/elastic/apm/agent/cassandra4/Cassandra4Instrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.cassandra4; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.cassandra.CassandraHelper; import co.elastic.apm.plugin.spi.GlobalTracer; import co.elastic.apm.plugin.spi.Span; diff --git a/apm-agent-plugins/apm-dubbo-plugin/src/main/java/co/elastic/apm/agent/dubbo/AbstractDubboInstrumentation.java b/apm-agent-plugins/apm-dubbo-plugin/src/main/java/co/elastic/apm/agent/dubbo/AbstractDubboInstrumentation.java index 416c998584..a974d960e3 100644 --- a/apm-agent-plugins/apm-dubbo-plugin/src/main/java/co/elastic/apm/agent/dubbo/AbstractDubboInstrumentation.java +++ b/apm-agent-plugins/apm-dubbo-plugin/src/main/java/co/elastic/apm/agent/dubbo/AbstractDubboInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.dubbo; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.Arrays; import java.util.Collection; diff --git a/apm-agent-plugins/apm-ecs-logging-plugin/src/main/java/co/elastic/apm/agent/ecs_logging/AbstractLog4j2ServiceInstrumentation.java b/apm-agent-plugins/apm-ecs-logging-plugin/src/main/java/co/elastic/apm/agent/ecs_logging/AbstractLog4j2ServiceInstrumentation.java index 846142d850..0d86559469 100644 --- a/apm-agent-plugins/apm-ecs-logging-plugin/src/main/java/co/elastic/apm/agent/ecs_logging/AbstractLog4j2ServiceInstrumentation.java +++ b/apm-agent-plugins/apm-ecs-logging-plugin/src/main/java/co/elastic/apm/agent/ecs_logging/AbstractLog4j2ServiceInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.ecs_logging; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-ecs-logging-plugin/src/main/java/co/elastic/apm/agent/ecs_logging/JulEcsFormatterInstrumentation.java b/apm-agent-plugins/apm-ecs-logging-plugin/src/main/java/co/elastic/apm/agent/ecs_logging/JulEcsFormatterInstrumentation.java index 424fbe3589..65fc25ac09 100644 --- a/apm-agent-plugins/apm-ecs-logging-plugin/src/main/java/co/elastic/apm/agent/ecs_logging/JulEcsFormatterInstrumentation.java +++ b/apm-agent-plugins/apm-ecs-logging-plugin/src/main/java/co/elastic/apm/agent/ecs_logging/JulEcsFormatterInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.ecs_logging; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers; import co.elastic.apm.agent.loginstr.correlation.CorrelationIdMapAdapter; import co.elastic.logging.jul.EcsFormatter; diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-common/src/main/java/co/elastic/apm/agent/esrestclient/ElasticsearchRestClientInstrumentation.java b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-common/src/main/java/co/elastic/apm/agent/esrestclient/ElasticsearchRestClientInstrumentation.java index 583535e436..d721ecb54d 100644 --- a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-common/src/main/java/co/elastic/apm/agent/esrestclient/ElasticsearchRestClientInstrumentation.java +++ b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-common/src/main/java/co/elastic/apm/agent/esrestclient/ElasticsearchRestClientInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.esrestclient; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.Collection; import java.util.Collections; diff --git a/apm-agent-plugins/apm-finagle-httpclient-plugin/src/main/java/co/elastic/apm/agent/finaglehttpclient/FinagleExceptionSourceFilterInstrumentation.java b/apm-agent-plugins/apm-finagle-httpclient-plugin/src/main/java/co/elastic/apm/agent/finaglehttpclient/FinagleExceptionSourceFilterInstrumentation.java index fc4fec63c7..b17c5db384 100644 --- a/apm-agent-plugins/apm-finagle-httpclient-plugin/src/main/java/co/elastic/apm/agent/finaglehttpclient/FinagleExceptionSourceFilterInstrumentation.java +++ b/apm-agent-plugins/apm-finagle-httpclient-plugin/src/main/java/co/elastic/apm/agent/finaglehttpclient/FinagleExceptionSourceFilterInstrumentation.java @@ -19,7 +19,7 @@ package co.elastic.apm.agent.finaglehttpclient; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.httpclient.HttpClientHelper; import co.elastic.apm.plugin.spi.Span; import co.elastic.apm.agent.sdk.logging.Logger; diff --git a/apm-agent-plugins/apm-finagle-httpclient-plugin/src/main/java/co/elastic/apm/agent/finaglehttpclient/FinaglePayloadSizeFilterInstrumentation.java b/apm-agent-plugins/apm-finagle-httpclient-plugin/src/main/java/co/elastic/apm/agent/finaglehttpclient/FinaglePayloadSizeFilterInstrumentation.java index ff3555e0f9..f0847d2a25 100644 --- a/apm-agent-plugins/apm-finagle-httpclient-plugin/src/main/java/co/elastic/apm/agent/finaglehttpclient/FinaglePayloadSizeFilterInstrumentation.java +++ b/apm-agent-plugins/apm-finagle-httpclient-plugin/src/main/java/co/elastic/apm/agent/finaglehttpclient/FinaglePayloadSizeFilterInstrumentation.java @@ -19,7 +19,7 @@ package co.elastic.apm.agent.finaglehttpclient; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.finaglehttpclient.helper.RequestHeaderAccessor; import co.elastic.apm.agent.httpclient.HttpClientHelper; import co.elastic.apm.plugin.spi.AbstractSpan; diff --git a/apm-agent-plugins/apm-finagle-httpclient-plugin/src/main/java/co/elastic/apm/agent/finaglehttpclient/FinagleTlsFilterInstrumentation.java b/apm-agent-plugins/apm-finagle-httpclient-plugin/src/main/java/co/elastic/apm/agent/finaglehttpclient/FinagleTlsFilterInstrumentation.java index 92142d14fc..9e1b06d434 100644 --- a/apm-agent-plugins/apm-finagle-httpclient-plugin/src/main/java/co/elastic/apm/agent/finaglehttpclient/FinagleTlsFilterInstrumentation.java +++ b/apm-agent-plugins/apm-finagle-httpclient-plugin/src/main/java/co/elastic/apm/agent/finaglehttpclient/FinagleTlsFilterInstrumentation.java @@ -19,7 +19,7 @@ package co.elastic.apm.agent.finaglehttpclient; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.sdk.weakconcurrent.WeakConcurrent; import co.elastic.apm.agent.sdk.weakconcurrent.WeakSet; import com.twitter.finagle.http.Request; diff --git a/apm-agent-plugins/apm-grails-plugin/src/main/java/co/elastic/apm/agent/grails/GrailsTransactionNameInstrumentation.java b/apm-agent-plugins/apm-grails-plugin/src/main/java/co/elastic/apm/agent/grails/GrailsTransactionNameInstrumentation.java index fa3058ab48..d44e61bcfe 100644 --- a/apm-agent-plugins/apm-grails-plugin/src/main/java/co/elastic/apm/agent/grails/GrailsTransactionNameInstrumentation.java +++ b/apm-agent-plugins/apm-grails-plugin/src/main/java/co/elastic/apm/agent/grails/GrailsTransactionNameInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.grails; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.Transaction; import co.elastic.apm.agent.util.TransactionNameUtils; import grails.core.GrailsControllerClass; diff --git a/apm-agent-plugins/apm-grpc/apm-grpc-plugin/src/main/java/co/elastic/apm/agent/grpc/BaseInstrumentation.java b/apm-agent-plugins/apm-grpc/apm-grpc-plugin/src/main/java/co/elastic/apm/agent/grpc/BaseInstrumentation.java index f63ca09913..2e2ac395d4 100644 --- a/apm-agent-plugins/apm-grpc/apm-grpc-plugin/src/main/java/co/elastic/apm/agent/grpc/BaseInstrumentation.java +++ b/apm-agent-plugins/apm-grpc/apm-grpc-plugin/src/main/java/co/elastic/apm/agent/grpc/BaseInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.grpc; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.Collection; import java.util.Collections; diff --git a/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-5_x/src/main/java/co/elastic/apm/agent/hibernatesearch/v5/HibernateSearch5Instrumentation.java b/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-5_x/src/main/java/co/elastic/apm/agent/hibernatesearch/v5/HibernateSearch5Instrumentation.java index 045c7ab0e7..be381f17b5 100644 --- a/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-5_x/src/main/java/co/elastic/apm/agent/hibernatesearch/v5/HibernateSearch5Instrumentation.java +++ b/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-5_x/src/main/java/co/elastic/apm/agent/hibernatesearch/v5/HibernateSearch5Instrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.hibernatesearch.v5; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.hibernatesearch.HibernateSearchConstants; import co.elastic.apm.agent.hibernatesearch.HibernateSearchHelper; import co.elastic.apm.plugin.spi.Span; diff --git a/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-6_x/src/main/java/co/elastic/apm/agent/hibernatesearch/HibernateSearch6Instrumentation.java b/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-6_x/src/main/java/co/elastic/apm/agent/hibernatesearch/HibernateSearch6Instrumentation.java index 29880d93ad..8656d2aac7 100644 --- a/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-6_x/src/main/java/co/elastic/apm/agent/hibernatesearch/HibernateSearch6Instrumentation.java +++ b/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-6_x/src/main/java/co/elastic/apm/agent/hibernatesearch/HibernateSearch6Instrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.hibernatesearch; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.Span; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.NamedElement; diff --git a/apm-agent-plugins/apm-jakarta-websocket-plugin/src/main/java/co/elastic/apm/agent/websocket/BaseServerEndpointInstrumentation.java b/apm-agent-plugins/apm-jakarta-websocket-plugin/src/main/java/co/elastic/apm/agent/websocket/BaseServerEndpointInstrumentation.java index e57f4d2f50..8f19a84985 100644 --- a/apm-agent-plugins/apm-jakarta-websocket-plugin/src/main/java/co/elastic/apm/agent/websocket/BaseServerEndpointInstrumentation.java +++ b/apm-agent-plugins/apm-jakarta-websocket-plugin/src/main/java/co/elastic/apm/agent/websocket/BaseServerEndpointInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.websocket; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.DefaultOutcome; import co.elastic.apm.plugin.spi.StacktraceConfiguration; import co.elastic.apm.plugin.spi.Tracer; diff --git a/apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/ExecutorInstrumentation.java b/apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/ExecutorInstrumentation.java index 5c0428bfa8..1ad7c6d6fd 100644 --- a/apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/ExecutorInstrumentation.java +++ b/apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/ExecutorInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.concurrent; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.sdk.state.GlobalVariables; import co.elastic.apm.agent.util.ExecutorUtils; import net.bytebuddy.asm.Advice; diff --git a/apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/ForkJoinTaskInstrumentation.java b/apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/ForkJoinTaskInstrumentation.java index 205066d1ea..c45188d0b4 100644 --- a/apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/ForkJoinTaskInstrumentation.java +++ b/apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/ForkJoinTaskInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.concurrent; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/RunnableCallableForkJoinTaskInstrumentation.java b/apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/RunnableCallableForkJoinTaskInstrumentation.java index 80575b189d..11d5015f9b 100644 --- a/apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/RunnableCallableForkJoinTaskInstrumentation.java +++ b/apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/RunnableCallableForkJoinTaskInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.concurrent; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.AbstractSpan; import co.elastic.apm.agent.sdk.DynamicTransformer; import net.bytebuddy.asm.Advice; diff --git a/apm-agent-plugins/apm-java-ldap-plugin/src/main/java/co/elastic/apm/agent/java_ldap/LdapClientAdvice.java b/apm-agent-plugins/apm-java-ldap-plugin/src/main/java/co/elastic/apm/agent/java_ldap/LdapClientAdvice.java index 9caff2f2b5..1ec3142958 100644 --- a/apm-agent-plugins/apm-java-ldap-plugin/src/main/java/co/elastic/apm/agent/java_ldap/LdapClientAdvice.java +++ b/apm-agent-plugins/apm-java-ldap-plugin/src/main/java/co/elastic/apm/agent/java_ldap/LdapClientAdvice.java @@ -19,8 +19,8 @@ package co.elastic.apm.agent.java_ldap; import co.elastic.apm.plugin.spi.*; -import com.sun.jndi.ldap.Connection; -import com.sun.jndi.ldap.LdapResult; +//import com.sun.jndi.ldap.Connection; +//import com.sun.jndi.ldap.LdapResult; import net.bytebuddy.asm.Advice; import net.bytebuddy.implementation.bytecode.assign.Assigner; @@ -30,37 +30,37 @@ public class LdapClientAdvice { private static final Tracer tracer = GlobalTracer.get(); - @Advice.OnMethodEnter(suppress = Throwable.class, inline = false) - public static Object onEnter(@Advice.Origin("#m") String methodName, @Advice.FieldValue(value = "conn", typing = Assigner.Typing.DYNAMIC) Connection connection) { - AbstractSpan parent = tracer.getActive(); - if (parent == null) { - return null; - } - - Span span = parent.createExitSpan(); - if (span == null) { - return null; - } - - span.appendToName("LDAP ").appendToName(methodName) - .withType("external") - .withSubtype("ldap"); - - if (connection != null) { - span.getContext().getDestination().withAddress(connection.host).withPort(connection.port); - span.getContext().getServiceTarget().withType("ldap").withHostPortName(connection.host, connection.port); - } - - return span.activate(); - } - - @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class, inline = false) - public static void onExit(@Advice.Enter @Nullable Object spanObj, @Nullable @Advice.Return LdapResult ldapResult, @Nullable @Advice.Thrown Throwable t) { - Span span = (Span) spanObj; - if (span != null) { - span.withOutcome((ldapResult != null && ldapResult.status == 0 /* LDAP_SUCCESS */) ? DefaultOutcome.SUCCESS : DefaultOutcome.FAILURE) - .captureException(t) - .deactivate().end(); - } - } +// @Advice.OnMethodEnter(suppress = Throwable.class, inline = false) +// public static Object onEnter(@Advice.Origin("#m") String methodName, @Advice.FieldValue(value = "conn", typing = Assigner.Typing.DYNAMIC) Connection connection) { +// AbstractSpan parent = tracer.getActive(); +// if (parent == null) { +// return null; +// } +// +// Span span = parent.createExitSpan(); +// if (span == null) { +// return null; +// } +// +// span.appendToName("LDAP ").appendToName(methodName) +// .withType("external") +// .withSubtype("ldap"); +// +// if (connection != null) { +// span.getContext().getDestination().withAddress(connection.host).withPort(connection.port); +// span.getContext().getServiceTarget().withType("ldap").withHostPortName(connection.host, connection.port); +// } +// +// return span.activate(); +// } +// +// @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class, inline = false) +// public static void onExit(@Advice.Enter @Nullable Object spanObj, @Nullable @Advice.Return LdapResult ldapResult, @Nullable @Advice.Thrown Throwable t) { +// Span span = (Span) spanObj; +// if (span != null) { +// span.withOutcome((ldapResult != null && ldapResult.status == 0 /* LDAP_SUCCESS */) ? DefaultOutcome.SUCCESS : DefaultOutcome.FAILURE) +// .captureException(t) +// .deactivate().end(); +// } +// } TODO Rafael } diff --git a/apm-agent-plugins/apm-java-ldap-plugin/src/main/java/co/elastic/apm/agent/java_ldap/LdapClientInstrumentation.java b/apm-agent-plugins/apm-java-ldap-plugin/src/main/java/co/elastic/apm/agent/java_ldap/LdapClientInstrumentation.java index edf5bec64d..e512aa4d55 100644 --- a/apm-agent-plugins/apm-java-ldap-plugin/src/main/java/co/elastic/apm/agent/java_ldap/LdapClientInstrumentation.java +++ b/apm-agent-plugins/apm-java-ldap-plugin/src/main/java/co/elastic/apm/agent/java_ldap/LdapClientInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.java_ldap; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-agent-plugins/apm-javalin-plugin/src/main/java/co/elastic/apm/agent/javalin/JavalinHandlerLambdaInstrumentation.java b/apm-agent-plugins/apm-javalin-plugin/src/main/java/co/elastic/apm/agent/javalin/JavalinHandlerLambdaInstrumentation.java index 086ba0c52e..2a55c18b82 100644 --- a/apm-agent-plugins/apm-javalin-plugin/src/main/java/co/elastic/apm/agent/javalin/JavalinHandlerLambdaInstrumentation.java +++ b/apm-agent-plugins/apm-javalin-plugin/src/main/java/co/elastic/apm/agent/javalin/JavalinHandlerLambdaInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.javalin; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import io.javalin.http.Context; import io.javalin.http.Handler; import net.bytebuddy.asm.Advice; diff --git a/apm-agent-plugins/apm-javalin-plugin/src/main/java/co/elastic/apm/agent/javalin/JavalinInstrumentation.java b/apm-agent-plugins/apm-javalin-plugin/src/main/java/co/elastic/apm/agent/javalin/JavalinInstrumentation.java index b6f007b801..611c615460 100644 --- a/apm-agent-plugins/apm-javalin-plugin/src/main/java/co/elastic/apm/agent/javalin/JavalinInstrumentation.java +++ b/apm-agent-plugins/apm-javalin-plugin/src/main/java/co/elastic/apm/agent/javalin/JavalinInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.javalin; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.*; import co.elastic.apm.agent.util.TransactionNameUtils; import co.elastic.apm.agent.util.VersionUtils; diff --git a/apm-agent-plugins/apm-javalin-plugin/src/main/java/co/elastic/apm/agent/javalin/JavalinRenderInstrumentation.java b/apm-agent-plugins/apm-javalin-plugin/src/main/java/co/elastic/apm/agent/javalin/JavalinRenderInstrumentation.java index e0cd352b60..abf09771ab 100644 --- a/apm-agent-plugins/apm-javalin-plugin/src/main/java/co/elastic/apm/agent/javalin/JavalinRenderInstrumentation.java +++ b/apm-agent-plugins/apm-javalin-plugin/src/main/java/co/elastic/apm/agent/javalin/JavalinRenderInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.javalin; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.AbstractSpan; import co.elastic.apm.plugin.spi.Span; import net.bytebuddy.asm.Advice; 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 dc56876d7d..58d5eb8e86 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 @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.jaxrs; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.GlobalTracer; import co.elastic.apm.plugin.spi.StacktraceConfiguration; import co.elastic.apm.plugin.spi.Tracer; diff --git a/apm-agent-plugins/apm-jaxws-plugin/src/main/java/co/elastic/apm/agent/jaxws/JaxWsTransactionNameInstrumentation.java b/apm-agent-plugins/apm-jaxws-plugin/src/main/java/co/elastic/apm/agent/jaxws/JaxWsTransactionNameInstrumentation.java index 113f81c271..ce0c4327ab 100644 --- a/apm-agent-plugins/apm-jaxws-plugin/src/main/java/co/elastic/apm/agent/jaxws/JaxWsTransactionNameInstrumentation.java +++ b/apm-agent-plugins/apm-jaxws-plugin/src/main/java/co/elastic/apm/agent/jaxws/JaxWsTransactionNameInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.jaxws; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory.SimpleMethodSignature; import co.elastic.apm.plugin.spi.StacktraceConfiguration; import co.elastic.apm.plugin.spi.Tracer; diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/JdbcInstrumentation.java b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/JdbcInstrumentation.java index 98a1eb7c76..31e26fe4c4 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/JdbcInstrumentation.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/JdbcInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.jdbc; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.Collection; import java.util.Collections; diff --git a/apm-agent-plugins/apm-jdk-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/AbstractHttpClientInstrumentation.java b/apm-agent-plugins/apm-jdk-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/AbstractHttpClientInstrumentation.java index 83466de502..78e9f475c0 100644 --- a/apm-agent-plugins/apm-jdk-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/AbstractHttpClientInstrumentation.java +++ b/apm-agent-plugins/apm-jdk-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/AbstractHttpClientInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.httpclient; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.Arrays; import java.util.Collection; diff --git a/apm-agent-plugins/apm-jdk-httpserver-plugin/src/main/java/co/elastic/apm/agent/httpserver/JdkHttpServerInstrumentation.java b/apm-agent-plugins/apm-jdk-httpserver-plugin/src/main/java/co/elastic/apm/agent/httpserver/JdkHttpServerInstrumentation.java index c2465bc914..f5c9bedf08 100644 --- a/apm-agent-plugins/apm-jdk-httpserver-plugin/src/main/java/co/elastic/apm/agent/httpserver/JdkHttpServerInstrumentation.java +++ b/apm-agent-plugins/apm-jdk-httpserver-plugin/src/main/java/co/elastic/apm/agent/httpserver/JdkHttpServerInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.httpserver; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.Collection; import java.util.Collections; diff --git a/apm-agent-plugins/apm-jms-plugin/apm-jms-plugin-base/src/main/java/co/elastic/apm/agent/jms/BaseJmsInstrumentation.java b/apm-agent-plugins/apm-jms-plugin/apm-jms-plugin-base/src/main/java/co/elastic/apm/agent/jms/BaseJmsInstrumentation.java index 6e95cec217..0d9abaef8d 100644 --- a/apm-agent-plugins/apm-jms-plugin/apm-jms-plugin-base/src/main/java/co/elastic/apm/agent/jms/BaseJmsInstrumentation.java +++ b/apm-agent-plugins/apm-jms-plugin/apm-jms-plugin-base/src/main/java/co/elastic/apm/agent/jms/BaseJmsInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.jms; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.CoreConfiguration; import co.elastic.apm.plugin.spi.GlobalTracer; import co.elastic.apm.plugin.spi.MessagingConfiguration; diff --git a/apm-agent-plugins/apm-jsf-plugin/src/main/java/co/elastic/apm/agent/jsf/AbstractJsfLifecycleInstrumentation.java b/apm-agent-plugins/apm-jsf-plugin/src/main/java/co/elastic/apm/agent/jsf/AbstractJsfLifecycleInstrumentation.java index 732a37af03..080abc7259 100644 --- a/apm-agent-plugins/apm-jsf-plugin/src/main/java/co/elastic/apm/agent/jsf/AbstractJsfLifecycleInstrumentation.java +++ b/apm-agent-plugins/apm-jsf-plugin/src/main/java/co/elastic/apm/agent/jsf/AbstractJsfLifecycleInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.jsf; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-agent-plugins/apm-kafka-plugin/apm-kafka-base-plugin/src/main/java/co/elastic/apm/agent/kafka/BaseKafkaInstrumentation.java b/apm-agent-plugins/apm-kafka-plugin/apm-kafka-base-plugin/src/main/java/co/elastic/apm/agent/kafka/BaseKafkaInstrumentation.java index 37de780cd0..a814343aa2 100644 --- a/apm-agent-plugins/apm-kafka-plugin/apm-kafka-base-plugin/src/main/java/co/elastic/apm/agent/kafka/BaseKafkaInstrumentation.java +++ b/apm-agent-plugins/apm-kafka-plugin/apm-kafka-base-plugin/src/main/java/co/elastic/apm/agent/kafka/BaseKafkaInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.kafka; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.matcher.ElementMatcher; import java.util.Collection; diff --git a/apm-agent-plugins/apm-logging-plugin/apm-jboss-logging-plugin/src/main/java/co/elastic/apm/agent/jbosslogging/correlation/JBossLogManagerCorrelationInstrumentation.java b/apm-agent-plugins/apm-logging-plugin/apm-jboss-logging-plugin/src/main/java/co/elastic/apm/agent/jbosslogging/correlation/JBossLogManagerCorrelationInstrumentation.java index 5d73d83056..c7e0cfffa3 100644 --- a/apm-agent-plugins/apm-logging-plugin/apm-jboss-logging-plugin/src/main/java/co/elastic/apm/agent/jbosslogging/correlation/JBossLogManagerCorrelationInstrumentation.java +++ b/apm-agent-plugins/apm-logging-plugin/apm-jboss-logging-plugin/src/main/java/co/elastic/apm/agent/jbosslogging/correlation/JBossLogManagerCorrelationInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.jbosslogging.correlation; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-logging-plugin/apm-jboss-logging-plugin/src/main/java/co/elastic/apm/agent/jbosslogging/correlation/JBossLoggingCorrelationInstrumentation.java b/apm-agent-plugins/apm-logging-plugin/apm-jboss-logging-plugin/src/main/java/co/elastic/apm/agent/jbosslogging/correlation/JBossLoggingCorrelationInstrumentation.java index 1d5c440789..f90ff52c95 100644 --- a/apm-agent-plugins/apm-logging-plugin/apm-jboss-logging-plugin/src/main/java/co/elastic/apm/agent/jbosslogging/correlation/JBossLoggingCorrelationInstrumentation.java +++ b/apm-agent-plugins/apm-logging-plugin/apm-jboss-logging-plugin/src/main/java/co/elastic/apm/agent/jbosslogging/correlation/JBossLoggingCorrelationInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.jbosslogging.correlation; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-logging-plugin/apm-log4j1-plugin/src/main/java/co/elastic/apm/agent/log4j1/correlation/Log4j1LogCorrelationInstrumentation.java b/apm-agent-plugins/apm-logging-plugin/apm-log4j1-plugin/src/main/java/co/elastic/apm/agent/log4j1/correlation/Log4j1LogCorrelationInstrumentation.java index f7e963373c..063544a911 100644 --- a/apm-agent-plugins/apm-logging-plugin/apm-log4j1-plugin/src/main/java/co/elastic/apm/agent/log4j1/correlation/Log4j1LogCorrelationInstrumentation.java +++ b/apm-agent-plugins/apm-logging-plugin/apm-log4j1-plugin/src/main/java/co/elastic/apm/agent/log4j1/correlation/Log4j1LogCorrelationInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.log4j1.correlation; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/src/main/java/co/elastic/apm/agent/log4j2/correlation/Log4j2LogCorrelationInstrumentation.java b/apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/src/main/java/co/elastic/apm/agent/log4j2/correlation/Log4j2LogCorrelationInstrumentation.java index dd758d4dd2..644fdbe67a 100644 --- a/apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/src/main/java/co/elastic/apm/agent/log4j2/correlation/Log4j2LogCorrelationInstrumentation.java +++ b/apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/src/main/java/co/elastic/apm/agent/log4j2/correlation/Log4j2LogCorrelationInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.log4j2.correlation; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.NamedElement; diff --git a/apm-agent-plugins/apm-logging-plugin/apm-logback-plugin/apm-logback-plugin-impl/src/main/java/co/elastic/apm/agent/logback/correlation/LogbackLogCorrelationInstrumentation.java b/apm-agent-plugins/apm-logging-plugin/apm-logback-plugin/apm-logback-plugin-impl/src/main/java/co/elastic/apm/agent/logback/correlation/LogbackLogCorrelationInstrumentation.java index c34f532ea3..343d0cfa0a 100644 --- a/apm-agent-plugins/apm-logging-plugin/apm-logback-plugin/apm-logback-plugin-impl/src/main/java/co/elastic/apm/agent/logback/correlation/LogbackLogCorrelationInstrumentation.java +++ b/apm-agent-plugins/apm-logging-plugin/apm-logback-plugin/apm-logback-plugin-impl/src/main/java/co/elastic/apm/agent/logback/correlation/LogbackLogCorrelationInstrumentation.java @@ -19,7 +19,7 @@ package co.elastic.apm.agent.logback.correlation; import ch.qos.logback.classic.spi.ILoggingEvent; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-logging-plugin/apm-logging-plugin-common/src/main/java/co/elastic/apm/agent/loginstr/AbstractLogIntegrationInstrumentation.java b/apm-agent-plugins/apm-logging-plugin/apm-logging-plugin-common/src/main/java/co/elastic/apm/agent/loginstr/AbstractLogIntegrationInstrumentation.java index 5cfe7814b6..ff0f9d4778 100644 --- a/apm-agent-plugins/apm-logging-plugin/apm-logging-plugin-common/src/main/java/co/elastic/apm/agent/loginstr/AbstractLogIntegrationInstrumentation.java +++ b/apm-agent-plugins/apm-logging-plugin/apm-logging-plugin-common/src/main/java/co/elastic/apm/agent/loginstr/AbstractLogIntegrationInstrumentation.java @@ -19,7 +19,7 @@ package co.elastic.apm.agent.loginstr; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.ArrayList; import java.util.Collection; diff --git a/apm-agent-plugins/apm-logging-plugin/apm-logging-plugin-common/src/main/java/co/elastic/apm/agent/loginstr/error/AbstractLoggerErrorCapturingInstrumentation.java b/apm-agent-plugins/apm-logging-plugin/apm-logging-plugin-common/src/main/java/co/elastic/apm/agent/loginstr/error/AbstractLoggerErrorCapturingInstrumentation.java index 03e61b0007..6e405943e2 100644 --- a/apm-agent-plugins/apm-logging-plugin/apm-logging-plugin-common/src/main/java/co/elastic/apm/agent/loginstr/error/AbstractLoggerErrorCapturingInstrumentation.java +++ b/apm-agent-plugins/apm-logging-plugin/apm-logging-plugin-common/src/main/java/co/elastic/apm/agent/loginstr/error/AbstractLoggerErrorCapturingInstrumentation.java @@ -19,8 +19,6 @@ package co.elastic.apm.agent.loginstr.error; import co.elastic.apm.agent.bci.TracerAwareInstrumentation; -import co.elastic.apm.agent.impl.error.ErrorCapture; -import co.elastic.apm.agent.sdk.state.CallDepth; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.method.MethodDescription; diff --git a/apm-agent-plugins/apm-micrometer-plugin/src/main/java/co/elastic/apm/agent/micrometer/AbstractMicrometerInstrumentation.java b/apm-agent-plugins/apm-micrometer-plugin/src/main/java/co/elastic/apm/agent/micrometer/AbstractMicrometerInstrumentation.java index 728a190223..f673a4bcaf 100644 --- a/apm-agent-plugins/apm-micrometer-plugin/src/main/java/co/elastic/apm/agent/micrometer/AbstractMicrometerInstrumentation.java +++ b/apm-agent-plugins/apm-micrometer-plugin/src/main/java/co/elastic/apm/agent/micrometer/AbstractMicrometerInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.micrometer; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.impl.GlobalTracer; import co.elastic.apm.agent.impl.MetricsAwareTracer; diff --git a/apm-agent-plugins/apm-mongodb/apm-mongodb3-plugin/src/main/java/co/elastic/apm/agent/mongodb/v3/Mongo3Instrumentation.java b/apm-agent-plugins/apm-mongodb/apm-mongodb3-plugin/src/main/java/co/elastic/apm/agent/mongodb/v3/Mongo3Instrumentation.java index 18d2f4fc7a..09bbb71db6 100644 --- a/apm-agent-plugins/apm-mongodb/apm-mongodb3-plugin/src/main/java/co/elastic/apm/agent/mongodb/v3/Mongo3Instrumentation.java +++ b/apm-agent-plugins/apm-mongodb/apm-mongodb3-plugin/src/main/java/co/elastic/apm/agent/mongodb/v3/Mongo3Instrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.mongodb.v3; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-agent-plugins/apm-mongodb/apm-mongodb4-plugin/src/main/java/co/elastic/apm/agent/mongodb/v4/Mongo4Instrumentation.java b/apm-agent-plugins/apm-mongodb/apm-mongodb4-plugin/src/main/java/co/elastic/apm/agent/mongodb/v4/Mongo4Instrumentation.java index 9cf36bd5cd..e8f9317f10 100644 --- a/apm-agent-plugins/apm-mongodb/apm-mongodb4-plugin/src/main/java/co/elastic/apm/agent/mongodb/v4/Mongo4Instrumentation.java +++ b/apm-agent-plugins/apm-mongodb/apm-mongodb4-plugin/src/main/java/co/elastic/apm/agent/mongodb/v4/Mongo4Instrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.mongodb.v4; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.matcher.ElementMatcher; import java.security.ProtectionDomain; diff --git a/apm-agent-plugins/apm-okhttp-plugin/src/main/java/co/elastic/apm/agent/okhttp/AbstractOkHttp3ClientInstrumentation.java b/apm-agent-plugins/apm-okhttp-plugin/src/main/java/co/elastic/apm/agent/okhttp/AbstractOkHttp3ClientInstrumentation.java index 5ab5491940..4207e247c9 100644 --- a/apm-agent-plugins/apm-okhttp-plugin/src/main/java/co/elastic/apm/agent/okhttp/AbstractOkHttp3ClientInstrumentation.java +++ b/apm-agent-plugins/apm-okhttp-plugin/src/main/java/co/elastic/apm/agent/okhttp/AbstractOkHttp3ClientInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.okhttp; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.Arrays; import java.util.Collection; diff --git a/apm-agent-plugins/apm-okhttp-plugin/src/main/java/co/elastic/apm/agent/okhttp/AbstractOkHttpClientInstrumentation.java b/apm-agent-plugins/apm-okhttp-plugin/src/main/java/co/elastic/apm/agent/okhttp/AbstractOkHttpClientInstrumentation.java index d49b3b4cf6..867fb0be66 100644 --- a/apm-agent-plugins/apm-okhttp-plugin/src/main/java/co/elastic/apm/agent/okhttp/AbstractOkHttpClientInstrumentation.java +++ b/apm-agent-plugins/apm-okhttp-plugin/src/main/java/co/elastic/apm/agent/okhttp/AbstractOkHttpClientInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.okhttp; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.Arrays; import java.util.Collection; diff --git a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/main/java/co/elastic/apm/agent/opentelemetry/AbstractOpenTelemetryInstrumentation.java b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/main/java/co/elastic/apm/agent/opentelemetry/AbstractOpenTelemetryInstrumentation.java index 33ec237f9f..8d664d7a4e 100644 --- a/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/main/java/co/elastic/apm/agent/opentelemetry/AbstractOpenTelemetryInstrumentation.java +++ b/apm-agent-plugins/apm-opentelemetry/apm-opentelemetry-plugin/src/main/java/co/elastic/apm/agent/opentelemetry/AbstractOpenTelemetryInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.opentelemetry; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-agent-plugins/apm-process-plugin/src/main/java/co/elastic/apm/agent/process/BaseProcessInstrumentation.java b/apm-agent-plugins/apm-process-plugin/src/main/java/co/elastic/apm/agent/process/BaseProcessInstrumentation.java index e7786333c4..a4e9882b99 100644 --- a/apm-agent-plugins/apm-process-plugin/src/main/java/co/elastic/apm/agent/process/BaseProcessInstrumentation.java +++ b/apm-agent-plugins/apm-process-plugin/src/main/java/co/elastic/apm/agent/process/BaseProcessInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.process; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.matcher.ElementMatcher; import java.util.Collection; diff --git a/apm-agent-plugins/apm-process-plugin/src/main/java/co/elastic/apm/agent/process/CommonsExecAsyncInstrumentation.java b/apm-agent-plugins/apm-process-plugin/src/main/java/co/elastic/apm/agent/process/CommonsExecAsyncInstrumentation.java index c5cd2a12cb..db9bbd3ecb 100644 --- a/apm-agent-plugins/apm-process-plugin/src/main/java/co/elastic/apm/agent/process/CommonsExecAsyncInstrumentation.java +++ b/apm-agent-plugins/apm-process-plugin/src/main/java/co/elastic/apm/agent/process/CommonsExecAsyncInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.process; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.concurrent.JavaConcurrent; import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice.AssignReturned.ToArguments.ToArgument; diff --git a/apm-agent-plugins/apm-quartz-job-plugin/quartz-common/src/main/java/co/elastic/apm/agent/quartzjob/AbstractJobTransactionNameInstrumentation.java b/apm-agent-plugins/apm-quartz-job-plugin/quartz-common/src/main/java/co/elastic/apm/agent/quartzjob/AbstractJobTransactionNameInstrumentation.java index 0ddf7a826f..af851df989 100644 --- a/apm-agent-plugins/apm-quartz-job-plugin/quartz-common/src/main/java/co/elastic/apm/agent/quartzjob/AbstractJobTransactionNameInstrumentation.java +++ b/apm-agent-plugins/apm-quartz-job-plugin/quartz-common/src/main/java/co/elastic/apm/agent/quartzjob/AbstractJobTransactionNameInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.quartzjob; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.Tracer; import co.elastic.apm.plugin.spi.*; import co.elastic.apm.agent.util.PrivilegedActionUtils; diff --git a/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-plugin/src/main/java/co/elastic/apm/agent/rabbitmq/AbstractBaseInstrumentation.java b/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-plugin/src/main/java/co/elastic/apm/agent/rabbitmq/AbstractBaseInstrumentation.java index 20af5b214e..c9420d95cb 100644 --- a/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-plugin/src/main/java/co/elastic/apm/agent/rabbitmq/AbstractBaseInstrumentation.java +++ b/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-plugin/src/main/java/co/elastic/apm/agent/rabbitmq/AbstractBaseInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.rabbitmq; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.*; import javax.annotation.Nullable; diff --git a/apm-agent-plugins/apm-reactor-plugin/src/main/java/co/elastic/apm/agent/reactor/ReactorInstrumentation.java b/apm-agent-plugins/apm-reactor-plugin/src/main/java/co/elastic/apm/agent/reactor/ReactorInstrumentation.java index c824eda6f7..e54ded4002 100644 --- a/apm-agent-plugins/apm-reactor-plugin/src/main/java/co/elastic/apm/agent/reactor/ReactorInstrumentation.java +++ b/apm-agent-plugins/apm-reactor-plugin/src/main/java/co/elastic/apm/agent/reactor/ReactorInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.reactor; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; diff --git a/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/src/main/java/co/elastic/apm/agent/jedis/JedisConnectionInstrumentation.java b/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/src/main/java/co/elastic/apm/agent/jedis/JedisConnectionInstrumentation.java index 087da15afd..8d44eabad0 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/src/main/java/co/elastic/apm/agent/jedis/JedisConnectionInstrumentation.java +++ b/apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/src/main/java/co/elastic/apm/agent/jedis/JedisConnectionInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.jedis; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-agent-plugins/apm-redis-plugin/apm-lettuce-plugin/src/main/java/co/elastic/apm/agent/lettuce/Lettuce34Instrumentation.java b/apm-agent-plugins/apm-redis-plugin/apm-lettuce-plugin/src/main/java/co/elastic/apm/agent/lettuce/Lettuce34Instrumentation.java index 3c7cfa6927..9722692811 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-lettuce-plugin/src/main/java/co/elastic/apm/agent/lettuce/Lettuce34Instrumentation.java +++ b/apm-agent-plugins/apm-redis-plugin/apm-lettuce-plugin/src/main/java/co/elastic/apm/agent/lettuce/Lettuce34Instrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.lettuce; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.collections.WeakConcurrentProviderImpl; import co.elastic.apm.plugin.spi.Span; import co.elastic.apm.agent.sdk.weakconcurrent.WeakMap; diff --git a/apm-agent-plugins/apm-redis-plugin/apm-lettuce-plugin/src/main/java/co/elastic/apm/agent/lettuce/Lettuce5StartSpanInstrumentation.java b/apm-agent-plugins/apm-redis-plugin/apm-lettuce-plugin/src/main/java/co/elastic/apm/agent/lettuce/Lettuce5StartSpanInstrumentation.java index 521b021b44..1e17c909ca 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-lettuce-plugin/src/main/java/co/elastic/apm/agent/lettuce/Lettuce5StartSpanInstrumentation.java +++ b/apm-agent-plugins/apm-redis-plugin/apm-lettuce-plugin/src/main/java/co/elastic/apm/agent/lettuce/Lettuce5StartSpanInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.lettuce; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.collections.WeakConcurrentProviderImpl; import co.elastic.apm.plugin.spi.Span; import co.elastic.apm.agent.redis.RedisSpanUtils; diff --git a/apm-agent-plugins/apm-redis-plugin/apm-lettuce-plugin/src/main/java/co/elastic/apm/agent/lettuce/Lettuce5StopSpanInstrumentation.java b/apm-agent-plugins/apm-redis-plugin/apm-lettuce-plugin/src/main/java/co/elastic/apm/agent/lettuce/Lettuce5StopSpanInstrumentation.java index 805a257b7b..54e0abfecc 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-lettuce-plugin/src/main/java/co/elastic/apm/agent/lettuce/Lettuce5StopSpanInstrumentation.java +++ b/apm-agent-plugins/apm-redis-plugin/apm-lettuce-plugin/src/main/java/co/elastic/apm/agent/lettuce/Lettuce5StopSpanInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.lettuce; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.Span; import io.lettuce.core.protocol.RedisCommand; import net.bytebuddy.asm.Advice; diff --git a/apm-agent-plugins/apm-redis-plugin/apm-redisson-plugin/src/main/java/co/elastic/apm/agent/redisson/RedisConnectionInstrumentation.java b/apm-agent-plugins/apm-redis-plugin/apm-redisson-plugin/src/main/java/co/elastic/apm/agent/redisson/RedisConnectionInstrumentation.java index 76c406ea0a..787b891559 100644 --- a/apm-agent-plugins/apm-redis-plugin/apm-redisson-plugin/src/main/java/co/elastic/apm/agent/redisson/RedisConnectionInstrumentation.java +++ b/apm-agent-plugins/apm-redis-plugin/apm-redisson-plugin/src/main/java/co/elastic/apm/agent/redisson/RedisConnectionInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.redisson; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.Span; import co.elastic.apm.agent.redis.RedisSpanUtils; import io.netty.channel.Channel; diff --git a/apm-agent-plugins/apm-scala-concurrent-plugin/src/main/java/co/elastic/apm/agent/scalaconcurrent/FutureInstrumentation.java b/apm-agent-plugins/apm-scala-concurrent-plugin/src/main/java/co/elastic/apm/agent/scalaconcurrent/FutureInstrumentation.java index e445bfc554..566dc36430 100644 --- a/apm-agent-plugins/apm-scala-concurrent-plugin/src/main/java/co/elastic/apm/agent/scalaconcurrent/FutureInstrumentation.java +++ b/apm-agent-plugins/apm-scala-concurrent-plugin/src/main/java/co/elastic/apm/agent/scalaconcurrent/FutureInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.scalaconcurrent; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.collections.WeakConcurrentProviderImpl; import co.elastic.apm.plugin.spi.AbstractSpan; import co.elastic.apm.agent.sdk.weakconcurrent.WeakMap; diff --git a/apm-agent-plugins/apm-scheduled-annotation-plugin/src/main/java/co/elastic/apm/agent/scheduled/ScheduledTransactionNameInstrumentation.java b/apm-agent-plugins/apm-scheduled-annotation-plugin/src/main/java/co/elastic/apm/agent/scheduled/ScheduledTransactionNameInstrumentation.java index 0d4ea27086..57fdd8c3f8 100644 --- a/apm-agent-plugins/apm-scheduled-annotation-plugin/src/main/java/co/elastic/apm/agent/scheduled/ScheduledTransactionNameInstrumentation.java +++ b/apm-agent-plugins/apm-scheduled-annotation-plugin/src/main/java/co/elastic/apm/agent/scheduled/ScheduledTransactionNameInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.scheduled; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory.SimpleMethodSignature; import co.elastic.apm.plugin.spi.*; import co.elastic.apm.agent.util.PrivilegedActionUtils; diff --git a/apm-agent-plugins/apm-scheduled-annotation-plugin/src/main/java/co/elastic/apm/agent/scheduled/TimerTaskInstrumentation.java b/apm-agent-plugins/apm-scheduled-annotation-plugin/src/main/java/co/elastic/apm/agent/scheduled/TimerTaskInstrumentation.java index 44f78b654b..ac44ccb849 100644 --- a/apm-agent-plugins/apm-scheduled-annotation-plugin/src/main/java/co/elastic/apm/agent/scheduled/TimerTaskInstrumentation.java +++ b/apm-agent-plugins/apm-scheduled-annotation-plugin/src/main/java/co/elastic/apm/agent/scheduled/TimerTaskInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.scheduled; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory; import co.elastic.apm.plugin.spi.StacktraceConfiguration; import co.elastic.apm.plugin.spi.Tracer; diff --git a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/AbstractServletInstrumentation.java b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/AbstractServletInstrumentation.java index 1fafd00b28..6c3f197c12 100644 --- a/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/AbstractServletInstrumentation.java +++ b/apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/AbstractServletInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.servlet; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.matcher.ElementMatcher; import java.util.Collection; diff --git a/apm-agent-plugins/apm-sparkjava-plugin/src/main/java/co/elastic/apm/agent/sparkjava/RoutesInstrumentation.java b/apm-agent-plugins/apm-sparkjava-plugin/src/main/java/co/elastic/apm/agent/sparkjava/RoutesInstrumentation.java index c3debe8ff1..3c33454fd0 100644 --- a/apm-agent-plugins/apm-sparkjava-plugin/src/main/java/co/elastic/apm/agent/sparkjava/RoutesInstrumentation.java +++ b/apm-agent-plugins/apm-sparkjava-plugin/src/main/java/co/elastic/apm/agent/sparkjava/RoutesInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.sparkjava; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateAdvice.java b/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateAdvice.java index e7116f3af7..36ebad6bc6 100644 --- a/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateAdvice.java +++ b/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateAdvice.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.resttemplate; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.httpclient.HttpClientHelper; import co.elastic.apm.plugin.spi.AbstractSpan; import co.elastic.apm.plugin.spi.DefaultOutcome; diff --git a/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateInstrumentation.java b/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateInstrumentation.java index 52821ab6ac..2375aa4d14 100644 --- a/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateInstrumentation.java +++ b/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/src/main/java/co/elastic/apm/agent/resttemplate/SpringRestTemplateInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.resttemplate; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; diff --git a/apm-agent-plugins/apm-spring-webflux/apm-spring-webclient-plugin/src/main/java/co/elastic/apm/agent/springwebclient/WebClientExchangeFunctionInstrumentation.java b/apm-agent-plugins/apm-spring-webflux/apm-spring-webclient-plugin/src/main/java/co/elastic/apm/agent/springwebclient/WebClientExchangeFunctionInstrumentation.java index 585426f4f7..cc28e157fa 100644 --- a/apm-agent-plugins/apm-spring-webflux/apm-spring-webclient-plugin/src/main/java/co/elastic/apm/agent/springwebclient/WebClientExchangeFunctionInstrumentation.java +++ b/apm-agent-plugins/apm-spring-webflux/apm-spring-webclient-plugin/src/main/java/co/elastic/apm/agent/springwebclient/WebClientExchangeFunctionInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.springwebclient; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.httpclient.HttpClientHelper; import co.elastic.apm.plugin.spi.AbstractSpan; import co.elastic.apm.plugin.spi.Span; diff --git a/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/main/java/co/elastic/apm/agent/springwebflux/WebFluxInstrumentation.java b/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/main/java/co/elastic/apm/agent/springwebflux/WebFluxInstrumentation.java index 2008f1d305..c66fd41307 100644 --- a/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/main/java/co/elastic/apm/agent/springwebflux/WebFluxInstrumentation.java +++ b/apm-agent-plugins/apm-spring-webflux/apm-spring-webflux-plugin/src/main/java/co/elastic/apm/agent/springwebflux/WebFluxInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.springwebflux; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.Collection; import java.util.Collections; diff --git a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/ExceptionHandlerInstrumentation.java b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/ExceptionHandlerInstrumentation.java index c160b4d2c9..1f84d991d3 100644 --- a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/ExceptionHandlerInstrumentation.java +++ b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/ExceptionHandlerInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.springwebmvc; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; 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/springwebmvc/ServletWrappingControllerTransactionNameInstrumentation.java b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/ServletWrappingControllerTransactionNameInstrumentation.java index 3099b81667..b2eef5a51e 100644 --- a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/ServletWrappingControllerTransactionNameInstrumentation.java +++ b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/ServletWrappingControllerTransactionNameInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.springwebmvc; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.Transaction; import co.elastic.apm.agent.util.TransactionNameUtils; import net.bytebuddy.asm.Advice; diff --git a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/SpringServiceNameInstrumentation.java b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/SpringServiceNameInstrumentation.java index 76f684d0f4..9a9453c7f8 100644 --- a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/SpringServiceNameInstrumentation.java +++ b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/SpringServiceNameInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.springwebmvc; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.ServiceInfo; import co.elastic.apm.agent.servlet.ServletServiceNameHelper; import co.elastic.apm.agent.servlet.adapter.JavaxServletApiAdapter; diff --git a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/SpringTransactionNameInstrumentation.java b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/SpringTransactionNameInstrumentation.java index 1a22f859b6..41736884eb 100644 --- a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/SpringTransactionNameInstrumentation.java +++ b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/SpringTransactionNameInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.springwebmvc; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.GlobalTracer; import co.elastic.apm.plugin.spi.Transaction; import co.elastic.apm.agent.util.TransactionNameUtils; diff --git a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/ViewRenderInstrumentation.java b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/ViewRenderInstrumentation.java index ba7492f439..8240a49b78 100644 --- a/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/ViewRenderInstrumentation.java +++ b/apm-agent-plugins/apm-spring-webmvc-plugin/src/main/java/co/elastic/apm/agent/springwebmvc/ViewRenderInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.springwebmvc; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.plugin.spi.AbstractSpan; import co.elastic.apm.plugin.spi.Span; import net.bytebuddy.asm.Advice; diff --git a/apm-agent-plugins/apm-struts-plugin/src/main/java/co/elastic/apm/agent/struts/StrutsInstrumentation.java b/apm-agent-plugins/apm-struts-plugin/src/main/java/co/elastic/apm/agent/struts/StrutsInstrumentation.java index a86c9b86e7..c93bbb149a 100644 --- a/apm-agent-plugins/apm-struts-plugin/src/main/java/co/elastic/apm/agent/struts/StrutsInstrumentation.java +++ b/apm-agent-plugins/apm-struts-plugin/src/main/java/co/elastic/apm/agent/struts/StrutsInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.struts; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import java.util.Collection; diff --git a/apm-agent-plugins/apm-urlconnection-plugin/src/main/java/co/elastic/apm/agent/urlconnection/HttpUrlConnectionInstrumentation.java b/apm-agent-plugins/apm-urlconnection-plugin/src/main/java/co/elastic/apm/agent/urlconnection/HttpUrlConnectionInstrumentation.java index a4485b4ed7..ad7141611f 100644 --- a/apm-agent-plugins/apm-urlconnection-plugin/src/main/java/co/elastic/apm/agent/urlconnection/HttpUrlConnectionInstrumentation.java +++ b/apm-agent-plugins/apm-urlconnection-plugin/src/main/java/co/elastic/apm/agent/urlconnection/HttpUrlConnectionInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.urlconnection; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.collections.WeakConcurrentProviderImpl; import co.elastic.apm.agent.httpclient.HttpClientHelper; import co.elastic.apm.plugin.spi.*; diff --git a/apm-agent-plugins/apm-urlconnection-plugin/src/main/java/co/elastic/apm/agent/urlconnection/SSLContextInstrumentation.java b/apm-agent-plugins/apm-urlconnection-plugin/src/main/java/co/elastic/apm/agent/urlconnection/SSLContextInstrumentation.java index 45178a7a67..208646ca28 100644 --- a/apm-agent-plugins/apm-urlconnection-plugin/src/main/java/co/elastic/apm/agent/urlconnection/SSLContextInstrumentation.java +++ b/apm-agent-plugins/apm-urlconnection-plugin/src/main/java/co/elastic/apm/agent/urlconnection/SSLContextInstrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.urlconnection; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import co.elastic.apm.agent.common.ThreadUtils; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; diff --git a/apm-agent-plugins/apm-vertx/apm-vertx3-plugin/src/main/java/co/elastic/apm/agent/vertx/v3/Vertx3Instrumentation.java b/apm-agent-plugins/apm-vertx/apm-vertx3-plugin/src/main/java/co/elastic/apm/agent/vertx/v3/Vertx3Instrumentation.java index 763a2f2428..c147d057cd 100644 --- a/apm-agent-plugins/apm-vertx/apm-vertx3-plugin/src/main/java/co/elastic/apm/agent/vertx/v3/Vertx3Instrumentation.java +++ b/apm-agent-plugins/apm-vertx/apm-vertx3-plugin/src/main/java/co/elastic/apm/agent/vertx/v3/Vertx3Instrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.vertx.v3; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.matcher.ElementMatcher; import java.util.Arrays; diff --git a/apm-agent-plugins/apm-vertx/apm-vertx4-plugin/src/main/java/co/elastic/apm/agent/vertx/v4/Vertx4Instrumentation.java b/apm-agent-plugins/apm-vertx/apm-vertx4-plugin/src/main/java/co/elastic/apm/agent/vertx/v4/Vertx4Instrumentation.java index e32c3b0f26..4403cb82b4 100644 --- a/apm-agent-plugins/apm-vertx/apm-vertx4-plugin/src/main/java/co/elastic/apm/agent/vertx/v4/Vertx4Instrumentation.java +++ b/apm-agent-plugins/apm-vertx/apm-vertx4-plugin/src/main/java/co/elastic/apm/agent/vertx/v4/Vertx4Instrumentation.java @@ -18,7 +18,7 @@ */ package co.elastic.apm.agent.vertx.v4; -import co.elastic.apm.agent.bci.TracerAwareInstrumentation; +import co.elastic.apm.agent.sdk.TracerAwareInstrumentation; import net.bytebuddy.matcher.ElementMatcher; import java.util.Arrays; diff --git a/apm-agent-plugin-spi/pom.xml b/apm-agent-tracer-api/pom.xml similarity index 88% rename from apm-agent-plugin-spi/pom.xml rename to apm-agent-tracer-api/pom.xml index cb4d787d01..c5fc668015 100644 --- a/apm-agent-plugin-spi/pom.xml +++ b/apm-agent-tracer-api/pom.xml @@ -9,7 +9,7 @@ 1.36.1-SNAPSHOT - apm-agent-plugin-spi + apm-agent-tracer-api ${project.groupId}:${project.artifactId} @@ -22,13 +22,6 @@ ${project.basedir}/.. - - - net.bytebuddy - byte-buddy-dep - - - diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/AbstractContext.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/AbstractContext.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/AbstractContext.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/AbstractContext.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/AbstractHeaderGetter.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/AbstractHeaderGetter.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/AbstractHeaderGetter.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/AbstractHeaderGetter.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/AbstractSpan.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/AbstractSpan.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/AbstractSpan.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/AbstractSpan.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Allocator.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Allocator.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Allocator.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Allocator.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/BinaryHeaderGetter.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/BinaryHeaderGetter.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/BinaryHeaderGetter.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/BinaryHeaderGetter.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/BinaryHeaderSetter.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/BinaryHeaderSetter.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/BinaryHeaderSetter.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/BinaryHeaderSetter.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ChildContextCreator.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ChildContextCreator.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ChildContextCreator.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ChildContextCreator.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Cloud.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Cloud.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Cloud.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Cloud.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/CloudOrigin.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/CloudOrigin.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/CloudOrigin.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/CloudOrigin.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/CoreConfiguration.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/CoreConfiguration.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/CoreConfiguration.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/CoreConfiguration.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Db.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Db.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Db.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Db.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/DefaultOutcome.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/DefaultOutcome.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/DefaultOutcome.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/DefaultOutcome.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Destination.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Destination.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Destination.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Destination.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/DisabledObjectPool.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/DisabledObjectPool.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/DisabledObjectPool.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/DisabledObjectPool.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/DisabledObjectPoolFactory.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/DisabledObjectPoolFactory.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/DisabledObjectPoolFactory.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/DisabledObjectPoolFactory.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ElasticContext.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ElasticContext.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ElasticContext.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ElasticContext.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyCloud.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyCloud.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyCloud.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyCloud.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyCloudOrigin.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyCloudOrigin.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyCloudOrigin.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyCloudOrigin.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyCoreConfiguration.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyCoreConfiguration.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyCoreConfiguration.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyCoreConfiguration.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyDb.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyDb.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyDb.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyDb.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyDestination.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyDestination.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyDestination.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyDestination.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyFaas.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyFaas.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyFaas.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyFaas.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyHttp.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyHttp.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyHttp.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyHttp.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyMessage.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyMessage.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyMessage.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyMessage.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyMessagingConfiguration.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyMessagingConfiguration.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyMessagingConfiguration.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyMessagingConfiguration.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyPotentiallyMultiValuedMap.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyPotentiallyMultiValuedMap.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyPotentiallyMultiValuedMap.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyPotentiallyMultiValuedMap.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyRequest.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyRequest.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyRequest.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyRequest.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyResponse.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyResponse.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyResponse.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyResponse.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptySocket.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptySocket.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptySocket.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptySocket.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyStacktraceConfiguration.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyStacktraceConfiguration.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyStacktraceConfiguration.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyStacktraceConfiguration.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyUrl.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyUrl.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyUrl.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyUrl.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyUser.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyUser.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyUser.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyUser.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyWebConfiguration.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyWebConfiguration.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/EmptyWebConfiguration.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/EmptyWebConfiguration.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ErrorCapture.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ErrorCapture.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ErrorCapture.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ErrorCapture.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Faas.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Faas.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Faas.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Faas.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/GlobalTracer.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/GlobalTracer.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/GlobalTracer.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/GlobalTracer.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/HeaderChildContextCreator.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/HeaderChildContextCreator.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/HeaderChildContextCreator.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/HeaderChildContextCreator.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/HeaderGetter.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/HeaderGetter.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/HeaderGetter.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/HeaderGetter.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/HeaderRemover.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/HeaderRemover.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/HeaderRemover.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/HeaderRemover.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/HeaderSetter.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/HeaderSetter.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/HeaderSetter.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/HeaderSetter.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Http.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Http.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Http.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Http.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Id.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Id.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Id.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Id.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Message.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Message.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Message.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Message.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/MessagingConfiguration.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/MessagingConfiguration.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/MessagingConfiguration.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/MessagingConfiguration.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/NoopTracer.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/NoopTracer.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/NoopTracer.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/NoopTracer.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ObjectPool.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ObjectPool.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ObjectPool.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ObjectPool.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ObjectPoolFactory.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ObjectPoolFactory.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ObjectPoolFactory.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ObjectPoolFactory.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Outcome.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Outcome.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Outcome.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Outcome.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/PotentiallyMultiValuedMap.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/PotentiallyMultiValuedMap.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/PotentiallyMultiValuedMap.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/PotentiallyMultiValuedMap.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Recyclable.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Recyclable.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Recyclable.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Recyclable.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Request.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Request.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Request.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Request.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Response.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Response.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Response.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Response.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ResultUtil.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ResultUtil.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ResultUtil.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ResultUtil.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Scope.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Scope.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Scope.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Scope.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ServiceInfo.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ServiceInfo.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ServiceInfo.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ServiceInfo.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ServiceTarget.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ServiceTarget.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ServiceTarget.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/ServiceTarget.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Socket.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Socket.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Socket.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Socket.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Span.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Span.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Span.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Span.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/SpanContext.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/SpanContext.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/SpanContext.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/SpanContext.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/StacktraceConfiguration.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/StacktraceConfiguration.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/StacktraceConfiguration.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/StacktraceConfiguration.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/StringUtils.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/StringUtils.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/StringUtils.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/StringUtils.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/TextHeaderGetter.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/TextHeaderGetter.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/TextHeaderGetter.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/TextHeaderGetter.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/TextHeaderSetter.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/TextHeaderSetter.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/TextHeaderSetter.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/TextHeaderSetter.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/TraceContext.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/TraceContext.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/TraceContext.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/TraceContext.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/TraceContextUtil.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/TraceContextUtil.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/TraceContextUtil.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/TraceContextUtil.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Tracer.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Tracer.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Tracer.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Tracer.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Transaction.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Transaction.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Transaction.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Transaction.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/TransactionContext.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/TransactionContext.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/TransactionContext.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/TransactionContext.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Url.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Url.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Url.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/Url.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/User.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/User.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/User.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/User.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/WebConfiguration.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/WebConfiguration.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/WebConfiguration.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/WebConfiguration.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/WildcardMatcher.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/WildcardMatcher.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/WildcardMatcher.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/WildcardMatcher.java diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/WildcardMatcherUtil.java b/apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/WildcardMatcherUtil.java similarity index 100% rename from apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/WildcardMatcherUtil.java rename to apm-agent-tracer-api/src/main/java/co/elastic/apm/plugin/spi/WildcardMatcherUtil.java diff --git a/pom.xml b/pom.xml index 1f15a04bc0..8d2685b12e 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ apm-agent-common apm-agent-cached-lookup-key apm-opentracing - apm-agent-plugin-spi + apm-agent-tracer-api