Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new fields to SessionMessage class #555

Merged
merged 1 commit into from
Mar 13, 2024
Merged

Add new fields to SessionMessage class #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 31 additions & 1 deletion embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/payload/SessionMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package io.embrace.android.embracesdk.payload
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import io.embrace.android.embracesdk.comms.api.ApiClient
import io.embrace.android.embracesdk.internal.payload.EnvelopeMetadata
import io.embrace.android.embracesdk.internal.payload.EnvelopeResource
import io.embrace.android.embracesdk.internal.payload.SessionPayload
import io.embrace.android.embracesdk.internal.spans.EmbraceSpanData

/**
Expand Down Expand Up @@ -52,5 +55,32 @@ internal data class SessionMessage @JvmOverloads internal constructor(
val spans: List<EmbraceSpanData>? = null,

@Json(name = "v")
val version: Int = ApiClient.MESSAGE_VERSION
val version: Int = ApiClient.MESSAGE_VERSION,

/*
* Values below this point are copied temporarily from [Envelope]. Eventually we will migrate
* everything to use [Envelope] and [SessionPayload] and remove this class,
* but we'll keep it for now for backwards compat.
*/

@Json(name = "resource")
val resource: EnvelopeResource? = null,

@Json(name = "metadata")
val metadata: EnvelopeMetadata? = null,

@Json(name = "version")
val newVersion: String? = null,

@Json(name = "type")
val type: String? = null,

@Json(name = "data")
val data: SessionPayload? = null
)

/**
* Returns true if this message is a v2 payload. If so, it should be sent to a different
* endpoint & handled differently.
*/
internal fun SessionMessage.isV2Payload() = data != null
10 changes: 10 additions & 0 deletions ...ace-android-sdk/src/test/java/io/embrace/android/embracesdk/payload/SessionMessageTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ import io.embrace.android.embracesdk.assertJsonMatchesGoldenFile
import io.embrace.android.embracesdk.deserializeEmptyJsonString
import io.embrace.android.embracesdk.deserializeJsonFromResource
import io.embrace.android.embracesdk.fakes.fakeSession
import io.embrace.android.embracesdk.internal.payload.SessionPayload
import io.embrace.android.embracesdk.internal.spans.EmbraceSpanData
import io.opentelemetry.api.trace.StatusCode
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertTrue
import org.junit.Test

internal class SessionMessageTest {
Expand Down Expand Up @@ -66,4 +69,11 @@ internal class SessionMessageTest {
fun testEmptyObject() {
deserializeEmptyJsonString<SessionMessage>()
}

@Test
fun `is v2 payload`() {
assertFalse(info.isV2Payload())
val obj = SessionMessage(session = session, data = SessionPayload())
assertTrue(obj.isV2Payload())
}
}