Skip to content

Commit 0998910

Browse files
authored
Update otel4s to 0.15.0 and otel4s-sdk to 0.16.0 (#2772)
Before submitting pull request: - [x] Check if the project compiles by running `sbt compile` - [x] Verify docs compilation by running `sbt compileDocs` - [x] Check if tests pass by running `sbt test` - [x] Format code by running `sbt scalafmt`
1 parent db35873 commit 0998910

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

build.sbt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ val osLibVersion = "0.11.4"
170170
val tethysVersion = "0.29.7"
171171
val openTelemetryVersion = "1.58.0"
172172
val openTelemetrySemconvVersion = "1.37.0"
173-
val otel4s = "0.14.0"
173+
val otel4s = "0.15.0"
174+
val otel4sSdk = "0.16.0"
174175
val slf4jVersion = "1.7.36"
175176

176177
val compileAndTest = "compile->compile;test->test"
@@ -957,7 +958,7 @@ lazy val otel4sMetricsBackend = (projectMatrix in file("observability/otel4s-met
957958
"org.typelevel" %%% "otel4s-core-metrics" % otel4s,
958959
"org.typelevel" %%% "otel4s-semconv" % otel4s,
959960
"org.typelevel" %%% "otel4s-semconv-metrics-experimental" % otel4s % Test,
960-
"org.typelevel" %%% "otel4s-sdk-metrics-testkit" % otel4s % Test
961+
"org.typelevel" %%% "otel4s-sdk-metrics-testkit" % otel4sSdk % Test
961962
)
962963
)
963964
.jvmPlatform(scalaVersions = scala2_13And3, settings = commonJvmSettings)
@@ -971,7 +972,7 @@ lazy val otel4sTracingBackend = (projectMatrix in file("observability/otel4s-tra
971972
libraryDependencies ++= Seq(
972973
"org.typelevel" %%% "otel4s-core-trace" % otel4s,
973974
"org.typelevel" %%% "otel4s-semconv" % otel4s,
974-
"org.typelevel" %%% "otel4s-sdk-trace-testkit" % otel4s % Test,
975+
"org.typelevel" %%% "otel4s-sdk-trace-testkit" % otel4sSdk % Test,
975976
"org.typelevel" %%% "cats-effect-testkit" % catsEffect_3_version % Test
976977
)
977978
)

observability/otel4s-tracing-backend/src/main/scala/sttp/client4/opentelemetry/otel4s/Otel4sTracingBackend.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,35 +54,35 @@ object Otel4sTracingBackend {
5454
delegate: Backend[F],
5555
config: Otel4sTracingConfig
5656
): F[Backend[F]] =
57-
usingMeter { implicit tracer: Tracer[F] =>
57+
usingTracer { implicit tracer: Tracer[F] =>
5858
FollowRedirectsBackend(new Otel4sTracingBackend(delegate, config) with Backend[F])
5959
}
6060

6161
def apply[F[_]: MonadCancelThrow: TracerProvider](
6262
delegate: WebSocketBackend[F],
6363
config: Otel4sTracingConfig
6464
): F[WebSocketBackend[F]] =
65-
usingMeter { implicit tracer: Tracer[F] =>
65+
usingTracer { implicit tracer: Tracer[F] =>
6666
FollowRedirectsBackend(new Otel4sTracingBackend(delegate, config) with WebSocketBackend[F])
6767
}
6868

6969
def apply[F[_]: MonadCancelThrow: TracerProvider, S](
7070
delegate: StreamBackend[F, S],
7171
config: Otel4sTracingConfig
7272
): F[StreamBackend[F, S]] =
73-
usingMeter { implicit tracer: Tracer[F] =>
73+
usingTracer { implicit tracer: Tracer[F] =>
7474
FollowRedirectsBackend(new Otel4sTracingBackend(delegate, config) with StreamBackend[F, S])
7575
}
7676

7777
def apply[F[_]: MonadCancelThrow: TracerProvider, S](
7878
delegate: WebSocketStreamBackend[F, S],
7979
config: Otel4sTracingConfig
8080
): F[WebSocketStreamBackend[F, S]] =
81-
usingMeter { implicit tracer: Tracer[F] =>
81+
usingTracer { implicit tracer: Tracer[F] =>
8282
FollowRedirectsBackend(new Otel4sTracingBackend(delegate, config) with WebSocketStreamBackend[F, S])
8383
}
8484

85-
private def usingMeter[F[_]: MonadCancelThrow: TracerProvider, A](f: Tracer[F] => A): F[A] =
85+
private def usingTracer[F[_]: MonadCancelThrow: TracerProvider, A](f: Tracer[F] => A): F[A] =
8686
for {
8787
tracer <- TracerProvider[F].tracer("sttp-client4").withVersion("1.0.0").get
8888
} yield f(tracer)

observability/otel4s-tracing-backend/src/test/scala/sttp/client4/opentelemetry/otel4s/Otel4sTracingBackendTest.scala

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ class Otel4sTracingBackendTest extends AsyncFreeSpec with Matchers {
4343
"Otel4sTracingBackend" - {
4444
"should add tracing headers to the request" in {
4545
TracesTestkit
46-
.inMemory[IO](_.addTextMapPropagators(W3CTraceContextPropagator.default))
46+
.builder[IO]
47+
.addTracerProviderCustomizer(_.addTextMapPropagators(W3CTraceContextPropagator.default))
48+
.build
4749
.use { testkit =>
4850
implicit val tracerProvider: TracerProvider[IO] = testkit.tracerProvider
4951

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

6668
"should record request/response-specific attributes: 200 OK response" in {
6769
TracesTestkit
68-
.inMemory[IO](_.addTextMapPropagators(W3CTraceContextPropagator.default))
70+
.builder[IO]
71+
.addTracerProviderCustomizer(_.addTextMapPropagators(W3CTraceContextPropagator.default))
72+
.build
6973
.use { testkit =>
7074
implicit val tracerProvider: TracerProvider[IO] = testkit.tracerProvider
7175

@@ -107,7 +111,9 @@ class Otel4sTracingBackendTest extends AsyncFreeSpec with Matchers {
107111

108112
"should record request/response-specific attributes: 400 BadRequest response" in {
109113
TracesTestkit
110-
.inMemory[IO](_.addTextMapPropagators(W3CTraceContextPropagator.default))
114+
.builder[IO]
115+
.addTracerProviderCustomizer(_.addTextMapPropagators(W3CTraceContextPropagator.default))
116+
.build
111117
.use { testkit =>
112118
implicit val tracerProvider: TracerProvider[IO] = testkit.tracerProvider
113119

@@ -152,7 +158,9 @@ class Otel4sTracingBackendTest extends AsyncFreeSpec with Matchers {
152158
TestControl
153159
.executeEmbed {
154160
TracesTestkit
155-
.inMemory[IO](_.addTextMapPropagators(W3CTraceContextPropagator.default))
161+
.builder[IO]
162+
.addTracerProviderCustomizer(_.addTextMapPropagators(W3CTraceContextPropagator.default))
163+
.build
156164
.use { testkit =>
157165
implicit val tracerProvider: TracerProvider[IO] = testkit.tracerProvider
158166

0 commit comments

Comments
 (0)