Merge pull request #909 from NthPortal/sdk-Context-getOrElse

Add `sdk.Context#getOrElse`
typelevel · Feb 5, 2025 · a04dd8f · a04dd8f
2 parents 4450fc0 + 0cc562c
commit a04dd8f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
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
@@ -42,7 +42,7 @@ private[sdk] object SdkBaggageManager {
       .unsafeRunSync()
 
   private def baggageFromContext(context: Context): Baggage =
-    context.get(BaggageKey).getOrElse(Baggage.empty)
+    context.getOrElse(BaggageKey, Baggage.empty)
 
   def fromLocal[F[_]: LocalContext]: BaggageManager[F] =
     new SdkBaggageManager[F]

diff --git a/sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/context/Context.scala b/sdk/common/shared/src/main/scala/org/typelevel/otel4s/sdk/context/Context.scala
@@ -32,6 +32,12 @@ sealed trait Context {
     */
   def get[A](key: Context.Key[A]): Option[A]
 
+  /** Retrieves the value associated with the given key from the context, if such a value exists; otherwise, returns the
+    * provided default value.
+    */
+  def getOrElse[A](key: Context.Key[A], default: => A): A =
+    get(key).getOrElse(default)
+
   /** Creates a copy of this context with the given `value` associated with the given `key`.
     */
   def updated[A](key: Context.Key[A], value: A): Context