Merge pull request #2322 from embrace-io/deprecate-resource-attr

fractalwrench · web-flow · commit 0b650a766561 · 2025-07-08T15:57:44.000+01:00
Deprecate setResourceAttribute overload
diff --git a/embrace-android-api/src/main/kotlin/io/embrace/android/embracesdk/internal/api/OTelApi.kt b/embrace-android-api/src/main/kotlin/io/embrace/android/embracesdk/internal/api/OTelApi.kt
@@ -29,17 +29,21 @@ public interface OTelApi {
     public fun getOpenTelemetry(): OtelJavaOpenTelemetry
 
     /**
-     * Set an attribute on the [Resource] used by the OTel SDK instance with the given [AttributeKey] key and String value.
+     * Set an attribute on the resource used by the OTel SDK instance with the given 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.
      */
+    @Deprecated(
+        "Use setResourceAttribute(key: String, value: String) instead.",
+        ReplaceWith("setResourceAttribute(key.key, value)")
+    )
     public fun setResourceAttribute(
         key: OtelJavaAttributeKey<String>,
-        value: String
+        value: String,
     ): Unit = setResourceAttribute(key.key, value)
 
     /**
-     * Set an attribute on the [Resource] used by the OTel SDK instance with the given String key and value.
+     * Set an attribute on the resource used by the OTel SDK instance with the given String key and 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.
      */
diff --git a/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanImpl.kt b/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanImpl.kt
@@ -20,6 +20,8 @@ import io.embrace.android.embracesdk.internal.utils.Uuid
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.ErrorCode
 import io.embrace.opentelemetry.kotlin.Clock
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
+import io.embrace.opentelemetry.kotlin.k2j.tracing.SpanContextAdapter
 import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
@@ -94,20 +96,21 @@ internal class CurrentSessionSpanImpl(
         return sessionSpan.get()?.getSystemAttribute(SessionIncubatingAttributes.SESSION_ID.key) ?: ""
     }
 
+    @OptIn(ExperimentalApi::class)
     override fun spanStopCallback(spanId: String) {
         val currentSessionSpan = sessionSpan.get()
         val spanToStop = spanRepository.getSpan(spanId)
 
         if (currentSessionSpan != spanToStop) {
             spanToStop?.spanContext?.let { spanToStopContext ->
-                currentSessionSpan?.addSystemLink(spanToStopContext, LinkType.EndedIn)
+                currentSessionSpan?.addSystemLink(SpanContextAdapter(spanToStopContext), LinkType.EndedIn)
             }
 
             val sessionId = currentSessionSpan?.getSystemAttribute(SessionIncubatingAttributes.SESSION_ID.key)
             if (sessionId != null) {
                 currentSessionSpan.spanContext?.let { sessionSpanContext ->
                     spanToStop?.addSystemLink(
-                        linkedSpanContext = sessionSpanContext,
+                        linkedSpanContext = SpanContextAdapter(sessionSpanContext),
                         type = LinkType.EndSession,
                         attributes = mapOf(SessionIncubatingAttributes.SESSION_ID.key to sessionId)
                     )
@@ -196,6 +199,7 @@ internal class CurrentSessionSpanImpl(
     /**
      * This method should always be used when starting a new session span
      */
+    @OptIn(ExperimentalApi::class)
     private fun startSessionSpan(startTimeMs: Long): EmbraceSdkSpan {
         traceCount.set(0)
         internalTraceCount.set(0)
@@ -212,7 +216,7 @@ internal class CurrentSessionSpanImpl(
             previousSessionSpan?.spanContext?.let {
                 val prevSessionId = previousSessionSpan.getSystemAttribute(SessionIncubatingAttributes.SESSION_ID.key) ?: ""
                 addSystemLink(
-                    linkedSpanContext = it,
+                    linkedSpanContext = SpanContextAdapter(it),
                     type = LinkType.PreviousSession,
                     attributes = mapOf(SessionIncubatingAttributes.SESSION_ID.key to prevSessionId)
                 )
diff --git a/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/payload/SpanMapper.kt b/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/payload/SpanMapper.kt
@@ -10,6 +10,7 @@ import io.embrace.android.embracesdk.internal.payload.Link
 import io.embrace.android.embracesdk.internal.payload.Span
 import io.embrace.android.embracesdk.internal.payload.SpanEvent
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSpanId
 import io.embrace.opentelemetry.kotlin.tracing.StatusCode
 
@@ -44,6 +45,7 @@ fun Map<String, String>.toEmbracePayload(): List<Attribute> =
 fun List<Attribute>.toEmbracePayload(): Map<String, String> =
     associate { Pair(it.key ?: "", it.data ?: "") }.filterKeys { it.isNotBlank() }
 
+@OptIn(ExperimentalApi::class)
 fun EmbraceLinkData.toEmbracePayload() = Link(
     spanId = spanContext.spanId,
     traceId = spanContext.traceId,
diff --git a/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/OtelExt.kt b/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/OtelExt.kt
@@ -10,10 +10,8 @@ import io.embrace.android.embracesdk.internal.otel.spans.EmbraceSpanData.Compani
 import io.embrace.android.embracesdk.internal.otel.toOtelKotlin
 import io.embrace.android.embracesdk.internal.payload.Attribute
 import io.embrace.android.embracesdk.internal.payload.Link
-import io.embrace.android.embracesdk.internal.utils.isBlankish
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
 import io.embrace.opentelemetry.kotlin.ExperimentalApi
-import io.embrace.opentelemetry.kotlin.aliases.OtelJavaAttributeKey
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaAttributes
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaAttributesBuilder
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaLinkData
@@ -60,17 +58,6 @@ fun OtelJavaLogRecordBuilder.setEmbraceAttribute(embraceAttribute: EmbraceAttrib
     return this
 }
 
-fun OtelJavaLogRecordBuilder.setAttribute(
-    attributeKey: OtelJavaAttributeKey<String>,
-    value: String,
-    keepBlankishValues: Boolean = true,
-): OtelJavaLogRecordBuilder {
-    if (keepBlankishValues || !value.isBlankish()) {
-        setAttribute(attributeKey, value)
-    }
-    return this
-}
-
 fun OtelJavaSpan.setEmbraceAttribute(key: EmbraceAttributeKey, value: String): OtelJavaSpan {
     setAttribute(key.name, value)
     return this
diff --git a/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/StoreDataResultExt.kt b/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/sdk/StoreDataResultExt.kt
diff --git a/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/spans/EmbraceLinkData.kt b/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/spans/EmbraceLinkData.kt
@@ -1,8 +1,10 @@
 package io.embrace.android.embracesdk.internal.otel.spans
 
-import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSpanContext
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
+import io.embrace.opentelemetry.kotlin.tracing.model.SpanContext
 
+@OptIn(ExperimentalApi::class)
 data class EmbraceLinkData(
-    val spanContext: OtelJavaSpanContext,
-    val attributes: Map<String, String>
+    val spanContext: SpanContext,
+    val attributes: Map<String, String>,
 )
diff --git a/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/spans/EmbraceSdkSpan.kt b/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/spans/EmbraceSdkSpan.kt
@@ -5,11 +5,12 @@ import io.embrace.android.embracesdk.internal.otel.schema.EmbType
 import io.embrace.android.embracesdk.internal.otel.schema.LinkType
 import io.embrace.android.embracesdk.internal.payload.Span
 import io.embrace.android.embracesdk.spans.EmbraceSpan
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaContext
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaContextKey
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaImplicitContextKeyed
-import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSpanContext
 import io.embrace.opentelemetry.kotlin.tracing.StatusCode
+import io.embrace.opentelemetry.kotlin.tracing.model.SpanContext
 
 /**
  * An [EmbraceSpan] that has additional functionality to be used internally by the SDK
@@ -76,8 +77,9 @@ interface EmbraceSdkSpan : EmbraceSpan, OtelJavaImplicitContextKeyed {
     /**
      * Add a system link to the span that will subjected to a different maximum than typical links.
      */
+    @OptIn(ExperimentalApi::class)
     fun addSystemLink(
-        linkedSpanContext: OtelJavaSpanContext,
+        linkedSpanContext: SpanContext,
         type: LinkType,
         attributes: Map<String, String> = emptyMap(),
     ): Boolean
diff --git a/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/spans/EmbraceSpanFactoryImpl.kt b/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/spans/EmbraceSpanFactoryImpl.kt
@@ -35,6 +35,7 @@ import io.embrace.opentelemetry.kotlin.k2j.tracing.SpanContextAdapter
 import io.embrace.opentelemetry.kotlin.tracing.StatusCode
 import io.embrace.opentelemetry.kotlin.tracing.Tracer
 import io.embrace.opentelemetry.kotlin.tracing.model.Span
+import io.embrace.opentelemetry.kotlin.tracing.model.SpanContext
 import io.opentelemetry.context.ImplicitContextKeyed
 import io.opentelemetry.semconv.ExceptionAttributes
 import java.util.Queue
@@ -316,14 +317,14 @@ private class EmbraceSpanImpl(
         return false
     }
 
-    override fun addSystemLink(linkedSpanContext: OtelJavaSpanContext, type: LinkType, attributes: Map<String, String>): Boolean =
+    override fun addSystemLink(linkedSpanContext: SpanContext, type: LinkType, attributes: Map<String, String>): Boolean =
         addObject(systemLinks, systemLinkCount, dataValidator.otelLimitsConfig.getMaxSystemLinkCount()) {
             EmbraceLinkData(linkedSpanContext, mutableMapOf(type.asPair()).apply { putAll(attributes) })
         }
 
     override fun addLink(linkedSpanContext: OtelJavaSpanContext, attributes: Map<String, String>?): Boolean =
         addObject(customLinks, customLinkCount, dataValidator.otelLimitsConfig.getMaxCustomLinkCount()) {
-            EmbraceLinkData(linkedSpanContext, attributes ?: emptyMap())
+            EmbraceLinkData(SpanContextAdapter(linkedSpanContext), attributes ?: emptyMap())
         }
 
     override fun asNewContext(): OtelJavaContext? = startedSpan.get()?.run {
@@ -453,7 +454,7 @@ private class EmbraceSpanImpl(
             } else {
                 OtelJavaAttributes.empty()
             }
-            spanToStop.addLink(SpanContextAdapter(it.spanContext)) {
+            spanToStop.addLink(it.spanContext) {
                 linkAttributes.toStringMap().forEach { entry ->
                     setStringAttribute(entry.key, entry.value)
                 }
diff --git a/embrace-android-otel/src/test/kotlin/io/embrace/android/embracesdk/internal/otel/impl/EmbSpanTest.kt b/embrace-android-otel/src/test/kotlin/io/embrace/android/embracesdk/internal/otel/impl/EmbSpanTest.kt
@@ -8,6 +8,7 @@ import io.embrace.android.embracesdk.internal.otel.schema.ErrorCodeAttribute
 import io.embrace.android.embracesdk.internal.otel.sdk.hasEmbraceAttribute
 import io.embrace.android.embracesdk.internal.payload.Span
 import io.embrace.opentelemetry.kotlin.Clock
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaAttributeKey
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaAttributes
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaStatusCode
@@ -20,6 +21,7 @@ import org.junit.Before
 import org.junit.Test
 import java.util.concurrent.TimeUnit
 
+@OptIn(ExperimentalApi::class)
 internal class EmbSpanTest {
     private lateinit var fakeClock: FakeClock
     private lateinit var openTelemetryClock: Clock
diff --git a/embrace-android-otel/src/test/kotlin/io/embrace/android/embracesdk/internal/otel/spans/EmbraceSpanImplTest.kt b/embrace-android-otel/src/test/kotlin/io/embrace/android/embracesdk/internal/otel/spans/EmbraceSpanImplTest.kt
@@ -36,6 +36,7 @@ import io.embrace.android.embracesdk.internal.utils.truncatedStacktraceText
 import io.embrace.android.embracesdk.spans.ErrorCode
 import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.embrace.opentelemetry.kotlin.OpenTelemetryInstance
+import io.embrace.opentelemetry.kotlin.k2j.tracing.SpanContextAdapter
 import io.embrace.opentelemetry.kotlin.kotlinApi
 import io.opentelemetry.semconv.ExceptionAttributes
 import org.junit.Assert.assertEquals
@@ -213,7 +214,7 @@ internal class EmbraceSpanImplTest {
             assertTrue(start())
             val linkedSpan = FakeEmbraceSdkSpan.stopped()
             val spanContext = checkNotNull(linkedSpan.spanContext)
-            assertTrue(embraceSpan.addSystemLink(spanContext, LinkType.PreviousSession))
+            assertTrue(embraceSpan.addSystemLink(SpanContextAdapter(spanContext), LinkType.PreviousSession))
             assertTrue(updateNotified)
         }
     }
@@ -386,10 +387,12 @@ internal class EmbraceSpanImplTest {
         assertTrue(embraceSpan.start())
         repeat(InstrumentedConfigImpl.otelLimits.getMaxSystemLinkCount()) {
             val spanContext = checkNotNull(FakeEmbraceSdkSpan.stopped().spanContext)
-            assertTrue(embraceSpan.addSystemLink(spanContext, LinkType.PreviousSession))
+            assertTrue(embraceSpan.addSystemLink(SpanContextAdapter(spanContext), LinkType.PreviousSession))
         }
 
-        assertFalse(embraceSpan.addSystemLink(checkNotNull(FakeEmbraceSdkSpan.stopped().spanContext), LinkType.PreviousSession))
+        assertFalse(
+            embraceSpan.addSystemLink(SpanContextAdapter(checkNotNull(FakeEmbraceSdkSpan.stopped().spanContext)), LinkType.PreviousSession)
+        )
     }
 
     @Test
@@ -424,7 +427,7 @@ internal class EmbraceSpanImplTest {
             val linkAttrs = mapOf("link-attr" to "value")
             val spanContext = checkNotNull(linkedSpan.spanContext)
             assertTrue(embraceSpan.addLink(spanContext, linkAttrs))
-            assertTrue(embraceSpan.addSystemLink(spanContext, LinkType.PreviousSession))
+            assertTrue(embraceSpan.addSystemLink(SpanContextAdapter(spanContext), LinkType.PreviousSession))
 
             val snapshot = checkNotNull(embraceSpan.snapshot())
 
diff --git a/embrace-android-otel/src/test/kotlin/io/embrace/android/embracesdk/internal/otel/spans/SpanSinkImplTests.kt b/embrace-android-otel/src/test/kotlin/io/embrace/android/embracesdk/internal/otel/spans/SpanSinkImplTests.kt
@@ -2,9 +2,8 @@ package io.embrace.android.embracesdk.internal.otel.spans
 
 import io.embrace.android.embracesdk.concurrency.SingleThreadTestScheduledExecutor
 import io.embrace.android.embracesdk.fakes.FakeSpanData
-import io.embrace.android.embracesdk.internal.otel.sdk.toCompleteableResultCode
+import io.embrace.android.embracesdk.internal.otel.sdk.StoreDataResult
 import io.embrace.android.embracesdk.internal.otel.sdk.toEmbraceSpanData
-import io.embrace.opentelemetry.kotlin.aliases.OtelJavaCompletableResultCode
 import io.mockk.every
 import io.mockk.spyk
 import io.mockk.unmockkObject
@@ -28,7 +27,7 @@ internal class SpanSinkImplTests {
     fun `verify default state`() {
         assertEquals(0, spanSink.completedSpans().size)
         assertEquals(0, spanSink.flushSpans().size)
-        assertEquals(OtelJavaCompletableResultCode.ofSuccess(), spanSink.storeCompletedSpans(listOf()).toCompleteableResultCode())
+        assertEquals(StoreDataResult.SUCCESS, spanSink.storeCompletedSpans(listOf()))
     }
 
     @Test
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/OTelExportTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/OTelExportTest.kt
@@ -5,7 +5,7 @@ import io.embrace.android.embracesdk.Severity
 import io.embrace.android.embracesdk.fakes.FakeOtelJavaSpanExporter
 import io.embrace.android.embracesdk.internal.clock.millisToNanos
 import io.embrace.android.embracesdk.internal.otel.schema.EmbType
-import io.embrace.android.embracesdk.internal.otel.attrs.asOtelAttributeKey
+import io.embrace.android.embracesdk.internal.otel.sdk.hasEmbraceAttribute
 import io.embrace.android.embracesdk.testframework.SdkIntegrationTestRule
 import io.opentelemetry.semconv.ServiceAttributes
 import org.junit.Assert.assertEquals
@@ -27,7 +27,7 @@ internal class OTelExportTest {
         val fakeSpanExporter = FakeOtelJavaSpanExporter()
         testRule.runTest(
             preSdkStartAction = {
-                embrace.setResourceAttribute(ServiceAttributes.SERVICE_NAME, "my.app")
+                embrace.setResourceAttribute(ServiceAttributes.SERVICE_NAME.key, "my.app")
                 embrace.setResourceAttribute("test", "foo")
                 embrace.addSpanExporter(fakeSpanExporter)
             },
@@ -87,7 +87,7 @@ internal class OTelExportTest {
             },
             otelExportAssertion = {
                 val log = awaitLogs(1) {
-                    it.attributes.get(EmbType.System.Log.key.asOtelAttributeKey()) == EmbType.System.Log.value
+                    it.attributes.hasEmbraceAttribute(EmbType.System.Log)
                 }
                 with(log.single()) {
                     assertEquals("test message", body.asString())
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/api/delegate/OTelApiDelegateTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/api/delegate/OTelApiDelegateTest.kt
@@ -97,7 +97,7 @@ internal class OTelApiDelegateTest {
     @Test
     fun `override resource attribute before sdk starts`() {
         sdkCallChecker.started.set(false)
-        delegate.setResourceAttribute(ServiceAttributes.SERVICE_NAME, "foo")
+        delegate.setResourceAttribute(ServiceAttributes.SERVICE_NAME.key, "foo")
         val attrs = FakeAttributeContainer().apply(cfg.resourceAction).attributes()
         assertEquals("foo", attrs[ServiceAttributes.SERVICE_NAME.key])
     }
diff --git a/embrace-test-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/FakeEmbraceSdkSpan.kt b/embrace-test-fakes/src/main/kotlin/io/embrace/android/embracesdk/fakes/FakeEmbraceSdkSpan.kt
@@ -24,14 +24,18 @@ import io.embrace.android.embracesdk.spans.AutoTerminationMode
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
 import io.embrace.android.embracesdk.spans.ErrorCode
+import io.embrace.opentelemetry.kotlin.ExperimentalApi
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaContext
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSpan
 import io.embrace.opentelemetry.kotlin.aliases.OtelJavaSpanContext
+import io.embrace.opentelemetry.kotlin.k2j.tracing.SpanContextAdapter
 import io.embrace.opentelemetry.kotlin.tracing.StatusCode
+import io.embrace.opentelemetry.kotlin.tracing.model.SpanContext
 import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.TimeUnit
 
+@OptIn(ExperimentalApi::class)
 class FakeEmbraceSdkSpan(
     var name: String = "fake-span",
     var parentContext: OtelJavaContext = OtelJavaContext.root(),
@@ -140,12 +144,14 @@ class FakeEmbraceSdkSpan(
     }
 
     override fun addLink(linkedSpanContext: OtelJavaSpanContext, attributes: Map<String, String>?): Boolean {
-        links.add(EmbraceLinkData(linkedSpanContext, attributes ?: emptyMap()))
+        links.add(EmbraceLinkData(SpanContextAdapter(linkedSpanContext), attributes ?: emptyMap()))
         return true
     }
 
-    override fun addSystemLink(linkedSpanContext: OtelJavaSpanContext, type: LinkType, attributes: Map<String, String>): Boolean =
-        addLink(linkedSpanContext, mutableMapOf(type.asPair()).apply { putAll(attributes) })
+    override fun addSystemLink(linkedSpanContext: SpanContext, type: LinkType, attributes: Map<String, String>): Boolean {
+        links.add(EmbraceLinkData(linkedSpanContext, mutableMapOf(type.asPair()).apply { putAll(attributes) }))
+        return true
+    }
 
     override fun asNewContext(): OtelJavaContext? = sdkSpan?.let { parentContext.with(this).with(it) }
 

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ import io.embrace.opentelemetry.kotlin.k2j.tracing.SpanContextAdapter`
`35`	`35`	`import io.embrace.opentelemetry.kotlin.tracing.StatusCode`
`36`	`36`	`import io.embrace.opentelemetry.kotlin.tracing.Tracer`
`37`	`37`	`import io.embrace.opentelemetry.kotlin.tracing.model.Span`
	`38`	`+import io.embrace.opentelemetry.kotlin.tracing.model.SpanContext`
`38`	`39`	`import io.opentelemetry.context.ImplicitContextKeyed`
`39`	`40`	`import io.opentelemetry.semconv.ExceptionAttributes`
`40`	`41`	`import java.util.Queue`
`@@ -316,14 +317,14 @@ private class EmbraceSpanImpl(`
`316`	`317`	`return false`
`317`	`318`	`}`
`318`	`319`
`319`		`- override fun addSystemLink(linkedSpanContext: OtelJavaSpanContext, type: LinkType, attributes: Map<String, String>): Boolean =`
	`320`	`+ override fun addSystemLink(linkedSpanContext: SpanContext, type: LinkType, attributes: Map<String, String>): Boolean =`
`320`	`321`	`addObject(systemLinks, systemLinkCount, dataValidator.otelLimitsConfig.getMaxSystemLinkCount()) {`
`321`	`322`	`EmbraceLinkData(linkedSpanContext, mutableMapOf(type.asPair()).apply { putAll(attributes) })`
`322`	`323`	`}`
`323`	`324`
`324`	`325`	`override fun addLink(linkedSpanContext: OtelJavaSpanContext, attributes: Map<String, String>?): Boolean =`
`325`	`326`	`addObject(customLinks, customLinkCount, dataValidator.otelLimitsConfig.getMaxCustomLinkCount()) {`
`326`		`- EmbraceLinkData(linkedSpanContext, attributes ?: emptyMap())`
	`327`	`+ EmbraceLinkData(SpanContextAdapter(linkedSpanContext), attributes ?: emptyMap())`
`327`	`328`	`}`
`328`	`329`
`329`	`330`	`override fun asNewContext(): OtelJavaContext? = startedSpan.get()?.run {`
`@@ -453,7 +454,7 @@ private class EmbraceSpanImpl(`
`453`	`454`	`} else {`
`454`	`455`	`OtelJavaAttributes.empty()`
`455`	`456`	`}`
`456`		`- spanToStop.addLink(SpanContextAdapter(it.spanContext)) {`
	`457`	`+ spanToStop.addLink(it.spanContext) {`
`457`	`458`	`linkAttributes.toStringMap().forEach { entry ->`
`458`	`459`	`setStringAttribute(entry.key, entry.value)`
`459`	`460`	`}`