Merge branch 'next' into je/plat-15239

Author: Steve Kirkland

.buildkite/pipeline.benchmark.yml

@@ -1,24 +1,24 @@
 agents:
-  queue: opensource
+  queue: "opensource"
 
 steps:
-  - label: ':android: Build and upload benchmarks'
-    key: 'benchmark-fixture'
+  - label: ":android: Build and upload benchmarks"
+    key: "benchmark-fixture"
     timeout_in_minutes: 30
     agents:
-      queue: macos-15
+      queue: "macos-15"
     env:
-      JAVA_VERSION: '17'
+      JAVA_VERSION: "17"
     artifact_paths:
       - "build/benchmark_fixture_url.txt"
     commands:
-      - make benchmark-fixture
-      - bundle install
-      - bundle exec upload-app --farm=bb --app=./build/benchmark-fixture.apk --app-id-file=build/benchmark_fixture_url.txt
+      - "make benchmark-fixture"
+      - "bundle install"
+      - "bundle exec upload-app --farm=bb --app=./build/benchmark-fixture.apk --app-id-file=build/benchmark_fixture_url.txt"
 
-  - label: ':bitbar: Benchmarks'
+  - label: ":bitbar: Benchmarks"
     depends_on: "benchmark-fixture"
-    key: 'benchmark-tests'
+    key: "benchmark-tests"
     timeout_in_minutes: 30
     env:
       RUN_BENCHMARKS: "1"
@@ -29,8 +29,8 @@ steps:
           - "maze_output/failed/**/*"
           - "maze_output/metrics.csv"
       docker-compose#v4.8.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: "android-maze-runner"
+        run: "android-maze-runner"
         service-ports: true
         command:
           - "features/benchmarks"
@@ -42,21 +42,23 @@ steps:
           - "--aws-public-ip"
           - "--fail-fast"
     concurrency: 25
-    concurrency_group: 'bitbar'
-    concurrency_method: eager
+    concurrency_group: "bitbar"
+    concurrency_method: "eager"
     retry:
       automatic:
         - exit_status: 103  # Appium session failed
           limit: 2
+        - exit_status: -1  # Agent was lost
+          limit: 2
 
-  - label: 'Send results to Datadog'
+  - label: "Send results to Datadog"
     depends_on: "benchmark-tests"
     timeout_in_minutes: 10
     plugins:
       artifacts#v1.9.0:
         download: "maze_output/metrics.csv"
     agents:
-      queue: macos-15
+      queue: "macos-15"
     commands:
-      - bundle install
-      - bundle exec benchmarks-to-datadog --csv-file maze_output/metrics.csv
+      - "bundle install"
+      - "bundle exec benchmarks-to-datadog --csv-file maze_output/metrics.csv"

.buildkite/pipeline.yml

@@ -1,79 +1,79 @@
 agents:
-  queue: opensource
+  queue: "opensource"
 
 steps:
 
-  - label: ':android: Coding standards checks'
+  - label: ":android: Coding standards checks"
     timeout_in_minutes: 20
     agents:
-      queue: macos-15
+      queue: "macos-15"
     env:
-      JAVA_VERSION: '17'
-    command: './gradlew --continue license detekt lint ktlintCheck'
+      JAVA_VERSION: "17"
+    command: "./gradlew --continue license detekt lint ktlintCheck"
 
-  - label: ':android: Binary compatibility checks'
+  - label: ":android: Binary compatibility checks"
     timeout_in_minutes: 20
     agents:
-      queue: macos-15
+      queue: "macos-15"
     env:
-      JAVA_VERSION: '17'
-    command: './gradlew apiCheck'
+      JAVA_VERSION: "17"
+    command: "./gradlew apiCheck"
 
-  - label: ':android: JVM tests'
+  - label: ":android: JVM tests"
     timeout_in_minutes: 10
     agents:
-      queue: macos-15
+      queue: "macos-15"
     env:
-      JAVA_VERSION: '17'
-    command: './gradlew test'
+      JAVA_VERSION: "17"
+    command: "./gradlew test"
     plugins:
       artifacts#v1.9.0:
         upload: "bugsnag-android-performance/build/reports/tests/"
-        compressed: bugsnag-android-performance-test-reports.tgz
+        compressed: "bugsnag-android-performance-test-reports.tgz"
 
-  - label: ':android: Lint test scenarios'
+  - label: ":android: Lint test scenarios"
     timeout_in_minutes: 10
     agents:
-      queue: macos-15
+      queue: "macos-15"
     env:
-      JAVA_VERSION: '17'
+      JAVA_VERSION: "17"
     commands:
-      - cd features/fixtures/mazeracer
-      - ./gradlew ktlintCheck detekt
+      - "cd features/fixtures/mazeracer"
+      - "./gradlew ktlintCheck detekt"
 
-  - label: ':android: Android size reporting'
+  - label: ":android: Android size reporting"
     timeout_in_minutes: 10
     agents:
-      queue: macos-15
+      queue: "macos-15"
     env:
-      JAVA_VERSION: '17'
-    command: scripts/run-sizer.sh
+      JAVA_VERSION: "17"
+    command: "scripts/run-sizer.sh"
 
-  - label: ':android: Build Example App'
+  - label: ":android: Build Example App"
     timeout_in_minutes: 10
     agents:
-      queue: macos-15
-    command: 'make example-app'
+      queue: "macos-15"
+    command: "make example-app"
     env:
-      JAVA_VERSION: 17
+      JAVA_VERSION: "17"
 
-  - label: ':android: Build and upload test fixture'
-    key: 'fixture'
+  - label: ":android: Build and upload test fixture"
+    key: "fixture"
     timeout_in_minutes: 30
     agents:
-      queue: macos-15
+      queue: "macos-15"
     env:
-      JAVA_VERSION: '17'
+      JAVA_VERSION: "17"
     artifact_paths:
       - "build/fixture_url.txt"
       - "build/fixture_bs_url.txt"
     commands:
-      - make test-fixture
-      - bundle install
-      - bundle exec upload-app --farm=bb --app=./build/test-fixture.apk --app-id-file=build/fixture_url.txt
-      - bundle exec upload-app --farm=bs --app=./build/test-fixture.apk --app-id-file=build/fixture_bs_url.txt
+      - "make test-fixture"
+      - "bundle install"
+      - "bundle exec upload-app --farm=bb --app=./build/test-fixture.apk --app-id-file=build/fixture_url.txt"
+      - "bundle exec upload-app --farm=bs --app=./build/test-fixture.apk --app-id-file=build/fixture_bs_url.txt"
 
-  - label: ':bitbar: {{matrix}} tests'
+  - label: ":bitbar: {{matrix}} tests"
     depends_on: "fixture"
     timeout_in_minutes: 60
     matrix:
@@ -92,8 +92,8 @@ steps:
           - "maze_output/failed/**/*"
           - "maze_output/maze_output.zip"
       docker-compose#v4.8.0:
-        pull: android-maze-runner
-        run: android-maze-runner
+        pull: "android-maze-runner"
+        run: "android-maze-runner"
         service-ports: true
         command:
           - "features/full_tests"
@@ -111,61 +111,61 @@ steps:
         format: "junit"
         branch: "^main|next$$"
     concurrency: 25
-    concurrency_group: 'bitbar'
-    concurrency_method: eager
+    concurrency_group: "bitbar"
+    concurrency_method: "eager"
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
           limit: 2
         - exit_status: 103  # Appium session failed
           limit: 2
 
-  # If this is the 'main' branch activate a manual publishing step
+  # If this is the "main" branch activate a manual publishing step
 
-  - block: 'Trigger package publish'
+  - block: "Trigger package publish"
     if: build.branch == "main"
-    key: trigger-publish
-    blocked_state: passed
+    key: "trigger-publish"
+    blocked_state: "passed"
 
-  - label: ':docker: Build Android base image'
+  - label: ":docker: Build Android base image"
     if: build.branch == "main"
-    key: 'android-common'
+    key: "android-common"
     timeout_in_minutes: 30
-    depends_on: 'trigger-publish'
+    depends_on: "trigger-publish"
     plugins:
       - docker-compose#v4.7.0:
           build:
-            - android-common
-          image-repository: 855461928731.dkr.ecr.us-west-1.amazonaws.com/android
+            - "android-common"
+          image-repository: "855461928731.dkr.ecr.us-west-1.amazonaws.com/android"
           cache-from:
-            - android-common:855461928731.dkr.ecr.us-west-1.amazonaws.com/android:performance-release
+            - "android-common:855461928731.dkr.ecr.us-west-1.amazonaws.com/android:performance-release"
           push:
-            - android-common:855461928731.dkr.ecr.us-west-1.amazonaws.com/android:performance-release
+            - "android-common:855461928731.dkr.ecr.us-west-1.amazonaws.com/android:performance-release"
 
-  - label: 'Publish :rocket:'
+  - label: "Publish :rocket:"
     if: build.branch == "main"
-    depends_on: 'android-common'
+    depends_on: "android-common"
     timeout_in_minutes: 30
     env:
-      BUILDKITE_PLUGIN_S3_SECRETS_BUCKET_PREFIX: bugsnag-android-publish
+      BUILDKITE_PLUGIN_S3_SECRETS_BUCKET_PREFIX: "bugsnag-android-publish"
       RELEASING: "true"
     plugins:
       artifacts#v1.9.0:
         upload:
-          - bugsnag-android-performance/build/outputs/aar/bugsnag-android-performance-release.aar
-          - bugsnag-android-performance-api/build/outputs/aar/bugsnag-android-performance-api-release.aar
-          - bugsnag-android-performance-appcompat/build/outputs/aar/bugsnag-android-performance-appcompat-release.aar
-          - bugsnag-android-performance-compose/build/outputs/aar/bugsnag-android-performance-compose-release.aar
-          - bugsnag-android-performance-coroutines/build/outputs/aar/bugsnag-android-performance-coroutines-release.aar
-          - bugsnag-android-performance-impl/build/outputs/aar/bugsnag-android-performance-impl-release.aar
-          - bugsnag-android-performance-okhttp/build/outputs/aar/bugsnag-android-performance-okhttp-release.aar
-          - bugsnag-plugin-android-performance-named-spans/build/outputs/aar/bugsnag-plugin-android-performance-named-spans-release.aar
+          - "bugsnag-android-performance/build/outputs/aar/bugsnag-android-performance-release.aar"
+          - "bugsnag-android-performance-api/build/outputs/aar/bugsnag-android-performance-api-release.aar"
+          - "bugsnag-android-performance-appcompat/build/outputs/aar/bugsnag-android-performance-appcompat-release.aar"
+          - "bugsnag-android-performance-compose/build/outputs/aar/bugsnag-android-performance-compose-release.aar"
+          - "bugsnag-android-performance-coroutines/build/outputs/aar/bugsnag-android-performance-coroutines-release.aar"
+          - "bugsnag-android-performance-impl/build/outputs/aar/bugsnag-android-performance-impl-release.aar"
+          - "bugsnag-android-performance-okhttp/build/outputs/aar/bugsnag-android-performance-okhttp-release.aar"
+          - "bugsnag-plugin-android-performance-named-spans/build/outputs/aar/bugsnag-plugin-android-performance-named-spans-release.aar"
       docker-compose#v4.7.0:
-        no-cache: true
-        run: android-publisher
+        no-cache: "true"
+        run: "android-publisher"
 
-  - label: 'Conditionally include other pipelines'
+  - label: "Conditionally include other pipelines"
     agents:
-      queue: macos
-    command: sh -c .buildkite/pipeline_trigger.sh
+      queue: "macos"
+    command: "sh -c .buildkite/pipeline_trigger.sh"
     timeout_in_minutes: 10

CHANGELOG.md

@@ -5,6 +5,11 @@
 * System metrics are now reported for first-class `ViewLoad` spans
   [#475](https://github.com/bugsnag/bugsnag-android-performance/pull/475)
 
+### Bug fixes
+
+* Fixed an issue where `onSpanEnd` callbacks were not invoked for sampled spans
+  [#486](https://github.com/bugsnag/bugsnag-android-performance/pull/486)
+
 ## 2.1.1 (2025-11-20)
 
 ### Bug fixes

bugsnag-android-performance-impl/src/main/kotlin/com/bugsnag/android/performance/internal/processing/Tracer.kt

@@ -55,7 +55,7 @@ public class Tracer(
     override fun onEnd(span: Span) {
         if (span !is SpanImpl) return
 
-        if (sampler.shouldKeepSpan(span) && callbacksKeepSpan(span)) {
+        if (callbacksKeepSpan(span) && sampler.shouldKeepSpan(span)) {
             span.isSealed = true
             val batchSize = addToBatch(span)
             if (batchSize >= InternalDebug.spanBatchSizeSendTriggerPoint) {

features/full_tests/correlation.feature

@@ -6,8 +6,6 @@ Scenario: Errors notified within a span include the correlation data
   And I wait to receive an error
 
   * a span field "kind" equals 1
-  * a span field "startTimeUnixNano" matches the regex "^[0-9]+$"
-  * a span field "endTimeUnixNano" matches the regex "^[0-9]+$"
 
   # Check the error correlation with the span
   * the event "correlation.traceId" is not null

features/full_tests/device_metrics.feature

@@ -2,7 +2,11 @@ Feature: Device Metrics
 
   Scenario: CPU & Memory Test
     When I run "DeviceMetricsScenario" configured as "all"
-    * I wait to receive a trace
+    * I wait to receive a span named "FirstClass"
+    * I wait to receive a span named "No Metrics"
+    * I wait to receive a span named "Not FirstClass"
+    * I wait to receive a span named "CPU Metrics Only"
+    * I wait to receive a span named "Memory Metrics Only"
 
     # Check CPU Metrics on first class spans
     * the "FirstClass" span has double attribute named "bugsnag.system.cpu_mean_total"
@@ -101,7 +105,11 @@ Feature: Device Metrics
 
   Scenario: Configured for CPU Metrics only
     When I run "DeviceMetricsScenario" configured as "cpu"
-    * I wait to receive a trace
+    * I wait to receive a span named "FirstClass"
+    * I wait to receive a span named "No Metrics"
+    * I wait to receive a span named "Not FirstClass"
+    * I wait to receive a span named "CPU Metrics Only"
+    * I wait to receive a span named "Memory Metrics Only"
 
     # Check CPU Metrics on first class spans
     * the "FirstClass" span has double attribute named "bugsnag.system.cpu_mean_total"
@@ -198,7 +206,11 @@ Feature: Device Metrics
 
   Scenario: Configured for Memory Metrics only
     When I run "DeviceMetricsScenario" configured as "memory"
-    * I wait to receive a trace
+    * I wait to receive a span named "FirstClass"
+    * I wait to receive a span named "No Metrics"
+    * I wait to receive a span named "Not FirstClass"
+    * I wait to receive a span named "CPU Metrics Only"
+    * I wait to receive a span named "Memory Metrics Only"
 
     # Check there are no CPU Metrics on first class spans
     * the "FirstClass" span has no "bugsnag.system.cpu_mean_total" attribute

features/full_tests/frame_metrics.feature

@@ -2,10 +2,8 @@ Feature: Rendering / Frame Metrics
 
 Scenario: Slow & Frozen Frames are reported
   When I run "FrameMetricsScenario"
-  * I wait to receive a trace
-
-  * a span name equals "Slow Animation"
-  * a span name equals "FrozenFrame"
+  * I wait to receive a span named "Slow Animation"
+  * I wait to receive a span named "FrozenFrame"
 
   # The FrozenFrame span should be a child of Slow Animation
   * a span named "FrozenFrame" has a parent named "Slow Animation"
@@ -16,9 +14,7 @@ Scenario: Slow & Frozen Frames are reported
 
 Scenario: Rending Instrumentation can be turned off
   When I run "FrameMetricsScenario" configured as "disableInstrumentation"
-  * I wait to receive a trace
-
-  * a span name equals "Slow Animation"
+  * I wait to receive a span named "Slow Animation"
 
   * the "Slow Animation" span has no "bugsnag.rendering.slow_frames" attribute
   * the "Slow Animation" span has no "bugsnag.rendering.frozen_frames" attribute