Merge pull request #89 from NthPortal/small-tweaks

A small fix and improvement
http4s · May 8, 2024 · 3d00753 · 3d00753
2 parents 82edd7d + a5dba72
commit 3d00753
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 import com.typesafe.tools.mima.core._
 
-ThisBuild / tlBaseVersion := "0.6" // your current series x.y
+ThisBuild / tlBaseVersion := "0.7" // your current series x.y
 
 ThisBuild / licenses := Seq(License.Apache2)
 ThisBuild / developers += tlGitHubDev("rossabaker", "Ross A. Baker")

diff --git a/core/src/main/scala/org/http4s/otel4s/middleware/ServerMiddleware.scala b/core/src/main/scala/org/http4s/otel4s/middleware/ServerMiddleware.scala
@@ -131,15 +131,15 @@ object ServerMiddleware {
       *  server span.
       */
     def withAdditionalRequestAttributes(
-        additionalRequestAttributes: Request[F] => Seq[Attribute[_]]
+        additionalRequestAttributes: Request[F] => immutable.Iterable[Attribute[_]]
     ): ServerMiddlewareBuilder[F] =
       copy(additionalRequestAttributes = additionalRequestAttributes)
 
     /** Sets how to derive additional `Attribute`s from a response to add to the
       *  server span.
       */
     def withAdditionalResponseAttributes(
-        additionalResponseAttributes: Response[F] => Seq[Attribute[_]]
+        additionalResponseAttributes: Response[F] => immutable.Iterable[Attribute[_]]
     ): ServerMiddlewareBuilder[F] =
       copy(additionalResponseAttributes = additionalResponseAttributes)
 
@@ -164,7 +164,7 @@ object ServerMiddleware {
     )(implicit kt: KindTransformer[F, G]): Http[G, F] =
       Kleisli { (req: Request[F]) =>
         if (
-          shouldTrace(req.requestPrelude) == ShouldTrace.DoNotTrace ||
+          !shouldTrace(req.requestPrelude).shouldTrace ||
           !Tracer[F].meta.isEnabled
         ) {
           f(req)

diff --git a/core/src/main/scala/org/http4s/otel4s/middleware/ShouldTrace.scala b/core/src/main/scala/org/http4s/otel4s/middleware/ShouldTrace.scala
@@ -17,13 +17,21 @@
 package org.http4s.otel4s.middleware
 
 /** Whether or not to trace something. */
-sealed trait ShouldTrace
+sealed trait ShouldTrace {
+
+  /** Whether or not to trace something. */
+  def shouldTrace: Boolean
+}
 
 object ShouldTrace {
 
   /** Trace the thing. */
-  case object Trace extends ShouldTrace
+  case object Trace extends ShouldTrace {
+    def shouldTrace: Boolean = true
+  }
 
   /** Do not trace the thing. */
-  case object DoNotTrace extends ShouldTrace
+  case object DoNotTrace extends ShouldTrace {
+    def shouldTrace: Boolean = false
+  }
 }