Merge branch 'next' into dependabot/github_actions/gradle/actions-5.0.0

Author: YYChen01988

.buildkite/pipeline.yml

@@ -49,6 +49,14 @@ steps:
       JAVA_VERSION: '17'
     command: scripts/run-sizer.sh
 
+  - label: ':android: Build Example App'
+    timeout_in_minutes: 10
+    agents:
+      queue: macos-15
+    command: 'make example-app'
+    env:
+      JAVA_VERSION: 17
+
   - label: ':android: Build and upload test fixture'
     key: 'fixture'
     timeout_in_minutes: 30
@@ -76,10 +84,13 @@ steps:
       - "ANDROID_13"
       - "ANDROID_14"
       - "ANDROID_15"
+      - "ANDROID_16"
     plugins:
       artifacts#v1.9.0:
         download: "build/fixture_url.txt"
-        upload: "maze_output/failed/**/*"
+        upload:
+          - "maze_output/failed/**/*"
+          - "maze_output/maze_output.zip"
       docker-compose#v4.8.0:
         pull: android-maze-runner
         run: android-maze-runner
@@ -104,39 +115,11 @@ steps:
     concurrency_method: eager
     retry:
       automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
         - exit_status: 103  # Appium session failed
           limit: 2
 
-  - label: ':browserstack: {{matrix}} tests'
-    depends_on: "fixture"
-    timeout_in_minutes: 60
-    matrix:
-      - "ANDROID_16"
-    plugins:
-      artifacts#v1.9.0:
-        download: "build/fixture_bs_url.txt"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.8.0:
-        pull: android-maze-runner
-        run: android-maze-runner
-        service-ports: true
-        command:
-          - "features/full_tests"
-          - "--app=@build/fixture_bs_url.txt"
-          - "--farm=bs"
-          - "--device={{matrix}}"
-          - "--appium-version=1.22.0"
-          - "--fail-fast"
-          - "--app-activity=com.bugsnag.mazeracer.SplashScreenActivity"
-          - "--app-package=com.bugsnag.mazeracer"
-      test-collector#v1.10.2:
-        files: "reports/TEST-*.xml"
-        format: "junit"
-        branch: "^main|next$$"
-    concurrency: 5
-    concurrency_group: 'browserstack-app'
-    concurrency_method: eager
-
   # If this is the 'main' branch activate a manual publishing step
 
   - block: 'Trigger package publish'

.github/workflows/codeql.yml

@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5.0.1
         with:
           submodules: recursive
       - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 #v3.5.0
@@ -62,7 +62,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 #v3.30.5
+        uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db #v4.31.3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -78,6 +78,6 @@ jobs:
           ./gradlew --no-daemon assemble
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 #v3.30.5
+        uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db #v4.31.3
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/scorecard.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
 
@@ -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@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: SARIF file
           path: results.sarif
@@ -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@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
+        uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
         with:
           sarif_file: results.sarif
 
   gradle-wrapper-validation:
     name: "Checksum validation of Gradle Wrappers"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
       - uses: gradle/actions/wrapper-validation@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.gitignore

@@ -17,6 +17,7 @@ captures/
 
 # Mazerunner
 maze_output
+maze-runner.log
 
 # Misc
 .DS_Store

CHANGELOG.md

@@ -1,5 +1,26 @@
 ## TBD
 
+### Changes
+
+* System metrics are now reported for first-class `ViewLoad` spans
+  [#475](https://github.com/bugsnag/bugsnag-android-performance/pull/475)
+
+## 2.1.1 (2025-11-20)
+
+### Bug fixes
+
+* Made the new `ThreadAwareSpanContextStorage` interface public API
+  [#474](https://github.com/bugsnag/bugsnag-android-performance/pull/474)
+
+## 2.1.0 (2025-11-10)
+
+### Changes
+
+* Added an optional `spanName` to `LoadingIndicator` and `LoadingIndicatorView` to create a child span of the `ViewLoad` span
+  [#458](https://github.com/bugsnag/bugsnag-android-performance/pull/458)
+* Introduced `GlobalSpanContextStorage` and `HybridSpanContextStorage` for more flexible trace parentage
+  [#465](https://github.com/bugsnag/bugsnag-android-performance/pull/465)
+
 ### Bug fixes
 
 * `NamedSpanControlsPlugin` better handles timeouts when spans have duplicate names, avoiding holding references for longer than required

Gemfile

@@ -7,7 +7,7 @@ source "https://rubygems.org"
 gem 'bugsnag-maze-runner', '~>10.0'
 
 # Or a branch
-#gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'integration/v8'
+#gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'main'
 
 # Or follow master:
 # gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner'

Makefile

@@ -1,4 +1,4 @@
-.PHONY: install test-fixture check bump
+.PHONY: check install test-fixture example-app bump
 
 check:
 	@./gradlew --continue license detekt lint ktlintCheck test
@@ -15,6 +15,11 @@ benchmark-fixture: install
 	@cd features/fixtures/benchmarks && ./gradlew assembleRelease -x check
 	@cp features/fixtures/benchmarks/app/build/outputs/apk/release/app-release.apk build/benchmark-fixture.apk
 
+example-app:
+	@./gradlew assembleRelease publishToMavenLocal -x check
+	# Build example app
+	@cd ./examples/performance-example/ && ./gradlew clean assembleRelease
+
 bump:
 ifneq ($(shell git diff --staged),)
 	@git diff --staged

bugsnag-android-performance-api/api/bugsnag-android-performance-api.api

@@ -309,6 +309,11 @@ public final class com/bugsnag/android/performance/ViewType : java/lang/Enum {
 	public static fun values ()[Lcom/bugsnag/android/performance/ViewType;
 }
 
+public abstract interface class com/bugsnag/android/performance/context/ThreadAwareSpanContextStorage : com/bugsnag/android/performance/SpanContextStorage {
+	public abstract fun getCurrentThreadSpanContextStorage ()Lcom/bugsnag/android/performance/SpanContextStorage;
+	public abstract fun setCurrentThreadSpanContextStorage (Lcom/bugsnag/android/performance/SpanContextStorage;)V
+}
+
 public abstract interface class com/bugsnag/android/performance/controls/AppStartSpanControl {
 	public abstract fun clearType ()V
 	public abstract fun setType (Ljava/lang/String;)V

bugsnag-android-performance-api/src/main/kotlin/com/bugsnag/android/performance/context/ThreadAwareSpanContextStorage.kt

@@ -0,0 +1,37 @@
+package com.bugsnag.android.performance.context
+
+import com.bugsnag.android.performance.SpanContextStorage
+
+/**
+ * An extension of [SpanContextStorage] for implementations that can differentiate between
+ * execution threads.
+ *
+ * This interface provides a contract for storage mechanisms that are "thread-aware". It does not
+ * mandate that all operations are isolated per-thread, but rather for interacting with what might
+ * be a thread-specific storage instance.
+ *
+ * Implementations can use this to provide advanced capabilities, such as allowing manual
+ * propagation of a `SpanContext` stack from one thread to another.
+ *
+ * @see SpanContextStorage
+ */
+public interface ThreadAwareSpanContextStorage : SpanContextStorage {
+    /**
+     * Represents the [SpanContextStorage] for the currently executing thread, providing a
+     * mechanism to retrieve or replace it.
+     *
+     * This property is intended for advanced use cases, such as manual context propagation
+     * across asynchronous boundaries. For example, a caller could get the storage from a
+     * parent thread and set it on a newly created child thread to ensure the span
+     * hierarchy is correctly maintained.
+     *
+     * **Getter**: Retrieves a representation of the `SpanContextStorage` for the current thread.
+     * This may be the actual storage instance, a proxy, or `null` if no context is
+     * associated with the thread.
+     *
+     * **Setter**: Attempts to replace the `SpanContextStorage` for the current thread.
+     * This should be used with caution, as it can lead to an inconsistent state if not
+     * managed carefully.
+     */
+    public var currentThreadSpanContextStorage: SpanContextStorage?
+}

bugsnag-android-performance-compose/api/bugsnag-android-performance-compose.api

@@ -18,7 +18,7 @@ public final class com/bugsnag/android/performance/compose/ComposeModule : com/b
 }
 
 public final class com/bugsnag/android/performance/compose/LoadingIndicatorKt {
-	public static final fun LoadingIndicator (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
+	public static final fun LoadingIndicator (Landroidx/compose/ui/Modifier;Ljava/lang/String;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
 }
 
 public final class com/bugsnag/android/performance/compose/MeasuredComposableKt {