Skip to content

Commit f852309

Browse files
committed
Fix api from major
1 parent 32dc898 commit f852309

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/JvmScopeProvider.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import io.sentry.kotlin.multiplatform.extensions.toJvmSentryLevel
55
import io.sentry.kotlin.multiplatform.extensions.toJvmUser
66
import io.sentry.kotlin.multiplatform.extensions.toKmpSentryLevel
77
import io.sentry.kotlin.multiplatform.extensions.toKmpUser
8+
import io.sentry.kotlin.multiplatform.extensions.toMap
89
import io.sentry.kotlin.multiplatform.protocol.Breadcrumb
910
import io.sentry.kotlin.multiplatform.protocol.User
1011

@@ -31,7 +32,7 @@ internal class JvmScopeProvider(private val scope: JvmIScope) : Scope {
3132
}
3233

3334
override fun getContexts(): MutableMap<String, Any> {
34-
return scope.contexts
35+
return scope.contexts.toMap().toMutableMap()
3536
}
3637

3738
override fun getTags(): MutableMap<String, String> {

sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/SentryEvent.jvm.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.sentry.kotlin.multiplatform
22

3+
import io.sentry.kotlin.multiplatform.extensions.toMap
34
import io.sentry.kotlin.multiplatform.extensions.toKmpBreadcrumb
45
import io.sentry.kotlin.multiplatform.extensions.toKmpMessage
56
import io.sentry.kotlin.multiplatform.extensions.toKmpSentryException
@@ -34,7 +35,7 @@ public actual class SentryEvent actual constructor() : SentryBaseEvent() {
3435
user = jvmSentryEvent.user?.toKmpUser()
3536
serverName = jvmSentryEvent.serverName
3637
dist = jvmSentryEvent.dist
37-
contexts = jvmSentryEvent.contexts
38+
contexts = jvmSentryEvent.contexts.toMap()
3839
jvmSentryEvent.fingerprints?.let { fingerprint = it }
3940
jvmSentryEvent.exceptions?.let { exceptions = it.map { it.toKmpSentryException() }.toMutableList() }
4041
jvmSentryEvent.breadcrumbs?.let { breadcrumbs = it.map { it.toKmpBreadcrumb() }.toMutableList() }
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package io.sentry.kotlin.multiplatform.extensions
2+
3+
import io.sentry.kotlin.multiplatform.JvmContexts
4+
5+
internal fun JvmContexts.toMap(): Map<String, Any> {
6+
val resultMap = mutableMapOf<String, Any>()
7+
for (key in keys()) {
8+
val value = get(key)
9+
value?.let {
10+
resultMap[key] = it
11+
}
12+
}
13+
return resultMap
14+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ internal fun User.toJvmUser() = JvmUser().apply {
99
username = scope.username
1010
email = scope.email
1111
ipAddress = scope.ipAddress
12-
others = scope.other?.toMutableMap()
12+
data = scope.other?.toMutableMap()
1313
unknown = scope.unknown?.toMutableMap()
1414
}
1515

@@ -19,6 +19,6 @@ internal fun JvmUser.toKmpUser() = User().apply {
1919
username = scope.username
2020
email = scope.email
2121
ipAddress = scope.ipAddress
22-
other = scope.others?.toMutableMap()
22+
other = scope.data?.toMutableMap()
2323
unknown = scope.unknown?.toMutableMap()
2424
}

0 commit comments

Comments
 (0)