From e8ff969697e297565949da169b6b031a3afb3d0b Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Wed, 18 Nov 2026 17:17:04 +0100 Subject: [PATCH 1/5] ref: Narrow Throwable catches to the exceptions they guard Replace catch (Throwable) with the exceptions the guarded code can throw, so SDK bugs and fatal errors at these sites are no longer swallowed. Most are RejectedExecutionException around executor submit and schedule, IOException or SecurityException around file I/O, and the specific parsing exceptions. Several tests only passed because these catches hid mocks that don't behave like the real objects. They now do. Refs #5513 Refs JAVA-552 Co-Authored-By: Claude Opus 5.5 --- .../core/AndroidContinuousProfiler.java | 2 +- .../core/AndroidLoggerBatchProcessor.java | 3 ++- .../core/AndroidMetricsBatchProcessor.java | 3 ++- .../sentry/android/core/AndroidProfiler.java | 9 +++++-- .../sentry/android/core/AnrIntegration.java | 3 ++- .../sentry/android/core/AnrV2Integration.java | 3 ++- .../AppComponentsBreadcrumbsIntegration.java | 3 ++- .../ApplicationExitInfoEventProcessor.java | 8 +++--- .../android/core/BuildInfoProvider.java | 3 ++- .../io/sentry/android/core/ContextUtils.java | 3 ++- .../core/DefaultAndroidEventProcessor.java | 16 ++++++++--- .../sentry/android/core/DeviceInfoUtil.java | 4 ++- .../core/EnvelopeFileObserverIntegration.java | 3 ++- .../core/FeedbackShakeIntegration.java | 3 ++- .../android/core/InternalSentrySdk.java | 3 ++- .../sentry/android/core/LifecycleWatcher.java | 3 ++- .../android/core/NativeEventCollector.java | 15 +++++++---- .../core/PerfettoContinuousProfiler.java | 2 +- .../core/SendCachedEnvelopeIntegration.java | 13 ++++++--- .../SystemEventsBreadcrumbsIntegration.java | 2 +- .../android/core/TombstoneIntegration.java | 6 +++-- .../core/anr/AnrProfileRotationHelper.java | 4 +-- .../core/anr/AnrProfilingIntegration.java | 3 ++- .../core/cache/AndroidEnvelopeCache.java | 27 +++++++++---------- .../internal/modules/AssetsModulesLoader.java | 3 ++- .../util/AndroidConnectionStatusProvider.java | 3 ++- .../core/internal/util/RootChecker.java | 2 +- .../core/AndroidLoggerBatchProcessorTest.kt | 3 ++- .../core/AndroidMetricsBatchProcessorTest.kt | 3 ++- .../android/core/ContextUtilsTestHelper.kt | 27 ++++++++++++------- .../android/core/NativeEventCollectorTest.kt | 20 ++++++++++++++ .../core/SendCachedEnvelopeIntegrationTest.kt | 16 +++++++++++ .../core/internal/util/RootCheckerTest.kt | 6 ++++- .../sentry/android/ndk/NdkScopeObserver.java | 20 +++++++------- .../io/sentry/android/replay/ReplayCache.kt | 6 ++--- .../replay/capture/BaseCaptureStrategy.kt | 7 ++++- .../replay/capture/BufferCaptureStrategy.kt | 2 +- .../replay/screenshot/CanvasStrategy.kt | 6 ++--- .../sentry/android/replay/util/Executors.kt | 3 ++- .../replay/util/ReplayExecutorService.kt | 3 ++- .../android/replay/ReplayIntegrationTest.kt | 17 +++++++++--- .../capture/SessionCaptureStrategyTest.kt | 15 +++++++++++ .../apollo3/SentryApollo3HttpInterceptor.kt | 5 ++-- .../apollo4/SentryApollo4HttpInterceptor.kt | 5 ++-- .../profiling/JavaContinuousProfiler.java | 2 +- .../java/io/sentry/jdbc/DatabaseUtils.java | 5 ++-- .../OpenTelemetryAttributesExtractor.java | 5 ++-- .../otlp/OpenTelemetryOtlpPropagator.java | 3 ++- sentry/src/main/java/io/sentry/Baggage.java | 7 +++-- .../main/java/io/sentry/EnvelopeSender.java | 2 +- .../src/main/java/io/sentry/FilterString.java | 3 ++- .../main/java/io/sentry/MonitorSchedule.java | 2 +- sentry/src/main/java/io/sentry/Sentry.java | 11 ++++---- .../io/sentry/SentryCrashLastRunState.java | 2 +- .../io/sentry/SentryEnvelopeItemHeader.java | 4 ++- .../main/java/io/sentry/SentryOptions.java | 2 +- .../src/main/java/io/sentry/SentryTracer.java | 5 ++-- .../java/io/sentry/cache/EnvelopeCache.java | 6 ++--- .../sentry/cache/PersistingScopeObserver.java | 3 ++- .../config/FilesystemPropertiesLoader.java | 3 ++- .../modules/ManifestModulesLoader.java | 6 ++++- .../main/java/io/sentry/util/Platform.java | 4 +-- .../java/io/sentry/cache/EnvelopeCacheTest.kt | 3 ++- .../modules/ManifestModulesLoaderTest.kt | 16 +++++++++++ 64 files changed, 286 insertions(+), 124 deletions(-) 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 index 1793bffde09..7ccb54fdd0c 100644 --- 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 @@ -382,7 +382,7 @@ private void sendChunks(final @NotNull IScopes scopes, final @NotNull SentryOpti scopes.captureProfileChunk(payload); } }); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.DEBUG, "Failed to send profile chunks.", e); } } diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidLoggerBatchProcessor.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidLoggerBatchProcessor.java index 0eeb8bee1c8..b9f7d94046f 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidLoggerBatchProcessor.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidLoggerBatchProcessor.java @@ -4,6 +4,7 @@ import io.sentry.SentryLevel; import io.sentry.SentryOptions; import io.sentry.logger.LoggerBatchProcessor; +import java.util.concurrent.RejectedExecutionException; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -38,7 +39,7 @@ public void run() { flush(LoggerBatchProcessor.FLUSH_AFTER_MS); } }); - } catch (Throwable t) { + } catch (RejectedExecutionException t) { options.getLogger().log(SentryLevel.ERROR, t, "Failed to submit log flush in onBackground()"); } } diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidMetricsBatchProcessor.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidMetricsBatchProcessor.java index c224231daaa..507a5b90460 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidMetricsBatchProcessor.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidMetricsBatchProcessor.java @@ -4,6 +4,7 @@ import io.sentry.SentryLevel; import io.sentry.SentryOptions; import io.sentry.metrics.MetricsBatchProcessor; +import java.util.concurrent.RejectedExecutionException; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -38,7 +39,7 @@ public void run() { flush(MetricsBatchProcessor.FLUSH_AFTER_MS); } }); - } catch (Throwable t) { + } catch (RejectedExecutionException t) { options .getLogger() .log(SentryLevel.ERROR, t, "Failed to submit metrics flush in onBackground()"); diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidProfiler.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidProfiler.java index 69bf8805cde..3d9df960f1b 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidProfiler.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidProfiler.java @@ -214,7 +214,9 @@ public void onFrameMetricCollected( isRunning = true; return new ProfileStartData( profileStartNanos, profileStartCpuMillis, profileStartTimestamp); - } catch (Throwable e) { + } catch (RuntimeException e) { + // Debug reports trace file problems with a plain RuntimeException, so there is no + // narrower type to catch. The profile is not started. endAndCollect(false, null); logger.log(SentryLevel.ERROR, "Unable to start a profile: ", e); isRunning = false; @@ -237,7 +239,10 @@ public void onFrameMetricCollected( // wrapped, so this should never happen (except for tests, where this is the only method // that throws) Debug.stopMethodTracing(); - } catch (Throwable e) { + } catch (RuntimeException e) { + // Debug reports trace file problems with a plain RuntimeException, so there is no + // narrower type to catch. The profiler is still marked as stopped, and whatever the trace + // file holds is collected. logger.log(SentryLevel.ERROR, "Error while stopping profiling: ", e); } finally { isRunning = false; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AnrIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/AnrIntegration.java index a1b3abd3906..3ef138d163e 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AnrIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AnrIntegration.java @@ -20,6 +20,7 @@ import io.sentry.util.Objects; import java.io.Closeable; import java.io.IOException; +import java.util.concurrent.RejectedExecutionException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; @@ -74,7 +75,7 @@ private void register( } } }); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options .getLogger() .log(SentryLevel.DEBUG, "Failed to start AnrIntegration on executor thread.", e); diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java b/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java index 19de22c9a87..402a3335815 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java @@ -39,6 +39,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.List; +import java.util.concurrent.RejectedExecutionException; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -88,7 +89,7 @@ public void register(@NotNull IScopes scopes, @NotNull SentryOptions options) { .submit( new ApplicationExitInfoHistoryDispatcher( context, scopes, this.options, dateProvider, new AnrV2Policy(this.options))); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.DEBUG, "Failed to start ANR processor.", e); } options.getLogger().log(SentryLevel.DEBUG, "AnrV2Integration installed."); diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java index 66afe6033a3..2eb057a72bd 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java @@ -19,6 +19,7 @@ import java.io.Closeable; import java.io.IOException; import java.util.Locale; +import java.util.concurrent.RejectedExecutionException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -173,7 +174,7 @@ private void executeInBackground(final @NotNull Runnable runnable) { if (options != null) { try { options.getExecutorService().submit(runnable); - } catch (Throwable t) { + } catch (RejectedExecutionException t) { options .getLogger() .log(SentryLevel.ERROR, t, "Failed to submit app components breadcrumb task"); diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ApplicationExitInfoEventProcessor.java b/sentry-android-core/src/main/java/io/sentry/android/core/ApplicationExitInfoEventProcessor.java index 63b08cb9b73..9e04a1ed981 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ApplicationExitInfoEventProcessor.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ApplicationExitInfoEventProcessor.java @@ -234,7 +234,7 @@ private boolean sampleReplay( event.getEventId()); return false; } - } catch (Throwable e) { + } catch (NumberFormatException e) { options.getLogger().log(SentryLevel.ERROR, "Error parsing replay sample rate.", e); return false; } @@ -468,7 +468,7 @@ private void setAppVersionAndBuild(final @NotNull SentryBaseEvent event) { app.setAppVersion(versionName); app.setAppBuild(versionCode); event.getContexts().setApp(app); - } catch (Throwable e) { + } catch (IndexOutOfBoundsException e) { options .getLogger() .log(SentryLevel.WARNING, "Failed to parse release from scope cache: %s", release); @@ -699,7 +699,9 @@ private void mergeUser(final @NotNull SentryBaseEvent event) { private @Nullable String getDeviceId() { try { return Installation.id(context); - } catch (Throwable e) { + } catch (RuntimeException e) { + // Installation.id wraps file errors in a plain RuntimeException, so there is no narrower + // type to catch. The event is sent without a user id and a device id. options.getLogger().log(SentryLevel.ERROR, "Error getting installationId.", e); } return null; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/BuildInfoProvider.java b/sentry-android-core/src/main/java/io/sentry/android/core/BuildInfoProvider.java index 5b0786ffb7f..2024402768b 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/BuildInfoProvider.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/BuildInfoProvider.java @@ -67,7 +67,8 @@ public int getSdkInfoVersion() { || Build.PRODUCT.contains("vbox86p") || Build.PRODUCT.contains("emulator") || Build.PRODUCT.contains("simulator"); - } catch (Throwable e) { + } catch (NullPointerException e) { + // Build fields are only null off-device, e.g. in unit tests against the android.jar stubs logger.log( SentryLevel.ERROR, "Error checking whether application is running in an emulator.", e); return null; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ContextUtils.java b/sentry-android-core/src/main/java/io/sentry/android/core/ContextUtils.java index 22938712faf..e42b3ec7da9 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ContextUtils.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ContextUtils.java @@ -412,7 +412,8 @@ public static boolean appIsLibraryForComposePreview(final @NotNull Context conte static @Nullable String getFamily(final @NotNull ILogger logger) { try { return Build.MODEL.split(" ", -1)[0]; - } catch (Throwable e) { + } catch (NullPointerException e) { + // Build fields are only null off-device, e.g. in unit tests against the android.jar stubs logger.log(SentryLevel.ERROR, "Error getting device family.", e); return null; } diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java b/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java index 5c28ccaf488..05bde797ed4 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -210,7 +211,10 @@ private void mergeOS(final @NotNull SentryBaseEvent event) { final OperatingSystem androidOS = deviceInfoUtil.get().getOperatingSystem(); // make Android OS the main OS using the 'os' key event.getContexts().setOperatingSystem(androidOS); - } catch (Throwable e) { + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + options.getLogger().log(SentryLevel.ERROR, "Failed to retrieve os system", e); + } catch (ExecutionException e) { options.getLogger().log(SentryLevel.ERROR, "Failed to retrieve os system", e); } } else { @@ -310,7 +314,10 @@ private void setPackageInfo(final @NotNull SentryBaseEvent event, final @NotNull if (this.deviceInfoUtil != null) { try { deviceInfoUtil = this.deviceInfoUtil.get(); - } catch (Throwable e) { + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + options.getLogger().log(SentryLevel.ERROR, "Failed to retrieve device info", e); + } catch (ExecutionException e) { options.getLogger().log(SentryLevel.ERROR, "Failed to retrieve device info", e); } } else { @@ -367,7 +374,10 @@ private void setSideLoadedInfo(final @NotNull SentryBaseEvent event) { event.setTag(entry.getKey(), entry.getValue()); } } - } catch (Throwable e) { + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + options.getLogger().log(SentryLevel.ERROR, "Error getting side loaded info.", e); + } catch (ExecutionException e) { options.getLogger().log(SentryLevel.ERROR, "Error getting side loaded info.", e); } } else { 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 index 19113768ef3..02976ed2c39 100644 --- 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 @@ -457,7 +457,9 @@ private long getUnusedExternalStorage(final @NotNull StatFs stat) { private String getDeviceId() { try { return Installation.id(context); - } catch (Throwable e) { + } catch (RuntimeException e) { + // Installation.id wraps file errors in a plain RuntimeException, so there is no narrower + // type to catch. The device context is sent without an id. options.getLogger().log(SentryLevel.ERROR, "Error getting installationId.", e); } return null; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserverIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserverIntegration.java index e81577cfd4b..354bb601862 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserverIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserverIntegration.java @@ -14,6 +14,7 @@ import io.sentry.util.Objects; import java.io.Closeable; import java.io.File; +import java.util.concurrent.RejectedExecutionException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; @@ -56,7 +57,7 @@ public final void register(final @NotNull IScopes scopes, final @NotNull SentryO } } }); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { logger.log( SentryLevel.DEBUG, "Failed to start EnvelopeFileObserverIntegration on executor thread.", diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/FeedbackShakeIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/FeedbackShakeIntegration.java index 677678b2438..f3a51fe8b18 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/FeedbackShakeIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/FeedbackShakeIntegration.java @@ -16,6 +16,7 @@ import java.io.IOException; import java.lang.ref.WeakReference; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.RejectedExecutionException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; @@ -98,7 +99,7 @@ public synchronized void enableOnShake() { options .getExecutorService() .submit(() -> shakeDetector.init(application, options.getLogger())); - } catch (Throwable t) { + } catch (RejectedExecutionException t) { options .getLogger() .log(SentryLevel.WARNING, "Failed to submit shake detector initialization.", t); diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java b/sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java index 7c2e72031bb..705774cc768 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java @@ -41,6 +41,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicReference; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -415,7 +416,7 @@ private static void deleteCurrentSessionFile( .submit(() -> { deleteCurrentSessionFile(options); }); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options .getLogger() .log(WARNING, "Submission of deletion of the current session file rejected.", e); diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/LifecycleWatcher.java b/sentry-android-core/src/main/java/io/sentry/android/core/LifecycleWatcher.java index 0534e9ba539..ea84e666062 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/LifecycleWatcher.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/LifecycleWatcher.java @@ -11,6 +11,7 @@ import io.sentry.util.AutoClosableReentrantLock; import java.util.Date; import java.util.concurrent.Future; +import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import org.jetbrains.annotations.NotNull; @@ -132,7 +133,7 @@ private void scheduleEndSession() { .getOptions() .getTimerExecutorService() .schedule(endSession, sessionEnd.remaining(TimeUnit.MILLISECONDS)); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { scopes .getOptions() .getLogger() diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/NativeEventCollector.java b/sentry-android-core/src/main/java/io/sentry/android/core/NativeEventCollector.java index bb7811ce594..26ccd4ab103 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/NativeEventCollector.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/NativeEventCollector.java @@ -223,7 +223,7 @@ public boolean deleteNativeEventFile(final @NotNull NativeEventData nativeEventD file.getAbsolutePath()); return false; } - } catch (Throwable e) { + } catch (SecurityException e) { options .getLogger() .log( @@ -285,7 +285,7 @@ public boolean deleteNativeEventFile(final @NotNull NativeEventData nativeEventD break; } } - } catch (Throwable e) { + } catch (IOException e) { options .getLogger() .log( @@ -337,7 +337,8 @@ public boolean deleteNativeEventFile(final @NotNull NativeEventData nativeEventD if (NATIVE_PLATFORM.equals(platform) && timestamp != null) { result = new NativeEnvelopeMetadata(file, timestamp.getTime()); } - } catch (Throwable e) { + } catch (IOException | IllegalStateException e) { + // IllegalStateException is how the JSON reader reports an unexpected token options .getLogger() .log(SentryLevel.DEBUG, e, "Error parsing event JSON from: %s", file.getName()); @@ -369,7 +370,9 @@ public boolean deleteNativeEventFile(final @NotNull NativeEventData nativeEventD } } } - } catch (Throwable e) { + } catch (Exception e) { + // EnvelopeReader reports a malformed envelope with IllegalArgumentException, and getData() + // is declared to throw Exception for items that are created lazily options .getLogger() .log(SentryLevel.DEBUG, e, "Error loading envelope file: %s", file.getAbsolutePath()); @@ -420,7 +423,9 @@ private static final class ItemHeaderInfo { if (length >= 0) { return new ItemHeaderInfo(type, length); } - } catch (Throwable e) { + } catch (IOException | IllegalStateException | NumberFormatException e) { + // the JSON reader reports an unexpected token with IllegalStateException, and a length that + // isn't an int with NumberFormatException options.getLogger().log(SentryLevel.DEBUG, e, "Error parsing item header"); } return null; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/PerfettoContinuousProfiler.java b/sentry-android-core/src/main/java/io/sentry/android/core/PerfettoContinuousProfiler.java index 63512b7dd99..a92c7c35023 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/PerfettoContinuousProfiler.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/PerfettoContinuousProfiler.java @@ -553,7 +553,7 @@ private void sendChunk( } else { executorServiceSupplier.evaluate().submit(task); } - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.DEBUG, "Failed to send profile chunk.", e); } } diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SendCachedEnvelopeIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/SendCachedEnvelopeIntegration.java index 1f3dc572792..076f1330aef 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/SendCachedEnvelopeIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/SendCachedEnvelopeIntegration.java @@ -16,6 +16,8 @@ import io.sentry.util.Objects; import java.io.Closeable; import java.io.IOException; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; @@ -160,6 +162,13 @@ private void sendCachedEnvelopes( .getLogger() .log( SentryLevel.DEBUG, "Synchronous send interrupted, continuing in the background."); + } catch (ExecutionException e) { + options.getLogger().log(SentryLevel.ERROR, "Failed trying to send cached events.", e); + } catch (CancellationException e) { + // the executor returns a cancelled future instead of throwing when its queue is full + options + .getLogger() + .log(SentryLevel.ERROR, "The executor rejected sending the cached events.", e); } } options.getLogger().log(SentryLevel.DEBUG, "SendCachedEnvelopeIntegration installed."); @@ -170,10 +179,6 @@ private void sendCachedEnvelopes( SentryLevel.ERROR, "Failed to call the executor. Cached events will not be sent. Did you call Sentry.close()?", e); - } catch (Throwable e) { - options - .getLogger() - .log(SentryLevel.ERROR, "Failed to call the executor. Cached events will not be sent", e); } } } diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java index b3caf622c37..8d6a6b741ff 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java @@ -183,7 +183,7 @@ private void registerReceiver( } } }); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options .getLogger() .log( diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/TombstoneIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/TombstoneIntegration.java index 88f83fd2993..3cab596c3d3 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/TombstoneIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/TombstoneIntegration.java @@ -44,6 +44,7 @@ import java.time.Instant; import java.time.format.DateTimeFormatter; import java.util.List; +import java.util.concurrent.RejectedExecutionException; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -99,7 +100,7 @@ public void register(@NotNull IScopes scopes, @NotNull SentryOptions options) { this.options, dateProvider, new TombstonePolicy(this.options, this.context))); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.DEBUG, "Failed to start tombstone processor.", e); } options.getLogger().log(SentryLevel.DEBUG, "TombstoneIntegration installed."); @@ -282,7 +283,8 @@ private void addNativeAttachmentsToTombstoneHint( item.getHeader().getContentType(), item.getHeader().getAttachmentType(), false)); - } catch (Throwable e) { + } catch (Exception e) { + // getData() is declared to throw Exception for items that are created lazily options .getLogger() .log(SentryLevel.DEBUG, "Failed to process envelope item: %s", e.getMessage()); diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfileRotationHelper.java b/sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfileRotationHelper.java index 204d4c5c650..d55b48dab9f 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfileRotationHelper.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfileRotationHelper.java @@ -37,13 +37,13 @@ private static void performRotationIfNeeded(final @NotNull File cacheDir) { try { oldFile.delete(); - } catch (Throwable e) { + } catch (SecurityException e) { // ignored } try { currentFile.renameTo(oldFile); - } catch (Throwable e) { + } catch (SecurityException e) { // ignored } diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfilingIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfilingIntegration.java index 018fd49f6fd..1e18aa6cda7 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfilingIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfilingIntegration.java @@ -22,6 +22,7 @@ import java.io.Closeable; import java.io.File; import java.io.IOException; +import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -143,7 +144,7 @@ public void close() throws IOException { logger.log(SentryLevel.WARNING, "Failed to close AnrProfileManager"); } }); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { logger.log(SentryLevel.WARNING, "Failed to submit AnrProfileManager close"); } } diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/cache/AndroidEnvelopeCache.java b/sentry-android-core/src/main/java/io/sentry/android/core/cache/AndroidEnvelopeCache.java index 3a9fe794301..ee2d9bb164a 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/cache/AndroidEnvelopeCache.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/cache/AndroidEnvelopeCache.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.IOException; import java.io.OutputStream; import java.util.Arrays; import java.util.List; @@ -110,7 +111,7 @@ private void writeStartupCrashMarkerFile() { final File crashMarkerFile = new File(outboxDir, STARTUP_CRASH_MARKER_FILE); try { crashMarkerFile.createNewFile(); - } catch (Throwable e) { + } catch (IOException e) { options.getLogger().log(ERROR, "Error writing the startup crash marker file to the disk", e); } } @@ -138,7 +139,7 @@ public static boolean hasStartupCrashMarker(final @NotNull SentryOptions options } } return exists; - } catch (Throwable e) { + } catch (SecurityException e) { options .getLogger() .log(ERROR, "Error reading/deleting the startup crash marker file on the disk", e); @@ -161,17 +162,15 @@ public static boolean hasStartupCrashMarker(final @NotNull SentryOptions options // we wrapped into try-catch already //noinspection ConstantConditions return (content == null || content.equals("null")) ? null : Long.parseLong(content.trim()); - } catch (Throwable e) { - if (e instanceof FileNotFoundException) { - options - .getLogger() - .log( - DEBUG, - "Last " + markerLabel + " marker does not exist. %s.", - lastMarker.getAbsolutePath()); - } else { - options.getLogger().log(ERROR, "Error reading last " + markerLabel + " marker", e); - } + } catch (FileNotFoundException e) { + options + .getLogger() + .log( + DEBUG, + "Last " + markerLabel + " marker does not exist. %s.", + lastMarker.getAbsolutePath()); + } catch (IOException | NumberFormatException e) { + options.getLogger().log(ERROR, "Error reading last " + markerLabel + " marker", e); } return null; } @@ -195,7 +194,7 @@ private static void writeLastReportedMarker( try (final OutputStream outputStream = new FileOutputStream(anrMarker)) { outputStream.write(String.valueOf(timestamp).getBytes(UTF_8)); outputStream.flush(); - } catch (Throwable e) { + } catch (IOException e) { options .getLogger() .log(ERROR, "Error writing the " + markerCategory + " marker to the disk", e); diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/modules/AssetsModulesLoader.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/modules/AssetsModulesLoader.java index 27619febb2f..9d5e271072c 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/internal/modules/AssetsModulesLoader.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/internal/modules/AssetsModulesLoader.java @@ -10,6 +10,7 @@ import java.io.InputStream; import java.util.Map; import java.util.TreeMap; +import java.util.concurrent.RejectedExecutionException; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -30,7 +31,7 @@ public AssetsModulesLoader(final @NotNull Context context, final @NotNull Sentry .submit(() -> { getOrLoadModules(); }); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.ERROR, "AssetsModulesLoader submit failed", e); } } diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidConnectionStatusProvider.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidConnectionStatusProvider.java index de5a90c9067..de57bb51931 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidConnectionStatusProvider.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidConnectionStatusProvider.java @@ -25,6 +25,7 @@ import io.sentry.util.AutoClosableReentrantLock; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; @@ -1037,7 +1038,7 @@ ConnectionSnapshot withCapabilities( private void submitSafe(@NotNull Runnable r) { try { options.getExecutorService().submit(r); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options .getLogger() .log(SentryLevel.ERROR, "AndroidConnectionStatusProvider submit failed", e); diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/RootChecker.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/RootChecker.java index 2823f278a7d..8576469e719 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/RootChecker.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/RootChecker.java @@ -169,7 +169,7 @@ private boolean checkRootC() { } } catch (IOException e) { logger.log(SentryLevel.DEBUG, "SU isn't found on this Device."); - } catch (Throwable e) { + } catch (SecurityException e) { logger.log(SentryLevel.DEBUG, "Error when trying to check if SU exists.", e); } finally { if (p != null) { diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/AndroidLoggerBatchProcessorTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/AndroidLoggerBatchProcessorTest.kt index 3463daf1819..5ccd7569e1b 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/AndroidLoggerBatchProcessorTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/AndroidLoggerBatchProcessorTest.kt @@ -10,6 +10,7 @@ import io.sentry.SentryOptions import io.sentry.protocol.SentryId import io.sentry.test.ImmediateExecutorService import io.sentry.test.getProperty +import java.util.concurrent.RejectedExecutionException import java.util.concurrent.atomic.AtomicBoolean import kotlin.test.AfterTest import kotlin.test.BeforeTest @@ -96,7 +97,7 @@ class AndroidLoggerBatchProcessorTest { fun `onBackground handles executor exception gracefully`() { val sut = fixture.getSut { options -> val rejectingExecutor = mock() - whenever(rejectingExecutor.submit(any())).thenThrow(RuntimeException("Rejected")) + whenever(rejectingExecutor.submit(any())).thenThrow(RejectedExecutionException("Rejected")) options.executorService = rejectingExecutor } sut.add(SentryLogEvent(SentryId(), 1.0, "test", SentryLogLevel.INFO)) diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/AndroidMetricsBatchProcessorTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/AndroidMetricsBatchProcessorTest.kt index a8309a03b94..c0f70e4a990 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/AndroidMetricsBatchProcessorTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/AndroidMetricsBatchProcessorTest.kt @@ -9,6 +9,7 @@ import io.sentry.SentryOptions import io.sentry.protocol.SentryId import io.sentry.test.ImmediateExecutorService import io.sentry.test.getProperty +import java.util.concurrent.RejectedExecutionException import java.util.concurrent.atomic.AtomicBoolean import kotlin.test.AfterTest import kotlin.test.BeforeTest @@ -95,7 +96,7 @@ class AndroidMetricsBatchProcessorTest { fun `onBackground handles executor exception gracefully`() { val sut = fixture.getSut { options -> val rejectingExecutor = mock() - whenever(rejectingExecutor.submit(any())).thenThrow(RuntimeException("Rejected")) + whenever(rejectingExecutor.submit(any())).thenThrow(RejectedExecutionException("Rejected")) options.executorService = rejectingExecutor } sut.add(SentryMetricsEvent(SentryId(), 1.0, "test", "counter", 3.0)) diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ContextUtilsTestHelper.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ContextUtilsTestHelper.kt index 9d18a4fd405..8979d938c04 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/ContextUtilsTestHelper.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/ContextUtilsTestHelper.kt @@ -30,22 +30,31 @@ object ContextUtilsTestHelper { ) .thenReturn(mockApplicationInfo) - if (assets == null) { - val mockAssets = mock() - whenever(mockAssets.open(any())).thenThrow(FileNotFoundException()) - whenever(mockContext.assets).thenReturn(mockAssets) - } else { - whenever(mockContext.assets).thenReturn(assets) - } + val contextAssets = assets ?: assetsWithoutModulesFile() + whenever(mockContext.assets).thenReturn(contextAssets) mockApplicationInfo.metaData = metaData return mockContext } fun createMockContext(hasAppContext: Boolean = true): Context { + // A real Context always has assets. Without sentry-external-modules.txt, open() throws. + val assets = assetsWithoutModulesFile() val mockApp = mock() - whenever(mockApp.applicationContext) - .thenReturn(if (hasAppContext) mock() else null) + whenever(mockApp.assets).thenReturn(assets) + if (hasAppContext) { + val application = mock() + whenever(application.assets).thenReturn(assets) + whenever(mockApp.applicationContext).thenReturn(application) + } else { + whenever(mockApp.applicationContext).thenReturn(null) + } return mockApp } + + private fun assetsWithoutModulesFile(): AssetManager { + val mockAssets = mock() + whenever(mockAssets.open(any())).thenThrow(FileNotFoundException()) + return mockAssets + } } diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/NativeEventCollectorTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/NativeEventCollectorTest.kt index 490847b3182..16191e0e7eb 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/NativeEventCollectorTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/NativeEventCollectorTest.kt @@ -88,6 +88,26 @@ class NativeEventCollectorTest { assertNull(match) } + @Test + fun `handles an item header with a non-numeric length without throwing`() { + val sut = fixture.getSut(tmpDir) + File(fixture.outboxDir, "bad-length.envelope") + .writeText("{}\n{\"type\":\"event\",\"length\":\"abc\"}\n{}\n") + + val match = sut.findAndRemoveMatchingNativeEvent(0L) + assertNull(match) + } + + @Test + fun `handles an event payload that is not a JSON object without throwing`() { + val sut = fixture.getSut(tmpDir) + File(fixture.outboxDir, "array-payload.envelope") + .writeText("{}\n{\"type\":\"event\",\"length\":3}\n[1]\n") + + val match = sut.findAndRemoveMatchingNativeEvent(0L) + assertNull(match) + } + @Test fun `handles envelope with event and attachments without throwing`() { val sut = fixture.getSut(tmpDir) diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/SendCachedEnvelopeIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/SendCachedEnvelopeIntegrationTest.kt index 46df2ee227c..a021d0c6c91 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/SendCachedEnvelopeIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/SendCachedEnvelopeIntegrationTest.kt @@ -14,7 +14,9 @@ import io.sentry.test.DeferredExecutorService import io.sentry.test.ImmediateExecutorService import io.sentry.transport.RateLimiter import io.sentry.util.LazyEvaluator +import java.util.concurrent.CancellationException import java.util.concurrent.ExecutionException +import java.util.concurrent.Future import java.util.concurrent.TimeUnit.MILLISECONDS import java.util.concurrent.atomic.AtomicBoolean import kotlin.test.Test @@ -138,6 +140,20 @@ class SendCachedEnvelopeIntegrationTest { verify(fixture.sender).send() } + @Test + fun `when has startup crash marker and the executor cancels the task, register does not throw`() { + // the executor hands back a cancelled future instead of throwing when its queue is full + val cancelledFuture = mock>() + whenever(cancelledFuture.get(any(), any())).thenThrow(CancellationException()) + val executor = mock() + whenever(executor.submit(any())).thenReturn(cancelledFuture) + val sut = fixture.getSut(hasStartupCrashMarker = true, mockExecutorService = executor) + + sut.register(fixture.scopes, fixture.options) + + verify(fixture.sender, never()).send() + } + @Test fun `when interrupted while awaiting the task, keeps the interrupt and continues in the background`() { // the delay keeps the task running, so the wait for it sees the interrupt diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/internal/util/RootCheckerTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/internal/util/RootCheckerTest.kt index 3dc060bb635..8ed6ddecc4f 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/internal/util/RootCheckerTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/internal/util/RootCheckerTest.kt @@ -14,6 +14,7 @@ import kotlin.test.Test import kotlin.test.assertFalse import kotlin.test.assertTrue import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn import org.mockito.kotlin.eq import org.mockito.kotlin.mock import org.mockito.kotlin.verify @@ -25,7 +26,10 @@ class RootCheckerTest { val logger = mock() val buildInfoProvider = mock() val packageManager = mock() - val runtime = mock() + // by default, `which su` finds nothing, like on a device without su + private val whichSuNotFound = + mock { on { inputStream } doReturn ByteArrayInputStream(ByteArray(0)) } + val runtime = mock { on { exec(any>()) } doReturn whichSuNotFound } fun getSut( tags: String? = "abc", diff --git a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java index 0ec3446aa83..ff9d3b62387 100644 --- a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java +++ b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java @@ -48,7 +48,7 @@ public void setUser(final @Nullable User user) { user.getId(), user.getEmail(), user.getIpAddress(), user.getUsername()); } }); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.ERROR, e, "Scope sync setUser has an error."); } } @@ -87,7 +87,7 @@ public void addBreadcrumb(final @NotNull Breadcrumb crumb) { nativeScope.addBreadcrumb( level, crumb.getMessage(), crumb.getCategory(), crumb.getType(), timestamp, data); }); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.ERROR, e, "Scope sync addBreadcrumb has an error."); } } @@ -96,7 +96,7 @@ public void addBreadcrumb(final @NotNull Breadcrumb crumb) { public void setTag(final @NotNull String key, final @NotNull String value) { try { options.getExecutorService().submit(() -> nativeScope.setTag(key, value)); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.ERROR, e, "Scope sync setTag(%s) has an error.", key); } } @@ -105,7 +105,7 @@ public void setTag(final @NotNull String key, final @NotNull String value) { public void removeTag(final @NotNull String key) { try { options.getExecutorService().submit(() -> nativeScope.removeTag(key)); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.ERROR, e, "Scope sync removeTag(%s) has an error.", key); } } @@ -114,7 +114,7 @@ public void removeTag(final @NotNull String key) { public void setExtra(final @NotNull String key, final @NotNull String value) { try { options.getExecutorService().submit(() -> nativeScope.setExtra(key, value)); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.ERROR, e, "Scope sync setExtra(%s) has an error.", key); } } @@ -123,7 +123,7 @@ public void setExtra(final @NotNull String key, final @NotNull String value) { public void removeExtra(final @NotNull String key) { try { options.getExecutorService().submit(() -> nativeScope.removeExtra(key)); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options .getLogger() .log(SentryLevel.ERROR, e, "Scope sync removeExtra(%s) has an error.", key); @@ -142,7 +142,7 @@ public void setTrace(@Nullable SpanContext spanContext, @NotNull IScope scope) { .submit(() -> nativeScope.setTrace( spanContext.getTraceId().toString(), spanContext.getSpanId().toString())); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.ERROR, e, "Scope sync setTrace failed."); } } @@ -153,7 +153,7 @@ public void addAttachment(final @NotNull Attachment attachment) { if (pathname != null) { try { options.getExecutorService().submit(() -> nativeScope.addAttachment(pathname)); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.ERROR, e, "Scope sync addAttachment has an error."); } return; @@ -164,7 +164,7 @@ public void addAttachment(final @NotNull Attachment attachment) { final String filename = attachment.getFilename(); try { options.getExecutorService().submit(() -> nativeScope.addAttachmentBytes(bytes, filename)); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.ERROR, e, "Scope sync addAttachment has an error."); } return; @@ -179,7 +179,7 @@ public void addAttachment(final @NotNull Attachment attachment) { public void clearAttachments() { try { options.getExecutorService().submit(() -> nativeScope.clearAttachments()); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.ERROR, e, "Scope sync clearAttachments has an error."); } } diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayCache.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayCache.kt index 64aec8a077c..5d802388f6d 100644 --- a/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayCache.kt +++ b/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayCache.kt @@ -246,7 +246,7 @@ public class ReplayCache(private val options: SentryOptions, private val replayI if (!file.delete()) { options.logger.log(ERROR, "Failed to delete replay frame: %s", file.absolutePath) } - } catch (e: Throwable) { + } catch (e: SecurityException) { options.logger.log(ERROR, e, "Failed to delete replay frame: %s", file.absolutePath) } } @@ -397,13 +397,13 @@ public class ReplayCache(private val options: SentryOptions, private val replayI val segmentTimestamp = try { DateUtils.getDateTime(lastSegment[SEGMENT_KEY_TIMESTAMP].orEmpty()) - } catch (e: Throwable) { + } catch (_: IllegalArgumentException) { null } val replayType = try { ReplayType.valueOf(lastSegment[SEGMENT_KEY_REPLAY_TYPE].orEmpty()) - } catch (e: Throwable) { + } catch (_: IllegalArgumentException) { null } if ( diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BaseCaptureStrategy.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BaseCaptureStrategy.kt index 6b55cab0bb1..9bbddd4fe36 100644 --- a/sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BaseCaptureStrategy.kt +++ b/sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BaseCaptureStrategy.kt @@ -39,6 +39,7 @@ import io.sentry.time.Deadline import io.sentry.time.MonotonicTicker import io.sentry.transport.ICurrentDateProvider import java.io.File +import java.io.IOException import java.util.Date import java.util.Deque import java.util.concurrent.ConcurrentLinkedDeque @@ -260,9 +261,13 @@ constructor( if (options.threadChecker.isMainThread) { persistingExecutor.submit(ReplayRunnable("$TAG.runInBackground") { task() }) } else { + // every task ends in ReplayCache.persistSegmentValues, which writes the segment file try { task() - } catch (e: Throwable) { + } catch (e: IOException) { + options.logger.log(ERROR, "Failed to execute task $TAG.runInBackground", e) + } catch (@Suppress("TooGenericExceptionCaught") e: IndexOutOfBoundsException) { + // a line of the segment file has no "=", so the file is corrupt options.logger.log(ERROR, "Failed to execute task $TAG.runInBackground", e) } } diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BufferCaptureStrategy.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BufferCaptureStrategy.kt index 988a62e6411..5a084e78434 100644 --- a/sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BufferCaptureStrategy.kt +++ b/sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BufferCaptureStrategy.kt @@ -213,7 +213,7 @@ constructor( if (!file.delete()) { options.logger.log(ERROR, "Failed to delete replay segment: %s", file.absolutePath) } - } catch (e: Throwable) { + } catch (e: SecurityException) { options.logger.log(ERROR, e, "Failed to delete replay segment: %s", file.absolutePath) } } diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/screenshot/CanvasStrategy.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/screenshot/CanvasStrategy.kt index dfb8ec0f268..bafc52f7121 100644 --- a/sentry-android-replay/src/main/java/io/sentry/android/replay/screenshot/CanvasStrategy.kt +++ b/sentry-android-replay/src/main/java/io/sentry/android/replay/screenshot/CanvasStrategy.kt @@ -209,13 +209,11 @@ internal class CanvasStrategy( } fun Handler.postSafely(runnable: ReplayRunnable) { - try { - post(runnable) - } catch (t: Throwable) { + // post() doesn't throw, it returns false when the handler thread's looper is quitting + if (!post(runnable)) { options.logger.log( SentryLevel.ERROR, "Canvas Strategy: failed to post runnable ${runnable.taskName}", - t, ) } } diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/util/Executors.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/util/Executors.kt index a5dddc3bd4d..9b94d9198c4 100644 --- a/sentry-android-replay/src/main/java/io/sentry/android/replay/util/Executors.kt +++ b/sentry-android-replay/src/main/java/io/sentry/android/replay/util/Executors.kt @@ -4,6 +4,7 @@ import io.sentry.ISentryExecutorService import io.sentry.SentryLevel.ERROR import io.sentry.SentryOptions import java.util.concurrent.Future +import java.util.concurrent.RejectedExecutionException internal fun ISentryExecutorService.submitSafely( options: SentryOptions, @@ -18,7 +19,7 @@ internal fun ISentryExecutorService.submitSafely( options.logger.log(ERROR, "Failed to execute task $taskName", e) } } - } catch (e: Throwable) { + } catch (e: RejectedExecutionException) { options.logger.log(ERROR, "Failed to submit task $taskName to executor", e) null } diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/util/ReplayExecutorService.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/util/ReplayExecutorService.kt index 5ba334f8029..292d44b1e20 100644 --- a/sentry-android-replay/src/main/java/io/sentry/android/replay/util/ReplayExecutorService.kt +++ b/sentry-android-replay/src/main/java/io/sentry/android/replay/util/ReplayExecutorService.kt @@ -3,6 +3,7 @@ package io.sentry.android.replay.util import io.sentry.SentryLevel.ERROR import io.sentry.SentryOptions import java.util.concurrent.Future +import java.util.concurrent.RejectedExecutionException import java.util.concurrent.ScheduledExecutorService import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit.MILLISECONDS @@ -42,7 +43,7 @@ internal class ReplayExecutorService( ) } } - } catch (e: Throwable) { + } catch (e: RejectedExecutionException) { options.logger.log( ERROR, "Failed to submit task ${if (task is ReplayRunnable) task.taskName else ""} to executor", 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 index d66584f1085..e75e5641b70 100644 --- 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 @@ -105,7 +105,12 @@ class ReplayIntegrationTest { mock { on { breadcrumbConverter }.thenReturn(DefaultReplayBreadcrumbConverter()) }, ) executorService = mock { - doAnswer { (it.arguments[0] as Runnable).run() }.whenever(mock).submit(any()) + doAnswer { + (it.arguments[0] as Runnable).run() + null + } + .whenever(mock) + .submit(any()) } } val scope = Scope(options) @@ -1272,7 +1277,10 @@ class ReplayIntegrationTest { // hold back the startup work, like a busy executor does val deferredTasks = mutableListOf() fixture.options.executorService = mock { - doAnswer { deferredTasks += it.arguments[0] as Runnable } + doAnswer { + deferredTasks += it.arguments[0] as Runnable + null + } .whenever(mock) .submit(any()) } @@ -1326,7 +1334,10 @@ class ReplayIntegrationTest { fixture.options.addScopeObserver(PersistingScopeObserver(fixture.options)) val deferredTasks = mutableListOf() fixture.options.executorService = mock { - doAnswer { deferredTasks += it.arguments[0] as Runnable } + doAnswer { + deferredTasks += it.arguments[0] as Runnable + null + } .whenever(mock) .submit(any()) } diff --git a/sentry-android-replay/src/test/java/io/sentry/android/replay/capture/SessionCaptureStrategyTest.kt b/sentry-android-replay/src/test/java/io/sentry/android/replay/capture/SessionCaptureStrategyTest.kt index 68f7bb0cb0f..916c207f5ff 100644 --- a/sentry-android-replay/src/test/java/io/sentry/android/replay/capture/SessionCaptureStrategyTest.kt +++ b/sentry-android-replay/src/test/java/io/sentry/android/replay/capture/SessionCaptureStrategyTest.kt @@ -41,6 +41,7 @@ import io.sentry.time.TestMonotonicTicker import io.sentry.transport.CurrentDateProvider import io.sentry.transport.ICurrentDateProvider import java.io.File +import java.io.IOException import java.util.Date import java.util.concurrent.ScheduledExecutorService import java.util.concurrent.TimeUnit.MILLISECONDS @@ -170,6 +171,20 @@ class SessionCaptureStrategyTest { assertEquals(0, strategy.currentSegment) } + @Test + fun `start does not fail when the segment values can't be written`() { + doAnswer { throw IOException("disk full") } + .whenever(fixture.replayCache) + .persistSegmentValues(any(), anyOrNull()) + val strategy = fixture.getSut() + val replayId = SentryId() + + strategy.start(0, replayId) + + assertEquals(replayId, strategy.currentReplayId) + assertEquals(0, strategy.currentSegment) + } + @Test fun `start persists the recording metadata`() { fixture.options.release = "io.sentry.sample@1.0.0+1" diff --git a/sentry-apollo-3/src/main/java/io/sentry/apollo3/SentryApollo3HttpInterceptor.kt b/sentry-apollo-3/src/main/java/io/sentry/apollo3/SentryApollo3HttpInterceptor.kt index 400643cef4a..2473266f2a5 100644 --- a/sentry-apollo-3/src/main/java/io/sentry/apollo3/SentryApollo3HttpInterceptor.kt +++ b/sentry-apollo-3/src/main/java/io/sentry/apollo3/SentryApollo3HttpInterceptor.kt @@ -39,6 +39,7 @@ import io.sentry.util.SpanUtils import io.sentry.util.TracingUtils import io.sentry.util.UrlUtils import io.sentry.vendor.Base64 +import java.io.IOException import kotlin.coroutines.cancellation.CancellationException import okio.Buffer import org.jetbrains.annotations.ApiStatus @@ -192,7 +193,7 @@ constructor( return getHeader(headerName, request.headers)?.let { try { String(Base64.decode(it, Base64.NO_WRAP)) - } catch (e: Throwable) { + } catch (e: IllegalArgumentException) { scopes.options.logger.log( SentryLevel.ERROR, "Error decoding internal apolloHeader $headerName", @@ -381,7 +382,7 @@ constructor( val body = try { response.body?.peek()?.readUtf8() ?: "" - } catch (e: Throwable) { + } catch (e: IOException) { scopes.options.logger.log(SentryLevel.ERROR, "Error reading the response body.", e) // bail out because the response body has the most important information return diff --git a/sentry-apollo-4/src/main/java/io/sentry/apollo4/SentryApollo4HttpInterceptor.kt b/sentry-apollo-4/src/main/java/io/sentry/apollo4/SentryApollo4HttpInterceptor.kt index 539bdb25b21..d2b7959cf48 100644 --- a/sentry-apollo-4/src/main/java/io/sentry/apollo4/SentryApollo4HttpInterceptor.kt +++ b/sentry-apollo-4/src/main/java/io/sentry/apollo4/SentryApollo4HttpInterceptor.kt @@ -37,6 +37,7 @@ import io.sentry.util.SpanUtils import io.sentry.util.TracingUtils import io.sentry.util.UrlUtils import io.sentry.vendor.Base64 +import java.io.IOException import java.util.Locale import kotlin.coroutines.cancellation.CancellationException import okio.Buffer @@ -191,7 +192,7 @@ constructor( return getHeader(headerName, request.headers)?.let { try { String(Base64.decode(it, Base64.NO_WRAP)) - } catch (e: Throwable) { + } catch (e: IllegalArgumentException) { scopes.options.logger.log( SentryLevel.ERROR, "Error decoding internal apolloHeader $headerName", @@ -380,7 +381,7 @@ constructor( val body = try { response.body?.peek()?.readUtf8() ?: "" - } catch (e: Throwable) { + } catch (e: IOException) { scopes.options.logger.log(SentryLevel.ERROR, "Error reading the response body.", e) // bail out because the response body has the most important information return diff --git a/sentry-async-profiler/src/main/java/io/sentry/asyncprofiler/profiling/JavaContinuousProfiler.java b/sentry-async-profiler/src/main/java/io/sentry/asyncprofiler/profiling/JavaContinuousProfiler.java index c7e2bcdd9b2..029e7b0bfdf 100644 --- a/sentry-async-profiler/src/main/java/io/sentry/asyncprofiler/profiling/JavaContinuousProfiler.java +++ b/sentry-async-profiler/src/main/java/io/sentry/asyncprofiler/profiling/JavaContinuousProfiler.java @@ -416,7 +416,7 @@ private void sendChunks(final @NotNull IScopes scopes, final @NotNull SentryOpti scopes.captureProfileChunk(payload); } }); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.DEBUG, "Failed to send profile chunks.", e); } } diff --git a/sentry-jdbc/src/main/java/io/sentry/jdbc/DatabaseUtils.java b/sentry-jdbc/src/main/java/io/sentry/jdbc/DatabaseUtils.java index 6325105205c..f4b1612d159 100644 --- a/sentry-jdbc/src/main/java/io/sentry/jdbc/DatabaseUtils.java +++ b/sentry-jdbc/src/main/java/io/sentry/jdbc/DatabaseUtils.java @@ -4,6 +4,7 @@ import com.p6spy.engine.common.StatementInformation; import io.sentry.util.StringUtils; import java.net.URI; +import java.net.URISyntaxException; import java.util.Locale; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -46,7 +47,7 @@ public static DatabaseDetails parse(final @Nullable String databaseConnectionUrl final @NotNull String dbSystem = urlParts[0]; return parseDbSystemSpecific(dbSystem, urlParts, rawUrl); } - } catch (Throwable t) { + } catch (IndexOutOfBoundsException t) { // ignore } @@ -126,7 +127,7 @@ public static DatabaseDetails parse(final @Nullable String databaseConnectionUrl String path = StringUtils.removePrefix(url.getPath(), "/"); String pathWithoutProperties = StringUtils.substringBefore(path, ";"); return new DatabaseDetails(dbSystem, pathWithoutProperties); - } catch (Throwable t) { + } catch (URISyntaxException t) { // ignore } return new DatabaseDetails(dbSystem, null); diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OpenTelemetryAttributesExtractor.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OpenTelemetryAttributesExtractor.java index 5ae9de98cc6..56acc9f0d15 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OpenTelemetryAttributesExtractor.java +++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OpenTelemetryAttributesExtractor.java @@ -13,6 +13,7 @@ import io.sentry.util.HttpUtils; import io.sentry.util.StringUtils; import io.sentry.util.UrlUtils; +import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; import java.util.List; @@ -93,7 +94,7 @@ private static Map collectHeaders( toString( CookieUtils.filterOutSecurityCookiesFromHeader( headerValues, headerName, null))); - } catch (Throwable t) { + } catch (ClassCastException t) { options.getLogger().log(SentryLevel.WARNING, "Expected a List as header", t); } } @@ -140,7 +141,7 @@ private static Map collectHeaders( } else { return new URL(scheme, serverAddress, serverPort.intValue(), pathToUse).toString(); } - } catch (Throwable t) { + } catch (MalformedURLException t) { options .getLogger() .log(SentryLevel.WARNING, "Unable to combine URL span attributes into one.", t); diff --git a/sentry-opentelemetry/sentry-opentelemetry-otlp/src/main/java/io/sentry/opentelemetry/otlp/OpenTelemetryOtlpPropagator.java b/sentry-opentelemetry/sentry-opentelemetry-otlp/src/main/java/io/sentry/opentelemetry/otlp/OpenTelemetryOtlpPropagator.java index 4cdf1b0ed09..e11fce13e76 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-otlp/src/main/java/io/sentry/opentelemetry/otlp/OpenTelemetryOtlpPropagator.java +++ b/sentry-opentelemetry/sentry-opentelemetry-otlp/src/main/java/io/sentry/opentelemetry/otlp/OpenTelemetryOtlpPropagator.java @@ -25,6 +25,7 @@ import io.sentry.exception.InvalidSentryTraceHeaderException; import io.sentry.util.PropagationTargetsUtils; import io.sentry.util.TracingUtils; +import java.net.MalformedURLException; import java.net.URL; import java.util.Arrays; import java.util.Collection; @@ -123,7 +124,7 @@ private boolean shouldInjectTracingHeaders(final @NotNull Span otelSpan) { } else { return new URL(scheme, serverAddress, serverPort.intValue(), pathToUse).toString(); } - } catch (Throwable t) { + } catch (MalformedURLException t) { options .getLogger() .log(SentryLevel.WARNING, "Unable to combine URL span attributes into one.", t); diff --git a/sentry/src/main/java/io/sentry/Baggage.java b/sentry/src/main/java/io/sentry/Baggage.java index 64a2c904a91..af94ede98ae 100644 --- a/sentry/src/main/java/io/sentry/Baggage.java +++ b/sentry/src/main/java/io/sentry/Baggage.java @@ -145,7 +145,10 @@ public static Baggage fromHeader( if (!DSCKeys.SAMPLE_RAND.equalsIgnoreCase(key)) { shouldFreeze = true; } - } catch (Throwable e) { + } catch (UnsupportedEncodingException + | IllegalArgumentException + | IndexOutOfBoundsException e) { + // e.g. an entry without "=", or an invalid percent-encoding logger.log( SentryLevel.ERROR, e, "Unable to decode baggage key value pair %s", keyValueString); } @@ -308,7 +311,7 @@ public String getThirdPartyHeader() { sb.append(encodedKeyValue); separator = ","; } - } catch (Throwable e) { + } catch (UnsupportedEncodingException e) { logger.log( SentryLevel.ERROR, e, diff --git a/sentry/src/main/java/io/sentry/EnvelopeSender.java b/sentry/src/main/java/io/sentry/EnvelopeSender.java index 0aed2d62614..785a955b64c 100644 --- a/sentry/src/main/java/io/sentry/EnvelopeSender.java +++ b/sentry/src/main/java/io/sentry/EnvelopeSender.java @@ -128,7 +128,7 @@ private void safeDelete(final @NotNull File file, final @NotNull String errorMes file.getAbsolutePath(), errorMessageSuffix); } - } catch (Throwable e) { + } catch (SecurityException e) { logger.log( SentryLevel.ERROR, e, diff --git a/sentry/src/main/java/io/sentry/FilterString.java b/sentry/src/main/java/io/sentry/FilterString.java index 3fd146aa4eb..9d49ebcd0e5 100644 --- a/sentry/src/main/java/io/sentry/FilterString.java +++ b/sentry/src/main/java/io/sentry/FilterString.java @@ -2,6 +2,7 @@ import java.util.Objects; import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -14,7 +15,7 @@ public FilterString(@NotNull String filterString) { @Nullable Pattern pattern = null; try { pattern = Pattern.compile(filterString); - } catch (Throwable t) { + } catch (PatternSyntaxException t) { Sentry.getCurrentScopes() .getOptions() .getLogger() diff --git a/sentry/src/main/java/io/sentry/MonitorSchedule.java b/sentry/src/main/java/io/sentry/MonitorSchedule.java index 438e0399632..a065dfc15ea 100644 --- a/sentry/src/main/java/io/sentry/MonitorSchedule.java +++ b/sentry/src/main/java/io/sentry/MonitorSchedule.java @@ -100,7 +100,7 @@ public void serialize(final @NotNull ObjectWriter writer, final @NotNull ILogger if (MonitorScheduleType.INTERVAL.apiName().equalsIgnoreCase(type)) { try { writer.name(JsonKeys.VALUE).value(Integer.valueOf(value)); - } catch (Throwable t) { + } catch (NumberFormatException t) { logger.log(SentryLevel.ERROR, "Unable to serialize monitor schedule value: %s", value); } } else { diff --git a/sentry/src/main/java/io/sentry/Sentry.java b/sentry/src/main/java/io/sentry/Sentry.java index ce286600477..84f128eae8f 100644 --- a/sentry/src/main/java/io/sentry/Sentry.java +++ b/sentry/src/main/java/io/sentry/Sentry.java @@ -32,6 +32,7 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; @@ -489,14 +490,14 @@ private static void handleAppStartProfilingConfig( options.getSerializer().serialize(appStartProfilingOptions, writer); } } - } catch (Throwable e) { + } catch (IOException e) { options .getLogger() .log(SentryLevel.ERROR, "Unable to create app start profiling config file. ", e); } } }); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options .getLogger() .log( @@ -521,7 +522,7 @@ private static void movePreviousSession(final @NotNull SentryOptions options) { // enqueue a task to move previous unfinished session to its own file try { options.getExecutorService().submit(new MovePreviousSession(options)); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.DEBUG, "Failed to move previous session.", e); } } @@ -534,7 +535,7 @@ private static void finalizePreviousSession( // to modify the previous session have done their work, even if they do that async. try { options.getExecutorService().submit(new PreviousSessionFinalizer(options, scopes)); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.DEBUG, "Failed to finalize previous session.", e); } } @@ -575,7 +576,7 @@ private static void notifyOptionsObservers(final @NotNull SentryOptions options) } } }); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { options.getLogger().log(SentryLevel.DEBUG, "Failed to notify options observers.", e); } } diff --git a/sentry/src/main/java/io/sentry/SentryCrashLastRunState.java b/sentry/src/main/java/io/sentry/SentryCrashLastRunState.java index dc5b334df25..d086e5b3027 100644 --- a/sentry/src/main/java/io/sentry/SentryCrashLastRunState.java +++ b/sentry/src/main/java/io/sentry/SentryCrashLastRunState.java @@ -53,7 +53,7 @@ public static SentryCrashLastRunState getInstance() { nativeMarker.delete(); } } - } catch (Throwable e) { + } catch (SecurityException e) { // ignore // TODO: Take ILogger via ctor and log here } diff --git a/sentry/src/main/java/io/sentry/SentryEnvelopeItemHeader.java b/sentry/src/main/java/io/sentry/SentryEnvelopeItemHeader.java index eaacee9957a..0659c57428a 100644 --- a/sentry/src/main/java/io/sentry/SentryEnvelopeItemHeader.java +++ b/sentry/src/main/java/io/sentry/SentryEnvelopeItemHeader.java @@ -62,7 +62,9 @@ Integer getMetaLength() { if (calculateMetaLength != null) { try { return calculateMetaLength.call(); - } catch (Throwable ignored) { + } catch (Exception e) { + // Callable.call() declares Exception, but the only factory reads a value that the data + // factory stored. The header is written without a meta length. return null; } } diff --git a/sentry/src/main/java/io/sentry/SentryOptions.java b/sentry/src/main/java/io/sentry/SentryOptions.java index 5ba97164a5e..2f127c0405f 100644 --- a/sentry/src/main/java/io/sentry/SentryOptions.java +++ b/sentry/src/main/java/io/sentry/SentryOptions.java @@ -2561,7 +2561,7 @@ public void setOrgId(final @Nullable String orgId) { try { final @Nullable String dsnOrgId = retrieveParsedDsn().getOrgId(); return dsnOrgId; - } catch (Throwable e) { + } catch (IllegalArgumentException e) { return null; } } diff --git a/sentry/src/main/java/io/sentry/SentryTracer.java b/sentry/src/main/java/io/sentry/SentryTracer.java index 0970f30bed6..dd6b6d16326 100644 --- a/sentry/src/main/java/io/sentry/SentryTracer.java +++ b/sentry/src/main/java/io/sentry/SentryTracer.java @@ -15,6 +15,7 @@ import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Future; +import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import org.jetbrains.annotations.ApiStatus; @@ -125,7 +126,7 @@ public void scheduleFinish() { .getOptions() .getTimerExecutorService() .schedule(this::onIdleTimeoutReached, idleTimeout); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { scopes .getOptions() .getLogger() @@ -310,7 +311,7 @@ private void scheduleDeadlineTimeout() { .getOptions() .getTimerExecutorService() .schedule(this::onDeadlineTimeoutReached, deadlineTimeOut); - } catch (Throwable e) { + } catch (RejectedExecutionException e) { scopes .getOptions() .getLogger() diff --git a/sentry/src/main/java/io/sentry/cache/EnvelopeCache.java b/sentry/src/main/java/io/sentry/cache/EnvelopeCache.java index 3fde2a97f5a..755f0e98c38 100644 --- a/sentry/src/main/java/io/sentry/cache/EnvelopeCache.java +++ b/sentry/src/main/java/io/sentry/cache/EnvelopeCache.java @@ -275,7 +275,7 @@ private void writeCrashMarkerFile() { final String timestamp = DateUtils.getTimestamp(DateUtils.getCurrentDateTime()); outputStream.write(timestamp.getBytes(UTF_8)); outputStream.flush(); - } catch (Throwable e) { + } catch (IOException e) { options.getLogger().log(ERROR, "Error writing the crash marker file to the disk", e); } } @@ -366,7 +366,7 @@ private boolean writeSessionToDisk(final @NotNull File file, final @NotNull Sess .log(DEBUG, "Overwriting session to offline storage: %s", session.getSessionId()); serializer.getValue().serialize(session, writer); - } catch (Throwable e) { + } catch (IOException e) { options .getLogger() .log(ERROR, e, "Error writing Session to offline storage: %s", session.getSessionId()); @@ -519,7 +519,7 @@ public void movePreviousSession( if (!renamed) { options.getLogger().log(WARNING, "Unable to move current session to previous session."); } - } catch (Throwable e) { + } catch (SecurityException e) { options .getLogger() .log(SentryLevel.ERROR, "Error moving current session to previous session.", e); diff --git a/sentry/src/main/java/io/sentry/cache/PersistingScopeObserver.java b/sentry/src/main/java/io/sentry/cache/PersistingScopeObserver.java index cf3bfcb3d15..00ff78905d2 100644 --- a/sentry/src/main/java/io/sentry/cache/PersistingScopeObserver.java +++ b/sentry/src/main/java/io/sentry/cache/PersistingScopeObserver.java @@ -35,6 +35,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Future; +import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicBoolean; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -245,7 +246,7 @@ private void requestFlush() { // no later mutation would ever be able to queue a flush again hasPendingFlush.set(false); } - } catch (Throwable e) { + } catch (RejectedExecutionException e) { hasPendingFlush.set(false); options.getLogger().log(ERROR, "Scope persistence flush could not be submitted", e); } diff --git a/sentry/src/main/java/io/sentry/config/FilesystemPropertiesLoader.java b/sentry/src/main/java/io/sentry/config/FilesystemPropertiesLoader.java index c896091f006..a87ebc4bc33 100644 --- a/sentry/src/main/java/io/sentry/config/FilesystemPropertiesLoader.java +++ b/sentry/src/main/java/io/sentry/config/FilesystemPropertiesLoader.java @@ -5,6 +5,7 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; +import java.io.IOException; import java.io.InputStream; import java.util.Properties; import org.jetbrains.annotations.NotNull; @@ -50,7 +51,7 @@ public FilesystemPropertiesLoader( "Failed to load Sentry configuration since it is not readable: %s", filePath); } - } catch (Throwable e) { + } catch (IOException | IllegalArgumentException e) { logger.log( SentryLevel.ERROR, e, "Failed to load Sentry configuration from file: %s", filePath); return null; diff --git a/sentry/src/main/java/io/sentry/internal/modules/ManifestModulesLoader.java b/sentry/src/main/java/io/sentry/internal/modules/ManifestModulesLoader.java index fc1c313ec43..a922d38e991 100644 --- a/sentry/src/main/java/io/sentry/internal/modules/ManifestModulesLoader.java +++ b/sentry/src/main/java/io/sentry/internal/modules/ManifestModulesLoader.java @@ -4,6 +4,7 @@ import io.sentry.ILogger; import io.sentry.SentryLevel; +import java.io.IOException; import java.net.URL; import java.util.ArrayList; import java.util.Enumeration; @@ -57,7 +58,10 @@ protected Map loadModules() { modules.add(module); } } - } catch (Throwable e) { + } catch (IOException | RuntimeException e) { + // The class loader belongs to the app or its container, so it can also throw unchecked + // exceptions, e.g. an IllegalStateException for a jar that was already closed. The modules + // found so far are returned and cached, so events are still processed, without modules. logger.log(SentryLevel.ERROR, "Unable to detect modules via manifest files.", e); } diff --git a/sentry/src/main/java/io/sentry/util/Platform.java b/sentry/src/main/java/io/sentry/util/Platform.java index bad0f214db3..a46e816311c 100644 --- a/sentry/src/main/java/io/sentry/util/Platform.java +++ b/sentry/src/main/java/io/sentry/util/Platform.java @@ -15,7 +15,7 @@ public final class Platform { // All system properties on Android: // https://developer.android.com/reference/java/lang/System#getProperties() isAndroid = "The Android Project".equals(System.getProperty("java.vendor")); - } catch (Throwable e) { + } catch (SecurityException e) { isAndroid = false; } @@ -31,7 +31,7 @@ public final class Platform { } else { isJavaNinePlus = false; } - } catch (Throwable e) { + } catch (SecurityException | NumberFormatException e) { isJavaNinePlus = false; } } diff --git a/sentry/src/test/java/io/sentry/cache/EnvelopeCacheTest.kt b/sentry/src/test/java/io/sentry/cache/EnvelopeCacheTest.kt index 179c2222b6d..fe125bb7170 100644 --- a/sentry/src/test/java/io/sentry/cache/EnvelopeCacheTest.kt +++ b/sentry/src/test/java/io/sentry/cache/EnvelopeCacheTest.kt @@ -24,6 +24,7 @@ import io.sentry.hints.SessionStartHint import io.sentry.protocol.SentryId import io.sentry.util.HintUtils import java.io.File +import java.io.IOException import java.io.Writer import java.nio.file.Files import java.nio.file.Path @@ -341,7 +342,7 @@ class EnvelopeCacheTest { val delayedStart = createSession(sessionId = sid) val serializer = mock() whenever(serializer.serialize(same(liveSession), any())) - .thenThrow(RuntimeException("forced ex")) + .thenThrow(IOException("forced ex")) whenever(serializer.deserialize(any(), eq(Session::class.java))).thenReturn(delayedStart) val cache = fixture.getSUT { options -> options.setSerializer(serializer) } diff --git a/sentry/src/test/java/io/sentry/internal/modules/ManifestModulesLoaderTest.kt b/sentry/src/test/java/io/sentry/internal/modules/ManifestModulesLoaderTest.kt index dbf35c4b115..bc8607065f3 100644 --- a/sentry/src/test/java/io/sentry/internal/modules/ManifestModulesLoaderTest.kt +++ b/sentry/src/test/java/io/sentry/internal/modules/ManifestModulesLoaderTest.kt @@ -86,4 +86,20 @@ class ManifestModulesLoaderTest { verifyNoMoreInteractions(classLoader) } + + @Test + fun `reading modules from manifest caches an empty map on a runtime exception`() { + val logger = mock() + val classLoader = mock() + + whenever(classLoader.getResources(any())).thenThrow(IllegalStateException("zip file closed")) + + val sut = ManifestModulesLoader(classLoader, logger) + + assertEquals(emptyMap(), sut.orLoadModules) + assertEquals(emptyMap(), sut.orLoadModules) + + verify(classLoader).getResources(any()) + verifyNoMoreInteractions(classLoader) + } } From c219fbff240c9936efbb29e20b13ae0ca2755bc8 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Wed, 18 Nov 2026 17:32:46 +0100 Subject: [PATCH 2/5] changelog Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index be7899e2dd6..6f996feb456 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,6 +116,7 @@ ### Internal - Measure the 30 second performance-collection budget on a monotonic ticker, so that a device time change no longer ends collection early or extends it past the budget ([#6101](https://github.com/getsentry/sentry-java/pull/6101)) +- Narrow `catch (Throwable)` to the exceptions the guarded code throws, so SDK bugs and fatal errors are no longer swallowed ([#6669](https://github.com/getsentry/sentry-java/pull/6669)) ## 8.64.0 ### Breaking Changes From 28c925582e8e9a222391d05ceb8610c205d0d65f Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Wed, 18 Nov 2026 18:34:08 +0100 Subject: [PATCH 3/5] test: Remove the tests added for the narrowed catches The fixes to existing tests whose mocks only passed behind broad catches stay. Refs #5513 Refs JAVA-552 Co-Authored-By: Claude Opus 5.5 --- .../android/core/NativeEventCollectorTest.kt | 20 ------------------- .../core/SendCachedEnvelopeIntegrationTest.kt | 16 --------------- .../capture/SessionCaptureStrategyTest.kt | 15 -------------- .../modules/ManifestModulesLoaderTest.kt | 16 --------------- 4 files changed, 67 deletions(-) diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/NativeEventCollectorTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/NativeEventCollectorTest.kt index 16191e0e7eb..490847b3182 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/NativeEventCollectorTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/NativeEventCollectorTest.kt @@ -88,26 +88,6 @@ class NativeEventCollectorTest { assertNull(match) } - @Test - fun `handles an item header with a non-numeric length without throwing`() { - val sut = fixture.getSut(tmpDir) - File(fixture.outboxDir, "bad-length.envelope") - .writeText("{}\n{\"type\":\"event\",\"length\":\"abc\"}\n{}\n") - - val match = sut.findAndRemoveMatchingNativeEvent(0L) - assertNull(match) - } - - @Test - fun `handles an event payload that is not a JSON object without throwing`() { - val sut = fixture.getSut(tmpDir) - File(fixture.outboxDir, "array-payload.envelope") - .writeText("{}\n{\"type\":\"event\",\"length\":3}\n[1]\n") - - val match = sut.findAndRemoveMatchingNativeEvent(0L) - assertNull(match) - } - @Test fun `handles envelope with event and attachments without throwing`() { val sut = fixture.getSut(tmpDir) diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/SendCachedEnvelopeIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/SendCachedEnvelopeIntegrationTest.kt index a021d0c6c91..46df2ee227c 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/SendCachedEnvelopeIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/SendCachedEnvelopeIntegrationTest.kt @@ -14,9 +14,7 @@ import io.sentry.test.DeferredExecutorService import io.sentry.test.ImmediateExecutorService import io.sentry.transport.RateLimiter import io.sentry.util.LazyEvaluator -import java.util.concurrent.CancellationException import java.util.concurrent.ExecutionException -import java.util.concurrent.Future import java.util.concurrent.TimeUnit.MILLISECONDS import java.util.concurrent.atomic.AtomicBoolean import kotlin.test.Test @@ -140,20 +138,6 @@ class SendCachedEnvelopeIntegrationTest { verify(fixture.sender).send() } - @Test - fun `when has startup crash marker and the executor cancels the task, register does not throw`() { - // the executor hands back a cancelled future instead of throwing when its queue is full - val cancelledFuture = mock>() - whenever(cancelledFuture.get(any(), any())).thenThrow(CancellationException()) - val executor = mock() - whenever(executor.submit(any())).thenReturn(cancelledFuture) - val sut = fixture.getSut(hasStartupCrashMarker = true, mockExecutorService = executor) - - sut.register(fixture.scopes, fixture.options) - - verify(fixture.sender, never()).send() - } - @Test fun `when interrupted while awaiting the task, keeps the interrupt and continues in the background`() { // the delay keeps the task running, so the wait for it sees the interrupt diff --git a/sentry-android-replay/src/test/java/io/sentry/android/replay/capture/SessionCaptureStrategyTest.kt b/sentry-android-replay/src/test/java/io/sentry/android/replay/capture/SessionCaptureStrategyTest.kt index 916c207f5ff..68f7bb0cb0f 100644 --- a/sentry-android-replay/src/test/java/io/sentry/android/replay/capture/SessionCaptureStrategyTest.kt +++ b/sentry-android-replay/src/test/java/io/sentry/android/replay/capture/SessionCaptureStrategyTest.kt @@ -41,7 +41,6 @@ import io.sentry.time.TestMonotonicTicker import io.sentry.transport.CurrentDateProvider import io.sentry.transport.ICurrentDateProvider import java.io.File -import java.io.IOException import java.util.Date import java.util.concurrent.ScheduledExecutorService import java.util.concurrent.TimeUnit.MILLISECONDS @@ -171,20 +170,6 @@ class SessionCaptureStrategyTest { assertEquals(0, strategy.currentSegment) } - @Test - fun `start does not fail when the segment values can't be written`() { - doAnswer { throw IOException("disk full") } - .whenever(fixture.replayCache) - .persistSegmentValues(any(), anyOrNull()) - val strategy = fixture.getSut() - val replayId = SentryId() - - strategy.start(0, replayId) - - assertEquals(replayId, strategy.currentReplayId) - assertEquals(0, strategy.currentSegment) - } - @Test fun `start persists the recording metadata`() { fixture.options.release = "io.sentry.sample@1.0.0+1" diff --git a/sentry/src/test/java/io/sentry/internal/modules/ManifestModulesLoaderTest.kt b/sentry/src/test/java/io/sentry/internal/modules/ManifestModulesLoaderTest.kt index bc8607065f3..dbf35c4b115 100644 --- a/sentry/src/test/java/io/sentry/internal/modules/ManifestModulesLoaderTest.kt +++ b/sentry/src/test/java/io/sentry/internal/modules/ManifestModulesLoaderTest.kt @@ -86,20 +86,4 @@ class ManifestModulesLoaderTest { verifyNoMoreInteractions(classLoader) } - - @Test - fun `reading modules from manifest caches an empty map on a runtime exception`() { - val logger = mock() - val classLoader = mock() - - whenever(classLoader.getResources(any())).thenThrow(IllegalStateException("zip file closed")) - - val sut = ManifestModulesLoader(classLoader, logger) - - assertEquals(emptyMap(), sut.orLoadModules) - assertEquals(emptyMap(), sut.orLoadModules) - - verify(classLoader).getResources(any()) - verifyNoMoreInteractions(classLoader) - } } From 7c46714c8b7e8dfc76039a1416b6415405c1df9c Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Wed, 18 Nov 2026 18:35:22 +0100 Subject: [PATCH 4/5] changelog: Move the entry to #6665 Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f996feb456..be7899e2dd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,7 +116,6 @@ ### Internal - Measure the 30 second performance-collection budget on a monotonic ticker, so that a device time change no longer ends collection early or extends it past the budget ([#6101](https://github.com/getsentry/sentry-java/pull/6101)) -- Narrow `catch (Throwable)` to the exceptions the guarded code throws, so SDK bugs and fatal errors are no longer swallowed ([#6669](https://github.com/getsentry/sentry-java/pull/6669)) ## 8.64.0 ### Breaking Changes From d613a9e0069b82287a71bf709b0f9160eb01899c Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Wed, 18 Nov 2026 18:36:43 +0100 Subject: [PATCH 5/5] ref(core): Narrow the client report attach catch to IOException SentryEnvelopeItem.fromClientReport only throws IOException. The name is fully qualified so this PR doesn't touch the import block, where #6665 adds ExceptionUtils right next to it. Refs #5513 Refs JAVA-552 Co-Authored-By: Claude Opus 5.5 --- .../main/java/io/sentry/clientreport/ClientReportRecorder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry/src/main/java/io/sentry/clientreport/ClientReportRecorder.java b/sentry/src/main/java/io/sentry/clientreport/ClientReportRecorder.java index ba6d60e2563..27657417b82 100644 --- a/sentry/src/main/java/io/sentry/clientreport/ClientReportRecorder.java +++ b/sentry/src/main/java/io/sentry/clientreport/ClientReportRecorder.java @@ -46,7 +46,7 @@ public ClientReportRecorder(@NotNull SentryOptions options) { items.add(SentryEnvelopeItem.fromClientReport(options.getSerializer(), clientReport)); return new SentryEnvelope(envelope.getHeader(), items); - } catch (Throwable e) { + } catch (java.io.IOException e) { options.getLogger().log(SentryLevel.ERROR, e, "Unable to attach client report to envelope."); return envelope; }