Skip to content

Commit 42828b4

Browse files
fractalwrenchfractalwrench
authored
Merge pull request #2287 from embrace-io/otel-kotlin-bump
Bump opentelemetry-kotlin
2 parents 1e4b6cb + 26f60dc commit 42828b4

File tree

72 files changed

+701
-439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+701
-439
lines changed

‎embrace-android-core/lint-baseline.xml‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<issues format="6" by="lint 8.9.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.9.2)" variant="all" version="8.9.2">
2+
<issues format="6" by="lint 8.10.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.10.1)" variant="all" version="8.10.1">
3+
4+
<issue
5+
id="TrimLambda"
6+
message="The lambda argument (`{ it &lt;= &apos; &apos; }`) is unnecessary"
7+
errorLine1=" packageInfo.versionName.toString().trim { it &lt;= &apos; &apos; }"
8+
errorLine2=" ~~~~~~~~~~~~~">
9+
<location
10+
file="src/main/kotlin/io/embrace/android/embracesdk/internal/injection/PackageVersionInfo.kt"
11+
line="15"
12+
column="49"/>
13+
</issue>
14+
15+
<issue
16+
id="TrimLambda"
17+
message="The lambda argument (`{ it &lt;= &apos; &apos; }`) is unnecessary"
18+
errorLine1=" packageInfo.versionName.toString().trim { it &lt;= &apos; &apos; }"
19+
errorLine2=" ~~~~~~~~~~~~~">
20+
<location
21+
file="src/main/kotlin/io/embrace/android/embracesdk/internal/injection/PackageVersionInfo.kt"
22+
line="15"
23+
column="49"/>
24+
</issue>
325

426
<issue
527
id="EmbracePublicApiPackageRule"
@@ -12,15 +34,4 @@
1234
column="12"/>
1335
</issue>
1436

15-
<issue
16-
id="UnclosedTrace"
17-
message="The `beginSection()` call is not always closed with a matching `endSection()` because the code in between may return early"
18-
errorLine1=" Trace.beginSection(&quot;emb-$name&quot;.take(127))"
19-
errorLine2=" ~~~~~~~~~~~~">
20-
<location
21-
file="src/main/kotlin/io/embrace/android/embracesdk/internal/EmbTrace.kt"
22-
line="47"
23-
column="19"/>
24-
</issue>
25-
2637
</issues>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import io.embrace.android.embracesdk.internal.session.lifecycle.ProcessStateServ
1212
import io.embrace.android.embracesdk.internal.utils.Uuid
1313
import io.embrace.opentelemetry.kotlin.ExperimentalApi
1414
import io.embrace.opentelemetry.kotlin.logging.Logger
15-
import io.embrace.opentelemetry.kotlin.logging.SeverityNumber
15+
import io.embrace.opentelemetry.kotlin.logging.model.SeverityNumber
1616
import io.opentelemetry.semconv.incubating.LogIncubatingAttributes
1717
import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
1818
import java.util.concurrent.TimeUnit

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import io.embrace.android.embracesdk.internal.spans.EmbraceTracer
2424
import io.embrace.android.embracesdk.internal.spans.InternalTracer
2525
import io.embrace.android.embracesdk.internal.utils.EmbTrace
2626
import io.embrace.opentelemetry.kotlin.ExperimentalApi
27-
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaClock
2827
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaOpenTelemetry
2928
import io.embrace.opentelemetry.kotlin.aliases.OtelJavaTracerProvider
3029
import io.embrace.opentelemetry.kotlin.logging.Logger
@@ -33,7 +32,7 @@ import io.embrace.opentelemetry.kotlin.tracing.Tracer
3332
@OptIn(ExperimentalApi::class)
3433
internal class OpenTelemetryModuleImpl(
3534
private val initModule: InitModule,
36-
override val openTelemetryClock: OtelJavaClock = EmbOtelJavaClock(
35+
override val openTelemetryClock: EmbOtelJavaClock = EmbOtelJavaClock(
3736
embraceClock = initModule.clock
3837
),
3938
) : OpenTelemetryModule {
@@ -61,7 +60,7 @@ internal class OpenTelemetryModuleImpl(
6160
EmbTrace.trace("otel-sdk-wrapper-init") {
6261
try {
6362
OtelSdkWrapper(
64-
openTelemetryClock = openTelemetryClock,
63+
otelClock = openTelemetryClock,
6564
configuration = otelSdkConfig
6665
)
6766
} catch (exc: NoClassDefFoundError) {

‎embrace-android-core/src/test/java/io/embrace/android/embracesdk/internal/arch/destination/LogWriterImplTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ internal class LogWriterImplTest {
6767
assertNotNull(attributes()[embState.name])
6868
assertNotNull(attributes()[LogIncubatingAttributes.LOG_RECORD_UID.key])
6969
assertTrue(attributes()[PrivateSpan.key.name] != null)
70-
assertEquals(clock.now().millisToNanos(), timestampNs)
71-
assertNull(observedTimestampNs)
70+
assertEquals(clock.now().millisToNanos(), timestamp)
71+
assertNull(observedTimestamp)
7272
}
7373
}
7474

@@ -160,8 +160,8 @@ internal class LogWriterImplTest {
160160
)
161161

162162
with(logger.logs.last()) {
163-
assertEquals(fakeTimeMs.millisToNanos(), timestampNs)
164-
assertNull(observedTimestampNs)
163+
assertEquals(fakeTimeMs.millisToNanos(), timestamp)
164+
assertNull(observedTimestamp)
165165
}
166166
}
167167

‎embrace-android-core/src/test/java/io/embrace/android/embracesdk/internal/config/ConfigServiceImplTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package io.embrace.android.embracesdk.internal.config
33
import io.embrace.android.embracesdk.concurrency.BlockingScheduledExecutorService
44
import io.embrace.android.embracesdk.core.BuildConfig
55
import io.embrace.android.embracesdk.fakes.FakeClock
6-
import io.embrace.android.embracesdk.fakes.FakeLogRecordExporter
6+
import io.embrace.android.embracesdk.fakes.FakeOtelJavaLogRecordExporter
77
import io.embrace.android.embracesdk.fakes.FakePreferenceService
88
import io.embrace.android.embracesdk.fakes.FakeProcessStateService
99
import io.embrace.android.embracesdk.fakes.config.FakeInstrumentedConfig
@@ -160,7 +160,7 @@ internal class ConfigServiceImplTest {
160160
BuildConfig.VERSION_NAME,
161161
SystemInfo()
162162
)
163-
cfg.addLogExporter(FakeLogRecordExporter())
163+
cfg.addLogExporter(FakeOtelJavaLogRecordExporter())
164164
val service = createService(config = cfg, appId = null)
165165
assertNotNull(service)
166166
assertTrue(service.isOnlyUsingOtelExporters())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import io.embrace.android.embracesdk.internal.otel.spans.SpanService
1616
import io.embrace.android.embracesdk.internal.otel.spans.SpanSink
1717
import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
1818
import io.embrace.android.embracesdk.spans.ErrorCode
19-
import io.embrace.opentelemetry.kotlin.StatusCode
19+
import io.embrace.opentelemetry.kotlin.tracing.StatusCode
2020
import org.junit.Assert.assertEquals
2121
import org.junit.Assert.assertNotNull
2222
import org.junit.Assert.assertNull

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import io.embrace.android.embracesdk.internal.otel.spans.EmbraceSpanData
1212
import io.embrace.android.embracesdk.internal.otel.spans.SpanService
1313
import io.embrace.android.embracesdk.internal.otel.spans.SpanSink
1414
import io.embrace.android.embracesdk.spans.ErrorCode
15-
import io.embrace.opentelemetry.kotlin.StatusCode
15+
import io.embrace.opentelemetry.kotlin.tracing.StatusCode
1616
import org.junit.Assert.assertEquals
1717
import org.junit.Assert.assertFalse
1818
import org.junit.Assert.assertNotNull

‎embrace-android-features/src/test/java/io/embrace/android/embracesdk/internal/ndk/NativeCrashDataSourceImplTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ internal class NativeCrashDataSourceImplTest {
9494
)
9595

9696
with(otelLogger.logs.single()) {
97-
assertEquals(testNativeCrashData.timestamp, timestampNs?.nanosToMillis())
98-
assertNull(observedTimestampNs?.nanosToMillis())
97+
assertEquals(testNativeCrashData.timestamp, timestamp?.nanosToMillis())
98+
assertNull(observedTimestamp?.nanosToMillis())
9999
assertTrue(attributes()[EmbType.System.NativeCrash.key.name] != null)
100100
assertEquals("value", attributes()["prop".toSessionPropertyAttributeName()])
101101
assertEquals("background", attributes()[embState.name])

‎embrace-android-otel/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ dependencies {
3636
implementation(libs.opentelemetry.kotlin.api)
3737
implementation(libs.opentelemetry.kotlin.api.ext)
3838
implementation(libs.opentelemetry.kotlin.compat)
39+
implementation(libs.opentelemetry.java.aliases)
3940
}

‎embrace-android-otel/lint-baseline.xml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<issues format="6" by="lint 8.9.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.9.2)" variant="all" version="8.9.2">
2+
<issues format="6" by="lint 8.10.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.10.1)" variant="all" version="8.10.1">
3+
4+
<issue
5+
id="StopShip"
6+
message="`TODO` call found; points to code which must be fixed prior to release"
7+
errorLine1=" TODO()"
8+
errorLine2=" ~~~~~~">
9+
<location
10+
file="src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/OtelSdkWrapper.kt"
11+
line="107"
12+
column="25"/>
13+
</issue>
14+
15+
<issue
16+
id="StopShip"
17+
message="`TODO` call found; points to code which must be fixed prior to release"
18+
errorLine1=" TODO(),"
19+
errorLine2=" ~~~~~~">
20+
<location
21+
file="src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/OtelSdkWrapper.kt"
22+
line="120"
23+
column="25"/>
24+
</issue>
325

426
</issues>

0 commit comments

Comments
 (0)