Update dist impl as well

Author: buenaflor

sentry-kotlin-multiplatform/src/appleMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryEventExtensions.apple.kt

@@ -5,12 +5,15 @@ import io.sentry.kotlin.multiplatform.CocoaSentryEvent
 import io.sentry.kotlin.multiplatform.SentryEvent
 
 internal fun CocoaSentryEvent.applyKmpEvent(kmpEvent: SentryEvent): CocoaSentryEvent {
-    // Native SDKs may have a default behaviour if no release is set.
-    // Setting a release (even if it's null) will remove this behaviour,
+    // Native SDKs may have a default behaviour if no release/dist is set.
+    // Setting a release/dist (even if it's null) will remove this behaviour,
     // so we have to check if the values differ first before setting.
     if (releaseName != kmpEvent.release) {
         releaseName = kmpEvent.release
     }
+    if (dist != kmpEvent.dist) {
+        dist = kmpEvent.dist
+    }
     kmpEvent.level?.let { level = it.toCocoaSentryLevel() }
     kmpEvent.platform?.let { platform = it }
     message = kmpEvent.message?.toCocoaMessage()

sentry-kotlin-multiplatform/src/appleTest/kotlin/io/sentry/kotlin/multiplatform/ApplyKmpEventTest.kt

@@ -7,22 +7,46 @@ import kotlin.test.assertFalse
 class ApplyKmpEventTest {
     @Test
     fun `native release is not set if kmp release has same value`() {
-        val nativeEvent = FakeSentryEvent()
-        val kmpEvent = SentryEvent()
+        val nativeEvent = FakeSentryEvent().apply {
+            releaseName = "1.0.0"
+        }
+        val kmpEvent = SentryEvent().apply {
+            release = "1.0.0"
+        }
 
         nativeEvent.applyKmpEvent(kmpEvent)
 
         assertFalse(nativeEvent.wasReleaseSet)
     }
+
+    @Test
+    fun `native dist is not set if kmp dist has same value`() {
+        val nativeEvent = FakeSentryEvent().apply {
+            dist = "randomDist"
+        }
+        val kmpEvent = SentryEvent().apply {
+            dist = "randomDist"
+        }
+
+        nativeEvent.applyKmpEvent(kmpEvent)
+
+        assertFalse(nativeEvent.wasDistSet)
+    }
 }
 
 // init with a SentryLevel as a workaround for:
 // Unable to call non-designated initializer as super constructor
 private class FakeSentryEvent : CocoaSentryEvent(Internal.Sentry.kSentryLevelFatal) {
     var wasReleaseSet = false
+    var wasDistSet = false
 
     override fun setReleaseName(releaseName: String?) {
         super.setReleaseName(releaseName)
         wasReleaseSet = true
     }
+
+    override fun setDist(dist: String?) {
+        super.setDist(dist)
+        wasDistSet = true
+    }
 }

sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryEventExtensions.jvm.kt

@@ -6,12 +6,15 @@ import io.sentry.kotlin.multiplatform.SentryEvent
 
 // TODO(buenaflor): properly test this once we introduce a mocking framework
 internal fun JvmSentryEvent.applyKmpEvent(kmpEvent: SentryEvent): JvmSentryEvent {
-    // Native SDKs may have a default behaviour if no release is set.
-    // Setting a release (even if it's null) will remove this behaviour,
+    // Native SDKs may have a default behaviour if no release/dist is set.
+    // Setting a release/dist (even if it's null) will remove this behaviour,
     // so we have to check if the values differ first before setting.
     if (release != kmpEvent.release) {
         release = kmpEvent.release
     }
+    if (dist != kmpEvent.dist) {
+        dist = kmpEvent.dist
+    }
     level = kmpEvent.level?.toJvmSentryLevel()
     message = kmpEvent.message?.toJvmMessage()
     logger = kmpEvent.logger