ALTAPPS-552: Android Sentry capture HTTP client errors

androidHyperskillApp/build.gradle.kts

@@ -7,7 +7,6 @@ plugins {
     kotlin("android")
     kotlin("kapt")
     kotlin("plugin.serialization")
-    alias(libs.plugins.sentry.androidGradle)
 }
 
 dependencies {

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ mokoResources = "0.20.1"
 mokoKswift = "0.6.1"
 ktlintRules = '1.0.0'
 adapters = '1.1.1'
-sentry = '5.7.3'
+sentry = '6.12.1'
 fragment = '1.4.1'
 flipper = '0.148.0'
 dokka = '1.7.20'
@@ -76,13 +76,15 @@ ktlintRules = { module = "ru.nobird.android.ktlint:rules", version.ref = "ktlint
 
 android-security = { module = "androidx.security:security-crypto", version = "1.1.0-alpha03" }
 android-material-progress-bar = { module = "me.zhanghai.android.materialprogressbar:library", version = "1.6.1" }
-android-sentry = { module = "io.sentry:sentry-android", version.ref = "sentry" }
-android-sentry-fragment = { module = "io.sentry:sentry-android-fragment", version.ref = "sentry" }
 android-flipper = { module = "com.facebook.flipper:flipper", version.ref = "flipper" }
 android-flipper-noop = { module = "com.facebook.flipper:flipper-noop", version.ref = "flipper" }
 android-soloader = { module = "com.facebook.soloader:soloader", version = "0.10.1" }
 android-parcelable = { module = "com.chrynan.parcelable:parcelable-core", version = "0.4.1" }
 
+android-sentry = { module = "io.sentry:sentry-android", version.ref = "sentry" }
+android-sentry-fragment = { module = "io.sentry:sentry-android-fragment", version.ref = "sentry" }
+android-sentry-okhttp = { module = "io.sentry:sentry-android-okhttp", version.ref = "sentry" }
+
 android-reactivex-rxandroid = { module = "io.reactivex.rxjava2:rxandroid", version = "2.1.0" }
 android-reactivex-rxjava = { module = "io.reactivex.rxjava2:rxjava", version = "2.2.5" }
 android-reactivex-rxkotlin = { module = "io.reactivex.rxjava2:rxkotlin", version = "2.3.0" }
@@ -95,7 +97,4 @@ android-desugar-jdk = { module = "com.android.tools:desugar_jdk_libs", version =
 
 [bundles]
 ktor-common = ['ktor-core', 'ktor-serialization', 'ktor-logging', 'ktor-contentNegotiation', 'ktor-serialization-json']
-android-test = ['android-test-junit', 'android-test-runner', 'android-test-robolectric']
-
-[plugins]
-sentry-androidGradle = { id = "io.sentry.android.gradle", version = "3.0.1" }
+android-test = ['android-test-junit', 'android-test-runner', 'android-test-robolectric']

shared/build.gradle.kts

@@ -76,6 +76,7 @@ kotlin {
                 implementation(libs.ktor.android)
                 implementation(libs.kit.view.redux)
                 implementation(libs.android.lifecycle.viewmodel.ktx)
+                implementation(libs.android.sentry.okhttp)
             }
         }
         val androidTest by getting {

shared/src/androidMain/kotlin/org/hyperskill/app/network/PreconfiguredHttpClient.kt

@@ -0,0 +1,24 @@
+package org.hyperskill.app.network
+
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.okhttp.OkHttp
+import io.sentry.HttpStatusCodeRange
+import io.sentry.android.okhttp.SentryOkHttpInterceptor
+
+@Suppress("FunctionName")
+internal actual fun PreconfiguredPlatformHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient =
+    HttpClient(OkHttp) {
+        apply(block)
+        engine {
+            addInterceptor(
+                SentryOkHttpInterceptor(
+                    captureFailedRequests = true,
+                    failedRequestStatusCodes = listOf(
+                        HttpStatusCodeRange(400, 407),
+                        HttpStatusCodeRange(409, 599)
+                    )
+                )
+            )
+        }
+    }

shared/src/commonMain/kotlin/org/hyperskill/app/network/injection/NetworkBuilder.kt → shared/src/commonMain/kotlin/org/hyperskill/app/network/NetworkBuilder.kt

@@ -1,4 +1,4 @@
-package org.hyperskill.app.network.injection
+package org.hyperskill.app.network
 
 import com.russhwolf.settings.Settings
 import io.ktor.client.HttpClient
@@ -36,10 +36,10 @@ import org.hyperskill.app.core.remote.UserAgentInfo
 import org.hyperskill.app.network.domain.model.NetworkClientType
 import org.hyperskill.app.network.domain.model.NetworkEndpointConfigInfo
 
-object NetworkBuilder {
+internal object NetworkBuilder {
     private const val AUTHORIZATION_HEADER = "Authorization"
 
-    internal fun buildEndpointConfigInfo(buildKonfig: BuildKonfig): NetworkEndpointConfigInfo =
+    fun buildEndpointConfigInfo(buildKonfig: BuildKonfig): NetworkEndpointConfigInfo =
         NetworkEndpointConfigInfo(
             baseUrl = buildKonfig.baseUrl,
             host = buildKonfig.host,
@@ -73,7 +73,7 @@ object NetworkBuilder {
         )
     }
 
-    internal fun buildAuthorizedClient(
+    fun buildAuthorizedClient(
         networkEndpointConfigInfo: NetworkEndpointConfigInfo,
         userAgentInfo: UserAgentInfo,
         json: Json,
@@ -83,7 +83,7 @@ object NetworkBuilder {
         authorizationMutex: Mutex,
         cookiesStorage: CookiesStorage
     ): HttpClient =
-        HttpClient {
+        PreconfiguredPlatformHttpClient {
             val tokenSocialAuthClient = buildAuthClient(
                 NetworkClientType.SOCIAL,
                 networkEndpointConfigInfo,
@@ -182,14 +182,14 @@ object NetworkBuilder {
             }
         }
 
-    internal fun buildFrontendEventsUnauthorizedClient(
+    fun buildFrontendEventsUnauthorizedClient(
         networkEndpointConfigInfo: NetworkEndpointConfigInfo,
         userAgentInfo: UserAgentInfo,
         json: Json,
         buildVariant: BuildVariant,
         cookiesStorage: CookiesStorage
     ): HttpClient =
-        HttpClient {
+        PreconfiguredPlatformHttpClient {
             defaultRequest {
                 url {
                     protocol = URLProtocol.HTTPS
@@ -222,7 +222,7 @@ object NetworkBuilder {
         buildVariant: BuildVariant,
         credentials: String
     ) =
-        HttpClient {
+        PreconfiguredPlatformHttpClient {
             defaultRequest {
                 headers {
                     append(AUTHORIZATION_HEADER, credentials)

shared/src/commonMain/kotlin/org/hyperskill/app/network/PreconfiguredHttpClient.kt

@@ -0,0 +1,7 @@
+package org.hyperskill.app.network
+
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+
+@Suppress("FunctionName")
+internal expect fun PreconfiguredPlatformHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient

shared/src/commonMain/kotlin/org/hyperskill/app/network/injection/NetworkModule.kt

@@ -12,6 +12,7 @@ import org.hyperskill.app.auth.domain.model.UserDeauthorized
 import org.hyperskill.app.config.BuildKonfig
 import org.hyperskill.app.core.domain.BuildVariant
 import org.hyperskill.app.core.remote.UserAgentInfo
+import org.hyperskill.app.network.NetworkBuilder
 import org.hyperskill.app.network.domain.model.NetworkClientType
 import org.hyperskill.app.network.domain.model.NetworkEndpointConfigInfo
 

shared/src/iosMain/kotlin/org/hyperskill/app/network/PreconfiguredHttpClient.kt

@@ -0,0 +1,11 @@
+package org.hyperskill.app.network
+
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.darwin.Darwin
+
+@Suppress("FunctionName")
+internal actual fun PreconfiguredPlatformHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient =
+    HttpClient(Darwin) {
+        apply(block)
+    }