From dd7649414d003fe4b3cf0cc06fb2e8c0ec6dab62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Wed, 17 Dec 2025 13:31:51 +0100 Subject: [PATCH] Fix wrong variable being used, improve tests --- .../sentry/SentryAnalyticsProvider.kt | 2 +- .../sentry/SentryAnalyticsProviderTest.kt | 23 +++++-------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProvider.kt b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProvider.kt index 2a0677ed20..7545563736 100644 --- a/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProvider.kt +++ b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProvider.kt @@ -124,7 +124,7 @@ class SentryAnalyticsProvider( transaction.removeExtra(invalidExtra.key) } val invalidTags = transaction.tags?.filter { it.value.startsWith("@") }.orEmpty() - for (invalidTag in invalidExtras) { + for (invalidTag in invalidTags) { transaction.removeTag(invalidTag.key) } diff --git a/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt b/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt index c98439dddd..24b938d9a5 100644 --- a/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt +++ b/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt @@ -157,11 +157,13 @@ class SentryAnalyticsProviderTest { val transaction = SentryTransaction(Sentry.startTransaction("foo", "bar") as SentryTracer) // Add a user id value transaction.setExtra("user", "@some:user") + transaction.setTag("user", "@some:user") val result = prepareTransactionBeforeSend(transaction) // The user id value should have been removed assertThat(result.getExtra("user")).isNull() + assertThat(result.getTag("user")).isNull() // The DB sizes should be included assertThat(result.getExtra(AnalyticsUserData.STATE_STORE_SIZE)).isEqualTo(10) @@ -172,7 +174,7 @@ class SentryAnalyticsProviderTest { } @Test - fun `prepareTransactionBeforeSend removes unwanted data and doesn't add anything if no session id is provided`() { + fun `prepareTransactionBeforeSend doesn't add DB info if no session id is provided`() { createSentryAnalyticsProvider( getDatabaseSizesUseCase = GetDatabaseSizesUseCase { Result.success( @@ -186,21 +188,14 @@ class SentryAnalyticsProviderTest { init() val transaction = SentryTransaction(Sentry.startTransaction("foo", "bar") as SentryTracer) - // Add a user id value - transaction.setExtra("user", "@some:user") - val result = prepareTransactionBeforeSend(transaction) - - // The user id value should have been removed - assertThat(result.getExtra("user")).isNull() - // The DB sizes are missing since there was no session id to query them - assertThat(result.extras).isEmpty() + assertThat(result.extras).isNull() } } @Test - fun `prepareTransactionBeforeSend removes unwanted data and doesn't add anything if no store sizes are available`() { + fun `prepareTransactionBeforeSend doesn't add DB info if no store sizes are available`() { createSentryAnalyticsProvider( getDatabaseSizesUseCase = GetDatabaseSizesUseCase { Result.success( @@ -214,16 +209,10 @@ class SentryAnalyticsProviderTest { init() val transaction = SentryTransaction(Sentry.startTransaction("foo", "bar") as SentryTracer) - // Add a user id value - transaction.setExtra("user", "@some:user") - val result = prepareTransactionBeforeSend(transaction) - // The user id value should have been removed - assertThat(result.getExtra("user")).isNull() - // The DB sizes are missing since there was no session id to query them - assertThat(result.extras).isEmpty() + assertThat(result.extras).isNull() } }