Remove operation name decorators (#36)

open-telemetry · Dec 9, 2019 · 38a916f · 38a916f
1 parent 7f2b478
commit 38a916f
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 76 deletions.
diff --git a/...-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java b/...-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java
@@ -28,7 +28,7 @@ public AmazonWebServiceRequest beforeMarshalling(final AmazonWebServiceRequest r
 
   @Override
   public void beforeRequest(final Request<?> request) {
-    final AgentSpan span = startSpan("aws.command");
+    final AgentSpan span = startSpan("aws.http");
     DECORATE.afterStart(span);
     DECORATE.onRequest(span, request);
     request.addHandlerContext(SCOPE_CONTEXT_KEY, activateSpan(span, true));

diff --git a/...-2.2/src/main/java8/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java b/...-2.2/src/main/java8/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java
@@ -29,7 +29,7 @@ public class TracingExecutionInterceptor implements ExecutionInterceptor {
   @Override
   public void beforeExecution(
       final Context.BeforeExecution context, final ExecutionAttributes executionAttributes) {
-    final AgentSpan span = startSpan("aws.command");
+    final AgentSpan span = startSpan("aws.http");
     try (final AgentScope scope = activateSpan(span, false)) {
       DECORATE.afterStart(span);
       executionAttributes.putAttribute(SPAN_ATTRIBUTE, span);

diff --git a/...ndra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java b/...ndra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
@@ -234,7 +234,7 @@ public void run() {
   }
 
   private AgentScope startSpanWithScope(final String query) {
-    final AgentSpan span = startSpan("cassandra.execute");
+    final AgentSpan span = startSpan("cassandra.query");
     DECORATE.afterStart(span);
     DECORATE.onConnection(span, session);
     DECORATE.onStatement(span, query);

diff --git a/dd-java-agent/instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy b/dd-java-agent/instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy
@@ -29,7 +29,7 @@ class SlickTest extends AgentTestRunner {
           }
         }
         span(1) {
-          operationName "${SlickUtils.Driver()}.query"
+          operationName "database.query"
           spanType DDSpanTypes.SQL
           childOf span(0)
           errored false

diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy
@@ -170,7 +170,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
       trace(0, 2) {
         basicSpan(it, 0, "parent")
         span(1) {
-          operationName "${driver}.query"
+          operationName "database.query"
           spanType DDSpanTypes.SQL
           childOf span(0)
           errored false
@@ -231,7 +231,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
       trace(0, 2) {
         basicSpan(it, 0, "parent")
         span(1) {
-          operationName "${driver}.query"
+          operationName "database.query"
           spanType DDSpanTypes.SQL
           childOf span(0)
           errored false
@@ -284,7 +284,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
       trace(0, 2) {
         basicSpan(it, 0, "parent")
         span(1) {
-          operationName "${driver}.query"
+          operationName "database.query"
           spanType DDSpanTypes.SQL
           childOf span(0)
           errored false
@@ -337,7 +337,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
       trace(0, 2) {
         basicSpan(it, 0, "parent")
         span(1) {
-          operationName "${driver}.query"
+          operationName "database.query"
           spanType DDSpanTypes.SQL
           childOf span(0)
           errored false
@@ -390,7 +390,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
       trace(0, 2) {
         basicSpan(it, 0, "parent")
         span(1) {
-          operationName "${driver}.query"
+          operationName "database.query"
           spanType DDSpanTypes.SQL
           childOf span(0)
           errored false
@@ -446,7 +446,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
       trace(0, 2) {
         basicSpan(it, 0, "parent")
         span(1) {
-          operationName "${driver}.query"
+          operationName "database.query"
           spanType DDSpanTypes.SQL
           childOf span(0)
           errored false
@@ -515,7 +515,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
       trace(0, 2) {
         basicSpan(it, 0, "parent")
         span(1) {
-          operationName "${driver}.query"
+          operationName "database.query"
           spanType DDSpanTypes.SQL
           childOf span(0)
           errored false
@@ -592,7 +592,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
     assertTraces(5) {
       trace(0, 1) {
         span(0) {
-          operationName "${dbType}.query"
+          operationName "database.query"
           spanType DDSpanTypes.SQL
           errored false
           tags {
@@ -612,7 +612,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
       for (int i = 1; i < numQueries; ++i) {
         trace(i, 1) {
           span(0) {
-            operationName "${dbType}.query"
+            operationName "database.query"
             spanType DDSpanTypes.SQL
             errored false
             tags {

diff --git a/...ion/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java b/...ion/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java
@@ -60,7 +60,7 @@ public static class JedisAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static AgentScope onEnter(@Advice.Argument(1) final Command command) {
-      final AgentSpan span = startSpan("redis.command");
+      final AgentSpan span = startSpan("redis.query");
       DECORATE.afterStart(span);
       DECORATE.onStatement(span, command.name());
       return activateSpan(span, true);

diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DBTypeDecorator.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DBTypeDecorator.java
@@ -34,8 +34,6 @@ public boolean shouldSetTag(final DDSpanContext context, final String tag, final
     } else {
       context.setSpanType(DDSpanTypes.SQL);
     }
-    // Works for: mongo, cassandra, jdbc
-    context.setOperationName(String.valueOf(value) + ".query");
     return true;
   }
 }
diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DDDecoratorsFactory.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DDDecoratorsFactory.java
@@ -8,10 +8,6 @@ public class DDDecoratorsFactory {
   public static List<AbstractDecorator> createBuiltinDecorators() {
 
     return Arrays.asList(
-        new DBTypeDecorator(),
-        new ErrorFlag(),
-        new OperationDecorator(),
-        new SpanTypeDecorator(),
-        new Status5XXDecorator());
+        new DBTypeDecorator(), new ErrorFlag(), new SpanTypeDecorator(), new Status5XXDecorator());
   }
 }
diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/decorators/OperationDecorator.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/OperationDecorator.java
diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy
@@ -35,18 +35,6 @@ class SpanDecoratorTest extends DDSpecification {
     span.getTags().get("newFoo") == "newBar"
   }
 
-  def "set operation name"() {
-    when:
-    Tags.COMPONENT.set(span, component)
-
-    then:
-    span.getOperationName() == operationName
-
-    where:
-    component << OperationDecorator.MAPPINGS.keySet()
-    operationName << OperationDecorator.MAPPINGS.values()
-  }
-
   def "set span type"() {
     when:
     span.setTag(DDTags.SPAN_TYPE, type)
@@ -58,20 +46,19 @@ class SpanDecoratorTest extends DDSpecification {
     type = DDSpanTypes.HTTP_CLIENT
   }
 
-  def "override operation with DBTypeDecorator"() {
+
+  def "set span type with DBTypeDecorator"() {
     when:
     Tags.DB_TYPE.set(span, type)
 
     then:
-    span.getOperationName() == type + ".query"
     span.context().getSpanType() == "sql"
 
 
     when:
     Tags.DB_TYPE.set(span, "mongo")
 
     then:
-    span.getOperationName() == "mongo.query"
     span.context().getSpanType() == "mongodb"
 
     where:

diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/DDTracerTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/DDTracerTest.groovy
@@ -35,7 +35,7 @@ class DDTracerTest extends DDSpecification {
     def tracer = new DDTracer()
 
     then:
-    tracer.spanContextDecorators.size() == 5
+    tracer.spanContextDecorators.size() == 4
 
     tracer.injector instanceof DatadogHttpCodec.Injector
     tracer.extractor instanceof DatadogHttpCodec.Extractor