Merge branch 'main' into agrognetti/O11Y-418

Author: agrognetti

.release-please-manifest.json

@@ -1,11 +1,11 @@
 {
 	"go": "0.4.0",
-	"sdk/@launchdarkly/observability": "0.4.5",
-	"sdk/@launchdarkly/observability-android": "0.11.0",
+	"sdk/@launchdarkly/observability": "0.4.6",
+	"sdk/@launchdarkly/observability-android": "0.12.0",
 	"sdk/@launchdarkly/observability-dotnet": "0.3.0",
 	"sdk/@launchdarkly/observability-node": "0.3.1",
 	"sdk/@launchdarkly/observability-python": "0.1.1",
 	"sdk/@launchdarkly/observability-react-native": "0.7.0",
-	"sdk/@launchdarkly/session-replay": "0.4.5",
-	"sdk/highlight-run": "9.22.2"
+	"sdk/@launchdarkly/session-replay": "0.4.6",
+	"sdk/highlight-run": "9.22.3"
 }

e2e/android/app/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 android {
     namespace = "com.example.androidobservability"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.example.androidobservability"

e2e/android/app/src/main/java/com/example/androidobservability/BaseApplication.kt

@@ -9,6 +9,7 @@ import com.launchdarkly.sdk.android.Components
 import com.launchdarkly.sdk.android.LDClient
 import com.launchdarkly.sdk.android.LDConfig
 import com.launchdarkly.observability.plugin.Observability
+import com.launchdarkly.observability.replay.ReplayInstrumentation
 import com.launchdarkly.sdk.android.LDAndroidLogging
 import com.launchdarkly.sdk.android.integrations.Plugin
 import io.opentelemetry.api.common.AttributeKey
@@ -29,6 +30,10 @@ open class BaseApplication : Application() {
         ),
         debug = true,
         logAdapter = LDAndroidLogging.adapter(),
+        // TODO: consider these being factories so that the obs plugin can pass instantiation data, log adapter
+        instrumentations = listOf(
+            ReplayInstrumentation()
+        ),
     )
 
     var telemetryInspector: TelemetryInspector? = null

e2e/android/app/src/main/java/com/example/androidobservability/MainActivity.kt

@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -35,16 +36,21 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             AndroidObservabilityTheme {
-                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+                Scaffold(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .imePadding()
+                ) { innerPadding ->
                     var customLogText by remember { mutableStateOf("") }
                     var customSpanText by remember { mutableStateOf("") }
                     var customContextKey by remember { mutableStateOf("") }
 
                     Column(
                         modifier = Modifier
+                            .fillMaxSize()
                             .padding(innerPadding)
-                            .padding(16.dp)
                             .verticalScroll(rememberScrollState())
+                            .padding(16.dp)
                     ) {
                         Text(
                             text = "Hello Telemetry",
@@ -77,6 +83,34 @@ class MainActivity : ComponentActivity() {
                         ) {
                             Text("Trigger Metric")
                         }
+                        Button(
+                            onClick = {
+                                viewModel.triggerHistogramMetric()
+                            }
+                        ) {
+                            Text("Trigger Histogram Metric")
+                        }
+                        Button(
+                            onClick = {
+                                viewModel.triggerCountMetric()
+                            }
+                        ) {
+                            Text("Trigger Count Metric")
+                        }
+                        Button(
+                            onClick = {
+                                viewModel.triggerIncrementalMetric()
+                            }
+                        ) {
+                            Text("Trigger Incremental Metric")
+                        }
+                        Button(
+                            onClick = {
+                                viewModel.triggerUpDownCounterMetric()
+                            }
+                        ) {
+                            Text("Trigger UpDownCounter Metric")
+                        }
                         Button(
                             onClick = {
                                 viewModel.triggerError()

e2e/android/app/src/main/java/com/example/androidobservability/ViewModel.kt

@@ -24,7 +24,23 @@ import java.net.URL
 class ViewModel(application: Application) : AndroidViewModel(application) {
 
     fun triggerMetric() {
-        LDObserve.recordMetric(Metric("test", 50.0))
+        LDObserve.recordMetric(Metric("test-gauge", 50.0))
+    }
+
+    fun triggerHistogramMetric() {
+        LDObserve.recordHistogram(Metric("test-histogram", 15.0))
+    }
+
+    fun triggerCountMetric() {
+        LDObserve.recordCount(Metric("test-counter", 10.0))
+    }
+
+    fun triggerIncrementalMetric() {
+        LDObserve.recordIncr(Metric("test-incremental-counter", 12.0))
+    }
+
+    fun triggerUpDownCounterMetric() {
+        LDObserve.recordUpDownCounter(Metric("test-up-down-counter", 25.0))
     }
 
     fun triggerError() {

e2e/android/app/src/test/java/com/example/androidobservability/DisablingConfigOptionsE2ETest.kt

@@ -2,18 +2,17 @@ package com.example.androidobservability
 
 import android.app.Application
 import androidx.test.core.app.ApplicationProvider
+import com.example.androidobservability.TestUtils.TelemetryType
 import com.example.androidobservability.TestUtils.waitForTelemetryData
+import com.launchdarkly.observability.api.Options
 import com.launchdarkly.observability.interfaces.Metric
 import com.launchdarkly.observability.sdk.LDObserve
 import io.opentelemetry.api.common.AttributeKey
 import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.logs.Severity
-import com.example.androidobservability.TestUtils.TelemetryType
-import com.launchdarkly.observability.api.Options
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertFalse
 import junit.framework.TestCase.assertNotNull
-import junit.framework.TestCase.assertNull
 import junit.framework.TestCase.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -96,7 +95,6 @@ class DisablingConfigOptionsE2ETest {
         LDObserve.flush()
         waitForTelemetryData(telemetryInspector = application.telemetryInspector, telemetryType = TelemetryType.METRICS)
 
-        assertNull(application.telemetryInspector?.metricExporter)
         assertFalse(requestsContainsUrl(metricsUrl))
     }
 
@@ -110,7 +108,6 @@ class DisablingConfigOptionsE2ETest {
         LDObserve.flush()
         waitForTelemetryData(telemetryInspector = application.telemetryInspector, telemetryType = TelemetryType.METRICS)
 
-        assertNotNull(application.telemetryInspector?.metricExporter)
         assertTrue(requestsContainsUrl(metricsUrl))
     }
 

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

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.12.0](https://github.com/launchdarkly/observability-sdk/compare/launchdarkly-observability-android-0.11.0...launchdarkly-observability-android-0.12.0) (2025-10-24)
+
+
+### Features
+
+* Android observability plugin session replay support ([#268](https://github.com/launchdarkly/observability-sdk/issues/268)) ([4ba5124](https://github.com/launchdarkly/observability-sdk/commit/4ba5124e59ebd5b46a55b124a749eeec715cff55))
+* O11Y-601 - Add Android launch time instrumentation ([#274](https://github.com/launchdarkly/observability-sdk/issues/274)) ([38b4a84](https://github.com/launchdarkly/observability-sdk/commit/38b4a8475b51bd8686f5e1cc0e6c3d47e3ebc2e2))
+
 ## [0.11.0](https://github.com/launchdarkly/observability-sdk/compare/launchdarkly-observability-android-0.10.0...launchdarkly-observability-android-0.11.0) (2025-10-10)
 
 

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

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

sdk/@launchdarkly/observability-android/lib/build.gradle.kts

@@ -23,6 +23,9 @@ dependencies {
     implementation("com.launchdarkly:launchdarkly-android-client-sdk:5.9.0")
     implementation("com.jakewharton.timber:timber:5.0.1")
 
+    // Android
+    implementation("androidx.activity:activity:1.11.0")
+
     // Coroutines
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
@@ -52,6 +55,11 @@ dependencies {
     // Android crash instrumentation
     implementation("io.opentelemetry.android.instrumentation:crash:0.11.0-alpha")
 
+    // TODO: O11Y-626 - move replay instrumentation and associated compose dependencies into dedicated package
+    // Compose dependencies for capture functionality
+    implementation("androidx.compose.ui:ui:1.7.5")
+    implementation("androidx.compose.ui:ui-tooling:1.7.5")
+
     // Use JUnit Jupiter for testing.
     testImplementation(platform("org.junit:junit-bom:5.13.4"))
     testImplementation("org.junit.jupiter:junit-jupiter")
@@ -69,7 +77,7 @@ tasks.withType<Test> {
 
 android {
     namespace = "com.launchdarkly.observability"
-    compileSdk = 35
+    compileSdk = 36
 
     buildFeatures {
         buildConfig = true

sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/api/Options.kt

@@ -2,13 +2,15 @@ package com.launchdarkly.observability.api
 
 import com.launchdarkly.logging.LDLogAdapter
 import com.launchdarkly.observability.BuildConfig
+import com.launchdarkly.observability.interfaces.LDExtendedInstrumentation
 import com.launchdarkly.sdk.android.LDTimberLogging
 import io.opentelemetry.api.common.Attributes
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
 
-private const val DEFAULT_OTLP_ENDPOINT = "https://otel.observability.app.launchdarkly.com:4318"
-private const val DEFAULT_BACKEND_URL = "https://pub.observability.app.launchdarkly.com"
+const val DEFAULT_SERVICE_NAME = "observability-android"
+const val DEFAULT_OTLP_ENDPOINT = "https://otel.observability.app.launchdarkly.com:4318"
+const val DEFAULT_BACKEND_URL = "https://pub.observability.app.launchdarkly.com"
 
 /**
  * Configuration options for the Observability plugin.
@@ -27,21 +29,23 @@ private const val DEFAULT_BACKEND_URL = "https://pub.observability.app.launchdar
  * @property disableMetrics Disables metrics if true. Defaults to false.
  * @property logAdapter The log adapter to use. Defaults to using the LaunchDarkly SDK's LDTimberLogging.adapter(). Use LDAndroidLogging.adapter() to use the Android logging adapter.
  * @property loggerName The name of the logger to use. Defaults to "LaunchDarklyObservabilityPlugin".
+ * @property instrumentations List of additional instrumentations to use
  */
 data class Options(
-    val serviceName: String = "observability-android",
+    val serviceName: String = DEFAULT_SERVICE_NAME,
     val serviceVersion: String = BuildConfig.OBSERVABILITY_SDK_VERSION,
     val otlpEndpoint: String = DEFAULT_OTLP_ENDPOINT,
     val backendUrl: String = DEFAULT_BACKEND_URL,
     val resourceAttributes: Attributes = Attributes.empty(),
     val customHeaders: Map<String, String> = emptyMap(),
     val sessionBackgroundTimeout: Duration = 15.minutes,
     val debug: Boolean = false,
-    // TODO O11Y-398: implement disable config options after all other instrumentations are implemented
     val disableErrorTracking: Boolean = false,
     val disableLogs: Boolean = false,
     val disableTraces: Boolean = false,
     val disableMetrics: Boolean = false,
     val logAdapter: LDLogAdapter = LDTimberLogging.adapter(), // this follows the LaunchDarkly SDK's default log adapter
-    val loggerName: String = "LaunchDarklyObservabilityPlugin"
+    val loggerName: String = "LaunchDarklyObservabilityPlugin",
+    // TODO: update this to provide a list of factories instead of instances
+    val instrumentations: List<LDExtendedInstrumentation> = emptyList()
 )