v5.15.0

.buildkite/pipeline.full.yml

@@ -12,6 +12,7 @@ steps:
       MINIMAL_FIXTURE: true
       TEST_FIXTURE_NDK_VERSION: "17.2.4988734"
       TEST_FIXTURE_NAME: "fixture-minimal.apk"
+      BUILD_TASK: "assembleRelease"
 
   - label: ':android: Build Example App'
     depends_on: "android-ci"
@@ -21,6 +22,21 @@ steps:
       docker-compose#v3.7.0:
         run: android-ci
 
+  - label: ':android: Build debug fixture APK'
+    key: "fixture-debug"
+    depends_on: "android-ci"
+    timeout_in_minutes: 30
+    artifact_paths: build/debug/fixture-debug.apk
+    plugins:
+      - docker-compose#v3.7.0:
+          run: android-builder
+    env:
+      MAVEN_VERSION: "3.6.1"
+      MINIMAL_FIXTURE: false
+      TEST_FIXTURE_NDK_VERSION: "17.2.4988734"
+      TEST_FIXTURE_NAME: "fixture-debug.apk"
+      BUILD_TASK: "assembleDebug"
+
   - label: ':android: Build Scan'
     depends_on: "android-ci"
     timeout_in_minutes: 10
@@ -47,6 +63,28 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
+
+  - label: ':android: Debug fixture smoke tests'
+    depends_on: "fixture-debug"
+    timeout_in_minutes: 30
+    plugins:
+      artifacts#v1.2.0:
+        download: "build/debug/fixture-debug.apk"
+        upload: "maze_output/failed/**/*"
+      docker-compose#v3.7.0:
+        pull: android-maze-runner
+        run: android-maze-runner
+        command:
+          - "features/smoke_tests"
+          - "--tags=debug-safe"
+          - "--app=/app/build/debug/fixture-debug.apk"
+          - "--farm=bs"
+          - "--device=ANDROID_9_0"
+          - "--fail-fast"
+    concurrency: 9
+    concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android size reporting'
     depends_on: "android-ci"
@@ -55,21 +93,6 @@ steps:
       - docker-compose#v3.7.0:
           run: android-sizer
 
-  - label: ':android: Android 9 Instrumentation tests'
-    depends_on:
-      - "android-ci"
-    timeout_in_minutes: 60
-    command: ./scripts/build-instrumentation-tests.sh && ./scripts/run-instrumentation-test.sh
-    plugins:
-      - docker-compose#v3.7.0:
-          run: android-ci
-    env:
-      SINGLE_RUNNER: "true"
-      INSTRUMENTATION_DEVICES: '["Google Pixel 3-9.0"]'
-      TEST_APK_LOCATION: 'bugsnag-android-core/build/outputs/apk/androidTest/debug/bugsnag-android-core-debug-androidTest.apk'
-    concurrency: 9
-    concurrency_group: 'browserstack-app'
-
   - label: ':android: Android 5 NDK r16 end-to-end tests - batch 1'
     depends_on:
       - "fixture-r16"
@@ -90,6 +113,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
     soft_fail:
       - exit_status: "*"
 
@@ -113,6 +137,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
     soft_fail:
       - exit_status: "*"
 
@@ -136,6 +161,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 6 NDK r16 end-to-end tests - batch 2'
     depends_on:
@@ -157,6 +183,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 7 NDK r19 end-to-end tests - batch 1'
     depends_on:
@@ -178,6 +205,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 7 NDK r19 end-to-end tests - batch 2'
     depends_on:
@@ -199,6 +227,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 8.1 NDK r19 end-to-end tests - batch 1'
     depends_on:
@@ -220,6 +249,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 8.1 NDK r19 end-to-end tests - batch 2'
     depends_on:
@@ -241,6 +271,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 10 NDK r21 end-to-end tests - batch 1'
     depends_on:
@@ -262,6 +293,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 10 NDK r21 end-to-end tests - batch 2'
     depends_on:
@@ -283,6 +315,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   # Android 11+ devices have the GWP-ASAN tool enabled which randomly samples native memory to
   # to detect misuse (such as use-after-free, buffer overflow). If a failure is detected then
@@ -308,6 +341,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 11 NDK r21 end-to-end tests - batch 2'
     depends_on:
@@ -329,6 +363,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   # If there is a tag present activate a manual publishing step
 

.buildkite/pipeline.quick.yml

@@ -18,6 +18,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
     soft_fail:
       - exit_status: "*"
 
@@ -40,6 +41,7 @@ steps:
         - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 7 NDK r19 smoke tests'
     key: 'android-7-smoke'
@@ -60,6 +62,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 8.1 NDK r19 smoke tests'
     key: 'android-8-1-smoke'
@@ -80,6 +83,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 9 NDK r21 smoke tests'
     key: 'android-9-smoke'
@@ -100,6 +104,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 9 NDK r21 end-to-end tests - batch 1'
     depends_on:
@@ -120,6 +125,7 @@ steps:
           - "--device=ANDROID_9_0"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 9 NDK r21 end-to-end tests - batch 2'
     depends_on:
@@ -140,6 +146,7 @@ steps:
           - "--device=ANDROID_9_0"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: ':android: Android 10 NDK r21 smoke tests'
     key: 'android-10-smoke'
@@ -160,3 +167,4 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager

.buildkite/pipeline.yml

@@ -63,6 +63,7 @@ steps:
       TEST_FIXTURE_NDK_VERSION: "17.2.4988734"
       TEST_FIXTURE_NAME: "fixture-r16.apk"
       USE_LEGACY_OKHTTP: "true"
+      BUILD_TASK: "assembleRelease"
 
   - label: ':android: Build fixture APK r19'
     key: "fixture-r19"
@@ -76,6 +77,7 @@ steps:
       MAVEN_VERSION: "3.6.1"
       TEST_FIXTURE_NDK_VERSION: "19.2.5345600"
       TEST_FIXTURE_NAME: "fixture-r19.apk"
+      BUILD_TASK: "assembleRelease"
 
   - label: ':android: Build fixture APK r21'
     key: "fixture-r21"
@@ -89,6 +91,7 @@ steps:
       MAVEN_VERSION: "3.6.1"
       TEST_FIXTURE_NDK_VERSION: "21.3.6528147"
       TEST_FIXTURE_NAME: "fixture-r21.apk"
+      BUILD_TASK: "assembleRelease"
 
   - label: ':android: Lint'
     depends_on: "android-ci"
@@ -154,54 +157,6 @@ steps:
           run: android-ci
     command: './gradlew test'
 
-  - label: ':android: Android 7 Instrumentation tests'
-    key: 'core-instrumentation-tests'
-    depends_on:
-      - "android-ci"
-    timeout_in_minutes: 60
-    command: ./scripts/build-instrumentation-tests.sh && ./scripts/run-instrumentation-test.sh
-    plugins:
-      - docker-compose#v3.7.0:
-          run: android-ci
-    env:
-      SINGLE_RUNNER: "true"
-      INSTRUMENTATION_DEVICES: '["Google Pixel-7.1"]'
-      TEST_APK_LOCATION: 'bugsnag-android-core/build/outputs/apk/androidTest/debug/bugsnag-android-core-debug-androidTest.apk'
-    concurrency: 9
-    concurrency_group: 'browserstack-app'
-
-  - label: ':android: NDK Instrumentation tests'
-    key: 'ndk-instrumentation-tests'
-    depends_on:
-      - "android-ci"
-    timeout_in_minutes: 60
-    command: ./scripts/build-instrumentation-tests.sh && ./scripts/run-instrumentation-test.sh
-    plugins:
-      - docker-compose#v3.7.0:
-          run: android-ci
-    env:
-      SINGLE_RUNNER: "true"
-      INSTRUMENTATION_DEVICES: '["Google Pixel-7.1"]'
-      TEST_APK_LOCATION: 'bugsnag-plugin-android-ndk/build/outputs/apk/androidTest/debug/bugsnag-plugin-android-ndk-debug-androidTest.apk'
-    concurrency: 9
-    concurrency_group: 'browserstack-app'
-
-  - label: ':android: Performance benchmarks'
-    key: 'perf-benchmarks'
-    depends_on:
-      - "android-ci"
-    timeout_in_minutes: 60
-    command: ./scripts/build-instrumentation-tests.sh && ./scripts/run-instrumentation-test.sh
-    plugins:
-      - docker-compose#v3.7.0:
-          run: android-ci
-    env:
-      SINGLE_RUNNER: "false"
-      INSTRUMENTATION_DEVICES: '["Google Pixel-7.1"]'
-      TEST_APK_LOCATION: 'bugsnag-benchmarks/build/outputs/apk/androidTest/release/bugsnag-benchmarks-release-androidTest.apk'
-    concurrency: 9
-    concurrency_group: 'browserstack-app'
-
   - label: ':android: Android 4.4 NDK r16 smoke tests'
     key: 'android-4-4-smoke'
     depends_on: "fixture-r16"
@@ -221,6 +176,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   # Android 11+ devices have the GWP-ASAN tool enabled which randomly samples native memory to
   # to detect misuse (such as use-after-free, buffer overflow). If a failure is detected then
@@ -247,6 +203,7 @@ steps:
           - "--fail-fast"
     concurrency: 9
     concurrency_group: 'browserstack-app'
+    concurrency_method: eager
 
   - label: 'Conditionally trigger full set of tests'
     command: sh -c .buildkite/pipeline_trigger.sh

.github/workflows/build.yml

@@ -0,0 +1,35 @@
+name: instrumentation_tests
+
+on: [push, pull_request]
+
+env:
+  GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dkotlin.incremental=false -Dorg.gradle.parallel=true"
+
+jobs:
+  android:
+    runs-on: macos-latest
+
+    strategy:
+      fail-fast: true
+      matrix:
+        api-level:
+          - 29
+
+    steps:
+      - uses: actions/[email protected]
+        with:
+          submodules: recursive
+      - uses: gradle/[email protected]
+
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 11
+
+      - name: Run Tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          script: ./gradlew connectedCheck -x :bugsnag-benchmarks:connectedCheck
+        env:
+          API_LEVEL: ${{ matrix.api-level }}

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 5.15.0 (2021-11-04)
+
+### Bug fixes
+
+* Avoid reporting false-positive background ANRs with improved foreground detection
+  [#1429](https://github.com/bugsnag/bugsnag-android/pull/1429)
+
+* Prevent events being attached to phantom sessions when they are blocked by an `OnSessionCallback`
+  [#1434](https://github.com/bugsnag/bugsnag-android/pull/1434)
+
+* Plugins will correctly mirror metadata added using `addMetadata(String, Map)`
+  [#1454](https://github.com/bugsnag/bugsnag-android/pull/1454)
+
 ## 5.14.0 (2021-09-29)
 
 ### Enhancements 

Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 #gem 'bugsnag-maze-runner', path: '../maze-runner'
 
 # Or a specific release:
-gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v5.0.1'
+gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v6.0.1'
 
 
 # Or follow master: