From e8a451cbcea44c3557da6552cac0b3d7cfeb5077 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 15 Apr 2020 10:17:04 -0700 Subject: [PATCH] Remove unused service method (#321) --- .../instrumentation/decorator/ClientDecorator.java | 2 -- .../instrumentation/decorator/HttpClientDecorator.java | 5 ----- .../instrumentation/decorator/ClientDecoratorTest.groovy | 5 ----- .../decorator/DatabaseClientDecoratorTest.groovy | 9 ++------- .../decorator/HttpClientDecoratorTest.groovy | 7 +------ .../decorator/OrmClientDecoratorTest.groovy | 6 ------ .../awssdk/v1_11/AwsSdkClientDecorator.java | 5 ----- .../awssdk/v2_2/AwsSdkClientDecorator.java | 5 ----- .../cassandra/CassandraClientDecorator.java | 5 ----- .../couchbase/v2_0/CouchbaseClientDecorator.java | 5 ----- .../elasticsearch/ElasticsearchRestClientDecorator.java | 5 ----- .../ElasticsearchTransportClientDecorator.java | 5 ----- .../auto/instrumentation/geode/GeodeDecorator.java | 5 ----- .../instrumentation/grpc/client/GrpcClientDecorator.java | 5 ----- .../instrumentation/hibernate/HibernateDecorator.java | 5 ----- .../auto/instrumentation/jdbc/JDBCDecorator.java | 5 ----- .../instrumentation/jedis/v1_4/JedisClientDecorator.java | 5 ----- .../instrumentation/jedis/v3_0/JedisClientDecorator.java | 5 ----- .../auto/instrumentation/jms/JMSDecorator.java | 5 ----- .../instrumentation/kafkaclients/KafkaDecorator.java | 5 ----- .../kafkastreams/KafkaStreamsDecorator.java | 5 ----- .../instrumentation/lettuce/LettuceClientDecorator.java | 5 ----- .../auto/instrumentation/mongo/MongoClientDecorator.java | 5 ----- .../instrumentation/okhttp/OkHttpClientDecorator.java | 5 ----- .../instrumentation/rabbitmq/amqp/RabbitDecorator.java | 5 ----- .../instrumentation/rmi/client/RmiClientDecorator.java | 5 ----- .../instrumentation/springdata/SpringDataDecorator.java | 5 ----- .../spymemcached/MemcacheClientDecorator.java | 5 ----- .../instrumentation/twilio/TwilioClientDecorator.java | 5 ----- 29 files changed, 3 insertions(+), 146 deletions(-) diff --git a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/ClientDecorator.java b/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/ClientDecorator.java index bae3371a1e..85de55127f 100644 --- a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/ClientDecorator.java +++ b/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/ClientDecorator.java @@ -19,8 +19,6 @@ import io.opentelemetry.trace.Span; public abstract class ClientDecorator extends BaseDecorator { - protected abstract String service(); - @Override public Span afterStart(final Span span) { assert span != null; diff --git a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpClientDecorator.java b/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpClientDecorator.java index 98c5ab6ce7..c836485a8c 100644 --- a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpClientDecorator.java +++ b/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpClientDecorator.java @@ -35,11 +35,6 @@ public abstract class HttpClientDecorator extends ClientDecor protected abstract Integer status(RESPONSE response); - @Override - protected String service() { - return null; - } - public String spanNameForRequest(final REQUEST request) { if (request == null) { return DEFAULT_SPAN_NAME; diff --git a/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy b/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy index 260fb83751..5143be20f2 100644 --- a/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy +++ b/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy @@ -51,11 +51,6 @@ class ClientDecoratorTest extends BaseDecoratorTest { def newDecorator(String serviceName) { return new ClientDecorator() { - - @Override - protected String service() { - return serviceName - } } } } diff --git a/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy b/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy index 4f8b54d93d..ff852c5a50 100644 --- a/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy +++ b/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy @@ -24,7 +24,7 @@ class DatabaseClientDecoratorTest extends ClientDecoratorTest { def "test afterStart"() { setup: - def decorator = newDecorator((String) serviceName) + def decorator = newDecorator() when: decorator.afterStart(span) @@ -103,14 +103,9 @@ class DatabaseClientDecoratorTest extends ClientDecoratorTest { } @Override - def newDecorator(String serviceName = "test-service") { + def newDecorator() { return new DatabaseClientDecorator() { - @Override - protected String service() { - return serviceName - } - @Override protected String dbType() { return "test-db" diff --git a/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpClientDecoratorTest.groovy b/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpClientDecoratorTest.groovy index fa08c89a19..9838d47acd 100644 --- a/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpClientDecoratorTest.groovy +++ b/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpClientDecoratorTest.groovy @@ -148,14 +148,9 @@ class HttpClientDecoratorTest extends ClientDecoratorTest { } @Override - def newDecorator(String serviceName = "test-service") { + def newDecorator() { return new HttpClientDecorator() { - @Override - protected String service() { - return serviceName - } - @Override protected String method(Map m) { return m.method diff --git a/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/OrmClientDecoratorTest.groovy b/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/OrmClientDecoratorTest.groovy index 4638eb7382..5d71a94aa2 100644 --- a/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/OrmClientDecoratorTest.groovy +++ b/agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/OrmClientDecoratorTest.groovy @@ -55,12 +55,6 @@ class OrmClientDecoratorTest extends DatabaseClientDecoratorTest { protected String dbInstance(Object o) { return "test-user" } - - @Override - protected String service() { - return "test-service" - } } } - } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v1_11/AwsSdkClientDecorator.java b/instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v1_11/AwsSdkClientDecorator.java index 4720ffc53e..ca8f4ecb38 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v1_11/AwsSdkClientDecorator.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v1_11/AwsSdkClientDecorator.java @@ -100,11 +100,6 @@ public class AwsSdkClientDecorator extends HttpClientDecorator { public static final CassandraClientDecorator DECORATE = new CassandraClientDecorator(); - @Override - protected String service() { - return "cassandra"; - } - @Override protected String dbType() { return "cassandra"; diff --git a/instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/v2_0/CouchbaseClientDecorator.java b/instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/v2_0/CouchbaseClientDecorator.java index 4bb1bd3aaf..aa6f84851f 100644 --- a/instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/v2_0/CouchbaseClientDecorator.java +++ b/instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/v2_0/CouchbaseClientDecorator.java @@ -20,11 +20,6 @@ import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientD class CouchbaseClientDecorator extends DatabaseClientDecorator { public static final CouchbaseClientDecorator DECORATE = new CouchbaseClientDecorator(); - @Override - protected String service() { - return "couchbase"; - } - @Override protected String dbType() { return "couchbase"; diff --git a/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java b/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java index 9334bb255d..96a20470e4 100644 --- a/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java +++ b/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java @@ -30,11 +30,6 @@ public class ElasticsearchRestClientDecorator extends DatabaseClientDecorator { public static final Tracer TRACER = OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.elasticsearch"); - @Override - protected String service() { - return "elasticsearch"; - } - @Override protected String dbType() { return "elasticsearch"; diff --git a/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java b/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java index d3d64fdbb5..353c971adf 100644 --- a/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java +++ b/instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java @@ -27,11 +27,6 @@ public class ElasticsearchTransportClientDecorator extends DatabaseClientDecorat public static final Tracer TRACER = OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.elasticsearch"); - @Override - protected String service() { - return "elasticsearch"; - } - @Override protected String dbType() { return "elasticsearch"; diff --git a/instrumentation/geode-1.4/src/main/java/io/opentelemetry/auto/instrumentation/geode/GeodeDecorator.java b/instrumentation/geode-1.4/src/main/java/io/opentelemetry/auto/instrumentation/geode/GeodeDecorator.java index c8fa6ab7fc..22aa4407db 100644 --- a/instrumentation/geode-1.4/src/main/java/io/opentelemetry/auto/instrumentation/geode/GeodeDecorator.java +++ b/instrumentation/geode-1.4/src/main/java/io/opentelemetry/auto/instrumentation/geode/GeodeDecorator.java @@ -40,9 +40,4 @@ public class GeodeDecorator extends DatabaseClientDecorator { protected String dbInstance(final Region region) { return region.getName(); } - - @Override - protected String service() { - return "apache-geode"; - } } diff --git a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/auto/instrumentation/grpc/client/GrpcClientDecorator.java b/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/auto/instrumentation/grpc/client/GrpcClientDecorator.java index d601d030bc..a17d467b71 100644 --- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/auto/instrumentation/grpc/client/GrpcClientDecorator.java +++ b/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/auto/instrumentation/grpc/client/GrpcClientDecorator.java @@ -26,11 +26,6 @@ public class GrpcClientDecorator extends ClientDecorator { public static final Tracer TRACER = OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.grpc-1.5"); - @Override - protected String service() { - return null; - } - public Span onClose(final Span span, final io.grpc.Status status) { span.setAttribute("status.code", status.getCode().name()); diff --git a/instrumentation/hibernate/hibernate-common/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/HibernateDecorator.java b/instrumentation/hibernate/hibernate-common/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/HibernateDecorator.java index f38fc50ffd..b54e62c0d5 100644 --- a/instrumentation/hibernate/hibernate-common/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/HibernateDecorator.java +++ b/instrumentation/hibernate/hibernate-common/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/HibernateDecorator.java @@ -30,11 +30,6 @@ public class HibernateDecorator extends OrmClientDecorator { public static final Tracer TRACER = OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.hibernate"); - @Override - protected String service() { - return "hibernate"; - } - @Override protected String dbType() { return null; diff --git a/instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCDecorator.java b/instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCDecorator.java index c6449b6fc4..31b03c6552 100644 --- a/instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCDecorator.java +++ b/instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCDecorator.java @@ -35,11 +35,6 @@ public class JDBCDecorator extends DatabaseClientDecorator { private static final String DB_QUERY = "DB Query"; - @Override - protected String service() { - return "jdbc"; // Overridden by onConnection - } - @Override protected String dbType() { return "jdbc"; diff --git a/instrumentation/jedis/jedis-1.4/src/main/java/io/opentelemetry/auto/instrumentation/jedis/v1_4/JedisClientDecorator.java b/instrumentation/jedis/jedis-1.4/src/main/java/io/opentelemetry/auto/instrumentation/jedis/v1_4/JedisClientDecorator.java index d478529fd7..f34ac041c3 100644 --- a/instrumentation/jedis/jedis-1.4/src/main/java/io/opentelemetry/auto/instrumentation/jedis/v1_4/JedisClientDecorator.java +++ b/instrumentation/jedis/jedis-1.4/src/main/java/io/opentelemetry/auto/instrumentation/jedis/v1_4/JedisClientDecorator.java @@ -26,11 +26,6 @@ public class JedisClientDecorator extends DatabaseClientDecorator { public static final Tracer TRACER = OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.jedis-1.4"); - @Override - protected String service() { - return "redis"; - } - @Override protected String dbType() { return "redis"; diff --git a/instrumentation/jedis/jedis-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jedis/v3_0/JedisClientDecorator.java b/instrumentation/jedis/jedis-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jedis/v3_0/JedisClientDecorator.java index 510032f74a..4a8a3c5f0a 100644 --- a/instrumentation/jedis/jedis-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jedis/v3_0/JedisClientDecorator.java +++ b/instrumentation/jedis/jedis-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jedis/v3_0/JedisClientDecorator.java @@ -26,11 +26,6 @@ public class JedisClientDecorator extends DatabaseClientDecorator { public static final Tracer TRACER = OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.jedis-1.4"); - @Override - protected String service() { - return "redis"; - } - @Override protected String dbType() { return "redis"; diff --git a/instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSDecorator.java b/instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSDecorator.java index bb19da4e05..c6ce0f698e 100644 --- a/instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSDecorator.java +++ b/instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSDecorator.java @@ -32,11 +32,6 @@ public class JMSDecorator extends ClientDecorator { public static final Tracer TRACER = OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.jms-1.1"); - @Override - protected String service() { - return "jms"; - } - public String spanNameForReceive(final Message message) { return toResourceName(message, null); } diff --git a/instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkaclients/KafkaDecorator.java b/instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkaclients/KafkaDecorator.java index f3add43944..6f21a70a56 100644 --- a/instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkaclients/KafkaDecorator.java +++ b/instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkaclients/KafkaDecorator.java @@ -28,11 +28,6 @@ public class KafkaDecorator extends ClientDecorator { public static final Tracer TRACER = OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.kafka-clients-0.11"); - @Override - protected String service() { - return "kafka"; - } - public String spanNameOnConsume(final ConsumerRecord record) { final String topic = record.topic(); if (topic != null) { diff --git a/instrumentation/kafka-streams-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkastreams/KafkaStreamsDecorator.java b/instrumentation/kafka-streams-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkastreams/KafkaStreamsDecorator.java index ad2fe767d2..24ea2a9a60 100644 --- a/instrumentation/kafka-streams-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkastreams/KafkaStreamsDecorator.java +++ b/instrumentation/kafka-streams-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkastreams/KafkaStreamsDecorator.java @@ -27,11 +27,6 @@ public class KafkaStreamsDecorator extends ClientDecorator { public static final Tracer TRACER = OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.kafka-streams-0.11"); - @Override - protected String service() { - return "kafka"; - } - public String spanNameForConsume(final StampedRecord record) { if (record == null) { return null; diff --git a/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientDecorator.java b/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientDecorator.java index b5421def2a..063977e293 100644 --- a/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientDecorator.java +++ b/instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientDecorator.java @@ -28,11 +28,6 @@ public class LettuceClientDecorator extends DatabaseClientDecorator { public static final Tracer TRACER = OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.lettuce-5.0"); - @Override - protected String service() { - return "redis"; - } - @Override protected String dbType() { return "redis"; diff --git a/instrumentation/mongo/mongo-common/src/main/java/io/opentelemetry/auto/instrumentation/mongo/MongoClientDecorator.java b/instrumentation/mongo/mongo-common/src/main/java/io/opentelemetry/auto/instrumentation/mongo/MongoClientDecorator.java index 3d65b144c0..c94a468d2c 100644 --- a/instrumentation/mongo/mongo-common/src/main/java/io/opentelemetry/auto/instrumentation/mongo/MongoClientDecorator.java +++ b/instrumentation/mongo/mongo-common/src/main/java/io/opentelemetry/auto/instrumentation/mongo/MongoClientDecorator.java @@ -39,11 +39,6 @@ public class MongoClientDecorator extends DatabaseClientDecorator { public static final OkHttpClientDecorator DECORATE = new OkHttpClientDecorator(); - @Override - protected String service() { - return null; - } - @Override protected String method(final Request httpRequest) { return httpRequest.method(); diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java b/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java index 29e40afb83..ad98849528 100644 --- a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java +++ b/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java @@ -29,11 +29,6 @@ public class RabbitDecorator extends ClientDecorator { public static final Tracer TRACER = OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.rabbitmq-amqp-2.7"); - @Override - protected String service() { - return "rabbitmq"; - } - public void onPublish(final Span span, final String exchange, final String routingKey) { final String exchangeName = exchange == null || exchange.isEmpty() ? "" : exchange; final String routing = diff --git a/instrumentation/rmi/src/main/java/io/opentelemetry/auto/instrumentation/rmi/client/RmiClientDecorator.java b/instrumentation/rmi/src/main/java/io/opentelemetry/auto/instrumentation/rmi/client/RmiClientDecorator.java index 7c53408e5b..7ba094c7c1 100644 --- a/instrumentation/rmi/src/main/java/io/opentelemetry/auto/instrumentation/rmi/client/RmiClientDecorator.java +++ b/instrumentation/rmi/src/main/java/io/opentelemetry/auto/instrumentation/rmi/client/RmiClientDecorator.java @@ -24,9 +24,4 @@ public class RmiClientDecorator extends ClientDecorator { public static final Tracer TRACER = OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.rmi"); - - @Override - protected String service() { - return null; - } } diff --git a/instrumentation/spring-data-1.8/src/main/java/io/opentelemetry/auto/instrumentation/springdata/SpringDataDecorator.java b/instrumentation/spring-data-1.8/src/main/java/io/opentelemetry/auto/instrumentation/springdata/SpringDataDecorator.java index e74d832c0f..12d14fa349 100644 --- a/instrumentation/spring-data-1.8/src/main/java/io/opentelemetry/auto/instrumentation/springdata/SpringDataDecorator.java +++ b/instrumentation/spring-data-1.8/src/main/java/io/opentelemetry/auto/instrumentation/springdata/SpringDataDecorator.java @@ -26,9 +26,4 @@ public final class SpringDataDecorator extends ClientDecorator { OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.spring-data-1.8"); private SpringDataDecorator() {} - - @Override - protected String service() { - return null; - } } diff --git a/instrumentation/spymemcached-2.12/src/main/java/io/opentelemetry/auto/instrumentation/spymemcached/MemcacheClientDecorator.java b/instrumentation/spymemcached-2.12/src/main/java/io/opentelemetry/auto/instrumentation/spymemcached/MemcacheClientDecorator.java index 52423f4e6d..5df4b23963 100644 --- a/instrumentation/spymemcached-2.12/src/main/java/io/opentelemetry/auto/instrumentation/spymemcached/MemcacheClientDecorator.java +++ b/instrumentation/spymemcached-2.12/src/main/java/io/opentelemetry/auto/instrumentation/spymemcached/MemcacheClientDecorator.java @@ -26,11 +26,6 @@ public class MemcacheClientDecorator extends DatabaseClientDecorator