fixup! Add BaggageManager utility

Local#reader
typelevel · Feb 4, 2025 · 3a13fb2 · 3a13fb2
1 parent c5dba2e
commit 3a13fb2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/core/common/src/main/scala/org/typelevel/otel4s/baggage/BaggageManager.scala b/core/common/src/main/scala/org/typelevel/otel4s/baggage/BaggageManager.scala
@@ -29,12 +29,12 @@ trait BaggageManager[F[_]] extends Local[F, Baggage] {
     *   mapping for the key
     */
   def get(key: String): F[Option[Baggage.Entry]] =
-    applicative.map(ask[Baggage])(_.get(key))
+    reader(_.get(key))
 
   /** @return
     *   the value (without [[Baggage.Metadata metadata]]) to which the specified key is mapped, or `None` if the current
     *   `Baggage` contains no mapping for the key
     */
   def getValue(key: String): F[Option[String]] =
-    applicative.map(ask[Baggage])(_.get(key).map(_.value))
+    reader(_.get(key).map(_.value))
 }
diff --git a/...java/common/src/main/scala/org/typelevel/otel4s/oteljava/baggage/BaggageManagerImpl.scala b/...java/common/src/main/scala/org/typelevel/otel4s/oteljava/baggage/BaggageManagerImpl.scala
@@ -28,7 +28,7 @@ private final class BaggageManagerImpl[F[_]] private (implicit localContext: Loc
     extends BaggageManager[F] {
   def applicative: Applicative[F] = localContext.applicative
   def ask[E2 >: Baggage]: F[E2] =
-    applicative.map(localContext.ask[Context]) { ctx =>
+    localContext.reader { ctx =>
       Option(JBaggage.fromContextOrNull(ctx.underlying))
         .fold(Baggage.empty)(_.toScala)
     }
@@ -40,12 +40,12 @@ private final class BaggageManagerImpl[F[_]] private (implicit localContext: Loc
       Context.wrap(jCtx.`with`(updated))
     }
   override def get(key: String): F[Option[Baggage.Entry]] =
-    applicative.map(localContext.ask[Context]) { ctx =>
+    localContext.reader { ctx =>
       Option(JBaggage.fromContext(ctx.underlying).getEntry(key))
         .map(_.toScala)
     }
   override def getValue(key: String): F[Option[String]] =
-    applicative.map(localContext.ask[Context]) { ctx =>
+    localContext.reader { ctx =>
       Option(JBaggage.fromContext(ctx.underlying).getEntryValue(key))
     }
 }

diff --git a/sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/baggage/SdkBaggageManager.scala b/sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/baggage/SdkBaggageManager.scala
@@ -28,7 +28,7 @@ private final class SdkBaggageManager[F[_]](implicit localContext: LocalContext[
 
   def applicative: Applicative[F] = localContext.applicative
   def ask[E2 >: Baggage]: F[E2] =
-    applicative.map(localContext.ask[Context])(baggageFromContext)
+    localContext.reader(baggageFromContext)
   def local[A](fa: F[A])(f: Baggage => Baggage): F[A] =
     localContext.local(fa) { ctx =>
       ctx.updated(BaggageKey, f(baggageFromContext(ctx)))