refactor: remove version field

embrace-io · May 28, 2024 · 319b76d · 319b76d
1 parent efdc127
commit 319b76d
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 12 deletions.
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/payload/SessionMessage.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/payload/SessionMessage.kt
@@ -2,7 +2,6 @@ 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
@@ -45,9 +44,6 @@ internal data class SessionMessage @JvmOverloads internal constructor(
     @Json(name = "span_snapshots")
     val spanSnapshots: List<EmbraceSpanData>? = null,
 
-    @Json(name = "v")
-    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,

diff --git a/...k/src/main/java/io/embrace/android/embracesdk/session/message/V2PayloadMessageCollator.kt b/...k/src/main/java/io/embrace/android/embracesdk/session/message/V2PayloadMessageCollator.kt
@@ -129,7 +129,6 @@ internal class V2PayloadMessageCollator(
             type = envelope.type,
 
             // make legacy fields null
-            version = null,
             spans = null,
         )
     }

diff --git a/...c/test/java/io/embrace/android/embracesdk/session/message/V2PayloadMessageCollatorTest.kt b/...c/test/java/io/embrace/android/embracesdk/session/message/V2PayloadMessageCollatorTest.kt
@@ -176,7 +176,6 @@ internal class V2PayloadMessageCollatorTest {
     private fun SessionMessage.verifyFinalFieldsPopulated(
         payloadType: PayloadType
     ) {
-        assertNull(version)
         assertNull(spans)
         assertNotNull(appInfo)
         assertNotNull(deviceInfo)

diff --git a/embrace-android-sdk/src/test/resources/bg_activity_message_expected.json b/embrace-android-sdk/src/test/resources/bg_activity_message_expected.json
@@ -32,6 +32,5 @@
       "events": [],
       "attributes": {}
     }
-  ],
-  "v": 13
+  ]
 }
diff --git a/embrace-android-sdk/src/test/resources/session_message_expected.json b/embrace-android-sdk/src/test/resources/session_message_expected.json
@@ -45,6 +45,5 @@
       "events": [],
       "attributes": {}
     }
-  ],
-  "v": 13
+  ]
 }
diff --git a/embrace-android-sdk/src/test/resources/v1_session_expected.json b/embrace-android-sdk/src/test/resources/v1_session_expected.json
@@ -51,6 +51,5 @@
     "wvi_beta": "__EMBRACE_TEST_IGNORE__"
   },
   "spans": "__EMBRACE_TEST_IGNORE__",
-  "span_snapshots": "__EMBRACE_TEST_IGNORE__",
-  "v": 13
+  "span_snapshots": "__EMBRACE_TEST_IGNORE__"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,5 @@ @@
           "events": [],
           "attributes": {}
         }
-      ],
-      "v": 13
+      ]
     }