apply metric tags on spans, even if the span is not sampled, fixes #513

1 files changed, 20 insertions, 13 deletions

diff --git a/kamon-core/src/main/scala/kamon/trace/Span.scala b/kamon-core/src/main/scala/kamon/trace/Span.scala
index 690efeb4..9778373a 100644
--- a/kamon-core/src/main/scala/kamon/trace/Span.scala
+++ b/kamon-core/src/main/scala/kamon/trace/Span.scala
@@ -123,11 +123,12 @@ object Span {
     }
 
     override def tagMetric(key: String, value: String): Span = synchronized {
-      if(sampled && open) {
-        spanTags = spanTags + (key -> TagValue.String(value))
-
+      if(open) {
         if(collectMetrics)
           customMetricTags = customMetricTags + (key -> value)
+
+        if(sampled)
+          spanTags = spanTags + (key -> TagValue.String(value))
       }
       this
     }
@@ -142,23 +143,29 @@ object Span {
     }
 
     override def addError(error: String): Span = synchronized {
-      if(sampled && open) {
+      if(open) {
         hasError = true
-        spanTags = spanTags ++ Map(
-          "error" -> TagValue.True,
-          "error.object" -> TagValue.String(error)
-        )
+
+        if(sampled) {
+          spanTags = spanTags ++ Map(
+            "error" -> TagValue.True,
+            "error.object" -> TagValue.String(error)
+          )
+        }
       }
       this
     }
 
     override def addError(error: String, throwable: Throwable): Span = synchronized {
-      if(sampled && open) {
+      if(open) {
         hasError = true
-        spanTags = spanTags ++ Map(
-          "error" -> TagValue.True,
-          "error.object" -> TagValue.String(throwable.getMessage())
-        )
+
+        if(sampled) {
+          spanTags = spanTags ++ Map(
+            "error" -> TagValue.True,
+            "error.object" -> TagValue.String(throwable.getMessage())
+          )
+        }
       }
       this
     }