Merge branch 'main' into andrey/double-masking

* main:
  doc: Add using ldMask in readme. (#311)
  chore: release main (#312)
  feat: take transformed coordinates, which are more precise in animation  (#309)
  chore: release main (#307)
  fix(SEC-7530): update react-server-dom-webpack to 19.0.1 (#310)

# Conflicts:
#	sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
#	sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
#	sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
#	sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt

Author: abelonogov-ld

.release-please-manifest.json

@@ -1,7 +1,7 @@
 {
 	"go": "0.4.0",
 	"sdk/@launchdarkly/observability": "0.4.9",
-	"sdk/@launchdarkly/observability-android": "0.17.0",
+	"sdk/@launchdarkly/observability-android": "0.19.0",
 	"sdk/@launchdarkly/observability-dotnet": "0.3.0",
 	"sdk/@launchdarkly/observability-node": "0.3.1",
 	"sdk/@launchdarkly/observability-python": "0.1.1",

package.json

@@ -40,7 +40,8 @@
 		"typescript": "^5.8.3"
 	},
 	"resolutions": {
-		"ansi-color@^0.2.1": "patch:ansi-color@npm%3A0.2.1#./.yarn/patches/ansi-color-npm-0.2.1-f7243d10a4.patch"
+		"ansi-color@^0.2.1": "patch:ansi-color@npm%3A0.2.1#./.yarn/patches/ansi-color-npm-0.2.1-f7243d10a4.patch",
+		"react-server-dom-webpack": "19.0.1"
 	},
 	"packageManager": "[email protected]"
 }

sdk/@launchdarkly/observability-android/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.19.0](https://github.com/launchdarkly/observability-sdk/compare/launchdarkly-observability-android-0.18.0...launchdarkly-observability-android-0.19.0) (2025-12-04)
+
+
+### Features
+
+* take transformed coordinates, which are more precise in animation  ([#309](https://github.com/launchdarkly/observability-sdk/issues/309)) ([5d669d4](https://github.com/launchdarkly/observability-sdk/commit/5d669d49a7d412b4edce8e5f5bdc7728243bd2c3))
+
+## [0.18.0](https://github.com/launchdarkly/observability-sdk/compare/launchdarkly-observability-android-0.17.0...launchdarkly-observability-android-0.18.0) (2025-12-04)
+
+
+### Features
+
+* Android SR Do not send duplicate screens ([#304](https://github.com/launchdarkly/observability-sdk/issues/304)) ([f3369bc](https://github.com/launchdarkly/observability-sdk/commit/f3369bc87f7e1293c8bdabf592693b8365600312))
+* recursive mask collection ([#308](https://github.com/launchdarkly/observability-sdk/issues/308)) ([ee9f061](https://github.com/launchdarkly/observability-sdk/commit/ee9f0610d199378b368cd5a91aa259254b27511a))
+* support non-standard windows added by WindowManager ([#306](https://github.com/launchdarkly/observability-sdk/issues/306)) ([199374a](https://github.com/launchdarkly/observability-sdk/commit/199374a30c67da7d8151cbb65c8eb1a50545006c))
+
 ## [0.17.0](https://github.com/launchdarkly/observability-sdk/compare/launchdarkly-observability-android-0.16.0...launchdarkly-observability-android-0.17.0) (2025-11-26)
 
 

sdk/@launchdarkly/observability-android/README.md

@@ -167,7 +167,82 @@ span.makeCurrent().use {
 span.end()
 ```
 
+### Session Replay
 
+#### Masking sensitive UI
+
+Use `ldMask()` to mark views that should be masked in session replay. There are helpers for both XML-based Views and Jetpack Compose.
+
+##### XML Views
+
+Import the masking API and call `ldMask()` on any `View` (for example, after inflating the layout in an `Activity` or `Fragment`).
+
+```kotlin
+import android.os.Bundle
+import android.widget.EditText
+import androidx.appcompat.app.AppCompatActivity
+import com.launchdarkly.observability.api.ldMask
+
+class LoginActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_login)
+
+        val password = findViewById<EditText>(R.id.password)
+        password.ldMask() // mask this field in session replay
+    }
+}
+```
+
+With View Binding or Data Binding:
+
+```kotlin
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.launchdarkly.observability.api.ldMask
+
+class CheckoutFragment : Fragment(R.layout.fragment_checkout) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val binding = FragmentCheckoutBinding.bind(view)
+        binding.creditCardNumber.ldMask()
+        binding.cvv.ldMask()
+    }
+}
+```
+
+Optional: use `ldUnmask()` to explicitly clear masking on a view you previously masked.
+
+##### Jetpack Compose
+
+Add the masking `Modifier` to any composable you want masked in session replay.
+
+```kotlin
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import com.launchdarkly.observability.api.ldMask
+
+@Composable
+fun CreditCardField() {
+    var number by remember { mutableStateOf("") }
+    TextField(
+        value = number,
+        onValueChange = { number = it },
+        modifier = Modifier
+            .fillMaxWidth()
+            .ldMask() // mask this composable in session replay
+    )
+}
+```
+
+Optional: use `Modifier.ldUnmask()` to explicitly clear masking on a composable you previously masked.
+
+Notes:
+- Masking marks elements so their contents are obscured in recorded sessions.
+- You can apply masking to any `View` or composable where sensitive data may appear.
 
 ## Contributing
 

sdk/@launchdarkly/observability-android/gradle.properties

@@ -4,5 +4,5 @@
 android.useAndroidX=true
 
 #x-release-please-start-version
-version=0.17.0
+version=0.19.0
 #x-release-please-end

sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt

@@ -34,8 +34,6 @@ import kotlin.coroutines.resume
 import androidx.core.graphics.withTranslation
 import com.launchdarkly.observability.replay.masking.Mask
 import androidx.core.graphics.createBitmap
-import com.launchdarkly.observability.replay.masking.draw
-import java.util.Dictionary
 import kotlin.collections.mutableMapOf
 import kotlin.math.abs
 import kotlin.math.max
@@ -321,30 +319,42 @@ class CaptureSource(
      * @param canvas The canvas to mask
      * @param afterMasks areas that will be masked
      */
-//    private fun drawMasks(canvas: Canvas, captureResult: CaptureResult) {
-////        val path = Path()
-////        captureResult.beforeMasks.forEach { mask ->
-////            mask.draw(path, canvas, beforeMasksPaint)
-////        }
-////        captureResult.afterMasks.forEach { mask ->
-////            mask.draw(path, canvas, afterMaskPaint)
-////        }
-//    }
 
     private fun drawMasks(canvas: Canvas, beforeMasks: List<Mask>?, afterMasks: List<Mask>?) {
         if (afterMasks == null && beforeMasks == null) return
 
         val path = Path()
         beforeMasks?.forEach { mask ->
-            mask.draw(path, canvas, beforeMaskPaint)
+            drawMask(mask, path, canvas, beforeMaskPaint)
         }
         afterMasks?.forEach { mask ->
-            mask.draw(path, canvas, afterMaskPaint)
+            drawMask(mask, path, canvas, afterMaskPaint)
         }
     }
 
-    fun areMasksMapsStable(
+    private val maskIntRect = Rect()
+    private fun drawMask(mask: Mask, path: Path, canvas: Canvas, paint: Paint) {
+        if (mask.points != null) {
+            val pts = mask.points
+
+            path.reset()
+            path.moveTo(pts[0], pts[1])
+            path.lineTo(pts[2], pts[3])
+            path.lineTo(pts[4], pts[5])
+            path.lineTo(pts[6], pts[7])
+            path.close()
+
+            canvas.drawPath(path, paint)
+        } else {
+            maskIntRect.left = mask.rect.left.toInt()
+            maskIntRect.top = mask.rect.top.toInt()
+            maskIntRect.right = mask.rect.right.toInt()
+            maskIntRect.bottom =  mask.rect.bottom.toInt()
+            canvas.drawRect(maskIntRect, paint)
+        }
+    }
 
+    fun areMasksMapsStable(
         beforeMasksMap: Map<Int, List<Mask>>,
         afterMasksMap: Map<Int, List<Mask>>
     ): Map<Int, List<Mask>>? {

sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt

@@ -108,7 +108,7 @@ data class ComposeMaskTarget(
     }
 
     // return 4 points of polygon under transformations
-    fun points(context: MaskContext): FloatArray? {
+    private fun points(context: MaskContext): FloatArray? {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             return null
         }

sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt

@@ -1,14 +1,12 @@
 package com.launchdarkly.observability.replay.masking
-import android.graphics.Path
-import android.graphics.Rect
+
 import android.graphics.RectF
-import android.graphics.Canvas
-import android.graphics.Paint
 
 data class Mask(
     val rect: RectF,
     val viewId: Int,
-    val points: FloatArray? = null) {
+    val points: FloatArray? = null
+) {
     // Implemented to suppress warning
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -25,27 +23,4 @@ data class Mask(
         result = 31 * result + points.contentHashCode()
         return result
     }
-}
-
-fun Mask.draw(path: Path, canvas: Canvas, paint: Paint) {
-    if (points != null) {
-        val pts = points
-
-        path.reset()
-        path.moveTo(pts[0], pts[1])
-        path.lineTo(pts[2], pts[3])
-        path.lineTo(pts[4], pts[5])
-        path.lineTo(pts[6], pts[7])
-        path.close()
-
-        canvas.drawPath(path, paint)
-    } else {
-        val intRect = Rect(
-            rect.left.toInt(),
-            rect.top.toInt(),
-            rect.right.toInt(),
-            rect.bottom.toInt()
-        )
-        canvas.drawRect(intRect, paint)
-    }
 }

sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt

@@ -69,7 +69,7 @@ data class NativeMaskTarget(
     }
 
     // return 4 points of polygon under transformations
-    fun points(context: MaskContext): FloatArray? {
+    private fun points(context: MaskContext): FloatArray? {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             return null
         }

yarn.lock

@@ -39290,17 +39290,18 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"react-server-dom-webpack@npm:19.0.0-rc-6230622a1a-20240610":
-  version: 19.0.0-rc-6230622a1a-20240610
-  resolution: "react-server-dom-webpack@npm:19.0.0-rc-6230622a1a-20240610"
+"react-server-dom-webpack@npm:19.0.1":
+  version: 19.0.1
+  resolution: "react-server-dom-webpack@npm:19.0.1"
   dependencies:
     acorn-loose: "npm:^8.3.0"
     neo-async: "npm:^2.6.1"
+    webpack-sources: "npm:^3.2.0"
   peerDependencies:
-    react: 19.0.0-rc-6230622a1a-20240610
-    react-dom: 19.0.0-rc-6230622a1a-20240610
+    react: ^19.0.1
+    react-dom: ^19.0.1
     webpack: ^5.59.0
-  checksum: 10/66ae78f359bcd09400d39f25341c9f799b33cbdb4c7a1134c07ee34d7d142c240bd0dea83942c9260c3e3be6de0bc2bf0ed1343e4f044eeabcf6e5d3c1172c79
+  checksum: 10/bf457509c1201b2bd5080beee6ffa50a2dff70e0ff8130e95bb39d75e51a2bbfad4b72acd732ac4f8dd7f91ec202986b44f68f78a81d1acd266279e1ce63721c
   languageName: node
   linkType: hard
 
@@ -46330,10 +46331,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-sources@npm:^3.0.0, webpack-sources@npm:^3.2.3":
-  version: 3.2.3
-  resolution: "webpack-sources@npm:3.2.3"
-  checksum: 10/a661f41795d678b7526ae8a88cd1b3d8ce71a7d19b6503da8149b2e667fc7a12f9b899041c1665d39e38245ed3a59ab68de648ea31040c3829aa695a5a45211d
+"webpack-sources@npm:^3.0.0, webpack-sources@npm:^3.2.0, webpack-sources@npm:^3.2.3":
+  version: 3.3.3
+  resolution: "webpack-sources@npm:3.3.3"
+  checksum: 10/ec5d72607e8068467370abccbfff855c596c098baedbe9d198a557ccf198e8546a322836a6f74241492576adba06100286592993a62b63196832cdb53c8bae91
   languageName: node
   linkType: hard