From 0d55daff84dfc11b12517e47467387f4795c5bea Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Mon, 16 Nov 2026 15:09:43 +0100 Subject: [PATCH 1/9] collection: Servlet API compatibility From 98875ae10cc73c6b7c60a6f12ccff27e232e2bf8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Nov 2026 08:05:18 +0100 Subject: [PATCH 2/9] chore(deps): bump javax.servlet:javax.servlet-api from 3.1.0 to 4.0.1 (#6475) Bumps [javax.servlet:javax.servlet-api](https://github.com/javaee/servlet-spec) from 3.1.0 to 4.0.1. - [Commits](https://github.com/javaee/servlet-spec/compare/3.1.0...4.0.1) --- updated-dependencies: - dependency-name: javax.servlet:javax.servlet-api dependency-version: 4.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 88af43cd57..4fe8d3434c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -198,7 +198,7 @@ retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" } sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.17.6" } sentry-native-ndk-outproc = { module = "io.sentry:sentry-native-ndk-outproc", version = "1.0.0-beta.1" } -servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" } +servlet-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" } servlet4-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" } servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" } slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } From 48a933420b51d463547fd6fcb399979bf73dd270 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 17 Nov 2026 09:43:19 +0100 Subject: [PATCH 3/9] build(servlet): Keep Servlet 3.1 as compatibility floor Compile the javax servlet integrations against the minimum supported API. Exclude the intentionally pinned API from Dependabot while retaining the separate Servlet 4 alias for latest-runtime coverage. Co-Authored-By: Claude --- .github/dependabot.yml | 2 ++ gradle/libs.versions.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 93fc79f4a2..c2eaf195f6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,6 +17,8 @@ updates: ignore: - dependency-name: "org.springframework.boot*" - dependency-name: "io.opentelemetry*" + # Servlet 3.1 is the minimum supported API and must remain the production compile target. + - dependency-name: "javax.servlet:javax.servlet-api" # DGS 5+ needs Spring Boot 3; the sample is on Spring Boot 2. - dependency-name: "com.netflix.graphql.dgs*" commit-message: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4fe8d3434c..88af43cd57 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -198,7 +198,7 @@ retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" } sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.17.6" } sentry-native-ndk-outproc = { module = "io.sentry:sentry-native-ndk-outproc", version = "1.0.0-beta.1" } -servlet-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" } +servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" } servlet4-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" } servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" } slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } From 31f58edc3b3d2d638963bf1878c8cf31fab3b70c Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Thu, 19 Nov 2026 11:53:37 +0100 Subject: [PATCH 4/9] test(servlet): Test Servlet 3.1 and 4.0 runtimes (#6625) * test(servlet): Test Servlet 3.1 on Tomcat 8.5 Run sentry-servlet against the minimum supported servlet container while keeping Servlet 3.1 as the production compile target. Exercise the service-loaded initializer through a real HTTP request and verify that request context reaches Sentry. * test(servlet): Run integration test on Tomcat 9 Reuse the real-container servlet integration test with a Tomcat 9 and Servlet 4 runtime classpath. Keep the Tomcat 8.5 run as the minimum-runtime check and attach both runs to the verification lifecycle. * build(servlet): Use JVM test suites for Tomcat matrix Replace the hand-built Tomcat 9 test task with isolated JVM test suites. Run the shared servlet integration test with independent Tomcat 8.5 and Tomcat 9 dependency graphs and attach both suites to check. Co-Authored-By: Claude * build(servlet): Remove unused Truth dependency The servlet integration suites declare Truth directly, so the regular unit test configuration no longer needs it after moving the integration test. Co-Authored-By: Claude * build(deps): Share the Tomcat 9 version Reference one catalog version from the Tomcat 9 core, Catalina, and Jasper aliases so dependency updates keep the runtime components aligned. Co-Authored-By: Claude * test(servlet): Run Tomcat matrix in dedicated CI job Compile the servlet integration test once and execute it with separate Tomcat 8.5 and Tomcat 9 runtime targets. Move both targets out of the standard check lifecycle and run them in a dedicated CI job. Co-Authored-By: Claude * ci: Move integration tests to dedicated workflow Create a shared workflow for non-Spring Boot integration suites and move the servlet runtime matrix there instead of adding it to the main build workflow. Co-Authored-By: Claude * ci: Restrict integration test workflow permissions Limit the workflow token to read-only repository contents because the test, artifact, and step-summary operations do not require write access. Co-Authored-By: Claude --------- Co-authored-by: Claude --- .github/workflows/integration-tests.yml | 62 ++++++++++ gradle/libs.versions.toml | 7 +- sentry-servlet/build.gradle.kts | 46 ++++++++ .../servlet/SentryServletIntegrationTest.kt | 107 ++++++++++++++++++ 4 files changed, 220 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/integration-tests.yml create mode 100644 sentry-servlet/src/integrationTest/kotlin/io/sentry/servlet/SentryServletIntegrationTest.kt diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml new file mode 100644 index 0000000000..d9d75cab29 --- /dev/null +++ b/.github/workflows/integration-tests.yml @@ -0,0 +1,62 @@ +name: Integration Tests + +on: + push: + branches: + - main + pull_request: + +permissions: + contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + integration-tests: + name: Integration Tests + timeout-minutes: 30 + runs-on: ubuntu-latest + + steps: + - name: Checkout Repo + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + ref: ${{ github.event.pull_request.head.sha || github.sha }} + + - name: Setup Java Version + uses: actions/setup-java@77dd5b2ce225ea11469928ac317850245a74ae78 # v6.2.0 + with: + distribution: 'temurin' + java-version: '21' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1 + + - name: Run integration tests + # Spring Boot integration suites run in their version-matrix workflows. + run: | + ./gradlew \ + :sentry-servlet:integrationTest \ + :sentry-servlet:integrationTestTomcat9 + + - name: Upload test results + if: always() + uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7 + with: + name: test-results-integration-tests + path: | + **/build/reports/* + **/build/test-results/**/*.xml + + - name: Test Report + uses: phoenix-actions/test-reporting@7317eea6e13c47348dd0bb318669485157c518d6 # pin@v16 + if: always() + with: + name: JUnit Integration Tests + path: | + **/build/test-results/**/*.xml + reporter: java-junit + output-to: step-summary + fail-on-error: false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 88af43cd57..3938870ffb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -53,6 +53,7 @@ springboot4 = "4.1.0" springKafka2 = "2.8.11" springKafka3 = "3.3.5" sqldelight = "2.3.2" +tomcat9 = "9.0.108" vanniktechMavenPublish = "0.37.0" # Android @@ -266,8 +267,10 @@ gummy-bears-api21 = { module = "com.toasttab.android:gummy-bears-api-21", versio java8-signature = { module = "org.codehaus.mojo.signature:java18", version.ref = "java8Signature" } # tomcat libraries -tomcat-catalina = { module = "org.apache.tomcat:tomcat-catalina", version = "9.0.108" } -tomcat-embed-jasper = { module = "org.apache.tomcat.embed:tomcat-embed-jasper", version = "9.0.108" } +tomcat85-embed-core = { module = "org.apache.tomcat.embed:tomcat-embed-core", version = "8.5.100" } +tomcat9-embed-core = { module = "org.apache.tomcat.embed:tomcat-embed-core", version.ref = "tomcat9" } +tomcat-catalina = { module = "org.apache.tomcat:tomcat-catalina", version.ref = "tomcat9" } +tomcat-embed-jasper = { module = "org.apache.tomcat.embed:tomcat-embed-jasper", version.ref = "tomcat9" } tomcat-catalina-jakarta = { module = "org.apache.tomcat:tomcat-catalina", version = "11.0.22" } tomcat-embed-jasper-jakarta = { module = "org.apache.tomcat.embed:tomcat-embed-jasper", version = "11.0.22" } # The version comes from the Spring Boot BOM of whichever Spring line uses it. diff --git a/sentry-servlet/build.gradle.kts b/sentry-servlet/build.gradle.kts index 42549c1f09..4612ecef83 100644 --- a/sentry-servlet/build.gradle.kts +++ b/sentry-servlet/build.gradle.kts @@ -41,6 +41,52 @@ dependencies { testImplementation(libs.springboot.starter.web) } +val integrationTest = + testing.suites.register("integrationTest") { + useJUnit() + dependencies { + implementation(project()) + implementation(projects.sentryTestSupport) + implementation(libs.google.truth) + implementation(libs.kotlin.test.junit) + compileOnly(libs.tomcat85.embed.core) + runtimeOnly(libs.tomcat85.embed.core) + } + targets.named("integrationTest") { + testTask.configure { + description = "Runs the servlet integration test on Tomcat 8.5 and Servlet 3.1" + systemProperty("io.sentry.test.tomcat-version-prefix", "8.5.") + systemProperty("io.sentry.test.servlet-major-version", "3") + systemProperty("io.sentry.test.servlet-minor-version", "1") + } + } + } + +val integrationTestSourceSet = sourceSets["integrationTest"] +val integrationTestTomcat9RuntimeClasspath = + configurations.resolvable("integrationTestTomcat9RuntimeClasspath") { + extendsFrom(configurations[integrationTestSourceSet.implementationConfigurationName]) + attributes.addAllLater( + configurations[integrationTestSourceSet.runtimeClasspathConfigurationName].attributes, + ) + } + +dependencies { + add(integrationTestTomcat9RuntimeClasspath.name, libs.tomcat9.embed.core) +} + +integrationTest { + targets.register("integrationTestTomcat9") { + testTask.configure { + description = "Runs the servlet integration test on Tomcat 9 and Servlet 4" + classpath = integrationTestSourceSet.output + integrationTestTomcat9RuntimeClasspath.get() + systemProperty("io.sentry.test.tomcat-version-prefix", "9.0.") + systemProperty("io.sentry.test.servlet-major-version", "4") + systemProperty("io.sentry.test.servlet-minor-version", "0") + } + } +} + tasks.withType().configureEach { options.errorprone { check("NullAway", net.ltgt.gradle.errorprone.CheckSeverity.ERROR) diff --git a/sentry-servlet/src/integrationTest/kotlin/io/sentry/servlet/SentryServletIntegrationTest.kt b/sentry-servlet/src/integrationTest/kotlin/io/sentry/servlet/SentryServletIntegrationTest.kt new file mode 100644 index 0000000000..ec90cb46e9 --- /dev/null +++ b/sentry-servlet/src/integrationTest/kotlin/io/sentry/servlet/SentryServletIntegrationTest.kt @@ -0,0 +1,107 @@ +package io.sentry.servlet + +import com.google.common.truth.Truth.assertThat +import io.sentry.Sentry +import io.sentry.test.MockSentryServer +import io.sentry.test.event +import java.net.HttpURLConnection +import java.net.URI +import java.nio.file.Files +import java.util.ServiceLoader +import javax.servlet.ServletContainerInitializer +import javax.servlet.ServletContext +import javax.servlet.http.HttpServlet +import javax.servlet.http.HttpServletRequest +import javax.servlet.http.HttpServletResponse +import kotlin.test.AfterTest +import kotlin.test.BeforeTest +import kotlin.test.Test +import org.apache.catalina.startup.Tomcat +import org.apache.catalina.util.ServerInfo + +class SentryServletIntegrationTest { + private val servletMajorVersion = + System.getProperty("io.sentry.test.servlet-major-version", "3").toInt() + private val servletMinorVersion = + System.getProperty("io.sentry.test.servlet-minor-version", "1").toInt() + private val tomcatVersionPrefix = + System.getProperty("io.sentry.test.tomcat-version-prefix", "8.5.") + + private var server: MockSentryServer? = null + private var servletContext: ServletContext? = null + private var tomcat: Tomcat? = null + + @BeforeTest + fun setUp() { + val mockServer = MockSentryServer() + server = mockServer + Sentry.init { it.dsn = mockServer.dsn } + + tomcat = + Tomcat().apply { + setBaseDir(Files.createTempDirectory("tomcat").toString()) + setPort(0) + connector.setProperty("address", "127.0.0.1") + + val context = addContext("", Files.createTempDirectory("servlet-docbase").toString()) + context.effectiveMajorVersion = servletMajorVersion + context.effectiveMinorVersion = servletMinorVersion + context.parentClassLoader = javaClass.classLoader + Tomcat.addServlet(context, "capture", CaptureServlet()) + context.addServletMappingDecoded("/capture", "capture") + val initializer = + ServiceLoader.load(ServletContainerInitializer::class.java) + .filterIsInstance() + .single() + context.addServletContainerInitializer(initializer, emptySet()) + + start() + servletContext = context.servletContext + } + } + + @AfterTest + fun tearDown() { + Sentry.close() + tomcat?.stop() + tomcat?.destroy() + server?.close() + } + + @Test + fun `captures request data on supported servlet container`() { + assertThat(ServerInfo.getServerNumber()).startsWith(tomcatVersionPrefix) + assertThat(servletContext!!.effectiveMajorVersion).isEqualTo(servletMajorVersion) + assertThat(servletContext!!.effectiveMinorVersion).isEqualTo(servletMinorVersion) + + val port = tomcat!!.connector.localPort + val connection = + URI("http://127.0.0.1:$port/capture?customer=123").toURL().openConnection() + as HttpURLConnection + + try { + assertThat(connection.responseCode).isEqualTo(HttpServletResponse.SC_OK) + assertThat(connection.inputStream.bufferedReader().use { it.readText().trim() }) + .isEqualTo("captured") + } finally { + connection.disconnect() + } + + val event = server!!.awaitEnvelope { it.event()?.message?.formatted == MESSAGE }.event()!! + + assertThat(event.request?.method).isEqualTo("GET") + assertThat(event.request?.url).isEqualTo("http://127.0.0.1:$port/capture") + assertThat(event.request?.queryString).isEqualTo("customer=123") + } + + private class CaptureServlet : HttpServlet() { + override fun doGet(request: HttpServletRequest, response: HttpServletResponse) { + Sentry.captureMessage(MESSAGE) + response.writer.print("captured") + } + } + + private companion object { + const val MESSAGE = "captured from servlet integration test" + } +} From 97f84a7843a869d3ea227a773b9109a00dbe8afe Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Thu, 19 Nov 2026 12:33:46 +0100 Subject: [PATCH 5/9] build(deps): Share the Tomcat 11 version Restore Tomcat 11.0.27 after the collection branch merge and use one catalog version for Catalina and embedded Jasper so future updates keep them aligned. Co-Authored-By: Claude --- gradle/libs.versions.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0167d8786d..75c3ce9ca4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -54,6 +54,7 @@ springKafka2 = "2.8.11" springKafka3 = "3.3.5" sqldelight = "2.4.1" tomcat9 = "9.0.108" +tomcat11 = "11.0.27" vanniktechMavenPublish = "0.37.0" # Android @@ -271,8 +272,8 @@ tomcat85-embed-core = { module = "org.apache.tomcat.embed:tomcat-embed-core", ve tomcat9-embed-core = { module = "org.apache.tomcat.embed:tomcat-embed-core", version.ref = "tomcat9" } tomcat-catalina = { module = "org.apache.tomcat:tomcat-catalina", version.ref = "tomcat9" } tomcat-embed-jasper = { module = "org.apache.tomcat.embed:tomcat-embed-jasper", version.ref = "tomcat9" } -tomcat-catalina-jakarta = { module = "org.apache.tomcat:tomcat-catalina", version = "11.0.22" } -tomcat-embed-jasper-jakarta = { module = "org.apache.tomcat.embed:tomcat-embed-jasper", version = "11.0.22" } +tomcat-catalina-jakarta = { module = "org.apache.tomcat:tomcat-catalina", version.ref = "tomcat11" } +tomcat-embed-jasper-jakarta = { module = "org.apache.tomcat.embed:tomcat-embed-jasper", version.ref = "tomcat11" } # The version comes from the Spring Boot BOM of whichever Spring line uses it. tomcat-embed-core = { module = "org.apache.tomcat.embed:tomcat-embed-core" } From ee14ece251108a474e020e374a2d365093082454 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Fri, 20 Nov 2026 10:18:15 +0000 Subject: [PATCH 6/9] Revert "fix(replay): Support Compose 1.13 and mask Compose views that can't be traversed (#6626)" This reverts commit 7eda47030e927bff1a7097ab8666ad0e98aea769. Co-Authored-By: Nelson Osacky --- CHANGELOG.md | 1 - sentry-android-replay/build.gradle.kts | 25 ------ sentry-android-replay/detekt-baseline.xml | 2 +- .../viewhierarchy/ComposeViewHierarchyNode.kt | 24 +----- .../viewhierarchy/SentryLayoutNodeHelper.kt | 20 ++--- .../ComposeMaskingOptionsTest.kt | 76 ------------------- 6 files changed, 12 insertions(+), 136 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a01e88ce7c..cc8cb704eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,6 @@ ### Fixes -- Session Replay: Fix Compose masking for Jetpack Compose 1.13. If the SDK can't walk the Compose tree of a screen, it now masks the whole Compose view instead of recording it unmasked ([#6626](https://github.com/getsentry/sentry-java/pull/6626)) - Session Replay: Send Ktor client network request start and end times in milliseconds, so the requests line up with the replay ([#6619](https://github.com/getsentry/sentry-java/pull/6619)) - Nav3: Stop attributing errors and spans from an Activity or ViewPager2 page without a `SentryNavEffect` to the most recently visited Nav3 root ([#6483](https://github.com/getsentry/sentry-java/pull/6483)) - Android: Count deep sleep in breadcrumb, screenshot and view hierarchy debounce windows, so the first low-memory or battery breadcrumb after a long Doze is no longer dropped ([#6590](https://github.com/getsentry/sentry-java/pull/6590)) diff --git a/sentry-android-replay/build.gradle.kts b/sentry-android-replay/build.gradle.kts index d0d101d190..034268031b 100644 --- a/sentry-android-replay/build.gradle.kts +++ b/sentry-android-replay/build.gradle.kts @@ -1,5 +1,3 @@ -import com.android.build.api.variant.HasHostTestsBuilder -import com.android.build.api.variant.HostTestBuilder import io.gitlab.arturbosch.detekt.Detekt import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion @@ -18,10 +16,6 @@ plugins { id("io.sentry.robolectric") } -// Session Replay calls Compose internals, whose mangled JVM names change between Compose versions. -// Creating extra build types to run tests against the latest stable, and latest preview version. -val composeUiTestVersions = mapOf("composeUi112" to "1.12.1", "composeUi113" to "1.13.0-rc01") - android { compileSdk = libs.versions.compileSdk.get().toInt() compileSdkMinor = libs.versions.compileSdkMinor.get().toInt() @@ -43,12 +37,6 @@ android { buildTypes { getByName("debug") { consumerProguardFiles("proguard-rules.pro") } getByName("release") { consumerProguardFiles("proguard-rules.pro") } - composeUiTestVersions.keys.forEach { name -> - create(name) { - initWith(getByName("release")) - matchingFallbacks += "release" - } - } } // AGP 9 only generates unit tests for the testBuildType. The debug variant is @@ -85,9 +73,6 @@ android { androidComponents.beforeVariants { it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType) - if (it.buildType in composeUiTestVersions) { - (it as HasHostTestsBuilder).hostTests[HostTestBuilder.UNIT_TEST_TYPE]?.enable = true - } } } @@ -117,16 +102,6 @@ dependencies { testImplementation(libs.coil.compose) } -composeUiTestVersions.forEach { (buildType, version) -> - configurations - .matching { it.name == "${buildType}UnitTestRuntimeClasspath" } - .configureEach { - resolutionStrategy.eachDependency { - if (requested.group == "androidx.compose.ui") useVersion(version) - } - } -} - tasks.withType().configureEach { // Target version of the generated JVM bytecode. It is used for type resolution. jvmTarget = JavaVersion.VERSION_1_8.toString() diff --git a/sentry-android-replay/detekt-baseline.xml b/sentry-android-replay/detekt-baseline.xml index 289a639e26..8432d83f8d 100644 --- a/sentry-android-replay/detekt-baseline.xml +++ b/sentry-android-replay/detekt-baseline.xml @@ -116,7 +116,7 @@ ReturnCount:ReplayGestureConverter.kt$ReplayGestureConverter$fun convert( event: MotionEvent, recorderConfig: ScreenshotRecorderConfig, ): List<RRWebIncrementalSnapshotEvent>? ReturnCount:ReplayIntegration.kt$ReplayIntegration$override fun captureReplay(isTerminating: Boolean?): SentryId ReturnCount:ScreenshotRecorder.kt$ScreenshotRecorder$fun capture() - ReturnCount:SentryLayoutNodeHelper.kt$SentryLayoutNodeHelper$@JvmStatic @Suppress("UNCHECKED_CAST") fun getChildren(node: LayoutNode): List<LayoutNode> + ReturnCount:SentryLayoutNodeHelper.kt$SentryLayoutNodeHelper$@Suppress("UNCHECKED_CAST") fun getChildren(node: LayoutNode): List<LayoutNode> ReturnCount:SentryLayoutNodeHelper.kt$SentryLayoutNodeHelper$fun isTransparent(node: LayoutNode): Boolean ReturnCount:ViewHierarchyNode.kt$ViewHierarchyNode.Companion$@JvmStatic fun fromView( view: View, parent: ViewHierarchyNode?, distance: Int, options: SentryMaskingOptions, ): ViewHierarchyNode ReturnCount:ViewHierarchyNode.kt$ViewHierarchyNode.Companion$private fun View.shouldMask(options: SentryMaskingOptions): Boolean diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt index 9e4615ec36..2e40144e2d 100644 --- a/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt +++ b/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt @@ -285,8 +285,7 @@ internal object ComposeViewHierarchyNode { } try { - val rootNode = - (view as? Owner)?.root ?: error("${view::class.java.name} is not a Compose Owner") + val rootNode = (view as? Owner)?.root ?: return false rootNode.traverse(parent, isComposeRoot = true, options, logger) } catch (e: Throwable) { logger.log( @@ -301,28 +300,11 @@ internal object ComposeViewHierarchyNode { .trimIndent(), ) // fail fast in our own sample/UI-test apps (see SentryReplayDebug), so regressions surface - // as crashes instead of a fully masked Compose view + // as crashes instead of silently skipping the whole Compose subtree (i.e. not masking it) if (SentryReplayDebug.failFast) { throw e } - // We can't tell which parts of the Compose view are sensitive, so we mask all of it, - // regardless of the masking options - parent.children = - listOf( - GenericViewHierarchyNode( - x = parent.x, - y = parent.y, - width = parent.width, - height = parent.height, - elevation = parent.elevation, - distance = 0, - parent = parent, - shouldMask = true, - isImportantForContentCapture = true, - isVisible = parent.isVisible, - visibleRect = parent.visibleRect, - ), - ) + return false } return true diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/SentryLayoutNodeHelper.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/SentryLayoutNodeHelper.kt index abea6f7cb0..6cfe5ec6fc 100644 --- a/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/SentryLayoutNodeHelper.kt +++ b/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/SentryLayoutNodeHelper.kt @@ -18,13 +18,10 @@ import java.lang.reflect.Method * This class is not thread-safe, as Compose UI operations are expected to be performed on the main * thread. * - * The internal `children` and `outerCoordinator` aren't called directly, as Kotlin mangles their - * JVM names with a module suffix that changed between Compose versions (`$ui_release` before 1.10, - * `$ui` in 1.10 - 1.12, `$androidx_compose_ui_ui` since 1.13). Since Compose 1.8, LayoutNode - * implements `SemanticsInfo`, whose unmangled `childrenInfo` and `isTransparent()` call them from - * within the Compose version the app ships. For apps on Compose < 1.8 the direct call will throw - * [NoSuchMethodError] and we fall back to reflection-based accessors on the `$ui_release` names, - * that are resolved and cached on first use. + * Compiled against Compose >= 1.10 where the mangled names use the "ui" module suffix (e.g. + * getChildren$ui()). For apps still on Compose < 1.10 (where the suffix is "$ui_release"), the + * direct call will throw [NoSuchMethodError] and we fall back to reflection-based accessors that + * are resolved and cached on first use. */ internal object SentryLayoutNodeHelper { private class Fallback(val getChildren: Method?, val getOuterCoordinator: Method?) @@ -40,17 +37,16 @@ internal object SentryLayoutNodeHelper { } } - @JvmStatic @Suppress("UNCHECKED_CAST") fun getChildren(node: LayoutNode): List { when (useFallback) { - false -> return node.childrenInfo as List + false -> return node.children true -> { return getFallback().getChildren!!.invoke(node) as List } null -> { try { - return (node.childrenInfo as List).also { useFallback = false } + return node.children.also { useFallback = false } } catch (_: NoSuchMethodError) { useFallback = true return getFallback().getChildren!!.invoke(node) as List @@ -61,7 +57,7 @@ internal object SentryLayoutNodeHelper { fun isTransparent(node: LayoutNode): Boolean { when (useFallback) { - false -> return node.isTransparent() + false -> return node.outerCoordinator.isTransparent() true -> { val fb = getFallback() val coordinator = fb.getOuterCoordinator!!.invoke(node) as NodeCoordinator @@ -69,7 +65,7 @@ internal object SentryLayoutNodeHelper { } null -> { try { - return node.isTransparent().also { useFallback = false } + return node.outerCoordinator.isTransparent().also { useFallback = false } } catch (_: NoSuchMethodError) { useFallback = true val fb = getFallback() diff --git a/sentry-android-replay/src/test/java/io/sentry/android/replay/viewhierarchy/ComposeMaskingOptionsTest.kt b/sentry-android-replay/src/test/java/io/sentry/android/replay/viewhierarchy/ComposeMaskingOptionsTest.kt index f21a1bc1a1..607b81d888 100644 --- a/sentry-android-replay/src/test/java/io/sentry/android/replay/viewhierarchy/ComposeMaskingOptionsTest.kt +++ b/sentry-android-replay/src/test/java/io/sentry/android/replay/viewhierarchy/ComposeMaskingOptionsTest.kt @@ -3,15 +3,11 @@ package io.sentry.android.replay.viewhierarchy import android.app.Activity -import android.content.Context -import android.graphics.Bitmap -import android.graphics.Rect import android.net.Uri import android.os.Bundle import android.os.Looper import android.view.View import android.view.ViewGroup -import android.widget.FrameLayout import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.foundation.layout.Arrangement @@ -36,7 +32,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.test.ext.junit.runners.AndroidJUnit4 import coil.compose.AsyncImage -import com.google.common.truth.Truth.assertThat import io.sentry.NoOpLogger import io.sentry.SentryOptions import io.sentry.android.replay.maskAllImages @@ -44,7 +39,6 @@ import io.sentry.android.replay.maskAllText import io.sentry.android.replay.sentryReplayMask import io.sentry.android.replay.sentryReplayUnmask import io.sentry.android.replay.util.ComposeTextLayout -import io.sentry.android.replay.util.MaskRenderer import io.sentry.android.replay.util.traverse import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.GenericViewHierarchyNode import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.ImageViewHierarchyNode @@ -293,74 +287,6 @@ class ComposeMaskingOptionsTest { assertTrue(genericNodes.none { it.shouldMask }) } - @Test - fun `when walking the Compose tree throws a LinkageError, the whole Compose view is masked`() { - assertComposeViewFullyMaskedWhenGetChildrenThrows(NoSuchMethodError()) - } - - @Test - fun `when walking the Compose tree throws a RuntimeException, the whole Compose view is masked`() { - assertComposeViewFullyMaskedWhenGetChildrenThrows(IllegalStateException()) - } - - @Test - fun `when a Compose view has no Owner, the whole view is masked`() { - val activity = buildActivity(ComponentActivity::class.java).setup() - val composeView = AndroidComposeViewWithoutOwner(activity.get()) - activity.get().setContentView(composeView) - shadowOf(Looper.getMainLooper()).idle() - val options = - SentryOptions().apply { - sessionReplay.maskAllText = false - sessionReplay.maskAllImages = false - } - val composeViewNode = ViewHierarchyNode.fromView(composeView, null, 0, options.sessionReplay) - - val handled = - ComposeViewHierarchyNode.fromView( - composeView, - composeViewNode, - options.sessionReplay, - NoOpLogger.getInstance(), - ) - - assertTrue(handled) - assertThat(composeViewNode.renderMasks()).containsExactly(composeViewNode.visibleRect) - } - - private fun assertComposeViewFullyMaskedWhenGetChildrenThrows(error: Throwable) { - val activity = buildActivity(ComposeMaskingOptionsActivity::class.java).setup() - shadowOf(Looper.getMainLooper()).idle() - val options = - SentryOptions().apply { - sessionReplay.maskAllText = false - sessionReplay.maskAllImages = false - } - val composeView = assertNotNull(activity.get().window.decorView.lookupComposeView()) - val composeViewNode = ViewHierarchyNode.fromView(composeView, null, 0, options.sessionReplay) - - val handled = - Mockito.mockStatic(SentryLayoutNodeHelper.javaClass).use { - mock: MockedStatic -> - mock.`when` { SentryLayoutNodeHelper.getChildren(any()) }.thenThrow(error) - - ComposeViewHierarchyNode.fromView( - composeView, - composeViewNode, - options.sessionReplay, - NoOpLogger.getInstance(), - ) - } - - assertTrue(handled) - assertThat(composeViewNode.renderMasks()).containsExactly(composeViewNode.visibleRect) - } - - private fun ViewHierarchyNode.renderMasks(): List { - val bitmap = Bitmap.createBitmap(1000, 2000, Bitmap.Config.ARGB_8888) - return MaskRenderer().use { it.renderMasks(bitmap, this) } - } - private inline fun Activity.collectNodesOfType(options: SentryOptions): List { val root = window.decorView val viewHierarchy = ViewHierarchyNode.fromView(root, null, 0, options.sessionReplay) @@ -393,8 +319,6 @@ class ComposeMaskingOptionsTest { } } -private class AndroidComposeViewWithoutOwner(context: Context) : FrameLayout(context) - private class ComposeMaskingOptionsActivity : ComponentActivity() { companion object { var textModifierApplier: (() -> Modifier)? = null From 8d47ad1016c5e58649b918903eb16a371c082a64 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Fri, 20 Nov 2026 10:53:55 +0000 Subject: [PATCH 7/9] Reapply "fix(replay): Support Compose 1.13 and mask Compose views that can't be traversed (#6626)" This reverts commit ee14ece251108a474e020e374a2d365093082454. Co-Authored-By: Nelson Osacky --- CHANGELOG.md | 1 + sentry-android-replay/build.gradle.kts | 25 ++++++ sentry-android-replay/detekt-baseline.xml | 2 +- .../viewhierarchy/ComposeViewHierarchyNode.kt | 24 +++++- .../viewhierarchy/SentryLayoutNodeHelper.kt | 20 +++-- .../ComposeMaskingOptionsTest.kt | 76 +++++++++++++++++++ 6 files changed, 136 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc8cb704eb..a01e88ce7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ ### Fixes +- Session Replay: Fix Compose masking for Jetpack Compose 1.13. If the SDK can't walk the Compose tree of a screen, it now masks the whole Compose view instead of recording it unmasked ([#6626](https://github.com/getsentry/sentry-java/pull/6626)) - Session Replay: Send Ktor client network request start and end times in milliseconds, so the requests line up with the replay ([#6619](https://github.com/getsentry/sentry-java/pull/6619)) - Nav3: Stop attributing errors and spans from an Activity or ViewPager2 page without a `SentryNavEffect` to the most recently visited Nav3 root ([#6483](https://github.com/getsentry/sentry-java/pull/6483)) - Android: Count deep sleep in breadcrumb, screenshot and view hierarchy debounce windows, so the first low-memory or battery breadcrumb after a long Doze is no longer dropped ([#6590](https://github.com/getsentry/sentry-java/pull/6590)) diff --git a/sentry-android-replay/build.gradle.kts b/sentry-android-replay/build.gradle.kts index 034268031b..d0d101d190 100644 --- a/sentry-android-replay/build.gradle.kts +++ b/sentry-android-replay/build.gradle.kts @@ -1,3 +1,5 @@ +import com.android.build.api.variant.HasHostTestsBuilder +import com.android.build.api.variant.HostTestBuilder import io.gitlab.arturbosch.detekt.Detekt import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion @@ -16,6 +18,10 @@ plugins { id("io.sentry.robolectric") } +// Session Replay calls Compose internals, whose mangled JVM names change between Compose versions. +// Creating extra build types to run tests against the latest stable, and latest preview version. +val composeUiTestVersions = mapOf("composeUi112" to "1.12.1", "composeUi113" to "1.13.0-rc01") + android { compileSdk = libs.versions.compileSdk.get().toInt() compileSdkMinor = libs.versions.compileSdkMinor.get().toInt() @@ -37,6 +43,12 @@ android { buildTypes { getByName("debug") { consumerProguardFiles("proguard-rules.pro") } getByName("release") { consumerProguardFiles("proguard-rules.pro") } + composeUiTestVersions.keys.forEach { name -> + create(name) { + initWith(getByName("release")) + matchingFallbacks += "release" + } + } } // AGP 9 only generates unit tests for the testBuildType. The debug variant is @@ -73,6 +85,9 @@ android { androidComponents.beforeVariants { it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType) + if (it.buildType in composeUiTestVersions) { + (it as HasHostTestsBuilder).hostTests[HostTestBuilder.UNIT_TEST_TYPE]?.enable = true + } } } @@ -102,6 +117,16 @@ dependencies { testImplementation(libs.coil.compose) } +composeUiTestVersions.forEach { (buildType, version) -> + configurations + .matching { it.name == "${buildType}UnitTestRuntimeClasspath" } + .configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "androidx.compose.ui") useVersion(version) + } + } +} + tasks.withType().configureEach { // Target version of the generated JVM bytecode. It is used for type resolution. jvmTarget = JavaVersion.VERSION_1_8.toString() diff --git a/sentry-android-replay/detekt-baseline.xml b/sentry-android-replay/detekt-baseline.xml index 8432d83f8d..289a639e26 100644 --- a/sentry-android-replay/detekt-baseline.xml +++ b/sentry-android-replay/detekt-baseline.xml @@ -116,7 +116,7 @@ ReturnCount:ReplayGestureConverter.kt$ReplayGestureConverter$fun convert( event: MotionEvent, recorderConfig: ScreenshotRecorderConfig, ): List<RRWebIncrementalSnapshotEvent>? ReturnCount:ReplayIntegration.kt$ReplayIntegration$override fun captureReplay(isTerminating: Boolean?): SentryId ReturnCount:ScreenshotRecorder.kt$ScreenshotRecorder$fun capture() - ReturnCount:SentryLayoutNodeHelper.kt$SentryLayoutNodeHelper$@Suppress("UNCHECKED_CAST") fun getChildren(node: LayoutNode): List<LayoutNode> + ReturnCount:SentryLayoutNodeHelper.kt$SentryLayoutNodeHelper$@JvmStatic @Suppress("UNCHECKED_CAST") fun getChildren(node: LayoutNode): List<LayoutNode> ReturnCount:SentryLayoutNodeHelper.kt$SentryLayoutNodeHelper$fun isTransparent(node: LayoutNode): Boolean ReturnCount:ViewHierarchyNode.kt$ViewHierarchyNode.Companion$@JvmStatic fun fromView( view: View, parent: ViewHierarchyNode?, distance: Int, options: SentryMaskingOptions, ): ViewHierarchyNode ReturnCount:ViewHierarchyNode.kt$ViewHierarchyNode.Companion$private fun View.shouldMask(options: SentryMaskingOptions): Boolean diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt index 2e40144e2d..9e4615ec36 100644 --- a/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt +++ b/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt @@ -285,7 +285,8 @@ internal object ComposeViewHierarchyNode { } try { - val rootNode = (view as? Owner)?.root ?: return false + val rootNode = + (view as? Owner)?.root ?: error("${view::class.java.name} is not a Compose Owner") rootNode.traverse(parent, isComposeRoot = true, options, logger) } catch (e: Throwable) { logger.log( @@ -300,11 +301,28 @@ internal object ComposeViewHierarchyNode { .trimIndent(), ) // fail fast in our own sample/UI-test apps (see SentryReplayDebug), so regressions surface - // as crashes instead of silently skipping the whole Compose subtree (i.e. not masking it) + // as crashes instead of a fully masked Compose view if (SentryReplayDebug.failFast) { throw e } - return false + // We can't tell which parts of the Compose view are sensitive, so we mask all of it, + // regardless of the masking options + parent.children = + listOf( + GenericViewHierarchyNode( + x = parent.x, + y = parent.y, + width = parent.width, + height = parent.height, + elevation = parent.elevation, + distance = 0, + parent = parent, + shouldMask = true, + isImportantForContentCapture = true, + isVisible = parent.isVisible, + visibleRect = parent.visibleRect, + ), + ) } return true diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/SentryLayoutNodeHelper.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/SentryLayoutNodeHelper.kt index 6cfe5ec6fc..abea6f7cb0 100644 --- a/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/SentryLayoutNodeHelper.kt +++ b/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/SentryLayoutNodeHelper.kt @@ -18,10 +18,13 @@ import java.lang.reflect.Method * This class is not thread-safe, as Compose UI operations are expected to be performed on the main * thread. * - * Compiled against Compose >= 1.10 where the mangled names use the "ui" module suffix (e.g. - * getChildren$ui()). For apps still on Compose < 1.10 (where the suffix is "$ui_release"), the - * direct call will throw [NoSuchMethodError] and we fall back to reflection-based accessors that - * are resolved and cached on first use. + * The internal `children` and `outerCoordinator` aren't called directly, as Kotlin mangles their + * JVM names with a module suffix that changed between Compose versions (`$ui_release` before 1.10, + * `$ui` in 1.10 - 1.12, `$androidx_compose_ui_ui` since 1.13). Since Compose 1.8, LayoutNode + * implements `SemanticsInfo`, whose unmangled `childrenInfo` and `isTransparent()` call them from + * within the Compose version the app ships. For apps on Compose < 1.8 the direct call will throw + * [NoSuchMethodError] and we fall back to reflection-based accessors on the `$ui_release` names, + * that are resolved and cached on first use. */ internal object SentryLayoutNodeHelper { private class Fallback(val getChildren: Method?, val getOuterCoordinator: Method?) @@ -37,16 +40,17 @@ internal object SentryLayoutNodeHelper { } } + @JvmStatic @Suppress("UNCHECKED_CAST") fun getChildren(node: LayoutNode): List { when (useFallback) { - false -> return node.children + false -> return node.childrenInfo as List true -> { return getFallback().getChildren!!.invoke(node) as List } null -> { try { - return node.children.also { useFallback = false } + return (node.childrenInfo as List).also { useFallback = false } } catch (_: NoSuchMethodError) { useFallback = true return getFallback().getChildren!!.invoke(node) as List @@ -57,7 +61,7 @@ internal object SentryLayoutNodeHelper { fun isTransparent(node: LayoutNode): Boolean { when (useFallback) { - false -> return node.outerCoordinator.isTransparent() + false -> return node.isTransparent() true -> { val fb = getFallback() val coordinator = fb.getOuterCoordinator!!.invoke(node) as NodeCoordinator @@ -65,7 +69,7 @@ internal object SentryLayoutNodeHelper { } null -> { try { - return node.outerCoordinator.isTransparent().also { useFallback = false } + return node.isTransparent().also { useFallback = false } } catch (_: NoSuchMethodError) { useFallback = true val fb = getFallback() diff --git a/sentry-android-replay/src/test/java/io/sentry/android/replay/viewhierarchy/ComposeMaskingOptionsTest.kt b/sentry-android-replay/src/test/java/io/sentry/android/replay/viewhierarchy/ComposeMaskingOptionsTest.kt index 607b81d888..f21a1bc1a1 100644 --- a/sentry-android-replay/src/test/java/io/sentry/android/replay/viewhierarchy/ComposeMaskingOptionsTest.kt +++ b/sentry-android-replay/src/test/java/io/sentry/android/replay/viewhierarchy/ComposeMaskingOptionsTest.kt @@ -3,11 +3,15 @@ package io.sentry.android.replay.viewhierarchy import android.app.Activity +import android.content.Context +import android.graphics.Bitmap +import android.graphics.Rect import android.net.Uri import android.os.Bundle import android.os.Looper import android.view.View import android.view.ViewGroup +import android.widget.FrameLayout import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.foundation.layout.Arrangement @@ -32,6 +36,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.test.ext.junit.runners.AndroidJUnit4 import coil.compose.AsyncImage +import com.google.common.truth.Truth.assertThat import io.sentry.NoOpLogger import io.sentry.SentryOptions import io.sentry.android.replay.maskAllImages @@ -39,6 +44,7 @@ import io.sentry.android.replay.maskAllText import io.sentry.android.replay.sentryReplayMask import io.sentry.android.replay.sentryReplayUnmask import io.sentry.android.replay.util.ComposeTextLayout +import io.sentry.android.replay.util.MaskRenderer import io.sentry.android.replay.util.traverse import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.GenericViewHierarchyNode import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.ImageViewHierarchyNode @@ -287,6 +293,74 @@ class ComposeMaskingOptionsTest { assertTrue(genericNodes.none { it.shouldMask }) } + @Test + fun `when walking the Compose tree throws a LinkageError, the whole Compose view is masked`() { + assertComposeViewFullyMaskedWhenGetChildrenThrows(NoSuchMethodError()) + } + + @Test + fun `when walking the Compose tree throws a RuntimeException, the whole Compose view is masked`() { + assertComposeViewFullyMaskedWhenGetChildrenThrows(IllegalStateException()) + } + + @Test + fun `when a Compose view has no Owner, the whole view is masked`() { + val activity = buildActivity(ComponentActivity::class.java).setup() + val composeView = AndroidComposeViewWithoutOwner(activity.get()) + activity.get().setContentView(composeView) + shadowOf(Looper.getMainLooper()).idle() + val options = + SentryOptions().apply { + sessionReplay.maskAllText = false + sessionReplay.maskAllImages = false + } + val composeViewNode = ViewHierarchyNode.fromView(composeView, null, 0, options.sessionReplay) + + val handled = + ComposeViewHierarchyNode.fromView( + composeView, + composeViewNode, + options.sessionReplay, + NoOpLogger.getInstance(), + ) + + assertTrue(handled) + assertThat(composeViewNode.renderMasks()).containsExactly(composeViewNode.visibleRect) + } + + private fun assertComposeViewFullyMaskedWhenGetChildrenThrows(error: Throwable) { + val activity = buildActivity(ComposeMaskingOptionsActivity::class.java).setup() + shadowOf(Looper.getMainLooper()).idle() + val options = + SentryOptions().apply { + sessionReplay.maskAllText = false + sessionReplay.maskAllImages = false + } + val composeView = assertNotNull(activity.get().window.decorView.lookupComposeView()) + val composeViewNode = ViewHierarchyNode.fromView(composeView, null, 0, options.sessionReplay) + + val handled = + Mockito.mockStatic(SentryLayoutNodeHelper.javaClass).use { + mock: MockedStatic -> + mock.`when` { SentryLayoutNodeHelper.getChildren(any()) }.thenThrow(error) + + ComposeViewHierarchyNode.fromView( + composeView, + composeViewNode, + options.sessionReplay, + NoOpLogger.getInstance(), + ) + } + + assertTrue(handled) + assertThat(composeViewNode.renderMasks()).containsExactly(composeViewNode.visibleRect) + } + + private fun ViewHierarchyNode.renderMasks(): List { + val bitmap = Bitmap.createBitmap(1000, 2000, Bitmap.Config.ARGB_8888) + return MaskRenderer().use { it.renderMasks(bitmap, this) } + } + private inline fun Activity.collectNodesOfType(options: SentryOptions): List { val root = window.decorView val viewHierarchy = ViewHierarchyNode.fromView(root, null, 0, options.sessionReplay) @@ -319,6 +393,8 @@ class ComposeMaskingOptionsTest { } } +private class AndroidComposeViewWithoutOwner(context: Context) : FrameLayout(context) + private class ComposeMaskingOptionsActivity : ComponentActivity() { companion object { var textModifierApplier: (() -> Modifier)? = null From 1009bddf7859b2639b8931b40680be4a94e3531a Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Fri, 20 Nov 2026 10:53:55 +0000 Subject: [PATCH 8/9] build: Lower Gradle daemon heap to 7g and metaspace to 1g Co-Authored-By: Nelson Osacky --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 471871c1d4..b2a2fd5771 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Daemons heap size -org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC +org.gradle.jvmargs=-Xmx7g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC org.gradle.caching=true org.gradle.parallel=true org.gradle.configureondemand=true From d1f04b46751951adf81323182bb7186ba26c5fd7 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Fri, 20 Nov 2026 11:15:00 +0000 Subject: [PATCH 9/9] build: Restore 8g Gradle heap and cap Kotlin daemon heap at 3g Co-Authored-By: Nelson Osacky --- gradle.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b2a2fd5771..e96ff6fc5a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ # Daemons heap size -org.gradle.jvmargs=-Xmx7g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC +org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC +kotlin.daemon.jvmargs=-Xmx3g org.gradle.caching=true org.gradle.parallel=true org.gradle.configureondemand=true