From 8a8c9f0f75c3f6d6f5ebfb59ea7e02d3edb5b283 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 24 Apr 2024 11:59:06 +0200 Subject: [PATCH] chore: Update skunk-circe, skunk-core from 1.0.0-M4 to 1.0.0-M5, otel4s from 0.0.4 to 0.0.5 (#105) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Raphaƫl Lemaitre --- modules/core/src/main/scala/pillars/Observability.scala | 2 +- .../sttp/tapir/server/metrics/otel4s/Otel4sMetrics.scala | 6 +++--- project/Dependencies.scala | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/core/src/main/scala/pillars/Observability.scala b/modules/core/src/main/scala/pillars/Observability.scala index 2e642c0e6..4abf8401f 100644 --- a/modules/core/src/main/scala/pillars/Observability.scala +++ b/modules/core/src/main/scala/pillars/Observability.scala @@ -8,8 +8,8 @@ import io.circe.derivation.Configuration import io.github.iltotore.iron.* import io.github.iltotore.iron.circe.given import io.github.iltotore.iron.constraint.all.* -import org.typelevel.otel4s.java.OtelJava import org.typelevel.otel4s.metrics.Meter +import org.typelevel.otel4s.oteljava.OtelJava import org.typelevel.otel4s.trace.Tracer import sttp.tapir.server.interceptor.EndpointInterceptor import sttp.tapir.server.interceptor.Interceptor diff --git a/modules/core/src/main/scala/sttp/tapir/server/metrics/otel4s/Otel4sMetrics.scala b/modules/core/src/main/scala/sttp/tapir/server/metrics/otel4s/Otel4sMetrics.scala index 6b6fafd17..f1e35cae9 100644 --- a/modules/core/src/main/scala/sttp/tapir/server/metrics/otel4s/Otel4sMetrics.scala +++ b/modules/core/src/main/scala/sttp/tapir/server/metrics/otel4s/Otel4sMetrics.scala @@ -70,7 +70,7 @@ object Otel4sMetrics: labels: MetricLabels ): F[Metric[F, UpDownCounter[F, Long]]] = meter - .upDownCounter("request.active") + .upDownCounter[Long]("request.active") .withDescription("Active HTTP requests") .withUnit("1") .create @@ -94,7 +94,7 @@ object Otel4sMetrics: private def requestTotal[F[_]: Applicative](meter: Meter[F], labels: MetricLabels): F[Metric[F, Counter[F, Long]]] = meter - .counter("request.total") + .counter[Long]("request.total") .withDescription("Total HTTP requests") .withUnit("1") .create @@ -132,7 +132,7 @@ object Otel4sMetrics: labels: MetricLabels ): F[Metric[F, Histogram[F, Double]]] = meter - .histogram("request.duration") + .histogram[Double]("request.duration") .withDescription("Duration of HTTP requests") .withUnit("ms") .create diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e983852ae..453319a0e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -81,14 +81,14 @@ object Dependencies { ) val observability: Seq[ModuleID] = Seq( - "org.typelevel" %% "otel4s-java" % "0.4.0", + "org.typelevel" %% "otel4s-oteljava" % "0.5.0", "io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.37.0" % Runtime, "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "1.37.0" % Runtime ) val database: Seq[ModuleID] = Seq( - "org.tpolecat" %% "skunk-core" % "1.0.0-M4", - "org.tpolecat" %% "skunk-circe" % "1.0.0-M4" + "org.tpolecat" %% "skunk-core" % "1.0.0-M5", + "org.tpolecat" %% "skunk-circe" % "1.0.0-M5" ) ++ tests val doobie: Seq[ModuleID] = Seq(