Remove unused service method (#321)

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;

agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpClientDecorator.java

@@ -35,11 +35,6 @@ public abstract class HttpClientDecorator<REQUEST, RESPONSE> 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;

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

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<Map>() {
 
-      @Override
-      protected String service() {
-        return serviceName
-      }
-
       @Override
       protected String dbType() {
         return "test-db"

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<Map, Map>() {
 
-      @Override
-      protected String service() {
-        return serviceName
-      }
-
       @Override
       protected String method(Map m) {
         return m.method

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

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<Request, Response
     return operationNames.get(awsOperation);
   }
 
-  @Override
-  protected String service() {
-    return COMPONENT_NAME;
-  }
-
   @Override
   protected String method(final Request request) {
     return request.getHttpMethod().name();

instrumentation/aws-sdk/aws-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/awssdk/v2_2/AwsSdkClientDecorator.java

@@ -86,11 +86,6 @@ public class AwsSdkClientDecorator extends HttpClientDecorator<SdkHttpRequest, S
     return span;
   }
 
-  @Override
-  protected String service() {
-    return COMPONENT_NAME;
-  }
-
   @Override
   protected String method(final SdkHttpRequest request) {
     return request.method().name();

instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/cassandra/CassandraClientDecorator.java

@@ -24,11 +24,6 @@ import io.opentelemetry.trace.Span;
 public class CassandraClientDecorator extends DatabaseClientDecorator<Session> {
   public static final CassandraClientDecorator DECORATE = new CassandraClientDecorator();
 
-  @Override
-  protected String service() {
-    return "cassandra";
-  }
-
   @Override
   protected String dbType() {
     return "cassandra";

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

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

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

instrumentation/geode-1.4/src/main/java/io/opentelemetry/auto/instrumentation/geode/GeodeDecorator.java

@@ -40,9 +40,4 @@ public class GeodeDecorator extends DatabaseClientDecorator<Region> {
   protected String dbInstance(final Region region) {
     return region.getName();
   }
-
-  @Override
-  protected String service() {
-    return "apache-geode";
-  }
 }

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());

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;

instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCDecorator.java

@@ -35,11 +35,6 @@ public class JDBCDecorator extends DatabaseClientDecorator<DBInfo> {
 
   private static final String DB_QUERY = "DB Query";
 
-  @Override
-  protected String service() {
-    return "jdbc"; // Overridden by onConnection
-  }
-
   @Override
   protected String dbType() {
     return "jdbc";

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<Connection> {
   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";

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<Connection> {
   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";

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

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

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;

instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientDecorator.java

@@ -28,11 +28,6 @@ public class LettuceClientDecorator extends DatabaseClientDecorator<RedisURI> {
   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";

instrumentation/mongo/mongo-common/src/main/java/io/opentelemetry/auto/instrumentation/mongo/MongoClientDecorator.java

@@ -39,11 +39,6 @@ public class MongoClientDecorator extends DatabaseClientDecorator<CommandStarted
   public static final Tracer TRACER =
       OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.mongo");
 
-  @Override
-  protected String service() {
-    return "mongo";
-  }
-
   @Override
   protected String dbType() {
     return "mongo";

instrumentation/okhttp-3.0/src/main/java/io/opentelemetry/auto/instrumentation/okhttp/OkHttpClientDecorator.java

@@ -23,11 +23,6 @@ import okhttp3.Response;
 public class OkHttpClientDecorator extends HttpClientDecorator<Request, Response> {
   public static final OkHttpClientDecorator DECORATE = new OkHttpClientDecorator();
 
-  @Override
-  protected String service() {
-    return null;
-  }
-
   @Override
   protected String method(final Request httpRequest) {
     return httpRequest.method();

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() ? "<default>" : exchange;
     final String routing =

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

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

instrumentation/spymemcached-2.12/src/main/java/io/opentelemetry/auto/instrumentation/spymemcached/MemcacheClientDecorator.java

@@ -26,11 +26,6 @@ public class MemcacheClientDecorator extends DatabaseClientDecorator<MemcachedCo
   public static final Tracer TRACER =
       OpenTelemetry.getTracerProvider().get("io.opentelemetry.auto.spymemcached-2.12");
 
-  @Override
-  protected String service() {
-    return "memcached";
-  }
-
   @Override
   protected String dbType() {
     return "memcached";

instrumentation/twilio-6.6/src/main/java/io/opentelemetry/auto/instrumentation/twilio/TwilioClientDecorator.java

@@ -37,11 +37,6 @@ public class TwilioClientDecorator extends ClientDecorator {
 
   static final String COMPONENT_NAME = "twilio-sdk";
 
-  @Override
-  protected String service() {
-    return COMPONENT_NAME;
-  }
-
   /** Decorate trace based on service execution metadata. */
   public String spanNameOnServiceExecution(final Object serviceExecutor, final String methodName) {
     return spanNameForClass(serviceExecutor.getClass()) + "." + methodName;