Release v6.17.0

.buildkite/pipeline.full.yml

@@ -1013,7 +1013,6 @@ steps:
           image-repository: 855461928731.dkr.ecr.us-west-1.amazonaws.com/android
           cache-from:
             - android-common:855461928731.dkr.ecr.us-west-1.amazonaws.com/android:latest
-      - docker-compose#v4.7.0:
           push:
             - android-common:855461928731.dkr.ecr.us-west-1.amazonaws.com/android:latest
 

.buildkite/pipeline.yml

@@ -52,8 +52,6 @@ steps:
     env:
       JAVA_VERSION: 17
     command: './gradlew --continue checkstyle detekt lint ktlintCheck'
-    env:
-      JAVA_VERSION: 17
 
   - label: ':android: Binary compatibility checks'
     timeout_in_minutes: 20
@@ -62,8 +60,6 @@ steps:
     env:
       JAVA_VERSION: 17
     command: './gradlew apiCheck'
-    env:
-      JAVA_VERSION: 17
 
   - label: ':android: CppCheck'
     timeout_in_minutes: 10
@@ -100,8 +96,6 @@ steps:
     env:
       JAVA_VERSION: 17
     command: './gradlew test'
-    env:
-      JAVA_VERSION: 17
 
   - label: ':android: Instrumentation tests'
     timeout_in_minutes: 10

.github/workflows/codeql.yml

@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
         with:
           submodules: recursive
       - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 #v3.5.0
@@ -64,7 +64,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 #v3.29.4
+        uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed #v3.29.8
         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@4e828ff8d448a8a6e532957b1811f387a63867e8 #v3.29.4
+        uses: github/codeql-action/analyze@76621b61decf072c1cee8dd1ce2d2a82d33c17ed #v3.29.8
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/downstream_updates.yml

@@ -28,5 +28,5 @@ jobs:
       - run: >
           curl -X POST https://api.github.com/repos/${{ matrix.downstream_repo }}/dispatches
           -H 'Content-Type: application/json'
-          -H "Authorization: Bearer ${{ secrets.DEP_UPDATER_BEARER_TOKEN }}"
+          -H "Authorization: Token ${{ secrets.DEP_UPDATER_BEARER_TOKEN }}"
           -d '{"event_type":"update-dependency","client_payload": {"target_submodule":"bugsnag-android", "target_version": "${{ env.RELEASE_VERSION }}"}}'

.github/workflows/scorecard.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -68,13 +68,13 @@ 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@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+        uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
         with:
           sarif_file: results.sarif
 
   gradle-wrapper-validation:
     name: "Checksum validation of Gradle Wrappers"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 6.17.0 (2025-08-14)
+
+### Enhancements
+
+* `memoryTrimLevel` and `lowMemory` will not be reported when they are not set (newer versions of Android do not set these values)
+  [#2237](https://github.com/bugsnag/bugsnag-android/pull/2237)
+
+### Bug fixes
+
+* Handle edge-cases to reduce the changes of duplicate ANR reporting from `bugsnag-plugin-android-exitinfo` when `reportUnmatchedANR = true && disableProcessStateSummaryOverride = true`
+  [#2235](https://github.com/bugsnag/bugsnag-android/pull/2235)
+* Correct the reporting of the loadAddress for native system libraries and JIT frames
+  [#2244](https://github.com/bugsnag/bugsnag-android/pull/2244)
+* Added deterministic sorting for `discardOldestFileIfNeeded` method to avoid potential crashes where mutliple files have the same last modified time
+  [#2189](https://github.com/bugsnag/bugsnag-android/pull/2189)
+
 ## 6.16.0 (2025-07-31)
 
 ### Changes

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ClientTest.java

@@ -171,14 +171,12 @@ public void testAppDataCollection() {
     public void testAppDataMetadata() {
         client = generateClient();
         Map<String, Object> app = client.getAppDataCollector().getAppDataMetadata();
-        assertEquals(11, app.size());
+        assertEquals(9, app.size());
         assertEquals("Bugsnag Android Tests", app.get("name"));
         assertEquals("com.bugsnag.android.core.test", app.get("processName"));
         assertNotNull(app.get("memoryUsage"));
         assertTrue(app.containsKey("activeScreen"));
         assertTrue(app.containsKey("installerPackage"));
-        assertNotNull(app.get("lowMemory"));
-        assertNotNull(app.get("memoryTrimLevel"));
     }
 
     @Test

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

@@ -109,10 +109,15 @@ internal class AppDataCollector(
         val map = HashMap<String, Any?>()
         map["name"] = appName
         map["activeScreen"] = sessionTracker.get().contextActivity
-        map["lowMemory"] = memoryTrimState.isLowMemory
-        map["memoryTrimLevel"] = memoryTrimState.trimLevelDescription
         map["processImportance"] = getProcessImportance()
 
+        // only report the memory trim/low memory state if it has been captured
+        // more recent Android versions will not report these
+        if (memoryTrimState.memoryTrimLevel != null) {
+            map["lowMemory"] = memoryTrimState.isLowMemory
+            map["memoryTrimLevel"] = memoryTrimState.trimLevelDescription
+        }
+
         populateRuntimeMemoryMetadata(map)
 
         bgWorkRestricted?.let {

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

@@ -112,24 +112,32 @@ internal abstract class FileStore(
 
     fun discardOldestFileIfNeeded() {
         // Limit number of saved payloads to prevent disk space issues
-        if (isStorageDirValid(storageDir)) {
-            val listFiles = storageDir.listFiles() ?: return
-            if (listFiles.size < maxStoreCount) return
-            val sortedListFiles = listFiles.sortedBy { it.lastModified() }
-            // Number of files to discard takes into account that a new file may need to be written
-            val numberToDiscard = listFiles.size - maxStoreCount + 1
-            var discardedCount = 0
-            for (file in sortedListFiles) {
-                if (discardedCount == numberToDiscard) {
-                    return
-                } else if (!queuedFiles.contains(file)) {
-                    logger.w(
-                        "Discarding oldest error as stored error limit reached: '" +
-                            file.path + '\''
-                    )
-                    deleteStoredFiles(setOf(file))
-                    discardedCount++
-                }
+        if (!isStorageDirValid(storageDir)) return
+        val listFiles = storageDir.listFiles() ?: return
+        if (listFiles.size < maxStoreCount) return
+
+        // Store lastModified to ensure it doesn't change during sort
+        val timestampedFiles = listFiles.mapTo(ArrayList(listFiles.size)) { file ->
+            FileWithTimestamp(file, file.lastModified())
+        }
+
+        // Sort by cached lastModified timestamps
+        timestampedFiles.sort()
+
+        // Number of files to discard takes into account that a new file may need to be written
+        val numberToDiscard = listFiles.size - maxStoreCount + 1
+        var discardedCount = 0
+
+        for (fileMeta in timestampedFiles) {
+            val file = fileMeta.file
+            if (discardedCount == numberToDiscard) {
+                return
+            } else if (!queuedFiles.contains(file)) {
+                logger.w(
+                    "Discarding oldest error as stored error limit reached: '${file.path}'"
+                )
+                deleteStoredFiles(setOf(file))
+                discardedCount++
             }
         }
     }
@@ -188,4 +196,18 @@ internal abstract class FileStore(
             lock.unlock()
         }
     }
+
+    /**
+     * A data holder for associating a {@link File} with its last modified timestamp.
+     *
+     * @param file The file to associate with a timestamp.
+     * @param timestamp The last modified time of the file, cached to ensure consistent ordering.
+     */
+    private data class FileWithTimestamp(
+        val file: File,
+        val timestamp: Long
+    ) : Comparable<FileWithTimestamp> {
+        override fun compareTo(other: FileWithTimestamp): Int =
+            timestamp.compareTo(other.timestamp)
+    }
 }

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

@@ -7,7 +7,7 @@ import java.io.IOException
  */
 class Notifier @JvmOverloads constructor(
     var name: String = "Android Bugsnag Notifier",
-    var version: String = "6.16.0",
+    var version: String = "6.17.0",
     var url: String = "https://bugsnag.com"
 ) : JsonStream.Streamable {
 

bugsnag-android-core/src/test/java/com/bugsnag/android/AppMetadataSerializationTest.kt

@@ -1,6 +1,7 @@
 package com.bugsnag.android
 
 import android.app.ActivityManager
+import android.content.ComponentCallbacks2
 import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
@@ -30,7 +31,11 @@ internal class AppMetadataSerializationTest {
             val sessionTracker = mock(SessionTracker::class.java)
             val launchCrashTracker = mock(LaunchCrashTracker::class.java)
             val config = BugsnagTestUtils.generateConfiguration()
+
             val memoryTrimState = MemoryTrimState()
+            memoryTrimState.isLowMemory = true
+            @Suppress("DEPRECATION")
+            memoryTrimState.memoryTrimLevel = ComponentCallbacks2.TRIM_MEMORY_MODERATE
 
             // populate summary fields
             config.appType = "React Native"
@@ -59,14 +64,27 @@ internal class AppMetadataSerializationTest {
             appData.codeBundleId = "foo-99"
             appData.setBinaryArch("x86")
 
+            val withMemoryTrim = prepareAppMetadata(appData)
+
+            memoryTrimState.memoryTrimLevel = null
+            val noMemoryTrim = prepareAppMetadata(appData)
+
+            return generateSerializationTestCases(
+                "app_meta_data",
+                withMemoryTrim,
+                noMemoryTrim
+            )
+        }
+
+        private fun prepareAppMetadata(appData: AppDataCollector): Map<String, Any> {
             val metadata = appData.getAppDataMetadata()
             assertNotNull(metadata.remove("memoryUsage"))
             assertNotNull(metadata.remove("totalMemory"))
             assertNotNull(metadata.remove("freeMemory"))
             assertNotNull(metadata.remove("memoryLimit"))
 
             @Suppress("UNCHECKED_CAST")
-            return generateSerializationTestCases("app_meta_data", metadata.toMap() as Map<String, Any>)
+            return metadata as Map<String, Any>
         }
     }
 

bugsnag-android-core/src/test/resources/app_meta_data_serialization_0.json

@@ -1,6 +1,6 @@
 {
-  "memoryTrimLevel": "None",
+  "memoryTrimLevel": "Moderate",
   "activeScreen": "MyActivity",
   "name": "MyApp",
-  "lowMemory": false
+  "lowMemory": true
 }

bugsnag-android-core/src/test/resources/app_meta_data_serialization_1.json

@@ -0,0 +1,4 @@
+{
+  "activeScreen": "MyActivity",
+  "name": "MyApp"
+}

bugsnag-plugin-android-exitinfo/detekt-baseline.xml

@@ -2,12 +2,11 @@
 <SmellBaseline>
   <ManuallySuppressedIssues/>
   <CurrentIssues>
-    <ID>CyclomaticComplexMethod:CodeStrings.kt$@RequiresApi(Build.VERSION_CODES.R) @SuppressLint("SwitchIntDef") @Suppress("DEPRECATION") internal fun importanceDescriptionOf(exitInfo: ApplicationExitInfo)</ID>
-    <ID>CyclomaticComplexMethod:CodeStrings.kt$@RequiresApi(Build.VERSION_CODES.R) internal fun exitReasonOf(exitInfo: ApplicationExitInfo)</ID>
+    <ID>CyclomaticComplexMethod:CodeDescriptions.kt$@RequiresApi(Build.VERSION_CODES.R) @SuppressLint("SwitchIntDef") @Suppress("DEPRECATION") internal fun importanceDescriptionOf(exitInfo: ApplicationExitInfo)</ID>
+    <ID>CyclomaticComplexMethod:CodeDescriptions.kt$@RequiresApi(Build.VERSION_CODES.R) internal fun exitReasonOf(exitInfo: ApplicationExitInfo)</ID>
     <ID>LongParameterList:TombstoneParser.kt$TombstoneParser$( exitInfo: ApplicationExitInfo, listOpenFds: Boolean, includeLogcat: Boolean, threadConsumer: (BugsnagThread) -> Unit, fileDescriptorConsumer: (Int, String, String) -> Unit, logcatConsumer: (String) -> Unit )</ID>
     <ID>MagicNumber:TraceParser.kt$TraceParser$16</ID>
     <ID>MagicNumber:TraceParser.kt$TraceParser$3</ID>
-    <ID>MaxLineLength:ExitInfoCallbackTest.kt$ExitInfoCallbackTest$exitInfoCallback = ExitInfoCallback(context, nativeEnhancer, anrEventEnhancer, null, ApplicationExitInfoMatcher(context, 100))</ID>
     <ID>MaxLineLength:TraceParserInvalidStackframesTest.kt$TraceParserInvalidStackframesTest.Companion$"#01 pc 0000000000000c5c /data/app/~~sKQbJGqVJA5glcnvEjZCMg==/com.example.bugsnag.android-fVuoJh5GpAL7sRAeI3vjSw==/lib/arm64/libentrypoint.so "</ID>
     <ID>MaxLineLength:TraceParserInvalidStackframesTest.kt$TraceParserInvalidStackframesTest.Companion$"#01 pc 0000000000000c5c /data/app/~~sKQbJGqVJA5glcnvEjZCMg==/com.example.bugsnag.android-fVuoJh5GpAL7sRAeI3vjSw==/lib/arm64/libentrypoint.so (Java_com_example_bugsnag_android_BaseCrashyActivity_anrFromCXX+20"</ID>
     <ID>MaxLineLength:TraceParserInvalidStackframesTest.kt$TraceParserInvalidStackframesTest.Companion$"#01 pc 0000000000000c5c /data/app/~~sKQbJGqVJA5glcnvEjZCMg==/com.example.bugsnag.android-fVuoJh5GpAL7sRAeI3vjSw==/lib/arm64/libentrypoint.so (Java_com_example_bugsnag_android_BaseCrashyActivity_anrFromCXX+20) ("</ID>