Merge branch 'andrey/ld-android2' into andrey/android-internal

abelonogov-ld · abelonogov-ld · commit 3a02179bd4f5 · 2026-04-17T17:39:35.000-07:00
* andrey/ld-android2: fix address feedback fix: [SDK-2197] manually register main Activity with session replay (#475) chore: silence otlp localhost connection exceptions in e2e tests (#474) chore: release main (#470)
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,12 +1,12 @@
 {
 	"go": "1.1.0",
 	"sdk/@launchdarkly/observability": "1.1.2",
-	"sdk/@launchdarkly/observability-android": "0.38.0",
+	"sdk/@launchdarkly/observability-android": "0.39.0",
 	"sdk/@launchdarkly/observability-dotnet": "1.1.0",
 	"sdk/@launchdarkly/observability-node": "1.1.0",
 	"sdk/@launchdarkly/observability-python": "1.2.0",
 	"sdk/@launchdarkly/observability-react-native": "0.8.0",
-	"sdk/@launchdarkly/react-native-ld-session-replay": "0.3.0",
+	"sdk/@launchdarkly/react-native-ld-session-replay": "0.4.0",
 	"sdk/@launchdarkly/session-replay": "1.1.2",
 	"sdk/highlight-run": "10.0.0",
 	"sdk/@launchdarkly/observability-ruby": "0.2.0"
diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/BaseApplication.kt b/e2e/android/app/src/main/java/com/example/androidobservability/BaseApplication.kt
@@ -57,6 +57,7 @@ open class BaseApplication : Application() {
 
     var testUrl: String? = null
 
+    // example on creating OBS/SR with flagging sdk
     open fun realInit() {
         val observabilityPlugin = Observability(
             application = this@BaseApplication,
@@ -96,6 +97,7 @@ open class BaseApplication : Application() {
         LDReplay.start()
     }
 
+    // example on creating OBS/SR without flagging
     open fun realIndependentInit() {
         val effectiveOptions = testUrl?.let {
             observabilityOptions.copy(backendUrl = it, otlpEndpoint = it)
diff --git a/e2e/android/app/src/test/java/com/example/androidobservability/SamplingE2ETest.kt b/e2e/android/app/src/test/java/com/example/androidobservability/SamplingE2ETest.kt
@@ -64,12 +64,16 @@ class SamplingE2ETest {
     @Test
     fun `should avoid exporting logs matching sampling configuration for logs`() = runTest {
         triggerLogs()
-        telemetryInspector?.logExporter?.flush()
+        // Force the BatchLogRecordProcessor to drain everything to the exporter so the
+        // assertion doesn't race with the batch scheduler.
+        LDObserve.flush()
         waitForTelemetryData(telemetryInspector = application.telemetryInspector, telemetryType = TelemetryType.LOGS)
 
-        val logsExported = telemetryInspector?.logExporter?.finishedLogRecordItems?.map {
-            it.bodyValue?.value.toString()
-        }
+        val logsExported = telemetryInspector?.logExporter?.finishedLogRecordItems
+            ?.map { it.bodyValue?.value.toString() }
+            // The SDK emits an unrelated "LD.identify" INFO log during init; filter it out so
+            // this test only observes the logs triggered by triggerLogs().
+            ?.filter { it != LD_IDENTIFY_LOG_BODY }
 
         // Only first and final logs should be exported
         assertEquals(2, logsExported?.size)
@@ -80,7 +84,7 @@ class SamplingE2ETest {
     @Test
     fun `should avoid exporting spans matching sampling configuration for spans`() = runTest {
         triggerSpans()
-        telemetryInspector?.spanExporter?.flush()
+        LDObserve.flush()
         waitForTelemetryData(telemetryInspector = application.telemetryInspector, telemetryType = TelemetryType.SPANS)
 
         val spansExported = telemetryInspector?.spanExporter?.finishedSpanItems?.map {
@@ -225,4 +229,8 @@ class SamplingE2ETest {
             )
         )
     }
+
+    companion object {
+        private const val LD_IDENTIFY_LOG_BODY = "LD.identify"
+    }
 }
diff --git a/sdk/@launchdarkly/observability-android/CHANGELOG.md b/sdk/@launchdarkly/observability-android/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.39.0](https://github.com/launchdarkly/observability-sdk/compare/launchdarkly-observability-android-0.38.0...launchdarkly-observability-android-0.39.0) (2026-04-17)
+
+
+### Features
+
+* [SDK-2197] Add `LDReplay. registerActivity()` method for React Native. ([#472](https://github.com/launchdarkly/observability-sdk/issues/472)) ([f99b566](https://github.com/launchdarkly/observability-sdk/commit/f99b5660f68ac8ec1edf94f27e9eb29dea7c4d93))
+
 ## [0.38.0](https://github.com/launchdarkly/observability-sdk/compare/launchdarkly-observability-android-0.37.0...launchdarkly-observability-android-0.38.0) (2026-04-13)
 
 
diff --git a/sdk/@launchdarkly/observability-android/gradle.properties b/sdk/@launchdarkly/observability-android/gradle.properties
@@ -5,5 +5,5 @@ android.useAndroidX=true
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
 
 #x-release-please-start-version
-version=0.38.0
+version=0.39.0
 #x-release-please-end
diff --git a/sdk/@launchdarkly/react-native-ld-session-replay/CHANGELOG.md b/sdk/@launchdarkly/react-native-ld-session-replay/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.4.0](https://github.com/launchdarkly/observability-sdk/compare/session-replay-react-native-0.3.0...session-replay-react-native-0.4.0) (2026-04-17)
+
+
+### Features
+
+* [SDK-2121] implement session replay for react native android ([#456](https://github.com/launchdarkly/observability-sdk/issues/456)) ([a5af1d8](https://github.com/launchdarkly/observability-sdk/commit/a5af1d8368fc06ffbef9b486f4b40cbfd7390ef3))
+* [SDK-2190] add dialogs to the RN session replay example app ([#471](https://github.com/launchdarkly/observability-sdk/issues/471)) ([c677962](https://github.com/launchdarkly/observability-sdk/commit/c6779627f17bdb161b4fb79092dd6743ad54f9bf))
+
 ## [0.3.0](https://github.com/launchdarkly/observability-sdk/compare/session-replay-react-native-0.2.2...session-replay-react-native-0.3.0) (2026-03-26)
 
 
diff --git a/sdk/@launchdarkly/react-native-ld-session-replay/android/build.gradle b/sdk/@launchdarkly/react-native-ld-session-replay/android/build.gradle
@@ -83,7 +83,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.launchdarkly:launchdarkly-observability-android:0.34.1"
+  implementation "com.launchdarkly:launchdarkly-observability-android:0.39.0"
   implementation "com.launchdarkly:launchdarkly-android-client-sdk:5.11.0"
   // compileOnly: OTel Attributes appears in ObservabilityOptions parameter types; provided at
   // runtime transitively through launchdarkly-observability-android.
diff --git a/sdk/@launchdarkly/react-native-ld-session-replay/android/src/main/java/com/sessionreplayreactnative/SessionReplayClientAdapter.kt b/sdk/@launchdarkly/react-native-ld-session-replay/android/src/main/java/com/sessionreplayreactnative/SessionReplayClientAdapter.kt
@@ -1,5 +1,6 @@
 package com.sessionreplayreactnative
 
+import android.app.Activity
 import android.app.Application
 import android.os.Handler
 import android.os.Looper
@@ -39,7 +40,7 @@ internal class SessionReplayClientAdapter private constructor() {
         }
     }
 
-    fun start(application: Application, completion: (Boolean, String?) -> Unit) {
+    fun start(application: Application, activity: Activity?, completion: (Boolean, String?) -> Unit) {
         val localMobileKey: String?
         val localServiceName: String
         val localReplayOptions: ReplayOptions?
@@ -70,6 +71,9 @@ internal class SessionReplayClientAdapter private constructor() {
                     return@post
                 }
                 initialized = true
+                // React Native is often initialized after the main activity has already been
+                // created, so we miss its lifecycle events. Manually register it, just in case.
+                activity?.let { LDReplay.registerActivity(it) }
             } else {
                 logger.debug("start: already initialized, re-applying isEnabled={0}", localReplayOptions.enabled)
             }
diff --git a/sdk/@launchdarkly/react-native-ld-session-replay/android/src/main/java/com/sessionreplayreactnative/SessionReplayReactNativeModule.kt b/sdk/@launchdarkly/react-native-ld-session-replay/android/src/main/java/com/sessionreplayreactnative/SessionReplayReactNativeModule.kt
@@ -33,7 +33,7 @@ class SessionReplayReactNativeModule(reactContext: ReactApplicationContext) :
       return
     }
     try {
-      SessionReplayClientAdapter.shared.start(application) { success, errorMessage ->
+      SessionReplayClientAdapter.shared.start(application, reactApplicationContext.getCurrentActivity()) { success, errorMessage ->
         if (success) {
           promise.resolve(null)
         } else {
diff --git a/sdk/@launchdarkly/react-native-ld-session-replay/package.json b/sdk/@launchdarkly/react-native-ld-session-replay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@launchdarkly/session-replay-react-native",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "session replay for react native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.sessionreplayreactnative`
`2`	`2`
	`3`	`+import android.app.Activity`
`3`	`4`	`import android.app.Application`
`4`	`5`	`import android.os.Handler`
`5`	`6`	`import android.os.Looper`
`@@ -39,7 +40,7 @@ internal class SessionReplayClientAdapter private constructor() {`
`39`	`40`	`}`
`40`	`41`	`}`
`41`	`42`
`42`		`- fun start(application: Application, completion: (Boolean, String?) -> Unit) {`
	`43`	`+ fun start(application: Application, activity: Activity?, completion: (Boolean, String?) -> Unit) {`
`43`	`44`	`val localMobileKey: String?`
`44`	`45`	`val localServiceName: String`
`45`	`46`	`val localReplayOptions: ReplayOptions?`
`@@ -70,6 +71,9 @@ internal class SessionReplayClientAdapter private constructor() {`
`70`	`71`	`return@post`
`71`	`72`	`}`
`72`	`73`	`initialized = true`
	`74`	`+ // React Native is often initialized after the main activity has already been`
	`75`	`+ // created, so we miss its lifecycle events. Manually register it, just in case.`
	`76`	`+ activity?.let { LDReplay.registerActivity(it) }`
`73`	`77`	`} else {`
`74`	`78`	`logger.debug("start: already initialized, re-applying isEnabled={0}", localReplayOptions.enabled)`
`75`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class SessionReplayReactNativeModule(reactContext: ReactApplicationContext) :`
`33`	`33`	`return`
`34`	`34`	`}`
`35`	`35`	`try {`
`36`		`- SessionReplayClientAdapter.shared.start(application) { success, errorMessage ->`
	`36`	`+ SessionReplayClientAdapter.shared.start(application, reactApplicationContext.getCurrentActivity()) { success, errorMessage ->`
`37`	`37`	`if (success) {`
`38`	`38`	`promise.resolve(null)`
`39`	`39`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@launchdarkly/session-replay-react-native",`
`3`		`- "version": "0.3.0",`
	`3`	`+ "version": "0.4.0",`
`4`	`4`	`"description": "session replay for react native",`
`5`	`5`	`"main": "./lib/module/index.js",`
`6`	`6`	`"types": "./lib/typescript/src/index.d.ts",`