Change all instrumentation names to io.opentelemetry.{libName}-{libVersion}

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java

@@ -41,7 +41,20 @@
  */
 public class Instrumenter<REQUEST, RESPONSE> {
 
-  /** Returns a new {@link InstrumenterBuilder}. */
+  /**
+   * Returns a new {@link InstrumenterBuilder}.
+   *
+   * <p>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.
+   *
+   * <p>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 <REQUEST, RESPONSE> InstrumenterBuilder<REQUEST, RESPONSE> newBuilder(
       OpenTelemetry openTelemetry,
       String instrumentationName,

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.
    *
    * <p>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)
    */

instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientTracer.java

@@ -65,6 +65,6 @@ protected TextMapSetter<AkkaHttpHeaders> getSetter() {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.akka-http-10.0";
+    return "io.opentelemetry.akka-http-10.0";
   }
 }

instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerTracer.java

@@ -65,7 +65,7 @@ protected TextMapGetter<HttpRequest> getGetter() {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.akka-http-10.0";
+    return "io.opentelemetry.akka-http-10.0";
   }
 
   @Override

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) {

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

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. */

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<HttpMethod, HttpMethod> INSTRUMENTER;
 

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<HttpUriRequest, HttpResponse> INSTRUMENTER;
 

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<ClassicHttpRequest, HttpResponse> INSTRUMENTER;
 

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<Request> getSetter() {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.async-http-client-1.9";
+    return "io.opentelemetry.async-http-client-1.9";
   }
 }

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<Request, Response> INSTRUMENTER;
 

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<Request<?>> 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<ConcurrentHashMap<String, String>> {

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. */

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

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<CassandraRequest, ExecutionInfo> INSTRUMENTER;

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";
   }
 }

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";
   }
 }

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";
   }
 }

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";
   }
 }

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) {

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) {

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<GeodeRequest, Void> INSTRUMENTER;
 

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

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";
   }
 }

instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java

@@ -90,7 +90,7 @@ protected TextMapGetter<HttpRequestPacket> getGetter() {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.grizzly-2.0";
+    return "io.opentelemetry.grizzly-2.0";
   }
 
   @Override

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<Boolean> RPC_CONTEXT_KEY =
       ContextKey.named("opentelemetry-gwt-rpc-context-key");

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";
   }
 }

instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTracer.java

@@ -64,6 +64,6 @@ protected TextMapSetter<HttpURLConnection> getSetter() {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.http-url-connection";
+    return "io.opentelemetry.http-url-connection";
   }
 }

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) {

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

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<ClientRequest> getSetter() {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.jaxrs-client-1.1";
+    return "io.opentelemetry.jaxrs-client-1.1";
   }
 }

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";
   }
 }

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";
   }
 }

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";
   }
 }

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";
   }
 }

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";
   }
 }

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";
   }
 }

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";
   }
 }

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) {

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<DbRequest, Void> INSTRUMENTER;
 

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<DataSource, Void> INSTRUMENTER;
 

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<JedisRequest, Void> INSTRUMENTER;
 

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<JedisRequest, Void> INSTRUMENTER;