Merge branch 'main' into feat/otlp

Author: adinauer

CHANGELOG.md

@@ -2,11 +2,17 @@
 
 ## Unreleased
 
+### Features
+
 - Create `sentry-opentelemetry-otlp` and `sentry-opentelemetry-otlp-spring` modules for combining OpenTelemetry SDK OTLP export with Sentry SDK ([#5100](https://github.com/getsentry/sentry-java/pull/5100))
   - OpenTelemetry is configured to send spans to Sentry directly using an OTLP endpoint.
   - Sentry only uses trace and span ID from OpenTelemetry (via `OpenTelemetryOtlpEventProcessor`) but will not send spans through OpenTelemetry nor use OpenTelemetry `Context` for `Scopes` propagation.
   - See the OTLP setup docs for [Java](https://docs.sentry.io/platforms/java/opentelemetry/setup/otlp/) and [Spring Boot](https://docs.sentry.io/platforms/java/guides/spring-boot/opentelemetry/setup/otlp/) for installation and configuration instructions.
 
+### Fixes
+
+- Fix crash when unregistering `SystemEventsBroadcastReceiver` with try-catch block. ([#5106](https://github.com/getsentry/sentry-java/pull/5106))
+
 ## 8.33.0
 
 ### Features

sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java

@@ -203,13 +203,13 @@ private void scheduleUnregisterReceiver() {
     }
 
     try {
-      options.getExecutorService().submit(() -> unregisterReceiver());
+      options.getExecutorService().submit(() -> unregisterReceiver(options));
     } catch (RejectedExecutionException e) {
-      unregisterReceiver();
+      unregisterReceiver(options);
     }
   }
 
-  private void unregisterReceiver() {
+  private void unregisterReceiver(final @NotNull SentryAndroidOptions options) {
     final @Nullable SystemEventsBroadcastReceiver receiverRef;
     try (final @NotNull ISentryLifecycleToken ignored = receiverLock.acquire()) {
       isStopped = true;
@@ -218,7 +218,14 @@ private void unregisterReceiver() {
     }
 
     if (receiverRef != null) {
-      context.unregisterReceiver(receiverRef);
+      try {
+        context.unregisterReceiver(receiverRef);
+      } catch (Throwable exception) {
+        options
+            .getLogger()
+            .log(
+                SentryLevel.ERROR, exception, "Failed to unregister SystemEventsBroadcastReceiver");
+      }
     }
   }
 

sentry-android-core/src/test/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegrationTest.kt

@@ -52,6 +52,7 @@ class SystemEventsBreadcrumbsIntegrationTest {
     lateinit var shadowActivityManager: ShadowActivityManager
 
     fun getSut(
+      contextForSut: Context = context,
       enableSystemEventBreadcrumbs: Boolean = true,
       enableSystemEventBreadcrumbsExtras: Boolean = false,
       executorService: ISentryExecutorService = ImmediateExecutorService(),
@@ -64,7 +65,7 @@ class SystemEventsBreadcrumbsIntegrationTest {
           this.executorService = executorService
         }
       return SystemEventsBreadcrumbsIntegration(
-        context,
+        contextForSut,
         SystemEventsBreadcrumbsIntegration.getDefaultActions().toTypedArray(),
         handler,
       )
@@ -313,6 +314,20 @@ class SystemEventsBreadcrumbsIntegrationTest {
     assertFalse(fixture.options.isEnableSystemEventBreadcrumbs)
   }
 
+  @Test
+  fun `Do not crash if receiver already unregistered`() {
+    val realContext = ApplicationProvider.getApplicationContext<Context>()
+    val sut = fixture.getSut(realContext)
+
+    sut.register(fixture.scopes, fixture.options)
+
+    realContext.unregisterReceiver(sut.receiver)
+
+    val result = runCatching { sut.onBackground() }
+
+    assertFalse(result.isFailure)
+  }
+
   @Test
   fun `when str has full package, return last string after dot`() {
     val sut = fixture.getSut()