Update SDK to support OTel 1.51.0

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

@@ -17,7 +17,7 @@ class EmbSpan(
     private val clock: Clock,
 ) : Span {
 
-    override fun <T : Any> setAttribute(key: AttributeKey<T>, value: T): Span {
+    override fun <T : Any> setAttribute(key: AttributeKey<T>, value: T?): Span {
         embraceSpan.addAttribute(key = key.key, value = value.toString())
         return this
     }

embrace-android-sdk/embrace-proguard.cfg

@@ -33,6 +33,9 @@
 ## OpenTelemetry Java SDK
 -keep class io.opentelemetry.api.trace.StatusCode { *; }
 -dontwarn com.google.auto.value.extension.memoized.Memoized
+-dontwarn io.opentelemetry.api.incubator.common.ExtendedAttributeKey
+-dontwarn io.opentelemetry.api.incubator.common.ExtendedAttributes
+-dontwarn io.opentelemetry.api.incubator.common.ExtendedAttributesBuilder
 -dontwarn io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder
 -dontwarn io.opentelemetry.api.incubator.logs.ExtendedLogger
 -dontwarn io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder

embrace-test-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/FakeLogRecordBuilder.kt

@@ -1,5 +1,7 @@
 package io.embrace.android.embracesdk.fakes
 
+import android.os.Build
+import androidx.annotation.RequiresApi
 import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.api.logs.LogRecordBuilder
 import io.opentelemetry.api.logs.Severity
@@ -23,6 +25,7 @@ class FakeLogRecordBuilder : LogRecordBuilder {
         return this
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     override fun setTimestamp(instant: Instant): LogRecordBuilder {
         timestampEpochNanos = instant.toEpochMilli() * 1_000_000
         return this
@@ -33,6 +36,7 @@ class FakeLogRecordBuilder : LogRecordBuilder {
         return this
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     override fun setObservedTimestamp(instant: Instant): LogRecordBuilder {
         observedTimestampEpochNanos = instant.toEpochMilli() * 1_000_000
         return this
@@ -58,7 +62,7 @@ class FakeLogRecordBuilder : LogRecordBuilder {
         return this
     }
 
-    override fun <T : Any> setAttribute(key: AttributeKey<T>, value: T): LogRecordBuilder {
+    override fun <T : Any> setAttribute(key: AttributeKey<T>, value: T?): LogRecordBuilder {
         attributes[key.key.toString()] = value.toString()
         return this
     }

embrace-test-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/FakeSpan.kt

@@ -27,8 +27,11 @@ class FakeSpan(
     private var status: StatusCode = StatusCode.UNSET
     private var statusDescription: String = ""
 
-    override fun <T : Any> setAttribute(key: AttributeKey<T>, value: T): Span {
-        fakeSpanBuilder.setAttribute(key, value)
+    override fun <T : Any> setAttribute(key: AttributeKey<T>, value: T?): Span {
+        if (value != null) {
+            fakeSpanBuilder.setAttribute(key, value)
+        }
+
         return this
     }
 

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ dokka = "1.9.20"
 kotlinGradlePlugin = "2.1.21"
 koverGradlePlugin = "0.9.1"
 lint = "31.10.1"
-openTelemetryCore = "1.49.0"
+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