feat: handle conditional attributes in OpenTelemetryMetrics

softwaremill · Nov 28, 2024 · 4e13068 · 4e13068
1 parent 50cb4f7
commit 4e13068
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/...metrics/src/main/scala/sttp/tapir/server/metrics/opentelemetry/OpenTelemetryMetrics.scala b/...metrics/src/main/scala/sttp/tapir/server/metrics/opentelemetry/OpenTelemetryMetrics.scala
@@ -56,8 +56,8 @@ object OpenTelemetryMetrics {
         case Left(_) => "500"
       },
       "error.type" -> {
-        case Left(ex) => ex.getClass.getName // Exception class name for pre-response errors
-        case Right(_) => None // No error.type for successful responses
+        case Left(ex) => ex.getClass.getName // Exception class name for errors
+        case Right(_) => ""
       }
     )
   )
@@ -197,7 +197,11 @@ object OpenTelemetryMetrics {
     l.forRequest.foldLeft(Attributes.builder())((b, label) => { b.put(label._1, label._2(ep, req)) }).build()
 
   private def asOpenTelemetryAttributes(l: MetricLabels, res: Either[Throwable, ServerResponse[_]], phase: Option[String]): Attributes = {
-    val builder = l.forResponse.foldLeft(Attributes.builder())((b, label) => { b.put(label._1, label._2(res)) })
+    val builder = Attributes.builder()
+    l.forResponse.foreach { case (key, valueFn) =>
+      val value = valueFn(res)
+      if (value.nonEmpty) builder.put(key, value)
+    }
     phase.foreach(v => builder.put(l.forResponsePhase.name, v))
     builder.build()
   }

diff --git a/...ics/src/test/scala/sttp/tapir/server/metrics/opentelemetry/OpenTelemetryMetricsTest.scala b/...ics/src/test/scala/sttp/tapir/server/metrics/opentelemetry/OpenTelemetryMetricsTest.scala
@@ -109,8 +109,6 @@ class OpenTelemetryMetricsTest extends AnyFlatSpec with Matchers {
               "http",
               AttributeKey.stringKey("http.response.status_code"),
               "200",
-              AttributeKey.stringKey("error.type"),
-              ""
             ) && dp.getValue == 2 =>
           true
         case dp
@@ -123,8 +121,6 @@ class OpenTelemetryMetricsTest extends AnyFlatSpec with Matchers {
               "http",
               AttributeKey.stringKey("http.response.status_code"),
               "400",
-              AttributeKey.stringKey("error.type"),
-              ""
             ) && dp.getValue == 2 =>
           true
         case _ => false
@@ -172,8 +168,6 @@ class OpenTelemetryMetricsTest extends AnyFlatSpec with Matchers {
         "body",
         AttributeKey.stringKey("url.scheme"),
         "http",
-        AttributeKey.stringKey("error.type"),
-        ""
       )
     )
   }
@@ -230,9 +224,7 @@ class OpenTelemetryMetricsTest extends AnyFlatSpec with Matchers {
       AttributeKey.stringKey("url.scheme"),
       "http",
       AttributeKey.stringKey("http.response.status_code"),
-      "500",
-      AttributeKey.stringKey("error.type"),
-      ""
+      "500"
     )
     point.getValue shouldBe 1
   }