Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSdkTracerProvider
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSpanLimits
import io.embrace.opentelemetry.kotlin.compatWithOtelJava
import io.embrace.opentelemetry.kotlin.j2k.logging.export.OtelJavaLogRecordExporterAdapter
import io.embrace.opentelemetry.kotlin.j2k.tracing.export.OtelJavaSpanExporterAdapter
import io.embrace.opentelemetry.kotlin.kotlinApi
import io.embrace.opentelemetry.kotlin.tracing.Tracer

Expand Down Expand Up @@ -97,14 +99,14 @@
* Creates an instance of opentelemetry-kotlin using the Kotlin API's DSL, rather than the opentelemetry-java
* API.
*/
@Suppress("unused", "UNREACHABLE_CODE")
@Suppress("unused")
private val kotlinApiViaDsl: OpenTelemetry by lazy {
OpenTelemetryInstance.kotlinApi(
loggerProvider = {
resource(configuration.resourceAction)
addLogRecordProcessor(
DefaultLogRecordProcessor(
TODO()
OtelJavaLogRecordExporterAdapter(configuration.otelJavaLogRecordExporter)

Check warning on line 109 in embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/OtelSdkWrapper.kt

View check run for this annotation

Codecov / codecov/patch

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/OtelSdkWrapper.kt#L109

Added line #L109 was not covered by tests
)
)
},
Expand All @@ -117,7 +119,7 @@
}
addSpanProcessor(
DefaultSpanProcessor(
TODO(),
OtelJavaSpanExporterAdapter(configuration.otelJavaSpanExporter),

Check warning on line 122 in embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/OtelSdkWrapper.kt

View check run for this annotation

Codecov / codecov/patch

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/OtelSdkWrapper.kt#L122

Added line #L122 was not covered by tests
configuration.processIdentifier
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@

override fun forceFlush(): OperationResultCode = OperationResultCode.Success
override fun shutdown(): OperationResultCode = OperationResultCode.Success
override fun isEndRequired(): Boolean = true
override fun isStartRequired(): Boolean = true

Check warning on line 38 in embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/spans/DefaultSpanProcessor.kt

View check run for this annotation

Codecov / codecov/patch

embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/spans/DefaultSpanProcessor.kt#L37-L38

Added lines #L37 - L38 were not covered by tests
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package io.embrace.android.embracesdk.internal.otel.wrapper

import io.embrace.opentelemetry.kotlin.ExperimentalApi
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSpanContext
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaTraceFlags
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaTraceState
import io.embrace.opentelemetry.kotlin.tracing.model.SpanContext

@OptIn(ExperimentalApi::class)
class KotlinSpanContextWrapper(
private val impl: SpanContext,
) : OtelJavaSpanContext {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package io.embrace.android.embracesdk.internal.otel.wrapper

import android.os.Build
import io.embrace.opentelemetry.kotlin.ExperimentalApi
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaTraceState
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaTraceStateBuilder
import io.embrace.opentelemetry.kotlin.tracing.model.TraceState
import java.util.function.BiConsumer

@OptIn(ExperimentalApi::class)
class KotlinTraceStateWrapper(
private val impl: TraceState,
) : OtelJavaTraceState {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,26 @@ package io.embrace.android.embracesdk.fakes

import io.embrace.opentelemetry.kotlin.ExperimentalApi
import io.embrace.opentelemetry.kotlin.InstrumentationScopeInfo
import io.embrace.opentelemetry.kotlin.attributes.AttributeContainer
import io.embrace.opentelemetry.kotlin.context.Context
import io.embrace.opentelemetry.kotlin.logging.model.ReadWriteLogRecord
import io.embrace.opentelemetry.kotlin.logging.model.SeverityNumber
import io.embrace.opentelemetry.kotlin.resource.Resource
import io.embrace.opentelemetry.kotlin.tracing.model.TraceFlags
import io.embrace.opentelemetry.kotlin.tracing.model.SpanContext

@OptIn(ExperimentalApi::class)
class FakeReadWriteLogRecord : ReadWriteLogRecord {
override val attributes: MutableMap<String, Any> = mutableMapOf()
class FakeReadWriteLogRecord(
private val attributeContainer: AttributeContainer = FakeAttributeContainer()
) : ReadWriteLogRecord, AttributeContainer by attributeContainer {

override var body: String? = null
override val context: Context? = null
override val instrumentationScopeInfo: InstrumentationScopeInfo? = null
override var observedTimestamp: Long? = null
override val resource: Resource? = null
override var severityNumber: SeverityNumber? = null
override var severityText: String? = null
override var spanId: String? = null
override var timestamp: Long? = null
override var traceFlags: TraceFlags? = null
override var traceId: String? = null
override var spanContext: SpanContext = FakeSpanContext()
override val attributes: Map<String, Any> = attributeContainer.attributes()
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ class FakeReadWriteSpan(
get() = throw UnsupportedOperationException()

override fun hasEnded(): Boolean = true
override val endTimestamp: Long? = null
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package io.embrace.android.embracesdk.fakes

import io.embrace.opentelemetry.kotlin.ExperimentalApi
import io.embrace.opentelemetry.kotlin.tracing.model.SpanContext
import io.embrace.opentelemetry.kotlin.tracing.model.TraceFlags
import io.embrace.opentelemetry.kotlin.tracing.model.TraceState

@ExperimentalApi
class FakeSpanContext : SpanContext {
override val isRemote: Boolean = false
override val isValid: Boolean = false
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ openTelemetryCore = "1.51.0"
openTelementrySemConv = "1.29.0-alpha"
moshi = "1.15.2"
lifecycle = "2.7.0" # version pinned to 2.7.0 because of AGP bug
otelKotlin = "0.1.4"
otelKotlin = "0.2.0"
protobuf = "4.31.1"
profileinstaller = "1.3.1" # version pinned to 1.3.1 because of AGP bug
okhttp = "4.12.0"
Expand Down Expand Up @@ -85,7 +85,7 @@ apktool-lib = { module = "org.apktool:apktool-lib", version.ref = "apktoolLib" }
bundletool = { module = "com.android.tools.build:bundletool", version.ref = "bundletool" }
opentelemetry-kotlin-api = { module = "io.embrace.opentelemetry.kotlin:opentelemetry-kotlin-api", version.ref = "otelKotlin" }
opentelemetry-kotlin-api-ext = { module = "io.embrace.opentelemetry.kotlin:opentelemetry-kotlin-api-ext", version.ref = "otelKotlin" }
opentelemetry-kotlin-compat = { module = "io.embrace.opentelemetry.kotlin:compat-kotlin-to-official", version.ref = "otelKotlin" }
opentelemetry-kotlin-compat = { module = "io.embrace.opentelemetry.kotlin:opentelemetry-kotlin-compat", version.ref = "otelKotlin" }
opentelemetry-java-aliases = { module = "io.embrace.opentelemetry.kotlin:opentelemetry-java-typealiases", version.ref = "otelKotlin" }

[plugins]
Expand Down
Loading