Merge upstream

typelevel · Nov 13, 2023 · a2c1349 · a2c1349
1 parent 1fd0687
commit a2c1349
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/core/trace/src/main/scala/org/typelevel/otel4s/trace/SpanContext.scala b/core/trace/src/main/scala/org/typelevel/otel4s/trace/SpanContext.scala
@@ -122,7 +122,7 @@ object SpanContext {
   }
 
   val invalid: SpanContext =
-    SpanContextImpl(
+    Impl(
       traceId = TraceId.Invalid,
       traceIdHex = TraceId.Invalid.toHex,
       spanId = SpanId.Invalid,
@@ -243,7 +243,7 @@ object SpanContext {
       remote: Boolean,
       isValid: Boolean
   ): SpanContext =
-    SpanContextImpl(
+    Impl(
       traceId = traceId,
       traceIdHex = traceId.toHex,
       spanId = spanId,
@@ -254,7 +254,7 @@ object SpanContext {
       isValid = isValid
     )
 
-  private final case class SpanContextImpl(
+  private final case class Impl(
       traceId: ByteVector,
       traceIdHex: String,
       spanId: ByteVector,

diff --git a/java/trace/src/main/scala/org/typelevel/otel4s/java/trace/SpanBackendImpl.scala b/java/trace/src/main/scala/org/typelevel/otel4s/java/trace/SpanBackendImpl.scala
@@ -106,7 +106,7 @@ private[java] object SpanBackendImpl {
   def fromJSpan[F[_]: Sync](jSpan: JSpan): SpanBackendImpl[F] =
     new SpanBackendImpl(
       jSpan,
-      SpanContextConversion.fromJSpanContext(jSpan.getSpanContext)
+      SpanContextConversions.toScala(jSpan.getSpanContext)
     )
 
   private def toJStatus(status: Status): JStatusCode =

diff --git a/java/trace/src/main/scala/org/typelevel/otel4s/java/trace/SpanBuilderImpl.scala b/java/trace/src/main/scala/org/typelevel/otel4s/java/trace/SpanBuilderImpl.scala
@@ -105,7 +105,7 @@ private[java] final case class SpanBuilderImpl[F[_]: Sync](
     startTimestamp.foreach(d => b.setStartTimestamp(d.length, d.unit))
     links.foreach { case (ctx, attributes) =>
       b.addLink(
-        SpanContextConversion.toJSpanContext(ctx),
+        SpanContextConversions.toJava(ctx),
         Conversions.toJAttributes(attributes)
       )
     }
@@ -136,7 +136,7 @@ private[java] final case class SpanBuilderImpl[F[_]: Sync](
             case Parent.Propagate => underlying
             case Parent.Explicit(parent) =>
               JSpan
-                .wrap(SpanContextConversion.toJSpanContext(parent))
+                .wrap(SpanContextConversions.toJava(parent))
                 .storeInContext(underlying)
           }
         }

diff --git a/...4s/java/trace/SpanContextConversion.scala → ...s/java/trace/SpanContextConversions.scala b/...4s/java/trace/SpanContextConversion.scala → ...s/java/trace/SpanContextConversions.scala
@@ -24,9 +24,9 @@ import org.typelevel.otel4s.trace.TraceFlags
 import org.typelevel.otel4s.trace.TraceState
 import scodec.bits.ByteVector
 
-private[otel4s] object SpanContextConversion {
+private[otel4s] object SpanContextConversions {
 
-  def fromJSpanContext(context: JSpanContext): SpanContext = {
+  def toScala(context: JSpanContext): SpanContext = {
     val entries = Vector.newBuilder[(String, String)]
     context.getTraceState.forEach((k, v) => entries.addOne(k -> v))
     val traceState = TraceState.fromVectorUnsafe(entries.result())
@@ -41,7 +41,7 @@ private[otel4s] object SpanContextConversion {
     )
   }
 
-  def toJSpanContext(context: SpanContext): JSpanContext = {
+  def toJava(context: SpanContext): JSpanContext = {
     val traceId = context.traceIdHex
     val spanId = context.spanIdHex
     val flags = JTraceFlags.fromByte(context.traceFlags.toByte)

diff --git a/java/trace/src/main/scala/org/typelevel/otel4s/java/trace/TracerImpl.scala b/java/trace/src/main/scala/org/typelevel/otel4s/java/trace/TracerImpl.scala
@@ -45,9 +45,7 @@ private[java] class TracerImpl[F[_]: Sync](
       case Context.Noop => None
       case Context.Wrapped(underlying) =>
         Option(JSpan.fromContextOrNull(underlying))
-          .map(jSpan =>
-            SpanContextConversion.fromJSpanContext(jSpan.getSpanContext)
-          )
+          .map(jSpan => SpanContextConversions.toScala(jSpan.getSpanContext))
     }
 
   def currentSpanOrNoop: F[Span[F]] =
@@ -64,9 +62,7 @@ private[java] class TracerImpl[F[_]: Sync](
 
   def childScope[A](parent: SpanContext)(fa: F[A]): F[A] =
     L.local(fa) {
-      _.map(
-        JSpan.wrap(SpanContextConversion.toJSpanContext(parent)).storeInContext
-      )
+      _.map(JSpan.wrap(SpanContextConversions.toJava(parent)).storeInContext)
     }
 
   def rootScope[A](fa: F[A]): F[A] =

diff --git a/java/trace/src/test/scala/org/typelevel/otel4s/java/trace/SpanContextSuite.scala b/java/trace/src/test/scala/org/typelevel/otel4s/java/trace/SpanContextSuite.scala
@@ -60,7 +60,7 @@ class SpanContextSuite extends ScalaCheckSuite {
 
   test("SpanContext to JSpanContext") {
     Prop.forAll(spanContextGen) { ctx =>
-      val jCtx = SpanContextConversion.toJSpanContext(ctx)
+      val jCtx = SpanContextConversions.toJava(ctx)
 
       assert(ctx.traceId.toArray.sameElements(jCtx.getTraceIdBytes))
       assert(ctx.spanId.toArray.sameElements(jCtx.getSpanIdBytes))
@@ -76,8 +76,8 @@ class SpanContextSuite extends ScalaCheckSuite {
 
   test("back and forth conversion") {
     Prop.forAll(spanContextGen) { ctx =>
-      val jCtx = SpanContextConversion.toJSpanContext(ctx)
-      assertEquals(SpanContextConversion.fromJSpanContext(jCtx), ctx)
+      val jCtx = SpanContextConversions.toJava(ctx)
+      assertEquals(SpanContextConversions.toScala(jCtx), ctx)
     }
   }