diff --git a/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/arch/schema/SchemaType.kt b/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/arch/schema/SchemaType.kt
index 48afaa0155..e1e8af8d50 100644
--- a/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/arch/schema/SchemaType.kt
+++ b/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/arch/schema/SchemaType.kt
@@ -1,10 +1,13 @@
 package io.embrace.android.embracesdk.internal.arch.schema
 
-import io.embrace.android.embracesdk.internal.clock.millisToNanos
 import io.embrace.android.embracesdk.internal.payload.AppExitInfoData
 import io.embrace.android.embracesdk.internal.payload.NetworkCapturedCall
 import io.embrace.android.embracesdk.internal.utils.toNonNullMap
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
+import io.opentelemetry.semconv.HttpAttributes
+import io.opentelemetry.semconv.UrlAttributes
+import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes
+import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 
 /**
  * The collections of attribute schemas used by the associated telemetry types.
@@ -44,46 +47,6 @@ public sealed class SchemaType(
         override val schemaAttributes: Map<String, String> = mapOf("view.name" to viewName)
     }
 
-    /**
-     * Represents a span in which a thread was blocked.
-     */
-    public class ThreadBlockage(
-        threadPriority: Int,
-        lastKnownTimeMs: Long,
-        intervalCode: Int
-    ) : SchemaType(
-        telemetryType = EmbType.Performance.ThreadBlockage,
-        fixedObjectName = "thread_blockage"
-    ) {
-        override val schemaAttributes: Map<String, String> = mapOf(
-            "thread_priority" to threadPriority.toString(),
-            "last_known_time_unix_nano" to lastKnownTimeMs.millisToNanos().toString(),
-            "interval_code" to intervalCode.toString()
-        )
-    }
-
-    /**
-     * Represents a point in time when a thread was blocked.
-     */
-    public class ThreadBlockageSample(
-        sampleOverheadMs: Long,
-        frameCount: Int,
-        stacktrace: String,
-        sampleCode: Int,
-        threadState: Thread.State
-    ) : SchemaType(
-        telemetryType = EmbType.Performance.ThreadBlockageSample,
-        fixedObjectName = "thread_blockage_sample"
-    ) {
-        override val schemaAttributes: Map<String, String> = mapOf(
-            "sample_overhead" to sampleOverheadMs.millisToNanos().toString(),
-            "frame_count" to frameCount.toString(),
-            "stacktrace" to stacktrace,
-            "sample_code" to sampleCode.toString(),
-            "thread_state" to threadState.toString()
-        )
-    }
-
     /**
      * Represents a push notification event.
      * @param viewName The name of the view that the tap event occurred in.
@@ -111,48 +74,6 @@ public sealed class SchemaType(
         ).toNonNullMap()
     }
 
-    /**
-     * Represents a span in which a native thread was blocked.
-     */
-    public class NativeThreadBlockage(
-        threadId: Int,
-        threadName: String,
-        threadPriority: Int,
-        threadState: String,
-        samplingOffsetMs: Long,
-        stackUnwinder: String,
-    ) : SchemaType(
-        telemetryType = EmbType.Performance.NativeThreadBlockage,
-        fixedObjectName = "native_thread_blockage"
-    ) {
-        override val schemaAttributes: Map<String, String> = mapOf(
-            "thread_id" to threadId.toString(),
-            "thread_name" to threadName,
-            "thread_priority" to threadPriority.toString(),
-            "thread_state" to threadState,
-            "sampling_offset_ms" to samplingOffsetMs.toString(),
-            "stack_unwinder" to stackUnwinder,
-        )
-    }
-
-    /**
-     * Represents a point in time when a native thread was blocked.
-     */
-    public class NativeThreadBlockageSample(
-        result: Int,
-        sampleOverheadMs: Long,
-        stacktrace: String,
-    ) : SchemaType(
-        telemetryType = EmbType.Performance.NativeThreadBlockageSample,
-        fixedObjectName = "native_thread_blockage_sample"
-    ) {
-        override val schemaAttributes: Map<String, String> = mapOf(
-            "result" to result.toString(),
-            "sample_overhead_ms" to sampleOverheadMs.toString(),
-            "stacktrace" to stacktrace
-        )
-    }
-
     /**
      * Represents a tap breadcrumb event.
      * @param viewName The name of the view that the tap event occurred in.
@@ -181,7 +102,7 @@ public sealed class SchemaType(
         fixedObjectName = "web-view"
     ) {
         override val schemaAttributes: Map<String, String> = mapOf(
-            "webview.url" to url
+            UrlAttributes.URL_FULL.key to url
         ).toNonNullMap()
     }
 
@@ -259,23 +180,23 @@ public sealed class SchemaType(
         override val schemaAttributes: Map<String, String> = mapOf(
             "duration" to networkCapturedCall.duration.toString(),
             "end-time" to networkCapturedCall.endTime.toString(),
-            "http-method" to networkCapturedCall.httpMethod,
-            "matched-url" to networkCapturedCall.matchedUrl,
+            HttpAttributes.HTTP_REQUEST_METHOD.key to networkCapturedCall.httpMethod,
+            UrlAttributes.URL_FULL.key to networkCapturedCall.matchedUrl,
             "network-id" to networkCapturedCall.networkId,
             "request-body" to networkCapturedCall.requestBody,
-            "request-body-size" to networkCapturedCall.requestBodySize.toString(),
+            HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE.key to networkCapturedCall.requestBodySize.toString(),
             "request-query" to networkCapturedCall.requestQuery,
-            "request-query-headers" to networkCapturedCall.requestQueryHeaders.toString(),
+            "http.request.header" to networkCapturedCall.requestQueryHeaders.toString(),
             "request-size" to networkCapturedCall.requestSize.toString(),
             "response-body" to networkCapturedCall.responseBody,
-            "response-body-size" to networkCapturedCall.responseBodySize.toString(),
-            "response-headers" to networkCapturedCall.responseHeaders.toString(),
+            HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE.key to networkCapturedCall.responseBodySize.toString(),
+            "http.response.header" to networkCapturedCall.responseHeaders.toString(),
             "response-size" to networkCapturedCall.responseSize.toString(),
-            "response-status" to networkCapturedCall.responseStatus.toString(),
-            "session-id" to networkCapturedCall.sessionId,
+            HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key to networkCapturedCall.responseStatus.toString(),
+            SessionIncubatingAttributes.SESSION_ID.key to networkCapturedCall.sessionId,
             "start-time" to networkCapturedCall.startTime.toString(),
             "url" to networkCapturedCall.url,
-            "error-message" to networkCapturedCall.errorMessage,
+            ExceptionAttributes.EXCEPTION_MESSAGE.key to networkCapturedCall.errorMessage,
             "encrypted-payload" to networkCapturedCall.encryptedPayload
         ).toNonNullMap()
     }
@@ -300,7 +221,7 @@ public sealed class SchemaType(
         fixedObjectName = "webview-info"
     ) {
         override val schemaAttributes: Map<String, String> = mapOf(
-            "emb.webview_info.url" to url,
+            UrlAttributes.URL_FULL.key to url,
             "emb.webview_info.web_vitals" to webVitals,
             "emb.webview_info.tag" to tag
         ).toNonNullMap()
@@ -344,12 +265,12 @@ public sealed class SchemaType(
         fixedObjectName = "internal-error"
     ) {
         override val schemaAttributes: Map<String, String> = mapOf(
-            ExceptionIncubatingAttributes.EXCEPTION_TYPE.key to throwable.javaClass.name,
-            ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key to throwable.stackTrace.joinToString(
+            ExceptionAttributes.EXCEPTION_TYPE.key to throwable.javaClass.name,
+            ExceptionAttributes.EXCEPTION_STACKTRACE.key to throwable.stackTrace.joinToString(
                 "\n",
                 transform = StackTraceElement::toString
             ),
-            ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key to (throwable.message ?: "")
+            ExceptionAttributes.EXCEPTION_MESSAGE.key to (throwable.message ?: "")
         )
     }
 }
diff --git a/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/spans/PersistableEmbraceSpan.kt b/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/spans/PersistableEmbraceSpan.kt
index 1925fd746a..ac181ae085 100644
--- a/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/spans/PersistableEmbraceSpan.kt
+++ b/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/spans/PersistableEmbraceSpan.kt
@@ -1,10 +1,10 @@
 package io.embrace.android.embracesdk.internal.spans
 
 import io.embrace.android.embracesdk.internal.arch.schema.EmbType
-import io.embrace.android.embracesdk.internal.arch.schema.EmbraceAttributeKey
 import io.embrace.android.embracesdk.internal.arch.schema.FixedAttribute
 import io.embrace.android.embracesdk.internal.payload.Span
 import io.embrace.android.embracesdk.spans.EmbraceSpan
+import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.api.trace.StatusCode
 import io.opentelemetry.context.Context
 import io.opentelemetry.context.ContextKey
@@ -34,12 +34,12 @@ public interface PersistableEmbraceSpan : EmbraceSpan, ImplicitContextKeyed {
     /**
      * Get the value of the attribute with the given key. Returns null if the attribute does not exist.
      */
-    public fun getSystemAttribute(key: EmbraceAttributeKey): String?
+    public fun getSystemAttribute(key: AttributeKey<String>): String?
 
     /**
      * Set the value of the attribute with the given key, overwriting the original value if it's already set
      */
-    public fun setSystemAttribute(key: EmbraceAttributeKey, value: String)
+    public fun setSystemAttribute(key: AttributeKey<String>, value: String)
 
     /**
      * Remove the custom attribute with the given key name
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/SpanAssertions.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/SpanAssertions.kt
index 8832e46a69..395e893857 100644
--- a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/SpanAssertions.kt
+++ b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/SpanAssertions.kt
@@ -9,8 +9,8 @@ import io.embrace.android.embracesdk.internal.payload.Span
 import io.embrace.android.embracesdk.internal.payload.SpanEvent
 import io.embrace.android.embracesdk.internal.spans.findAttributeValue
 import io.embrace.android.embracesdk.internal.spans.hasFixedAttribute
-import io.embrace.android.embracesdk.internal.opentelemetry.embSessionId
 import io.embrace.android.embracesdk.internal.payload.getSessionSpan
+import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 
 /**
  * Finds the first Span Event matching the given [TelemetryType]
@@ -55,7 +55,7 @@ internal fun Envelope<SessionPayload>.getSessionId(): String {
     val sessionSpan = checkNotNull(getSessionSpan()) {
         "No session span found in session message"
     }
-    return checkNotNull(sessionSpan.attributes?.findAttributeValue(embSessionId.name)) {
+    return checkNotNull(sessionSpan.attributes?.findAttributeValue(SessionIncubatingAttributes.SESSION_ID.key)) {
         "No session id found in session message"
     }
 }
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/assertions/InternalErrorAssertions.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/assertions/InternalErrorAssertions.kt
index ce28c1b884..1f623e8ce4 100644
--- a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/assertions/InternalErrorAssertions.kt
+++ b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/assertions/InternalErrorAssertions.kt
@@ -3,7 +3,7 @@ package io.embrace.android.embracesdk.assertions
 import io.embrace.android.embracesdk.FakeDeliveryService
 import io.embrace.android.embracesdk.internal.injection.ModuleInitBootstrapper
 import io.embrace.android.embracesdk.internal.spans.findAttributeValue
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 import org.junit.Assert.fail
 
 /**
@@ -27,8 +27,8 @@ internal fun assertInternalErrorLogged(
     }
 
     val matchingLogs = logs.filter { log ->
-        log.attributes?.findAttributeValue(ExceptionIncubatingAttributes.EXCEPTION_TYPE.key) == exceptionClassName &&
-            log.attributes.findAttributeValue(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key) == errorMessage
+        log.attributes?.findAttributeValue(ExceptionAttributes.EXCEPTION_TYPE.key) == exceptionClassName &&
+                log.attributes.findAttributeValue(ExceptionAttributes.EXCEPTION_MESSAGE.key) == errorMessage
     }
     if (matchingLogs.isEmpty()) {
         fail("No internal errors found matching the expected exception")
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/assertions/OTelLogAssertions.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/assertions/OTelLogAssertions.kt
index 2b806464e4..40ff5aa5b6 100644
--- a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/assertions/OTelLogAssertions.kt
+++ b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/assertions/OTelLogAssertions.kt
@@ -1,11 +1,11 @@
 package io.embrace.android.embracesdk.assertions
 
 import io.embrace.android.embracesdk.IntegrationTestRule
+import io.embrace.android.embracesdk.internal.opentelemetry.embExceptionHandling
 import io.embrace.android.embracesdk.internal.payload.Log
 import io.embrace.android.embracesdk.internal.serialization.EmbraceSerializer
 import io.embrace.android.embracesdk.internal.serialization.truncatedStacktrace
-import io.embrace.android.embracesdk.internal.opentelemetry.embExceptionHandling
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 
@@ -31,14 +31,14 @@ internal fun assertOtelLogReceived(
         assertEquals(expectedTimeMs * 1000000, log.timeUnixNano)
         expectedType?.let { assertAttribute(log, embExceptionHandling.name, it) }
         expectedExceptionName?.let {
-            assertAttribute(log, ExceptionIncubatingAttributes.EXCEPTION_TYPE.key, expectedExceptionName)
+            assertAttribute(log, ExceptionAttributes.EXCEPTION_TYPE.key, expectedExceptionName)
         }
         expectedExceptionMessage?.let {
-            assertAttribute(log, ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key, expectedExceptionMessage)
+            assertAttribute(log, ExceptionAttributes.EXCEPTION_MESSAGE.key, expectedExceptionMessage)
         }
         expectedStacktrace?.let {
             val serializedStack = EmbraceSerializer().truncatedStacktrace(it.toTypedArray())
-            assertAttribute(log, ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key, serializedStack)
+            assertAttribute(log, ExceptionAttributes.EXCEPTION_STACKTRACE.key, serializedStack)
         }
         expectedProperties?.forEach { (key, value) ->
             assertAttribute(log, key, value.toString())
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/features/WebviewFeatureTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/features/WebviewFeatureTest.kt
index ab6638c265..97c7ae8417 100644
--- a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/features/WebviewFeatureTest.kt
+++ b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/features/WebviewFeatureTest.kt
@@ -15,6 +15,7 @@ import io.embrace.android.embracesdk.internal.spans.findAttributeValue
 import io.embrace.android.embracesdk.internal.payload.WebVital
 import io.embrace.android.embracesdk.internal.payload.WebVitalType
 import io.embrace.android.embracesdk.recordSession
+import io.opentelemetry.semconv.UrlAttributes.URL_FULL
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Rule
@@ -54,7 +55,7 @@ internal class WebviewFeatureTest {
             val attrs = checkNotNull(event.attributes)
             assertEquals("emb-webview-info", event.name)
             assertEquals("myWebView", attrs.findAttributeValue("emb.webview_info.tag"))
-            assertEquals("https://embrace.io/", attrs.findAttributeValue("emb.webview_info.url"))
+            assertEquals("https://embrace.io/", attrs.findAttributeValue(URL_FULL.key))
 
             val webVitalsAttr = checkNotNull(attrs.findAttributeValue("emb.webview_info.web_vitals"))
             val type = Types.newParameterizedType(List::class.java, WebVital::class.java)
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/ExternalTracerTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/ExternalTracerTest.kt
index 906d416abe..88971a591e 100644
--- a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/ExternalTracerTest.kt
+++ b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/ExternalTracerTest.kt
@@ -25,7 +25,7 @@ import io.opentelemetry.api.trace.StatusCode
 import io.opentelemetry.api.trace.Tracer
 import io.opentelemetry.context.Context
 import io.opentelemetry.sdk.trace.data.SpanData
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertNull
@@ -148,9 +148,9 @@ internal class ExternalTracerTest {
                         timestampNanos = checkNotNull(startTimeMs?.millisToNanos()),
                         attributes = listOf(
                             Attribute("bad", "yes"),
-                            Attribute(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key, "bah"),
-                            Attribute(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key, stacktrace),
-                            Attribute(ExceptionIncubatingAttributes.EXCEPTION_TYPE.key, checkNotNull(RuntimeException::class.java.canonicalName))
+                            Attribute(ExceptionAttributes.EXCEPTION_MESSAGE.key, "bah"),
+                            Attribute(ExceptionAttributes.EXCEPTION_STACKTRACE.key, stacktrace),
+                            Attribute(ExceptionAttributes.EXCEPTION_TYPE.key, checkNotNull(RuntimeException::class.java.canonicalName))
                         )
                     )
                 ),
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/FlutterInternalInterfaceTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/FlutterInternalInterfaceTest.kt
index 6afca7981b..a725b7c124 100644
--- a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/FlutterInternalInterfaceTest.kt
+++ b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/FlutterInternalInterfaceTest.kt
@@ -16,7 +16,7 @@ import io.embrace.android.embracesdk.internal.spans.findAttributeValue
 import io.embrace.android.embracesdk.recordSession
 import io.embrace.android.embracesdk.internal.worker.WorkerName
 import io.opentelemetry.api.logs.Severity
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Before
@@ -170,7 +170,7 @@ internal class FlutterInternalInterfaceTest {
                 expectedEmbType = "sys.flutter_exception",
             )
             val attrs = checkNotNull(log.attributes)
-            assertEquals(expectedStacktrace, attrs.findAttributeValue(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key))
+            assertEquals(expectedStacktrace, attrs.findAttributeValue(ExceptionAttributes.EXCEPTION_STACKTRACE.key))
             assertEquals(expectedContext, attrs.findAttributeValue("emb.exception.context"))
             assertEquals(expectedLibrary, attrs.findAttributeValue("emb.exception.library"))
         }
@@ -207,7 +207,7 @@ internal class FlutterInternalInterfaceTest {
                 expectedEmbType = "sys.flutter_exception",
             )
             val attrs = checkNotNull(log.attributes)
-            assertEquals(expectedStacktrace, attrs.findAttributeValue(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key))
+            assertEquals(expectedStacktrace, attrs.findAttributeValue(ExceptionAttributes.EXCEPTION_STACKTRACE.key))
             assertEquals(expectedContext, attrs.findAttributeValue("emb.exception.context"))
             assertEquals(expectedLibrary, attrs.findAttributeValue("emb.exception.library"))
         }
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/NetworkRequestApiTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/NetworkRequestApiTest.kt
index b33597cf7d..3a0a11e6c8 100644
--- a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/NetworkRequestApiTest.kt
+++ b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/NetworkRequestApiTest.kt
@@ -13,6 +13,7 @@ import io.embrace.android.embracesdk.network.http.HttpMethod
 import io.embrace.android.embracesdk.recordSession
 import io.opentelemetry.semconv.HttpAttributes
 import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
@@ -267,7 +268,7 @@ internal class NetworkRequestApiTest {
                     assertEquals(expectedRequest.bytesSent.toString(), attrs.findAttributeValue(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE.key))
                     assertEquals(expectedRequest.bytesReceived.toString(), attrs.findAttributeValue(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE.key))
                     assertEquals(null, attrs.findAttributeValue("error.type"))
-                    assertEquals(null, attrs.findAttributeValue("error.message"))
+                    assertEquals(null, attrs.findAttributeValue(ExceptionAttributes.EXCEPTION_MESSAGE.key))
                     val statusCode = expectedRequest.responseCode
                     val expectedStatus = if (statusCode != null && statusCode >= 200 && statusCode < 400) {
                         Span.Status.UNSET
@@ -280,7 +281,7 @@ internal class NetworkRequestApiTest {
                     assertEquals(null, attrs.findAttributeValue(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE.key))
                     assertEquals(null, attrs.findAttributeValue(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE.key))
                     assertEquals(expectedRequest.errorType, attrs.findAttributeValue("error.type"))
-                    assertEquals(expectedRequest.errorMessage, attrs.findAttributeValue("error.message"))
+                    assertEquals(expectedRequest.errorMessage, attrs.findAttributeValue(ExceptionAttributes.EXCEPTION_MESSAGE.key))
                     assertEquals(Span.Status.ERROR, status)
                 }
             }
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/V2SessionApiTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/V2SessionApiTest.kt
index e0504c5d80..8a6bac0e6d 100644
--- a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/V2SessionApiTest.kt
+++ b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/V2SessionApiTest.kt
@@ -9,6 +9,7 @@ import io.embrace.android.embracesdk.internal.spans.findAttributeValue
 import io.embrace.android.embracesdk.recordSession
 import io.embrace.android.embracesdk.toMap
 import io.embrace.android.embracesdk.validatePayloadAgainstGoldenFile
+import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Rule
@@ -53,8 +54,8 @@ internal class V2SessionApiTest {
             // validate session span
             val sessionSpan = snapshots.single { it.name == "emb-session" }
             assertEquals(startTime, sessionSpan.startTimeNanos?.nanosToMillis())
-            assertNotNull(sessionSpan.attributes?.findAttributeValue("emb.session_id"))
-            val attrs = checkNotNull(sessionSpan.attributes?.filter { it.key != "emb.session_id" }?.toMap())
+            assertNotNull(sessionSpan.attributes?.findAttributeValue(SessionIncubatingAttributes.SESSION_ID.key))
+            val attrs = checkNotNull(sessionSpan.attributes?.filter { it.key != SessionIncubatingAttributes.SESSION_ID.key }?.toMap())
 
             val expected = mapOf(
                 "emb.cold_start" to "true",
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/anr/AnrOtelMapper.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/anr/AnrOtelMapper.kt
index 0184f13e08..6f926017bd 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/anr/AnrOtelMapper.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/anr/AnrOtelMapper.kt
@@ -10,6 +10,8 @@ import io.embrace.android.embracesdk.internal.payload.Span
 import io.embrace.android.embracesdk.internal.payload.SpanEvent
 import io.opentelemetry.api.trace.SpanId
 import io.opentelemetry.sdk.trace.IdGenerator
+import io.opentelemetry.semconv.ExceptionAttributes
+import io.opentelemetry.semconv.JvmAttributes
 
 /**
  * Maps captured ANRs to OTel constructs.
@@ -67,12 +69,12 @@ internal class AnrOtelMapper(
             attrs.add(Attribute("sample_code", it.toString()))
         }
         sample.threads?.singleOrNull()?.let { thread ->
-            attrs.add(Attribute("thread_state", thread.state.toString()))
+            attrs.add(Attribute(JvmAttributes.JVM_THREAD_STATE.key, thread.state.toString()))
             attrs.add(Attribute("thread_priority", thread.priority.toString()))
 
             thread.lines?.let { lines ->
                 attrs.add(Attribute("frame_count", lines.size.toString()))
-                attrs.add(Attribute("stacktrace", lines.joinToString("\n")))
+                attrs.add(Attribute(ExceptionAttributes.EXCEPTION_STACKTRACE.key, lines.joinToString("\n")))
             }
         }
         return SpanEvent(
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/anr/ndk/NativeAnrOtelMapper.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/anr/ndk/NativeAnrOtelMapper.kt
index 6d4e239429..3deb6d534f 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/anr/ndk/NativeAnrOtelMapper.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/anr/ndk/NativeAnrOtelMapper.kt
@@ -14,6 +14,9 @@ import io.embrace.android.embracesdk.internal.payload.SpanEvent
 import io.embrace.android.embracesdk.internal.serialization.EmbraceSerializer
 import io.opentelemetry.api.trace.SpanId
 import io.opentelemetry.sdk.trace.IdGenerator
+import io.opentelemetry.semconv.ExceptionAttributes
+import io.opentelemetry.semconv.JvmAttributes
+import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes
 
 internal class NativeAnrOtelMapper(
     private val nativeThreadSamplerService: NativeThreadSamplerService?,
@@ -50,16 +53,16 @@ internal class NativeAnrOtelMapper(
         attrs.add(Attribute("emb.type", "perf.native_thread_blockage"))
 
         interval.id?.let {
-            attrs.add(Attribute("thread_id", it.toString()))
+            attrs.add(Attribute(ThreadIncubatingAttributes.THREAD_ID.key, it.toString()))
         }
         interval.name?.let {
-            attrs.add(Attribute("thread_name", it))
+            attrs.add(Attribute(ThreadIncubatingAttributes.THREAD_NAME.key, it))
         }
         interval.priority?.let {
             attrs.add(Attribute("thread_priority", it.toString()))
         }
         interval.state?.let {
-            attrs.add(Attribute("thread_state", it.toString()))
+            attrs.add(Attribute(JvmAttributes.JVM_THREAD_STATE.key, it.toString()))
         }
         interval.sampleOffsetMs?.let {
             attrs.add(Attribute("sampling_offset_ms", it.toString()))
@@ -94,7 +97,7 @@ internal class NativeAnrOtelMapper(
         }
         frames?.let { stacktrace ->
             val json = serializer.toJson(stacktrace, Types.newParameterizedType(List::class.java, NativeAnrSampleFrame::class.java))
-            attrs.add(Attribute("stacktrace", json))
+            attrs.add(Attribute(ExceptionAttributes.EXCEPTION_STACKTRACE.key, json))
         }
         return SpanEvent(
             name = "emb_native_thread_blockage_sample",
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/arch/destination/LogWriterImpl.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/arch/destination/LogWriterImpl.kt
index 0b9548ac55..8d9b2d5d39 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/arch/destination/LogWriterImpl.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/arch/destination/LogWriterImpl.kt
@@ -3,7 +3,6 @@ package io.embrace.android.embracesdk.internal.arch.destination
 import io.embrace.android.embracesdk.internal.arch.schema.PrivateSpan
 import io.embrace.android.embracesdk.internal.arch.schema.SchemaType
 import io.embrace.android.embracesdk.internal.capture.metadata.MetadataService
-import io.embrace.android.embracesdk.internal.opentelemetry.embSessionId
 import io.embrace.android.embracesdk.internal.opentelemetry.embState
 import io.embrace.android.embracesdk.internal.session.id.SessionIdTracker
 import io.embrace.android.embracesdk.internal.spans.setFixedAttribute
@@ -12,6 +11,7 @@ import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.api.logs.Logger
 import io.opentelemetry.api.logs.Severity
 import io.opentelemetry.semconv.incubating.LogIncubatingAttributes
+import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 
 internal class LogWriterImpl(
     private val logger: Logger,
@@ -33,7 +33,7 @@ internal class LogWriterImpl(
         builder.setAttribute(LogIncubatingAttributes.LOG_RECORD_UID, Uuid.getEmbUuid())
 
         sessionIdTracker.getActiveSessionId()?.let { sessionId ->
-            builder.setAttribute(embSessionId.attributeKey, sessionId)
+            builder.setAttribute(SessionIncubatingAttributes.SESSION_ID, sessionId)
         }
 
         metadataService.getAppState()?.let { appState ->
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/capture/crash/CrashDataSourceImpl.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/capture/crash/CrashDataSourceImpl.kt
index 7e18096a9b..be6da54e8f 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/capture/crash/CrashDataSourceImpl.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/capture/crash/CrashDataSourceImpl.kt
@@ -27,7 +27,7 @@ import io.embrace.android.embracesdk.internal.session.properties.EmbraceSessionP
 import io.embrace.android.embracesdk.internal.spans.toOtelSeverity
 import io.embrace.android.embracesdk.internal.utils.Uuid.getEmbUuid
 import io.embrace.android.embracesdk.internal.utils.toUTF8String
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 import io.opentelemetry.semconv.incubating.LogIncubatingAttributes
 
 /**
@@ -88,14 +88,14 @@ internal class CrashDataSourceImpl(
             )
 
             val crashException = LegacyExceptionInfo.ofThrowable(exception)
-            crashAttributes.setAttribute(ExceptionIncubatingAttributes.EXCEPTION_TYPE, crashException.name)
+            crashAttributes.setAttribute(ExceptionAttributes.EXCEPTION_TYPE, crashException.name)
             crashAttributes.setAttribute(
-                ExceptionIncubatingAttributes.EXCEPTION_MESSAGE,
+                ExceptionAttributes.EXCEPTION_MESSAGE,
                 crashException.message
                     ?: ""
             )
             crashAttributes.setAttribute(
-                ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE,
+                ExceptionAttributes.EXCEPTION_STACKTRACE,
                 encodeToUTF8String(
                     serializer.toJson(crashException.lines, List::class.java),
                 ),
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/logs/EmbraceLogService.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/logs/EmbraceLogService.kt
index 0d2243f031..af8e136022 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/logs/EmbraceLogService.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/logs/EmbraceLogService.kt
@@ -24,7 +24,7 @@ import io.embrace.android.embracesdk.internal.session.properties.EmbraceSessionP
 import io.embrace.android.embracesdk.internal.spans.toOtelSeverity
 import io.embrace.android.embracesdk.internal.utils.Uuid
 import io.embrace.android.embracesdk.internal.worker.BackgroundWorker
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 import io.opentelemetry.semconv.incubating.LogIncubatingAttributes
 import java.util.NavigableMap
 import java.util.concurrent.ConcurrentSkipListMap
@@ -239,9 +239,9 @@ internal class EmbraceLogService(
         message: String?,
     ) {
         attributes.setAttribute(embExceptionHandling, logExceptionType.value)
-        type?.let { attributes.setAttribute(ExceptionIncubatingAttributes.EXCEPTION_TYPE, it) }
-        message?.let { attributes.setAttribute(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, it) }
-        stackTrace?.let { attributes.setAttribute(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, it) }
+        type?.let { attributes.setAttribute(ExceptionAttributes.EXCEPTION_TYPE, it) }
+        message?.let { attributes.setAttribute(ExceptionAttributes.EXCEPTION_MESSAGE, it) }
+        stackTrace?.let { attributes.setAttribute(ExceptionAttributes.EXCEPTION_STACKTRACE, it) }
     }
 
     private fun addLogEventData(
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/ndk/NativeCrashDataSource.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/ndk/NativeCrashDataSource.kt
index 1764b4f87d..dc22bcf59a 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/ndk/NativeCrashDataSource.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/ndk/NativeCrashDataSource.kt
@@ -15,7 +15,6 @@ import io.embrace.android.embracesdk.internal.arch.schema.TelemetryAttributes
 import io.embrace.android.embracesdk.internal.config.ConfigService
 import io.embrace.android.embracesdk.internal.logging.EmbLogger
 import io.embrace.android.embracesdk.internal.opentelemetry.embCrashNumber
-import io.embrace.android.embracesdk.internal.opentelemetry.embSessionId
 import io.embrace.android.embracesdk.internal.payload.NativeCrashData
 import io.embrace.android.embracesdk.internal.payload.NativeCrashDataError
 import io.embrace.android.embracesdk.internal.prefs.PreferencesService
@@ -23,6 +22,7 @@ import io.embrace.android.embracesdk.internal.serialization.EmbraceSerializer
 import io.embrace.android.embracesdk.internal.session.properties.EmbraceSessionProperties
 import io.embrace.android.embracesdk.internal.spans.toOtelSeverity
 import io.embrace.android.embracesdk.internal.utils.toUTF8String
+import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 
 internal interface NativeCrashDataSource : LogDataSource, NativeCrashService
 
@@ -50,7 +50,7 @@ internal class NativeCrashDataSourceImpl(
             configService = configService,
             sessionPropertiesProvider = sessionProperties::get
         )
-        crashAttributes.setAttribute(embSessionId, nativeCrash.sessionId)
+        crashAttributes.setAttribute(SessionIncubatingAttributes.SESSION_ID, nativeCrash.sessionId)
         crashAttributes.setAttribute(embCrashNumber, nativeCrashNumber.toString())
         nativeCrash.crash?.let { crashAttributes.setAttribute(embNativeCrashException, it) }
         val nativeErrorsJson = serializer.toJson(nativeCrash.errors, errorSerializerType)
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/logging/EmbraceNetworkLoggingService.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/logging/EmbraceNetworkLoggingService.kt
index 886f39c7f7..7ad6418a20 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/logging/EmbraceNetworkLoggingService.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/logging/EmbraceNetworkLoggingService.kt
@@ -12,6 +12,7 @@ import io.embrace.android.embracesdk.internal.utils.toNonNullMap
 import io.embrace.android.embracesdk.network.EmbraceNetworkRequest
 import io.embrace.android.embracesdk.spans.ErrorCode
 import io.opentelemetry.semconv.ErrorAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 import io.opentelemetry.semconv.HttpAttributes
 import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes
 
@@ -90,7 +91,7 @@ internal class EmbraceNetworkLoggingService(
         HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE.key to networkRequest.bytesSent,
         HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE.key to networkRequest.bytesReceived,
         ErrorAttributes.ERROR_TYPE.key to networkRequest.errorType,
-        "error.message" to networkRequest.errorMessage,
+        ExceptionAttributes.EXCEPTION_MESSAGE.key to networkRequest.errorMessage,
         "emb.w3c_traceparent" to networkRequest.w3cTraceparent,
         "emb.trace_id" to getValidTraceId(networkRequest.traceId),
     ).toNonNullMap().mapValues { it.value.toString() }
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/opentelemetry/EmbraceAttributeKeys.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/opentelemetry/EmbraceAttributeKeys.kt
index 814ac53d73..78759ab918 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/opentelemetry/EmbraceAttributeKeys.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/opentelemetry/EmbraceAttributeKeys.kt
@@ -28,11 +28,6 @@ internal val embProcessIdentifier: EmbraceAttributeKey = EmbraceAttributeKey("pr
  */
 internal val embSequenceId: EmbraceAttributeKey = EmbraceAttributeKey(id = "sequence_id", isPrivate = true)
 
-/**
- * Attribute name for the Embrace Sesssion
- */
-internal val embSessionId: EmbraceAttributeKey = EmbraceAttributeKey("session_id")
-
 /**
  * Attribute name for the application state (foreground/background) at the time the log was recorded
  */
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/opentelemetry/OpenTelemetryConfiguration.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/opentelemetry/OpenTelemetryConfiguration.kt
index e0cc990a30..7b88abc967 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/opentelemetry/OpenTelemetryConfiguration.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/opentelemetry/OpenTelemetryConfiguration.kt
@@ -13,10 +13,10 @@ import io.opentelemetry.sdk.logs.export.LogRecordExporter
 import io.opentelemetry.sdk.resources.Resource
 import io.opentelemetry.sdk.trace.SpanProcessor
 import io.opentelemetry.sdk.trace.export.SpanExporter
+import io.opentelemetry.semconv.ServiceAttributes
 import io.opentelemetry.semconv.incubating.AndroidIncubatingAttributes
 import io.opentelemetry.semconv.incubating.DeviceIncubatingAttributes
 import io.opentelemetry.semconv.incubating.OsIncubatingAttributes
-import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes
 import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes
 
 internal class OpenTelemetryConfiguration(
@@ -28,8 +28,8 @@ internal class OpenTelemetryConfiguration(
     val embraceSdkName = BuildConfig.LIBRARY_PACKAGE_NAME
     val embraceSdkVersion = BuildConfig.VERSION_NAME
     val resource: Resource = Resource.getDefault().toBuilder()
-        .put(ServiceIncubatingAttributes.SERVICE_NAME, embraceSdkName)
-        .put(ServiceIncubatingAttributes.SERVICE_VERSION, embraceSdkVersion)
+        .put(ServiceAttributes.SERVICE_NAME, embraceSdkName)
+        .put(ServiceAttributes.SERVICE_VERSION, embraceSdkVersion)
         .put(OsIncubatingAttributes.OS_NAME, systemInfo.osName)
         .put(OsIncubatingAttributes.OS_VERSION, systemInfo.osVersion)
         .put(OsIncubatingAttributes.OS_TYPE, systemInfo.osType)
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/payload/Envelope.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/payload/Envelope.kt
index 61bdfe835a..6518d8bd57 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/payload/Envelope.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/payload/Envelope.kt
@@ -4,9 +4,9 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Types
 import io.embrace.android.embracesdk.internal.arch.schema.EmbType
-import io.embrace.android.embracesdk.internal.opentelemetry.embSessionId
 import io.embrace.android.embracesdk.internal.spans.findAttributeValue
 import io.embrace.android.embracesdk.internal.spans.hasFixedAttribute
+import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 
 /**
  * Envelope used for Embrace API requests for different types of data:
@@ -45,5 +45,5 @@ internal fun Envelope<SessionPayload>.getSessionSpan(): Span? {
 }
 
 internal fun Envelope<SessionPayload>.getSessionId(): String? {
-    return getSessionSpan()?.attributes?.findAttributeValue(embSessionId.name)
+    return getSessionSpan()?.attributes?.findAttributeValue(SessionIncubatingAttributes.SESSION_ID.key)
 }
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanImpl.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanImpl.kt
index ab08095e61..34b957bddb 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanImpl.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanImpl.kt
@@ -6,13 +6,13 @@ import io.embrace.android.embracesdk.internal.arch.schema.AppTerminationCause
 import io.embrace.android.embracesdk.internal.arch.schema.EmbType
 import io.embrace.android.embracesdk.internal.arch.schema.SchemaType
 import io.embrace.android.embracesdk.internal.clock.nanosToMillis
-import io.embrace.android.embracesdk.internal.opentelemetry.embSessionId
 import io.embrace.android.embracesdk.internal.telemetry.TelemetryService
 import io.embrace.android.embracesdk.internal.utils.Provider
 import io.embrace.android.embracesdk.internal.utils.Uuid
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.ErrorCode
 import io.opentelemetry.sdk.common.Clock
+import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.atomic.AtomicReference
@@ -82,7 +82,7 @@ internal class CurrentSessionSpanImpl(
     }
 
     override fun getSessionId(): String {
-        return sessionSpan.get()?.getSystemAttribute(embSessionId) ?: ""
+        return sessionSpan.get()?.getSystemAttribute(SessionIncubatingAttributes.SESSION_ID) ?: ""
     }
 
     override fun endSession(startNewSession: Boolean, appTerminationCause: AppTerminationCause?): List<EmbraceSpanData> {
@@ -109,7 +109,7 @@ internal class CurrentSessionSpanImpl(
                 } else {
                     val crashTime = openTelemetryClock.now().nanosToMillis()
                     spanRepository.failActiveSpans(crashTime)
-                    endingSessionSpan.setSystemAttribute(appTerminationCause.key, appTerminationCause.value)
+                    endingSessionSpan.setSystemAttribute(appTerminationCause.key.attributeKey, appTerminationCause.value)
                     endingSessionSpan.stop(errorCode = ErrorCode.FAILURE, endTimeMs = crashTime)
                 }
                 spanSink.flushSpans()
@@ -157,7 +157,7 @@ internal class CurrentSessionSpanImpl(
             private = false
         ).apply {
             start(startTimeMs = startTimeMs)
-            setSystemAttribute(embSessionId, Uuid.getEmbUuid())
+            setSystemAttribute(SessionIncubatingAttributes.SESSION_ID, Uuid.getEmbUuid())
         }
     }
 }
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceExtensions.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceExtensions.kt
index 125c8cb213..20027b3075 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceExtensions.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceExtensions.kt
@@ -19,7 +19,7 @@ import io.opentelemetry.api.trace.StatusCode
 import io.opentelemetry.api.trace.Tracer
 import io.opentelemetry.sdk.logs.data.LogRecordData
 import io.opentelemetry.sdk.trace.data.SpanData
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 
 /**
  * Extension functions and constants to augment the core OpenTelemetry SDK and provide Embrace-specific customizations
@@ -135,7 +135,7 @@ internal fun io.embrace.android.embracesdk.Severity.toOtelSeverity(): Severity =
 
 internal fun String.isValidLongValueAttribute() = longValueAttributes.contains(this)
 
-internal val longValueAttributes = setOf(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key)
+internal val longValueAttributes = setOf(ExceptionAttributes.EXCEPTION_STACKTRACE.key)
 
 internal fun StatusCode.toStatus(): io.embrace.android.embracesdk.internal.payload.Span.Status {
     return when (this) {
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanImpl.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanImpl.kt
index 03fe96b7ce..8edd6b35de 100644
--- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanImpl.kt
+++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanImpl.kt
@@ -1,7 +1,6 @@
 package io.embrace.android.embracesdk.internal.spans
 
 import io.embrace.android.embracesdk.internal.arch.schema.EmbType
-import io.embrace.android.embracesdk.internal.arch.schema.EmbraceAttributeKey
 import io.embrace.android.embracesdk.internal.arch.schema.ErrorCodeAttribute
 import io.embrace.android.embracesdk.internal.arch.schema.ErrorCodeAttribute.Failure.fromErrorCode
 import io.embrace.android.embracesdk.internal.arch.schema.FixedAttribute
@@ -15,13 +14,14 @@ import io.embrace.android.embracesdk.internal.utils.truncatedStacktraceText
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
 import io.embrace.android.embracesdk.spans.ErrorCode
+import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.trace.SpanContext
 import io.opentelemetry.api.trace.SpanId
 import io.opentelemetry.api.trace.StatusCode
 import io.opentelemetry.context.Context
 import io.opentelemetry.sdk.common.Clock
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.TimeUnit
@@ -40,8 +40,8 @@ internal class EmbraceSpanImpl(
     private var status = Span.Status.UNSET
     private var updatedName: String? = null
     private val events = ConcurrentLinkedQueue<EmbraceSpanEvent>()
-    private val systemAttributes = ConcurrentHashMap<EmbraceAttributeKey, String>().apply {
-        putAll(spanBuilder.getFixedAttributes().associate { it.key to it.value })
+    private val systemAttributes = ConcurrentHashMap<AttributeKey<String>, String>().apply {
+        putAll(spanBuilder.getFixedAttributes().associate { it.key.attributeKey to it.value })
     }
     private val customAttributes = ConcurrentHashMap<String, String>().apply {
         putAll(spanBuilder.getCustomAttributes())
@@ -106,7 +106,7 @@ internal class EmbraceSpanImpl(
 
             startedSpan.get()?.let { spanToStop ->
                 systemAttributes.forEach { systemAttribute ->
-                    spanToStop.setEmbraceAttribute(systemAttribute.key, systemAttribute.value)
+                    spanToStop.setAttribute(systemAttribute.key, systemAttribute.value)
                 }
                 customAttributes.forEach { attribute ->
                     spanToStop.setAttribute(attribute.key, attribute.value)
@@ -163,14 +163,14 @@ internal class EmbraceSpanImpl(
             }
 
             exception.javaClass.canonicalName?.let { type ->
-                eventAttributes[ExceptionIncubatingAttributes.EXCEPTION_TYPE.key] = type
+                eventAttributes[ExceptionAttributes.EXCEPTION_TYPE.key] = type
             }
 
             exception.message?.let { message ->
-                eventAttributes[ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key] = message
+                eventAttributes[ExceptionAttributes.EXCEPTION_MESSAGE.key] = message
             }
 
-            eventAttributes[ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key] = exception.truncatedStacktraceText()
+            eventAttributes[ExceptionAttributes.EXCEPTION_STACKTRACE.key] = exception.truncatedStacktraceText()
 
             EmbraceSpanEvent.create(
                 name = EXCEPTION_EVENT_NAME,
@@ -248,18 +248,19 @@ internal class EmbraceSpanImpl(
         }
     }
 
-    override fun hasFixedAttribute(fixedAttribute: FixedAttribute): Boolean = systemAttributes[fixedAttribute.key] == fixedAttribute.value
+    override fun hasFixedAttribute(fixedAttribute: FixedAttribute): Boolean =
+        systemAttributes[fixedAttribute.key.attributeKey] == fixedAttribute.value
 
-    override fun getSystemAttribute(key: EmbraceAttributeKey): String? = systemAttributes[key]
+    override fun getSystemAttribute(key: AttributeKey<String>): String? = systemAttributes[key]
 
-    override fun setSystemAttribute(key: EmbraceAttributeKey, value: String) {
+    override fun setSystemAttribute(key: AttributeKey<String>, value: String) {
         systemAttributes[key] = value
     }
 
     override fun removeCustomAttribute(key: String): Boolean = customAttributes.remove(key) != null
 
     private fun getAttributesPayload(): List<Attribute> =
-        systemAttributes.map { Attribute(it.key.name, it.value) } + customAttributes.toNewPayload()
+        systemAttributes.map { Attribute(it.key.key, it.value) } + customAttributes.toNewPayload()
 
     private fun canSnapshot(): Boolean = spanId != null && spanStartTimeMs != null
 
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/EmbraceWebViewServiceTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/EmbraceWebViewServiceTest.kt
index d5e9dd6311..ea2b6dbccc 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/EmbraceWebViewServiceTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/EmbraceWebViewServiceTest.kt
@@ -17,6 +17,7 @@ import io.embrace.android.embracesdk.internal.logging.EmbLoggerImpl
 import io.embrace.android.embracesdk.internal.payload.WebVital
 import io.embrace.android.embracesdk.internal.payload.WebVitalType
 import io.embrace.android.embracesdk.internal.serialization.EmbraceSerializer
+import io.opentelemetry.semconv.UrlAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -72,7 +73,7 @@ internal class EmbraceWebViewServiceTest {
         writer.addedEvents.first().let {
             assert(it.schemaType is SchemaType.WebViewInfo)
             val webViewInfo = it.schemaType as SchemaType.WebViewInfo
-            assertEquals("https://embrace.io/", webViewInfo.attributes()["emb.webview_info.url"])
+            assertEquals("https://embrace.io/", webViewInfo.attributes()[UrlAttributes.URL_FULL.key])
             val webVitals = webViewInfo.attributes()["emb.webview_info.web_vitals"]?.let { it1 ->
                 serializer.fromJson(it1, List::class.java)
             }
@@ -90,7 +91,7 @@ internal class EmbraceWebViewServiceTest {
         writer.addedEvents.forEach {
             assert(it.schemaType is SchemaType.WebViewInfo)
             val webViewInfo = it.schemaType as SchemaType.WebViewInfo
-            assertEquals("https://embrace.io/", webViewInfo.attributes()["emb.webview_info.url"])
+            assertEquals("https://embrace.io/", webViewInfo.attributes()[UrlAttributes.URL_FULL.key])
             val webVitals = webViewInfo.attributes()["emb.webview_info.web_vitals"]?.let { it1 ->
                 serializer.fromJson(it1, List::class.java)
             }
@@ -108,7 +109,7 @@ internal class EmbraceWebViewServiceTest {
         val event = writer.addedEvents.first()
         assert(event.schemaType is SchemaType.WebViewInfo)
         val webViewInfo = event.schemaType as SchemaType.WebViewInfo
-        assertEquals("https://embrace.io/", webViewInfo.attributes()["emb.webview_info.url"])
+        assertEquals("https://embrace.io/", webViewInfo.attributes()[UrlAttributes.URL_FULL.key])
         val webVitals: List<WebVital>? = webViewInfo.attributes()["emb.webview_info.web_vitals"]?.let { wv ->
             val type = Types.newParameterizedType(List::class.java, WebVital::class.java)
             serializer.fromJson(wv, type)
@@ -134,7 +135,7 @@ internal class EmbraceWebViewServiceTest {
         writer.addedEvents.forEach {
             assert(it.schemaType is SchemaType.WebViewInfo)
             val webViewInfo = it.schemaType as SchemaType.WebViewInfo
-            assertEquals("https://embrace.io/", webViewInfo.attributes()["emb.webview_info.url"])
+            assertEquals("https://embrace.io/", webViewInfo.attributes()[UrlAttributes.URL_FULL.key])
             val webVitals = webViewInfo.attributes()["emb.webview_info.web_vitals"]?.let { it1 ->
                 serializer.fromJson(it1, List::class.java)
             }
@@ -151,7 +152,7 @@ internal class EmbraceWebViewServiceTest {
         val event = writer.addedEvents.first()
         assert(event.schemaType is SchemaType.WebViewInfo)
         val webViewInfo = event.schemaType as SchemaType.WebViewInfo
-        assertEquals("https://embrace.io/", webViewInfo.attributes()["emb.webview_info.url"])
+        assertEquals("https://embrace.io/", webViewInfo.attributes()[UrlAttributes.URL_FULL.key])
         val webVitals: List<WebVital>? = webViewInfo.attributes()["emb.webview_info.web_vitals"]?.let { wv ->
             val type = Types.newParameterizedType(List::class.java, WebVital::class.java)
             serializer.fromJson(wv, type)
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/anr/AnrOtelMapperTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/anr/AnrOtelMapperTest.kt
index a3378bd5ba..09ed62ab0a 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/anr/AnrOtelMapperTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/anr/AnrOtelMapperTest.kt
@@ -15,6 +15,8 @@ import io.embrace.android.embracesdk.internal.payload.SpanEvent
 import io.embrace.android.embracesdk.internal.payload.ThreadInfo
 import io.embrace.android.embracesdk.internal.payload.extensions.clearSamples
 import io.opentelemetry.api.trace.SpanId
+import io.opentelemetry.semconv.ExceptionAttributes
+import io.opentelemetry.semconv.JvmAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Before
@@ -199,10 +201,10 @@ internal class AnrOtelMapperTest {
 
         // validate threads
         val thread = checkNotNull(sample.threads?.single())
-        assertEquals(thread.state.toString(), attrs.findAttribute("thread_state").data)
+        assertEquals(thread.state.toString(), attrs.findAttribute(JvmAttributes.JVM_THREAD_STATE.key).data)
         assertEquals(thread.priority, attrs.findAttribute("thread_priority").data?.toInt())
         assertEquals(thread.lines?.size, attrs.findAttribute("frame_count").data?.toInt())
-        assertEquals(thread.lines?.joinToString("\n"), attrs.findAttribute("stacktrace").data)
+        assertEquals(thread.lines?.joinToString("\n"), attrs.findAttribute(ExceptionAttributes.EXCEPTION_STACKTRACE.key).data)
     }
 
     private fun List<Attribute>.findAttribute(key: String): Attribute {
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/anr/ndk/NativeAnrOtelMapperTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/anr/ndk/NativeAnrOtelMapperTest.kt
index 7fa5f07a15..5da30c051c 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/anr/ndk/NativeAnrOtelMapperTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/anr/ndk/NativeAnrOtelMapperTest.kt
@@ -12,6 +12,9 @@ import io.embrace.android.embracesdk.internal.payload.NativeThreadAnrStackframe
 import io.embrace.android.embracesdk.internal.payload.Span
 import io.embrace.android.embracesdk.internal.payload.ThreadState
 import io.embrace.android.embracesdk.internal.serialization.EmbraceSerializer
+import io.opentelemetry.semconv.ExceptionAttributes
+import io.opentelemetry.semconv.JvmAttributes
+import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -82,9 +85,9 @@ internal class NativeAnrOtelMapperTest {
         // assert span attrs
         val attrs = checkNotNull(span.attributes)
         assertEquals("perf.native_thread_blockage", attrs.findAttribute("emb.type").data)
-        assertEquals("1", attrs.findAttribute("thread_id").data)
-        assertEquals("main", attrs.findAttribute("thread_name").data)
-        assertEquals("2", attrs.findAttribute("thread_state").data)
+        assertEquals("1", attrs.findAttribute(ThreadIncubatingAttributes.THREAD_ID.key).data)
+        assertEquals("main", attrs.findAttribute(ThreadIncubatingAttributes.THREAD_NAME.key).data)
+        assertEquals("2", attrs.findAttribute(JvmAttributes.JVM_THREAD_STATE.key).data)
         assertEquals("100", attrs.findAttribute("sampling_offset_ms").data)
         assertEquals("1", attrs.findAttribute("stack_unwinder").data)
 
@@ -103,7 +106,7 @@ internal class NativeAnrOtelMapperTest {
         val expectedStacktrace =
             "[{\"program_counter\":\"0x8000050209\",\"so_load_addr\":\"0x500234500\"," +
                 "\"so_name\":\"/data/app/lib.so\",\"result\":0}]"
-        assertEquals(expectedStacktrace, eventAttrs.findAttribute("stacktrace").data)
+        assertEquals(expectedStacktrace, eventAttrs.findAttribute(ExceptionAttributes.EXCEPTION_STACKTRACE.key).data)
     }
 
     private fun List<Attribute>.findAttribute(key: String): Attribute {
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/arch/destination/LogWriterImplTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/arch/destination/LogWriterImplTest.kt
index ce0b298624..82b04dd760 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/arch/destination/LogWriterImplTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/arch/destination/LogWriterImplTest.kt
@@ -8,13 +8,13 @@ import io.embrace.android.embracesdk.internal.arch.destination.LogWriterImpl
 import io.embrace.android.embracesdk.internal.arch.schema.PrivateSpan
 import io.embrace.android.embracesdk.internal.arch.schema.SchemaType
 import io.embrace.android.embracesdk.internal.arch.schema.TelemetryAttributes
-import io.embrace.android.embracesdk.internal.opentelemetry.embSessionId
 import io.embrace.android.embracesdk.internal.opentelemetry.embState
 import io.embrace.android.embracesdk.internal.session.id.SessionIdTracker
 import io.embrace.android.embracesdk.internal.spans.getAttribute
 import io.embrace.android.embracesdk.internal.spans.hasFixedAttribute
 import io.opentelemetry.api.logs.Severity
 import io.opentelemetry.semconv.incubating.LogIncubatingAttributes
+import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
@@ -57,7 +57,7 @@ internal class LogWriterImplTest {
             assertEquals("test", body)
             assertEquals(Severity.ERROR, severity)
             assertEquals(Severity.ERROR.name, severity.name)
-            assertEquals("session-id", attributes.getAttribute(embSessionId))
+            assertEquals("session-id", attributes.getAttribute(SessionIncubatingAttributes.SESSION_ID))
             assertNotNull(attributes.getAttribute(embState))
             assertNotNull(attributes.getAttribute(LogIncubatingAttributes.LOG_RECORD_UID))
             assertTrue(attributes.hasFixedAttribute(PrivateSpan))
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/arch/schema/TelemetryAttributesTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/arch/schema/TelemetryAttributesTest.kt
index 65ba332ea2..bb32f8170d 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/arch/schema/TelemetryAttributesTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/arch/schema/TelemetryAttributesTest.kt
@@ -8,11 +8,11 @@ import io.embrace.android.embracesdk.internal.config.ConfigService
 import io.embrace.android.embracesdk.internal.config.remote.RemoteConfig
 import io.embrace.android.embracesdk.internal.config.remote.SessionRemoteConfig
 import io.embrace.android.embracesdk.internal.logging.EmbLoggerImpl
-import io.embrace.android.embracesdk.internal.opentelemetry.embSessionId
 import io.embrace.android.embracesdk.internal.session.properties.EmbraceSessionProperties
 import io.embrace.android.embracesdk.internal.spans.getSessionProperty
 import io.embrace.android.embracesdk.internal.utils.Uuid
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
+import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -42,14 +42,14 @@ internal class TelemetryAttributesTest {
         telemetryAttributes = TelemetryAttributes(
             configService = configService,
         )
-        telemetryAttributes.setAttribute(embSessionId, sessionId)
-        telemetryAttributes.setAttribute(ExceptionIncubatingAttributes.EXCEPTION_TYPE, "exceptionValue")
+        telemetryAttributes.setAttribute(SessionIncubatingAttributes.SESSION_ID, sessionId)
+        telemetryAttributes.setAttribute(ExceptionAttributes.EXCEPTION_TYPE, "exceptionValue")
         val attributes = telemetryAttributes.snapshot()
         assertEquals(2, attributes.size)
-        assertEquals(sessionId, attributes[embSessionId.name])
-        assertEquals("exceptionValue", attributes[ExceptionIncubatingAttributes.EXCEPTION_TYPE.key])
-        assertEquals(sessionId, telemetryAttributes.getAttribute(embSessionId))
-        assertEquals("exceptionValue", telemetryAttributes.getAttribute(ExceptionIncubatingAttributes.EXCEPTION_TYPE))
+        assertEquals(sessionId, attributes[SessionIncubatingAttributes.SESSION_ID.key])
+        assertEquals("exceptionValue", attributes[ExceptionAttributes.EXCEPTION_TYPE.key])
+        assertEquals(sessionId, telemetryAttributes.getAttribute(SessionIncubatingAttributes.SESSION_ID))
+        assertEquals("exceptionValue", telemetryAttributes.getAttribute(ExceptionAttributes.EXCEPTION_TYPE))
     }
 
     @Test
@@ -59,7 +59,7 @@ internal class TelemetryAttributesTest {
             sessionPropertiesProvider = sessionProperties::get,
             customAttributes = customAttributes
         )
-        telemetryAttributes.setAttribute(embSessionId, sessionId)
+        telemetryAttributes.setAttribute(SessionIncubatingAttributes.SESSION_ID, sessionId)
         sessionProperties.add("perm", "permVal", true)
         sessionProperties.add("temp", "tempVal", false)
 
@@ -67,7 +67,7 @@ internal class TelemetryAttributesTest {
         assertEquals("attributeValue", attributes["custom"])
         assertEquals("permVal", attributes.getSessionProperty("perm"))
         assertEquals("tempVal", attributes.getSessionProperty("temp"))
-        assertEquals(sessionId, attributes[embSessionId.name])
+        assertEquals(sessionId, attributes[SessionIncubatingAttributes.SESSION_ID.key])
         sessionProperties.add("temp", "newVal", false)
         assertEquals("newVal", telemetryAttributes.snapshot().getSessionProperty("temp"))
     }
@@ -79,8 +79,8 @@ internal class TelemetryAttributesTest {
             configService = configService,
             sessionPropertiesProvider = sessionProperties::get,
         )
-        telemetryAttributes.setAttribute(embSessionId, sessionId)
-        telemetryAttributes.setAttribute(embSessionId, newSessionId)
+        telemetryAttributes.setAttribute(SessionIncubatingAttributes.SESSION_ID, sessionId)
+        telemetryAttributes.setAttribute(SessionIncubatingAttributes.SESSION_ID, newSessionId)
         sessionProperties.add("perm", "permVal", true)
         sessionProperties.add("temp", "tempVal", false)
         sessionProperties.add("perm", "newPermVal", true)
@@ -90,7 +90,7 @@ internal class TelemetryAttributesTest {
         assertEquals(3, attributes.size)
         assertEquals("newPermVal", attributes.getSessionProperty("perm"))
         assertEquals("newTempVal", attributes.getSessionProperty("temp"))
-        assertEquals(newSessionId, attributes[embSessionId.name])
+        assertEquals(newSessionId, attributes[SessionIncubatingAttributes.SESSION_ID.key])
     }
 
     @Test
@@ -98,12 +98,12 @@ internal class TelemetryAttributesTest {
         val newSessionId = Uuid.getEmbUuid()
         telemetryAttributes = TelemetryAttributes(
             configService = configService,
-            customAttributes = mapOf(embSessionId.name to sessionId)
+            customAttributes = mapOf(SessionIncubatingAttributes.SESSION_ID.key to sessionId)
         )
-        telemetryAttributes.setAttribute(embSessionId, newSessionId)
+        telemetryAttributes.setAttribute(SessionIncubatingAttributes.SESSION_ID, newSessionId)
         val attributes = telemetryAttributes.snapshot()
         assertEquals(1, attributes.size)
-        assertEquals(newSessionId, attributes[embSessionId.name])
+        assertEquals(newSessionId, attributes[SessionIncubatingAttributes.SESSION_ID.key])
     }
 
     @Test
@@ -128,7 +128,7 @@ internal class TelemetryAttributesTest {
             sessionPropertiesProvider = sessionProperties::get,
             customAttributes = customAttributes
         )
-        telemetryAttributes.setAttribute(embSessionId, sessionId)
+        telemetryAttributes.setAttribute(SessionIncubatingAttributes.SESSION_ID, sessionId)
 
         val attributes = telemetryAttributes.snapshot()
         assertEquals(1, attributes.size)
@@ -156,7 +156,7 @@ internal class TelemetryAttributesTest {
             sessionPropertiesProvider = sessionProperties::get,
             customAttributes = customAttributes
         )
-        telemetryAttributes.setAttribute(embSessionId, sessionId)
+        telemetryAttributes.setAttribute(SessionIncubatingAttributes.SESSION_ID, sessionId)
 
         val attributes = telemetryAttributes.snapshot()
         assertEquals(4, attributes.size)
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/crash/InternalErrorDataSourceImplTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/crash/InternalErrorDataSourceImplTest.kt
index dfaae7bf42..77d5d7e796 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/crash/InternalErrorDataSourceImplTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/crash/InternalErrorDataSourceImplTest.kt
@@ -7,7 +7,7 @@ import io.embrace.android.embracesdk.internal.logging.EmbLogger
 import io.embrace.android.embracesdk.internal.logging.EmbLoggerImpl
 import io.embrace.android.embracesdk.internal.telemetry.errors.InternalErrorDataSourceImpl
 import io.opentelemetry.api.logs.Severity
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Before
@@ -34,9 +34,9 @@ internal class InternalErrorDataSourceImplTest {
         dataSource.handleInternalError(IllegalStateException())
         val data = logWriter.logEvents.single()
         val attrs = assertInternalErrorLogged(data)
-        assertEquals("java.lang.IllegalStateException", attrs[ExceptionIncubatingAttributes.EXCEPTION_TYPE.key])
-        assertEquals("", attrs[ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key])
-        assertNotNull(attrs[ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key])
+        assertEquals("java.lang.IllegalStateException", attrs[ExceptionAttributes.EXCEPTION_TYPE.key])
+        assertEquals("", attrs[ExceptionAttributes.EXCEPTION_MESSAGE.key])
+        assertNotNull(attrs[ExceptionAttributes.EXCEPTION_STACKTRACE.key])
     }
 
     @Test
@@ -44,9 +44,9 @@ internal class InternalErrorDataSourceImplTest {
         dataSource.handleInternalError(IllegalArgumentException("Whoops!"))
         val data = logWriter.logEvents.single()
         val attrs = assertInternalErrorLogged(data)
-        assertEquals("java.lang.IllegalArgumentException", attrs[ExceptionIncubatingAttributes.EXCEPTION_TYPE.key])
-        assertEquals("Whoops!", attrs[ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key])
-        assertNotNull(attrs[ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key])
+        assertEquals("java.lang.IllegalArgumentException", attrs[ExceptionAttributes.EXCEPTION_TYPE.key])
+        assertEquals("Whoops!", attrs[ExceptionAttributes.EXCEPTION_MESSAGE.key])
+        assertNotNull(attrs[ExceptionAttributes.EXCEPTION_STACKTRACE.key])
     }
 
     @Test
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/crumbs/WebViewUrlDataSourceTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/crumbs/WebViewUrlDataSourceTest.kt
index 68ed1a1c25..3134d03e43 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/crumbs/WebViewUrlDataSourceTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/crumbs/WebViewUrlDataSourceTest.kt
@@ -9,6 +9,7 @@ import io.embrace.android.embracesdk.internal.config.ConfigService
 import io.embrace.android.embracesdk.internal.config.local.SdkLocalConfig
 import io.embrace.android.embracesdk.internal.config.local.WebViewLocalConfig
 import io.embrace.android.embracesdk.internal.logging.EmbLoggerImpl
+import io.opentelemetry.semconv.UrlAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -52,7 +53,7 @@ internal class WebViewUrlDataSourceTest {
             assertEquals(15000000000, spanStartTimeMs)
             assertEquals(
                 mapOf(
-                    "webview.url" to "http://www.google.com?query=123"
+                    UrlAttributes.URL_FULL.key to "http://www.google.com?query=123"
                 ),
                 schemaType.attributes()
             )
@@ -87,7 +88,7 @@ internal class WebViewUrlDataSourceTest {
             assertEquals(15000000000, spanStartTimeMs)
             assertEquals(
                 mapOf(
-                    "webview.url" to "http://www.google.com"
+                    UrlAttributes.URL_FULL.key to "http://www.google.com"
                 ),
                 schemaType.attributes()
             )
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/webview/WebViewDataSourceTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/webview/WebViewDataSourceTest.kt
index e42ff506c5..d5808c5c30 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/webview/WebViewDataSourceTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/capture/webview/WebViewDataSourceTest.kt
@@ -9,6 +9,7 @@ import io.embrace.android.embracesdk.internal.payload.WebViewInfo
 import io.embrace.android.embracesdk.internal.payload.WebVital
 import io.embrace.android.embracesdk.internal.payload.WebVitalType
 import io.embrace.android.embracesdk.internal.serialization.EmbraceSerializer
+import io.opentelemetry.semconv.UrlAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -44,8 +45,8 @@ internal class WebViewDataSourceTest {
         dataSource.loadDataIntoSession(listOf(webViewInfo1, webViewInfo2))
         assertEquals(2, writer.addedEvents.size)
         assertEquals(2, writer.addedEvents.count { it.schemaType.fixedObjectName == "webview-info" })
-        assertEquals("https://example1.com", writer.addedEvents[0].schemaType.attributes()["emb.webview_info.url"])
-        assertEquals("https://example2.com", writer.addedEvents[1].schemaType.attributes()["emb.webview_info.url"])
+        assertEquals("https://example1.com", writer.addedEvents[0].schemaType.attributes()[UrlAttributes.URL_FULL.key])
+        assertEquals("https://example2.com", writer.addedEvents[1].schemaType.attributes()[UrlAttributes.URL_FULL.key])
     }
 
     private fun getWebViewInfo(url: String): WebViewInfo {
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakePersistableEmbraceSpan.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakePersistableEmbraceSpan.kt
index 514897bda1..cb8da54a1e 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakePersistableEmbraceSpan.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakePersistableEmbraceSpan.kt
@@ -1,7 +1,6 @@
 package io.embrace.android.embracesdk.fakes
 
 import io.embrace.android.embracesdk.internal.arch.schema.EmbType
-import io.embrace.android.embracesdk.internal.arch.schema.EmbraceAttributeKey
 import io.embrace.android.embracesdk.internal.arch.schema.ErrorCodeAttribute
 import io.embrace.android.embracesdk.internal.arch.schema.ErrorCodeAttribute.Failure.fromErrorCode
 import io.embrace.android.embracesdk.internal.arch.schema.FixedAttribute
@@ -18,6 +17,7 @@ import io.embrace.android.embracesdk.internal.spans.toStatus
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
 import io.embrace.android.embracesdk.spans.ErrorCode
+import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.api.trace.SpanContext
 import io.opentelemetry.api.trace.StatusCode
 import io.opentelemetry.context.Context
@@ -80,7 +80,7 @@ internal class FakePersistableEmbraceSpan(
 
             if (status == Span.Status.ERROR) {
                 val error = errorCode?.fromErrorCode() ?: ErrorCodeAttribute.Failure
-                setSystemAttribute(error.key, error.value)
+                setSystemAttribute(error.key.attributeKey, error.value)
             }
 
             val timestamp = endTimeMs ?: fakeClock.now()
@@ -149,10 +149,10 @@ internal class FakePersistableEmbraceSpan(
     override fun hasFixedAttribute(fixedAttribute: FixedAttribute): Boolean =
         attributes.hasFixedAttribute(fixedAttribute)
 
-    override fun getSystemAttribute(key: EmbraceAttributeKey): String? = attributes[key.name]
+    override fun getSystemAttribute(key: AttributeKey<String>): String? = attributes[key.key]
 
-    override fun setSystemAttribute(key: EmbraceAttributeKey, value: String) {
-        attributes[key.name] = value
+    override fun setSystemAttribute(key: AttributeKey<String>, value: String) {
+        attributes[key.key] = value
     }
 
     override fun removeCustomAttribute(key: String): Boolean = attributes.remove(key) != null
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeSession.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeSession.kt
index 730c974d2d..7cd3446925 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeSession.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeSession.kt
@@ -3,7 +3,6 @@ package io.embrace.android.embracesdk.fakes
 import io.embrace.android.embracesdk.fixtures.testSpan
 import io.embrace.android.embracesdk.internal.arch.schema.EmbType
 import io.embrace.android.embracesdk.internal.clock.millisToNanos
-import io.embrace.android.embracesdk.internal.opentelemetry.embSessionId
 import io.embrace.android.embracesdk.internal.payload.ApplicationState
 import io.embrace.android.embracesdk.internal.payload.Attribute
 import io.embrace.android.embracesdk.internal.payload.Envelope
@@ -13,6 +12,7 @@ import io.embrace.android.embracesdk.internal.payload.SessionZygote
 import io.embrace.android.embracesdk.internal.payload.Span
 import io.embrace.android.embracesdk.internal.payload.getSessionSpan
 import io.opentelemetry.api.trace.SpanId
+import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 
 internal fun fakeSessionZygote() = SessionZygote(
     sessionId = "fakeSessionId",
@@ -34,7 +34,7 @@ internal fun fakeSessionEnvelope(
         parentSpanId = SpanId.getInvalid(),
         attributes = listOf(
             Attribute("emb.type", EmbType.Ux.Session.value),
-            Attribute(embSessionId.name, sessionId)
+            Attribute(SessionIncubatingAttributes.SESSION_ID.key, sessionId)
         )
     )
     val spans = listOf(testSpan, sessionSpan)
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/logs/EmbraceLogServiceTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/logs/EmbraceLogServiceTest.kt
index 5c9b33b35d..2f620b34fe 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/logs/EmbraceLogServiceTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/logs/EmbraceLogServiceTest.kt
@@ -28,7 +28,7 @@ import io.embrace.android.embracesdk.internal.session.properties.EmbraceSessionP
 import io.embrace.android.embracesdk.internal.spans.getSessionProperty
 import io.embrace.android.embracesdk.internal.worker.BackgroundWorker
 import io.opentelemetry.api.logs.Severity
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 import io.opentelemetry.semconv.incubating.LogIncubatingAttributes
 import org.junit.Assert
 import org.junit.Assert.assertEquals
@@ -90,19 +90,19 @@ internal class EmbraceLogServiceTest {
         assertEquals(Severity.INFO, first.severity)
         assertEquals("bar", first.schemaType.attributes()["foo"])
         assertNotNull(first.schemaType.attributes()[LogIncubatingAttributes.LOG_RECORD_UID.key])
-        assertNull(first.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_TYPE.key])
+        assertNull(first.schemaType.attributes()[ExceptionAttributes.EXCEPTION_TYPE.key])
 
         val second = logs[1]
         assertEquals("Warning world", second.message)
         assertEquals(Severity.WARN, second.severity)
         assertNotNull(second.schemaType.attributes()[LogIncubatingAttributes.LOG_RECORD_UID.key])
-        assertNull(second.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_TYPE.key])
+        assertNull(second.schemaType.attributes()[ExceptionAttributes.EXCEPTION_TYPE.key])
 
         val third = logs[2]
         assertEquals("Hello errors", third.message)
         assertEquals(Severity.ERROR, third.severity)
         assertNotNull(third.schemaType.attributes()[LogIncubatingAttributes.LOG_RECORD_UID.key])
-        assertNull(third.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_TYPE.key])
+        assertNull(third.schemaType.attributes()[ExceptionAttributes.EXCEPTION_TYPE.key])
         third.assertIsType(EmbType.System.Log)
     }
 
@@ -125,11 +125,11 @@ internal class EmbraceLogServiceTest {
         assertEquals(Severity.WARN, log.severity)
         assertNotNull(log.schemaType.attributes()[LogIncubatingAttributes.LOG_RECORD_UID.key])
         assertEquals(LogExceptionType.HANDLED.value, log.schemaType.attributes()[embExceptionHandling.name])
-        assertEquals("NullPointerException", log.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_TYPE.key])
-        assertEquals("exception message", log.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key])
+        assertEquals("NullPointerException", log.schemaType.attributes()[ExceptionAttributes.EXCEPTION_TYPE.key])
+        assertEquals("exception message", log.schemaType.attributes()[ExceptionAttributes.EXCEPTION_MESSAGE.key])
         assertEquals(
             exception.stackTrace.toExceptionSchema(),
-            log.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key]
+            log.schemaType.attributes()[ExceptionAttributes.EXCEPTION_STACKTRACE.key]
         )
         log.assertIsType(EmbType.System.Exception)
     }
@@ -157,11 +157,11 @@ internal class EmbraceLogServiceTest {
         assertEquals(Severity.ERROR, log.severity)
         assertNotNull(log.schemaType.attributes()[LogIncubatingAttributes.LOG_RECORD_UID.key])
         assertEquals(LogExceptionType.HANDLED.value, log.schemaType.attributes()[embExceptionHandling.name])
-        assertEquals("NullPointerException", log.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_TYPE.key])
-        assertEquals("exception message", log.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key])
+        assertEquals("NullPointerException", log.schemaType.attributes()[ExceptionAttributes.EXCEPTION_TYPE.key])
+        assertEquals("exception message", log.schemaType.attributes()[ExceptionAttributes.EXCEPTION_MESSAGE.key])
         assertEquals(
             exception.stackTrace.toExceptionSchema(),
-            log.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key]
+            log.schemaType.attributes()[ExceptionAttributes.EXCEPTION_STACKTRACE.key]
         )
         assertEquals("context", log.schemaType.attributes()[embFlutterExceptionContext.name])
         assertEquals("library", log.schemaType.attributes()[embFlutterExceptionLibrary.name])
@@ -186,11 +186,11 @@ internal class EmbraceLogServiceTest {
         val log = logWriter.logEvents.single()
         assertEquals("Hello world", log.message)
         assertEquals(Severity.WARN, log.severity)
-        assertEquals("NullPointerException", log.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_TYPE.key])
-        assertEquals("exception message", log.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key])
+        assertEquals("NullPointerException", log.schemaType.attributes()[ExceptionAttributes.EXCEPTION_TYPE.key])
+        assertEquals("exception message", log.schemaType.attributes()[ExceptionAttributes.EXCEPTION_MESSAGE.key])
         assertEquals(
             exception.stackTrace.toExceptionSchema(),
-            log.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key]
+            log.schemaType.attributes()[ExceptionAttributes.EXCEPTION_STACKTRACE.key]
         )
         assertNotNull(log.schemaType.attributes()[LogIncubatingAttributes.LOG_RECORD_UID.key])
         assertEquals(LogExceptionType.UNHANDLED.value, log.schemaType.attributes()[embExceptionHandling.name])
@@ -311,9 +311,9 @@ internal class EmbraceLogServiceTest {
         assertEquals(Severity.INFO, log.severity)
         assertNotNull(log.schemaType.attributes()[LogIncubatingAttributes.LOG_RECORD_UID.key])
 
-        assertEquals("my stacktrace", log.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key])
-        assertEquals(null, log.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_TYPE.key])
-        assertEquals(null, log.schemaType.attributes()[ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key])
+        assertEquals("my stacktrace", log.schemaType.attributes()[ExceptionAttributes.EXCEPTION_STACKTRACE.key])
+        assertEquals(null, log.schemaType.attributes()[ExceptionAttributes.EXCEPTION_TYPE.key])
+        assertEquals(null, log.schemaType.attributes()[ExceptionAttributes.EXCEPTION_MESSAGE.key])
         assertEquals(LogExceptionType.HANDLED.value, log.schemaType.attributes()[embExceptionHandling.name])
     }
 
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanAttributeTests.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanAttributeTests.kt
index 0a9113652b..f46182c814 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanAttributeTests.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/spans/CurrentSessionSpanAttributeTests.kt
@@ -3,6 +3,7 @@ package io.embrace.android.embracesdk.internal.spans
 import io.embrace.android.embracesdk.fakes.FakeClock
 import io.embrace.android.embracesdk.fakes.injection.FakeInitModule
 import io.embrace.android.embracesdk.findAttributeValue
+import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Before
@@ -47,7 +48,7 @@ internal class CurrentSessionSpanAttributeTests {
     }
 
     private fun EmbraceSpanData.assertCommonSessionSpanAttrs() {
-        assertNotNull(attributes.findAttributeValue("emb.session_id"))
+        assertNotNull(attributes.findAttributeValue(SessionIncubatingAttributes.SESSION_ID.key))
         assertEquals("ux.session", attributes.findAttributeValue("emb.type"))
     }
 }
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanImplTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanImplTest.kt
index ddda14d95f..1f231762c7 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanImplTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanImplTest.kt
@@ -24,7 +24,7 @@ import io.opentelemetry.api.trace.SpanId
 import io.opentelemetry.sdk.OpenTelemetrySdk
 import io.opentelemetry.sdk.common.Clock
 import io.opentelemetry.sdk.trace.SdkTracerProvider
-import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes
+import io.opentelemetry.semconv.ExceptionAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
@@ -211,12 +211,12 @@ internal class EmbraceSpanImplTest {
                 assertEquals(timestampNanos, timestampNanos)
                 assertEquals(
                     IllegalStateException::class.java.canonicalName,
-                    attrs.single { it.key == ExceptionIncubatingAttributes.EXCEPTION_TYPE.key }.data
+                    attrs.single { it.key == ExceptionAttributes.EXCEPTION_TYPE.key }.data
                 )
-                assertEquals("oops", attrs.single { it.key == ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key }.data)
+                assertEquals("oops", attrs.single { it.key == ExceptionAttributes.EXCEPTION_MESSAGE.key }.data)
                 assertEquals(
                     firstExceptionStackTrace,
-                    attrs.single { it.key == ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key }.data
+                    attrs.single { it.key == ExceptionAttributes.EXCEPTION_STACKTRACE.key }.data
                 )
             }
             with(sanitizedEvents.last()) {
@@ -225,13 +225,13 @@ internal class EmbraceSpanImplTest {
                 assertEquals(timestampNanos, timestampNanos)
                 assertEquals(
                     RuntimeException::class.java.canonicalName,
-                    attrs.single { it.key == ExceptionIncubatingAttributes.EXCEPTION_TYPE.key }.data
+                    attrs.single { it.key == ExceptionAttributes.EXCEPTION_TYPE.key }.data
                 )
-                assertEquals("haha", attrs.single { it.key == ExceptionIncubatingAttributes.EXCEPTION_MESSAGE.key }.data)
+                assertEquals("haha", attrs.single { it.key == ExceptionAttributes.EXCEPTION_MESSAGE.key }.data)
                 assertEquals("myValue", attrs.single { it.key == "myKey" }.data)
                 assertEquals(
                     secondExceptionStackTrace,
-                    attrs.single { it.key == ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE.key }.data
+                    attrs.single { it.key == ExceptionAttributes.EXCEPTION_STACKTRACE.key }.data
                 )
             }
         }
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/ndk/NativeCrashDataSourceImplTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/ndk/NativeCrashDataSourceImplTest.kt
index 3b9d802cbb..0e08e25c1a 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/ndk/NativeCrashDataSourceImplTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/ndk/NativeCrashDataSourceImplTest.kt
@@ -20,7 +20,6 @@ import io.embrace.android.embracesdk.internal.logging.EmbLogger
 import io.embrace.android.embracesdk.internal.logging.EmbLoggerImpl
 import io.embrace.android.embracesdk.internal.ndk.NativeCrashDataSourceImpl
 import io.embrace.android.embracesdk.internal.opentelemetry.embCrashNumber
-import io.embrace.android.embracesdk.internal.opentelemetry.embSessionId
 import io.embrace.android.embracesdk.internal.payload.NativeCrashDataError
 import io.embrace.android.embracesdk.internal.serialization.EmbraceSerializer
 import io.embrace.android.embracesdk.internal.session.id.SessionIdTracker
@@ -29,6 +28,7 @@ import io.embrace.android.embracesdk.internal.spans.getAttribute
 import io.embrace.android.embracesdk.internal.spans.hasFixedAttribute
 import io.embrace.android.embracesdk.internal.utils.toUTF8String
 import io.opentelemetry.semconv.incubating.LogIncubatingAttributes
+import io.opentelemetry.semconv.incubating.SessionIncubatingAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
@@ -85,7 +85,7 @@ internal class NativeCrashDataSourceImplTest {
             assertEquals(1, emitCalled)
             assertTrue(attributes.hasFixedAttribute(EmbType.System.NativeCrash))
             assertNotNull(attributes.getAttribute(LogIncubatingAttributes.LOG_RECORD_UID))
-            assertEquals(testNativeCrashData.sessionId, attributes.getAttribute(embSessionId))
+            assertEquals(testNativeCrashData.sessionId, attributes.getAttribute(SessionIncubatingAttributes.SESSION_ID))
             assertEquals("1", attributes.getAttribute(embCrashNumber))
             assertEquals(testNativeCrashData.crash, attributes.getAttribute(embNativeCrashException))
             assertEquals(
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/opentelemetry/OTelAssertions.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/opentelemetry/OTelAssertions.kt
index b018fee730..0601d1b160 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/opentelemetry/OTelAssertions.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/opentelemetry/OTelAssertions.kt
@@ -5,10 +5,10 @@ import io.embrace.android.embracesdk.internal.arch.schema.EmbraceAttributeKey
 import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.sdk.resources.Resource
 import io.opentelemetry.sdk.trace.data.SpanData
+import io.opentelemetry.semconv.ServiceAttributes
 import io.opentelemetry.semconv.incubating.AndroidIncubatingAttributes
 import io.opentelemetry.semconv.incubating.DeviceIncubatingAttributes
 import io.opentelemetry.semconv.incubating.OsIncubatingAttributes
-import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes
 import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes
 import org.junit.Assert.assertEquals
 
@@ -17,8 +17,8 @@ internal fun Resource.assertExpectedAttributes(
     expectedServiceVersion: String,
     systemInfo: SystemInfo
 ) {
-    assertEquals(expectedServiceName, getAttribute(ServiceIncubatingAttributes.SERVICE_NAME))
-    assertEquals(expectedServiceVersion, getAttribute(ServiceIncubatingAttributes.SERVICE_VERSION))
+    assertEquals(expectedServiceName, getAttribute(ServiceAttributes.SERVICE_NAME))
+    assertEquals(expectedServiceVersion, getAttribute(ServiceAttributes.SERVICE_VERSION))
     assertEquals(expectedServiceName, getAttribute(TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME))
     assertEquals(expectedServiceVersion, getAttribute(TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION))
     assertEquals(systemInfo.osName, getAttribute(OsIncubatingAttributes.OS_NAME))
diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/opentelemetry/OpenTelemetryConfigurationTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/opentelemetry/OpenTelemetryConfigurationTest.kt
index df647e4e74..2832f8846f 100644
--- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/opentelemetry/OpenTelemetryConfigurationTest.kt
+++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/opentelemetry/OpenTelemetryConfigurationTest.kt
@@ -4,10 +4,10 @@ import io.embrace.android.embracesdk.internal.SystemInfo
 import io.embrace.android.embracesdk.internal.logs.LogSinkImpl
 import io.embrace.android.embracesdk.internal.opentelemetry.OpenTelemetryConfiguration
 import io.embrace.android.embracesdk.internal.spans.SpanSinkImpl
+import io.opentelemetry.semconv.ServiceAttributes
 import io.opentelemetry.semconv.incubating.AndroidIncubatingAttributes
 import io.opentelemetry.semconv.incubating.DeviceIncubatingAttributes
 import io.opentelemetry.semconv.incubating.OsIncubatingAttributes
-import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes
 import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Test
@@ -33,8 +33,8 @@ internal class OpenTelemetryConfigurationTest {
             processIdentifier = "fakeProcessIdentifier"
         )
 
-        assertEquals(configuration.embraceSdkName, configuration.resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME))
-        assertEquals(configuration.embraceSdkVersion, configuration.resource.getAttribute(ServiceIncubatingAttributes.SERVICE_VERSION))
+        assertEquals(configuration.embraceSdkName, configuration.resource.getAttribute(ServiceAttributes.SERVICE_NAME))
+        assertEquals(configuration.embraceSdkVersion, configuration.resource.getAttribute(ServiceAttributes.SERVICE_VERSION))
         assertEquals(configuration.embraceSdkName, configuration.resource.getAttribute(TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME))
         assertEquals(
             configuration.embraceSdkVersion,