+ core: include Tags and Status in TraceInfo and SegmentInfo and closes #377

1 files changed, 69 insertions, 0 deletions

diff --git a/kamon-core/src/test/scala/kamon/trace/SimpleTraceSpec.scala b/kamon-core/src/test/scala/kamon/trace/SimpleTraceSpec.scala
index 95deeef9..f408ad93 100644
--- a/kamon-core/src/test/scala/kamon/trace/SimpleTraceSpec.scala
+++ b/kamon-core/src/test/scala/kamon/trace/SimpleTraceSpec.scala
@@ -20,6 +20,7 @@ import kamon.Kamon
 import kamon.testkit.BaseKamonSpec
 
 import scala.concurrent.duration._
+import scala.util.control.NoStackTrace
 
 class SimpleTraceSpec extends BaseKamonSpec("simple-trace-spec") {
 
@@ -42,6 +43,71 @@ class SimpleTraceSpec extends BaseKamonSpec("simple-trace-spec") {
       traceInfo.segments.find(_.name == "segment-two") should be('defined)
     }
 
+    "send a TraceInfo when the trace has finished with error and all segments are finished" in {
+      Kamon.tracer.subscribe(testActor)
+
+      Tracer.withContext(newContext("simple-trace-with-error-and-without-segments")) {
+        Tracer.currentContext.startSegment("segment-one", "test-segment", "test").finish()
+        Tracer.currentContext.startSegment("segment-two", "test-segment", "test").finish()
+        Tracer.currentContext.finishWithError(TraceException("awesome-trace-error"))
+      }
+
+      val traceInfo = expectMsgType[TraceInfo]
+      Kamon.tracer.unsubscribe(testActor)
+
+      traceInfo.name should be("simple-trace-with-error-and-without-segments")
+      traceInfo.status should be(Status.FinishedWithError)
+      traceInfo.segments.size should be(2)
+      traceInfo.segments.find(_.name == "segment-one") should be('defined)
+      traceInfo.segments.find(_.name == "segment-two") should be('defined)
+    }
+
+    "send a TraceInfo when the trace has finished with error and all segments are finished with error" in {
+      Kamon.tracer.subscribe(testActor)
+
+      Tracer.withContext(newContext("simple-trace-with-error-and-without-segments")) {
+        Tracer.currentContext.startSegment("segment-one-finished-with-error", "test-segment", "test").finishWithError(SegmentException("awesome-segment-exception"))
+        Tracer.currentContext.startSegment("segment-two-finished-with-error", "test-segment", "test").finishWithError(SegmentException("awesome-segment-exception"))
+        Tracer.currentContext.finishWithError(TraceException("awesome-trace-error"))
+      }
+
+      val traceInfo = expectMsgType[TraceInfo]
+      Kamon.tracer.unsubscribe(testActor)
+
+      traceInfo.name should be("simple-trace-with-error-and-without-segments")
+      traceInfo.status should be(Status.FinishedWithError)
+      traceInfo.segments.size should be(2)
+
+      val segmentOne = traceInfo.segments.find(_.name == "segment-one-finished-with-error")
+      val segmentTwo = traceInfo.segments.find(_.name == "segment-two-finished-with-error")
+
+      segmentOne.get.status should be(Status.FinishedWithError)
+      segmentTwo.get.status should be(Status.FinishedWithError)
+    }
+
+    "send a TraceInfo when the trace has finished and all segments are finished and both contains tags" in {
+      Kamon.tracer.subscribe(testActor)
+
+      Tracer.withContext(newContext("simple-trace-without-segments", "awesome-token", Map("environment" -> "production"))) {
+        Tracer.currentContext.startSegment("segment-one", "test-segment", "test", Map("segment-one-info" -> "info")).finish()
+        Tracer.currentContext.startSegment("segment-two", "test-segment", "test", Map("segment-two-info" -> "info")).finish()
+        Tracer.currentContext.finish()
+      }
+
+      val traceInfo = expectMsgType[TraceInfo]
+      Kamon.tracer.unsubscribe(testActor)
+
+      traceInfo.name should be("simple-trace-without-segments")
+      traceInfo.tags should be(Map("environment" -> "production"))
+      traceInfo.segments.size should be(2)
+
+      val segmentOne = traceInfo.segments.find(_.name == "segment-one")
+      val segmentTwo = traceInfo.segments.find(_.name == "segment-two")
+
+      segmentOne.get.tags should be(Map("segment-one-info" -> "info"))
+      segmentTwo.get.tags should be(Map("segment-two-info" -> "info"))
+    }
+
     "incubate the tracing context if there are open segments after finishing" in {
       Kamon.tracer.subscribe(testActor)
 
@@ -68,3 +134,6 @@ class SimpleTraceSpec extends BaseKamonSpec("simple-trace-spec") {
 
   }
 }
+
+case class TraceException(message: String) extends RuntimeException(message) with NoStackTrace
+case class SegmentException(message: String) extends RuntimeException(message) with NoStackTrace
\ No newline at end of file