Wire in correct session ids for native crashes (#3275)

fractalwrench · web-flow · commit e2ac120338cd · 2026-04-21T17:36:11.000+01:00
* fix: rate limit manual end via user session

* persist inactivity timeout for user sessions

* return correct ID in SdkStateApiDelegate

* refactor: alter timer syntax

* refactor inactivity timeout

* update semantic conventions

* enforce manual session end requirements correctly

* handle backwards time shift

* support correct session ordinals

* wire through session ids

* refactor: prevent setting part id without user session id

* wire in correct session ids for native crashes
diff --git a/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/envelope/log/LogEnvelopeSourceImpl.kt b/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/envelope/log/LogEnvelopeSourceImpl.kt
@@ -11,7 +11,6 @@ import io.embrace.android.embracesdk.internal.payload.Envelope
 import io.embrace.android.embracesdk.internal.payload.Envelope.Companion.createLogEnvelope
 import io.embrace.android.embracesdk.internal.payload.LogPayload
 import io.embrace.android.embracesdk.semconv.EmbSessionAttributes
-import io.opentelemetry.kotlin.semconv.SessionAttributes
 
 internal class LogEnvelopeSourceImpl(
     private val metadataSource: EnvelopeMetadataSource,
@@ -40,7 +39,7 @@ internal class LogEnvelopeSourceImpl(
             val nativeCrash = payload.logs?.firstOrNull()
             val envelope = cachedLogEnvelopeStore.get(
                 createNativeCrashEnvelopeMetadata(
-                    sessionId = nativeCrash?.attributes?.findAttributeValue(SessionAttributes.SESSION_ID),
+                    sessionPartId = nativeCrash?.attributes?.findAttributeValue(EmbSessionAttributes.EMB_SESSION_PART_ID),
                     processIdentifier = nativeCrash?.attributes?.findAttributeValue(EmbSessionAttributes.EMB_PROCESS_IDENTIFIER)
                 )
             )
diff --git a/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/resurrection/PayloadResurrectionServiceImpl.kt b/embrace-android-core/src/main/kotlin/io/embrace/android/embracesdk/internal/resurrection/PayloadResurrectionServiceImpl.kt
@@ -69,7 +69,7 @@ internal class PayloadResurrectionServiceImpl(
         val nativeCrashService = nativeCrashServiceProvider()
         val undeliveredPayloads = cacheStorageService.getUndeliveredPayloads()
         val payloadsToResurrect = undeliveredPayloads.filterNot { it.isCrashEnvelope() }
-        val nativeCrashes = nativeCrashService?.getNativeCrashes()?.associateBy { it.sessionId } ?: emptyMap()
+        val nativeCrashes = nativeCrashService?.getNativeCrashes()?.associateBy { it.sessionPartId } ?: emptyMap()
         val processedCrashes = mutableSetOf<NativeCrashData>()
 
         payloadsToResurrect.forEach { payload ->
@@ -126,7 +126,7 @@ internal class PayloadResurrectionServiceImpl(
                     if (resource != null && metadata != null) {
                         cachedLogEnvelopeStore.create(
                             storedTelemetryMetadata = createNativeCrashEnvelopeMetadata(
-                                sessionId = nativeCrash.sessionId
+                                sessionPartId = nativeCrash.sessionPartId
                             ),
                             resource = resource,
                             metadata = metadata
@@ -180,7 +180,7 @@ internal class PayloadResurrectionServiceImpl(
                 val nativeCrash = if (nativeCrashService != null && sessionId != null) {
                     nativeCrashProvider(sessionId)?.apply {
                         val nativeCrashEnvelopeMetadata = createNativeCrashEnvelopeMetadata(
-                            sessionId = sessionId,
+                            sessionPartId = sessionId,
                             processIdentifier = processIdentifier
                         )
 
@@ -269,7 +269,7 @@ internal class PayloadResurrectionServiceImpl(
      * Attach crash data to the existing session span in the payload if it exists
      */
     private fun Span.attachCrashToSession(nativeCrashData: NativeCrashData): Span {
-        return if (attributes?.findAttributeValue(SessionAttributes.SESSION_ID) == nativeCrashData.sessionId) {
+        return if (attributes?.findAttributeValue(SessionAttributes.SESSION_ID) == nativeCrashData.sessionPartId) {
             copy(
                 attributes = attributes?.plus(
                     Attribute(
diff --git a/embrace-android-core/src/test/kotlin/io/embrace/android/embracesdk/internal/envelope/log/LogEnvelopeSourceImplTest.kt b/embrace-android-core/src/test/kotlin/io/embrace/android/embracesdk/internal/envelope/log/LogEnvelopeSourceImplTest.kt
@@ -17,7 +17,6 @@ import io.embrace.android.embracesdk.internal.otel.logs.LogRequest
 import io.embrace.android.embracesdk.internal.otel.sdk.findAttributeValue
 import io.embrace.android.embracesdk.internal.payload.LogPayload
 import io.embrace.android.embracesdk.semconv.EmbSessionAttributes
-import io.opentelemetry.kotlin.semconv.SessionAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
@@ -97,10 +96,10 @@ internal class LogEnvelopeSourceImplTest {
     fun `check native crash envelope`() {
         val crashPayload = LogPayload(logs = listOf(nativeCrashLog))
         val crashLogAttributes = checkNotNull(nativeCrashLog.attributes)
-        val expectedSessionId = crashLogAttributes.findAttributeValue(SessionAttributes.SESSION_ID)
+        val expectedSessionId = crashLogAttributes.findAttributeValue(EmbSessionAttributes.EMB_SESSION_PART_ID)
         val expectedProcessIdentifier = crashLogAttributes.findAttributeValue(EmbSessionAttributes.EMB_PROCESS_IDENTIFIER)
         val cachedCrashEnvelopeMetadata = createNativeCrashEnvelopeMetadata(
-            sessionId = expectedSessionId,
+            sessionPartId = expectedSessionId,
             processIdentifier = expectedProcessIdentifier,
         )
         logSource.singleLogPayloadsSource = listOf(
diff --git a/embrace-android-core/src/test/kotlin/io/embrace/android/embracesdk/internal/resurrection/PayloadResurrectionServiceImplTest.kt b/embrace-android-core/src/test/kotlin/io/embrace/android/embracesdk/internal/resurrection/PayloadResurrectionServiceImplTest.kt
@@ -496,7 +496,7 @@ class PayloadResurrectionServiceImplTest {
         sessionId: String,
     ) = NativeCrashData(
         nativeCrashId = nativeCrashId,
-        sessionId = sessionId,
+        sessionPartId = sessionId,
         timestamp = 0L,
         crash = null,
         symbols = null,
diff --git a/embrace-android-delivery/src/main/kotlin/io/embrace/android/embracesdk/internal/delivery/storage/CachedLogEnvelopeStore.kt b/embrace-android-delivery/src/main/kotlin/io/embrace/android/embracesdk/internal/delivery/storage/CachedLogEnvelopeStore.kt
@@ -37,11 +37,11 @@ interface CachedLogEnvelopeStore {
 
     companion object {
         fun createNativeCrashEnvelopeMetadata(
-            sessionId: String? = null,
+            sessionPartId: String? = null,
             processIdentifier: String? = null,
         ) = StoredTelemetryMetadata(
             timestamp = 0L,
-            uuid = sessionId ?: "none",
+            uuid = sessionPartId ?: "none",
             processIdentifier = processIdentifier ?: "none",
             envelopeType = SupportedEnvelopeType.CRASH,
             payloadType = PayloadType.NATIVE_CRASH,
diff --git a/embrace-android-delivery/src/test/kotlin/io/embrace/android/embracesdk/internal/delivery/storage/CachedLogEnvelopeStoreImplTest.kt b/embrace-android-delivery/src/test/kotlin/io/embrace/android/embracesdk/internal/delivery/storage/CachedLogEnvelopeStoreImplTest.kt
@@ -51,7 +51,7 @@ class CachedLogEnvelopeStoreImplTest {
         )
 
         val anotherCrashMetadata = createNativeCrashEnvelopeMetadata(
-            sessionId = "another-session",
+            sessionPartId = "another-session",
             processIdentifier = "another-process"
         )
 
@@ -69,7 +69,7 @@ class CachedLogEnvelopeStoreImplTest {
 
     companion object {
         val fakeNativeCrashEnvelope = createNativeCrashEnvelopeMetadata(
-            sessionId = "old-session-id",
+            sessionPartId = "old-session-id",
             processIdentifier = "old-process-id"
         )
     }
diff --git a/embrace-android-instrumentation-crash-ndk/src/main/kotlin/io/embrace/android/embracesdk/internal/instrumentation/crash/ndk/NativeCrashDataSourceImpl.kt b/embrace-android-instrumentation-crash-ndk/src/main/kotlin/io/embrace/android/embracesdk/internal/instrumentation/crash/ndk/NativeCrashDataSourceImpl.kt
@@ -38,15 +38,20 @@ internal class NativeCrashDataSourceImpl(
             val nativeCrashNumber = args.ordinalStore.incrementAndGet(Ordinal.NATIVE_CRASH)
             val crashAttributes = TelemetryAttributes().apply {
                 setAttribute(
-                    key = SessionAttributes.SESSION_ID,
-                    value = nativeCrash.sessionId,
+                    key = EmbSessionAttributes.EMB_SESSION_PART_ID,
+                    value = nativeCrash.sessionPartId,
                     keepBlankishValues = false,
                 )
 
-                nativeCrash.userSessionId?.let {
+                nativeCrash.userSessionId?.let { userSessionId ->
+                    setAttribute(
+                        key = SessionAttributes.SESSION_ID,
+                        value = userSessionId,
+                        keepBlankishValues = false,
+                    )
                     setAttribute(
                         key = EmbSessionAttributes.EMB_USER_SESSION_ID,
-                        value = it,
+                        value = userSessionId,
                         keepBlankishValues = false,
                     )
                 }
diff --git a/embrace-android-instrumentation-crash-ndk/src/test/kotlin/io/embrace/android/embracesdk/internal/instrumentation/crash/ndk/NativeCrashDataSourceImplTest.kt b/embrace-android-instrumentation-crash-ndk/src/test/kotlin/io/embrace/android/embracesdk/internal/instrumentation/crash/ndk/NativeCrashDataSourceImplTest.kt
@@ -59,7 +59,11 @@ internal class NativeCrashDataSourceImplTest {
             assertEquals("value", attributes[sessionPropertyName])
             assertEquals("background", attributes[EmbSessionAttributes.EMB_STATE])
             assertEquals(
-                testNativeCrashData.sessionId,
+                testNativeCrashData.sessionPartId,
+                attributes[EmbSessionAttributes.EMB_SESSION_PART_ID]
+            )
+            assertEquals(
+                testNativeCrashData.userSessionId,
                 attributes[SessionAttributes.SESSION_ID]
             )
             assertEquals(
@@ -81,7 +85,7 @@ internal class NativeCrashDataSourceImplTest {
         nativeCrashDataSource.sendNativeCrash(
             nativeCrash = NativeCrashData(
                 nativeCrashId = "nativeCrashId",
-                sessionId = "null",
+                sessionPartId = "null",
                 timestamp = 1700000000000,
                 crash = null,
                 symbols = null,
@@ -94,6 +98,9 @@ internal class NativeCrashDataSourceImplTest {
             val attributes = schemaType.attributes()
             assertEquals(EmbType.System.NativeCrash, schemaType.telemetryType)
             assertEquals("1", attributes[EmbAndroidAttributes.EMB_ANDROID_CRASH_NUMBER])
+            assertNull(attributes[EmbSessionAttributes.EMB_SESSION_PART_ID])
+            assertNull(attributes[SessionAttributes.SESSION_ID])
+            assertNull(attributes[EmbSessionAttributes.EMB_USER_SESSION_ID])
             assertNull(attributes[embNativeCrashException])
             assertNull(attributes[embNativeCrashSymbols])
         }
@@ -104,7 +111,7 @@ internal class NativeCrashDataSourceImplTest {
         nativeCrashDataSource.sendNativeCrash(
             nativeCrash = NativeCrashData(
                 nativeCrashId = "nativeCrashId",
-                sessionId = "",
+                sessionPartId = "",
                 timestamp = 1700000000000,
                 crash = "",
                 symbols = emptyMap(),
@@ -117,6 +124,9 @@ internal class NativeCrashDataSourceImplTest {
             val attributes = schemaType.attributes()
             assertEquals(EmbType.System.NativeCrash, schemaType.telemetryType)
             assertEquals("1", attributes[EmbAndroidAttributes.EMB_ANDROID_CRASH_NUMBER])
+            assertNull(attributes[EmbSessionAttributes.EMB_SESSION_PART_ID])
+            assertNull(attributes[SessionAttributes.SESSION_ID])
+            assertNull(attributes[EmbSessionAttributes.EMB_USER_SESSION_ID])
             assertNull(attributes[EmbSessionAttributes.EMB_STATE])
             assertNull(attributes[embNativeCrashException])
             assertNull(attributes[embNativeCrashSymbols])
@@ -125,7 +135,7 @@ internal class NativeCrashDataSourceImplTest {
 
     private val testNativeCrashData: NativeCrashData = NativeCrashData(
         nativeCrashId = "nativeCrashId",
-        sessionId = "sessionId",
+        sessionPartId = "sessionId",
         userSessionId = "userSessionId",
         timestamp = 1700000000000,
         crash = "base64binarystring",
diff --git a/embrace-android-otel-fakes/src/main/kotlin/io/embrace/android/embracesdk/fixtures/LogTestFixtures.kt b/embrace-android-otel-fakes/src/main/kotlin/io/embrace/android/embracesdk/fixtures/LogTestFixtures.kt
@@ -6,8 +6,6 @@ import io.embrace.android.embracesdk.internal.arch.schema.EmbType
 import io.embrace.android.embracesdk.internal.arch.schema.SendMode
 import io.embrace.android.embracesdk.internal.payload.Attribute
 import io.embrace.android.embracesdk.internal.payload.Log
-import io.embrace.android.embracesdk.internal.payload.NativeCrashData
-import io.opentelemetry.kotlin.semconv.SessionAttributes
 
 val testLog: Log = Log(
     traceId = "ceadd56622414a06ae382e4e5a70bcf7",
@@ -44,7 +42,7 @@ val nativeCrashLog = Log(
     attributes = listOf(
         Attribute(EmbSessionAttributes.EMB_PRIVATE_SEND_MODE, SendMode.IMMEDIATE.name),
         EmbType.System.NativeCrash.toPayload(),
-        Attribute(SessionAttributes.SESSION_ID, "bb6b5b1ea2ff48928382fe81d7991ced"),
+        Attribute(EmbSessionAttributes.EMB_SESSION_PART_ID, "bb6b5b1ea2ff48928382fe81d7991ced"),
         Attribute(EmbSessionAttributes.EMB_PROCESS_IDENTIFIER, "8115ec91-3e5e-4d8a-816d-cc40306f9822"),
     )
 )
diff --git a/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/NativeCrashData.kt b/embrace-android-payload/src/main/kotlin/io/embrace/android/embracesdk/internal/payload/NativeCrashData.kt
@@ -6,7 +6,7 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 data class NativeCrashData(
     @Json(name = "report_id") val nativeCrashId: String,
-    @Json(name = "sid") val sessionId: String,
+    @Json(name = "sid") val sessionPartId: String,
     @Json(name = "usid") val userSessionId: String? = null,
     @Json(name = "ts") val timestamp: Long,
     @Json(name = "crash") val crash: String?,
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/NativeCrashFeatureTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/NativeCrashFeatureTest.kt
@@ -21,6 +21,7 @@ import io.embrace.android.embracesdk.internal.delivery.SupportedEnvelopeType
 import io.embrace.android.embracesdk.internal.otel.sdk.findAttributeValue
 import io.embrace.android.embracesdk.internal.payload.Envelope
 import io.embrace.android.embracesdk.internal.payload.LogPayload
+import io.embrace.android.embracesdk.semconv.EmbSessionAttributes
 import io.embrace.android.embracesdk.internal.worker.Worker
 import io.embrace.android.embracesdk.testframework.SdkIntegrationTestRule
 import io.embrace.android.embracesdk.testframework.actions.EmbracePayloadAssertionInterface
@@ -231,11 +232,11 @@ internal class NativeCrashFeatureTest {
                 assertNativeCrashSent(log2, crashData2, fakeSymbols)
 
                 // sessions updated to include crash IDs
-                val session1 = sessionEnvelopes.single { it.getSessionId() == crashData.nativeCrash.sessionId }
+                val session1 = sessionEnvelopes.single { it.getSessionId() == crashData.nativeCrash.sessionPartId }
                 session1.assertDeadPartResurrected(crashData)
 
                 // sessions updated to include crash IDs
-                val session2 = sessionEnvelopes.single { it.getSessionId() == crashData2.nativeCrash.sessionId }
+                val session2 = sessionEnvelopes.single { it.getSessionId() == crashData2.nativeCrash.sessionPartId }
                 session2.assertDeadPartResurrected(crashData2)
             }
         )
@@ -364,7 +365,7 @@ internal class NativeCrashFeatureTest {
     }
 
     private fun findMatchingSessionId(it: Envelope<LogPayload>, data: StoredNativeCrashData): Boolean {
-        return it.getLogOfType(EmbType.System.NativeCrash).attributes?.findAttributeValue("session.id") == data.nativeCrash.sessionId
+        return it.getLogOfType(EmbType.System.NativeCrash).attributes?.findAttributeValue(EmbSessionAttributes.EMB_SESSION_PART_ID) == data.nativeCrash.sessionPartId
     }
 
     private fun EmbracePayloadAssertionInterface.assertNoNativeCrashSent(
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/EmbracePayloadAssertionInterface.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/EmbracePayloadAssertionInterface.kt
@@ -26,6 +26,7 @@ import io.embrace.android.embracesdk.semconv.EmbSessionAttributes
 import io.embrace.android.embracesdk.testframework.assertions.JsonComparator
 import io.embrace.android.embracesdk.testframework.server.FakeApiServer
 import io.embrace.android.embracesdk.testframework.server.FormPart
+import io.opentelemetry.kotlin.semconv.SessionAttributes
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Assert.assertEquals
@@ -254,9 +255,8 @@ internal class EmbracePayloadAssertionInterface(
         )
         assertNotNull(attrs.findAttributeValue("log.record.uid"))
         assertNotNull(attrs.findAttributeValue(EmbAndroidAttributes.EMB_ANDROID_CRASH_NUMBER))
-        if (crashData.partEnvelope != null) {
-            assertEquals(crashData.partEnvelope.getSessionId(), attrs.findAttributeValue("session.id"))
-        }
+        assertEquals(crashData.nativeCrash.sessionPartId, attrs.findAttributeValue(EmbSessionAttributes.EMB_SESSION_PART_ID))
+        assertEquals(crashData.nativeCrash.userSessionId, attrs.findAttributeValue(SessionAttributes.SESSION_ID))
         assertNativeCrashDoesNotExist(crashData)
     }
 
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/StoredNdkData.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/StoredNdkData.kt
@@ -62,7 +62,7 @@ internal fun createStoredNativeCrashData(
         cachedCrashEnvelopeMetadata = if (createCrashEnvelope) {
             StoredTelemetryMetadata(
                 timestamp = crashMetadata.timestamp,
-                uuid = nativeCrashData.sessionId,
+                uuid = nativeCrashData.sessionPartId,
                 processIdentifier = crashMetadata.processIdentifier,
                 complete = false,
                 envelopeType = SupportedEnvelopeType.CRASH,
@@ -75,7 +75,7 @@ internal fun createStoredNativeCrashData(
             fakeIncompleteSessionEnvelope(
                 startMs = sessionMetadata.timestamp,
                 lastHeartbeatTimeMs = sessionMetadata.timestamp + 1000L,
-                sessionId = nativeCrashData.sessionId,
+                sessionId = nativeCrashData.sessionPartId,
                 sessionProperties = mapOf("dead-session-prop" to "some-val"),
                 processIdentifier = sessionMetadata.processIdentifier,
                 resource = envelopeResource,

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class CachedLogEnvelopeStoreImplTest {`
`51`	`51`	`)`
`52`	`52`
`53`	`53`	`val anotherCrashMetadata = createNativeCrashEnvelopeMetadata(`
`54`		`- sessionId = "another-session",`
	`54`	`+ sessionPartId = "another-session",`
`55`	`55`	`processIdentifier = "another-process"`
`56`	`56`	`)`
`57`	`57`
`@@ -69,7 +69,7 @@ class CachedLogEnvelopeStoreImplTest {`
`69`	`69`
`70`	`70`	`companion object {`
`71`	`71`	`val fakeNativeCrashEnvelope = createNativeCrashEnvelopeMetadata(`
`72`		`- sessionId = "old-session-id",`
	`72`	`+ sessionPartId = "old-session-id",`
`73`	`73`	`processIdentifier = "old-process-id"`
`74`	`74`	`)`
`75`	`75`	`}`