Merge pull request #13 from twillouer/distributed-message-must-finish…

…-span finish span when actor finish received
opentracing-contrib · Jan 2, 2020 · 8424125 · 8424125
2 parents c03100a + 2f4bc7b
commit 8424125
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/io/opentracing/contrib/akka/DistributedTracedActor.java b/src/main/java/io/opentracing/contrib/akka/DistributedTracedActor.java
@@ -40,6 +40,8 @@ public static void aroundReceive(
 
       try (Scope ignored = tracer.scopeManager().activate(span)) {
         superConsumer.accept(receive, originalMessage);
+      } finally {
+        span.finish();
       }
     }
   }

diff --git a/src/main/java/io/opentracing/contrib/akka/DistributedTracedMessage.java b/src/main/java/io/opentracing/contrib/akka/DistributedTracedMessage.java
@@ -69,17 +69,14 @@ Span activeSpan() {
   }
 
   Span activeSpan(final Tracer tracer) {
-    final Tracer.SpanBuilder spanBuilder = tracer.buildSpan("receive")
+    Tracer.SpanBuilder spanBuilder = tracer.buildSpan("receive")
         .ignoreActiveSpan()
-        .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CONSUMER);
+        .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CONSUMER)
+        .withTag(Tags.COMPONENT, "java-akka");
 
     final SpanContext context = spanContext(tracer);
     if (context != null) {
-      spanBuilder.addReference(References.FOLLOWS_FROM, context);
-
-      Span span = spanBuilder.start();
-      Tags.COMPONENT.set(span, "akka");
-
+      spanBuilder = spanBuilder.addReference(References.FOLLOWS_FROM, context);
     }
     return spanBuilder.start();
   }