Merge branch 'main' into dependabot/github_actions/getsentry/craft-2.21.2

romtsn · web-flow · commit 11ece9d0bc53 · 2026-02-11T18:25:47.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@
   - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0126)
   - [diff](https://github.com/getsentry/sentry-native/compare/0.12.4...0.12.6)
 
+### Internal
+
+- Add integration to track session replay custom masking ([#5070](https://github.com/getsentry/sentry-java/pull/5070))
+
 ## 8.32.0
 
 ### Features
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
@@ -85,10 +85,12 @@ internal object ComposeViewHierarchyNode {
   ): Boolean {
     val sentryPrivacyModifier = this?.getOrNull(SentryReplayModifiers.SentryPrivacy)
     if (sentryPrivacyModifier == "unmask") {
+      options.sessionReplay.trackCustomMasking()
       return false
     }
 
     if (sentryPrivacyModifier == "mask") {
+      options.sessionReplay.trackCustomMasking()
       return true
     }
 
diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ViewHierarchyNode.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ViewHierarchyNode.kt
@@ -291,13 +291,15 @@ internal sealed class ViewHierarchyNode(
         (tag as? String)?.lowercase()?.contains(SENTRY_UNMASK_TAG) == true ||
           getTag(R.id.sentry_privacy) == "unmask"
       ) {
+        options.sessionReplay.trackCustomMasking()
         return false
       }
 
       if (
         (tag as? String)?.lowercase()?.contains(SENTRY_MASK_TAG) == true ||
           getTag(R.id.sentry_privacy) == "mask"
       ) {
+        options.sessionReplay.trackCustomMasking()
         return true
       }
 
diff --git a/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml b/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml
@@ -256,5 +256,8 @@
     <meta-data 
       android:name="io.sentry.spotlight.enable"
       android:value="true" />
+    <meta-data 
+      android:name="io.sentry.tombstone.enable"
+      android:value="true" />
   </application>
 </manifest>
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
@@ -3953,6 +3953,7 @@ public final class io/sentry/SentryReplayOptions {
 	public fun setSessionSampleRate (Ljava/lang/Double;)V
 	public fun setTrackConfiguration (Z)V
 	public fun setUnmaskViewContainerClass (Ljava/lang/String;)V
+	public fun trackCustomMasking ()V
 }
 
 public final class io/sentry/SentryReplayOptions$SentryReplayQuality : java/lang/Enum {
diff --git a/sentry/src/main/java/io/sentry/SentryReplayOptions.java b/sentry/src/main/java/io/sentry/SentryReplayOptions.java
@@ -1,5 +1,7 @@
 package io.sentry;
 
+import static io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion;
+
 import io.sentry.protocol.SdkVersion;
 import io.sentry.util.SampleRateUtils;
 import java.util.ArrayList;
@@ -16,6 +18,9 @@
 
 public final class SentryReplayOptions {
 
+  private static final String CUSTOM_MASKING_INTEGRATION_NAME = "ReplayCustomMasking";
+  private volatile boolean customMaskingTracked = false;
+
   public static final String TEXT_VIEW_CLASS_NAME = "android.widget.TextView";
   public static final String IMAGE_VIEW_CLASS_NAME = "android.widget.ImageView";
   public static final String WEB_VIEW_CLASS_NAME = "android.webkit.WebView";
@@ -209,8 +214,9 @@ public enum SentryReplayQuality {
 
   public SentryReplayOptions(final boolean empty, final @Nullable SdkVersion sdkVersion) {
     if (!empty) {
-      setMaskAllText(true);
-      setMaskAllImages(true);
+      // Add default mask classes directly without setting usingCustomMasking flag
+      maskViewClasses.add(TEXT_VIEW_CLASS_NAME);
+      maskViewClasses.add(IMAGE_VIEW_CLASS_NAME);
       maskViewClasses.add(WEB_VIEW_CLASS_NAME);
       maskViewClasses.add(VIDEO_VIEW_CLASS_NAME);
       maskViewClasses.add(ANDROIDX_MEDIA_VIEW_CLASS_NAME);
@@ -276,10 +282,11 @@ public void setSessionSampleRate(final @Nullable Double sessionSampleRate) {
    */
   public void setMaskAllText(final boolean maskAllText) {
     if (maskAllText) {
-      addMaskViewClass(TEXT_VIEW_CLASS_NAME);
+      maskViewClasses.add(TEXT_VIEW_CLASS_NAME);
       unmaskViewClasses.remove(TEXT_VIEW_CLASS_NAME);
     } else {
-      addUnmaskViewClass(TEXT_VIEW_CLASS_NAME);
+      trackCustomMasking();
+      unmaskViewClasses.add(TEXT_VIEW_CLASS_NAME);
       maskViewClasses.remove(TEXT_VIEW_CLASS_NAME);
     }
   }
@@ -294,10 +301,11 @@ public void setMaskAllText(final boolean maskAllText) {
    */
   public void setMaskAllImages(final boolean maskAllImages) {
     if (maskAllImages) {
-      addMaskViewClass(IMAGE_VIEW_CLASS_NAME);
+      maskViewClasses.add(IMAGE_VIEW_CLASS_NAME);
       unmaskViewClasses.remove(IMAGE_VIEW_CLASS_NAME);
     } else {
-      addUnmaskViewClass(IMAGE_VIEW_CLASS_NAME);
+      trackCustomMasking();
+      unmaskViewClasses.add(IMAGE_VIEW_CLASS_NAME);
       maskViewClasses.remove(IMAGE_VIEW_CLASS_NAME);
     }
   }
@@ -308,6 +316,7 @@ public Set<String> getMaskViewClasses() {
   }
 
   public void addMaskViewClass(final @NotNull String className) {
+    trackCustomMasking();
     this.maskViewClasses.add(className);
   }
 
@@ -317,6 +326,7 @@ public Set<String> getUnmaskViewClasses() {
   }
 
   public void addUnmaskViewClass(final @NotNull String className) {
+    trackCustomMasking();
     this.unmaskViewClasses.add(className);
   }
 
@@ -351,7 +361,7 @@ public long getSessionDuration() {
 
   @ApiStatus.Internal
   public void setMaskViewContainerClass(@NotNull String containerClass) {
-    addMaskViewClass(containerClass);
+    maskViewClasses.add(containerClass);
     maskViewContainerClass = containerClass;
   }
 
@@ -370,6 +380,14 @@ public void setUnmaskViewContainerClass(@NotNull String containerClass) {
     return unmaskViewContainerClass;
   }
 
+  @ApiStatus.Internal
+  public void trackCustomMasking() {
+    if (!customMaskingTracked) {
+      customMaskingTracked = true;
+      addIntegrationToSdkVersion(CUSTOM_MASKING_INTEGRATION_NAME);
+    }
+  }
+
   @ApiStatus.Internal
   public boolean isTrackConfiguration() {
     return trackConfiguration;
diff --git a/sentry/src/test/java/io/sentry/SentryReplayOptionsTest.kt b/sentry/src/test/java/io/sentry/SentryReplayOptionsTest.kt
@@ -1,10 +1,18 @@
 package io.sentry
 
+import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 class SentryReplayOptionsTest {
+
+  @BeforeTest
+  fun setup() {
+    SentryIntegrationPackageStorage.getInstance().clearStorage()
+  }
+
   @Test
   fun `uses medium quality as default`() {
     val replayOptions = SentryReplayOptions(true, null)
@@ -126,4 +134,88 @@ class SentryReplayOptionsTest {
     assertTrue(headers.contains("X-Response-Header"))
     assertTrue(headers.contains("X-Debug-Header"))
   }
+
+  // Custom Masking Integration Tests
+
+  private fun hasCustomMaskingIntegration(): Boolean {
+    return SentryIntegrationPackageStorage.getInstance()
+      .integrations
+      .contains("ReplayCustomMasking")
+  }
+
+  @Test
+  fun `default options does not add ReplayCustomMasking integration`() {
+    SentryReplayOptions(false, null)
+    assertFalse(hasCustomMaskingIntegration())
+  }
+
+  @Test
+  fun `empty options does not add ReplayCustomMasking integration`() {
+    SentryReplayOptions(true, null)
+    assertFalse(hasCustomMaskingIntegration())
+  }
+
+  @Test
+  fun `addUnmaskViewClass adds ReplayCustomMasking integration`() {
+    val options = SentryReplayOptions(false, null)
+    options.addUnmaskViewClass("com.example.MyTextView")
+    assertTrue(hasCustomMaskingIntegration())
+  }
+
+  @Test
+  fun `setMaskViewContainerClass does not add ReplayCustomMasking integration`() {
+    val options = SentryReplayOptions(false, null)
+    options.setMaskViewContainerClass("com.example.MyContainer")
+    assertFalse(hasCustomMaskingIntegration())
+  }
+
+  @Test
+  fun `setUnmaskViewContainerClass does not add ReplayCustomMasking integration`() {
+    val options = SentryReplayOptions(false, null)
+    options.setUnmaskViewContainerClass("com.example.MyContainer")
+    assertFalse(hasCustomMaskingIntegration())
+  }
+
+  @Test
+  fun `setMaskAllText true does not set custom integration`() {
+    val options = SentryReplayOptions(false, null)
+    options.setMaskAllText(true)
+    options.setMaskAllImages(true)
+    assertFalse(hasCustomMaskingIntegration())
+  }
+
+  @Test
+  fun `trackCustomMasking only adds integration once`() {
+    val options = SentryReplayOptions(false, null)
+    options.setMaskAllText(false)
+    options.setMaskAllImages(false)
+    assertTrue(hasCustomMaskingIntegration())
+    assertEquals(
+      1,
+      SentryIntegrationPackageStorage.getInstance().integrations.count {
+        it == "ReplayCustomMasking"
+      },
+    )
+  }
+
+  @Test
+  fun `addMaskViewClass adds ReplayCustomMasking integration`() {
+    val options = SentryReplayOptions(false, null)
+    options.addMaskViewClass("com.example.MySensitiveView")
+    assertTrue(hasCustomMaskingIntegration())
+  }
+
+  @Test
+  fun `setMaskAllText adds ReplayCustomMasking integration`() {
+    val options = SentryReplayOptions(false, null)
+    options.setMaskAllText(false)
+    assertTrue(hasCustomMaskingIntegration())
+  }
+
+  @Test
+  fun `setMaskAllImages adds ReplayCustomMasking integration`() {
+    val options = SentryReplayOptions(false, null)
+    options.setMaskAllImages(false)
+    assertTrue(hasCustomMaskingIntegration())
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,12 @@ internal object ComposeViewHierarchyNode {`
`85`	`85`	`): Boolean {`
`86`	`86`	`val sentryPrivacyModifier = this?.getOrNull(SentryReplayModifiers.SentryPrivacy)`
`87`	`87`	`if (sentryPrivacyModifier == "unmask") {`
	`88`	`+ options.sessionReplay.trackCustomMasking()`
`88`	`89`	`return false`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`if (sentryPrivacyModifier == "mask") {`
	`93`	`+ options.sessionReplay.trackCustomMasking()`
`92`	`94`	`return true`
`93`	`95`	`}`
`94`	`96`
Original file line number	Diff line number	Diff line change
`@@ -291,13 +291,15 @@ internal sealed class ViewHierarchyNode(`
`291`	`291`	`(tag as? String)?.lowercase()?.contains(SENTRY_UNMASK_TAG) == true \|\|`
`292`	`292`	`getTag(R.id.sentry_privacy) == "unmask"`
`293`	`293`	`) {`
	`294`	`+ options.sessionReplay.trackCustomMasking()`
`294`	`295`	`return false`
`295`	`296`	`}`
`296`	`297`
`297`	`298`	`if (`
`298`	`299`	`(tag as? String)?.lowercase()?.contains(SENTRY_MASK_TAG) == true \|\|`
`299`	`300`	`getTag(R.id.sentry_privacy) == "mask"`
`300`	`301`	`) {`
	`302`	`+ options.sessionReplay.trackCustomMasking()`
`301`	`303`	`return true`
`302`	`304`	`}`
`303`	`305`
Original file line number	Diff line number	Diff line change
`@@ -3953,6 +3953,7 @@ public final class io/sentry/SentryReplayOptions {`
`3953`	`3953`	`public fun setSessionSampleRate (Ljava/lang/Double;)V`
`3954`	`3954`	`public fun setTrackConfiguration (Z)V`
`3955`	`3955`	`public fun setUnmaskViewContainerClass (Ljava/lang/String;)V`
	`3956`	`+ public fun trackCustomMasking ()V`
`3956`	`3957`	`}`
`3957`	`3958`
`3958`	`3959`	`public final class io/sentry/SentryReplayOptions$SentryReplayQuality : java/lang/Enum {`