Merge b713bb5 into dcc6bbf

markushi · web-flow · commit 2e0d7c5e62c4 · 2025-11-10T19:03:56.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Fix visual artifacts for the Canvas strategy on some devices ([#4861](https://github.com/getsentry/sentry-java/pull/4861))
 - [Config] Trim whitespace on properties path ([#4880](https://github.com/getsentry/sentry-java/pull/4880))
 - Only set `DefaultReplayBreadcrumbConverter` if replay is available ([#4888](https://github.com/getsentry/sentry-java/pull/4888))
+- Prevent ANR by caching connection status instead of blocking calls ([#4891](https://github.com/getsentry/sentry-java/pull/4891))
 
 ### Improvements
 
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidContinuousProfiler.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidContinuousProfiler.java
@@ -190,6 +190,7 @@ private void start() {
       }
 
       // If device is offline, we don't start the profiler, to avoid flooding the cache
+      // TODO .getConnectionStatus() may be blocking, investigate if this can be done async
       if (scopes.getOptions().getConnectionStatusProvider().getConnectionStatus() == DISCONNECTED) {
         logger.log(SentryLevel.WARNING, "Device is offline. Stopping profiler.");
         // Let's stop and reset profiler id, as the profile is now broken anyway
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/DeviceInfoUtil.java b/sentry-android-core/src/main/java/io/sentry/android/core/DeviceInfoUtil.java
@@ -203,6 +203,7 @@ private void setDeviceIO(final @NotNull Device device, final boolean includeDyna
       device.setBatteryTemperature(getBatteryTemperature(batteryIntent));
     }
 
+    // TODO .getConnectionStatus() may be blocking, investigate if this can be done async
     Boolean connected;
     switch (options.getConnectionStatusProvider().getConnectionStatus()) {
       case DISCONNECTED:
diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayIntegration.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayIntegration.kt
@@ -95,6 +95,7 @@ public class ReplayIntegration(
     this.gestureRecorderProvider = gestureRecorderProvider
   }
 
+  @Volatile private var lastKnownConnectionStatus: ConnectionStatus = ConnectionStatus.UNKNOWN
   private var debugMaskingEnabled: Boolean = false
   private lateinit var options: SentryOptions
   private var scopes: IScopes? = null
@@ -219,7 +220,7 @@ public class ReplayIntegration(
 
       if (
         isManualPause.get() ||
-          options.connectionStatusProvider.connectionStatus == DISCONNECTED ||
+          lastKnownConnectionStatus == DISCONNECTED ||
           scopes?.rateLimiter?.isActiveForCategory(All) == true ||
           scopes?.rateLimiter?.isActiveForCategory(Replay) == true
       ) {
@@ -335,6 +336,8 @@ public class ReplayIntegration(
   }
 
   override fun onConnectionStatusChanged(status: ConnectionStatus) {
+    lastKnownConnectionStatus = status
+
     if (captureStrategy !is SessionCaptureStrategy) {
       // we only want to stop recording when offline for session mode
       return
@@ -375,7 +378,7 @@ public class ReplayIntegration(
   private fun checkCanRecord() {
     if (
       captureStrategy is SessionCaptureStrategy &&
-        (options.connectionStatusProvider.connectionStatus == DISCONNECTED ||
+        (lastKnownConnectionStatus == DISCONNECTED ||
           scopes?.rateLimiter?.isActiveForCategory(All) == true ||
           scopes?.rateLimiter?.isActiveForCategory(Replay) == true)
     ) {
diff --git a/sentry-android-replay/src/test/java/io/sentry/android/replay/ReplayIntegrationTest.kt b/sentry-android-replay/src/test/java/io/sentry/android/replay/ReplayIntegrationTest.kt
@@ -120,7 +120,6 @@ class ReplayIntegrationTest {
       context: Context,
       sessionSampleRate: Double = 1.0,
       onErrorSampleRate: Double = 1.0,
-      isOffline: Boolean = false,
       isRateLimited: Boolean = false,
       recorderProvider: (() -> Recorder)? = null,
       replayCaptureStrategyProvider: ((isFullSession: Boolean) -> CaptureStrategy)? = null,
@@ -130,9 +129,6 @@ class ReplayIntegrationTest {
       options.run {
         sessionReplay.onErrorSampleRate = onErrorSampleRate
         sessionReplay.sessionSampleRate = sessionSampleRate
-        connectionStatusProvider = mock {
-          on { connectionStatus }.thenReturn(if (isOffline) DISCONNECTED else CONNECTED)
-        }
       }
       if (isRateLimited) {
         whenever(rateLimiter.isActiveForCategory(any())).thenReturn(true)
@@ -623,13 +619,13 @@ class ReplayIntegrationTest {
         context,
         recorderProvider = { recorder },
         replayCaptureStrategyProvider = { captureStrategy },
-        isOffline = true,
       )
 
     replay.register(fixture.scopes, fixture.options)
     replay.start()
     replay.onScreenshotRecorded(mock<Bitmap>())
 
+    replay.onConnectionStatusChanged(DISCONNECTED)
     verify(recorder).pause()
   }
 
@@ -903,10 +899,10 @@ class ReplayIntegrationTest {
         context,
         recorderProvider = { recorder },
         replayCaptureStrategyProvider = { captureStrategy },
-        isOffline = true,
       )
 
     replay.register(fixture.scopes, fixture.options)
+    replay.onConnectionStatusChanged(DISCONNECTED)
     replay.start()
 
     replay.pause()

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,7 @@ private void start() {`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`// If device is offline, we don't start the profiler, to avoid flooding the cache`
	`193`	`+ // TODO .getConnectionStatus() may be blocking, investigate if this can be done async`
`193`	`194`	`if (scopes.getOptions().getConnectionStatusProvider().getConnectionStatus() == DISCONNECTED) {`
`194`	`195`	`logger.log(SentryLevel.WARNING, "Device is offline. Stopping profiler.");`
`195`	`196`	`// Let's stop and reset profiler id, as the profile is now broken anyway`
Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,7 @@ private void setDeviceIO(final @NotNull Device device, final boolean includeDyna`
`203`	`203`	`device.setBatteryTemperature(getBatteryTemperature(batteryIntent));`
`204`	`204`	`}`
`205`	`205`
	`206`	`+ // TODO .getConnectionStatus() may be blocking, investigate if this can be done async`
`206`	`207`	`Boolean connected;`
`207`	`208`	`switch (options.getConnectionStatusProvider().getConnectionStatus()) {`
`208`	`209`	`case DISCONNECTED:`