[pr-shepherd] Merge origin/main into feat/android-binder-tracing

Keep both Unreleased changelog entries after #6301 merged.

Author: sentry-junior[bot]

.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
           fetch-depth: 0
           submodules: 'recursive'
       - name: Prepare release
-        uses: getsentry/craft@7a7857552e2cdc08b502de96e6076849c01fba32 # v2.35.0
+        uses: getsentry/craft@0ff75896d43285ca376c7254e8143bac23acd429 # v2.35.1
         env:
           GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with:

.github/workflows/spring-boot-2-matrix.yml

@@ -87,6 +87,9 @@ jobs:
             :sentry-samples:sentry-samples-spring:testClasses \
             :sentry-opentelemetry:sentry-opentelemetry-agent:assemble
 
+      - name: Test sentry-spring-boot integration suite
+        run: ./gradlew :sentry-spring-boot:integrationTest
+
       - name: Test sentry-samples-spring-boot
         run: |
           python3 test/system-test-runner.py test \

.github/workflows/spring-boot-3-matrix.yml

@@ -71,8 +71,6 @@ jobs:
       - name: Build sample artifacts
         run: |
           ./gradlew \
-            :sentry-samples:sentry-samples-spring-boot-jakarta:bootJar \
-            :sentry-samples:sentry-samples-spring-boot-jakarta:testClasses \
             :sentry-samples:sentry-samples-spring-boot-webflux-jakarta:bootJar \
             :sentry-samples:sentry-samples-spring-boot-webflux-jakarta:testClasses \
             :sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry:bootJar \
@@ -83,12 +81,11 @@ jobs:
             :sentry-samples:sentry-samples-spring-jakarta:testClasses \
             :sentry-opentelemetry:sentry-opentelemetry-agent:assemble
 
-      - name: Test sentry-samples-spring-boot-jakarta
+      - name: Test sentry-spring-boot-jakarta integration suites
         run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring-boot-jakarta" \
-            --agent false \
-            --auto-init "true"
+          ./gradlew \
+            :sentry-spring-boot-jakarta:integrationTest \
+            :sentry-spring-boot-jakarta:integrationTestOtelAgent
 
       - name: Test sentry-samples-spring-boot-webflux-jakarta
         run: |

.github/workflows/spring-boot-4-matrix.yml

@@ -71,8 +71,6 @@ jobs:
       - name: Build sample artifacts
         run: |
           ./gradlew \
-            :sentry-samples:sentry-samples-spring-boot-4:bootJar \
-            :sentry-samples:sentry-samples-spring-boot-4:testClasses \
             :sentry-samples:sentry-samples-spring-boot-4-webflux:bootJar \
             :sentry-samples:sentry-samples-spring-boot-4-webflux:testClasses \
             :sentry-samples:sentry-samples-spring-boot-4-opentelemetry:bootJar \
@@ -83,12 +81,8 @@ jobs:
             :sentry-samples:sentry-samples-spring-7:testClasses \
             :sentry-opentelemetry:sentry-opentelemetry-agent:assemble
 
-      - name: Run sentry-samples-spring-boot-4
-        run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring-boot-4" \
-            --agent false \
-            --auto-init "true"
+      - name: Test sentry-spring-boot-4 integration suite
+        run: ./gradlew :sentry-spring-boot-4:integrationTest
 
       - name: Run sentry-samples-spring-boot-4-webflux
         run: |

.github/workflows/system-tests-backend.yml

@@ -24,13 +24,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sample: [ "sentry-samples-spring-boot-jakarta" ]
+        sample: [ "sentry-samples-spring-boot" ]
         agent: [ "false" ]
         agent-auto-init: [ "true" ]
         include:
-          - sample: "sentry-samples-spring-boot"
-            agent: "false"
-            agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-opentelemetry-noagent"
             agent: "false"
             agent-auto-init: "true"
@@ -64,18 +61,12 @@ jobs:
           - sample: "sentry-samples-console-otlp"
             agent: "false"
             agent-auto-init: "true"
-          - sample: "sentry-samples-logback"
-            agent: "false"
-            agent-auto-init: "true"
           - sample: "sentry-samples-log4j2"
             agent: "false"
             agent-auto-init: "true"
           - sample: "sentry-samples-jul"
             agent: "false"
             agent-auto-init: "true"
-          - sample: "sentry-samples-spring-boot-4"
-            agent: "false"
-            agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-4-log4j2"
             agent: "false"
             agent-auto-init: "true"

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+### Improvements
+
+- Support Navigation 3 integration for multi-Activity and multi-Fragment applications, where each Activity or Fragment has its own `SentryNavEffect` ([#6305](https://github.com/getsentry/sentry-java/pull/6305))
+  - See the [Navigation for Android docs](https://docs.sentry.io/platforms/android/integrations/navigation/#supported-setups) for a detailed list of supported vs unsupported app setups.
+
 ### Features
 
 - Add opt-in binder (IPC) tracing and logging instrumentation for Android ([#5515](https://github.com/getsentry/sentry-java/pull/5515))
@@ -10,12 +15,22 @@
 
 ### Fixes
 
+- Always remove the first-draw listener after the first frame, even if no layout pass follows it ([#6152](https://github.com/getsentry/sentry-java/pull/6152))
+
+## 8.61.1
+
+### Fixes
+
+- Session Replay: Fix a native crash (`SIGABRT` on the RenderThread) when stopping a replay that uses the canvas screenshot strategy ([#6342](https://github.com/getsentry/sentry-java/pull/6342))
+- Session Replay: Keep the segment videos of a replay that stopped before the startup cleanup of previous replays ran ([#6343](https://github.com/getsentry/sentry-java/pull/6343))
 - Report the number of dropped spans in client reports when a batched span envelope item is discarded, instead of a quantity of 1 (e.g. for Flutter span streaming) ([#6265](https://github.com/getsentry/sentry-java/pull/6265))
+- Session Replay: Keep the flushed video and do not reuse its segment id when `stop()` is called right after `flush()` in buffer mode ([#6340](https://github.com/getsentry/sentry-java/pull/6340))
 - Keep sending events from Android 7.1.0 and older devices after Sentry changes its TLS certificate authority ([#6227](https://github.com/getsentry/sentry-java/pull/6227))
   - In February 2027, Sentry moves its TLS certificates from DigiCert to Let's Encrypt and Google Trust Services ([announcement](https://sentry.io/changelog/were-changing-our-tls-certificate-authority-in-february-2027)).
   - Android 7.1.0 (API 25) and older don't trust the Let's Encrypt root certificate (ISRG Root X1), so without this fix, the SDK on those devices can no longer send events to Sentry after the switch.
   - The SDK now bundles ISRG Root X1 and trusts it in addition to the device's root certificates on API 25 and lower. This only applies to the SDK's own uploads to Sentry SaaS (DSNs on `sentry.io`), not to self-hosted Sentry, not to any other connection your app makes, and not if you set your own `SentryOptions.setSslSocketFactory`.
   - Apps need to update to an SDK version with this fix to keep sending events from these devices.
+- Session Replay: Use a software canvas for video encoding on the Android Emulator to avoid a native crash in `eglDestroySurface` ([#6282](https://github.com/getsentry/sentry-java/pull/6282))
 
 ### Internal
 

build-logic/src/main/kotlin/io/sentry/gradle/ChildJvmTestArguments.kt

@@ -0,0 +1,30 @@
+package io.sentry.gradle
+
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.tasks.Classpath
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.process.CommandLineArgumentProvider
+
+/**
+ * Tells a test task's JVM where to find the built OpenTelemetry agent and the app to run with it.
+ *
+ * The test launches the app in a child JVM, so neither file is on the test classpath. Declaring
+ * them here makes them task inputs: the test reruns when either changes and depends on the tasks
+ * that build them.
+ */
+abstract class ChildJvmTestArguments : CommandLineArgumentProvider {
+  @get:InputFiles
+  @get:PathSensitive(PathSensitivity.NONE)
+  abstract val agentJar: ConfigurableFileCollection
+
+  @get:Classpath abstract val appClasspath: ConfigurableFileCollection
+
+  override fun asArguments(): List<String> = buildList {
+    add("-Dsentry.test.agentJar=${agentJar.singleFile.absolutePath}")
+    if (!appClasspath.isEmpty) {
+      add("-Dsentry.test.appClasspath=${appClasspath.asPath}")
+    }
+  }
+}

devenv/config.ini

@@ -2,15 +2,15 @@
 minimum_version = 1.22.1
 
 [uv]
-darwin_arm64 = https://github.com/astral-sh/uv/releases/download/0.8.2/uv-aarch64-apple-darwin.tar.gz
-darwin_arm64_sha256 = 954d24634d5f37fa26c7af75eb79893d11623fc81b4de4b82d60d1ade4bfca22
-darwin_x86_64 = https://github.com/astral-sh/uv/releases/download/0.8.2/uv-x86_64-apple-darwin.tar.gz
-darwin_x86_64_sha256 = ae755df53c8c2c1f3dfbee6e3d2e00be0dfbc9c9b4bdffdb040b96f43678b7ce
-linux_arm64 = https://github.com/astral-sh/uv/releases/download/0.8.2/uv-aarch64-unknown-linux-gnu.tar.gz
-linux_arm64_sha256 = 27da35ef54e9131c2e305de67dd59a07c19257882c6b1f3cf4d8d5fbb8eaf4ca
-linux_x86_64 = https://github.com/astral-sh/uv/releases/download/0.8.2/uv-x86_64-unknown-linux-gnu.tar.gz
-linux_x86_64_sha256 = 6dcb28a541868a455aefb2e8d4a1283dd6bf888605a2db710f0530cec888b0ad
+darwin_arm64 = https://github.com/astral-sh/uv/releases/download/0.13.4/uv-aarch64-apple-darwin.tar.gz
+darwin_arm64_sha256 = e0b1d4743ce64c55d9f0f4a444afa6b81125680070ee04e853fcd0f6c1ebf8f1
+darwin_x86_64 = https://github.com/astral-sh/uv/releases/download/0.13.4/uv-x86_64-apple-darwin.tar.gz
+darwin_x86_64_sha256 = 7be2dcd316122f4b3e5a0a7889f6248266c14425374e105ff7dc9779184603a6
+linux_arm64 = https://github.com/astral-sh/uv/releases/download/0.13.4/uv-aarch64-unknown-linux-gnu.tar.gz
+linux_arm64_sha256 = 1ae72b4718729e2ccc4f1ae2c6d1e531ca8467800e0546e9130b3886023a60ab
+linux_x86_64 = https://github.com/astral-sh/uv/releases/download/0.13.4/uv-x86_64-unknown-linux-gnu.tar.gz
+linux_x86_64_sha256 = 2b428396f12572d4429cf210ca234dd599a33b3af0958a4d5ed569d63e3f344f
 # used for autoupdate
 # NOTE: if using uv-build as a build backend, you'll have to make sure the versions match
-version = 0.8.2
+version = 0.13.4
 

gradle.properties

@@ -16,7 +16,7 @@ android.newDsl=false
 android.experimental.lint.version=9.4.0
 
 # Release information
-versionName=8.61.0
+versionName=8.61.1
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

gradle/libs.versions.toml

@@ -48,6 +48,7 @@ spotless = "8.8.0"
 springboot2 = "2.7.18"
 springboot3 = "3.5.0"
 springboot4 = "4.1.0"
+springKafka3 = "3.3.5"
 sqldelight = "2.3.2"
 
 # Android
@@ -110,11 +111,13 @@ androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.7.0" }
 androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version = "1.3.5" }
 androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "androidxLifecycle" }
 androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "androidxLifecycle" }
+androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version = "2.8.3" }
 androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidxNavigation" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }
 androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidxNavigation" }
 androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "androidxNavigation3" }
 androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "androidxNavigation3" }
+androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version = "1.1.0" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room2" }
 androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room2" }
 androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room2" }
@@ -219,8 +222,10 @@ springboot3-starter-jdbc = { module = "org.springframework.boot:spring-boot-star
 springboot3-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "springboot3" }
 springboot3-starter-cache = { module = "org.springframework.boot:spring-boot-starter-cache", version.ref = "springboot3" }
 spring-kafka2 = { module = "org.springframework.kafka:spring-kafka", version = "2.8.11" }
-spring-kafka3 = { module = "org.springframework.kafka:spring-kafka", version = "3.3.5" }
+spring-kafka3 = { module = "org.springframework.kafka:spring-kafka", version.ref = "springKafka3" }
+spring-kafka3-test = { module = "org.springframework.kafka:spring-kafka-test", version.ref = "springKafka3" }
 spring-kafka4 = { module = "org.springframework.kafka:spring-kafka" }
+spring-kafka4-test = { module = "org.springframework.kafka:spring-kafka-test" }
 kafka-clients = { module = "org.apache.kafka:kafka-clients", version = "3.8.1" }
 springboot4-otel = { module = "io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter", version.ref = "otelInstrumentation" }
 springboot4-resttestclient = { module = "org.springframework.boot:spring-boot-resttestclient", version.ref = "springboot4" }