Merge pull request #2281 from bugsnag/release/v6.18.0

Release v6.18.0

Author: lemnik

.buildkite/pipeline.full.yml

@@ -47,9 +47,9 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
         with:
           submodules: recursive
-      - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 #v3.5.0
+      - uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 #v4.4.2
 
-      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 #v4.7.1
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0
         with:
           distribution: 'zulu'
           java-version: 17
@@ -64,7 +64,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed #v3.29.8
+        uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d #v3.30.0
         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@76621b61decf072c1cee8dd1ce2d2a82d33c17ed #v3.29.8
+        uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d #v3.30.0
         with:
           category: "/language:${{matrix.language}}"

.buildkite/pipeline.yml

@@ -26,7 +26,8 @@ jobs:
           sudo apt-get install libcurl4-openssl-dev net-tools
 
       - run: >
-          curl -X POST https://api.github.com/repos/${{ matrix.downstream_repo }}/dispatches
+          curl --fail --silent --show-error
+          -X POST https://api.github.com/repos/${{ matrix.downstream_repo }}/dispatches
           -H 'Content-Type: application/json'
           -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/codeql.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@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
+        uses: github/codeql-action/upload-sarif@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
         with:
           sarif_file: results.sarif
 

.github/workflows/downstream_updates.yml

@@ -1,5 +1,12 @@
 # Changelog
 
+## 6.18.0 (2025-09-10)
+
+### Enhancements
+
+* Introduced a new `Bugsnag.groupingDiscriminator` and `Event.groupingDiscriminator` to augment the default grouping behaviour.
+  [#2273](https://github.com/bugsnag/bugsnag-android/pull/2273)
+
 ## 6.17.0 (2025-08-14)
 
 ### Enhancements

.github/workflows/scorecard.yml

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

CHANGELOG.md

@@ -46,6 +46,14 @@ fixture-r21: notifier
                assembleRelease -x check
 	@ruby scripts/copy-build-files.rb release r21
 
+fixture-r28: notifier
+	# Build the r28 test fixture
+	@cd ./features/fixtures/mazerunner && ./gradlew -PTEST_FIXTURE_NDK_VERSION=28.2.13676358 \
+	           -PTEST_FIXTURE_MINSDK=21 \
+               -PTEST_FIXTURE_NAME=fixture-r28.apk \
+               assembleRelease -x check
+	@ruby scripts/copy-build-files.rb release r28
+
 fixture-minimal: notifier
 	# Build the minimal test fixture
 	@cd ./features/fixtures/mazerunner && ./gradlew -PMINIMAL_FIXTURE=true \

Gemfile

@@ -71,6 +71,7 @@ public final class com/bugsnag/android/Bugsnag {
 	public static fun getBreadcrumbs ()Ljava/util/List;
 	public static fun getClient ()Lcom/bugsnag/android/Client;
 	public static fun getContext ()Ljava/lang/String;
+	public static fun getGroupingDiscriminator ()Ljava/lang/String;
 	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;
@@ -87,6 +88,7 @@ public final class com/bugsnag/android/Bugsnag {
 	public static fun removeOnSession (Lcom/bugsnag/android/OnSessionCallback;)V
 	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 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;
@@ -127,6 +129,7 @@ public class com/bugsnag/android/Client : com/bugsnag/android/CallbackAware, com
 	protected fun finalize ()V
 	public fun getBreadcrumbs ()Ljava/util/List;
 	public fun getContext ()Ljava/lang/String;
+	public fun getGroupingDiscriminator ()Ljava/lang/String;
 	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;
@@ -142,6 +145,7 @@ public class com/bugsnag/android/Client : com/bugsnag/android/CallbackAware, com
 	public fun removeOnSession (Lcom/bugsnag/android/OnSessionCallback;)V
 	public fun resumeSession ()Z
 	public fun setContext (Ljava/lang/String;)V
+	public fun setGroupingDiscriminator (Ljava/lang/String;)Ljava/lang/String;
 	public fun setUser (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 	public fun startSession ()V
 }
@@ -388,6 +392,7 @@ public class com/bugsnag/android/Event : com/bugsnag/android/FeatureFlagAware, c
 	public fun getDevice ()Lcom/bugsnag/android/DeviceWithState;
 	public fun getErrors ()Ljava/util/List;
 	public fun getFeatureFlags ()Ljava/util/List;
+	public fun getGroupingDiscriminator ()Ljava/lang/String;
 	public fun getGroupingHash ()Ljava/lang/String;
 	public fun getMetadata (Ljava/lang/String;)Ljava/util/Map;
 	public fun getMetadata (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
@@ -400,6 +405,7 @@ public class com/bugsnag/android/Event : com/bugsnag/android/FeatureFlagAware, c
 	public fun leaveBreadcrumb (Ljava/lang/String;Lcom/bugsnag/android/BreadcrumbType;Ljava/util/Map;)Lcom/bugsnag/android/Breadcrumb;
 	public fun setApiKey (Ljava/lang/String;)V
 	public fun setContext (Ljava/lang/String;)V
+	public fun setGroupingDiscriminator (Ljava/lang/String;)Ljava/lang/String;
 	public fun setGroupingHash (Ljava/lang/String;)V
 	public fun setSeverity (Lcom/bugsnag/android/Severity;)V
 	public fun setTraceCorrelation (Ljava/util/UUID;J)V
@@ -547,6 +553,7 @@ public class com/bugsnag/android/NativeInterface {
 	public static fun setBinaryArch (Ljava/lang/String;)V
 	public static fun setClient (Lcom/bugsnag/android/Client;)V
 	public static fun setContext (Ljava/lang/String;)V
+	public static fun setGroupingDiscriminator (Ljava/lang/String;)Ljava/lang/String;
 	public static fun setUser (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 	public static fun setUser ([B[B[B)V
 	public static fun startSession ()V
@@ -757,6 +764,11 @@ public final class com/bugsnag/android/StateEvent$UpdateContext : com/bugsnag/an
 	public fun <init> (Ljava/lang/String;)V
 }
 
+public final class com/bugsnag/android/StateEvent$UpdateGroupingDiscriminator : com/bugsnag/android/StateEvent {
+	public final field groupingDiscriminator Ljava/lang/String;
+	public fun <init> (Ljava/lang/String;)V
+}
+
 public final class com/bugsnag/android/StateEvent$UpdateInForeground : com/bugsnag/android/StateEvent {
 	public final field inForeground Z
 	public fun <init> (ZLjava/lang/String;)V

Makefile

@@ -5,6 +5,7 @@
     <ID>CyclomaticComplexMethod:AppDataCollector.kt$AppDataCollector$@SuppressLint("SwitchIntDef") @Suppress("DEPRECATION") private fun getProcessImportance(): String?</ID>
     <ID>CyclomaticComplexMethod:ConfigInternal.kt$ConfigInternal$fun getConfigDifferences(): Map&lt;String, Any></ID>
     <ID>ImplicitDefaultLocale:Deliverable.kt$Deliverable$String.format("%02x", byte)</ID>
+    <ID>LongMethod:EventSerializationTest.kt$EventSerializationTest.Companion$@JvmStatic @Parameters fun testCases(): Collection&lt;Pair&lt;Event, String>></ID>
     <ID>LongParameterList:App.kt$App$( /** * The architecture of the running application binary */ var binaryArch: String?, /** * The package name of the application */ var id: String?, /** * The release stage set in [Configuration.releaseStage] */ var releaseStage: String?, /** * The version of the application set in [Configuration.version] */ var version: String?, /** The revision ID from the manifest (React Native apps only) */ var codeBundleId: String?, /** * The unique identifier for the build of the application set in [Configuration.buildUuid] */ buildUuid: Provider&lt;String?>?, /** * The application type set in [Configuration#version] */ var type: String?, /** * The version code of the application set in [Configuration.versionCode] */ var versionCode: Number? )</ID>
     <ID>LongParameterList:AppDataCollector.kt$AppDataCollector$( appContext: Context, private val packageManager: PackageManager?, private val config: ImmutableConfig, private val sessionTracker: Provider&lt;SessionTracker>, private val activityManager: ActivityManager?, private val launchCrashTracker: LaunchCrashTracker, private val memoryTrimState: MemoryTrimState )</ID>
     <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>