Merge pull request #1997 from bugsnag/release/v6.3.0

v6.3.0
bugsnag · Mar 19, 2024 · 7ad83fa · 7ad83fa
2 parents 96c1d40 + 4502a06
commit 7ad83fa
Show file tree

Hide file tree

Showing 34 changed files with 255 additions and 95 deletions.
diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml
@@ -49,6 +49,7 @@ steps:
           - "--app=/app/build/fixture-minimal.apk"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_9"
           - "--no-tunnel"
@@ -77,6 +78,7 @@ steps:
           - "--app=/app/build/fixture-debug.apk"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_9"
           - "--no-tunnel"
@@ -108,6 +110,7 @@ steps:
           - "--app=@build/fixture-r19-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_7"
           - "--no-tunnel"
@@ -141,6 +144,7 @@ steps:
           - "--app=@build/fixture-r19-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_7"
           - "--no-tunnel"
@@ -170,6 +174,7 @@ steps:
           - "--app=@build/fixture-r19-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_8"
           - "--no-tunnel"
@@ -201,6 +206,7 @@ steps:
           - "--app=@build/fixture-r19-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_8"
           - "--no-tunnel"
@@ -232,6 +238,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_9"
           - "--no-tunnel"
@@ -265,6 +272,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_9"
           - "--no-tunnel"
@@ -297,6 +305,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_10"
           - "--no-tunnel"
@@ -329,6 +338,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_10"
           - "--no-tunnel"
@@ -365,6 +375,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_11"
           - "--no-tunnel"
@@ -397,6 +408,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_11"
           - "--no-tunnel"
@@ -429,6 +441,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_13"
           - "--no-tunnel"
@@ -461,6 +474,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_13"
           - "--no-tunnel"

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -101,6 +101,7 @@ steps:
           - "--app=@build/fixture-r19-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_7"
           - "--no-tunnel"
@@ -130,6 +131,7 @@ steps:
           - "--app=@build/fixture-r19-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_8"
           - "--no-tunnel"
@@ -161,6 +163,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_9"
           - "--no-tunnel"
@@ -192,6 +195,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_10"
           - "--no-tunnel"
@@ -224,6 +228,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_11"
           - "--no-tunnel"
@@ -261,6 +266,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_12"
           - "--no-tunnel"
@@ -294,6 +300,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_12"
           - "--no-tunnel"
@@ -325,6 +332,7 @@ steps:
           - "--app=@build/fixture-r21-url.txt"
           - "--app-activity=com.bugsnag.android.mazerunner.MainActivity"
           - "--app-package=com.bugsnag.android.mazerunner"
+          - "--appium-version=1.22"
           - "--farm=bb"
           - "--device=ANDROID_13"
           - "--no-tunnel"

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -35,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'cpp', 'java', 'ruby' ]
+        language: [ 'java', 'ruby' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Use only 'java' to analyze code written in Java, Kotlin or both
         # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
@@ -58,7 +58,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -72,7 +72,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -85,6 +85,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## 6.3.0 (2024-03-19)
+
+### Enhancements
+
+* Introduced `generateAnonymousId` config option to control device-id generation
+  [#1989](https://github.com/bugsnag/bugsnag-android/pull/1989)
+
+### Bug fixes
+
+* Use PushLocalFrame/PopLocalFrame instead of DeleteLocalRef to avoid creating "holes" in the local ref table that are not always reused, leading to possible crashes in the ANR handler
+  [#1988](https://github.com/bugsnag/bugsnag-android/pull/1988)
+
+* Removed makeSafe as it is no longer applicable, and slows-down the creation of breadcrumbs and adding metadata
+  [#1990](https://github.com/bugsnag/bugsnag-android/pull/1990)
+
 ## 6.2.0 (2024-02-08)
 
 ### Enhancements

diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 #gem 'bugsnag-maze-runner', path: '../maze-runner'
 
 # Or a specific release:
-gem 'bugsnag-maze-runner', '~>8.0'
+gem 'bugsnag-maze-runner', '~>9.0'
 
 # Or follow master:
 #gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,9 +8,9 @@ GEM
     appium_lib_core (5.4.0)
       faye-websocket (~> 0.11.0)
       selenium-webdriver (~> 4.2, < 4.6)
-    bugsnag (6.26.0)
+    bugsnag (6.26.3)
       concurrent-ruby (~> 1.0)
-    bugsnag-maze-runner (8.2.0)
+    bugsnag-maze-runner (9.2.1)
       appium_lib (~> 12.0.0)
       appium_lib_core (~> 5.4.0)
       bugsnag (~> 6.24)
@@ -29,7 +29,7 @@ GEM
       webrick (~> 1.7.0)
     builder (3.2.4)
     childprocess (4.1.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     cucumber (7.1.0)
       builder (~> 3.2, >= 3.2.4)
       cucumber-core (~> 10.1, >= 10.1.0)
@@ -62,15 +62,15 @@ GEM
       cucumber-core (~> 10.1, >= 10.1.0)
       cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
     curb (0.9.11)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     dogstatsd-ruby (5.5.0)
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
     eventmachine (1.2.7)
     faye-websocket (0.11.3)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    ffi (1.15.5)
+    ffi (1.16.3)
     hana (1.3.7)
     json_schemer (0.2.25)
       ecma-re-validator (~> 0.3)
@@ -85,22 +85,22 @@ GEM
       tomlrb (>= 1.3, < 2.1)
       with_env (= 1.1.0)
       xml-simple (~> 1.1.5)
-    mime-types (3.4.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
+    mime-types-data (3.2024.0206)
     multi_test (0.1.2)
-    nokogiri (1.15.3-arm64-darwin)
+    nokogiri (1.15.5-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.3-x86_64-darwin)
+    nokogiri (1.15.5-x86_64-darwin)
       racc (~> 1.4)
     optimist (3.0.1)
     os (1.0.1)
     power_assert (2.0.3)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (2.2.8)
     rake (12.3.3)
-    regexp_parser (2.8.1)
-    rexml (3.2.5)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
     rubyzip (2.3.2)
     selenium-webdriver (4.5.0)
       childprocess (>= 0.5, < 5.0)
@@ -117,10 +117,10 @@ GEM
     tomlrb (2.0.3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.2)
+    unf_ext (0.0.9.1)
     uri_template (0.7.0)
     webrick (1.7.0)
-    websocket (1.2.9)
+    websocket (1.2.10)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -134,7 +134,7 @@ PLATFORMS
   x86_64-darwin-20
 
 DEPENDENCIES
-  bugsnag-maze-runner (~> 8.0)
+  bugsnag-maze-runner (~> 9.0)
   license_finder (~> 6.13)
 
 BUNDLED WITH

diff --git a/bugsnag-android-core/api/bugsnag-android-core.api b/bugsnag-android-core/api/bugsnag-android-core.api
@@ -175,6 +175,7 @@ public class com/bugsnag/android/Configuration : com/bugsnag/android/CallbackAwa
 	public fun getEnabledErrorTypes ()Lcom/bugsnag/android/ErrorTypes;
 	public fun getEnabledReleaseStages ()Ljava/util/Set;
 	public fun getEndpoints ()Lcom/bugsnag/android/EndpointConfiguration;
+	public fun getGenerateAnonymousId ()Z
 	public fun getLaunchDurationMillis ()J
 	public fun getLogger ()Lcom/bugsnag/android/Logger;
 	public fun getMaxBreadcrumbs ()I
@@ -214,6 +215,7 @@ public class com/bugsnag/android/Configuration : com/bugsnag/android/CallbackAwa
 	public fun setEnabledErrorTypes (Lcom/bugsnag/android/ErrorTypes;)V
 	public fun setEnabledReleaseStages (Ljava/util/Set;)V
 	public fun setEndpoints (Lcom/bugsnag/android/EndpointConfiguration;)V
+	public fun setGenerateAnonymousId (Z)V
 	public fun setLaunchDurationMillis (J)V
 	public fun setLogger (Lcom/bugsnag/android/Logger;)V
 	public fun setMaxBreadcrumbs (I)V
@@ -861,7 +863,7 @@ public final class com/bugsnag/android/internal/DateUtils {
 }
 
 public final class com/bugsnag/android/internal/ImmutableConfig {
-	public fun <init> (Ljava/lang/String;ZLcom/bugsnag/android/ErrorTypes;ZLcom/bugsnag/android/ThreadSendPolicy;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Set;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/bugsnag/android/Delivery;Lcom/bugsnag/android/EndpointConfiguration;ZJLcom/bugsnag/android/Logger;IIIIJLkotlin/Lazy;ZZLandroid/content/pm/PackageInfo;Landroid/content/pm/ApplicationInfo;Ljava/util/Collection;)V
+	public fun <init> (Ljava/lang/String;ZLcom/bugsnag/android/ErrorTypes;ZLcom/bugsnag/android/ThreadSendPolicy;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Set;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/bugsnag/android/Delivery;Lcom/bugsnag/android/EndpointConfiguration;ZJLcom/bugsnag/android/Logger;IIIIJLkotlin/Lazy;ZZZLandroid/content/pm/PackageInfo;Landroid/content/pm/ApplicationInfo;Ljava/util/Collection;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component10 ()Ljava/util/Set;
 	public final fun component11 ()Ljava/lang/String;
@@ -883,18 +885,19 @@ public final class com/bugsnag/android/internal/ImmutableConfig {
 	public final fun component26 ()Lkotlin/Lazy;
 	public final fun component27 ()Z
 	public final fun component28 ()Z
-	public final fun component29 ()Landroid/content/pm/PackageInfo;
+	public final fun component29 ()Z
 	public final fun component3 ()Lcom/bugsnag/android/ErrorTypes;
-	public final fun component30 ()Landroid/content/pm/ApplicationInfo;
-	public final fun component31 ()Ljava/util/Collection;
+	public final fun component30 ()Landroid/content/pm/PackageInfo;
+	public final fun component31 ()Landroid/content/pm/ApplicationInfo;
+	public final fun component32 ()Ljava/util/Collection;
 	public final fun component4 ()Z
 	public final fun component5 ()Lcom/bugsnag/android/ThreadSendPolicy;
 	public final fun component6 ()Ljava/util/Collection;
 	public final fun component7 ()Ljava/util/Collection;
 	public final fun component8 ()Ljava/util/Collection;
 	public final fun component9 ()Ljava/util/Set;
-	public final fun copy (Ljava/lang/String;ZLcom/bugsnag/android/ErrorTypes;ZLcom/bugsnag/android/ThreadSendPolicy;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Set;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/bugsnag/android/Delivery;Lcom/bugsnag/android/EndpointConfiguration;ZJLcom/bugsnag/android/Logger;IIIIJLkotlin/Lazy;ZZLandroid/content/pm/PackageInfo;Landroid/content/pm/ApplicationInfo;Ljava/util/Collection;)Lcom/bugsnag/android/internal/ImmutableConfig;
-	public static synthetic fun copy$default (Lcom/bugsnag/android/internal/ImmutableConfig;Ljava/lang/String;ZLcom/bugsnag/android/ErrorTypes;ZLcom/bugsnag/android/ThreadSendPolicy;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Set;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/bugsnag/android/Delivery;Lcom/bugsnag/android/EndpointConfiguration;ZJLcom/bugsnag/android/Logger;IIIIJLkotlin/Lazy;ZZLandroid/content/pm/PackageInfo;Landroid/content/pm/ApplicationInfo;Ljava/util/Collection;ILjava/lang/Object;)Lcom/bugsnag/android/internal/ImmutableConfig;
+	public final fun copy (Ljava/lang/String;ZLcom/bugsnag/android/ErrorTypes;ZLcom/bugsnag/android/ThreadSendPolicy;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Set;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/bugsnag/android/Delivery;Lcom/bugsnag/android/EndpointConfiguration;ZJLcom/bugsnag/android/Logger;IIIIJLkotlin/Lazy;ZZZLandroid/content/pm/PackageInfo;Landroid/content/pm/ApplicationInfo;Ljava/util/Collection;)Lcom/bugsnag/android/internal/ImmutableConfig;
+	public static synthetic fun copy$default (Lcom/bugsnag/android/internal/ImmutableConfig;Ljava/lang/String;ZLcom/bugsnag/android/ErrorTypes;ZLcom/bugsnag/android/ThreadSendPolicy;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Collection;Ljava/util/Set;Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/bugsnag/android/Delivery;Lcom/bugsnag/android/EndpointConfiguration;ZJLcom/bugsnag/android/Logger;IIIIJLkotlin/Lazy;ZZZLandroid/content/pm/PackageInfo;Landroid/content/pm/ApplicationInfo;Ljava/util/Collection;ILjava/lang/Object;)Lcom/bugsnag/android/internal/ImmutableConfig;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getApiKey ()Ljava/lang/String;
 	public final fun getAppInfo ()Landroid/content/pm/ApplicationInfo;
@@ -910,6 +913,7 @@ public final class com/bugsnag/android/internal/ImmutableConfig {
 	public final fun getEnabledErrorTypes ()Lcom/bugsnag/android/ErrorTypes;
 	public final fun getEnabledReleaseStages ()Ljava/util/Collection;
 	public final fun getEndpoints ()Lcom/bugsnag/android/EndpointConfiguration;
+	public final fun getGenerateAnonymousId ()Z
 	public final fun getLaunchDurationMillis ()J
 	public final fun getLogger ()Lcom/bugsnag/android/Logger;
 	public final fun getMaxBreadcrumbs ()I