diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java index ebf52e81ca1d..db812386efb2 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java @@ -41,7 +41,20 @@ */ public class Instrumenter { - /** Returns a new {@link InstrumenterBuilder}. */ + /** + * Returns a new {@link InstrumenterBuilder}. + * + *

The {@code instrumentationName} is the name of the instrumentation library, not the name of + * the instrument*ed* library. The value passed in this parameter should uniquely identify the + * instrumentation library so that during troubleshooting it's possible to pinpoint what tracer + * produced problematic telemetry. + * + *

In this project we use a convention to encode the minimum supported version of the + * instrument*ed* library into the instrumentation name, for example {@code + * io.opentelemetry.apache-httpclient-4.0}. This way, if there are different instrumentations for + * different library versions it's easy to find out which instrumentations produced the telemetry + * data. + */ public static InstrumenterBuilder newBuilder( OpenTelemetry openTelemetry, String instrumentationName, diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/BaseTracer.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/BaseTracer.java index dd91d7960dfc..0986c9cbb08f 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/BaseTracer.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/BaseTracer.java @@ -73,9 +73,9 @@ protected BaseTracer(OpenTelemetry openTelemetry) { * troubleshooting it's possible to pinpoint what tracer produced problematic telemetry. * *

In this project we use a convention to encode the version of the instrument*ed* library into - * the instrumentation name, for example {@code io.opentelemetry.javaagent.apache-httpclient-4.0}. - * This way, if there are different instrumentations for different library versions it's easy to - * find out which instrumentations produced the telemetry data. + * the instrumentation name, for example {@code io.opentelemetry.apache-httpclient-4.0}. This way, + * if there are different instrumentations for different library versions it's easy to find out + * which instrumentations produced the telemetry data. * * @see io.opentelemetry.api.trace.TracerProvider#get(String, String) */ diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientTracer.java b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientTracer.java index 21b55ce169e0..255ce1223dc3 100644 --- a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientTracer.java +++ b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientTracer.java @@ -65,6 +65,6 @@ protected TextMapSetter getSetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.akka-http-10.0"; + return "io.opentelemetry.akka-http-10.0"; } } diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerTracer.java b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerTracer.java index 249403b6341f..067a478f14d2 100644 --- a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerTracer.java +++ b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerTracer.java @@ -65,7 +65,7 @@ protected TextMapGetter getGetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.akka-http-10.0"; + return "io.opentelemetry.akka-http-10.0"; } @Override diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelTracer.java b/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelTracer.java index 6ec39660c2a2..2adcfa6dd931 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelTracer.java +++ b/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelTracer.java @@ -39,7 +39,7 @@ class CamelTracer extends BaseTracer { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.apache-camel-2.20"; + return "io.opentelemetry.apache-camel-2.20"; } public Scope startClientScope(Span span) { diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java index 7767e4d0e5b3..682662747f71 100644 --- a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java +++ b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java @@ -55,7 +55,7 @@ public void end(Context context, Result result) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.apache-dubbo-2.7"; + return "io.opentelemetry.apache-dubbo-2.7"; } @Override diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientTracer.java b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientTracer.java index 649e753e73c4..6d3a90585bc0 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientTracer.java +++ b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientTracer.java @@ -101,7 +101,7 @@ private static String header(HttpMessage message, String name) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.apache-httpasyncclient-4.1"; + return "io.opentelemetry.apache-httpasyncclient-4.1"; } /** This method is overridden to allow other classes in this package to call it. */ diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientSingletons.java b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientSingletons.java index 7594393cd72f..847abf2726f2 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientSingletons.java +++ b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientSingletons.java @@ -16,8 +16,7 @@ import org.apache.commons.httpclient.HttpMethod; public final class ApacheHttpClientSingletons { - private static final String INSTRUMENTATION_NAME = - "io.opentelemetry.javaagent.apache-httpclient-2.0"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-2.0"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientSingletons.java b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientSingletons.java index b4a014e70822..90d8fe27cbca 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientSingletons.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientSingletons.java @@ -17,8 +17,7 @@ import org.apache.http.client.methods.HttpUriRequest; public final class ApacheHttpClientSingletons { - private static final String INSTRUMENTATION_NAME = - "io.opentelemetry.javaagent.apache-httpclient-4.0"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-4.0"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientSingletons.java b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientSingletons.java index 53fe88bfa6d2..5ac88456c331 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientSingletons.java +++ b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientSingletons.java @@ -17,8 +17,7 @@ import org.apache.hc.core5.http.HttpResponse; public final class ApacheHttpClientSingletons { - private static final String INSTRUMENTATION_NAME = - "io.opentelemetry.javaagent.apache-httpclient-5.0"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-5.0"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientTracer.java b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientTracer.java index 5c7afcb046de..396d30d2c77f 100644 --- a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientTracer.java +++ b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientTracer.java @@ -57,6 +57,6 @@ protected TextMapSetter getSetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.async-http-client-1.9"; + return "io.opentelemetry.async-http-client-1.9"; } } diff --git a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java index 29c62ecacafd..ef5737b531aa 100644 --- a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java +++ b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientSingletons.java @@ -17,8 +17,7 @@ import org.asynchttpclient.Response; public final class AsyncHttpClientSingletons { - private static final String INSTRUMENTATION_NAME = - "io.opentelemetry.javaagent.async-http-client-2.0"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.async-http-client-2.0"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkClientTracer.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkClientTracer.java index 105ad4c2b656..0c4543d1115c 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkClientTracer.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkClientTracer.java @@ -148,7 +148,7 @@ protected TextMapSetter> getSetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.aws-sdk-1.11"; + return "io.opentelemetry.aws-sdk-1.11"; } static final class NamesCache extends ClassValue> { diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpClientTracer.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpClientTracer.java index be8f064dfd45..b4a22b62e6c0 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpClientTracer.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpClientTracer.java @@ -75,7 +75,7 @@ private static String header(SdkHttpHeaders headers, String name) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.aws-sdk-2.2"; + return "io.opentelemetry.aws-sdk-2.2"; } /** This method is overridden to allow other classes in this package to call it. */ diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java index 8444f3dc92f3..1871088afb6e 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java @@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.db.DbSpanNameExtractor; public final class CassandraSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.cassandra-3.0"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.cassandra-3.0"; // could use RESPONSE "ResultSet" here, but using RESPONSE "ExecutionInfo" in cassandra-4.0 // instrumentation (see comment over there for why), so also using here for consistency diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java index 17347f21f383..6fe601925ca2 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java @@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.db.DbSpanNameExtractor; public final class CassandraSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.cassandra-4.0"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.cassandra-4.0"; // using ExecutionInfo because we can get that from ResultSet, AsyncResultSet and DriverException private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseClientTracer.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseClientTracer.java index 226b3987c3f2..1524a21d3337 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseClientTracer.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseClientTracer.java @@ -47,6 +47,6 @@ protected InetSocketAddress peerAddress(Void connection) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.couchbase-2.0"; + return "io.opentelemetry.couchbase-2.0"; } } diff --git a/instrumentation/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardTracer.java b/instrumentation/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardTracer.java index ce3368aa358d..5d2d67e54234 100644 --- a/instrumentation/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardTracer.java +++ b/instrumentation/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardTracer.java @@ -16,6 +16,6 @@ public static DropwizardTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.dropwizard-views-0.7"; + return "io.opentelemetry.dropwizard-views-0.7"; } } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestClientTracer.java b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestClientTracer.java index ba8858f6e8ff..8d44d20484d1 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestClientTracer.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestClientTracer.java @@ -54,6 +54,6 @@ protected String dbOperation(Void connection, String operation, String ignored) @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.elasticsearch-rest-common"; + return "io.opentelemetry.elasticsearch-rest-common"; } } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportClientTracer.java b/instrumentation/elasticsearch/elasticsearch-transport-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportClientTracer.java index 69dcaa81302a..d767c97e77a4 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportClientTracer.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportClientTracer.java @@ -60,6 +60,6 @@ protected String dbOperation(Void connection, Object action, String operation) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.elasticsearch-transport-common"; + return "io.opentelemetry.elasticsearch-transport-common"; } } diff --git a/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationTracer.java b/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationTracer.java index 87bdc014cf4d..393a820370e5 100644 --- a/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationTracer.java +++ b/instrumentation/external-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extannotations/ExternalAnnotationTracer.java @@ -19,7 +19,7 @@ public static ExternalAnnotationTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.external-annotations"; + return "io.opentelemetry.external-annotations"; } public Context startSpan(Method method) { diff --git a/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraTracer.java b/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraTracer.java index d9c08ef792a6..568c0c724ce2 100644 --- a/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraTracer.java +++ b/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraTracer.java @@ -19,7 +19,7 @@ public static FinatraTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.finatra-2.9"; + return "io.opentelemetry.finatra-2.9"; } public Context startSpan(Context parentContext, Class clazz) { diff --git a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeSingletons.java b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeSingletons.java index 4e2f55860662..7dfeaba65466 100644 --- a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeSingletons.java +++ b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeSingletons.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.db.DbSpanNameExtractor; public final class GeodeSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.geode-1.4"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.geode-1.4"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientTracer.java b/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientTracer.java index 7c79a6b336d9..9dbe7fda7254 100644 --- a/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientTracer.java +++ b/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientTracer.java @@ -35,7 +35,7 @@ public Context startSpan(Context parentContext, HttpRequest request) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.google-http-client-1.19"; + return "io.opentelemetry.google-http-client-1.19"; } @Override diff --git a/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsTracer.java b/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsTracer.java index 6471c237fa3f..6f6ee0847ef7 100644 --- a/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsTracer.java +++ b/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsTracer.java @@ -41,6 +41,6 @@ private static String getServerSpanName(Context context, GrailsControllerUrlMapp @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.grails-3.0"; + return "io.opentelemetry.grails-3.0"; } } diff --git a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java b/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java index 47060259f2b1..ae4e222c0db1 100644 --- a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java +++ b/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java @@ -90,7 +90,7 @@ protected TextMapGetter getGetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.grizzly-2.0"; + return "io.opentelemetry.grizzly-2.0"; } @Override diff --git a/instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtSingletons.java b/instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtSingletons.java index 8a2334ae1ebd..aefc3e6d46a1 100644 --- a/instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtSingletons.java +++ b/instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtSingletons.java @@ -14,7 +14,7 @@ public final class GwtSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.gwt-2.0"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.gwt-2.0"; public static final ContextKey RPC_CONTEXT_KEY = ContextKey.named("opentelemetry-gwt-rpc-context-key"); diff --git a/instrumentation/hibernate/hibernate-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/HibernateTracer.java b/instrumentation/hibernate/hibernate-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/HibernateTracer.java index 167cb5e5c584..6ead21502f14 100644 --- a/instrumentation/hibernate/hibernate-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/HibernateTracer.java +++ b/instrumentation/hibernate/hibernate-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/HibernateTracer.java @@ -64,6 +64,6 @@ String entityName(Object entity) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.hibernate-common"; + return "io.opentelemetry.hibernate-common"; } } diff --git a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTracer.java b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTracer.java index 9c880f4a5c77..13dde169a315 100644 --- a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTracer.java +++ b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTracer.java @@ -64,6 +64,6 @@ protected TextMapSetter getSetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.http-url-connection"; + return "io.opentelemetry.http-url-connection"; } } diff --git a/instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTracer.java b/instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTracer.java index 94ea990c982e..df981a7fd197 100644 --- a/instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTracer.java +++ b/instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTracer.java @@ -23,7 +23,7 @@ public static HystrixTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.hystrix-1.4"; + return "io.opentelemetry.hystrix-1.4"; } public void onCommand(Span span, HystrixInvokableInfo command, String methodName) { diff --git a/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpClientTracer.java b/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpClientTracer.java index 525960061a8e..374c98fc6f12 100644 --- a/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpClientTracer.java +++ b/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpClientTracer.java @@ -35,7 +35,7 @@ public static JdkHttpClientTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.java-http-client"; + return "io.opentelemetry.java-http-client"; } @Override diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientV1Tracer.java b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientV1Tracer.java index 6c5b93b0c865..2709f3eb54d0 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientV1Tracer.java +++ b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientV1Tracer.java @@ -59,6 +59,6 @@ protected TextMapSetter getSetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.jaxrs-client-1.1"; + return "io.opentelemetry.jaxrs-client-1.1"; } } diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientTracer.java b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientTracer.java index ce900168356c..99576d1a5aef 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientTracer.java +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientTracer.java @@ -67,6 +67,6 @@ protected Throwable unwrapThrowable(Throwable throwable) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.jaxrs-client-2.0"; + return "io.opentelemetry.jaxrs-client-2.0"; } } diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ResteasyClientTracer.java b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ResteasyClientTracer.java index 328b83ce02c8..50243d72440c 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ResteasyClientTracer.java +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ResteasyClientTracer.java @@ -67,6 +67,6 @@ protected Throwable unwrapThrowable(Throwable throwable) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.jaxrs-client-2.0-resteasy-3.0"; + return "io.opentelemetry.jaxrs-client-2.0-resteasy-3.0"; } } diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsAnnotationsTracer.java b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsAnnotationsTracer.java index 6db021315e53..bf8d3cfd19e0 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsAnnotationsTracer.java +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsAnnotationsTracer.java @@ -192,6 +192,6 @@ private static String buildSpanName(Path classPath, Path methodPath) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.jaxrs-1.0"; + return "io.opentelemetry.jaxrs-1.0"; } } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsAnnotationsTracer.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsAnnotationsTracer.java index 57cc6cb1412b..9b8efbfabec1 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsAnnotationsTracer.java +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsAnnotationsTracer.java @@ -225,6 +225,6 @@ private static String buildSpanName(Path classPath, Path methodPath) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.jaxrs-2.0-common"; + return "io.opentelemetry.jaxrs-2.0-common"; } } diff --git a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/src/main/java/io/opentelemetry/instrumentation/axis2/Axis2JaxWsTracer.java b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/src/main/java/io/opentelemetry/instrumentation/axis2/Axis2JaxWsTracer.java index 76acfb5dcbe7..f34d4cf634e8 100644 --- a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/src/main/java/io/opentelemetry/instrumentation/axis2/Axis2JaxWsTracer.java +++ b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/src/main/java/io/opentelemetry/instrumentation/axis2/Axis2JaxWsTracer.java @@ -76,6 +76,6 @@ public void end(MessageContext message, Throwable throwable) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.jaxws-2.0-axis2-1.6"; + return "io.opentelemetry.jaxws-2.0-axis2-1.6"; } } diff --git a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/cxf/CxfJaxWsTracer.java b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/cxf/CxfJaxWsTracer.java index 257db37c67d6..be0b239f2f48 100644 --- a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/cxf/CxfJaxWsTracer.java +++ b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/cxf/CxfJaxWsTracer.java @@ -80,6 +80,6 @@ public void stopSpan(Message message) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.jaxws-2.0-cxf-3.0"; + return "io.opentelemetry.jaxws-2.0-cxf-3.0"; } } diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroJaxWsTracer.java b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroJaxWsTracer.java index 29e3a7c40fc5..ed29bc89b3e9 100644 --- a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroJaxWsTracer.java +++ b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroJaxWsTracer.java @@ -88,6 +88,6 @@ public void storeThrowable(Packet packet, Throwable throwable) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.jaxws-2.0-metro-2.2"; + return "io.opentelemetry.jaxws-2.0-metro-2.2"; } } diff --git a/instrumentation/jaxws/jaxws-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsTracer.java b/instrumentation/jaxws/jaxws-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsTracer.java index b263c85bfb16..7fb45029cfef 100644 --- a/instrumentation/jaxws/jaxws-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsTracer.java +++ b/instrumentation/jaxws/jaxws-common/library/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsTracer.java @@ -25,7 +25,7 @@ public static JaxWsTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.jaxws-common"; + return "io.opentelemetry.jaxws-common"; } public Context startSpan(Class target, Method method) { diff --git a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java index 58c3accf7a4a..1c8c935ce4e2 100644 --- a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java +++ b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java @@ -14,7 +14,7 @@ import io.opentelemetry.javaagent.instrumentation.api.instrumenter.PeerServiceAttributesExtractor; public final class JdbcSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.jdbc"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jdbc"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/datasource/DataSourceSingletons.java b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/datasource/DataSourceSingletons.java index 48f751e33f2f..1338b80fa024 100644 --- a/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/datasource/DataSourceSingletons.java +++ b/instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/datasource/DataSourceSingletons.java @@ -13,7 +13,7 @@ import javax.sql.DataSource; public final class DataSourceSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.jdbc"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jdbc"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisSingletons.java b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisSingletons.java index f31dcba7cbca..a512b53480d4 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisSingletons.java +++ b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisSingletons.java @@ -14,7 +14,7 @@ import io.opentelemetry.javaagent.instrumentation.api.instrumenter.PeerServiceAttributesExtractor; public final class JedisSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.jedis-1.4"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jedis-1.4"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisSingletons.java b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisSingletons.java index b0b75559ee1f..cfbce45fbda6 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisSingletons.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisSingletons.java @@ -14,7 +14,7 @@ import io.opentelemetry.javaagent.instrumentation.api.instrumenter.PeerServiceAttributesExtractor; public final class JedisSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.jedis-3.0"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jedis-3.0"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11HttpServerTracer.java b/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11HttpServerTracer.java index 678d0fc8789a..22ed66e63d0e 100644 --- a/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11HttpServerTracer.java +++ b/instrumentation/jetty/jetty-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/Jetty11HttpServerTracer.java @@ -29,6 +29,6 @@ protected Context customizeContext(Context context, HttpServletRequest request) @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.jetty-11.0"; + return "io.opentelemetry.jetty-11.0"; } } diff --git a/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8HttpServerTracer.java b/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8HttpServerTracer.java index 8595d0484a12..c1b7f8be6f48 100644 --- a/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8HttpServerTracer.java +++ b/instrumentation/jetty/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/Jetty8HttpServerTracer.java @@ -29,6 +29,6 @@ protected Context customizeContext(Context context, HttpServletRequest request) @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.jetty-8.0"; + return "io.opentelemetry.jetty-8.0"; } } diff --git a/instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsSingletons.java b/instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsSingletons.java index 49e7f6ba6f24..e31326bdd931 100644 --- a/instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsSingletons.java +++ b/instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsSingletons.java @@ -14,7 +14,7 @@ import java.time.Instant; public final class JmsSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.jms-1.1"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jms-1.1"; private static final Instrumenter PRODUCER_INSTRUMENTER; private static final Instrumenter CONSUMER_INSTRUMENTER; diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraTracer.java b/instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraTracer.java index 42ff5dbeccd7..2f6d28f3e785 100644 --- a/instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraTracer.java +++ b/instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraTracer.java @@ -16,6 +16,6 @@ public static MojarraTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.mojarra-1.2"; + return "io.opentelemetry.mojarra-1.2"; } } diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesTracer.java b/instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesTracer.java index 3634213f1493..8d291629f6ab 100644 --- a/instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesTracer.java +++ b/instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesTracer.java @@ -26,6 +26,6 @@ protected Throwable unwrapThrowable(Throwable throwable) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.myfaces-1.2"; + return "io.opentelemetry.myfaces-1.2"; } } diff --git a/instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspTracer.java b/instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspTracer.java index a13bbcc41a02..0b4f1663da19 100644 --- a/instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspTracer.java +++ b/instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspTracer.java @@ -83,6 +83,6 @@ public void onRender(Context context, HttpServletRequest req) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.jsp-2.3"; + return "io.opentelemetry.jsp-2.3"; } } diff --git a/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerTracer.java b/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerTracer.java index 93a338d840fc..717e50562f55 100644 --- a/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerTracer.java +++ b/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerTracer.java @@ -78,6 +78,6 @@ public void onConsume(Span span, long startTimeMillis, ConsumerRecord reco @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.kafka-clients-0.11"; + return "io.opentelemetry.kafka-clients-0.11"; } } diff --git a/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaProducerTracer.java b/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaProducerTracer.java index c5e6e90448bd..629d999546c8 100644 --- a/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaProducerTracer.java +++ b/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaProducerTracer.java @@ -60,6 +60,6 @@ public void onProduce(SpanBuilder span, ProducerRecord record) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.kafka-clients-0.11"; + return "io.opentelemetry.kafka-clients-0.11"; } } diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsTracer.java b/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsTracer.java index e2f94cecaf0e..ae6d6e29bb66 100644 --- a/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsTracer.java +++ b/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsTracer.java @@ -57,6 +57,6 @@ public void onConsume(Span span, StampedRecord record) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.kafka-streams-0.11"; + return "io.opentelemetry.kafka-streams-0.11"; } } diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTracer.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTracer.java index 92643f59db37..01f133f9333d 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTracer.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTracer.java @@ -41,7 +41,7 @@ public static KubernetesClientTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.kubernetes-client-7.0"; + return "io.opentelemetry.kubernetes-client-7.0"; } @Override diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSingletons.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSingletons.java index 825d45c6c387..1dbb4f7088f2 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSingletons.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSingletons.java @@ -16,7 +16,7 @@ import io.opentelemetry.javaagent.instrumentation.api.instrumenter.PeerServiceAttributesExtractor; public final class LettuceSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.jedis-1.4"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.lettuce-4.0"; private static final Instrumenter, Void> INSTRUMENTER; diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSingletons.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSingletons.java index 016b71894e96..44ff18dd2574 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSingletons.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSingletons.java @@ -16,7 +16,7 @@ import io.opentelemetry.javaagent.instrumentation.api.instrumenter.PeerServiceAttributesExtractor; public final class LettuceSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.jedis-5.0"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.lettuce-5.0"; private static final Instrumenter, Void> INSTRUMENTER; diff --git a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceTracing.java b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceTracing.java index b11c9e509962..ac8f4a1c6a7c 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceTracing.java +++ b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceTracing.java @@ -20,7 +20,7 @@ public static LettuceTracing create(OpenTelemetry openTelemetry) { private final Tracer tracer; private LettuceTracing(OpenTelemetry openTelemetry) { - tracer = openTelemetry.getTracer("io.opentelemetry.javaagent.lettuce-5.1"); + tracer = openTelemetry.getTracer("io.opentelemetry.lettuce-5.1"); } /** diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherTracer.java b/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherTracer.java index d36af0fdb0e6..cd5a4ebe185e 100644 --- a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherTracer.java +++ b/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherTracer.java @@ -26,7 +26,7 @@ public static LibertyDispatcherTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.liberty-dispatcher"; + return "io.opentelemetry.liberty-dispatcher"; } @Override diff --git a/instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyHttpServerTracer.java b/instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyHttpServerTracer.java index 52a2a3b4130f..4f3ef89c009f 100644 --- a/instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyHttpServerTracer.java +++ b/instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyHttpServerTracer.java @@ -22,6 +22,6 @@ public Context startSpan(HttpServletRequest request) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.liberty"; + return "io.opentelemetry.liberty"; } } diff --git a/instrumentation/methods/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/MethodSingletons.java b/instrumentation/methods/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/MethodSingletons.java index 0e6f3a8cb37d..1253831a75d0 100644 --- a/instrumentation/methods/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/MethodSingletons.java +++ b/instrumentation/methods/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/MethodSingletons.java @@ -13,8 +13,7 @@ import java.lang.reflect.Method; public final class MethodSingletons { - private static final String INSTRUMENTATION_NAME = - "io.opentelemetry.javaagent.external-annotations"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.methods"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoClientTracer.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoClientTracer.java index 7b4b52c05d97..8cdd6f201cff 100644 --- a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoClientTracer.java +++ b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoClientTracer.java @@ -46,7 +46,7 @@ final class MongoClientTracer @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.mongo-common"; + return "io.opentelemetry.mongo-3.1"; } @Override diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientTracer.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientTracer.java index 820daa9b4207..91522bbf31e1 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientTracer.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientTracer.java @@ -105,6 +105,6 @@ protected TextMapSetter getSetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.netty-3.8"; + return "io.opentelemetry.netty-3.8"; } } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java index bbecdde3acc9..5c4e14b9ad60 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java @@ -81,7 +81,7 @@ protected TextMapGetter getGetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.netty-3.8"; + return "io.opentelemetry.netty-3.8"; } @Override diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java index 994f361a7aa6..d57ac647cef7 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java @@ -104,6 +104,6 @@ protected TextMapSetter getSetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.netty-4.0"; + return "io.opentelemetry.netty-4.0"; } } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java index b4d493fe84cb..033f7b7a86bd 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java @@ -53,7 +53,7 @@ public Context getServerContext(Channel channel) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.netty-4.0"; + return "io.opentelemetry.netty-4.0"; } @Override diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java index c08c9078a1cc..61a92be56996 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java @@ -132,6 +132,6 @@ public boolean shouldStartSpan(Context parentContext) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.netty-4.1"; + return "io.opentelemetry.netty-4.1"; } } diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java index 0e4cb6f9b7b3..81e085452a60 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java @@ -53,7 +53,7 @@ public Context getServerContext(Channel channel) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.netty-4.1"; + return "io.opentelemetry.netty-4.1"; } @Override diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttpClientTracer.java b/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttpClientTracer.java index d6334bdf2a57..3bd9d91b5ad2 100644 --- a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttpClientTracer.java +++ b/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttpClientTracer.java @@ -58,6 +58,6 @@ protected TextMapSetter getSetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.okhttp-2.2"; + return "io.opentelemetry.okhttp-2.2"; } } diff --git a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpClientTracer.java b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpClientTracer.java index 34fb296f982d..fc83078b78fe 100644 --- a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpClientTracer.java +++ b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpClientTracer.java @@ -53,6 +53,6 @@ protected TextMapSetter getSetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.okhttp-3.0"; + return "io.opentelemetry.okhttp-3.0"; } } diff --git a/instrumentation/opentelemetry-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/WithSpanTracer.java b/instrumentation/opentelemetry-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/WithSpanTracer.java index 620f41487ccd..a85a264a0bac 100644 --- a/instrumentation/opentelemetry-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/WithSpanTracer.java +++ b/instrumentation/opentelemetry-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/WithSpanTracer.java @@ -101,6 +101,6 @@ public Object end(Context context, Class returnType, Object returnValue) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.opentelemetry-annotations-1.0"; + return "io.opentelemetry.opentelemetry-annotations-1.0"; } } diff --git a/instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientTracer.java b/instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientTracer.java index 3fc06d33b6f6..c6b1ebf3c7f9 100644 --- a/instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientTracer.java +++ b/instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientTracer.java @@ -59,6 +59,6 @@ protected TextMapSetter getSetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.play-ws-common"; + return "io.opentelemetry.play-ws-common"; } } diff --git a/instrumentation/play/play-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayTracer.java b/instrumentation/play/play-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayTracer.java index a0229017d09c..2e0dc5adb140 100644 --- a/instrumentation/play/play-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayTracer.java +++ b/instrumentation/play/play-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayTracer.java @@ -29,6 +29,6 @@ public void updateSpanName(Span span, Request request) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.play-2.4"; + return "io.opentelemetry.play-2.4"; } } diff --git a/instrumentation/play/play-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayTracer.java b/instrumentation/play/play-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayTracer.java index de02704d51cb..71254e3dceec 100644 --- a/instrumentation/play/play-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayTracer.java +++ b/instrumentation/play/play-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayTracer.java @@ -70,6 +70,6 @@ public void updateSpanName(Span span, Request request) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.play-2.6"; + return "io.opentelemetry.play-2.6"; } } diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitTracer.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitTracer.java index 0912f5cb632b..cfa55ae16088 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitTracer.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitTracer.java @@ -190,6 +190,6 @@ public static void onCommand(Span span, Command command) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.rabbitmq-2.7"; + return "io.opentelemetry.rabbitmq-2.7"; } } diff --git a/instrumentation/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackTracer.java b/instrumentation/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackTracer.java index 1008cc6902d9..535c39a3afc1 100644 --- a/instrumentation/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackTracer.java +++ b/instrumentation/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackTracer.java @@ -29,7 +29,7 @@ public void onContext(io.opentelemetry.context.Context otelContext, Context ctx) @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.ratpack-1.4"; + return "io.opentelemetry.ratpack-1.4"; } @Override diff --git a/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaClientTracer.java b/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaClientTracer.java index 0fe07e4cee7d..055dabb41fbf 100644 --- a/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaClientTracer.java +++ b/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaClientTracer.java @@ -54,6 +54,6 @@ protected String dbStatement( @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.rediscala-1.8"; + return "io.opentelemetry.rediscala-1.8"; } } diff --git a/instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonSingletons.java b/instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonSingletons.java index aa3d11a24e89..26a15bf30e4c 100644 --- a/instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonSingletons.java +++ b/instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonSingletons.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.db.DbSpanNameExtractor; public final class RedissonSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.redisson-3.0"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.redisson-3.0"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientTracer.java b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientTracer.java index 3b40d5f9a93d..ffcc51989407 100644 --- a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientTracer.java +++ b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientTracer.java @@ -37,7 +37,7 @@ public Context startSpan(Method method) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.rmi"; + return "io.opentelemetry.rmi"; } @Override diff --git a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerTracer.java b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerTracer.java index a5ab4ef26481..d74e01a1e748 100644 --- a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerTracer.java +++ b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerTracer.java @@ -40,6 +40,6 @@ protected TextMapGetter getGetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.rmi"; + return "io.opentelemetry.rmi"; } } diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerTracer.java b/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerTracer.java index 1320af70c173..0844447b78ed 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerTracer.java +++ b/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqConsumerTracer.java @@ -34,7 +34,7 @@ final class RocketMqConsumerTracer extends BaseTracer { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.rocketmq-client"; + return "io.opentelemetry.rocketmq-client-4.8"; } Context startSpan(Context parentContext, List msgs) { diff --git a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqProducerTracer.java b/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqProducerTracer.java index 613462f5113f..11a48251524f 100644 --- a/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqProducerTracer.java +++ b/instrumentation/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmq/RocketMqProducerTracer.java @@ -27,7 +27,7 @@ final class RocketMqProducerTracer extends BaseTracer { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.rocketmq-client"; + return "io.opentelemetry.rocketmq-client-4.8"; } Context startProducerSpan(Context parentContext, String addr, Message msg) { diff --git a/instrumentation/servlet/servlet-2.2/library/src/main/java/io/opentelemetry/instrumentation/servlet/v2_2/Servlet2HttpServerTracer.java b/instrumentation/servlet/servlet-2.2/library/src/main/java/io/opentelemetry/instrumentation/servlet/v2_2/Servlet2HttpServerTracer.java index dc7de3bc6415..d75b74e40f03 100644 --- a/instrumentation/servlet/servlet-2.2/library/src/main/java/io/opentelemetry/instrumentation/servlet/v2_2/Servlet2HttpServerTracer.java +++ b/instrumentation/servlet/servlet-2.2/library/src/main/java/io/opentelemetry/instrumentation/servlet/v2_2/Servlet2HttpServerTracer.java @@ -35,6 +35,6 @@ public Context updateContext(Context context, HttpServletRequest request) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.servlet-2.2"; + return "io.opentelemetry.servlet-2.2"; } } diff --git a/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java b/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java index 94d79d2ca354..801fc6bc855c 100644 --- a/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java +++ b/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java @@ -48,6 +48,6 @@ public Context updateContext( @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.servlet-3.0"; + return "io.opentelemetry.servlet-3.0"; } } diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/response/ResponseTracer.java b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/response/ResponseTracer.java index cfd40e4a1d81..8fcefb4ce3b1 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/response/ResponseTracer.java +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/response/ResponseTracer.java @@ -19,7 +19,7 @@ public static ResponseTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.servlet-5.0"; + return "io.opentelemetry.servlet-5.0"; } public Context startSpan(Method method) { diff --git a/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/jakarta/v5_0/JakartaServletHttpServerTracer.java b/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/jakarta/v5_0/JakartaServletHttpServerTracer.java index a5b3ba467260..29114c69e857 100644 --- a/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/jakarta/v5_0/JakartaServletHttpServerTracer.java +++ b/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/jakarta/v5_0/JakartaServletHttpServerTracer.java @@ -51,7 +51,7 @@ public Context updateContext( @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.servlet-5.0"; + return "io.opentelemetry.servlet-5.0"; } @Override diff --git a/instrumentation/servlet/servlet-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/javax/response/ResponseTracer.java b/instrumentation/servlet/servlet-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/javax/response/ResponseTracer.java index 0e2318403d7b..f57f10c22dd6 100644 --- a/instrumentation/servlet/servlet-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/javax/response/ResponseTracer.java +++ b/instrumentation/servlet/servlet-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/javax/response/ResponseTracer.java @@ -19,7 +19,7 @@ public static ResponseTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.servlet-javax-common"; + return "io.opentelemetry.servlet-javax-common"; } public Context startSpan(Method method) { diff --git a/instrumentation/servlet/servlet-javax-common/library/src/test/java/RequestOnlyTracer.java b/instrumentation/servlet/servlet-javax-common/library/src/test/java/RequestOnlyTracer.java index cd3a47e91cb4..c493437e22b7 100644 --- a/instrumentation/servlet/servlet-javax-common/library/src/test/java/RequestOnlyTracer.java +++ b/instrumentation/servlet/servlet-javax-common/library/src/test/java/RequestOnlyTracer.java @@ -37,6 +37,6 @@ public boolean isResponseCommitted(Void unused) { @Override protected String getInstrumentationName() { - return null; + return "test"; } } diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/chunk/ChunkExecutionTracer.java b/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/chunk/ChunkExecutionTracer.java index 6993e2e269b8..1f94b4a22930 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/chunk/ChunkExecutionTracer.java +++ b/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/chunk/ChunkExecutionTracer.java @@ -48,6 +48,6 @@ private static void linkParentSpan(SpanBuilder spanBuilder, Context parentContex @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.spring-batch-3.0"; + return "io.opentelemetry.spring-batch-3.0"; } } diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/item/ItemTracer.java b/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/item/ItemTracer.java index 5d8ed409d27a..d0dbe456917e 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/item/ItemTracer.java +++ b/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/item/ItemTracer.java @@ -65,6 +65,6 @@ private Context startItemSpan(String itemOperationName) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.spring-batch-3.0"; + return "io.opentelemetry.spring-batch-3.0"; } } diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/job/JobExecutionTracer.java b/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/job/JobExecutionTracer.java index 18d8297164bf..368ba73e2278 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/job/JobExecutionTracer.java +++ b/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/job/JobExecutionTracer.java @@ -23,6 +23,6 @@ public Context startSpan(JobExecution jobExecution) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.spring-batch-3.0"; + return "io.opentelemetry.spring-batch-3.0"; } } diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/step/StepExecutionTracer.java b/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/step/StepExecutionTracer.java index 88f3fc34fd36..b8058f74bd65 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/step/StepExecutionTracer.java +++ b/instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/step/StepExecutionTracer.java @@ -24,6 +24,6 @@ public Context startSpan(StepExecution stepExecution) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.spring-batch-3.0"; + return "io.opentelemetry.spring-batch-3.0"; } } diff --git a/instrumentation/spring/spring-data-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/SpringDataTracer.java b/instrumentation/spring/spring-data-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/SpringDataTracer.java index 8c2a73d4cc1e..c93fa6d2833e 100644 --- a/instrumentation/spring/spring-data-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/SpringDataTracer.java +++ b/instrumentation/spring/spring-data-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/SpringDataTracer.java @@ -21,7 +21,7 @@ private SpringDataTracer() {} @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.spring-data-1.8"; + return "io.opentelemetry.spring-data-1.8"; } public Context startSpan(Method method) { diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/SpringRabbitSingletons.java b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/SpringRabbitSingletons.java index c2c316ecb512..93a238ea1eda 100644 --- a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/SpringRabbitSingletons.java +++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/SpringRabbitSingletons.java @@ -13,7 +13,7 @@ public final class SpringRabbitSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.spring-rabbit-1.0"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-rabbit-1.0"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/SpringSchedulingTracer.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/SpringSchedulingTracer.java index 44c4f7d29b15..12d6659461a6 100644 --- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/SpringSchedulingTracer.java +++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/SpringSchedulingTracer.java @@ -20,7 +20,7 @@ public static SpringSchedulingTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.spring-scheduling-3.1"; + return "io.opentelemetry.spring-scheduling-3.1"; } public Context startSpan(Runnable runnable) { diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/SpringWebfluxHttpServerTracer.java b/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/SpringWebfluxHttpServerTracer.java index 4329ce9e8a4d..3c54f0394777 100644 --- a/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/SpringWebfluxHttpServerTracer.java +++ b/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/SpringWebfluxHttpServerTracer.java @@ -16,6 +16,6 @@ public static SpringWebfluxHttpServerTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.spring-webflux-5.0"; + return "io.opentelemetry.spring-webflux-5.0"; } } diff --git a/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java index bcf5129ef763..1d4f744cbea0 100644 --- a/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java +++ b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java @@ -87,7 +87,7 @@ protected TextMapSetter getSetter() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.spring-webflux-5.0"; + return "io.opentelemetry.spring-webflux-5.0"; } // rawStatusCode() method was introduced in webflux 5.1 diff --git a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcSingletons.java b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcSingletons.java index 3ac2419d268a..f3bca44f5422 100644 --- a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcSingletons.java +++ b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcSingletons.java @@ -10,7 +10,7 @@ import org.springframework.web.servlet.ModelAndView; public final class SpringWebMvcSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.javaagent.spring-webmvc-3.1"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-webmvc-3.1"; private static final Instrumenter HANDLER_INSTRUMENTER; diff --git a/instrumentation/spring/spring-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/ws/SpringWsTracer.java b/instrumentation/spring/spring-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/ws/SpringWsTracer.java index f7dec5a6eefb..c9d0fd755693 100644 --- a/instrumentation/spring/spring-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/ws/SpringWsTracer.java +++ b/instrumentation/spring/spring-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/ws/SpringWsTracer.java @@ -33,6 +33,6 @@ public Context startSpan(Method method) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.spring-ws-2.0"; + return "io.opentelemetry.spring-ws-2.0"; } } diff --git a/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/MemcacheClientTracer.java b/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/MemcacheClientTracer.java index 02f1833a1dc0..761d2ec9c43d 100644 --- a/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/MemcacheClientTracer.java +++ b/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/MemcacheClientTracer.java @@ -55,6 +55,6 @@ protected String dbOperation( @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.spymemcached-2.12"; + return "io.opentelemetry.spymemcached-2.12"; } } diff --git a/instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2Tracer.java b/instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2Tracer.java index 8cc99ead34a4..944f090ab68b 100644 --- a/instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2Tracer.java +++ b/instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2Tracer.java @@ -72,6 +72,6 @@ private static String getServerSpanName(Context context, ActionProxy actionProxy @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.struts-2.3"; + return "io.opentelemetry.struts-2.3"; } } diff --git a/instrumentation/tapestry-5.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tapestry/TapestryTracer.java b/instrumentation/tapestry-5.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tapestry/TapestryTracer.java index 730fccc31ac0..3bae58e83ed2 100644 --- a/instrumentation/tapestry-5.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tapestry/TapestryTracer.java +++ b/instrumentation/tapestry-5.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tapestry/TapestryTracer.java @@ -53,6 +53,6 @@ protected Throwable unwrapThrowable(Throwable throwable) { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.tapestry-5.4"; + return "io.opentelemetry.tapestry-5.4"; } } diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10Tracer.java b/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10Tracer.java index 36b977df5e9d..2bf2e151d8a9 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10Tracer.java +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10Tracer.java @@ -16,6 +16,6 @@ public static TomcatTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.tomcat-10.0"; + return "io.opentelemetry.tomcat-10.0"; } } diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7Tracer.java b/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7Tracer.java index 342eb8925d8f..b011db9195ec 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7Tracer.java +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7Tracer.java @@ -16,6 +16,6 @@ public static TomcatTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.tomcat-7.0"; + return "io.opentelemetry.tomcat-7.0"; } } diff --git a/instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioTracer.java b/instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioTracer.java index 02d6879154df..fa8d05ce63f3 100644 --- a/instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioTracer.java +++ b/instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioTracer.java @@ -128,6 +128,6 @@ private static void setTagIfPresent(Span span, Object result, String tag, String @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.twilio-6.6"; + return "io.opentelemetry.twilio-6.6"; } } diff --git a/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpServerTracer.java b/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpServerTracer.java index 3d9a146406ce..4d540c741fdf 100644 --- a/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpServerTracer.java +++ b/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpServerTracer.java @@ -31,7 +31,7 @@ public static UndertowHttpServerTracer tracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.undertow"; + return "io.opentelemetry.undertow-1.4"; } public Context startServerSpan(HttpServerExchange exchange) { diff --git a/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinTracer.java b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinTracer.java index 1467a0aae372..64ecf11e7771 100644 --- a/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinTracer.java +++ b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinTracer.java @@ -144,7 +144,7 @@ public Context startRpcInvocationHandlerSpan( @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.vaadin-14.2"; + return "io.opentelemetry.vaadin-14.2"; } private static class VaadinServiceContext { diff --git a/instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/VertxClientTracer.java b/instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/VertxClientTracer.java index 1132d6aad8de..dcfc4249e3f3 100644 --- a/instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/VertxClientTracer.java +++ b/instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/VertxClientTracer.java @@ -28,7 +28,7 @@ public VertxClientTracer() { @Override protected String getInstrumentationName() { - return "io.opentelemetry.javaagent.vertx-core-3.0"; + return "io.opentelemetry.vertx-web-3.0"; } @Override