sdk: replace whenA with if, foldMapA with foldMapM

typelevel · Oct 30, 2024 · 27c822b · 27c822b
1 parent 73005d4
commit 27c822b
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 33 deletions.
diff --git a/sdk/metrics/src/main/scala/org/typelevel/otel4s/sdk/metrics/exemplar/ExemplarReservoir.scala b/sdk/metrics/src/main/scala/org/typelevel/otel4s/sdk/metrics/exemplar/ExemplarReservoir.scala
@@ -114,11 +114,11 @@ private[metrics] object ExemplarReservoir {
   ): ExemplarReservoir[F, A] =
     new ExemplarReservoir[F, A] {
       def offer(value: A, attributes: Attributes, context: Context): F[Unit] =
-        original
-          .offer(value, attributes, context)
-          .whenA(
-            filter.shouldSample(value, attributes, context)
-          )
+        if (filter.shouldSample(value, attributes, context)) {
+          original.offer(value, attributes, context)
+        } else {
+          Applicative[F].unit
+        }
 
       def collectAndReset(attributes: Attributes): F[Vector[Exemplar[A]]] =
         original.collectAndReset(attributes)

diff --git a/...rics/src/main/scala/org/typelevel/otel4s/sdk/metrics/exporter/ConsoleMetricExporter.scala b/...rics/src/main/scala/org/typelevel/otel4s/sdk/metrics/exporter/ConsoleMetricExporter.scala
@@ -16,7 +16,6 @@
 
 package org.typelevel.otel4s.sdk.metrics.exporter
 
-import cats.Applicative
 import cats.Foldable
 import cats.Monad
 import cats.effect.std.Console
@@ -60,7 +59,7 @@ private final class ConsoleMetricExporter[F[_]: Monad: Console](
     doExport.whenA(metrics.nonEmpty)
   }
 
-  def flush: F[Unit] = Applicative[F].unit
+  def flush: F[Unit] = Monad[F].unit
 }
 
 object ConsoleMetricExporter {

diff --git a/...trics/src/main/scala/org/typelevel/otel4s/sdk/metrics/internal/CallbackRegistration.scala b/...trics/src/main/scala/org/typelevel/otel4s/sdk/metrics/internal/CallbackRegistration.scala
@@ -39,14 +39,14 @@ private[metrics] final class CallbackRegistration[F[_]: MonadCancelThrow](
     * @param timeWindow
     *   the time window of the measurement
     */
-  def invokeCallback(
-      reader: RegisteredReader[F],
-      timeWindow: TimeWindow
-  ): F[Unit] =
-    measurements
-      .traverse_(_.withActiveReader(reader, timeWindow))
-      .surround(callback)
-      .whenA(hasStorages)
+  def invokeCallback(reader: RegisteredReader[F], timeWindow: TimeWindow): F[Unit] =
+    if (hasStorages) {
+      measurements
+        .traverse_(_.withActiveReader(reader, timeWindow))
+        .surround(callback)
+    } else {
+      MonadCancelThrow[F].unit
+    }
 
   override def toString: String =
     s"CallbackRegistration{instrumentDescriptors=${measurements.map(_.descriptor).mkString_("[", ", ", "]")}"

diff --git a/sdk/metrics/src/main/scala/org/typelevel/otel4s/sdk/metrics/internal/MeterSharedState.scala b/sdk/metrics/src/main/scala/org/typelevel/otel4s/sdk/metrics/internal/MeterSharedState.scala
@@ -216,7 +216,7 @@ private[metrics] final class MeterSharedState[
 
         for {
           _ <- currentCallbacks.traverse_(_.invokeCallback(reader, timeWindow))
-          storages <- registries.get(reader).foldMapA(_.storages)
+          storages <- registries.get(reader).foldMapM(_.storages)
           result <- storages.traverse { storage =>
             storage.collect(resource, scope, timeWindow)
           }

diff --git a/...s/src/main/scala/org/typelevel/otel4s/sdk/metrics/internal/SdkObservableMeasurement.scala b/...s/src/main/scala/org/typelevel/otel4s/sdk/metrics/internal/SdkObservableMeasurement.scala
@@ -117,17 +117,14 @@ private[metrics] object SdkObservableMeasurement {
           v => !cast(v).isNaN
       }
 
-    def withActiveReader(
-        reader: RegisteredReader[F],
-        timeWindow: TimeWindow
-    ): Resource[F, Unit] =
+    def withActiveReader(reader: RegisteredReader[F], timeWindow: TimeWindow): Resource[F, Unit] =
       Resource.make(stateRef.set(State.WithReader(reader, timeWindow))) { _ =>
         stateRef.set(State.Empty())
       }
 
     def record(value: A, attributes: Attributes): F[Unit] =
-      stateRef.get
-        .flatMap {
+      if (isValid(value)) {
+        stateRef.get.flatMap {
           case State.Empty() =>
             Console[F].errorln(
               "SdkObservableMeasurement: " +
@@ -143,7 +140,9 @@ private[metrics] object SdkObservableMeasurement {
               .filter(_.reader == reader)
               .traverse_(storage => storage.record(measurement))
         }
-        .whenA(isValid(value))
+      } else {
+        Monad[F].unit
+      }
 
     def hasStorages: Boolean = storages.nonEmpty
   }

diff --git a/sdk/trace/src/main/scala/org/typelevel/otel4s/sdk/trace/SdkSpanBackend.scala b/sdk/trace/src/main/scala/org/typelevel/otel4s/sdk/trace/SdkSpanBackend.scala
@@ -84,9 +84,13 @@ private final class SdkSpanBackend[F[_]: Monad: Clock: Console] private (
     updateState("updateName")(_.copy(name = name)).void
 
   def addAttributes(attributes: immutable.Iterable[Attribute[_]]): F[Unit] =
-    updateState("addAttributes") { s =>
-      s.copy(attributes = s.attributes.appendAll(attributes.to(Attributes)))
-    }.unlessA(attributes.isEmpty)
+    if (attributes.nonEmpty) {
+      updateState("addAttributes") { s =>
+        s.copy(attributes = s.attributes.appendAll(attributes.to(Attributes)))
+      }.void
+    } else {
+      Monad[F].unit
+    }
 
   def addEvent(
       name: String,
@@ -193,11 +197,11 @@ private final class SdkSpanBackend[F[_]: Monad: Clock: Console] private (
         else (update(state), true)
       }
       .flatTap { modified =>
-        Console[F]
-          .println(
-            s"SdkSpanBackend: calling [$method] on the ended span $context"
-          )
-          .unlessA(modified)
+        if (modified) {
+          Monad[F].unit
+        } else {
+          Console[F].println(s"SdkSpanBackend: calling [$method] on the ended span $context")
+        }
       }
 
   // SpanRef interfaces

diff --git a/sdk/trace/src/main/scala/org/typelevel/otel4s/sdk/trace/processor/SimpleSpanProcessor.scala b/sdk/trace/src/main/scala/org/typelevel/otel4s/sdk/trace/processor/SimpleSpanProcessor.scala
@@ -19,7 +19,6 @@ package processor
 
 import cats.MonadThrow
 import cats.effect.std.Console
-import cats.syntax.applicative._
 import cats.syntax.applicativeError._
 import org.typelevel.otel4s.sdk.trace.data.SpanData
 import org.typelevel.otel4s.sdk.trace.exporter.SpanExporter
@@ -53,7 +52,7 @@ private final class SimpleSpanProcessor[F[_]: MonadThrow: Console] private (
 
   def onEnd(span: SpanData): F[Unit] = {
     val canExport = !exportOnlySampled || span.spanContext.isSampled
-    doExport(span).whenA(canExport)
+    if (canExport) doExport(span) else MonadThrow[F].unit
   }
 
   private def doExport(span: SpanData): F[Unit] =