refactor: use otel-kotlin

Author: fractalwrench

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

@@ -11,9 +11,8 @@ import io.embrace.opentelemetry.kotlin.tracing.TracerProvider
 @OptIn(ExperimentalApi::class)
 class EmbOpenTelemetry(
     private val impl: OpenTelemetry,
-    override val clock: Clock,
     traceProviderSupplier: () -> TracerProvider,
 ) : OpenTelemetry by impl {
-
+    override val clock: Clock = impl.clock
     override val tracerProvider: TracerProvider = traceProviderSupplier()
 }

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

@@ -1,9 +1,9 @@
 package io.embrace.android.embracesdk.internal.otel.impl
 
+import io.embrace.android.embracesdk.internal.clock.nanosToMillis
 import io.embrace.android.embracesdk.internal.otel.spans.EmbraceSdkSpan
 import io.embrace.android.embracesdk.internal.otel.toOtelKotlin
 import io.embrace.android.embracesdk.internal.payload.Attribute
-import io.embrace.android.embracesdk.internal.payload.Span.Status
 import io.embrace.opentelemetry.kotlin.Clock
 import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSpanContext
@@ -64,7 +64,7 @@ class EmbSpan(
 
     override fun end(timestamp: Long) {
         if (isRecording()) {
-            impl.stop(endTimeMs = timestamp)
+            impl.stop(endTimeMs = timestamp.nanosToMillis())
         }
     }
 
@@ -103,9 +103,11 @@ class EmbSpan(
         get() = impl.getStartTimeMs() ?: 0
 
     override var status: StatusCode
-        get() = impl.status.toOtelKotlin()
+        get() = impl.status
         set(value) {
-            impl.setStatus(value)
+            if (isRecording()) {
+                impl.status = value
+            }
         }
 
     override fun events(): List<SpanEvent> = impl.events().map {
@@ -145,10 +147,4 @@ class EmbSpan(
             OtelJavaTraceState.getDefault()
         ).toOtelKotlin()
     }
-
-    private fun Status.toOtelKotlin() = when (this) {
-        Status.UNSET -> StatusCode.Unset
-        Status.ERROR -> StatusCode.Error(null)
-        Status.OK -> StatusCode.Ok
-    }
 }

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

@@ -6,8 +6,8 @@ import io.embrace.android.embracesdk.internal.otel.config.OtelSdkConfig
 import io.embrace.android.embracesdk.internal.otel.config.getMaxTotalAttributeCount
 import io.embrace.android.embracesdk.internal.otel.config.getMaxTotalEventCount
 import io.embrace.android.embracesdk.internal.otel.config.getMaxTotalLinkCount
-import io.embrace.android.embracesdk.internal.otel.impl.EmbOtelJavaOpenTelemetry
-import io.embrace.android.embracesdk.internal.otel.impl.EmbOtelJavaTracerProvider
+import io.embrace.android.embracesdk.internal.otel.impl.EmbOpenTelemetry
+import io.embrace.android.embracesdk.internal.otel.impl.EmbTracerProvider
 import io.embrace.android.embracesdk.internal.otel.logs.DefaultLogRecordProcessor
 import io.embrace.android.embracesdk.internal.otel.spans.DefaultSpanProcessor
 import io.embrace.android.embracesdk.internal.otel.spans.SpanService
@@ -17,7 +17,7 @@ import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.embrace.opentelemetry.kotlin.OpenTelemetry
 import io.embrace.opentelemetry.kotlin.OpenTelemetryInstance
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaOpenTelemetry
-import io.embrace.opentelemetry.kotlin.aliases.OtelJavaTracerProvider
+import io.embrace.opentelemetry.kotlin.compatWithOtelKotlin
 import io.embrace.opentelemetry.kotlin.kotlinApi
 import io.embrace.opentelemetry.kotlin.logging.Logger
 import io.embrace.opentelemetry.kotlin.tracing.Tracer
@@ -88,16 +88,10 @@ class OtelSdkWrapper(
     }
 
     val openTelemetryJava: OtelJavaOpenTelemetry by lazy {
-        EmbOtelJavaOpenTelemetry(
-            traceProviderSupplier = { externalTracerProvider }
-        )
-    }
-
-    private val externalTracerProvider: OtelJavaTracerProvider by lazy {
-        EmbOtelJavaTracerProvider(
-            sdkTracerProvider = kotlinApi.tracerProvider,
-            spanService = spanService,
-            clock = otelClock,
+        OpenTelemetryInstance.compatWithOtelKotlin(
+            EmbOpenTelemetry(kotlinApi) {
+                EmbTracerProvider(kotlinApi.tracerProvider, spanService, otelClock)
+            }
         )
     }
 }