#76 Fix sentry error logging for flaker companion app. Change package…

… of sample app

library/flaker-android-monitor/src/main/java/io/github/rotbolt/flakerandroidmonitor/FlakerMonitorImpl.kt

@@ -3,24 +3,24 @@ package io.github.rotbolt.flakerandroidmonitor
 import android.content.Context
 import io.sentry.Sentry
 import io.sentry.SentryEvent
-import io.sentry.SentryLevel
 import io.sentry.SentryOptions
 import io.sentry.android.core.SentryAndroid
 
 class FlakerMonitorImpl : FlakerMonitor {
     override fun initialize(appContext: Context) {
         SentryAndroid.init(appContext) { options ->
             options.dsn = BuildConfig.SENTRY_DSN
-            // Add a callback that will be used before the event is sent to Sentry.
-            // With this callback, you can modify the event or, when returning null, also discard the event.
-            options.beforeSend =
-                SentryOptions.BeforeSendCallback { event: SentryEvent, _ ->
-                    if (SentryLevel.DEBUG == event.level) {
-                        null
-                    } else {
-                        event
-                    }
-                }
+            options.beforeSend = SentryOptions.BeforeSendCallback { event: SentryEvent, _ -> filterEvent(event) }
+        }
+    }
+
+    private fun filterEvent(event: SentryEvent): SentryEvent? {
+        return event.throwable?.stackTrace?.let { stackTrace ->
+            if (stackTrace.any { it.className.startsWith("io.github.rotbolt") }) {
+                event
+            } else {
+                null
+            }
         }
     }
 

sampleapp/src/main/AndroidManifest.xml

@@ -4,18 +4,18 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name="io.github.rotbolt.flakersampleapp.MainApplication"
+        android:name="io.github.bolt.flakersampleapp.MainApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Flaker">
         <activity
-            android:name="io.github.rotbolt.flakersampleapp.home.HomeActivity"
+            android:name="io.github.bolt.flakersampleapp.home.HomeActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:taskAffinity="io.github.rotbolt.flakersampleapp.sampleapp"
+            android:taskAffinity="io.github.bolt.flakersampleapp.sampleapp"
             android:theme="@style/Theme.Flaker">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/MainApplication.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/MainApplication.kt

@@ -1,8 +1,8 @@
-package io.github.rotbolt.flakersampleapp
+package io.github.bolt.flakersampleapp
 
 import android.app.Application
+import io.github.bolt.flakersampleapp.di.AppContainer
 import io.github.rotbolt.flakerandroidokhttp.di.FlakerAndroidOkhttpContainer
-import io.github.rotbolt.flakersampleapp.di.AppContainer
 
 class MainApplication : Application() {
 

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/data/remote/RemoteResult.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/data/remote/RemoteResult.kt

@@ -1,4 +1,4 @@
-package io.github.rotbolt.flakersampleapp.data.remote
+package io.github.bolt.flakersampleapp.data.remote
 
 import retrofit2.HttpException
 import retrofit2.Response

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/di/AppContainer.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/di/AppContainer.kt

@@ -1,6 +1,6 @@
-package io.github.rotbolt.flakersampleapp.di
+package io.github.bolt.flakersampleapp.di
 
-import io.github.rotbolt.flakersampleapp.home.di.HomeContainer
+import io.github.bolt.flakersampleapp.home.di.HomeContainer
 
 class AppContainer {
 

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/di/CoroutineDispatcherProvider.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/di/CoroutineDispatcherProvider.kt

@@ -1,4 +1,4 @@
-package io.github.rotbolt.flakersampleapp.di
+package io.github.bolt.flakersampleapp.di
 
 import kotlinx.coroutines.Dispatchers
 

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/di/RetrofitProvider.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/di/RetrofitProvider.kt

@@ -1,4 +1,4 @@
-package io.github.rotbolt.flakersampleapp.di
+package io.github.bolt.flakersampleapp.di
 
 import io.github.rotbolt.flakerokhttpcore.FlakerInterceptor
 import okhttp3.OkHttpClient

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/home/HomeActivity.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/home/HomeActivity.kt

@@ -1,4 +1,4 @@
-package io.github.rotbolt.flakersampleapp.home
+package io.github.bolt.flakersampleapp.home
 
 import android.os.Bundle
 import android.widget.Toast
@@ -25,9 +25,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import io.github.rotbolt.flakersampleapp.MainApplication
-import io.github.rotbolt.flakersampleapp.home.di.HomeContainer
-import io.github.rotbolt.flakersampleapp.theme.FlakerTheme
+import io.github.bolt.flakersampleapp.MainApplication
+import io.github.bolt.flakersampleapp.home.di.HomeContainer
+import io.github.bolt.flakersampleapp.theme.FlakerTheme
 import kotlinx.coroutines.flow.collectLatest
 
 class HomeActivity : ComponentActivity() {

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/home/HomeViewModel.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/home/HomeViewModel.kt

@@ -1,10 +1,10 @@
-package io.github.rotbolt.flakersampleapp.home
+package io.github.bolt.flakersampleapp.home
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import io.github.rotbolt.flakersampleapp.data.remote.RemoteResult
-import io.github.rotbolt.flakersampleapp.home.data.remote.UsersApiClient
+import io.github.bolt.flakersampleapp.data.remote.RemoteResult
+import io.github.bolt.flakersampleapp.home.data.remote.UsersApiClient
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/home/data/remote/UsersApiClient.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/home/data/remote/UsersApiClient.kt

@@ -1,8 +1,8 @@
-package io.github.rotbolt.flakersampleapp.home.data.remote
+package io.github.bolt.flakersampleapp.home.data.remote
 
-import io.github.rotbolt.flakersampleapp.data.remote.RemoteResult
-import io.github.rotbolt.flakersampleapp.data.remote.handleRemoteResponse
-import io.github.rotbolt.flakersampleapp.home.data.remote.dto.UserData
+import io.github.bolt.flakersampleapp.data.remote.RemoteResult
+import io.github.bolt.flakersampleapp.data.remote.handleRemoteResponse
+import io.github.bolt.flakersampleapp.home.data.remote.dto.UserData
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/home/data/remote/UsersApiService.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/home/data/remote/UsersApiService.kt

@@ -1,6 +1,6 @@
-package io.github.rotbolt.flakersampleapp.home.data.remote
+package io.github.bolt.flakersampleapp.home.data.remote
 
-import io.github.rotbolt.flakersampleapp.home.data.remote.dto.UserData
+import io.github.bolt.flakersampleapp.home.data.remote.dto.UserData
 import retrofit2.Response
 import retrofit2.http.GET
 

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/home/data/remote/dto/UserDto.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/home/data/remote/dto/UserDto.kt

@@ -1,4 +1,4 @@
-package io.github.rotbolt.flakersampleapp.home.data.remote.dto
+package io.github.bolt.flakersampleapp.home.data.remote.dto
 
 @Suppress("ConstructorParameterNaming")
 data class UserData(

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/home/di/HomeContainer.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/home/di/HomeContainer.kt

@@ -1,13 +1,13 @@
-package io.github.rotbolt.flakersampleapp.home.di
+package io.github.bolt.flakersampleapp.home.di
 
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.createSavedStateHandle
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
-import io.github.rotbolt.flakersampleapp.di.CoroutineDispatcherProvider
-import io.github.rotbolt.flakersampleapp.home.HomeViewModel
-import io.github.rotbolt.flakersampleapp.home.data.remote.UsersApiClient
-import io.github.rotbolt.flakersampleapp.home.data.remote.UsersApiService
+import io.github.bolt.flakersampleapp.di.CoroutineDispatcherProvider
+import io.github.bolt.flakersampleapp.home.HomeViewModel
+import io.github.bolt.flakersampleapp.home.data.remote.UsersApiClient
+import io.github.bolt.flakersampleapp.home.data.remote.UsersApiService
 import retrofit2.Retrofit
 
 class HomeContainer(

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/theme/Color.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/theme/Color.kt

@@ -1,4 +1,4 @@
-package io.github.rotbolt.flakersampleapp.theme
+package io.github.bolt.flakersampleapp.theme
 
 import androidx.compose.ui.graphics.Color
 

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/theme/Theme.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/theme/Theme.kt

@@ -1,4 +1,4 @@
-package io.github.rotbolt.flakersampleapp.theme
+package io.github.bolt.flakersampleapp.theme
 
 import android.app.Activity
 import android.os.Build

sampleapp/src/main/java/io/github/rotbolt/flakersampleapp/theme/Type.kt → sampleapp/src/main/java/io/github/bolt/flakersampleapp/theme/Type.kt

@@ -1,4 +1,4 @@
-package io.github.rotbolt.flakersampleapp.theme
+package io.github.bolt.flakersampleapp.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle