diff options
| -rw-r--r-- | kamon-core/src/main/scala/kamon/trace/Tracer.scala | 5 | ||||
| -rw-r--r-- | kamon-core/src/test/scala/kamon/trace/RealSpanSpec.scala | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/Tracer.scala b/kamon-core/src/main/scala/kamon/trace/Tracer.scala index 714f0215..71201871 100644 --- a/kamon-core/src/main/scala/kamon/trace/Tracer.scala +++ b/kamon-core/src/main/scala/kamon/trace/Tracer.scala @@ -157,6 +157,11 @@ object Tracer { this } + def asChildOf(parentContext: Option[SpanContext]): SpanBuilder = { + parentContext.foreach(asChildOf) + this + } + def asChildOf(parentSpan: Span): SpanBuilder = asChildOf(parentSpan.context()) diff --git a/kamon-core/src/test/scala/kamon/trace/RealSpanSpec.scala b/kamon-core/src/test/scala/kamon/trace/RealSpanSpec.scala index 61e651c2..db283d43 100644 --- a/kamon-core/src/test/scala/kamon/trace/RealSpanSpec.scala +++ b/kamon-core/src/test/scala/kamon/trace/RealSpanSpec.scala @@ -12,17 +12,18 @@ class RealSpanSpec extends WordSpec with Matchers with BeforeAndAfterAll with Ev "a real span" when { "sampled" should { "be sent to the Span reporters" in { - Kamon.buildSpan("test-span") .withSpanTag("test", "value") .start() .finish() - eventually(timeout(50 milliseconds)) { + eventually(timeout(10 seconds)) { val finishedSpan = reporter.nextSpan().value finishedSpan.operationName shouldBe("test-span") } } + + } } |