wip: alter span implementation

Author: fractalwrench

embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/injection/OpenTelemetryModule.kt

@@ -11,8 +11,8 @@ import io.embrace.android.embracesdk.internal.spans.EmbraceTracer
 import io.embrace.android.embracesdk.internal.spans.InternalTracer
 import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.embrace.opentelemetry.kotlin.logging.Logger
+import io.embrace.opentelemetry.kotlin.tracing.Tracer
 import io.opentelemetry.api.OpenTelemetry
-import io.opentelemetry.api.trace.Tracer
 import io.opentelemetry.api.trace.TracerProvider
 
 /**

embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/injection/OpenTelemetryModuleImpl.kt

@@ -25,8 +25,8 @@ import io.embrace.android.embracesdk.internal.spans.InternalTracer
 import io.embrace.android.embracesdk.internal.utils.EmbTrace
 import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.embrace.opentelemetry.kotlin.logging.Logger
+import io.embrace.opentelemetry.kotlin.tracing.Tracer
 import io.opentelemetry.api.OpenTelemetry
-import io.opentelemetry.api.trace.Tracer
 import io.opentelemetry.api.trace.TracerProvider
 import io.opentelemetry.sdk.common.Clock
 
@@ -76,7 +76,12 @@ internal class OpenTelemetryModuleImpl(
     }
 
     override val sdkTracer: Tracer by lazy {
-        otelSdkWrapper.sdkTracer
+        EmbTrace.trace("otel-tracer-init") {
+            otelSdkWrapper.kotlinApi.tracerProvider.getTracer(
+                name = otelSdkConfig.sdkName,
+                version = otelSdkConfig.sdkVersion,
+            )
+        }
     }
 
     private var sensitiveKeysBehavior: SensitiveKeysBehavior? = null
@@ -158,7 +163,7 @@ internal class OpenTelemetryModuleImpl(
 
     override val externalTracerProvider: TracerProvider by lazy {
         EmbTracerProvider(
-            sdkTracerProvider = otelSdkWrapper.sdkTracerProvider,
+            sdkTracerProvider = otelSdkWrapper.kotlinApi.tracerProvider,
             spanService = spanService,
             clock = openTelemetryClock,
         )

embrace-android-core/src/test/java/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanImplTests.kt

@@ -31,7 +31,7 @@ import io.embrace.android.embracesdk.internal.spans.CurrentSessionSpanImpl.Compa
 import io.embrace.android.embracesdk.internal.telemetry.TelemetryService
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.ErrorCode
-import io.opentelemetry.api.trace.Tracer
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.opentelemetry.sdk.common.Clock
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -42,14 +42,15 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 
+@OptIn(ExperimentalApi::class)
 internal class CurrentSessionSpanImplTests {
     private lateinit var spanRepository: SpanRepository
     private lateinit var spanSink: SpanSink
     private lateinit var telemetryService: TelemetryService
     private lateinit var openTelemetryClock: Clock
     private lateinit var currentSessionSpan: CurrentSessionSpanImpl
     private lateinit var spanService: SpanService
-    private lateinit var tracer: Tracer
+    private lateinit var tracer: io.embrace.opentelemetry.kotlin.tracing.Tracer
     private val clock = FakeClock(1000L)
 
     @Before

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/impl/EmbSpanBuilder.kt

@@ -2,6 +2,7 @@ package io.embrace.android.embracesdk.internal.otel.impl
 
 import io.embrace.android.embracesdk.internal.otel.spans.OtelSpanCreator
 import io.embrace.android.embracesdk.internal.otel.spans.SpanService
+import io.embrace.android.embracesdk.internal.otel.toOtelKotlin
 import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.trace.Span
@@ -49,7 +50,7 @@ class EmbSpanBuilder(
         setAttribute(key.key, value.toString())
 
     override fun setSpanKind(spanKind: SpanKind): SpanBuilder {
-        otelSpanStartArgs.spanKind = spanKind
+        otelSpanStartArgs.spanKind = spanKind.toOtelKotlin()
         return this
     }
 

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/impl/EmbTracer.kt

@@ -4,13 +4,15 @@ import io.embrace.android.embracesdk.internal.otel.schema.EmbType
 import io.embrace.android.embracesdk.internal.otel.sdk.otelSpanCreator
 import io.embrace.android.embracesdk.internal.otel.spans.SpanService
 import io.embrace.android.embracesdk.internal.otel.spans.getEmbraceSpan
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.opentelemetry.api.trace.SpanBuilder
 import io.opentelemetry.api.trace.Tracer
 import io.opentelemetry.context.Context
 import io.opentelemetry.sdk.common.Clock
 
+@OptIn(ExperimentalApi::class)
 class EmbTracer(
-    private val sdkTracer: Tracer,
+    private val sdkTracer: io.embrace.opentelemetry.kotlin.tracing.Tracer,
     private val spanService: SpanService,
     private val clock: Clock,
 ) : Tracer {

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/impl/EmbTracerProvider.kt

@@ -2,14 +2,16 @@ package io.embrace.android.embracesdk.internal.otel.impl
 
 import io.embrace.android.embracesdk.internal.otel.sdk.TracerKey
 import io.embrace.android.embracesdk.internal.otel.spans.SpanService
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.opentelemetry.api.trace.Tracer
 import io.opentelemetry.api.trace.TracerBuilder
 import io.opentelemetry.api.trace.TracerProvider
 import io.opentelemetry.sdk.common.Clock
 import java.util.concurrent.ConcurrentHashMap
 
+@OptIn(ExperimentalApi::class)
 class EmbTracerProvider(
-    private val sdkTracerProvider: TracerProvider,
+    private val sdkTracerProvider: io.embrace.opentelemetry.kotlin.tracing.TracerProvider,
     private val spanService: SpanService,
     private val clock: Clock,
 ) : TracerProvider {
@@ -45,14 +47,11 @@ class EmbTracerProvider(
         return tracer
     }
 
-    private fun buildSdkTracer(key: TracerKey): Tracer {
-        val builder = sdkTracerProvider.tracerBuilder(key.instrumentationScopeName)
-        key.instrumentationScopeVersion?.apply {
-            builder.setInstrumentationVersion(this)
-        }
-        key.schemaUrl?.apply {
-            builder.setSchemaUrl(this)
-        }
-        return builder.build()
+    private fun buildSdkTracer(key: TracerKey): io.embrace.opentelemetry.kotlin.tracing.Tracer {
+        return sdkTracerProvider.getTracer(
+            name = key.instrumentationScopeName,
+            version = key.instrumentationScopeVersion,
+            schemaUrl = key.schemaUrl
+        )
     }
 }

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/TracerExt.kt

@@ -5,11 +5,13 @@ import io.embrace.android.embracesdk.internal.otel.spans.OtelSpanCreator
 import io.embrace.android.embracesdk.internal.otel.spans.OtelSpanStartArgs
 import io.embrace.android.embracesdk.spans.AutoTerminationMode
 import io.embrace.android.embracesdk.spans.EmbraceSpan
-import io.opentelemetry.api.trace.Tracer
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
+import io.embrace.opentelemetry.kotlin.tracing.Tracer
 
 /**
  * Creates a new [OtelSpanCreator] that marks the resulting span as private if [internal] is true
  */
+@OptIn(ExperimentalApi::class)
 fun Tracer.otelSpanCreator(
     name: String,
     type: EmbType,

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/spans/EmbraceSpanFactoryImpl.kt

@@ -16,20 +16,24 @@ import io.embrace.android.embracesdk.internal.otel.sdk.hasEmbraceAttribute
 import io.embrace.android.embracesdk.internal.otel.sdk.id.OtelIds
 import io.embrace.android.embracesdk.internal.otel.sdk.otelSpanCreator
 import io.embrace.android.embracesdk.internal.otel.sdk.setEmbraceAttribute
+import io.embrace.android.embracesdk.internal.otel.sdk.toStringMap
 import io.embrace.android.embracesdk.internal.otel.toEmbracePayload
-import io.embrace.android.embracesdk.internal.otel.toOtelJava
+import io.embrace.android.embracesdk.internal.otel.wrapper.KotlinSpanContextWrapper
 import io.embrace.android.embracesdk.internal.payload.Attribute
 import io.embrace.android.embracesdk.internal.utils.EmbTrace
 import io.embrace.android.embracesdk.internal.utils.truncatedStacktraceText
 import io.embrace.android.embracesdk.spans.AutoTerminationMode
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
 import io.embrace.android.embracesdk.spans.ErrorCode
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.embrace.opentelemetry.kotlin.StatusCode
+import io.embrace.opentelemetry.kotlin.k2j.tracing.SpanAdapter
+import io.embrace.opentelemetry.kotlin.k2j.tracing.SpanContextAdapter
+import io.embrace.opentelemetry.kotlin.tracing.Span
+import io.embrace.opentelemetry.kotlin.tracing.Tracer
 import io.opentelemetry.api.common.Attributes
-import io.opentelemetry.api.trace.Span
 import io.opentelemetry.api.trace.SpanContext
-import io.opentelemetry.api.trace.Tracer
 import io.opentelemetry.context.Context
 import io.opentelemetry.sdk.common.Clock
 import io.opentelemetry.semconv.ExceptionAttributes
@@ -40,6 +44,7 @@ import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.atomic.AtomicReference
 
+@OptIn(ExperimentalApi::class)
 class EmbraceSpanFactoryImpl(
     private val tracer: Tracer,
     private val openTelemetryClock: Clock,
@@ -83,6 +88,7 @@ class EmbraceSpanFactoryImpl(
     }
 }
 
+@OptIn(ExperimentalApi::class)
 private class EmbraceSpanImpl(
     private val otelSpanCreator: OtelSpanCreator,
     private val openTelemetryClock: Clock,
@@ -126,7 +132,7 @@ private class EmbraceSpanImpl(
     override val parent: EmbraceSpan? = otelSpanCreator.spanStartArgs.parentContext.getEmbraceSpan()
 
     override val spanContext: SpanContext?
-        get() = startedSpan.get()?.spanContext
+        get() = startedSpan.get()?.spanContext?.let(::KotlinSpanContextWrapper)
 
     override val traceId: String?
         get() = spanContext?.traceId
@@ -135,7 +141,7 @@ private class EmbraceSpanImpl(
         get() = spanContext?.spanId
 
     override val isRecording: Boolean
-        get() = startedSpan.get()?.isRecording == true
+        get() = startedSpan.get()?.isRecording() == true
 
     override fun start(startTimeMs: Long?): Boolean {
         EmbTrace.trace("span-start") {
@@ -151,15 +157,15 @@ private class EmbraceSpanImpl(
                 val newSpan = EmbTrace.trace("otel-span-start") {
                     otelSpanCreator.startSpan(attemptedStartTimeMs)
                 }
-                if (newSpan.isRecording) {
+                if (newSpan.isRecording()) {
                     startedSpan.set(newSpan)
                 } else {
                     return false
                 }
 
                 spanRepository.trackStartedSpan(this)
                 updatedName?.let { newName ->
-                    newSpan.updateName(newName)
+                    newSpan.name = newName
                 }
                 spanStartTimeMs = attemptedStartTimeMs
                 spanRepository.notifySpanUpdate()
@@ -196,7 +202,7 @@ private class EmbraceSpanImpl(
                     }
 
                     EmbTrace.trace("otel-span-end") {
-                        spanToStop.end(attemptedEndTimeMs, TimeUnit.MILLISECONDS)
+                        spanToStop.end(TimeUnit.MILLISECONDS.toNanos(attemptedEndTimeMs))
                     }
 
                     successful = !isRecording
@@ -272,7 +278,7 @@ private class EmbraceSpanImpl(
         startedSpan.get()?.let { sdkSpan ->
             synchronized(startedSpan) {
                 status = statusCode.toEmbracePayload()
-                sdkSpan.setStatus(statusCode.toOtelJava(), description)
+                sdkSpan.status = statusCode
                 spanRepository.notifySpanUpdate()
             }
         }
@@ -301,7 +307,7 @@ private class EmbraceSpanImpl(
             synchronized(startedSpan) {
                 if (!spanStarted() || isRecording) {
                     updatedName = newName
-                    startedSpan.get()?.updateName(newName)
+                    startedSpan.get()?.name = newName
                     spanRepository.notifySpanUpdate()
                     return true
                 }
@@ -322,7 +328,11 @@ private class EmbraceSpanImpl(
         }
 
     override fun asNewContext(): Context? = startedSpan.get()?.run {
-        otelSpanCreator.spanStartArgs.parentContext.with(this)
+        if (this is SpanAdapter) {
+            otelSpanCreator.spanStartArgs.parentContext.with(this.impl)
+        } else {
+            null
+        }
     }
 
     override fun snapshot(): io.embrace.android.embracesdk.internal.payload.Span? {
@@ -405,10 +415,10 @@ private class EmbraceSpanImpl(
 
     private fun populateAttributes(spanToStop: Span) {
         systemAttributes.forEach { systemAttribute ->
-            spanToStop.setAttribute(systemAttribute.key, systemAttribute.value)
+            spanToStop.setStringAttribute(systemAttribute.key, systemAttribute.value)
         }
         customAttributes.redactIfSensitive().forEach { attribute ->
-            spanToStop.setAttribute(attribute.key, attribute.value)
+            spanToStop.setStringAttribute(attribute.key, attribute.value)
         }
     }
 
@@ -423,14 +433,17 @@ private class EmbraceSpanImpl(
             }
 
             spanToStop.addEvent(
-                event.name,
-                eventAttributes,
-                event.timestampNanos,
-                TimeUnit.NANOSECONDS
-            )
+                name = event.name,
+                timestamp = event.timestampNanos
+            ) {
+                eventAttributes.toStringMap().forEach { entry ->
+                    setStringAttribute(entry.key, entry.value)
+                }
+            }
         }
     }
 
+    @Suppress("UNUSED_PARAMETER", "UNUSED_VARIABLE")
     private fun populateLinks(spanToStop: Span) {
         val redactedCustomLinks = customLinks.map { it.copy(attributes = it.attributes.redactIfSensitive()) }
 
@@ -440,7 +453,11 @@ private class EmbraceSpanImpl(
             } else {
                 Attributes.empty()
             }
-            spanToStop.addLink(it.spanContext, linkAttributes)
+            spanToStop.addLink(SpanContextAdapter(it.spanContext)) {
+                linkAttributes.toStringMap().forEach { entry ->
+                    setStringAttribute(entry.key, entry.value)
+                }
+            }
         }
     }
 }

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/spans/OtelSpanCreator.kt

@@ -1,27 +1,28 @@
 package io.embrace.android.embracesdk.internal.otel.spans
 
-import io.opentelemetry.api.trace.Span
-import io.opentelemetry.api.trace.Tracer
-import io.opentelemetry.context.Context
+import io.embrace.android.embracesdk.internal.otel.wrapper.KotlinContextWrapper
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
+import io.embrace.opentelemetry.kotlin.k2j.tracing.SpanContextAdapter
+import io.embrace.opentelemetry.kotlin.tracing.Span
+import io.embrace.opentelemetry.kotlin.tracing.SpanKind
+import io.embrace.opentelemetry.kotlin.tracing.Tracer
 import java.util.concurrent.TimeUnit
 
+@OptIn(ExperimentalApi::class)
 class OtelSpanCreator(
     val spanStartArgs: OtelSpanStartArgs,
     private val tracer: Tracer,
 ) {
 
     internal fun startSpan(startTimeMs: Long): Span {
         with(spanStartArgs) {
-            val builder = tracer.spanBuilder(spanName)
-            if (parentContext == Context.root()) {
-                builder.setNoParent()
-            } else {
-                builder.setParent(parentContext)
-            }
-
-            spanKind?.let(builder::setSpanKind)
-            builder.setStartTimestamp(startTimeMs, TimeUnit.MILLISECONDS)
-            return builder.startSpan()
+            return tracer.createSpan(
+                name = spanName,
+                parent = spanStartArgs.parentContext.getEmbraceSpan()?.spanContext?.let(::SpanContextAdapter),
+                spanKind = spanKind ?: SpanKind.INTERNAL,
+                startTimestamp = TimeUnit.MILLISECONDS.toNanos(startTimeMs),
+                context = KotlinContextWrapper(spanStartArgs.parentContext),
+            )
         }
     }
 }

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/spans/OtelSpanStartArgs.kt

@@ -6,7 +6,7 @@ import io.embrace.android.embracesdk.internal.otel.schema.PrivateSpan
 import io.embrace.android.embracesdk.internal.otel.sdk.toEmbraceObjectName
 import io.embrace.android.embracesdk.spans.AutoTerminationMode
 import io.embrace.android.embracesdk.spans.EmbraceSpan
-import io.opentelemetry.api.trace.SpanKind
+import io.embrace.opentelemetry.kotlin.tracing.SpanKind
 import io.opentelemetry.context.Context
 
 /**