Remove apache httpclient version (#1446)

* Remove version from `apache-httpclient` instrumentation

Fixes: #1260

* Remove version from all instrumentation names and add instrumentation name to `spring-web`

Fixes: #1260

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

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

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

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

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

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

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

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

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

@@ -64,7 +64,7 @@ class ApacheHttpClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.apache-httpclient-4.0";
+    return "io.opentelemetry.auto.apache-httpclient";
   }
 
   /** This method is overridden to allow other classes in this package to call it. */

instrumentation/armeria-1.0/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_0/client/ArmeriaClientTracer.java

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

instrumentation/armeria-1.0/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_0/server/ArmeriaServerTracer.java

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

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

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

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

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

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

@@ -127,7 +127,7 @@ public class AwsSdkClientTracer extends HttpClientTracer<Request<?>, Request<?>,
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.aws-sdk-1.11";
+    return "io.opentelemetry.auto.aws-sdk";
   }
 
   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

@@ -65,7 +65,7 @@ final class AwsSdkHttpClientTracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.aws-sdk-2.2";
+    return "io.opentelemetry.auto.aws-sdk";
   }
 
   /** This method is overridden to allow other classes in this package to call it. */

instrumentation/cassandra/cassandra-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraDatabaseClientTracer.java

@@ -20,7 +20,7 @@ public class CassandraDatabaseClientTracer extends DatabaseClientTracer<Session,
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.cassandra-3.0";
+    return "io.opentelemetry.auto.cassandra";
   }
 
   @Override

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

@@ -21,7 +21,7 @@ public class CassandraDatabaseClientTracer extends DatabaseClientTracer<CqlSessi
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.cassandra-4.0";
+    return "io.opentelemetry.auto.cassandra";
   }
 
   @Override

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

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

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

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

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

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

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

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

instrumentation/grizzly-client-1.9/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/client/GrizzlyClientTracer.java

@@ -48,6 +48,6 @@ public class GrizzlyClientTracer extends HttpClientTracer<Request, Request, Resp
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.grizzly-client-1.9";
+    return "io.opentelemetry.auto.grizzly-client";
   }
 }

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

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

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

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

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

@@ -50,6 +50,6 @@ public class JaxRsClientV1Tracer
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.jaxrs-client-1.1";
+    return "io.opentelemetry.auto.jaxrs-client";
   }
 }

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

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

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

@@ -181,6 +181,6 @@ public class JaxRsAnnotationsTracer extends BaseTracer {
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.jaxrs-1.0";
+    return "io.opentelemetry.auto.jaxrs";
   }
 }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsAnnotationsTracer.java

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

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

@@ -36,6 +36,6 @@ public class JedisClientTracer extends DatabaseClientTracer<Connection, Command>
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.jedis-1.4";
+    return "io.opentelemetry.auto.jedis";
   }
 }

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

@@ -44,6 +44,6 @@ public class JedisClientTracer extends DatabaseClientTracer<Connection, Protocol
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.jedis-3.0";
+    return "io.opentelemetry.auto.jedis";
   }
 }

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

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

instrumentation/jms-1.1/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.auto.jms-1.1";
+    return "io.opentelemetry.auto.jms";
   }
 }

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

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

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

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

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

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

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

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

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

@@ -50,7 +50,7 @@ public class KubernetesClientTracer extends HttpClientTracer<Request, Request, R
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.kubernetes-client-7.0";
+    return "io.opentelemetry.auto.kubernetes-client";
   }
 
   /** This method is overridden to allow other classes in this package to call it. */

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

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

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

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

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

@@ -24,7 +24,6 @@ import org.bson.BsonValue;
 public class MongoClientTracer extends DatabaseClientTracer<CommandStartedEvent, BsonDocument> {
   public static final MongoClientTracer TRACER = new MongoClientTracer();
 
-  // TODO use tracer names *.mongo-3.1, *.mongo-3.7, *.mongo-async-3.3 respectively in each module
   @Override
   protected String getInstrumentationName() {
     return "io.opentelemetry.auto.mongo";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -50,6 +50,6 @@ public class PlayWSClientTracer extends HttpClientTracer<Request, HttpHeaders, R
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.play-ws-2.1";
+    return "io.opentelemetry.auto.play-ws";
   }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -20,7 +20,7 @@ public class RedissonClientTracer extends DatabaseClientTracer<RedisConnection,
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.redisson-3.0";
+    return "io.opentelemetry.auto.redisson";
   }
 
   @Override

instrumentation/servlet/servlet-2.2/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServerTracer.java

@@ -11,7 +11,7 @@ public class Servlet2HttpServerTracer extends ServletHttpServerTracer<ResponseWi
   public static final Servlet2HttpServerTracer TRACER = new Servlet2HttpServerTracer();
 
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.servlet-2.2";
+    return "io.opentelemetry.auto.servlet";
   }
 
   @Override

instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java

@@ -20,7 +20,7 @@ public class Servlet3HttpServerTracer extends ServletHttpServerTracer<HttpServle
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.servlet-3.0";
+    return "io.opentelemetry.auto.servlet";
   }
 
   @Override

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

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

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

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

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

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

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

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

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

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

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

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

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 null;
+    return "io.opentelemetry.auto.spring-web";
   }
 }

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

@@ -46,6 +46,6 @@ public class MemcacheClientTracer extends DatabaseClientTracer<MemcachedConnecti
 
   @Override
   protected String getInstrumentationName() {
-    return "io.opentelemetry.auto.spymemcached-2.12";
+    return "io.opentelemetry.auto.spymemcached";
   }
 }