Merge branch 'main' into feat/events-with-modules

getsentry · Nov 4, 2022 · ae677c7 · ae677c7
2 parents 361a467 + 34811f4
commit ae677c7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/.sauce/sentry-uitest-android-benchmark.yml b/.sauce/sentry-uitest-android-benchmark.yml
@@ -22,7 +22,7 @@ suites:
   - name: "Android 12 (api 31)"
     devices:
       - id: Google_Pixel_6_Pro_real_us # Google Pixel 6 Pro - api 31 (12) - high end
-      - id: Google_Pixel_3_12_real_us # Google Pixel 3 - api 31 (12) - low end
+      - id: Google_Pixel_6a_real_us # Google Pixel 6a - api 31 (12) - low end
 
   - name: "Android 11 (api 30)"
     devices:
@@ -32,7 +32,7 @@ suites:
 
   - name: "Android 10 (api 29)"
     devices:
-      - id: Google_Pixel_4_XL_real_us1 # Google Pixel 4 XL - api 29 (10)
+      - id: OnePlus_7_Pro_real # OnePlus 7 Pro - api 29 (10)
       - id: Nokia_7_1_real_us # Nokia 7.1 - api 29 (10)
 
 # At the time of writing (July, 4, 2022), the market share per android version is:

diff --git a/...n-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/BaseUiTest.kt b/...n-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/BaseUiTest.kt
@@ -3,14 +3,16 @@ package io.sentry.uitest.android
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso
+import androidx.test.espresso.IdlingPolicies
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.idling.CountingIdlingResource
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnitRunner
 import io.sentry.Sentry
-import io.sentry.SentryOptions
 import io.sentry.android.core.SentryAndroid
+import io.sentry.android.core.SentryAndroidOptions
 import io.sentry.uitest.android.mockservers.MockRelay
+import java.util.concurrent.TimeUnit
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 
@@ -37,6 +39,7 @@ abstract class BaseUiTest {
     @BeforeTest
     fun baseSetUp() {
         runner = InstrumentationRegistry.getInstrumentation() as AndroidJUnitRunner
+        IdlingPolicies.setIdlingResourceTimeout(10, TimeUnit.SECONDS)
         context = ApplicationProvider.getApplicationContext()
         context.cacheDir.deleteRecursively()
         relay.start()
@@ -58,7 +61,7 @@ abstract class BaseUiTest {
      */
     protected fun initSentry(
         relayWaitForRequests: Boolean = false,
-        optionsConfiguration: ((options: SentryOptions) -> Unit)? = null
+        optionsConfiguration: ((options: SentryAndroidOptions) -> Unit)? = null
     ) {
         relay.waitForRequests = relayWaitForRequests
         if (relayWaitForRequests) {

diff --git a/...ests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/EnvelopeTests.kt b/...ests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/EnvelopeTests.kt
@@ -11,7 +11,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.sentry.ProfilingTraceData
 import io.sentry.Sentry
 import io.sentry.SentryEvent
-import io.sentry.SentryOptions
+import io.sentry.android.core.SentryAndroidOptions
 import io.sentry.protocol.SentryTransaction
 import org.junit.runner.RunWith
 import java.io.File
@@ -47,7 +47,7 @@ class EnvelopeTests : BaseUiTest() {
     @Test
     fun checkEnvelopeProfiledTransaction() {
 
-        initSentry(true) { options: SentryOptions ->
+        initSentry(true) { options: SentryAndroidOptions ->
             options.tracesSampleRate = 1.0
             options.profilesSampleRate = 1.0
         }
@@ -83,7 +83,7 @@ class EnvelopeTests : BaseUiTest() {
     @Test
     fun checkEnvelopeConcurrentTransactions() {
 
-        initSentry(true) { options: SentryOptions ->
+        initSentry(true) { options: SentryAndroidOptions ->
             options.tracesSampleRate = 1.0
             options.profilesSampleRate = 1.0
         }
@@ -158,7 +158,7 @@ class EnvelopeTests : BaseUiTest() {
     @Test
     fun checkProfileNotSentIfEmpty() {
 
-        initSentry(true) { options: SentryOptions ->
+        initSentry(true) { options: SentryAndroidOptions ->
             options.tracesSampleRate = 1.0
             options.profilesSampleRate = 1.0
         }
@@ -191,11 +191,11 @@ class EnvelopeTests : BaseUiTest() {
         }
     }
 
-    @Test
+//    @Test
     fun checkTimedOutProfile() {
         // We increase the IdlingResources timeout to exceed the profiling timeout
         IdlingPolicies.setIdlingResourceTimeout(1, TimeUnit.MINUTES)
-        initSentry(true) { options: SentryOptions ->
+        initSentry(true) { options: SentryAndroidOptions ->
             options.tracesSampleRate = 1.0
             options.profilesSampleRate = 1.0
         }
@@ -219,7 +219,7 @@ class EnvelopeTests : BaseUiTest() {
     fun sendProfiledTransaction() {
         // This is a dogfooding test
         IdlingRegistry.getInstance().register(ProfilingSampleActivity.scrollingIdlingResource)
-        initSentry(false) { options: SentryOptions ->
+        initSentry(false) { options: SentryAndroidOptions ->
             options.dsn = "https://640fae2f19ac4ba78ad740175f50195f@o1137848.ingest.sentry.io/6191083"
             options.tracesSampleRate = 1.0
             options.profilesSampleRate = 1.0

diff --git a/...s/sentry-uitest-android/src/main/java/io/sentry/uitest/android/ProfilingSampleActivity.kt b/...s/sentry-uitest-android/src/main/java/io/sentry/uitest/android/ProfilingSampleActivity.kt
@@ -2,6 +2,7 @@ package io.sentry.uitest.android
 
 import android.graphics.Bitmap
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -32,6 +33,10 @@ class ProfilingSampleActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            window.setSustainedPerformanceMode(true)
+        }
+
         binding = ActivityProfilingSampleBinding.inflate(layoutInflater)
         setContentView(binding.root)