Skip to content

Commit 525be4c

Browse files
committed
refactor: switch otel java implementation to wrap kotlin api
1 parent 2c224ee commit 525be4c

File tree

24 files changed

+108
-670
lines changed

24 files changed

+108
-670
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ internal class OpenTelemetryModuleImpl(
6161
try {
6262
OtelSdkWrapper(
6363
otelClock = openTelemetryClock,
64-
configuration = otelSdkConfig,
65-
spanService = spanService
64+
configuration = otelSdkConfig
6665
)
6766
} catch (exc: NoClassDefFoundError) {
6867
throw LinkageError(

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ import io.embrace.opentelemetry.kotlin.tracing.TracerProvider
1111
@OptIn(ExperimentalApi::class)
1212
class EmbOpenTelemetry(
1313
private val impl: OpenTelemetry,
14-
override val clock: Clock,
1514
traceProviderSupplier: () -> TracerProvider,
1615
) : OpenTelemetry by impl {
17-
16+
override val clock: Clock = impl.clock
1817
override val tracerProvider: TracerProvider = traceProviderSupplier()
1918
}

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 0 additions & 77 deletions
This file was deleted.

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

Lines changed: 0 additions & 73 deletions
This file was deleted.

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 0 additions & 59 deletions
This file was deleted.

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.embrace.android.embracesdk.internal.otel.impl
22

3+
import io.embrace.android.embracesdk.internal.clock.nanosToMillis
34
import io.embrace.android.embracesdk.internal.otel.spans.EmbraceSdkSpan
45
import io.embrace.android.embracesdk.internal.otel.toOtelKotlin
56
import io.embrace.android.embracesdk.internal.payload.Attribute
@@ -57,7 +58,7 @@ class EmbSpan(
5758
setStringAttribute(key, value.toString())
5859
}
5960

60-
override fun end(): Unit = end(timestamp = clock.now())
61+
override fun end(): Unit = end(timestamp = clock.now().nanosToMillis())
6162

6263
override fun end(timestamp: Long) {
6364
if (isRecording()) {
@@ -102,7 +103,9 @@ class EmbSpan(
102103
override var status: StatusCode
103104
get() = impl.status.toOtelKotlin()
104105
set(value) {
105-
impl.setStatus(value)
106+
if (isRecording()) {
107+
impl.setStatus(value)
108+
}
106109
}
107110

108111
override fun events(): List<SpanEvent> = impl.events().map {

0 commit comments

Comments
 (0)