Release/v6.13.0

.buildkite/pipeline.full.yml

@@ -869,6 +869,108 @@ steps:
     concurrency_group: 'browserstack-app'
     concurrency_method: eager
 
+
+  - label: ':bitbar: Android 15 NDK r21 end-to-end tests - batch 1'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/full_tests"
+          - "--exclude=features/full_tests/[^a-k].*.feature"
+          - "--exclude=features/full_tests/anr.feature"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--appium-version=1.22"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          - "--farm=bb"
+          - "--device=ANDROID_15"
+      test-collector#v1.10.2:
+        files: "reports/TEST-*.xml"
+        format: "junit"
+        branch: "^main|next$$"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':bitbar: Android 15 NDK r21 end-to-end tests - batch 2'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 60
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/full_tests"
+          - "--exclude=features/full_tests/[^l-z].*.feature"
+          - "--exclude=features/full_tests/anr.feature"
+          - "--app=@build/fixture-r21-url.txt"
+          - "--appium-version=1.22"
+          - "--no-tunnel"
+          - "--aws-public-ip"
+          - "--farm=bb"
+          - "--device=ANDROID_15"
+      test-collector#v1.10.2:
+        files: "reports/TEST-*.xml"
+        format: "junit"
+        branch: "^main|next$$"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 25
+    concurrency_group: 'bitbar'
+    concurrency_method: eager
+
+  - label: ':browserstack: Android 15 NDK r21 end-to-end tests - ANRs'
+    depends_on: "fixture-r21"
+    timeout_in_minutes: 30
+    plugins:
+      artifacts#v1.9.0:
+        download:
+          - "build/bs-fixture-r21-url.txt"
+          - "build/fixture-r21/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/metrics.csv"
+      docker-compose#v4.7.0:
+        pull: maze-runner
+        run: maze-runner
+        service-ports: true
+        command:
+          - "features/full_tests/anr.feature"
+          - "--app=@build/bs-fixture-r21-url.txt"
+          - "--appium-version=1.22.0"
+          - "--farm=bs"
+          - "--device=ANDROID_15"
+      test-collector#v1.10.2:
+        files: "reports/TEST-*.xml"
+        format: "junit"
+        branch: "^main|next$$"
+    env:
+      TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
+    concurrency: 5
+    concurrency_group: 'browserstack-app'
+    concurrency_method: eager
+
   # If there is a tag present activate a manual publishing step
 
   - block: 'Trigger package publish'

.github/workflows/codeql.yml

@@ -64,7 +64,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d #v3.28.10
+        uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 #v3.28.15
         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@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d #v3.28.10
+        uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 #v3.28.15
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/scorecard.yml

@@ -59,7 +59,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: SARIF file
           path: results.sarif
@@ -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@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
         with:
           sarif_file: results.sarif
 
@@ -77,4 +77,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: gradle/actions/wrapper-validation@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
+      - uses: gradle/actions/wrapper-validation@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 6.13.0 (2025-04-15)
+
+### Enhancements
+
+* Attempt a second `System.loadLibrary` for native modules in case of library loading race-conditions
+  [#2170](https://github.com/bugsnag/bugsnag-android/pull/2170)
+
 ## 6.12.1 (2025-03-03)
 
 ### Bug fixes

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

@@ -39,8 +39,14 @@ void loadLibInternal(String name, Client client, OnErrorCallback callback) {
             try {
                 System.loadLibrary(name);
                 loaded = true;
-            } catch (UnsatisfiedLinkError error) {
-                client.notify(error, callback);
+            } catch (UnsatisfiedLinkError ignored) {
+                // retry once in case the failure wasn't permanent
+                try {
+                    System.loadLibrary(name);
+                    loaded = true;
+                } catch (UnsatisfiedLinkError error) {
+                    client.notify(error, callback);
+                }
             }
         }
     }

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.12.1",
+    var version: String = "6.13.0",
     var url: String = "https://bugsnag.com"
 ) : JsonStream.Streamable {
 

bugsnag-plugin-android-ndk/package.json

@@ -1,7 +1,4 @@
 {
-  "dependencies": {
-    "kgabis/parson": "0.0.0"
-  },
   "development": {
     "silentbicycle/greatest": "v1.2.1"
   }

bugsnag-plugin-android-ndk/src/main/CMakeLists.txt

@@ -27,7 +27,6 @@ add_library( # Specifies the name of the library.
         jni/utils/string.c
         jni/utils/threads.c
         jni/utils/memory.c
-        jni/deps/parson/parson.c
 )
 
 include_directories(

bugsnag-plugin-android-ndk/src/main/jni/jni_cache.c

@@ -141,17 +141,9 @@ bool bsg_jni_cache_init(JNIEnv *env) {
 
   CACHE_CLASS(Long, "java/lang/Long");
   CACHE_STATIC_METHOD(Long, Long_valueOf, "valueOf", "(J)Ljava/lang/Long;");
-  CACHE_METHOD(Long, Long_constructor, "<init>", "(J)V");
 
   CACHE_CLASS(String, "java/lang/String");
 
-  CACHE_CLASS(ArrayList, "java/util/ArrayList");
-  CACHE_METHOD(ArrayList, ArrayList_constructor_default, "<init>", "()V");
-  CACHE_METHOD(ArrayList, ArrayList_constructor_collection, "<init>",
-               "(Ljava/util/Collection;)V");
-  CACHE_METHOD(ArrayList, ArrayList_get, "get", "(I)Ljava/lang/Object;");
-  CACHE_METHOD(ArrayList, ArrayList_add, "add", "(Ljava/lang/Object;)Z");
-
   CACHE_CLASS(Set, "java/util/Set");
   CACHE_METHOD(Set, Set_iterator, "iterator", "()Ljava/util/Iterator;");
 
@@ -160,7 +152,6 @@ bool bsg_jni_cache_init(JNIEnv *env) {
   CACHE_METHOD(Iterator, Iterator_next, "next", "()Ljava/lang/Object;");
 
   CACHE_CLASS(Map, "java/util/Map");
-  CACHE_METHOD(Map, Map_keySet, "keySet", "()Ljava/util/Set;");
   CACHE_METHOD(Map, Map_size, "size", "()I");
   CACHE_METHOD(Map, Map_get, "get", "(Ljava/lang/Object;)Ljava/lang/Object;");
   CACHE_METHOD(Map, Map_put, "put",
@@ -173,8 +164,6 @@ bool bsg_jni_cache_init(JNIEnv *env) {
 
   CACHE_CLASS(HashMap, "java/util/HashMap");
   CACHE_METHOD(HashMap, HashMap_constructor, "<init>", "()V");
-  CACHE_METHOD(HashMap, HashMap_keySet, "keySet", "()Ljava/util/Set;");
-  CACHE_METHOD(HashMap, HashMap_size, "size", "()I");
   CACHE_METHOD(HashMap, HashMap_get, "get",
                "(Ljava/lang/Object;)Ljava/lang/Object;");
   CACHE_METHOD(HashMap, HashMap_put, "put",
@@ -196,10 +185,6 @@ bool bsg_jni_cache_init(JNIEnv *env) {
   CACHE_STATIC_METHOD(NativeInterface, NativeInterface_notify, "notify",
                       "([B[BLcom/bugsnag/android/Severity;[Lcom/bugsnag/"
                       "android/NativeStackframe;)V");
-  CACHE_STATIC_METHOD(NativeInterface, NativeInterface_isDiscardErrorClass,
-                      "isDiscardErrorClass", "(Ljava/lang/String;)Z");
-  CACHE_STATIC_METHOD(NativeInterface, NativeInterface_deliverReport,
-                      "deliverReport", "([B[B[BLjava/lang/String;Z)V");
   CACHE_STATIC_METHOD(NativeInterface, NativeInterface_leaveBreadcrumb,
                       "leaveBreadcrumb",
                       "([BLcom/bugsnag/android/BreadcrumbType;)V");

bugsnag-plugin-android-ndk/src/main/jni/jni_cache.h

@@ -26,7 +26,6 @@ typedef struct {
   jmethodID Int_intValue;
 
   jclass Long;
-  jmethodID Long_constructor;
   jmethodID Long_valueOf;
 
   jclass Float;
@@ -48,7 +47,6 @@ typedef struct {
   jmethodID Map_get;
   jmethodID Map_put;
   jmethodID Map_size;
-  jmethodID Map_keySet;
   jmethodID Map_entrySet;
 
   jclass MapEntry;
@@ -59,14 +57,6 @@ typedef struct {
   jmethodID HashMap_constructor;
   jmethodID HashMap_get;
   jmethodID HashMap_put;
-  jmethodID HashMap_size;
-  jmethodID HashMap_keySet;
-
-  jclass ArrayList;
-  jmethodID ArrayList_constructor_default;
-  jmethodID ArrayList_constructor_collection;
-  jmethodID ArrayList_get;
-  jmethodID ArrayList_add;
 
   jclass NativeInterface;
   jmethodID NativeInterface_getApp;
@@ -77,8 +67,6 @@ typedef struct {
   jmethodID NativeInterface_getContext;
   jmethodID NativeInterface_notify;
   jmethodID NativeInterface_leaveBreadcrumb;
-  jmethodID NativeInterface_isDiscardErrorClass;
-  jmethodID NativeInterface_deliverReport;
 
   jclass NativeStackframe;
   jmethodID NativeStackframe_constructor;

bugsnag-plugin-android-ndk/src/test/CMakeLists.txt

@@ -14,5 +14,6 @@ add_library(bugsnag-ndk-test SHARED
     cpp/test_featureflags.c
     cpp/test_bsg_event.c
     cpp/UnwindTest.cpp
+    cpp/parson/parson.h
 )
 target_link_libraries(bugsnag-ndk-test bugsnag-ndk)

bugsnag-plugin-android-ndk/src/test/cpp/main.c

@@ -6,8 +6,8 @@
 #define GREATEST_FPRINTF(ignore, fmt, ...)                                     \
   __android_log_print(ANDROID_LOG_INFO, "BugsnagNDKTest", fmt, ##__VA_ARGS__)
 
+#include "parson/parson.h"
 #include <greatest/greatest.h>
-#include <parson/parson.h>
 
 #include "test_bsg_event.h"
 #include "test_serializer.h"

bugsnag-plugin-android-ndk/src/test/cpp/test_serializer.c

@@ -1,18 +1,6 @@
 #include <utils/string.h>
 #include "test_serializer.h"
 
-enum greatest_test_res validate_serialized_json(const test_case *test_case,
-                                                JSON_Value *event_val) {
-    // convert to string
-    char *serialized_string = json_serialize_to_string(event_val);
-    json_value_free(event_val);
-
-    // validate structure
-    char *expected = test_case->expected_json;
-    ASSERT_STR_EQ(expected, serialized_string);
-    PASS();
-}
-
 void loadUserTestCase(bugsnag_event *event) {
     bugsnag_user *user = &event->user;
     strcpy(user->name, "Fenton");

bugsnag-plugin-android-ndk/src/test/cpp/test_serializer.h

@@ -3,7 +3,7 @@
 
 #include <stdlib.h>
 
-#include <parson/parson.h>
+#include "parson/parson.h"
 
 #include <utils/serializer.h>
 
@@ -12,8 +12,6 @@ typedef struct {
     char *expected_json;
 } test_case;
 
-enum greatest_test_res validate_serialized_json(const test_case *test_case,
-                                                JSON_Value *event_val);
 void loadUserTestCase(bugsnag_event *event);
 void loadAppTestCase(bugsnag_event *event);
 void loadAppMetadataTestCase(bugsnag_event *event);

bugsnag-plugin-android-ndk/src/test/cpp/test_utils_serialize.c

@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "parson/parson.h"
 #include <greatest/greatest.h>
-#include <parson/parson.h>
 
 #include <featureflags.h>
 #include <utils/serializer.h>

docker-compose.yml

@@ -17,6 +17,7 @@ x-common-environment: &common-environment
   BUILDKITE_STEP_KEY:
   MAZE_BUGSNAG_API_KEY:
   MAZE_NO_FAIL_FAST:
+  MAZE_APPIUM_BUGSNAG_API_KEY:
   MAZE_SCENARIO_BUGSNAG_API_KEY:
   TEST_FIXTURE_SYMBOL_DIR:
 

examples/sdk-app-example/app/build.gradle

@@ -42,8 +42,8 @@ android {
 }
 
 dependencies {
-    implementation "com.bugsnag:bugsnag-android:6.12.1"
-    implementation "com.bugsnag:bugsnag-plugin-android-okhttp:6.12.1"
+    implementation "com.bugsnag:bugsnag-android:6.13.0"
+    implementation "com.bugsnag:bugsnag-plugin-android-okhttp:6.13.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "com.google.android.material:material:1.11.0"

features/fixtures/mazerunner/jvm-scenarios/src/main/java/com/bugsnag/android/mazerunner/scenarios/DiscardOldSessionScenario.kt

@@ -33,7 +33,7 @@ internal class DiscardOldSessionScenario(
 
     fun waitForSessionFile() {
         val dir = sessionDir()
-        while (dir.listFiles()!!.isEmpty()) {
+        while (dir.listFiles().isNullOrEmpty()) {
             Thread.sleep(100)
         }
     }