From 962ec71ac9b119badb434a747484ca675cf1268b Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Sat, 26 Aug 2017 22:30:11 +0200 Subject: add Span.addError(..) --- .../src/test/scala/kamon/trace/LocalSpanSpec.scala | 2 +- .../src/test/scala/kamon/trace/SpanMetrics.scala | 31 +++++++++++++++++----- 2 files changed, 25 insertions(+), 8 deletions(-) (limited to 'kamon-core-tests') diff --git a/kamon-core-tests/src/test/scala/kamon/trace/LocalSpanSpec.scala b/kamon-core-tests/src/test/scala/kamon/trace/LocalSpanSpec.scala index 966fdbad..05c1c53a 100644 --- a/kamon-core-tests/src/test/scala/kamon/trace/LocalSpanSpec.scala +++ b/kamon-core-tests/src/test/scala/kamon/trace/LocalSpanSpec.scala @@ -44,7 +44,7 @@ class LocalSpanSpec extends WordSpec with Matchers with BeforeAndAfterAll with E } } - "pass all the tags, annotations and baggage to the FinishedSpan instance when started and finished" in { + "pass all the tags to the FinishedSpan instance when started and finished" in { Kamon.buildSpan("full-span") .withTag("builder-string-tag", "value") .withTag("builder-boolean-tag-true", true) diff --git a/kamon-core-tests/src/test/scala/kamon/trace/SpanMetrics.scala b/kamon-core-tests/src/test/scala/kamon/trace/SpanMetrics.scala index 40813a25..4425ac92 100644 --- a/kamon-core-tests/src/test/scala/kamon/trace/SpanMetrics.scala +++ b/kamon-core-tests/src/test/scala/kamon/trace/SpanMetrics.scala @@ -19,6 +19,8 @@ import kamon.Kamon.buildSpan import kamon.testkit.{MetricInspection, Reconfigure} import org.scalatest.{Matchers, WordSpecLike} +import scala.util.control.NoStackTrace + class SpanMetrics extends WordSpecLike with Matchers with MetricInspection with Reconfigure { sampleAlways() @@ -46,14 +48,19 @@ class SpanMetrics extends WordSpecLike with Matchers with MetricInspection with buildSpan(operation) .start() - .addTag("error", true) + .addError("Terrible Error") + .finish() + + buildSpan(operation) + .start() + .addError("Terrible Error with Throwable", new Throwable with NoStackTrace) .finish() val histogram = Span.Metrics.ProcessingTime.refine(Map(operationTag, noErrorTag)) histogram.distribution().count shouldBe 0 val errorHistogram = Span.Metrics.ProcessingTime.refine(Map(operationTag, errorTag)) - errorHistogram.distribution().count shouldBe 1 + errorHistogram.distribution().count shouldBe 2 } "add a parentOperation tag to the metrics if span metrics scoping is enabled" in { @@ -66,20 +73,25 @@ class SpanMetrics extends WordSpecLike with Matchers with MetricInspection with buildSpan(operation) .asChildOf(parent) .start() - .addTag("error", false) .finish() buildSpan(operation) .asChildOf(parent) .start() - .addTag("error", true) + .addError("Terrible Error") + .finish() + + buildSpan(operation) + .asChildOf(parent) + .start() + .addError("Terrible Error with Throwable", new Throwable with NoStackTrace) .finish() val histogram = Span.Metrics.ProcessingTime.refine(Map(operationTag, noErrorTag, parentOperationTag)) histogram.distribution().count shouldBe 1 val errorHistogram = Span.Metrics.ProcessingTime.refine(Map(operationTag, errorTag, parentOperationTag)) - errorHistogram.distribution().count shouldBe 1 + errorHistogram.distribution().count shouldBe 2 } "not add any parentOperation tag to the metrics if span metrics scoping is disabled" in withoutSpanScopingEnabled { @@ -92,13 +104,18 @@ class SpanMetrics extends WordSpecLike with Matchers with MetricInspection with buildSpan(operation) .asChildOf(parent) .start() - .addTag("error", false) .finish() buildSpan(operation) .asChildOf(parent) .start() - .addTag("error", true) + .addError("Terrible Error") + .finish() + + buildSpan(operation) + .asChildOf(parent) + .start() + .addError("Terrible Error with Throwable", new Throwable with NoStackTrace) .finish() val histogram = Span.Metrics.ProcessingTime.refine(Map(operationTag, noErrorTag, parentOperationTag)) -- cgit v1.2.3