Merge pull request #861 from DataDog/tyler/revert-changes

Revert Pull Request #854 and #855

dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDecorator.java

@@ -12,11 +12,6 @@ import org.apache.kafka.clients.producer.ProducerRecord;
 public abstract class KafkaDecorator extends ClientDecorator {
   public static final KafkaDecorator PRODUCER_DECORATE =
       new KafkaDecorator() {
-        @Override
-        protected String service() {
-          return "kafka";
-        }
-
         @Override
         protected String spanKind() {
           return Tags.SPAN_KIND_PRODUCER;
@@ -30,16 +25,6 @@ public abstract class KafkaDecorator extends ClientDecorator {
 
   public static final KafkaDecorator CONSUMER_DECORATE =
       new KafkaDecorator() {
-        @Override
-        protected String service() {
-          /*
-            Use default service name. Common use-case here is to have consumer span parent
-            children spans in instrumented application. Since service name is inherited it makes
-            sense to default that to application service name rather than 'kafka'.
-          */
-          return null;
-        }
-
         @Override
         protected String spanKind() {
           return Tags.SPAN_KIND_CONSUMER;
@@ -56,6 +41,11 @@ public abstract class KafkaDecorator extends ClientDecorator {
     return new String[] {"kafka"};
   }
 
+  @Override
+  protected String service() {
+    return "kafka";
+  }
+
   @Override
   protected String component() {
     return "java-kafka";

dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy

@@ -94,7 +94,7 @@ class KafkaClientTest extends AgentTestRunner {
       trace(1, 1) {
         // CONSUMER span 0
         span(0) {
-          serviceName "unnamed-java-app"
+          serviceName "kafka"
           operationName "kafka.consume"
           resourceName "Consume Topic $SHARED_TOPIC"
           spanType "queue"

dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy

@@ -80,13 +80,13 @@ class KafkaStreamsTest extends AgentTestRunner {
     KStream<String, String> textLines = builder.stream(STREAM_PENDING)
     def values = textLines
       .mapValues(new ValueMapper<String, String>() {
-        @Override
+      @Override
-        String apply(String textLine) {
+      String apply(String textLine) {
-          TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
+        TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
-          getTestTracer().activeSpan().setTag("asdf", "testing")
+        getTestTracer().activeSpan().setTag("asdf", "testing")
-          return textLine.toLowerCase()
+        return textLine.toLowerCase()
-        }
+      }
-      })
+    })
 
     KafkaStreams streams
     try {
@@ -172,7 +172,7 @@ class KafkaStreamsTest extends AgentTestRunner {
       trace(2, 1) {
         // CONSUMER span 0
         span(0) {
-          serviceName "unnamed-java-app"
+          serviceName "kafka"
           operationName "kafka.consume"
           resourceName "Consume Topic $STREAM_PROCESSED"
           spanType "queue"

dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java

@@ -27,16 +27,6 @@ public class RabbitDecorator extends ClientDecorator {
 
   public static final RabbitDecorator CONSUMER_DECORATE =
       new RabbitDecorator() {
-        @Override
-        protected String service() {
-          /*
-            Use default service name. Common use-case here is to have consumer span parent
-            children spans in instrumented application. Since service name is inherited it makes
-            sense to default that to application service name rather than 'rabbitmq'.
-          */
-          return null;
-        }
-
         @Override
         protected String spanKind() {
           return Tags.SPAN_KIND_CONSUMER;

dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy

@@ -341,14 +341,7 @@ class RabbitMQTest extends AgentTestRunner {
     String errorMsg = null
   ) {
     trace.span(index) {
-      switch (span.tags["amqp.command"]) {
+      serviceName "rabbitmq"
-        case "basic.get":
-        case "basic.deliver":
-          serviceName "unnamed-java-app"
-          break
-        default:
-          serviceName "rabbitmq"
-      }
       operationName "amqp.command"
       resourceName resource
       switch (span.tags["amqp.command"]) {