Update instrumentation names (#2433)

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

@@ -61,6 +61,6 @@ public class AkkaHttpClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.akka-http";
+    return "io.opentelemetry.javaagent.akka-http-10.0";
   }
 }

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

@@ -65,7 +65,7 @@ public class AkkaHttpServerTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.akka-http";
+    return "io.opentelemetry.javaagent.akka-http-10.0";
   }
 
   @Override

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelTracer.java

@@ -40,7 +40,7 @@ class CamelTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.apache-camel";
+    return "io.opentelemetry.javaagent.apache-camel-2.20";
   }
 
   public SpanBuilder spanBuilder(String name) {

instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java

@@ -55,7 +55,7 @@ class DubboTracer extends RpcServerTracer<RpcInvocation> {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.apache-dubbo";
+    return "io.opentelemetry.javaagent.apache-dubbo-2.7";
   }
 
   @Override

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientTracer.java

@@ -100,7 +100,7 @@ public class ApacheHttpAsyncClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.apache-httpasyncclient";
+    return "io.opentelemetry.javaagent.apache-httpasyncclient-4.1";
   }
 
   @Override

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/CommonsHttpClientTracer.java

@@ -28,7 +28,7 @@ public class CommonsHttpClientTracer extends HttpClientTracer<HttpMethod, HttpMe
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.apache-httpclient";
+    return "io.opentelemetry.javaagent.apache-httpclient-2.0";
   }
 
   @Override

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientTracer.java

@@ -84,6 +84,6 @@ public class ApacheHttpClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.apache-httpclient";
+    return "io.opentelemetry.javaagent.apache-httpclient-4.0";
   }
 }

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientTracer.java

@@ -82,6 +82,6 @@ public class ApacheHttpClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.apache-httpclient";
+    return "io.opentelemetry.javaagent.apache-httpclient-5.0";
   }
 }

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/client/ArmeriaClientTracer.java

@@ -77,7 +77,7 @@ public class ArmeriaClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.armeria";
+    return "io.opentelemetry.armeria-1.3";
   }
 
   private static class ArmeriaSetter implements TextMapSetter<ClientRequestContext> {

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/server/ArmeriaServerTracer.java

@@ -36,7 +36,7 @@ public class ArmeriaServerTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.armeria";
+    return "io.opentelemetry.armeria-1.3";
   }
 
   @Override

instrumentation/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientTracer.java

@@ -52,6 +52,6 @@ public class AsyncHttpClientTracer extends HttpClientTracer<Request, Request, Re
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.async-http-client";
+    return "io.opentelemetry.javaagent.async-http-client-1.9";
   }
 }

instrumentation/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientTracer.java

@@ -52,6 +52,6 @@ public class AsyncHttpClientTracer extends HttpClientTracer<Request, Request, Re
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.async-http-client";
+    return "io.opentelemetry.javaagent.async-http-client-2.0";
   }
 }

instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/AwsLambdaMessageTracer.java

@@ -80,6 +80,6 @@ public class AwsLambdaMessageTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.aws-lambda";
+    return "io.opentelemetry.aws-lambda-1.0";
   }
 }

instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/AwsLambdaTracer.java

@@ -134,6 +134,6 @@ public class AwsLambdaTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.aws-lambda";
+    return "io.opentelemetry.aws-lambda-1.0";
   }
 }

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkClientTracer.java

@@ -135,7 +135,7 @@ public class AwsSdkClientTracer extends HttpClientTracer<Request<?>, Request<?>,
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.aws-sdk";
+    return "io.opentelemetry.javaagent.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 @@ final class AwsSdkHttpClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.aws-sdk";
+    return "io.opentelemetry.javaagent.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/CassandraDatabaseClientTracer.java

@@ -29,7 +29,7 @@ public class CassandraDatabaseClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.cassandra";
+    return "io.opentelemetry.javaagent.cassandra-3.0";
   }
 
   @Override

instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraDatabaseClientTracer.java

@@ -36,7 +36,7 @@ public class CassandraDatabaseClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.cassandra";
+    return "io.opentelemetry.javaagent.cassandra-4.0";
   }
 
   @Override

instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseClientTracer.java

@@ -42,6 +42,6 @@ public class CouchbaseClientTracer extends DatabaseClientTracer<Void, Method, Vo
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.couchbase";
+    return "io.opentelemetry.javaagent.couchbase-2.0";
   }
 }

instrumentation/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardTracer.java

@@ -16,6 +16,6 @@ public class DropwizardTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.dropwizard-views";
+    return "io.opentelemetry.javaagent.dropwizard-views-0.7";
   }
 }

instrumentation/elasticsearch/elasticsearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestClientTracer.java

@@ -50,6 +50,6 @@ public class ElasticsearchRestClientTracer extends DatabaseClientTracer<Void, St
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.elasticsearch";
+    return "io.opentelemetry.javaagent.elasticsearch-rest-common";
   }
 }

instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportClientTracer.java

@@ -57,6 +57,6 @@ public class ElasticsearchTransportClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.elasticsearch";
+    return "io.opentelemetry.javaagent.elasticsearch-transport-common";
   }
 }

instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraTracer.java

@@ -16,6 +16,6 @@ public class FinatraTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.finatra";
+    return "io.opentelemetry.javaagent.finatra-2.9";
   }
 }

instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeTracer.java

@@ -68,6 +68,6 @@ public class GeodeTracer extends DatabaseClientTracer<Region<?, ?>, String, SqlS
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.geode";
+    return "io.opentelemetry.javaagent.geode-1.4";
   }
 }

instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientTracer.java

@@ -30,7 +30,7 @@ public class GoogleHttpClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.google-http-client";
+    return "io.opentelemetry.javaagent.google-http-client-1.19";
   }
 
   @Override

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

@@ -90,7 +90,7 @@ public class GrizzlyHttpServerTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.grizzly";
+    return "io.opentelemetry.javaagent.grizzly-2.0";
   }
 
   @Override

instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/client/GrpcClientTracer.java

@@ -51,6 +51,6 @@ public class GrpcClientTracer extends RpcClientTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.grpc";
+    return "io.opentelemetry.javaagent.grpc-1.5";
   }
 }

instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/server/GrpcServerTracer.java

@@ -50,7 +50,7 @@ public class GrpcServerTracer extends RpcServerTracer<Metadata> {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.grpc";
+    return "io.opentelemetry.javaagent.grpc-1.5";
   }
 
   @Override

instrumentation/hibernate/hibernate-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/HibernateTracer.java

@@ -64,6 +64,6 @@ public class HibernateTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.hibernate";
+    return "io.opentelemetry.javaagent.hibernate-common";
   }
 }

instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTracer.java

@@ -23,7 +23,7 @@ public class HystrixTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.hystrix";
+    return "io.opentelemetry.javaagent.hystrix-1.4";
   }
 
   public void onCommand(Span span, HystrixInvokableInfo<?> command, String methodName) {

instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientV1Tracer.java

@@ -54,6 +54,6 @@ public class JaxRsClientV1Tracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.jaxrs-client";
+    return "io.opentelemetry.javaagent.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

@@ -53,6 +53,6 @@ public class JaxRsClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.jaxrs-client";
+    return "io.opentelemetry.javaagent.jaxrs-client-2.0";
   }
 }

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ResteasyClientTracer.java

@@ -53,6 +53,6 @@ public class ResteasyClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.jaxrs-client";
+    return "io.opentelemetry.javaagent.jaxrs-client-2.0-resteasy-2.0";
   }
 }

instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsAnnotationsTracer.java

@@ -185,6 +185,6 @@ public class JaxRsAnnotationsTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.jaxrs";
+    return "io.opentelemetry.javaagent.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

@@ -198,6 +198,6 @@ public class JaxRsAnnotationsTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.jaxrs";
+    return "io.opentelemetry.javaagent.jaxrs-2.0-common";
   }
 }

instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/src/main/java/io/opentelemetry/instrumentation/axis2/Axis2JaxWsTracer.java

@@ -84,6 +84,6 @@ public class Axis2JaxWsTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.axis2";
+    return "io.opentelemetry.javaagent.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

@@ -79,6 +79,6 @@ public class CxfJaxWsTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.cxf";
+    return "io.opentelemetry.javaagent.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

@@ -87,6 +87,6 @@ public class MetroJaxWsTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.metro";
+    return "io.opentelemetry.javaagent.jaxws-2.0-metro-2.2";
   }
 }

instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsTracer.java

@@ -21,7 +21,7 @@ public class JaxWsTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.jaxws";
+    return "io.opentelemetry.javaagent.jaxws-common";
   }
 
   public Context startSpan(Class<?> target, Method method) {

instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTracer.java

@@ -56,7 +56,7 @@ public class JedisClientTracer extends DatabaseClientTracer<Connection, CommandW
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.jedis";
+    return "io.opentelemetry.javaagent.jedis-1.4";
   }
 
   public static final class CommandWithArgs {

instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisClientTracer.java

@@ -58,7 +58,7 @@ public class JedisClientTracer extends DatabaseClientTracer<Connection, CommandW
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.jedis";
+    return "io.opentelemetry.javaagent.jedis-3.0";
   }
 
   public static final class CommandWithArgs {

instrumentation/jetty-8.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/JettyHttpServerTracer.java

@@ -30,6 +30,6 @@ public class JettyHttpServerTracer extends Servlet3HttpServerTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.jetty";
+    return "io.opentelemetry.javaagent.jetty-8.0";
   }
 }

instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsTracer.java

@@ -163,6 +163,6 @@ public class JmsTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.jms";
+    return "io.opentelemetry.javaagent.jms-1.1";
   }
 }

instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraTracer.java

@@ -16,6 +16,6 @@ public class MojarraTracer extends JsfTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.mojarra";
+    return "io.opentelemetry.javaagent.mojarra-1.2";
   }
 }

instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesTracer.java

@@ -28,6 +28,6 @@ public class MyFacesTracer extends JsfTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.myfaces";
+    return "io.opentelemetry.javaagent.myfaces-1.2";
   }
 }

instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspTracer.java

@@ -83,6 +83,6 @@ public class JspTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.jsp";
+    return "io.opentelemetry.javaagent.jsp-2.3";
   }
 }

instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaConsumerTracer.java

@@ -81,6 +81,6 @@ public class KafkaConsumerTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.kafka-clients";
+    return "io.opentelemetry.javaagent.kafka-clients-0.11";
   }
 }

instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaProducerTracer.java

@@ -60,6 +60,6 @@ public class KafkaProducerTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.kafka-clients";
+    return "io.opentelemetry.javaagent.kafka-clients-0.11";
   }
 }

instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsTracer.java

@@ -60,6 +60,6 @@ public class KafkaStreamsTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.kafka-streams";
+    return "io.opentelemetry.javaagent.kafka-streams-0.11";
   }
 }

instrumentation/khttp-0.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpTracer.java

@@ -53,6 +53,6 @@ public class KHttpTracer extends HttpClientTracer<RequestWrapper, Map<String, St
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.khttp";
+    return "io.opentelemetry.javaagent.khttp-0.1";
   }
 }

instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTracer.java

@@ -35,7 +35,7 @@ public class KubernetesClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.kubernetes-client";
+    return "io.opentelemetry.javaagent.kubernetes-client-7.0";
   }
 
   @Override

instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAbstractDatabaseClientTracer.java

@@ -46,6 +46,6 @@ public abstract class LettuceAbstractDatabaseClientTracer<STATEMENT>
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.lettuce";
+    return "io.opentelemetry.javaagent.lettuce-4.0";
   }
 }

instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAbstractDatabaseClientTracer.java

@@ -16,7 +16,7 @@ public abstract class LettuceAbstractDatabaseClientTracer<STATEMENT>
     extends DatabaseClientTracer<RedisURI, STATEMENT, String> {
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.lettuce";
+    return "io.opentelemetry.javaagent.lettuce-5.0";
   }
 
   @Override

instrumentation/mongo/mongo-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mongo/MongoClientTracer.java

@@ -51,7 +51,7 @@ public class MongoClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.mongo";
+    return "io.opentelemetry.javaagent.mongo-common";
   }
 
   @Override

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientTracer.java

@@ -91,6 +91,6 @@ public class NettyHttpClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.netty";
+    return "io.opentelemetry.javaagent.netty-3.8";
   }
 }

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java

@@ -81,7 +81,7 @@ public class NettyHttpServerTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.netty";
+    return "io.opentelemetry.javaagent.netty-3.8";
   }
 
   @Override

instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java

@@ -91,6 +91,6 @@ public class NettyHttpClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.netty";
+    return "io.opentelemetry.javaagent.netty-4.0";
   }
 }

instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java

@@ -52,7 +52,7 @@ public class NettyHttpServerTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.netty";
+    return "io.opentelemetry.javaagent.netty-4.0";
   }
 
   @Override

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java

@@ -118,6 +118,6 @@ public class NettyHttpClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.netty";
+    return "io.opentelemetry.javaagent.netty-4.1";
   }
 }

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java

@@ -52,7 +52,7 @@ public class NettyHttpServerTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.netty";
+    return "io.opentelemetry.javaagent.netty-4.1";
   }
 
   @Override

instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttpClientTracer.java

@@ -53,6 +53,6 @@ public class OkHttpClientTracer extends HttpClientTracer<Request, Request.Builde
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.okhttp";
+    return "io.opentelemetry.javaagent.okhttp-2.2";
   }
 }

instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttpClientTracer.java

@@ -52,6 +52,6 @@ public class OkHttpClientTracer extends HttpClientTracer<Request, Request.Builde
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.okhttp";
+    return "io.opentelemetry.javaagent.okhttp-3.0";
   }
 }

instrumentation/opentelemetry-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/WithSpanTracer.java

@@ -78,6 +78,6 @@ public class WithSpanTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.opentelemetry-annotations";
+    return "io.opentelemetry.javaagent.opentelemetry-annotations-1.0";
   }
 }

instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientTracer.java

@@ -54,6 +54,6 @@ public class PlayWsClientTracer extends HttpClientTracer<Request, HttpHeaders, R
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.play-ws";
+    return "io.opentelemetry.javaagent.play-ws-common";
   }
 }

instrumentation/play/play-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_3/PlayTracer.java

@@ -30,7 +30,7 @@ public class PlayTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.play";
+    return "io.opentelemetry.javaagent.play-2.3";
   }
 
   @Override

instrumentation/play/play-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayTracer.java

@@ -31,7 +31,7 @@ public class PlayTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.play";
+    return "io.opentelemetry.javaagent.play-2.4";
   }
 
   @Override

instrumentation/play/play-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayTracer.java

@@ -67,7 +67,7 @@ public class PlayTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.play";
+    return "io.opentelemetry.javaagent.play-2.6";
   }
 
   @Override

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitTracer.java

@@ -183,6 +183,6 @@ public class RabbitTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.rabbitmq";
+    return "io.opentelemetry.javaagent.rabbitmq-2.7";
   }
 }

instrumentation/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackTracer.java

@@ -29,7 +29,7 @@ public class RatpackTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.ratpack";
+    return "io.opentelemetry.javaagent.ratpack-1.4";
   }
 
   @Override

instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaClientTracer.java

@@ -48,6 +48,6 @@ public class RediscalaClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.rediscala";
+    return "io.opentelemetry.javaagent.rediscala-1.8";
   }
 }

instrumentation/redisson-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonClientTracer.java

@@ -54,7 +54,7 @@ public class RedissonClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.redisson";
+    return "io.opentelemetry.javaagent.redisson-3.0";
   }
 
   @Override

instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/chunk/ChunkExecutionTracer.java

@@ -45,6 +45,6 @@ public class ChunkExecutionTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spring-batch";
+    return "io.opentelemetry.javaagent.spring-batch-3.0";
   }
 }

instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/item/ItemTracer.java

@@ -65,6 +65,6 @@ public class ItemTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spring-batch";
+    return "io.opentelemetry.javaagent.spring-batch-3.0";
   }
 }

instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/job/JobExecutionTracer.java

@@ -25,6 +25,6 @@ public class JobExecutionTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spring-batch";
+    return "io.opentelemetry.javaagent.spring-batch-3.0";
   }
 }

instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/step/StepExecutionTracer.java

@@ -26,6 +26,6 @@ public class StepExecutionTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spring-batch";
+    return "io.opentelemetry.javaagent.spring-batch-3.0";
   }
 }

instrumentation/spring/spring-data-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/SpringDataTracer.java

@@ -18,6 +18,6 @@ public final class SpringDataTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spring-data";
+    return "io.opentelemetry.javaagent.spring-data-1.8";
   }
 }

instrumentation/spring/spring-scheduling-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/SpringSchedulingTracer.java

@@ -19,7 +19,7 @@ public class SpringSchedulingTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spring-scheduling";
+    return "io.opentelemetry.javaagent.spring-scheduling-3.1";
   }
 
   public Context startSpan(Runnable runnable) {

instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateTracer.java

@@ -60,6 +60,6 @@ class RestTemplateTracer extends HttpClientTracer<HttpRequest, HttpHeaders, Clie
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spring-web";
+    return "io.opentelemetry.javaagent.spring-web-3.1";
   }
 }

instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/SpringWebfluxHttpServerTracer.java

@@ -16,6 +16,6 @@ public class SpringWebfluxHttpServerTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spring-webflux";
+    return "io.opentelemetry.javaagent.spring-webflux-5.0";
   }
 }

instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java

@@ -82,7 +82,7 @@ public class SpringWebfluxHttpClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spring-webflux";
+    return "io.opentelemetry.javaagent.spring-webflux-5.0";
   }
 
   public Tracer getTracer() {

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcTracer.java

@@ -110,6 +110,6 @@ public class SpringWebMvcTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spring-webmvc";
+    return "io.opentelemetry.javaagent.spring-webmvc-3.1";
   }
 }

instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java

@@ -74,6 +74,6 @@ class SpringWebMvcServerTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spring-webmvc";
+    return "io.opentelemetry.javaagent.spring-webmvc-3.1";
   }
 }

instrumentation/spring/spring-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/ws/SpringWsTracer.java

@@ -31,6 +31,6 @@ public class SpringWsTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spring-ws";
+    return "io.opentelemetry.javaagent.spring-ws-2.0";
   }
 }

instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/MemcacheClientTracer.java

@@ -50,6 +50,6 @@ public class MemcacheClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.spymemcached";
+    return "io.opentelemetry.javaagent.spymemcached-2.12";
   }
 }

instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2Tracer.java

@@ -77,6 +77,6 @@ public class Struts2Tracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.struts";
+    return "io.opentelemetry.javaagent.struts-2.3";
   }
 }

instrumentation/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/TomcatTracer.java

@@ -41,7 +41,7 @@ public class TomcatTracer extends HttpServerTracer<Request, Response, Request, R
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.tomcat";
+    return "io.opentelemetry.javaagent.tomcat-7.0";
   }
 
   @Override

instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioTracer.java

@@ -128,6 +128,6 @@ public class TwilioTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.twilio";
+    return "io.opentelemetry.javaagent.twilio-6.6";
   }
 }

instrumentation/vertx-web-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxTracer.java

@@ -16,6 +16,6 @@ public class VertxTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.javaagent.vertx-web";
+    return "io.opentelemetry.javaagent.vertx-web-3.0";
   }
 }