fixup! fixup! Redesign context implementation

scalafix+scalafmt
typelevel · Aug 21, 2023 · 69f48ee · 69f48ee
1 parent b501b98
commit 69f48ee
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/java/trace/src/test/scala/org/typelevel/otel4s/java/trace/TracerSuite.scala b/java/trace/src/test/scala/org/typelevel/otel4s/java/trace/TracerSuite.scala
@@ -28,9 +28,11 @@ import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.trace.StatusCode
 import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator
 import io.opentelemetry.context.propagation.{
-  TextMapPropagator,
   ContextPropagators => JContextPropagators
 }
+import io.opentelemetry.context.propagation.{
+  TextMapPropagator => JTextMapPropagator
+}
 import io.opentelemetry.extension.incubator.propagation.PassThroughPropagator
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo
 import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter
@@ -886,7 +888,7 @@ class TracerSuite extends CatsEffectSuite {
   private def makeSdk(
       customize: SdkTracerProviderBuilder => SdkTracerProviderBuilder =
         identity,
-      additionalPropagators: Seq[TextMapPropagator] = Nil,
+      additionalPropagators: Seq[JTextMapPropagator] = Nil,
   ): IO[TracerSuite.Sdk] = {
     val exporter = InMemorySpanExporter.create()
 
@@ -902,7 +904,7 @@ class TracerSuite extends CatsEffectSuite {
         W3CTraceContextPropagator.getInstance() +: additionalPropagators
       val propagators = new ContextPropagatorsImpl[IO](
         JContextPropagators.create(
-          TextMapPropagator.composite(textMapPropagators.asJava)
+          JTextMapPropagator.composite(textMapPropagators.asJava)
         )
       )