Integration branch for Kotlin OTel API

embrace-android-api/build.gradle.kts

@@ -17,6 +17,6 @@ android {
 dependencies {
     compileOnly(platform(libs.opentelemetry.bom))
     compileOnly(libs.opentelemetry.api)
-    compileOnly(libs.opentelemetry.sdk)
     implementation(libs.lifecycle.process)
+    implementation(libs.opentelemetry.java.aliases)
 }

embrace-android-api/src/main/kotlin/io/embrace/android/embracesdk/internal/api/OTelApi.kt

@@ -1,12 +1,10 @@
 package io.embrace.android.embracesdk.internal.api
 
 import io.embrace.android.embracesdk.annotation.InternalApi
-import io.opentelemetry.api.OpenTelemetry
-import io.opentelemetry.api.common.AttributeKey
-import io.opentelemetry.api.trace.Tracer
-import io.opentelemetry.sdk.logs.export.LogRecordExporter
-import io.opentelemetry.sdk.resources.Resource
-import io.opentelemetry.sdk.trace.export.SpanExporter
+import io.embrace.opentelemetry.kotlin.aliases.OtelJavaAttributeKey
+import io.embrace.opentelemetry.kotlin.aliases.OtelJavaLogRecordExporter
+import io.embrace.opentelemetry.kotlin.aliases.OtelJavaOpenTelemetry
+import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSpanExporter
 
 /**
  * Methods that enable integration with the the large OTel ecosystem through standard OTel APIs and concepts.
@@ -17,26 +15,26 @@ public interface OTelApi {
     /**
      * Add a [LogRecordExporter] that OTel Logs will be exported to after logging
      */
-    public fun addLogRecordExporter(logRecordExporter: LogRecordExporter)
+    public fun addLogRecordExporter(logRecordExporter: OtelJavaLogRecordExporter)
 
     /**
      * Adds a [SpanExporter] that OTel Spans will be exported to after completion
      */
-    public fun addSpanExporter(spanExporter: SpanExporter)
+    public fun addSpanExporter(spanExporter: OtelJavaSpanExporter)
 
     /**
      * Returns an [OpenTelemetry] that provides working [Tracer] implementations that will record spans that fit into the Embrace data
      * model.
      */
-    public fun getOpenTelemetry(): OpenTelemetry
+    public fun getOpenTelemetry(): OtelJavaOpenTelemetry
 
     /**
      * Set an attribute on the [Resource] used by the OTel SDK instance with the given [AttributeKey] key and String value.
      * The value set will override any value set previously or by the Embrace SDK.
      * This must be called before the SDK is started in order for it to take effect.
      */
     public fun setResourceAttribute(
-        key: AttributeKey<String>,
+        key: OtelJavaAttributeKey<String>,
         value: String
     ): Unit = setResourceAttribute(key.key, value)
 

embrace-android-api/src/main/kotlin/io/embrace/android/embracesdk/spans/EmbraceSpan.kt

@@ -1,7 +1,6 @@
 package io.embrace.android.embracesdk.spans
 
-import io.opentelemetry.api.common.Attributes
-import io.opentelemetry.api.trace.SpanContext
+import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSpanContext
 
 /**
  * Represents a Span that can be started and stopped with the appropriate [ErrorCode] if applicable. This wraps the OpenTelemetry Span
@@ -12,7 +11,7 @@ public interface EmbraceSpan {
     /**
      * The [SpanContext] for this [EmbraceSpan] instance. This is null if the span has not been started.
      */
-    public val spanContext: SpanContext?
+    public val spanContext: OtelJavaSpanContext?
 
     /**
      * ID of the Trace that this Span belongs to. The format adheres to the OpenTelemetry standard for Trace IDs
@@ -141,7 +140,7 @@ public interface EmbraceSpan {
      * Add a link to the span with the given [SpanContext]
      */
     public fun addLink(
-        linkedSpanContext: SpanContext
+        linkedSpanContext: OtelJavaSpanContext
     ): Boolean = addLink(linkedSpanContext = linkedSpanContext, attributes = null)
 
     /**
@@ -159,5 +158,5 @@ public interface EmbraceSpan {
     /**
      * Add a link to the span with the given [SpanContext] with the given attributes
      */
-    public fun addLink(linkedSpanContext: SpanContext, attributes: Map<String, String>?): Boolean
+    public fun addLink(linkedSpanContext: OtelJavaSpanContext, attributes: Map<String, String>?): Boolean
 }

embrace-android-core/build.gradle.kts

@@ -43,6 +43,11 @@ dependencies {
     implementation(libs.lifecycle.process)
     implementation(libs.okhttp)
 
+    implementation(libs.opentelemetry.kotlin.api)
+    implementation(libs.opentelemetry.kotlin.api.ext)
+    implementation(libs.opentelemetry.kotlin.compat)
+    implementation(libs.opentelemetry.java.aliases)
+
     testImplementation(platform(libs.opentelemetry.bom))
     testImplementation(libs.opentelemetry.api)
     testImplementation(libs.opentelemetry.sdk)

embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/arch/destination/LogWriterImpl.kt

@@ -1,25 +1,23 @@
 package io.embrace.android.embracesdk.internal.arch.destination
 
+import io.embrace.android.embracesdk.Severity
 import io.embrace.android.embracesdk.internal.arch.schema.SchemaType
 import io.embrace.android.embracesdk.internal.clock.Clock
-import io.embrace.android.embracesdk.internal.otel.attrs.asOtelAttributeKey
 import io.embrace.android.embracesdk.internal.otel.attrs.embState
 import io.embrace.android.embracesdk.internal.otel.schema.PrivateSpan
-import io.embrace.android.embracesdk.internal.otel.sdk.setAttribute
-import io.embrace.android.embracesdk.internal.otel.sdk.setEmbraceAttribute
-import io.embrace.android.embracesdk.internal.otel.sdk.toOtelSeverity
 import io.embrace.android.embracesdk.internal.session.id.SessionIdTracker
 import io.embrace.android.embracesdk.internal.session.lifecycle.EmbraceProcessStateService.Companion.BACKGROUND_STATE
 import io.embrace.android.embracesdk.internal.session.lifecycle.EmbraceProcessStateService.Companion.FOREGROUND_STATE
 import io.embrace.android.embracesdk.internal.session.lifecycle.ProcessStateService
 import io.embrace.android.embracesdk.internal.utils.Uuid
-import io.opentelemetry.api.common.AttributeKey
-import io.opentelemetry.api.logs.Logger
-import io.opentelemetry.api.logs.Severity
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
+import io.embrace.opentelemetry.kotlin.logging.Logger
+import io.embrace.opentelemetry.kotlin.logging.SeverityNumber
 import io.opentelemetry.semconv.incubating.LogIncubatingAttributes
 import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 import java.util.concurrent.TimeUnit
 
+@OptIn(ExperimentalApi::class)
 class LogWriterImpl(
     private val logger: Logger,
     private val sessionIdTracker: SessionIdTracker,
@@ -36,45 +34,49 @@ class LogWriterImpl(
         timestampMs: Long?,
     ) {
         val logTimeMs = timestampMs ?: clock.now()
-        val otelSeverity = severity.toOtelSeverity()
-        val builder = logger.logRecordBuilder()
-            .setBody(message)
-            .setSeverity(otelSeverity)
-            .setSeverityText(getSeverityText(otelSeverity))
-            .setTimestamp(logTimeMs, TimeUnit.MILLISECONDS)
-
-        builder.setAttribute(LogIncubatingAttributes.LOG_RECORD_UID, Uuid.getEmbUuid())
+        val severityNumber = when (severity) {
+            Severity.INFO -> SeverityNumber.INFO
+            Severity.WARNING -> SeverityNumber.WARN
+            Severity.ERROR -> SeverityNumber.ERROR
+        }
+        logger.log(
+            body = message,
+            severityNumber = severityNumber,
+            severityText = getSeverityText(severityNumber),
+            timestampNs = TimeUnit.MILLISECONDS.toNanos(logTimeMs)
+        ) {
+            setStringAttribute(LogIncubatingAttributes.LOG_RECORD_UID.key, Uuid.getEmbUuid())
 
-        if (addCurrentSessionInfo) {
-            var sessionState: String? = null
-            sessionIdTracker.getActiveSession()?.let { session ->
-                builder.setAttribute(SessionIncubatingAttributes.SESSION_ID, session.id, false)
-                sessionState = if (session.isForeground) {
-                    FOREGROUND_STATE
-                } else {
-                    BACKGROUND_STATE
+            if (addCurrentSessionInfo) {
+                var sessionState: String? = null
+                sessionIdTracker.getActiveSession()?.let { session ->
+                    if (session.id.isNotBlank()) {
+                        setStringAttribute(SessionIncubatingAttributes.SESSION_ID.key, session.id)
+                    }
+                    sessionState = if (session.isForeground) {
+                        FOREGROUND_STATE
+                    } else {
+                        BACKGROUND_STATE
+                    }
                 }
+                setStringAttribute(embState.name, sessionState ?: processStateService.getAppState())
             }
 
-            builder.setAttribute(embState.asOtelAttributeKey(), sessionState ?: processStateService.getAppState())
-        }
-
-        if (isPrivate) {
-            builder.setEmbraceAttribute(PrivateSpan)
-        }
+            if (isPrivate) {
+                setStringAttribute(PrivateSpan.key.name, PrivateSpan.value)
+            }
 
-        with(schemaType) {
-            builder.setEmbraceAttribute(telemetryType)
-            attributes().forEach {
-                builder.setAttribute(AttributeKey.stringKey(it.key), it.value)
+            with(schemaType) {
+                setStringAttribute(telemetryType.key.name, telemetryType.value)
+                attributes().forEach {
+                    setStringAttribute(it.key, it.value)
+                }
             }
         }
-
-        builder.emit()
     }
 
-    private fun getSeverityText(severity: Severity) = when (severity) {
-        Severity.WARN -> "WARNING"
+    private fun getSeverityText(severity: SeverityNumber) = when (severity) {
+        SeverityNumber.WARN -> "WARNING"
         else -> severity.name
     }
 }

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

@@ -18,7 +18,9 @@ import io.embrace.android.embracesdk.internal.session.lifecycle.ProcessStateServ
 import io.embrace.android.embracesdk.internal.utils.EmbTrace
 import io.embrace.android.embracesdk.internal.utils.Provider
 import io.embrace.android.embracesdk.internal.worker.Worker
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
 
+@OptIn(ExperimentalApi::class)
 class EssentialServiceModuleImpl(
     initModule: InitModule,
     configModule: ConfigModule,

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

@@ -3,7 +3,6 @@ package io.embrace.android.embracesdk.internal.injection
 import io.embrace.android.embracesdk.internal.SystemInfo
 import io.embrace.android.embracesdk.internal.clock.Clock
 import io.embrace.android.embracesdk.internal.clock.NormalizedIntervalClock
-import io.embrace.android.embracesdk.internal.clock.SystemClock
 import io.embrace.android.embracesdk.internal.config.instrumented.InstrumentedConfigImpl
 import io.embrace.android.embracesdk.internal.config.instrumented.schema.InstrumentedConfig
 import io.embrace.android.embracesdk.internal.logging.EmbLogger
@@ -16,7 +15,7 @@ import io.embrace.android.embracesdk.internal.telemetry.EmbraceTelemetryService
 import io.embrace.android.embracesdk.internal.telemetry.TelemetryService
 
 internal class InitModuleImpl(
-    override val clock: Clock = NormalizedIntervalClock(systemClock = SystemClock()),
+    override val clock: Clock = NormalizedIntervalClock(),
     override val logger: EmbLogger = EmbLoggerImpl(),
     override val systemInfo: SystemInfo = SystemInfo(),
     override val processIdentifierProvider: () -> String = IdGenerator.Companion::generateLaunchInstanceId,

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

@@ -4,7 +4,6 @@ import android.content.Context
 import io.embrace.android.embracesdk.internal.SystemInfo
 import io.embrace.android.embracesdk.internal.clock.Clock
 import io.embrace.android.embracesdk.internal.clock.NormalizedIntervalClock
-import io.embrace.android.embracesdk.internal.clock.SystemClock
 import io.embrace.android.embracesdk.internal.logging.EmbLogger
 import io.embrace.android.embracesdk.internal.logging.EmbLoggerImpl
 
@@ -17,7 +16,7 @@ typealias InitModuleSupplier = (
 ) -> InitModule
 
 fun createInitModule(
-    clock: Clock = NormalizedIntervalClock(systemClock = SystemClock()),
+    clock: Clock = NormalizedIntervalClock(),
     logger: EmbLogger = EmbLoggerImpl(),
     systemInfo: SystemInfo = SystemInfo(),
 ): InitModule = InitModuleImpl(clock, logger, systemInfo)

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

@@ -9,14 +9,17 @@ import io.embrace.android.embracesdk.internal.otel.spans.SpanSink
 import io.embrace.android.embracesdk.internal.spans.CurrentSessionSpan
 import io.embrace.android.embracesdk.internal.spans.EmbraceTracer
 import io.embrace.android.embracesdk.internal.spans.InternalTracer
-import io.opentelemetry.api.OpenTelemetry
-import io.opentelemetry.api.logs.Logger
-import io.opentelemetry.api.trace.Tracer
-import io.opentelemetry.api.trace.TracerProvider
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
+import io.embrace.opentelemetry.kotlin.aliases.OtelJavaClock
+import io.embrace.opentelemetry.kotlin.aliases.OtelJavaOpenTelemetry
+import io.embrace.opentelemetry.kotlin.aliases.OtelJavaTracerProvider
+import io.embrace.opentelemetry.kotlin.logging.Logger
+import io.embrace.opentelemetry.kotlin.tracing.Tracer
 
 /**
  * Module that instantiates various OpenTelemetry related components
  */
+@OptIn(ExperimentalApi::class)
 interface OpenTelemetryModule {
 
     /**
@@ -74,17 +77,17 @@ interface OpenTelemetryModule {
      * Embrace APIs. Currently, only the APIs related [Tracer] have operational implementations. Every other method will return no-op
      * implementations that records no data.
      */
-    val externalOpenTelemetry: OpenTelemetry
+    val externalOpenTelemetry: OtelJavaOpenTelemetry
 
     /**
      * Provides [Tracer] instances for instrumentation external to the Embrace SDK to create spans
      */
-    val externalTracerProvider: TracerProvider
+    val externalTracerProvider: OtelJavaTracerProvider
 
     /**
      * OpenTelemetry SDK compatible clock based on the internal Embrace clock instance
      */
-    val openTelemetryClock: io.opentelemetry.sdk.common.Clock
+    val openTelemetryClock: OtelJavaClock
 
     /**
      * Setup configuration configuration-dependent behavior

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

@@ -4,9 +4,9 @@ import io.embrace.android.embracesdk.core.BuildConfig
 import io.embrace.android.embracesdk.internal.config.behavior.REDACTED_LABEL
 import io.embrace.android.embracesdk.internal.config.behavior.SensitiveKeysBehavior
 import io.embrace.android.embracesdk.internal.otel.config.OtelSdkConfig
-import io.embrace.android.embracesdk.internal.otel.impl.EmbClock
-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.impl.EmbOtelJavaClock
+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.logs.LogSink
 import io.embrace.android.embracesdk.internal.otel.logs.LogSinkImpl
 import io.embrace.android.embracesdk.internal.otel.sdk.DataValidator
@@ -23,15 +23,17 @@ import io.embrace.android.embracesdk.internal.spans.CurrentSessionSpanImpl
 import io.embrace.android.embracesdk.internal.spans.EmbraceTracer
 import io.embrace.android.embracesdk.internal.spans.InternalTracer
 import io.embrace.android.embracesdk.internal.utils.EmbTrace
-import io.opentelemetry.api.OpenTelemetry
-import io.opentelemetry.api.logs.Logger
-import io.opentelemetry.api.trace.Tracer
-import io.opentelemetry.api.trace.TracerProvider
-import io.opentelemetry.sdk.common.Clock
-
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
+import io.embrace.opentelemetry.kotlin.aliases.OtelJavaClock
+import io.embrace.opentelemetry.kotlin.aliases.OtelJavaOpenTelemetry
+import io.embrace.opentelemetry.kotlin.aliases.OtelJavaTracerProvider
+import io.embrace.opentelemetry.kotlin.logging.Logger
+import io.embrace.opentelemetry.kotlin.tracing.Tracer
+
+@OptIn(ExperimentalApi::class)
 internal class OpenTelemetryModuleImpl(
     private val initModule: InitModule,
-    override val openTelemetryClock: Clock = EmbClock(
+    override val openTelemetryClock: OtelJavaClock = EmbOtelJavaClock(
         embraceClock = initModule.clock
     ),
 ) : OpenTelemetryModule {
@@ -137,21 +139,25 @@ internal class OpenTelemetryModuleImpl(
     }
 
     override val logger: Logger by lazy {
-        otelSdkWrapper.getOpenTelemetryLogger()
+        EmbTrace.trace("otel-logger-init") {
+            otelSdkWrapper.kotlinApi.loggerProvider.getLogger(
+                name = otelSdkConfig.sdkName
+            )
+        }
     }
 
     override val logSink: LogSink by lazy {
         LogSinkImpl()
     }
 
-    override val externalOpenTelemetry: OpenTelemetry by lazy {
-        EmbOpenTelemetry(
+    override val externalOpenTelemetry: OtelJavaOpenTelemetry by lazy {
+        EmbOtelJavaOpenTelemetry(
             traceProviderSupplier = { externalTracerProvider }
         )
     }
 
-    override val externalTracerProvider: TracerProvider by lazy {
-        EmbTracerProvider(
+    override val externalTracerProvider: OtelJavaTracerProvider by lazy {
+        EmbOtelJavaTracerProvider(
             sdkTracerProvider = otelSdkWrapper.sdkTracerProvider,
             spanService = spanService,
             clock = openTelemetryClock,