Skip to content

Update otel4s to 0.15.0 and otel4s-sdk to 0.16.0 #2772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamw merged 1 commit into from
Jan 22, 2026
+21 −12
Merged

Update otel4s to 0.15.0 and otel4s-sdk to 0.16.0 #2772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ val osLibVersion = "0.11.4"
val tethysVersion = "0.29.7"
val openTelemetryVersion = "1.58.0"
val openTelemetrySemconvVersion = "1.37.0"
val otel4s = "0.14.0"
val otel4s = "0.15.0"
val otel4sSdk = "0.16.0"
val slf4jVersion = "1.7.36"

val compileAndTest = "compile->compile;test->test"
Expand Down Expand Up @@ -957,7 +958,7 @@ lazy val otel4sMetricsBackend = (projectMatrix in file("observability/otel4s-met
"org.typelevel" %%% "otel4s-core-metrics" % otel4s,
"org.typelevel" %%% "otel4s-semconv" % otel4s,
"org.typelevel" %%% "otel4s-semconv-metrics-experimental" % otel4s % Test,
"org.typelevel" %%% "otel4s-sdk-metrics-testkit" % otel4s % Test
"org.typelevel" %%% "otel4s-sdk-metrics-testkit" % otel4sSdk % Test
)
)
.jvmPlatform(scalaVersions = scala2_13And3, settings = commonJvmSettings)
Expand All @@ -971,7 +972,7 @@ lazy val otel4sTracingBackend = (projectMatrix in file("observability/otel4s-tra
libraryDependencies ++= Seq(
"org.typelevel" %%% "otel4s-core-trace" % otel4s,
"org.typelevel" %%% "otel4s-semconv" % otel4s,
"org.typelevel" %%% "otel4s-sdk-trace-testkit" % otel4s % Test,
"org.typelevel" %%% "otel4s-sdk-trace-testkit" % otel4sSdk % Test,
"org.typelevel" %%% "cats-effect-testkit" % catsEffect_3_version % Test
)
)
Expand Down
10 changes: 5 additions & 5 deletions ...acing-backend/src/main/scala/sttp/client4/opentelemetry/otel4s/Otel4sTracingBackend.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,35 +54,35 @@ object Otel4sTracingBackend {
delegate: Backend[F],
config: Otel4sTracingConfig
): F[Backend[F]] =
usingMeter { implicit tracer: Tracer[F] =>
usingTracer { implicit tracer: Tracer[F] =>
FollowRedirectsBackend(new Otel4sTracingBackend(delegate, config) with Backend[F])
}

def apply[F[_]: MonadCancelThrow: TracerProvider](
delegate: WebSocketBackend[F],
config: Otel4sTracingConfig
): F[WebSocketBackend[F]] =
usingMeter { implicit tracer: Tracer[F] =>
usingTracer { implicit tracer: Tracer[F] =>
FollowRedirectsBackend(new Otel4sTracingBackend(delegate, config) with WebSocketBackend[F])
}

def apply[F[_]: MonadCancelThrow: TracerProvider, S](
delegate: StreamBackend[F, S],
config: Otel4sTracingConfig
): F[StreamBackend[F, S]] =
usingMeter { implicit tracer: Tracer[F] =>
usingTracer { implicit tracer: Tracer[F] =>
FollowRedirectsBackend(new Otel4sTracingBackend(delegate, config) with StreamBackend[F, S])
}

def apply[F[_]: MonadCancelThrow: TracerProvider, S](
delegate: WebSocketStreamBackend[F, S],
config: Otel4sTracingConfig
): F[WebSocketStreamBackend[F, S]] =
usingMeter { implicit tracer: Tracer[F] =>
usingTracer { implicit tracer: Tracer[F] =>
FollowRedirectsBackend(new Otel4sTracingBackend(delegate, config) with WebSocketStreamBackend[F, S])
}

private def usingMeter[F[_]: MonadCancelThrow: TracerProvider, A](f: Tracer[F] => A): F[A] =
private def usingTracer[F[_]: MonadCancelThrow: TracerProvider, A](f: Tracer[F] => A): F[A] =
for {
tracer <- TracerProvider[F].tracer("sttp-client4").withVersion("1.0.0").get
} yield f(tracer)
Expand Down
16 changes: 12 additions & 4 deletions ...g-backend/src/test/scala/sttp/client4/opentelemetry/otel4s/Otel4sTracingBackendTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ class Otel4sTracingBackendTest extends AsyncFreeSpec with Matchers {
"Otel4sTracingBackend" - {
"should add tracing headers to the request" in {
TracesTestkit
.inMemory[IO](_.addTextMapPropagators(W3CTraceContextPropagator.default))
.builder[IO]
.addTracerProviderCustomizer(_.addTextMapPropagators(W3CTraceContextPropagator.default))
.build
.use { testkit =>
implicit val tracerProvider: TracerProvider[IO] = testkit.tracerProvider

Expand All @@ -65,7 +67,9 @@ class Otel4sTracingBackendTest extends AsyncFreeSpec with Matchers {

"should record request/response-specific attributes: 200 OK response" in {
TracesTestkit
.inMemory[IO](_.addTextMapPropagators(W3CTraceContextPropagator.default))
.builder[IO]
.addTracerProviderCustomizer(_.addTextMapPropagators(W3CTraceContextPropagator.default))
.build
.use { testkit =>
implicit val tracerProvider: TracerProvider[IO] = testkit.tracerProvider

Expand Down Expand Up @@ -107,7 +111,9 @@ class Otel4sTracingBackendTest extends AsyncFreeSpec with Matchers {

"should record request/response-specific attributes: 400 BadRequest response" in {
TracesTestkit
.inMemory[IO](_.addTextMapPropagators(W3CTraceContextPropagator.default))
.builder[IO]
.addTracerProviderCustomizer(_.addTextMapPropagators(W3CTraceContextPropagator.default))
.build
.use { testkit =>
implicit val tracerProvider: TracerProvider[IO] = testkit.tracerProvider

Expand Down Expand Up @@ -152,7 +158,9 @@ class Otel4sTracingBackendTest extends AsyncFreeSpec with Matchers {
TestControl
.executeEmbed {
TracesTestkit
.inMemory[IO](_.addTextMapPropagators(W3CTraceContextPropagator.default))
.builder[IO]
.addTracerProviderCustomizer(_.addTextMapPropagators(W3CTraceContextPropagator.default))
.build
.use { testkit =>
implicit val tracerProvider: TracerProvider[IO] = testkit.tracerProvider

Expand Down
Loading