From 50c8ab499d75190b966ab0d7facb910957412fc5 Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Wed, 25 Nov 2020 05:50:32 +0100 Subject: [PATCH] Remove no longer needed helperClassNames() methods (#1755) --- .../AkkaHttpClientInstrumentationModule.java | 10 --- .../AkkaHttpServerInstrumentationModule.java | 12 ---- .../ApacheCamelInstrumentationModule.java | 27 -------- ...eHttpAsyncClientInstrumentationModule.java | 10 --- ...ApacheHttpClientInstrumentationModule.java | 7 -- ...ApacheHttpClientInstrumentationModule.java | 11 --- .../v1_0/ArmeriaInstrumentationModule.java | 19 ----- .../AsyncHttpClientInstrumentationModule.java | 7 -- .../v1_0/AwsLambdaInstrumentationModule.java | 11 --- .../v1_11/AwsSdkInstrumentationModule.java | 14 +--- .../v2_2/AwsSdkInstrumentationModule.java | 14 ---- .../CassandraClientInstrumentationModule.java | 11 --- .../CassandraClientInstrumentationModule.java | 10 --- .../ClassLoaderInstrumentationModule.java | 5 -- .../v2_0/CouchbaseInstrumentationModule.java | 13 ---- .../DropwizardViewsInstrumentationModule.java | 5 -- ...earch5RestClientInstrumentationModule.java | 8 --- ...earch6RestClientInstrumentationModule.java | 8 --- ...5TransportClientInstrumentationModule.java | 13 ---- ...3TransportClientInstrumentationModule.java | 13 ---- ...6TransportClientInstrumentationModule.java | 13 ---- ...TraceAnnotationsInstrumentationModule.java | 7 -- .../TraceConfigInstrumentationModule.java | 7 -- .../finatra/FinatraInstrumentationModule.java | 7 -- .../geode/GeodeInstrumentationModule.java | 7 -- ...GoogleHttpClientInstrumentationModule.java | 7 -- .../grizzly/GrizzlyInstrumentationModule.java | 5 -- .../grpc/v1_5/GrpcInstrumentationModule.java | 17 ----- .../v3_3/HibernateInstrumentationModule.java | 8 --- .../v4_0/HibernateInstrumentationModule.java | 8 --- .../v4_3/HibernateInstrumentationModule.java | 8 --- ...ttpUrlConnectionInstrumentationModule.java | 10 --- .../hystrix/HystrixInstrumentationModule.java | 12 ---- .../HttpClientInstrumentationModule.java | 9 --- .../JaxRsClientInstrumentationModule.java | 7 -- .../JaxRsClientInstrumentationModule.java | 10 --- .../JerseyClientInstrumentationModule.java | 9 --- .../ResteasyClientInstrumentationModule.java | 7 -- .../v1_0/JaxRsInstrumentationModule.java | 9 --- .../v2_0/JaxRsInstrumentationModule.java | 11 --- .../v2_0/JerseyInstrumentationModule.java | 10 --- .../v2_0/Resteasy30InstrumentationModule.java | 10 --- .../v2_0/Resteasy31InstrumentationModule.java | 10 --- .../JdbcDataSourceInstrumentationModule.java | 29 -------- .../jdbc/JdbcInstrumentationModule.java | 29 -------- .../v1_4/JedisInstrumentationModule.java | 7 -- .../v3_0/JedisInstrumentationModule.java | 7 -- .../jetty/JettyInstrumentationModule.java | 13 ---- .../jms/JmsInstrumentationModule.java | 10 --- .../jsp/JspInstrumentationModule.java | 7 -- .../KafkaClientsInstrumentationModule.java | 15 ---- .../KafkaStreamsInstrumentationModule.java | 9 --- .../khttp/KHttpInstrumentationModule.java | 9 --- ...KotlinCoroutinesInstrumentationModule.java | 9 --- ...KubernetesClientInstrumentationModule.java | 13 ---- .../v4_0/LettuceInstrumentationModule.java | 10 --- .../v5_0/LettuceInstrumentationModule.java | 17 ----- .../v5_1/LettuceInstrumentationModule.java | 14 ---- .../v2_13_2/Log4j2InstrumentationModule.java | 7 -- .../v2_7/Log4j27InstrumentationModule.java | 7 -- .../v1_0/LogbackInstrumentationModule.java | 9 --- .../MongoClientInstrumentationModule.java | 8 --- .../MongoClientInstrumentationModule.java | 8 --- ...MongoAsyncClientInstrumentationModule.java | 8 --- .../v3_8/NettyInstrumentationModule.java | 23 ------- .../v4_0/NettyInstrumentationModule.java | 20 ------ .../v4_1/NettyInstrumentationModule.java | 20 ------ .../v2_2/OkHttp2InstrumentationModule.java | 9 --- .../v3_0/OkHttp3InstrumentationModule.java | 9 --- ...OpenTelemetryApiInstrumentationModule.java | 69 ------------------- ...thSpanAnnotationInstrumentationModule.java | 7 -- .../oshi/OshiInstrumentationModule.java | 14 ---- .../v1_0/PlayWsInstrumentationModule.java | 10 --- .../v2_0/PlayWsInstrumentationModule.java | 10 --- .../v2_1/PlayWsInstrumentationModule.java | 10 --- .../play/v2_3/PlayInstrumentationModule.java | 5 -- .../play/v2_4/PlayInstrumentationModule.java | 5 -- .../play/v2_6/PlayInstrumentationModule.java | 5 -- .../RabbitMqInstrumentationModule.java | 11 --- .../ratpack/RatpackInstrumentationModule.java | 12 ---- .../reactor/ReactorInstrumentationModule.java | 9 --- .../ReactorNettyInstrumentationModule.java | 21 ------ .../RediscalaInstrumentationModule.java | 8 --- .../redisson/RedissonInstrumentation.java | 5 -- .../RmiClientInstrumentationModule.java | 5 -- ...ntextPropagationInstrumentationModule.java | 12 ---- .../rmi/server/RmiServerInstrumentation.java | 5 -- .../v2_2/Servlet2InstrumentationModule.java | 10 --- .../v3_0/Servlet3InstrumentationModule.java | 11 --- ...equestDispatcherInstrumentationModule.java | 7 -- ...pServletResponseInstrumentationModule.java | 7 -- .../data/SpringDataInstrumentationModule.java | 9 --- ...SpringSchedulingInstrumentationModule.java | 7 -- .../WebfluxClientInstrumentationModule.java | 11 --- .../WebfluxServerInstrumentationModule.java | 10 --- .../SpringWebMvcInstrumentationModule.java | 9 --- .../SpymemcachedInstrumentationModule.java | 12 ---- .../struts2/Struts2InstrumentationModule.java | 5 -- .../twilio/TwilioInstrumentationModule.java | 8 --- .../VertxRxInstrumentationModule.java | 7 -- .../vertx/VertxWebInstrumentationModule.java | 7 -- .../tooling/InstrumentationModule.java | 20 ------ .../muzzle/collector/MuzzleCodeGenerator.java | 2 +- .../ContextTestInstrumentationModule.java | 5 -- 104 files changed, 4 insertions(+), 1128 deletions(-) diff --git a/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationModule.java b/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationModule.java index 43302bfd96..b87daa2452 100644 --- a/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationModule.java +++ b/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationModule.java @@ -38,16 +38,6 @@ public final class AkkaHttpClientInstrumentationModule extends InstrumentationMo super("akka-http", "akka-http-client"); } - @Override - public String[] helperClassNames() { - return new String[] { - AkkaHttpClientInstrumentationModule.class.getName() + "$OnCompleteHandler", - AkkaHttpClientInstrumentationModule.class.getName() + "$AkkaHttpHeaders", - AkkaHttpClientInstrumentationModule.class.getName() + "$InjectAdapter", - packageName + ".AkkaHttpClientTracer", - }; - } - @Override public List typeInstrumentations() { return Collections.singletonList(new HttpExtInstrumentation()); diff --git a/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerInstrumentationModule.java b/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerInstrumentationModule.java index 82399f0320..5d88c5d06f 100644 --- a/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerInstrumentationModule.java +++ b/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerInstrumentationModule.java @@ -38,18 +38,6 @@ public final class AkkaHttpServerInstrumentationModule extends InstrumentationMo super("akka-http", "akka-http-server"); } - @Override - public String[] helperClassNames() { - return new String[] { - AkkaHttpServerInstrumentationModule.class.getName() + "$SyncWrapper", - AkkaHttpServerInstrumentationModule.class.getName() + "$AsyncWrapper", - AkkaHttpServerInstrumentationModule.class.getName() + "$AsyncWrapper$1", - AkkaHttpServerInstrumentationModule.class.getName() + "$AsyncWrapper$2", - packageName + ".AkkaHttpServerHeaders", - packageName + ".AkkaHttpServerTracer", - }; - } - @Override public List typeInstrumentations() { return singletonList(new HttpExtInstrumentation()); diff --git a/instrumentation/apache-camel-2.20/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java b/instrumentation/apache-camel-2.20/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java index 0c5d95bfc6..8c1ecdf799 100644 --- a/instrumentation/apache-camel-2.20/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java +++ b/instrumentation/apache-camel-2.20/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java @@ -33,33 +33,6 @@ public class ApacheCamelInstrumentationModule extends InstrumentationModule { super("apache-camel", "apache-camel-2.20"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection", - "io.opentelemetry.javaagent.instrumentation.apachecamel.SpanDecorator", - "io.opentelemetry.javaagent.instrumentation.apachecamel.decorators.BaseSpanDecorator", - "io.opentelemetry.javaagent.instrumentation.apachecamel.decorators.DbSpanDecorator", - "io.opentelemetry.javaagent.instrumentation.apachecamel.decorators.MessagingSpanDecorator", - "io.opentelemetry.javaagent.instrumentation.apachecamel.decorators.HttpSpanDecorator", - "io.opentelemetry.javaagent.instrumentation.apachecamel.decorators.InternalSpanDecorator", - "io.opentelemetry.javaagent.instrumentation.apachecamel.decorators.KafkaSpanDecorator", - "io.opentelemetry.javaagent.instrumentation.apachecamel.decorators.LogSpanDecorator", - "io.opentelemetry.javaagent.instrumentation.apachecamel.decorators.RestSpanDecorator", - "io.opentelemetry.javaagent.instrumentation.apachecamel.decorators.TimerSpanDecorator", - "io.opentelemetry.javaagent.instrumentation.apachecamel.decorators.DecoratorRegistry", - "io.opentelemetry.javaagent.instrumentation.apachecamel.ActiveSpanManager", - "io.opentelemetry.javaagent.instrumentation.apachecamel.ActiveSpanManager$SpanWithScope", - "io.opentelemetry.javaagent.instrumentation.apachecamel.CamelPropagationUtil", - "io.opentelemetry.javaagent.instrumentation.apachecamel.CamelPropagationUtil$MapGetter", - "io.opentelemetry.javaagent.instrumentation.apachecamel.CamelPropagationUtil$MapSetter", - "io.opentelemetry.javaagent.instrumentation.apachecamel.CamelTracer", - "io.opentelemetry.javaagent.instrumentation.apachecamel.CamelEventNotifier", - "io.opentelemetry.javaagent.instrumentation.apachecamel.CamelRoutePolicy", - "io.opentelemetry.javaagent.instrumentation.apachecamel.CamelTracingService" - }; - } - @Override public List typeInstrumentations() { return singletonList(new CamelContextInstrumentation()); diff --git a/instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentationModule.java b/instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentationModule.java index c70a8cfd5a..3f3bc668a5 100644 --- a/instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentationModule.java +++ b/instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentationModule.java @@ -18,16 +18,6 @@ public class ApacheHttpAsyncClientInstrumentationModule extends InstrumentationM super("apache-httpasyncclient", "apache-httpasyncclient-4.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HttpHeadersInjectAdapter", - ApacheHttpAsyncClientInstrumentation.class.getName() + "$DelegatingRequestProducer", - ApacheHttpAsyncClientInstrumentation.class.getName() + "$TraceContinuedFutureCallback", - packageName + ".ApacheHttpAsyncClientTracer" - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumentationModule.java b/instrumentation/apache-httpclient/apache-httpclient-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumentationModule.java index 815b86b0ed..05e9756bc1 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumentationModule.java +++ b/instrumentation/apache-httpclient/apache-httpclient-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumentationModule.java @@ -36,13 +36,6 @@ public class ApacheHttpClientInstrumentationModule extends InstrumentationModule super("apache-httpclient", "apache-httpclient-2.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CommonsHttpClientTracer", packageName + ".HttpHeadersInjectAdapter", - }; - } - @Override public List typeInstrumentations() { return singletonList(new HttpClientInstrumentation()); diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumentationModule.java b/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumentationModule.java index 4e8fd73597..c3cc470cd8 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumentationModule.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumentationModule.java @@ -41,17 +41,6 @@ public class ApacheHttpClientInstrumentationModule extends InstrumentationModule super("apache-httpclient", "apache-httpclient-4.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0.ApacheHttpClientTracer", - "io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0.HttpHeadersInjectAdapter", - "io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0.HostAndRequestAsHttpUriRequest", - "io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0.ApacheHttpClientHelper", - "io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0.WrappingStatusSettingResponseHandler", - }; - } - @Override public List typeInstrumentations() { return singletonList(new HttpClientInstrumentation()); diff --git a/instrumentation/armeria-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_0/ArmeriaInstrumentationModule.java b/instrumentation/armeria-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_0/ArmeriaInstrumentationModule.java index d4149f2986..a58c2c8134 100644 --- a/instrumentation/armeria-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_0/ArmeriaInstrumentationModule.java +++ b/instrumentation/armeria-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_0/ArmeriaInstrumentationModule.java @@ -18,25 +18,6 @@ public class ArmeriaInstrumentationModule extends InstrumentationModule { super("armeria", "armeria-1.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.armeria.v1_0.ArmeriaDecorators", - "io.opentelemetry.instrumentation.armeria.v1_0.client.ArmeriaClientTracer", - "io.opentelemetry.instrumentation.armeria.v1_0.client.ArmeriaClientTracer$ArmeriaSetter", - "io.opentelemetry.instrumentation.armeria.v1_0.client.OpenTelemetryClient", - "io.opentelemetry.instrumentation.armeria.v1_0.client.OpenTelemetryClient$Decorator", - // Corresponds to lambda when calling .thenAccept(log -> ... - "io.opentelemetry.instrumentation.armeria.v1_0.client.OpenTelemetryClient$1", - "io.opentelemetry.instrumentation.armeria.v1_0.server.ArmeriaServerTracer", - "io.opentelemetry.instrumentation.armeria.v1_0.server.ArmeriaServerTracer$ArmeriaGetter", - "io.opentelemetry.instrumentation.armeria.v1_0.server.OpenTelemetryService", - "io.opentelemetry.instrumentation.armeria.v1_0.server.OpenTelemetryService$Decorator", - // Corresponds to lambda when calling .thenAccept(log -> ... - "io.opentelemetry.instrumentation.armeria.v1_0.server.OpenTelemetryService$1", - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/async-http-client-1.9/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientInstrumentationModule.java b/instrumentation/async-http-client-1.9/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientInstrumentationModule.java index 147a88574f..cee20d454f 100644 --- a/instrumentation/async-http-client-1.9/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientInstrumentationModule.java +++ b/instrumentation/async-http-client-1.9/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientInstrumentationModule.java @@ -21,13 +21,6 @@ public class AsyncHttpClientInstrumentationModule super("async-http-client", "async-http-client-1.9"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AsyncHttpClientTracer", packageName + ".AsyncHttpClientInjectAdapter" - }; - } - @Override public List typeInstrumentations() { return asList(new RequestInstrumentation(), new ResponseInstrumentation()); diff --git a/instrumentation/aws-lambda-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambda/v1_0/AwsLambdaInstrumentationModule.java b/instrumentation/aws-lambda-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambda/v1_0/AwsLambdaInstrumentationModule.java index 462544fb71..171982ec95 100644 --- a/instrumentation/aws-lambda-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambda/v1_0/AwsLambdaInstrumentationModule.java +++ b/instrumentation/aws-lambda-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambda/v1_0/AwsLambdaInstrumentationModule.java @@ -18,17 +18,6 @@ public class AwsLambdaInstrumentationModule extends InstrumentationModule { super("aws-lambda", "aws-lambda-1.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AwsLambdaInstrumentationHelper", - "io.opentelemetry.instrumentation.awslambda.v1_0.AwsLambdaTracer", - "io.opentelemetry.instrumentation.awslambda.v1_0.AwsLambdaMessageTracer", - "io.opentelemetry.instrumentation.awslambda.v1_0.ParentContextExtractor", - "io.opentelemetry.instrumentation.awslambda.v1_0.ParentContextExtractor$MapGetter" - }; - } - @Override public List typeInstrumentations() { return singletonList(new AwsLambdaRequestHandlerInstrumentation()); diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java index 32e0db1c3d..0a0dbac6a5 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java @@ -20,16 +20,6 @@ public class AwsSdkInstrumentationModule extends InstrumentationModule { super("aws-sdk", "aws-sdk-1.11"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AwsSdkClientTracer", - packageName + ".AwsSdkClientTracer$NamesCache", - packageName + ".RequestMeta", - packageName + ".TracingRequestHandler", - }; - } - @Override public List typeInstrumentations() { return asList( @@ -41,6 +31,8 @@ public class AwsSdkInstrumentationModule extends InstrumentationModule { @Override public Map contextStore() { - return singletonMap("com.amazonaws.AmazonWebServiceRequest", packageName + ".RequestMeta"); + return singletonMap( + "com.amazonaws.AmazonWebServiceRequest", + "io.opentelemetry.javaagent.instrumentation.awssdk.v1_11.RequestMeta"); } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java index 76a73ac34b..8537fe65a1 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java @@ -20,20 +20,6 @@ public class AwsSdkInstrumentationModule extends InstrumentationModule { super("aws-sdk", "aws-sdk-2.2"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TracingExecutionInterceptor", - packageName + ".TracingExecutionInterceptor$ScopeHolder", - "io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdk", - "io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkHttpClientTracer", - "io.opentelemetry.instrumentation.awssdk.v2_2.RequestType", - "io.opentelemetry.instrumentation.awssdk.v2_2.SdkRequestDecorator", - "io.opentelemetry.instrumentation.awssdk.v2_2.DbRequestDecorator", - "io.opentelemetry.instrumentation.awssdk.v2_2.TracingExecutionInterceptor" - }; - } - /** * Injects resource file with reference to our {@link TracingExecutionInterceptor} to allow SDK's * service loading mechanism to pick it up. diff --git a/instrumentation/cassandra/cassandra-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraClientInstrumentationModule.java b/instrumentation/cassandra/cassandra-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraClientInstrumentationModule.java index ff80c2ff25..98be621084 100644 --- a/instrumentation/cassandra/cassandra-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraClientInstrumentationModule.java +++ b/instrumentation/cassandra/cassandra-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraClientInstrumentationModule.java @@ -29,17 +29,6 @@ public class CassandraClientInstrumentationModule extends InstrumentationModule super("cassandra", "cassandra-3.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CassandraQueryNormalizer", - packageName + ".CassandraDatabaseClientTracer", - packageName + ".TracingSession", - packageName + ".TracingSession$1", - packageName + ".TracingSession$2", - }; - } - @Override public List typeInstrumentations() { return singletonList(new ClusterManagerInstrumentation()); diff --git a/instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraClientInstrumentationModule.java b/instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraClientInstrumentationModule.java index 22a2e3f020..7a58a843de 100644 --- a/instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraClientInstrumentationModule.java +++ b/instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraClientInstrumentationModule.java @@ -27,16 +27,6 @@ public class CassandraClientInstrumentationModule extends InstrumentationModule super("cassandra", "cassandra-4.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CassandraQueryNormalizer", - packageName + ".CassandraDatabaseClientTracer", - packageName + ".TracingCqlSession", - packageName + ".CompletionStageFunction" - }; - } - @Override public List typeInstrumentations() { return singletonList(new SessionBuilderInstrumentation()); diff --git a/instrumentation/classloaders/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ClassLoaderInstrumentationModule.java b/instrumentation/classloaders/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ClassLoaderInstrumentationModule.java index 0b4b4b5b76..4e6accdcb2 100644 --- a/instrumentation/classloaders/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ClassLoaderInstrumentationModule.java +++ b/instrumentation/classloaders/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ClassLoaderInstrumentationModule.java @@ -18,11 +18,6 @@ public class ClassLoaderInstrumentationModule extends InstrumentationModule { super("classloader"); } - @Override - public String[] helperClassNames() { - return new String[] {"io.opentelemetry.javaagent.tooling.Constants"}; - } - @Override protected String[] additionalHelperClassNames() { return new String[] {"io.opentelemetry.javaagent.tooling.Constants"}; diff --git a/instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java index dc2adf4eab..bf2dfac790 100644 --- a/instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java +++ b/instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java @@ -25,19 +25,6 @@ public class CouchbaseInstrumentationModule extends InstrumentationModule { }; } - @Override - public String[] helperClassNames() { - return new String[] { - "rx.__OpenTelemetryTracingUtil", - "io.opentelemetry.instrumentation.rxjava.SpanFinishingSubscription", - "io.opentelemetry.instrumentation.rxjava.TracedSubscriber", - "io.opentelemetry.instrumentation.rxjava.TracedOnSubscribe", - packageName + ".CouchbaseClientTracer", - packageName + ".CouchbaseOnSubscribe", - packageName + ".CouchbaseQueryNormalizer" - }; - } - @Override public List typeInstrumentations() { return asList(new CouchbaseBucketInstrumentation(), new CouchbaseClusterInstrumentation()); diff --git a/instrumentation/dropwizard-views-0.7/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardViewsInstrumentationModule.java b/instrumentation/dropwizard-views-0.7/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardViewsInstrumentationModule.java index 1cd204e0b0..dfe5f93d84 100644 --- a/instrumentation/dropwizard-views-0.7/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardViewsInstrumentationModule.java +++ b/instrumentation/dropwizard-views-0.7/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardViewsInstrumentationModule.java @@ -40,11 +40,6 @@ public final class DropwizardViewsInstrumentationModule extends InstrumentationM return singletonList(new ViewRendererInstrumentation()); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".DropwizardTracer"}; - } - private static final class ViewRendererInstrumentation implements TypeInstrumentation { @Override public ElementMatcher classLoaderOptimization() { diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/Elasticsearch5RestClientInstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/Elasticsearch5RestClientInstrumentationModule.java index 034e9d60c6..faa609b4b2 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/Elasticsearch5RestClientInstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/Elasticsearch5RestClientInstrumentationModule.java @@ -33,14 +33,6 @@ public class Elasticsearch5RestClientInstrumentationModule extends Instrumentati super("elasticsearch-rest", "elasticsearch-rest-5.0", "elasticsearch"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.elasticsearch.rest.ElasticsearchRestClientTracer", - packageName + ".RestResponseListener", - }; - } - @Override public List typeInstrumentations() { return singletonList(new RestClientInstrumentation()); diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/Elasticsearch6RestClientInstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/Elasticsearch6RestClientInstrumentationModule.java index 1281273c06..141f4754d1 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/Elasticsearch6RestClientInstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/Elasticsearch6RestClientInstrumentationModule.java @@ -33,14 +33,6 @@ public class Elasticsearch6RestClientInstrumentationModule extends Instrumentati super("elasticsearch-rest", "elasticsearch-rest-6.0", "elasticsearch"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.elasticsearch.rest.ElasticsearchRestClientTracer", - packageName + ".RestResponseListener", - }; - } - @Override public List typeInstrumentations() { return singletonList(new RestClientInstrumentation()); diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportClientInstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportClientInstrumentationModule.java index ddf8fd2678..6eabb2b85a 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportClientInstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportClientInstrumentationModule.java @@ -46,19 +46,6 @@ public class Elasticsearch5TransportClientInstrumentationModule extends Instrume }; } - @Override - public String[] helperClassNames() { - return new String[] { - "com.google.common.base.Preconditions", - "com.google.common.base.Joiner", - "com.google.common.base.Joiner$1", - "com.google.common.base.Joiner$2", - "com.google.common.base.Joiner$MapJoiner", - "io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticsearchTransportClientTracer", - packageName + ".TransportActionListener", - }; - } - @Override public List typeInstrumentations() { return singletonList(new AbstractClientInstrumentation()); diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientInstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientInstrumentationModule.java index a5b2a43c33..6249db2baa 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientInstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientInstrumentationModule.java @@ -47,19 +47,6 @@ public class Elasticsearch53TransportClientInstrumentationModule extends Instrum }; } - @Override - public String[] helperClassNames() { - return new String[] { - "com.google.common.base.Preconditions", - "com.google.common.base.Joiner", - "com.google.common.base.Joiner$1", - "com.google.common.base.Joiner$2", - "com.google.common.base.Joiner$MapJoiner", - "io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticsearchTransportClientTracer", - packageName + ".TransportActionListener", - }; - } - @Override public List typeInstrumentations() { return singletonList(new AbstractClientInstrumentation()); diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportClientInstrumentationModule.java b/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportClientInstrumentationModule.java index c7a83f56c0..222f871ce3 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportClientInstrumentationModule.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportClientInstrumentationModule.java @@ -50,19 +50,6 @@ public class Elasticsearch6TransportClientInstrumentationModule extends Instrume }; } - @Override - public String[] helperClassNames() { - return new String[] { - "com.google.common.base.Preconditions", - "com.google.common.base.Joiner", - "com.google.common.base.Joiner$1", - "com.google.common.base.Joiner$2", - "com.google.common.base.Joiner$MapJoiner", - "io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.ElasticsearchTransportClientTracer", - packageName + ".TransportActionListener", - }; - } - @Override public List typeInstrumentations() { return singletonList(new AbstractClientInstrumentation()); diff --git a/instrumentation/external-annotations/src/main/java/io/opentelemetry/javaagent/instrumentation/traceannotation/TraceAnnotationsInstrumentationModule.java b/instrumentation/external-annotations/src/main/java/io/opentelemetry/javaagent/instrumentation/traceannotation/TraceAnnotationsInstrumentationModule.java index 7e4529bf1f..2426994822 100644 --- a/instrumentation/external-annotations/src/main/java/io/opentelemetry/javaagent/instrumentation/traceannotation/TraceAnnotationsInstrumentationModule.java +++ b/instrumentation/external-annotations/src/main/java/io/opentelemetry/javaagent/instrumentation/traceannotation/TraceAnnotationsInstrumentationModule.java @@ -70,13 +70,6 @@ public final class TraceAnnotationsInstrumentationModule extends Instrumentation super("trace", "trace-annotation"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TraceAnnotationTracer", - }; - } - @Override public List typeInstrumentations() { return singletonList(new AnnotatedMethodsInstrumentation()); diff --git a/instrumentation/external-annotations/src/main/java/io/opentelemetry/javaagent/instrumentation/traceannotation/TraceConfigInstrumentationModule.java b/instrumentation/external-annotations/src/main/java/io/opentelemetry/javaagent/instrumentation/traceannotation/TraceConfigInstrumentationModule.java index 96f91fea6e..45d5f4042e 100644 --- a/instrumentation/external-annotations/src/main/java/io/opentelemetry/javaagent/instrumentation/traceannotation/TraceConfigInstrumentationModule.java +++ b/instrumentation/external-annotations/src/main/java/io/opentelemetry/javaagent/instrumentation/traceannotation/TraceConfigInstrumentationModule.java @@ -64,13 +64,6 @@ public class TraceConfigInstrumentationModule extends InstrumentationModule { .collect(Collectors.toList()); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TraceAnnotationTracer", - }; - } - @Override public List typeInstrumentations() { return typeInstrumentations; diff --git a/instrumentation/finatra-2.9/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraInstrumentationModule.java b/instrumentation/finatra-2.9/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraInstrumentationModule.java index 2d225e01b4..4fdeea7377 100644 --- a/instrumentation/finatra-2.9/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraInstrumentationModule.java +++ b/instrumentation/finatra-2.9/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraInstrumentationModule.java @@ -40,13 +40,6 @@ public class FinatraInstrumentationModule extends InstrumentationModule { super("finatra", "finatra-2.9"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".FinatraTracer", FinatraInstrumentationModule.class.getName() + "$Listener" - }; - } - @Override public List typeInstrumentations() { return singletonList(new RouteInstrumentation()); diff --git a/instrumentation/geode-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumentationModule.java b/instrumentation/geode-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumentationModule.java index e69ad296c2..b0b8aec837 100644 --- a/instrumentation/geode-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumentationModule.java +++ b/instrumentation/geode-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumentationModule.java @@ -36,13 +36,6 @@ public class GeodeInstrumentationModule extends InstrumentationModule { super("geode", "geode-1.4"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".GeodeQueryNormalizer", packageName + ".GeodeTracer", - }; - } - @Override public List typeInstrumentations() { return singletonList(new RegionInstrumentation()); diff --git a/instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientInstrumentationModule.java b/instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientInstrumentationModule.java index 6a6322dc26..2c93ed3b49 100644 --- a/instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientInstrumentationModule.java +++ b/instrumentation/google-http-client-1.19/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientInstrumentationModule.java @@ -45,13 +45,6 @@ public class GoogleHttpClientInstrumentationModule extends InstrumentationModule return singletonMap("com.google.api.client.http.HttpRequest", Context.class.getName()); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".GoogleHttpClientTracer", packageName + ".HeadersInjectAdapter" - }; - } - @Override public List typeInstrumentations() { return singletonList(new HttpRequestInstrumentation()); diff --git a/instrumentation/grizzly-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyInstrumentationModule.java b/instrumentation/grizzly-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyInstrumentationModule.java index c63b48bacc..ad1a980d24 100644 --- a/instrumentation/grizzly-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyInstrumentationModule.java +++ b/instrumentation/grizzly-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyInstrumentationModule.java @@ -18,11 +18,6 @@ public class GrizzlyInstrumentationModule extends InstrumentationModule { super("grizzly", "grizzly-2.0"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".GrizzlyHttpServerTracer", packageName + ".ExtractAdapter"}; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/grpc-1.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grpc/v1_5/GrpcInstrumentationModule.java b/instrumentation/grpc-1.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grpc/v1_5/GrpcInstrumentationModule.java index 9fb3519319..50e016e5d7 100644 --- a/instrumentation/grpc-1.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grpc/v1_5/GrpcInstrumentationModule.java +++ b/instrumentation/grpc-1.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grpc/v1_5/GrpcInstrumentationModule.java @@ -18,23 +18,6 @@ public class GrpcInstrumentationModule extends InstrumentationModule { super("grpc", "grpc-1.5"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.instrumentation.grpc.v1_5.common.GrpcHelper", - "io.opentelemetry.instrumentation.grpc.v1_5.client.GrpcClientTracer", - "io.opentelemetry.instrumentation.grpc.v1_5.client.GrpcInjectAdapter", - "io.opentelemetry.instrumentation.grpc.v1_5.client.TracingClientInterceptor", - "io.opentelemetry.instrumentation.grpc.v1_5.client.TracingClientInterceptor$TracingClientCall", - "io.opentelemetry.instrumentation.grpc.v1_5.client.TracingClientInterceptor$TracingClientCallListener", - "io.opentelemetry.instrumentation.grpc.v1_5.server.GrpcExtractAdapter", - "io.opentelemetry.instrumentation.grpc.v1_5.server.GrpcServerTracer", - "io.opentelemetry.instrumentation.grpc.v1_5.server.TracingServerInterceptor", - "io.opentelemetry.instrumentation.grpc.v1_5.server.TracingServerInterceptor$TracingServerCall", - "io.opentelemetry.instrumentation.grpc.v1_5.server.TracingServerInterceptor$TracingServerCallListener", - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java index 52ce054b2b..73a48894a3 100644 --- a/instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java @@ -34,14 +34,6 @@ public class HibernateInstrumentationModule extends InstrumentationModule { "org.hibernate.transaction.JBossTransactionManagerLookup"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.hibernate.SessionMethodUtils", - "io.opentelemetry.javaagent.instrumentation.hibernate.HibernateDecorator", - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java index 259ecc2f5b..e1187079ec 100644 --- a/instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java @@ -23,14 +23,6 @@ public class HibernateInstrumentationModule extends InstrumentationModule { super("hibernate", "hibernate-4.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.hibernate.SessionMethodUtils", - "io.opentelemetry.javaagent.instrumentation.hibernate.HibernateDecorator", - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/hibernate/hibernate-4.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/HibernateInstrumentationModule.java b/instrumentation/hibernate/hibernate-4.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/HibernateInstrumentationModule.java index d4e5b85ec2..b1d0003523 100644 --- a/instrumentation/hibernate/hibernate-4.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/HibernateInstrumentationModule.java +++ b/instrumentation/hibernate/hibernate-4.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/HibernateInstrumentationModule.java @@ -22,14 +22,6 @@ public class HibernateInstrumentationModule extends InstrumentationModule { super("hibernate", "hibernate-4.3"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.hibernate.SessionMethodUtils", - "io.opentelemetry.javaagent.instrumentation.hibernate.HibernateDecorator", - }; - } - @Override public List typeInstrumentations() { return asList(new ProcedureCallInstrumentation(), new SessionInstrumentation()); diff --git a/instrumentation/http-url-connection/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionInstrumentationModule.java b/instrumentation/http-url-connection/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionInstrumentationModule.java index c4a0158969..07e39670d4 100644 --- a/instrumentation/http-url-connection/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionInstrumentationModule.java +++ b/instrumentation/http-url-connection/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionInstrumentationModule.java @@ -40,16 +40,6 @@ public class HttpUrlConnectionInstrumentationModule extends InstrumentationModul super("httpurlconnection"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HttpUrlConnectionTracer", - packageName + ".HeadersInjectAdapter", - HttpUrlConnectionInstrumentationModule.class.getName() + "$HttpUrlState", - HttpUrlConnectionInstrumentationModule.class.getName() + "$HttpUrlState$1", - }; - } - @Override public List typeInstrumentations() { return singletonList(new HttpUrlConnectionInstrumentation()); diff --git a/instrumentation/hystrix-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java b/instrumentation/hystrix-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java index 28719b1088..65ebf342c2 100644 --- a/instrumentation/hystrix-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java +++ b/instrumentation/hystrix-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java @@ -45,18 +45,6 @@ public class HystrixInstrumentationModule extends InstrumentationModule { }; } - @Override - public String[] helperClassNames() { - return new String[] { - "rx.__OpenTelemetryTracingUtil", - "io.opentelemetry.instrumentation.rxjava.SpanFinishingSubscription", - "io.opentelemetry.instrumentation.rxjava.TracedSubscriber", - "io.opentelemetry.instrumentation.rxjava.TracedOnSubscribe", - packageName + ".HystrixTracer", - getClass().getName() + "$HystrixOnSubscribe", - }; - } - @Override public List typeInstrumentations() { return singletonList(new HystrixCommandInstrumentation()); diff --git a/instrumentation/java-httpclient/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/HttpClientInstrumentationModule.java b/instrumentation/java-httpclient/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/HttpClientInstrumentationModule.java index 4df192b883..d7b26fd6ef 100644 --- a/instrumentation/java-httpclient/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/HttpClientInstrumentationModule.java +++ b/instrumentation/java-httpclient/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/HttpClientInstrumentationModule.java @@ -18,15 +18,6 @@ public class HttpClientInstrumentationModule extends InstrumentationModule { super("httpclient"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HttpHeadersInjectAdapter", - packageName + ".JdkHttpClientTracer", - packageName + ".ResponseConsumer" - }; - } - @Override public List typeInstrumentations() { return asList(new HttpClientInstrumentation(), new HttpHeadersInstrumentation()); diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientInstrumentationModule.java b/instrumentation/jaxrs-client/jaxrs-client-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientInstrumentationModule.java index f65329aa2b..604837c99a 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientInstrumentationModule.java +++ b/instrumentation/jaxrs-client/jaxrs-client-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientInstrumentationModule.java @@ -38,13 +38,6 @@ public final class JaxRsClientInstrumentationModule extends InstrumentationModul super("jaxrs-client", "jaxrs-client-1.1"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JaxRsClientV1Tracer", packageName + ".InjectAdapter", - }; - } - @Override public List typeInstrumentations() { return singletonList(new ClientHandlerInstrumentation()); diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientInstrumentationModule.java b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientInstrumentationModule.java index 03c1acf858..10ce5f10e7 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientInstrumentationModule.java +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientInstrumentationModule.java @@ -32,16 +32,6 @@ public final class JaxRsClientInstrumentationModule extends InstrumentationModul super("jaxrs-client", "jaxrs-client-2.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JaxRsClientTracer", - packageName + ".ClientTracingFeature", - packageName + ".ClientTracingFilter", - packageName + ".InjectAdapter", - }; - } - @Override public List typeInstrumentations() { return singletonList(new ClientBuilderInstrumentation()); diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JerseyClientInstrumentationModule.java b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JerseyClientInstrumentationModule.java index a18f492127..205035a666 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JerseyClientInstrumentationModule.java +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JerseyClientInstrumentationModule.java @@ -40,15 +40,6 @@ public final class JerseyClientInstrumentationModule extends InstrumentationModu super("jaxrs-client", "jaxrs-client-2.0", "jersey-client", "jersey-client-2.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - getClass().getName() + "$WrappedFuture", - packageName + ".JaxRsClientTracer", - packageName + ".InjectAdapter", - }; - } - @Override public List typeInstrumentations() { return Collections.singletonList(new JerseyClientConnectionErrorInstrumentation()); diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ResteasyClientInstrumentationModule.java b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ResteasyClientInstrumentationModule.java index 9a08fb9594..da59005c6a 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ResteasyClientInstrumentationModule.java +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ResteasyClientInstrumentationModule.java @@ -42,13 +42,6 @@ public final class ResteasyClientInstrumentationModule extends InstrumentationMo super("jaxrs-client", "jaxrs-client-2.0", "resteasy-client", "resteasy-client-2.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ResteasyClientTracer", packageName + ".ResteasyInjectAdapter", - }; - } - @Override public List typeInstrumentations() { return singletonList(new ResteasyClientConnectionErrorInstrumentation()); diff --git a/instrumentation/jaxrs/jaxrs-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsInstrumentationModule.java b/instrumentation/jaxrs/jaxrs-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsInstrumentationModule.java index c8d829d1e9..5a8054c894 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsInstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsInstrumentationModule.java @@ -27,15 +27,6 @@ public class JaxRsInstrumentationModule extends InstrumentationModule { return not(hasClassesNamed("javax.ws.rs.container.AsyncResponse")); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.tooling.ClassHierarchyIterable", - "io.opentelemetry.javaagent.tooling.ClassHierarchyIterable$ClassIterator", - packageName + ".JaxRsAnnotationsTracer", - }; - } - @Override public List typeInstrumentations() { return singletonList(new JaxRsAnnotationsInstrumentation()); diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsInstrumentationModule.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsInstrumentationModule.java index d8eadb5610..694d0d9941 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsInstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsInstrumentationModule.java @@ -29,17 +29,6 @@ public class JaxRsInstrumentationModule extends InstrumentationModule { return hasClassesNamed("javax.ws.rs.container.AsyncResponse"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.tooling.ClassHierarchyIterable", - "io.opentelemetry.javaagent.tooling.ClassHierarchyIterable$ClassIterator", - packageName + ".JaxRsAnnotationsTracer", - packageName + ".CompletionStageFinishCallback", - packageName + ".RequestContextHelper" - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyInstrumentationModule.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyInstrumentationModule.java index dcfc5452ef..d40f4e8cc3 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyInstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyInstrumentationModule.java @@ -17,16 +17,6 @@ public class JerseyInstrumentationModule extends InstrumentationModule { super("jaxrs", "jaxrs-2.0", "jersey", "jersey-2.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.tooling.ClassHierarchyIterable", - "io.opentelemetry.javaagent.tooling.ClassHierarchyIterable$ClassIterator", - packageName + ".JaxRsAnnotationsTracer", - packageName + ".RequestContextHelper" - }; - } - @Override public List typeInstrumentations() { return Collections.singletonList(new JerseyRequestContextInstrumentation()); diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy30InstrumentationModule.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy30InstrumentationModule.java index 040d87d36e..cff568f3f1 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy30InstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy30InstrumentationModule.java @@ -17,16 +17,6 @@ public class Resteasy30InstrumentationModule extends InstrumentationModule { super("jaxrs", "jaxrs-2.0", "resteasy", "resteasy-3.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.tooling.ClassHierarchyIterable", - "io.opentelemetry.javaagent.tooling.ClassHierarchyIterable$ClassIterator", - packageName + ".JaxRsAnnotationsTracer", - packageName + ".RequestContextHelper" - }; - } - @Override public List typeInstrumentations() { return Collections.singletonList(new Resteasy30RequestContextInstrumentation()); diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy31InstrumentationModule.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy31InstrumentationModule.java index 78d50ed37e..643f208e99 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy31InstrumentationModule.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy31InstrumentationModule.java @@ -17,16 +17,6 @@ public class Resteasy31InstrumentationModule extends InstrumentationModule { super("jaxrs", "jaxrs-2.0", "resteasy", "resteasy-3.1"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.tooling.ClassHierarchyIterable", - "io.opentelemetry.javaagent.tooling.ClassHierarchyIterable$ClassIterator", - packageName + ".JaxRsAnnotationsTracer", - packageName + ".RequestContextHelper" - }; - } - @Override public List typeInstrumentations() { return Collections.singletonList(new Resteasy31RequestContextInstrumentation()); diff --git a/instrumentation/jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcDataSourceInstrumentationModule.java b/instrumentation/jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcDataSourceInstrumentationModule.java index cf0c779ab0..67fa05d4a4 100644 --- a/instrumentation/jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcDataSourceInstrumentationModule.java +++ b/instrumentation/jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcDataSourceInstrumentationModule.java @@ -32,35 +32,6 @@ public final class JdbcDataSourceInstrumentationModule extends InstrumentationMo super("jdbc-datasource"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".DataSourceTracer", - packageName + ".DbInfo", - packageName + ".DbInfo$Builder", - packageName + ".JdbcConnectionUrlParser", - packageName + ".JdbcConnectionUrlParser$1", - packageName + ".JdbcConnectionUrlParser$2", - packageName + ".JdbcConnectionUrlParser$3", - packageName + ".JdbcConnectionUrlParser$4", - packageName + ".JdbcConnectionUrlParser$5", - packageName + ".JdbcConnectionUrlParser$6", - packageName + ".JdbcConnectionUrlParser$7", - packageName + ".JdbcConnectionUrlParser$8", - packageName + ".JdbcConnectionUrlParser$9", - packageName + ".JdbcConnectionUrlParser$10", - packageName + ".JdbcConnectionUrlParser$11", - packageName + ".JdbcConnectionUrlParser$12", - packageName + ".JdbcConnectionUrlParser$13", - packageName + ".JdbcConnectionUrlParser$14", - packageName + ".JdbcConnectionUrlParser$15", - packageName + ".JdbcConnectionUrlParser$16", - packageName + ".JdbcConnectionUrlParser$17", - packageName + ".JdbcMaps", - packageName + ".JdbcUtils", - }; - } - @Override public List typeInstrumentations() { return singletonList(new DataSourceInstrumentation()); diff --git a/instrumentation/jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcInstrumentationModule.java b/instrumentation/jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcInstrumentationModule.java index 3e5530f5e4..b95d5237f3 100644 --- a/instrumentation/jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcInstrumentationModule.java +++ b/instrumentation/jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcInstrumentationModule.java @@ -18,35 +18,6 @@ public class JdbcInstrumentationModule extends InstrumentationModule { super("jdbc"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".DbInfo", - packageName + ".DbInfo$Builder", - packageName + ".JdbcConnectionUrlParser", - packageName + ".JdbcConnectionUrlParser$1", - packageName + ".JdbcConnectionUrlParser$2", - packageName + ".JdbcConnectionUrlParser$3", - packageName + ".JdbcConnectionUrlParser$4", - packageName + ".JdbcConnectionUrlParser$5", - packageName + ".JdbcConnectionUrlParser$6", - packageName + ".JdbcConnectionUrlParser$7", - packageName + ".JdbcConnectionUrlParser$8", - packageName + ".JdbcConnectionUrlParser$9", - packageName + ".JdbcConnectionUrlParser$10", - packageName + ".JdbcConnectionUrlParser$11", - packageName + ".JdbcConnectionUrlParser$12", - packageName + ".JdbcConnectionUrlParser$13", - packageName + ".JdbcConnectionUrlParser$14", - packageName + ".JdbcConnectionUrlParser$15", - packageName + ".JdbcConnectionUrlParser$16", - packageName + ".JdbcConnectionUrlParser$17", - packageName + ".JdbcMaps", - packageName + ".JdbcTracer", - packageName + ".JdbcUtils", - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/jedis/jedis-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisInstrumentationModule.java b/instrumentation/jedis/jedis-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisInstrumentationModule.java index 0ff26a0e90..2bd51be9b2 100644 --- a/instrumentation/jedis/jedis-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisInstrumentationModule.java +++ b/instrumentation/jedis/jedis-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisInstrumentationModule.java @@ -45,13 +45,6 @@ public final class JedisInstrumentationModule extends InstrumentationModule { return not(hasClassesNamed("redis.clients.jedis.commands.ProtocolCommand")); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JedisClientTracer$CommandWithArgs", packageName + ".JedisClientTracer", - }; - } - @Override public List typeInstrumentations() { return singletonList(new ConnectionInstrumentation()); diff --git a/instrumentation/jedis/jedis-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentationModule.java b/instrumentation/jedis/jedis-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentationModule.java index 9c323569fc..5b6bf6e32d 100644 --- a/instrumentation/jedis/jedis-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentationModule.java +++ b/instrumentation/jedis/jedis-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisInstrumentationModule.java @@ -36,13 +36,6 @@ public final class JedisInstrumentationModule extends InstrumentationModule { super("jedis", "jedis-3.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JedisClientTracer$CommandWithArgs", packageName + ".JedisClientTracer", - }; - } - @Override public List typeInstrumentations() { return singletonList(new ConnectionInstrumentation()); diff --git a/instrumentation/jetty-8.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/JettyInstrumentationModule.java b/instrumentation/jetty-8.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/JettyInstrumentationModule.java index 408247189e..f6fe85ef07 100644 --- a/instrumentation/jetty-8.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/JettyInstrumentationModule.java +++ b/instrumentation/jetty-8.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/JettyInstrumentationModule.java @@ -30,19 +30,6 @@ public final class JettyInstrumentationModule extends InstrumentationModule { super("jetty", "jetty-8.0"); } - @Override - public String[] helperClassNames() { - // order matters here because subclasses (e.g. JettyHttpServerTracer) need to be injected into - // the class loader after their super classes (e.g. Servlet3HttpServerTracer) - return new String[] { - "io.opentelemetry.instrumentation.servlet.HttpServletRequestGetter", - "io.opentelemetry.instrumentation.servlet.ServletHttpServerTracer", - "io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3HttpServerTracer", - "io.opentelemetry.javaagent.instrumentation.servlet.v3_0.TagSettingAsyncListener", - packageName + ".JettyHttpServerTracer", - }; - } - @Override public List typeInstrumentations() { return singletonList(new HandlerInstrumentation()); diff --git a/instrumentation/jms-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumentationModule.java b/instrumentation/jms-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumentationModule.java index 3243d85bb6..3fd3adfd04 100644 --- a/instrumentation/jms-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumentationModule.java +++ b/instrumentation/jms-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumentationModule.java @@ -20,16 +20,6 @@ public class JmsInstrumentationModule extends InstrumentationModule { super("jms", "jms-1.1"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".MessageDestination", - packageName + ".JmsTracer", - packageName + ".MessageExtractAdapter", - packageName + ".MessageInjectAdapter" - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/jsp-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationModule.java b/instrumentation/jsp-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationModule.java index 412e4a9db9..c38ceeb95b 100644 --- a/instrumentation/jsp-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationModule.java +++ b/instrumentation/jsp-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationModule.java @@ -18,13 +18,6 @@ public class JspInstrumentationModule extends InstrumentationModule { super("jsp"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JspTracer", - }; - } - @Override public List typeInstrumentations() { return asList(new HttpJspPageInstrumentation(), new JspCompilationContextInstrumentation()); diff --git a/instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientsInstrumentationModule.java b/instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientsInstrumentationModule.java index c5dba479ba..68200eeb7a 100644 --- a/instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientsInstrumentationModule.java +++ b/instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaClientsInstrumentationModule.java @@ -18,21 +18,6 @@ public class KafkaClientsInstrumentationModule extends InstrumentationModule { super("kafka-clients", "kafka-clients-0.11", "kafka"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".KafkaClientConfiguration", - packageName + ".KafkaConsumerTracer", - packageName + ".TextMapExtractAdapter", - packageName + ".TracingIterable", - packageName + ".TracingIterator", - packageName + ".TracingList", - packageName + ".KafkaProducerTracer", - packageName + ".TextMapInjectAdapter", - packageName + ".ProducerCallback" - }; - } - @Override public List typeInstrumentations() { return asList(new KafkaConsumerInstrumentation(), new KafkaProducerInstrumentation()); diff --git a/instrumentation/kafka-streams-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java b/instrumentation/kafka-streams-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java index 7945b3527e..cb395a95bc 100644 --- a/instrumentation/kafka-streams-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java +++ b/instrumentation/kafka-streams-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsInstrumentationModule.java @@ -18,15 +18,6 @@ public class KafkaStreamsInstrumentationModule extends InstrumentationModule { super("kafka-streams", "kafka-streams-0.11", "kafka"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".KafkaStreamsTracer", - packageName + ".TextMapExtractAdapter", - packageName + ".SpanScopeHolder" - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/khttp-0.1/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpInstrumentationModule.java b/instrumentation/khttp-0.1/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpInstrumentationModule.java index a9f27d6262..7d6983cde2 100644 --- a/instrumentation/khttp-0.1/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpInstrumentationModule.java +++ b/instrumentation/khttp-0.1/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpInstrumentationModule.java @@ -32,15 +32,6 @@ public class KHttpInstrumentationModule extends InstrumentationModule { super("khttp"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".KHttpHeadersInjectAdapter", - packageName + ".KHttpTracer", - packageName + ".RequestWrapper", - }; - } - @Override public List typeInstrumentations() { return singletonList(new KHttpInstrumentation()); diff --git a/instrumentation/kotlinx-coroutines/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationModule.java b/instrumentation/kotlinx-coroutines/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationModule.java index 26a2aa6fdc..a4aa96e74a 100644 --- a/instrumentation/kotlinx-coroutines/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationModule.java +++ b/instrumentation/kotlinx-coroutines/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationModule.java @@ -56,15 +56,6 @@ public class KotlinCoroutinesInstrumentationModule extends InstrumentationModule super("kotlinx-coroutines"); } - @Override - public String[] helperClassNames() { - return new String[] { - getClass().getName() + "$CoroutineWrapper", - getClass().getName() + "$TraceScopeKey", - getClass().getName() + "$CoroutineContextWrapper", - }; - } - @Override public List typeInstrumentations() { return singletonList(new KotlinDebugProbeInstrumentation()); diff --git a/instrumentation/kubernetes-client-7.0/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientInstrumentationModule.java b/instrumentation/kubernetes-client-7.0/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientInstrumentationModule.java index 41dded1643..611af0316c 100644 --- a/instrumentation/kubernetes-client-7.0/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientInstrumentationModule.java +++ b/instrumentation/kubernetes-client-7.0/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientInstrumentationModule.java @@ -38,19 +38,6 @@ public class KubernetesClientInstrumentationModule extends InstrumentationModule }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".KubernetesClientTracer", - packageName + ".TracingInterceptor", - packageName + ".KubernetesRequestDigest", - packageName + ".KubernetesResource", - packageName + ".KubernetesVerb", - packageName + ".ParseKubernetesResourceException", - "com.google.common.base.Strings", - }; - } - @Override public List typeInstrumentations() { return singletonList(new ApiClientInstrumentation()); diff --git a/instrumentation/lettuce/lettuce-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceInstrumentationModule.java b/instrumentation/lettuce/lettuce-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceInstrumentationModule.java index 5cb293d825..b01620667c 100644 --- a/instrumentation/lettuce/lettuce-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceInstrumentationModule.java +++ b/instrumentation/lettuce/lettuce-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceInstrumentationModule.java @@ -18,16 +18,6 @@ public class LettuceInstrumentationModule extends InstrumentationModule { super("lettuce", "lettuce-4.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".LettuceAbstractDatabaseClientTracer", - packageName + ".LettuceConnectionDatabaseClientTracer", - packageName + ".LettuceDatabaseClientTracer", - packageName + ".InstrumentationPoints" - }; - } - @Override public List typeInstrumentations() { return asList(new LettuceClientInstrumentation(), new LettuceAsyncCommandsInstrumentation()); diff --git a/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceInstrumentationModule.java b/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceInstrumentationModule.java index ba199533e0..7bae9b0c94 100644 --- a/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceInstrumentationModule.java +++ b/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceInstrumentationModule.java @@ -26,23 +26,6 @@ public class LettuceInstrumentationModule extends InstrumentationModule { return not(hasClassesNamed("io.lettuce.core.tracing.Tracing")); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.lettuce.LettuceArgSplitter", - packageName + ".LettuceAbstractDatabaseClientTracer", - packageName + ".LettuceConnectionDatabaseClientTracer", - packageName + ".LettuceDatabaseClientTracer", - packageName + ".LettuceInstrumentationUtil", - packageName + ".LettuceAsyncBiFunction", - packageName + ".rx.LettuceMonoCreationAdvice", - packageName + ".rx.LettuceMonoDualConsumer", - packageName + ".rx.LettuceFluxCreationAdvice", - packageName + ".rx.LettuceFluxTerminationRunnable", - packageName + ".rx.LettuceFluxTerminationRunnable$FluxOnSubscribeConsumer" - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/lettuce/lettuce-5.1/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceInstrumentationModule.java b/instrumentation/lettuce/lettuce-5.1/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceInstrumentationModule.java index 2d8002356d..367ec91ea7 100644 --- a/instrumentation/lettuce/lettuce-5.1/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceInstrumentationModule.java +++ b/instrumentation/lettuce/lettuce-5.1/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceInstrumentationModule.java @@ -31,20 +31,6 @@ public class LettuceInstrumentationModule extends InstrumentationModule { super("lettuce", "lettuce-5.1"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.lettuce.LettuceArgSplitter", - packageName + ".OpenTelemetryTracing", - packageName + ".OpenTelemetryTracing$OpenTelemetryTracerProvider", - packageName + ".OpenTelemetryTracing$OpenTelemetryTraceContextProvider", - packageName + ".OpenTelemetryTracing$OpenTelemetryTraceContext", - packageName + ".OpenTelemetryTracing$OpenTelemetryEndpoint", - packageName + ".OpenTelemetryTracing$OpenTelemetryTracer", - packageName + ".OpenTelemetryTracing$OpenTelemetrySpan", - }; - } - @Override public ElementMatcher.Junction classLoaderMatcher() { return hasClassesNamed("io.lettuce.core.tracing.Tracing"); diff --git a/instrumentation/log4j/log4j-2.13.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_13_2/Log4j2InstrumentationModule.java b/instrumentation/log4j/log4j-2.13.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_13_2/Log4j2InstrumentationModule.java index 28a03cebfa..38045fd109 100644 --- a/instrumentation/log4j/log4j-2.13.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_13_2/Log4j2InstrumentationModule.java +++ b/instrumentation/log4j/log4j-2.13.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_13_2/Log4j2InstrumentationModule.java @@ -35,13 +35,6 @@ public final class Log4j2InstrumentationModule extends InstrumentationModule { }; } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.instrumentation.log4j.v2_13_2.OpenTelemetryContextDataProvider" - }; - } - @Override public ElementMatcher.Junction classLoaderMatcher() { return hasClassesNamed("org.apache.logging.log4j.core.util.ContextDataProvider"); diff --git a/instrumentation/log4j/log4j-2.7/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_7/Log4j27InstrumentationModule.java b/instrumentation/log4j/log4j-2.7/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_7/Log4j27InstrumentationModule.java index 86db1e05f3..5aebd7f241 100644 --- a/instrumentation/log4j/log4j-2.7/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_7/Log4j27InstrumentationModule.java +++ b/instrumentation/log4j/log4j-2.7/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_7/Log4j27InstrumentationModule.java @@ -33,13 +33,6 @@ public class Log4j27InstrumentationModule extends InstrumentationModule { super("log4j", "log4j-2.7"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.log4j.v2_7.SpanDecoratingContextDataInjector" - }; - } - @Override public ElementMatcher.Junction classLoaderMatcher() { return hasClassesNamed("org.apache.logging.log4j.core.impl.ContextDataInjectorFactory") diff --git a/instrumentation/logback/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackInstrumentationModule.java b/instrumentation/logback/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackInstrumentationModule.java index 99f417e948..3ec8a09b95 100644 --- a/instrumentation/logback/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackInstrumentationModule.java +++ b/instrumentation/logback/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackInstrumentationModule.java @@ -21,15 +21,6 @@ public class LogbackInstrumentationModule extends InstrumentationModule { super("logback", "logback-1.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.instrumentation.logback.v1_0.internal.UnionMap", - "io.opentelemetry.instrumentation.logback.v1_0.internal.UnionMap$ConcatenatedSet", - "io.opentelemetry.instrumentation.logback.v1_0.internal.UnionMap$ConcatenatedSet$ConcatenatedSetIterator" - }; - } - @Override public List typeInstrumentations() { return asList(new LoggerInstrumentation(), new LoggingEventInstrumentation()); diff --git a/instrumentation/mongo/mongo-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_1/MongoClientInstrumentationModule.java b/instrumentation/mongo/mongo-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_1/MongoClientInstrumentationModule.java index 7b0f16d727..a19ab32b78 100644 --- a/instrumentation/mongo/mongo-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_1/MongoClientInstrumentationModule.java +++ b/instrumentation/mongo/mongo-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_1/MongoClientInstrumentationModule.java @@ -35,14 +35,6 @@ public final class MongoClientInstrumentationModule extends InstrumentationModul super("mongo", "mongo-3.1"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.mongo.MongoClientTracer", - "io.opentelemetry.javaagent.instrumentation.mongo.TracingCommandListener" - }; - } - @Override public List typeInstrumentations() { return singletonList(new MongoClientOptionsBuilderInstrumentation()); diff --git a/instrumentation/mongo/mongo-3.7/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_7/MongoClientInstrumentationModule.java b/instrumentation/mongo/mongo-3.7/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_7/MongoClientInstrumentationModule.java index 183a7e1655..efe42139fd 100644 --- a/instrumentation/mongo/mongo-3.7/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_7/MongoClientInstrumentationModule.java +++ b/instrumentation/mongo/mongo-3.7/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_7/MongoClientInstrumentationModule.java @@ -35,14 +35,6 @@ public final class MongoClientInstrumentationModule extends InstrumentationModul super("mongo", "mongo-3.7"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.mongo.MongoClientTracer", - "io.opentelemetry.javaagent.instrumentation.mongo.TracingCommandListener" - }; - } - @Override public List typeInstrumentations() { return singletonList(new MongoClientSettingsBuilderInstrumentation()); diff --git a/instrumentation/mongo/mongo-async-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/mongoasync/v3_3/MongoAsyncClientInstrumentationModule.java b/instrumentation/mongo/mongo-async-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/mongoasync/v3_3/MongoAsyncClientInstrumentationModule.java index 3724754efd..716153415b 100644 --- a/instrumentation/mongo/mongo-async-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/mongoasync/v3_3/MongoAsyncClientInstrumentationModule.java +++ b/instrumentation/mongo/mongo-async-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/mongoasync/v3_3/MongoAsyncClientInstrumentationModule.java @@ -36,14 +36,6 @@ public final class MongoAsyncClientInstrumentationModule extends Instrumentation super("mongo-async", "mongo-async-3.3", "mongo"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.mongo.MongoClientTracer", - "io.opentelemetry.javaagent.instrumentation.mongo.TracingCommandListener" - }; - } - @Override public List typeInstrumentations() { return singletonList(new MongoClientSettingsBuildersInstrumentation()); diff --git a/instrumentation/netty/netty-3.8/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java b/instrumentation/netty/netty-3.8/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java index acfe637c9d..9fae920d9b 100644 --- a/instrumentation/netty/netty-3.8/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java +++ b/instrumentation/netty/netty-3.8/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java @@ -20,29 +20,6 @@ public class NettyInstrumentationModule extends InstrumentationModule { super("netty", "netty-3.8"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ChannelTraceContext", - packageName + ".ChannelTraceContext$Factory", - NettyChannelPipelineInstrumentation.class.getName() + "$ChannelPipelineAdviceUtil", - // Util - packageName + ".util.CombinedSimpleChannelHandler", - // client helpers - packageName + ".client.NettyHttpClientTracer", - packageName + ".client.NettyResponseInjectAdapter", - packageName + ".client.HttpClientRequestTracingHandler", - packageName + ".client.HttpClientResponseTracingHandler", - packageName + ".client.HttpClientTracingHandler", - // server helpers - packageName + ".server.NettyHttpServerTracer", - packageName + ".server.NettyRequestExtractAdapter", - packageName + ".server.HttpServerRequestTracingHandler", - packageName + ".server.HttpServerResponseTracingHandler", - packageName + ".server.HttpServerTracingHandler", - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java b/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java index b8641cac8e..d5229e2964 100644 --- a/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java +++ b/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java @@ -18,26 +18,6 @@ public class NettyInstrumentationModule extends InstrumentationModule { super("netty", "netty-4.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AttributeKeys", - packageName + ".AttributeKeys$1", - // client helpers - packageName + ".client.NettyHttpClientTracer", - packageName + ".client.NettyResponseInjectAdapter", - packageName + ".client.HttpClientRequestTracingHandler", - packageName + ".client.HttpClientResponseTracingHandler", - packageName + ".client.HttpClientTracingHandler", - // server helpers - packageName + ".server.NettyHttpServerTracer", - packageName + ".server.NettyRequestExtractAdapter", - packageName + ".server.HttpServerRequestTracingHandler", - packageName + ".server.HttpServerResponseTracingHandler", - packageName + ".server.HttpServerTracingHandler" - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java index b604fa6dd4..7d361449d5 100644 --- a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java +++ b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java @@ -18,26 +18,6 @@ public class NettyInstrumentationModule extends InstrumentationModule { super("netty", "netty-4.1"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AttributeKeys", - packageName + ".AttributeKeys$1", - // client helpers - packageName + ".client.NettyHttpClientTracer", - packageName + ".client.NettyResponseInjectAdapter", - packageName + ".client.HttpClientRequestTracingHandler", - packageName + ".client.HttpClientResponseTracingHandler", - packageName + ".client.HttpClientTracingHandler", - // server helpers - packageName + ".server.NettyHttpServerTracer", - packageName + ".server.NettyRequestExtractAdapter", - packageName + ".server.HttpServerRequestTracingHandler", - packageName + ".server.HttpServerResponseTracingHandler", - packageName + ".server.HttpServerTracingHandler" - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/okhttp/okhttp-2.2/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2InstrumentationModule.java b/instrumentation/okhttp/okhttp-2.2/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2InstrumentationModule.java index fecfb0a979..1be07f268d 100644 --- a/instrumentation/okhttp/okhttp-2.2/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2InstrumentationModule.java +++ b/instrumentation/okhttp/okhttp-2.2/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2InstrumentationModule.java @@ -28,15 +28,6 @@ public class OkHttp2InstrumentationModule extends InstrumentationModule { super("okhttp", "okhttp-2.2"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RequestBuilderInjectAdapter", - packageName + ".OkHttpClientTracer", - packageName + ".TracingInterceptor", - }; - } - @Override public List typeInstrumentations() { return singletonList(new OkHttpClientInstrumentation()); diff --git a/instrumentation/okhttp/okhttp-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttp3InstrumentationModule.java b/instrumentation/okhttp/okhttp-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttp3InstrumentationModule.java index d99a848742..050eef7414 100644 --- a/instrumentation/okhttp/okhttp-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttp3InstrumentationModule.java +++ b/instrumentation/okhttp/okhttp-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttp3InstrumentationModule.java @@ -30,15 +30,6 @@ public class OkHttp3InstrumentationModule extends InstrumentationModule { super("okhttp", "okhttp-3.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RequestBuilderInjectAdapter", - packageName + ".OkHttpClientTracer", - packageName + ".TracingInterceptor", - }; - } - @Override public List typeInstrumentations() { return singletonList(new OkHttpClientInstrumentation()); diff --git a/instrumentation/opentelemetry-api-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/OpenTelemetryApiInstrumentationModule.java index e79a1ffecd..737367bddb 100644 --- a/instrumentation/opentelemetry-api-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/OpenTelemetryApiInstrumentationModule.java +++ b/instrumentation/opentelemetry-api-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/OpenTelemetryApiInstrumentationModule.java @@ -18,75 +18,6 @@ public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule super("opentelemetry-api"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".context.AgentContextStorage", - packageName + ".context.AgentContextStorage$AgentContextWrapper", - packageName + ".context.AgentContextStorage$SpanContextKeys", - packageName + ".context.propagation.ApplicationContextPropagators", - packageName + ".context.propagation.ApplicationTextMapPropagator", - packageName + ".context.propagation.ApplicationTextMapPropagator$AgentSetter", - packageName + ".context.propagation.ApplicationTextMapPropagator$AgentGetter", - packageName + ".metrics.ApplicationBatchRecorder", - packageName + ".metrics.ApplicationDoubleCounter", - packageName + ".metrics.ApplicationDoubleCounter$BoundInstrument", - packageName + ".metrics.ApplicationDoubleCounter$Builder", - packageName + ".metrics.ApplicationDoubleSumObserver", - packageName + ".metrics.ApplicationDoubleSumObserver$Builder", - packageName + ".metrics.ApplicationDoubleSumObserver$AgentResultDoubleSumObserver", - packageName + ".metrics.ApplicationDoubleSumObserver$ApplicationResultDoubleSumObserver", - packageName + ".metrics.ApplicationDoubleUpDownCounter", - packageName + ".metrics.ApplicationDoubleUpDownCounter$BoundInstrument", - packageName + ".metrics.ApplicationDoubleUpDownCounter$Builder", - packageName + ".metrics.ApplicationDoubleUpDownSumObserver", - packageName + ".metrics.ApplicationDoubleUpDownSumObserver$Builder", - packageName - + ".metrics.ApplicationDoubleUpDownSumObserver$AgentResultDoubleUpDownSumObserver", - packageName - + ".metrics.ApplicationDoubleUpDownSumObserver$ApplicationResultDoubleUpDownSumObserver", - packageName + ".metrics.ApplicationDoubleValueObserver", - packageName + ".metrics.ApplicationDoubleValueObserver$Builder", - packageName + ".metrics.ApplicationDoubleValueObserver$AgentResultDoubleValueObserver", - packageName + ".metrics.ApplicationDoubleValueObserver$ApplicationResultDoubleValueObserver", - packageName + ".metrics.ApplicationDoubleValueRecorder", - packageName + ".metrics.ApplicationDoubleValueRecorder$BoundInstrument", - packageName + ".metrics.ApplicationDoubleValueRecorder$Builder", - packageName + ".metrics.ApplicationLongCounter", - packageName + ".metrics.ApplicationLongCounter$BoundInstrument", - packageName + ".metrics.ApplicationLongCounter$Builder", - packageName + ".metrics.ApplicationLongSumObserver", - packageName + ".metrics.ApplicationLongSumObserver$Builder", - packageName + ".metrics.ApplicationLongSumObserver$AgentResultLongSumObserver", - packageName + ".metrics.ApplicationLongSumObserver$ApplicationResultLongSumObserver", - packageName + ".metrics.ApplicationLongUpDownCounter", - packageName + ".metrics.ApplicationLongUpDownCounter$BoundInstrument", - packageName + ".metrics.ApplicationLongUpDownCounter$Builder", - packageName + ".metrics.ApplicationLongUpDownSumObserver", - packageName + ".metrics.ApplicationLongUpDownSumObserver$Builder", - packageName + ".metrics.ApplicationLongUpDownSumObserver$AgentResultLongUpDownSumObserver", - packageName - + ".metrics.ApplicationLongUpDownSumObserver$ApplicationResultLongUpDownSumObserver", - packageName + ".metrics.ApplicationLongValueObserver", - packageName + ".metrics.ApplicationLongValueObserver$Builder", - packageName + ".metrics.ApplicationLongValueObserver$AgentResultLongValueObserver", - packageName + ".metrics.ApplicationLongValueObserver$ApplicationResultLongValueObserver", - packageName + ".metrics.ApplicationLongValueRecorder", - packageName + ".metrics.ApplicationLongValueRecorder$BoundInstrument", - packageName + ".metrics.ApplicationLongValueRecorder$Builder", - packageName + ".metrics.ApplicationMeter", - packageName + ".metrics.ApplicationMeterProvider", - packageName + ".trace.Bridging", - packageName + ".trace.Bridging$1", - packageName + ".trace.Bridging$2", - packageName + ".trace.ApplicationSpan", - packageName + ".trace.ApplicationSpan$Builder", - packageName + ".trace.ApplicationTracer", - packageName + ".trace.ApplicationTracerProvider", - packageName + ".LabelBridging" - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/opentelemetry-api-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/anotations/WithSpanAnnotationInstrumentationModule.java b/instrumentation/opentelemetry-api-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/anotations/WithSpanAnnotationInstrumentationModule.java index e404541cd5..7d72327dbc 100644 --- a/instrumentation/opentelemetry-api-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/anotations/WithSpanAnnotationInstrumentationModule.java +++ b/instrumentation/opentelemetry-api-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/anotations/WithSpanAnnotationInstrumentationModule.java @@ -41,13 +41,6 @@ public final class WithSpanAnnotationInstrumentationModule extends Instrumentati super("with-span-annotation"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TraceAnnotationTracer", - }; - } - @Override public List typeInstrumentations() { return singletonList(new AnnotatedMethodInstrumentation()); diff --git a/instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiInstrumentationModule.java b/instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiInstrumentationModule.java index 11ec16a0a6..dbb0f04a3a 100644 --- a/instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiInstrumentationModule.java +++ b/instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiInstrumentationModule.java @@ -31,20 +31,6 @@ public class OshiInstrumentationModule extends InstrumentationModule { super("oshi"); } - @Override - public final String[] helperClassNames() { - return new String[] { - "io.opentelemetry.instrumentation.oshi.SystemMetrics", - "io.opentelemetry.instrumentation.oshi.SystemMetrics$1", - "io.opentelemetry.instrumentation.oshi.SystemMetrics$2", - "io.opentelemetry.instrumentation.oshi.SystemMetrics$3", - "io.opentelemetry.instrumentation.oshi.SystemMetrics$4", - "io.opentelemetry.instrumentation.oshi.SystemMetrics$5", - "io.opentelemetry.instrumentation.oshi.SystemMetrics$6", - "io.opentelemetry.instrumentation.oshi.SystemMetrics$7" - }; - } - @Override public List typeInstrumentations() { return singletonList(new SystemInfoInstrumentation()); diff --git a/instrumentation/play-ws/play-ws-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/PlayWsInstrumentationModule.java b/instrumentation/play-ws/play-ws-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/PlayWsInstrumentationModule.java index 031ca57bb8..45e5d5414d 100644 --- a/instrumentation/play-ws/play-ws-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/PlayWsInstrumentationModule.java +++ b/instrumentation/play-ws/play-ws-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/PlayWsInstrumentationModule.java @@ -29,16 +29,6 @@ public class PlayWsInstrumentationModule extends InstrumentationModule { super("play-ws", "play-ws-1.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.playws.PlayWsClientTracer", - "io.opentelemetry.javaagent.instrumentation.playws.HeadersInjectAdapter", - packageName + ".AsyncHandlerWrapper", - packageName + ".StreamedAsyncHandlerWrapper" - }; - } - @Override public List typeInstrumentations() { return singletonList(new AsyncHttpClientInstrumentation(ClientAdvice.class.getName())); diff --git a/instrumentation/play-ws/play-ws-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_0/PlayWsInstrumentationModule.java b/instrumentation/play-ws/play-ws-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_0/PlayWsInstrumentationModule.java index 933c7c2665..1fa9ebb209 100644 --- a/instrumentation/play-ws/play-ws-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_0/PlayWsInstrumentationModule.java +++ b/instrumentation/play-ws/play-ws-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_0/PlayWsInstrumentationModule.java @@ -27,16 +27,6 @@ public class PlayWsInstrumentationModule extends InstrumentationModule { super("play-ws", "play-ws-2.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.playws.PlayWsClientTracer", - "io.opentelemetry.javaagent.instrumentation.playws.HeadersInjectAdapter", - packageName + ".AsyncHandlerWrapper", - packageName + ".StreamedAsyncHandlerWrapper" - }; - } - @Override public List typeInstrumentations() { return singletonList(new AsyncHttpClientInstrumentation(ClientAdvice.class.getName())); diff --git a/instrumentation/play-ws/play-ws-2.1/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsInstrumentationModule.java b/instrumentation/play-ws/play-ws-2.1/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsInstrumentationModule.java index c9d90e5789..f86e5d9134 100644 --- a/instrumentation/play-ws/play-ws-2.1/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsInstrumentationModule.java +++ b/instrumentation/play-ws/play-ws-2.1/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsInstrumentationModule.java @@ -27,16 +27,6 @@ public class PlayWsInstrumentationModule extends InstrumentationModule { super("play-ws", "play-ws-2.1"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.playws.PlayWsClientTracer", - "io.opentelemetry.javaagent.instrumentation.playws.HeadersInjectAdapter", - packageName + ".AsyncHandlerWrapper", - packageName + ".StreamedAsyncHandlerWrapper" - }; - } - @Override public List typeInstrumentations() { return singletonList(new AsyncHttpClientInstrumentation(ClientAdvice.class.getName())); diff --git a/instrumentation/play/play-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_3/PlayInstrumentationModule.java b/instrumentation/play/play-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_3/PlayInstrumentationModule.java index eea697d200..85ea30a4c3 100644 --- a/instrumentation/play/play-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_3/PlayInstrumentationModule.java +++ b/instrumentation/play/play-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_3/PlayInstrumentationModule.java @@ -29,11 +29,6 @@ public final class PlayInstrumentationModule extends InstrumentationModule { super("play", "play-2.3"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".PlayTracer", packageName + ".RequestCompleteCallback"}; - } - @Override public List typeInstrumentations() { return singletonList(new ActionInstrumentation()); diff --git a/instrumentation/play/play-2.4/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java b/instrumentation/play/play-2.4/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java index cd29443b42..25bea34200 100644 --- a/instrumentation/play/play-2.4/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java +++ b/instrumentation/play/play-2.4/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java @@ -29,11 +29,6 @@ public final class PlayInstrumentationModule extends InstrumentationModule { super("play", "play-2.4"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".PlayTracer", packageName + ".RequestCompleteCallback"}; - } - @Override public List typeInstrumentations() { return singletonList(new ActionInstrumentation()); diff --git a/instrumentation/play/play-2.6/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java b/instrumentation/play/play-2.6/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java index 6acef85a92..ac09958575 100644 --- a/instrumentation/play/play-2.6/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java +++ b/instrumentation/play/play-2.6/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java @@ -29,11 +29,6 @@ public final class PlayInstrumentationModule extends InstrumentationModule { super("play", "play-2.6"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".PlayTracer", packageName + ".RequestCompleteCallback"}; - } - @Override public List typeInstrumentations() { return singletonList(new ActionInstrumentation()); diff --git a/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqInstrumentationModule.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqInstrumentationModule.java index 2e1b83feb2..6bc6a732df 100644 --- a/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqInstrumentationModule.java +++ b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqInstrumentationModule.java @@ -18,17 +18,6 @@ public class RabbitMqInstrumentationModule extends InstrumentationModule { super("rabbitmq", "rabbitmq-2.7"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RabbitTracer", - packageName + ".TextMapInjectAdapter", - packageName + ".TextMapExtractAdapter", - packageName + ".TracedDelegatingConsumer", - RabbitCommandInstrumentation.class.getName() + "$SpanHolder", - }; - } - @Override public List typeInstrumentations() { return asList(new RabbitChannelInstrumentation(), new RabbitCommandInstrumentation()); diff --git a/instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackInstrumentationModule.java b/instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackInstrumentationModule.java index c24a30bcd4..59ab2bfdaa 100644 --- a/instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackInstrumentationModule.java +++ b/instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackInstrumentationModule.java @@ -18,18 +18,6 @@ public class RatpackInstrumentationModule extends InstrumentationModule { super("ratpack", "ratpack-1.4"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ActionWrapper", - packageName + ".BlockWrapper", - packageName + ".RatpackTracer", - packageName + ".TracingHandler", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys$1" - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/reactor-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ReactorInstrumentationModule.java b/instrumentation/reactor-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ReactorInstrumentationModule.java index 2be3a7054c..820f201cf2 100644 --- a/instrumentation/reactor-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ReactorInstrumentationModule.java +++ b/instrumentation/reactor-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/ReactorInstrumentationModule.java @@ -26,15 +26,6 @@ public final class ReactorInstrumentationModule extends InstrumentationModule { super("reactor", "reactor-3.1"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.instrumentation.reactor.TracingOperator$Lifter", - "io.opentelemetry.instrumentation.reactor.TracingOperator", - "io.opentelemetry.instrumentation.reactor.TracingSubscriber" - }; - } - @Override public List typeInstrumentations() { return singletonList(new HooksInstrumentation()); diff --git a/instrumentation/reactor-netty-0.9/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/ReactorNettyInstrumentationModule.java b/instrumentation/reactor-netty-0.9/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/ReactorNettyInstrumentationModule.java index 3cea9a56da..51d597f5f3 100644 --- a/instrumentation/reactor-netty-0.9/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/ReactorNettyInstrumentationModule.java +++ b/instrumentation/reactor-netty-0.9/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/ReactorNettyInstrumentationModule.java @@ -44,27 +44,6 @@ public final class ReactorNettyInstrumentationModule extends InstrumentationModu super("reactor-netty", "reactor-netty-0.9"); } - @Override - public String[] helperClassNames() { - return new String[] { - ReactorNettyInstrumentationModule.class.getName() + "$MapConnect", - ReactorNettyInstrumentationModule.class.getName() + "$OnRequest", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys$1", - // these below a transitive dependencies of AttributeKeys from above - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.client.NettyHttpClientTracer", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.client.NettyResponseInjectAdapter", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.client.HttpClientRequestTracingHandler", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.client.HttpClientResponseTracingHandler", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.client.HttpClientTracingHandler", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.server.NettyHttpServerTracer", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.server.NettyRequestExtractAdapter", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.server.HttpServerRequestTracingHandler", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.server.HttpServerResponseTracingHandler", - "io.opentelemetry.javaagent.instrumentation.netty.v4_1.server.HttpServerTracingHandler" - }; - } - @Override public List typeInstrumentations() { return singletonList(new HttpClientInstrumentation()); diff --git a/instrumentation/rediscala-1.8/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaInstrumentationModule.java b/instrumentation/rediscala-1.8/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaInstrumentationModule.java index 98e0184cd8..1ed21c5eb8 100644 --- a/instrumentation/rediscala-1.8/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaInstrumentationModule.java +++ b/instrumentation/rediscala-1.8/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaInstrumentationModule.java @@ -41,14 +41,6 @@ public final class RediscalaInstrumentationModule extends InstrumentationModule super("rediscala", "rediscala-1.8"); } - @Override - public String[] helperClassNames() { - return new String[] { - RediscalaInstrumentationModule.class.getName() + "$OnCompleteHandler", - packageName + ".RediscalaClientTracer", - }; - } - @Override public List typeInstrumentations() { return singletonList(new RequestInstrumentation()); diff --git a/instrumentation/redisson-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonInstrumentation.java b/instrumentation/redisson-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonInstrumentation.java index 3ee92f37c8..68d8f82122 100644 --- a/instrumentation/redisson-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonInstrumentation.java +++ b/instrumentation/redisson-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonInstrumentation.java @@ -31,11 +31,6 @@ public final class RedissonInstrumentation extends InstrumentationModule { super("redisson", "redisson-3.0"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".RedissonClientTracer"}; - } - @Override public List typeInstrumentations() { return singletonList(new RedisConnectionInstrumentation()); diff --git a/instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientInstrumentationModule.java b/instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientInstrumentationModule.java index a14e26cfc0..6da2fe36ed 100644 --- a/instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientInstrumentationModule.java +++ b/instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientInstrumentationModule.java @@ -34,11 +34,6 @@ public final class RmiClientInstrumentationModule extends InstrumentationModule super("rmi", "rmi-client"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".RmiClientTracer"}; - } - @Override public List typeInstrumentations() { return singletonList(new ClientInstrumentation()); diff --git a/instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/RmiContextPropagationInstrumentationModule.java b/instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/RmiContextPropagationInstrumentationModule.java index 65ccaa7f5c..2130065bde 100644 --- a/instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/RmiContextPropagationInstrumentationModule.java +++ b/instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/RmiContextPropagationInstrumentationModule.java @@ -22,18 +22,6 @@ public class RmiContextPropagationInstrumentationModule extends InstrumentationM super("rmi", "rmi-context-propagation"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.javaagent.instrumentation.rmi.context.ContextPayload$InjectAdapter", - "io.opentelemetry.javaagent.instrumentation.rmi.context.ContextPayload$ExtractAdapter", - "io.opentelemetry.javaagent.instrumentation.rmi.context.ContextPayload", - "io.opentelemetry.javaagent.instrumentation.rmi.context.ContextPropagator", - "io.opentelemetry.javaagent.instrumentation.rmi.context.server.ContextDispatcher", - "io.opentelemetry.javaagent.instrumentation.rmi.context.server.ContextDispatcher$NoopRemote" - }; - } - @Override public List typeInstrumentations() { return asList(new RmiClientContextInstrumentation(), new RmiServerContextInstrumentation()); diff --git a/instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerInstrumentation.java b/instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerInstrumentation.java index 2a687428ed..ccadf29565 100644 --- a/instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerInstrumentation.java +++ b/instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerInstrumentation.java @@ -39,11 +39,6 @@ public final class RmiServerInstrumentation extends InstrumentationModule { super("rmi", "rmi-server"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".RmiServerTracer"}; - } - @Override public List typeInstrumentations() { return singletonList(new ServerInstrumentation()); diff --git a/instrumentation/servlet/servlet-2.2/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2InstrumentationModule.java b/instrumentation/servlet/servlet-2.2/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2InstrumentationModule.java index e3b5481d25..cb553691e8 100644 --- a/instrumentation/servlet/servlet-2.2/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2InstrumentationModule.java +++ b/instrumentation/servlet/servlet-2.2/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2InstrumentationModule.java @@ -29,16 +29,6 @@ public class Servlet2InstrumentationModule extends InstrumentationModule { return not(hasClassesNamed("javax.servlet.AsyncEvent", "javax.servlet.AsyncListener")); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.instrumentation.servlet.ServletHttpServerTracer", - "io.opentelemetry.instrumentation.servlet.HttpServletRequestGetter", - packageName + ".ResponseWithStatus", - packageName + ".Servlet2HttpServerTracer" - }; - } - @Override public List typeInstrumentations() { return Arrays.asList( diff --git a/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java index d8346316d1..4cb5923af4 100644 --- a/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java +++ b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InstrumentationModule.java @@ -18,17 +18,6 @@ public class Servlet3InstrumentationModule extends InstrumentationModule { super("servlet", "servlet-3.0"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.instrumentation.servlet.HttpServletRequestGetter", - "io.opentelemetry.instrumentation.servlet.ServletHttpServerTracer", - packageName + ".Servlet3Advice", - packageName + ".Servlet3HttpServerTracer", - packageName + ".TagSettingAsyncListener" - }; - } - @Override public List typeInstrumentations() { return asList(new AsyncContextInstrumentation(), new ServletAndFilterInstrumentation()); diff --git a/instrumentation/servlet/servlet-common/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentationModule.java b/instrumentation/servlet/servlet-common/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentationModule.java index e86e17257e..5bdd27bafe 100644 --- a/instrumentation/servlet/servlet-common/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentationModule.java +++ b/instrumentation/servlet/servlet-common/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentationModule.java @@ -41,13 +41,6 @@ public final class RequestDispatcherInstrumentationModule extends Instrumentatio super("servlet", "servlet-dispatcher"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RequestDispatcherTracer", - }; - } - @Override public List typeInstrumentations() { return singletonList(new RequestDispatcherInstrumentation()); diff --git a/instrumentation/servlet/servlet-common/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/http/HttpServletResponseInstrumentationModule.java b/instrumentation/servlet/servlet-common/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/http/HttpServletResponseInstrumentationModule.java index 34c323dbb0..eb72169cf1 100644 --- a/instrumentation/servlet/servlet-common/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/http/HttpServletResponseInstrumentationModule.java +++ b/instrumentation/servlet/servlet-common/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/http/HttpServletResponseInstrumentationModule.java @@ -36,13 +36,6 @@ public final class HttpServletResponseInstrumentationModule extends Instrumentat super("servlet", "servlet-response"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HttpServletResponseTracer", - }; - } - @Override public List typeInstrumentations() { return singletonList(new HttpServletResponseInstrumentation()); diff --git a/instrumentation/spring/spring-data-1.8/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/SpringDataInstrumentationModule.java b/instrumentation/spring/spring-data-1.8/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/SpringDataInstrumentationModule.java index 467e997a90..a484a0f911 100644 --- a/instrumentation/spring/spring-data-1.8/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/SpringDataInstrumentationModule.java +++ b/instrumentation/spring/spring-data-1.8/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/SpringDataInstrumentationModule.java @@ -38,15 +38,6 @@ public final class SpringDataInstrumentationModule extends InstrumentationModule super("spring-data", "spring-data-1.8"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpringDataTracer", - getClass().getName() + "$RepositoryInterceptor", - getClass().getName() + "$InterceptingRepositoryProxyPostProcessor", - }; - } - @Override public List typeInstrumentations() { return singletonList(new RepositoryFactorySupportInstrumentation()); diff --git a/instrumentation/spring/spring-scheduling-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/SpringSchedulingInstrumentationModule.java b/instrumentation/spring/spring-scheduling-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/SpringSchedulingInstrumentationModule.java index 1631bb619e..1ead1d4a8f 100644 --- a/instrumentation/spring/spring-scheduling-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/SpringSchedulingInstrumentationModule.java +++ b/instrumentation/spring/spring-scheduling-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/SpringSchedulingInstrumentationModule.java @@ -28,13 +28,6 @@ public final class SpringSchedulingInstrumentationModule extends Instrumentation super("spring-scheduling", "spring-scheduling-3.1"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpringSchedulingTracer", packageName + ".SpringSchedulingRunnableWrapper", - }; - } - @Override public List typeInstrumentations() { return singletonList(new TaskInstrumentation()); diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/client/WebfluxClientInstrumentationModule.java b/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/client/WebfluxClientInstrumentationModule.java index a41e81573b..f702656cd4 100644 --- a/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/client/WebfluxClientInstrumentationModule.java +++ b/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/client/WebfluxClientInstrumentationModule.java @@ -29,17 +29,6 @@ public class WebfluxClientInstrumentationModule extends InstrumentationModule { super("spring-webflux", "spring-webflux-5.0", "spring-webflux-client"); } - @Override - public String[] helperClassNames() { - return new String[] { - "io.opentelemetry.instrumentation.spring.webflux.client.SpringWebfluxHttpClientTracer", - "io.opentelemetry.instrumentation.spring.webflux.client.HttpHeadersInjectAdapter", - "io.opentelemetry.instrumentation.spring.webflux.client.WebClientTracingFilter", - "io.opentelemetry.instrumentation.spring.webflux.client.WebClientTracingFilter$MonoWebClientTrace", - "io.opentelemetry.instrumentation.spring.webflux.client.TraceWebClientSubscriber" - }; - } - @Override public List typeInstrumentations() { return singletonList(new WebClientBuilderInstrumentation()); diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/WebfluxServerInstrumentationModule.java b/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/WebfluxServerInstrumentationModule.java index 8a9281b9d9..54abdbb07c 100644 --- a/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/WebfluxServerInstrumentationModule.java +++ b/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/WebfluxServerInstrumentationModule.java @@ -19,16 +19,6 @@ public class WebfluxServerInstrumentationModule extends InstrumentationModule { super("spring-webflux", "spring-webflux-5.0", "spring-webflux-server"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpringWebfluxHttpServerTracer", - packageName + ".AdviceUtils", - packageName + ".AdviceUtils$SpanFinishingSubscriber", - packageName + ".RouteOnSuccessOrError" - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcInstrumentationModule.java b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcInstrumentationModule.java index f6b00e6ff9..6792cb5938 100644 --- a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcInstrumentationModule.java +++ b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcInstrumentationModule.java @@ -18,15 +18,6 @@ public final class SpringWebMvcInstrumentationModule extends InstrumentationModu super("spring-webmvc", "spring-webmvc-3.1"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpringWebMvcTracer", - packageName + ".HandlerMappingResourceNameFilter", - packageName + ".HandlerMappingResourceNameFilter$BeanDefinition", - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/instrumentation/spymemcached-2.12/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedInstrumentationModule.java b/instrumentation/spymemcached-2.12/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedInstrumentationModule.java index 2c7b4768d8..885c17f91b 100644 --- a/instrumentation/spymemcached-2.12/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedInstrumentationModule.java +++ b/instrumentation/spymemcached-2.12/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedInstrumentationModule.java @@ -36,18 +36,6 @@ public final class SpymemcachedInstrumentationModule extends InstrumentationModu super("spymemcached", "spymemcached-2.12"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".MemcacheClientTracer", - packageName + ".CompletionListener", - packageName + ".SyncCompletionListener", - packageName + ".GetCompletionListener", - packageName + ".OperationCompletionListener", - packageName + ".BulkGetCompletionListener" - }; - } - @Override public List typeInstrumentations() { return singletonList(new MemcachedClientInstrumentation()); diff --git a/instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2InstrumentationModule.java b/instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2InstrumentationModule.java index ae5c90b176..e66adb20e5 100644 --- a/instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2InstrumentationModule.java +++ b/instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2InstrumentationModule.java @@ -19,11 +19,6 @@ public class Struts2InstrumentationModule extends InstrumentationModule { super("struts", "struts-2.3"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".Struts2Tracer"}; - } - @Override public List typeInstrumentations() { return singletonList(new ActionInvocationInstrumentation()); diff --git a/instrumentation/twilio-6.6/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioInstrumentationModule.java b/instrumentation/twilio-6.6/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioInstrumentationModule.java index 5500834fa6..ba005d4a9f 100644 --- a/instrumentation/twilio-6.6/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioInstrumentationModule.java +++ b/instrumentation/twilio-6.6/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioInstrumentationModule.java @@ -18,14 +18,6 @@ public class TwilioInstrumentationModule extends InstrumentationModule { super("twilio", "twilio-6.6"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TwilioClientDecorator", - packageName + ".TwilioAsyncInstrumentation$SpanFinishingCallback", - }; - } - @Override public List typeInstrumentations() { return asList(new TwilioAsyncInstrumentation(), new TwilioSyncInstrumentation()); diff --git a/instrumentation/vertx-reactive-3.5/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java b/instrumentation/vertx-reactive-3.5/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java index 93961ad2c7..4b6757962d 100644 --- a/instrumentation/vertx-reactive-3.5/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java +++ b/instrumentation/vertx-reactive-3.5/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java @@ -34,13 +34,6 @@ public class VertxRxInstrumentationModule extends InstrumentationModule { super("vertx-reactive", "vertx-reactive-3.5", "vertx"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AsyncResultConsumerWrapper", packageName + ".AsyncResultHandlerWrapper" - }; - } - @Override public List typeInstrumentations() { return singletonList(new AsyncResultSingleInstrumentation()); diff --git a/instrumentation/vertx-web-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java b/instrumentation/vertx-web-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java index 3f15001dd8..cb0ae9c601 100644 --- a/instrumentation/vertx-web-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java +++ b/instrumentation/vertx-web-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java @@ -34,13 +34,6 @@ public final class VertxWebInstrumentationModule extends InstrumentationModule { super("vertx-web", "vertx-web-3.0", "vertx"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RoutingContextHandlerWrapper", packageName + ".VertxTracer", - }; - } - @Override public List typeInstrumentations() { return singletonList(new RouteInstrumentation()); diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/InstrumentationModule.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/InstrumentationModule.java index 23b62314da..d8d48b552a 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/InstrumentationModule.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/InstrumentationModule.java @@ -56,15 +56,6 @@ public abstract class InstrumentationModule { private final Set instrumentationNames; protected final boolean enabled; - /** - * Deprecated, will be removed. - * - * @deprecated Will be removed together with {@link #helperClassNames()} - */ - @Deprecated - protected final String packageName = - getClass().getPackage() == null ? "" : getClass().getPackage().getName(); - /** * Creates an instrumentation module. Note that all implementations of {@link * InstrumentationModule} must have a default constructor (for SPI), so they have to pass the @@ -298,17 +289,6 @@ public abstract class InstrumentationModule { return 0; } - /** - * Deprecated, will be removed. - * - * @deprecated This method is replaced by {@link #getMuzzleHelperClassNames()} and {@link - * #additionalHelperClassNames()}, extending it provides no effect. - */ - @Deprecated - public String[] helperClassNames() { - return EMPTY; - } - /** Returns resource names to inject into the user's classloader. */ public String[] helperResourceNames() { return EMPTY; diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/collector/MuzzleCodeGenerator.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/collector/MuzzleCodeGenerator.java index 994eeaec07..62b9303d46 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/collector/MuzzleCodeGenerator.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/collector/MuzzleCodeGenerator.java @@ -199,7 +199,7 @@ class MuzzleCodeGenerator implements AsmVisitorWrapper { /* * protected synchronized ReferenceMatcher getMuzzleReferenceMatcher() { * if (null == this.muzzleReferenceMatcher) { - * this.muzzleReferenceMatcher = new ReferenceMatcher(this.helperClassNames(), + * this.muzzleReferenceMatcher = new ReferenceMatcher(this.getAllHelperClassNames(), * new Reference[]{ * //reference builders * }); diff --git a/testing-common/src/test/java/context/ContextTestInstrumentationModule.java b/testing-common/src/test/java/context/ContextTestInstrumentationModule.java index 7dcfeef6c5..6095169fbb 100644 --- a/testing-common/src/test/java/context/ContextTestInstrumentationModule.java +++ b/testing-common/src/test/java/context/ContextTestInstrumentationModule.java @@ -36,11 +36,6 @@ public class ContextTestInstrumentationModule extends InstrumentationModule { return false; } - @Override - public String[] helperClassNames() { - return new String[] {getClass().getName() + "$Context", getClass().getName() + "$Context$1"}; - } - @Override public List typeInstrumentations() { return singletonList(new ContextTestInstrumentation());