Polish observableCounter API

zio · Dec 24, 2023 · c86e15e · c86e15e
1 parent cb6b183
commit c86e15e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/opentelemetry-example/src/main/scala/zio/telemetry/opentelemetry/example/BackendApp.scala b/opentelemetry-example/src/main/scala/zio/telemetry/opentelemetry/example/BackendApp.scala
@@ -9,6 +9,7 @@ import zio.telemetry.opentelemetry.baggage.Baggage
 import zio.telemetry.opentelemetry.context.ContextStorage
 import zio.telemetry.opentelemetry.OpenTelemetry
 import zio.telemetry.opentelemetry.example.otel.OtelSdk
+import zio.telemetry.opentelemetry.metrics.Meter
 
 object BackendApp extends ZIOAppDefault {
 
@@ -17,6 +18,13 @@ object BackendApp extends ZIOAppDefault {
   private val instrumentationScopeName = "zio.telemetry.opentelemetry.example.BackendApp"
   private val resourceName             = "opentelemetry-example-backend"
 
+  val observableCounterLayer = 
+    ZLayer.suspend(
+      ZLayer.service[Meter].flatMap { env => 
+        env.get.observableCounter("foo")(_.record(1L)).unit
+      }
+    )
+
   override def run: ZIO[Scope, Any, ExitCode] =
     ZIO
       .serviceWithZIO[BackendHttpServer](_.start.exitCode)
@@ -27,6 +35,8 @@ object BackendApp extends ZIOAppDefault {
         OtelSdk.custom(resourceName),
         OpenTelemetry.tracing(instrumentationScopeName),
         OpenTelemetry.logging(instrumentationScopeName),
+        OpenTelemetry.meter(instrumentationScopeName),
+        observableCounterLayer,
         Baggage.live(),
         ContextStorage.fiberRef
       )

diff --git a/...etry-example/src/main/scala/zio/telemetry/opentelemetry/example/http/BackendHttpApp.scala b/...etry-example/src/main/scala/zio/telemetry/opentelemetry/example/http/BackendHttpApp.scala
@@ -10,8 +10,9 @@ import zio.telemetry.opentelemetry.context.IncomingContextCarrier
 import zio.telemetry.opentelemetry.example.http.{Status => ServiceStatus}
 import zio.telemetry.opentelemetry.tracing.Tracing
 import zio.telemetry.opentelemetry.tracing.propagation.TraceContextPropagator
+import zio.telemetry.opentelemetry.metrics.Meter
 
-case class BackendHttpApp(tracing: Tracing, baggage: Baggage) {
+case class BackendHttpApp(tracing: Tracing, meter: Meter, baggage: Baggage) {
 
   import tracing.aspects._
 
@@ -43,13 +44,14 @@ case class BackendHttpApp(tracing: Tracing, baggage: Baggage) {
       response     <- ZIO.succeed(Response.json(ServiceStatus.up("backend").toJson))
       _            <- tracing.addEvent("event from backend after response")
       _            <- ZIO.logInfo("status processing finished on backend")
+      _            <- meter.counter("status_requests_count").flatMap(_.inc).orDie
     } yield response
 
 }
 
 object BackendHttpApp {
 
-  val live: URLayer[Tracing with Baggage, BackendHttpApp] =
+  val live: URLayer[Tracing with Meter with Baggage, BackendHttpApp] =
     ZLayer.fromFunction(BackendHttpApp.apply _)
 
 }
diff --git a/opentelemetry/src/main/scala/zio/telemetry/opentelemetry/metrics/Meter.scala b/opentelemetry/src/main/scala/zio/telemetry/opentelemetry/metrics/Meter.scala
@@ -16,7 +16,7 @@ trait Meter {
     name: String,
     unit: Option[String] = None,
     description: Option[String] = None
-  )(cb: ObservableMeasurement[Long] => Task[Unit]): TaskLayer[api.metrics.ObservableLongCounter]
+  )(callback: ObservableMeasurement[Long] => Task[Unit]): TaskLayer[api.metrics.ObservableLongCounter]
 
 }
 
@@ -50,7 +50,7 @@ object Meter {
           name: String,
           unit: Option[String] = None,
           description: Option[String] = None
-        )(cb: ObservableMeasurement[Long] => Task[Unit]): TaskLayer[api.metrics.ObservableLongCounter] =
+        )(callback: ObservableMeasurement[Long] => Task[Unit]): TaskLayer[api.metrics.ObservableLongCounter] =
           ZLayer.scoped(
             ZIO.fromAutoCloseable(
               ZIO.attempt {
@@ -61,7 +61,7 @@ object Meter {
 
                 builder.buildWithCallback { om =>
                   Unsafe.unsafe { implicit unsafe =>
-                    unsafeRuntime.run(cb(ObservableMeasurement.long(om))).getOrThrowFiberFailure()
+                    unsafeRuntime.run(callback(ObservableMeasurement.long(om))).getOrThrowFiberFailure()
                   }
                 }
               }

diff --git a/opentelemetry/src/test/scala/zio/telemetry/opentelemetry/metrics/MeterTest.scala b/opentelemetry/src/test/scala/zio/telemetry/opentelemetry/metrics/MeterTest.scala
@@ -10,7 +10,7 @@ import scala.jdk.CollectionConverters._
 
 object MeterTest extends ZIOSpecDefault {
 
-  val inMemoryMetricReaderLayer: ZLayer[Any,Nothing,InMemoryMetricReader] =
+  val inMemoryMetricReaderLayer: ZLayer[Any, Nothing, InMemoryMetricReader] =
     ZLayer(ZIO.succeed(InMemoryMetricReader.create()))
 
   val meterLayer = {
@@ -35,7 +35,7 @@ object MeterTest extends ZIOSpecDefault {
               _      <- meter
                           .observableCounter("obs")(_.record(1L))
                           .launch
-                          .forkDaemon
+                          .fork
               _      <- TestClock.adjust(1.millisecond)
               metrics = reader.collectAllMetrics().asScala.toList
             } yield assertTrue(metrics.nonEmpty)