Merge pull request #2396 from bugsnag/release/v6.25.0

Release v6.25.0

Author: lemnik

.github/workflows/codeql.yml

@@ -47,7 +47,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
         with:
           submodules: recursive
-      - uses: gradle/actions/wrapper-validation@f29f5a9d7b09a7c6b29859002d29d24e1674c884 #v5.0.1
+      - uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c #v5.0.2
 
       - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v5.2.0
         with:
@@ -64,7 +64,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 #v4.32.2
+        uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e #v4.32.4
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -83,6 +83,6 @@ jobs:
           ./gradlew --no-daemon assemble
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 #v4.32.2
+        uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e #v4.32.4
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/scorecard.yml

@@ -68,7 +68,7 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
+        uses: github/codeql-action/upload-sarif@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
         with:
           sarif_file: results.sarif
 
@@ -77,4 +77,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: gradle/actions/wrapper-validation@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
+      - uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 6.25.0 (2026-03-02)
+
+### Enhancements
+
+* Added `NativeOutOfMemoryPlugin` as a new way to report `OutOfMemoryError`s that uses pre-allocated memory in the NDK module instead of allocating an `Event` object. When used `OutOfMemoryError`s will be more reliably reported, but will not be passed to `OnErrorCallback`s (`OnSendCallback` works as expected).
+  [#2384](https://github.com/bugsnag/bugsnag-android/pull/2384)
+* Added `appHangCooldownMillis` to the AppHangPlugin to control the number of AppHang errors produced when the app is performance constrained
+  [#2389](https://github.com/bugsnag/bugsnag-android/pull/2389)
+* Moved root/jailbreak detection onto a background thread so that it no longer blocks startup (this should improve startup performance in most common cases)
+  [#2391](https://github.com/bugsnag/bugsnag-android/pull/2391)
+
+### Bug Fixes
+
+* Reduced the heartbeat overheads of `BugsnagAppHangPlugin` reducing both the CPU cost of a heartbeat and the frequency. 
+  [#2395](https://github.com/bugsnag/bugsnag-android/pull/2395)
+
 ## 6.24.0 (2026-02-11)
 
 ### Enhancements

Gemfile

@@ -4,11 +4,9 @@ source "https://rubygems.org"
 #gem 'bugsnag-maze-runner', path: '../maze-runner'
 
 # Or a specific release:
-gem 'bugsnag-maze-runner', '~>10.0'
+gem 'bugsnag-maze-runner', '~>11.0'
 
 # Or follow master:
 #gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner'
 
 gem "license_finder", "~> 7.0"
-
-gem "openssl", "~> 4.0"

Makefile

@@ -85,6 +85,6 @@ endif
 
 .PHONY: check
 check:
-	@./gradlew lint detekt ktlintCheck checkstyle
+	@./gradlew lint detekt ktlintCheck checkstyle apiCheck
 	@./scripts/run-cpp-check.sh
 	@./scripts/run-clang-format-ci-check.sh

bugsnag-android-core/api/bugsnag-android-core.api

@@ -88,6 +88,7 @@ public final class com/bugsnag/android/Bugsnag {
 	public static fun getLastRunInfo ()Lcom/bugsnag/android/LastRunInfo;
 	public static fun getMetadata (Ljava/lang/String;)Ljava/util/Map;
 	public static fun getMetadata (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
+	public static fun getOutOfMemoryHandler ()Lcom/bugsnag/android/OutOfMemoryHandler;
 	public static fun getUser ()Lcom/bugsnag/android/User;
 	public static fun isStarted ()Z
 	public static fun leaveBreadcrumb (Ljava/lang/String;)V
@@ -103,6 +104,7 @@ public final class com/bugsnag/android/Bugsnag {
 	public static fun resumeSession ()Z
 	public static fun setContext (Ljava/lang/String;)V
 	public static fun setGroupingDiscriminator (Ljava/lang/String;)Ljava/lang/String;
+	public static fun setOutOfMemoryHandler (Lcom/bugsnag/android/OutOfMemoryHandler;)V
 	public static fun setUser (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 	public static fun start (Landroid/content/Context;)Lcom/bugsnag/android/Client;
 	public static fun start (Landroid/content/Context;Lcom/bugsnag/android/Configuration;)Lcom/bugsnag/android/Client;
@@ -147,6 +149,7 @@ public class com/bugsnag/android/Client : com/bugsnag/android/CallbackAware, com
 	public fun getLastRunInfo ()Lcom/bugsnag/android/LastRunInfo;
 	public fun getMetadata (Ljava/lang/String;)Ljava/util/Map;
 	public fun getMetadata (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
+	public fun getOutOfMemoryHandler ()Lcom/bugsnag/android/OutOfMemoryHandler;
 	public fun getUser ()Lcom/bugsnag/android/User;
 	public fun leaveBreadcrumb (Ljava/lang/String;)V
 	public fun leaveBreadcrumb (Ljava/lang/String;Ljava/util/Map;Lcom/bugsnag/android/BreadcrumbType;)V
@@ -161,6 +164,7 @@ public class com/bugsnag/android/Client : com/bugsnag/android/CallbackAware, com
 	public fun resumeSession ()Z
 	public fun setContext (Ljava/lang/String;)V
 	public fun setGroupingDiscriminator (Ljava/lang/String;)Ljava/lang/String;
+	public fun setOutOfMemoryHandler (Lcom/bugsnag/android/OutOfMemoryHandler;)V
 	public fun setUser (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 	public fun startSession ()V
 }
@@ -700,6 +704,10 @@ public abstract interface class com/bugsnag/android/OnSessionCallback {
 	public abstract fun onSession (Lcom/bugsnag/android/Session;)Z
 }
 
+public abstract interface class com/bugsnag/android/OutOfMemoryHandler {
+	public abstract fun onOutOfMemory (Ljava/lang/OutOfMemoryError;)Z
+}
+
 public abstract interface class com/bugsnag/android/Plugin {
 	public abstract fun load (Lcom/bugsnag/android/Client;)V
 	public abstract fun unload ()V
@@ -869,6 +877,10 @@ public final class com/bugsnag/android/StateEvent$StartSession : com/bugsnag/and
 	public final fun getUnhandledCount ()I
 }
 
+public final class com/bugsnag/android/StateEvent$SynchronizeState : com/bugsnag/android/StateEvent {
+	public static final field INSTANCE Lcom/bugsnag/android/StateEvent$SynchronizeState;
+}
+
 public final class com/bugsnag/android/StateEvent$UpdateContext : com/bugsnag/android/StateEvent {
 	public final field context Ljava/lang/String;
 	public fun <init> (Ljava/lang/String;)V
@@ -1171,13 +1183,15 @@ public final class com/bugsnag/android/internal/TaskType : java/lang/Enum {
 public abstract interface class com/bugsnag/android/internal/dag/Provider {
 	public abstract fun get ()Ljava/lang/Object;
 	public abstract fun getOrNull ()Ljava/lang/Object;
+	public abstract fun isComplete ()Z
 }
 
 public abstract class com/bugsnag/android/internal/dag/RunnableProvider : com/bugsnag/android/internal/dag/Provider, java/lang/Runnable {
 	public fun <init> ()V
 	public fun get ()Ljava/lang/Object;
 	public fun getOrNull ()Ljava/lang/Object;
 	public abstract fun invoke ()Ljava/lang/Object;
+	public fun isComplete ()Z
 	public final fun run ()V
 }
 
@@ -1189,6 +1203,7 @@ public final class com/bugsnag/android/internal/dag/ValueProvider : com/bugsnag/
 	public fun get ()Ljava/lang/Object;
 	public fun getOrNull ()Ljava/lang/Object;
 	public fun hashCode ()I
+	public fun isComplete ()Z
 	public fun toString ()Ljava/lang/String;
 }
 

bugsnag-android-core/detekt-baseline.xml

@@ -15,7 +15,7 @@
     <ID>LongParameterList:AppWithState.kt$AppWithState$( binaryArch: String?, id: String?, releaseStage: String?, version: String?, codeBundleId: String?, buildUuid: Provider&lt;String?>?, type: String?, versionCode: Number?, /** * The number of milliseconds the application was running before the event occurred */ var duration: Number?, /** * The number of milliseconds the application was running in the foreground before the * event occurred */ var durationInForeground: Number?, /** * Whether the application was in the foreground when the event occurred */ var inForeground: Boolean?, /** * Whether the application was launching when the event occurred */ var isLaunching: Boolean? )</ID>
     <ID>LongParameterList:AppWithState.kt$AppWithState$( binaryArch: String?, id: String?, releaseStage: String?, version: String?, codeBundleId: String?, buildUuid: String?, type: String?, versionCode: Number?, /** * The number of milliseconds the application was running before the event occurred */ duration: Number?, /** * The number of milliseconds the application was running in the foreground before the * event occurred */ durationInForeground: Number?, /** * Whether the application was in the foreground when the event occurred */ inForeground: Boolean?, /** * Whether the application was launching when the event occurred */ isLaunching: Boolean? )</ID>
     <ID>LongParameterList:AppWithState.kt$AppWithState$( config: ImmutableConfig, binaryArch: String?, id: String?, releaseStage: String?, version: String?, codeBundleId: String?, duration: Number?, durationInForeground: Number?, inForeground: Boolean?, isLaunching: Boolean? )</ID>
-    <ID>LongParameterList:DataCollectionModule.kt$DataCollectionModule$( contextModule: ContextModule, configModule: ConfigModule, systemServiceModule: SystemServiceModule, trackerModule: TrackerModule, bgTaskService: BackgroundTaskService, connectivity: Connectivity, deviceIdStore: Provider&lt;DeviceIdStore>, memoryTrimState: MemoryTrimState )</ID>
+    <ID>LongParameterList:DataCollectionModule.kt$DataCollectionModule$( contextModule: ContextModule, configModule: ConfigModule, systemServiceModule: SystemServiceModule, trackerModule: TrackerModule, bgTaskService: BackgroundTaskService, connectivity: Connectivity, deviceId: Provider&lt;DeviceIdStore.DeviceIds?>, memoryTrimState: MemoryTrimState, clientObservable: ClientObservable )</ID>
     <ID>LongParameterList:Device.kt$Device$( buildInfo: DeviceBuildInfo, /** * The Application Binary Interface used */ var cpuAbi: Array&lt;String>?, /** * Whether the device has been jailbroken */ var jailbroken: Boolean?, /** * A UUID generated by Bugsnag and used for the individual application on a device */ var id: String?, /** * The IETF language tag of the locale used */ var locale: String?, /** * The total number of bytes of memory on the device */ var totalMemory: Long?, /** * A collection of names and their versions of the primary languages, frameworks or * runtimes that the application is running on */ runtimeVersions: MutableMap&lt;String, Any>? )</ID>
     <ID>LongParameterList:DeviceBuildInfo.kt$DeviceBuildInfo$( val manufacturer: String?, val model: String?, val osVersion: String?, val apiLevel: Int?, val osBuild: String?, val fingerprint: String?, val tags: String?, val brand: String?, val cpuAbis: Array&lt;String>? )</ID>
     <ID>LongParameterList:DeviceDataCollector.kt$DeviceDataCollector$( private val connectivity: Connectivity, private val appContext: Context, resources: Resources, private val deviceIdStore: Provider&lt;DeviceIdStore.DeviceIds?>, private val buildInfo: DeviceBuildInfo, private val dataDirectory: File, private val rootedFuture: Provider&lt;Boolean>?, private val bgTaskService: BackgroundTaskService, private val logger: Logger )</ID>
@@ -84,7 +84,6 @@
     <ID>SwallowedException:ConnectivityCompat.kt$ConnectivityLegacy$e: NullPointerException</ID>
     <ID>SwallowedException:ContextExtensions.kt$exc: RuntimeException</ID>
     <ID>SwallowedException:DeviceDataCollector.kt$DeviceDataCollector$e: Throwable</ID>
-    <ID>SwallowedException:DeviceDataCollector.kt$DeviceDataCollector$exc: Exception</ID>
     <ID>SwallowedException:DeviceDataCollector.kt$DeviceDataCollector$exception: Exception</ID>
     <ID>SwallowedException:DeviceIdFilePersistence.kt$DeviceIdFilePersistence$exc: OverlappingFileLockException</ID>
     <ID>SwallowedException:EventStore.kt$EventStore$exception: RejectedExecutionException</ID>

bugsnag-android-core/src/main/java/com/bugsnag/android/Bugsnag.java

@@ -498,6 +498,26 @@ public static void clearFeatureFlags() {
         getClient().clearFeatureFlags();
     }
 
+    /**
+     * Override or intercept the default error handling for {@link OutOfMemoryError}s.
+     *
+     * @param handler the new handler to use (or null to revert to normal error handling for OOMs)
+     * @see #getOutOfMemoryHandler()
+     */
+    public static void setOutOfMemoryHandler(@Nullable OutOfMemoryHandler handler) {
+        getClient().setOutOfMemoryHandler(handler);
+    }
+
+    /**
+     * Return the currently defined {@link OutOfMemoryHandler} if one is being used.
+     *
+     * @return the current {@code OutOfMemoryHandler} or null if none is set
+     */
+    @Nullable
+    public static OutOfMemoryHandler getOutOfMemoryHandler() {
+        return getClient().getOutOfMemoryHandler();
+    }
+
     /**
      * Get the current Bugsnag Client instance.
      */

bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java

@@ -128,7 +128,7 @@ public Client(@NonNull Context androidContext, @NonNull String apiKey) {
      * @param configuration  a configuration for the Client
      */
     public Client(@NonNull Context androidContext, @NonNull final Configuration configuration) {
-        ContextModule contextModule = new ContextModule(androidContext, bgTaskService);
+        ContextModule contextModule = new ContextModule(androidContext);
         appContext = contextModule.getCtx();
 
         notifier = configuration.getNotifier();
@@ -186,16 +186,16 @@ public Unit invoke(Boolean hasConnection, String networkState) {
 
         // lookup system services
         final SystemServiceModule systemServiceModule =
-                new SystemServiceModule(contextModule, bgTaskService);
+                new SystemServiceModule(contextModule);
 
         // setup further state trackers and data collection
         TrackerModule trackerModule = new TrackerModule(configModule,
                 storageModule, this, bgTaskService, callbackState);
 
         DataCollectionModule dataCollectionModule = new DataCollectionModule(contextModule,
                 configModule, systemServiceModule, trackerModule,
-                bgTaskService, connectivity, storageModule.getDeviceIdStore(),
-                memoryTrimState);
+                bgTaskService, connectivity, storageModule.getDeviceId(),
+                memoryTrimState, clientObservable);
 
         // load the device + user information
         userState = storageModule.loadUser(configuration.getUser());
@@ -938,6 +938,31 @@ void notifyInternalWithErrorOptions(@NonNull Event event,
         }
     }
 
+    /**
+     * Override or intercept the default error handling for {@link OutOfMemoryError}s.
+     *
+     * @param handler the new handler to use (or null to revert to normal error handling for OOMs)
+     * @see #getOutOfMemoryHandler()
+     */
+    public void setOutOfMemoryHandler(@Nullable OutOfMemoryHandler handler) {
+        if (exceptionHandler != null) {
+            exceptionHandler.setOutOfMemoryHandler(handler);
+        }
+    }
+
+    /**
+     * Return the currently defined {@link OutOfMemoryHandler} if one is being used.
+     *
+     * @return the current {@code OutOfMemoryHandler} or null if none is set
+     */
+    @Nullable
+    public OutOfMemoryHandler getOutOfMemoryHandler() {
+        if (exceptionHandler == null) {
+            return null;
+        }
+        return exceptionHandler.getOutOfMemoryHandler();
+    }
+
     /**
      * Returns the current buffer of breadcrumbs that will be sent with captured events. This
      * ordered list represents the most recent breadcrumbs to be captured up to the limit

bugsnag-android-core/src/main/java/com/bugsnag/android/ClientObservable.kt

@@ -31,4 +31,8 @@ internal class ClientObservable : BaseObservable() {
     fun postNdkDeliverPending() {
         updateState { StateEvent.DeliverPending }
     }
+
+    fun postSynchronizeState() {
+        updateState { StateEvent.SynchronizeState }
+    }
 }