Merge remote-tracking branch 'origin/main' into ta/O11Y-606/replay

tanderson-ld · tanderson-ld · commit d52ac80256bd · 2025-10-24T15:42:37.000-04:00
diff --git a/e2e/android/app/build.gradle.kts b/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"
diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/MainActivity.kt b/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()
diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/ViewModel.kt b/e2e/android/app/src/main/java/com/example/androidobservability/ViewModel.kt
@@ -21,7 +21,23 @@ import java.net.URL
 class ViewModel : ViewModel() {
 
     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() {
diff --git a/sdk/@launchdarkly/observability-android/lib/build.gradle.kts b/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")
@@ -74,7 +77,7 @@ tasks.withType<Test> {
 
 android {
     namespace = "com.launchdarkly.observability"
-    compileSdk = 35
+    compileSdk = 36
 
     buildFeatures {
         buildConfig = true
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/client/DebugMetricExporter.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/client/DebugMetricExporter.kt
@@ -5,18 +5,20 @@ import io.opentelemetry.sdk.common.CompletableResultCode
 import io.opentelemetry.sdk.metrics.InstrumentType
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality
 import io.opentelemetry.sdk.metrics.data.MetricData
+import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector
 import io.opentelemetry.sdk.metrics.export.MetricExporter
 
 class DebugMetricExporter(private val logger: LDLogger): MetricExporter {
 
     override fun export(metrics: Collection<MetricData?>): CompletableResultCode? {
         for (metric in metrics) {
-            logger.info(metric.toString())
+            logger.info("Metric exported: ${metric.toString()}")
         }
         return CompletableResultCode.ofSuccess()
     }
 
     override fun flush(): CompletableResultCode = CompletableResultCode.ofSuccess()
     override fun shutdown(): CompletableResultCode = CompletableResultCode.ofSuccess()
-    override fun getAggregationTemporality(instrumentType: InstrumentType): AggregationTemporality? = AggregationTemporality.CUMULATIVE
+    override fun getAggregationTemporality(instrumentType: InstrumentType): AggregationTemporality? =
+        AggregationTemporalitySelector.deltaPreferred().getAggregationTemporality(instrumentType)
 }
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/client/InstrumentationManager.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/client/InstrumentationManager.kt
@@ -35,6 +35,7 @@ import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder
 import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor
 import io.opentelemetry.sdk.logs.export.LogRecordExporter
 import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder
+import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector
 import io.opentelemetry.sdk.metrics.export.MetricExporter
 import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader
 import io.opentelemetry.sdk.resources.Resource
@@ -75,6 +76,7 @@ class InstrumentationManager(
     private var spanProcessor: BatchSpanProcessor? = null
     private var logProcessor: LogRecordProcessor? = null
     private var metricsReader: PeriodicMetricReader? = null
+    private var launchTimeInstrumentation: LaunchTimeInstrumentation? = null
     private val gaugeCache = ConcurrentHashMap<String, DoubleGauge>()
     private val counterCache = ConcurrentHashMap<String, LongCounter>()
     private val histogramCache = ConcurrentHashMap<String, DoubleHistogram>()
@@ -87,7 +89,7 @@ class InstrumentationManager(
         initializeTelemetryInspector()
         val otelRumConfig = createOtelRumConfig()
 
-        val builder = OpenTelemetryRum.builder(application, otelRumConfig)
+        val rumBuilder = OpenTelemetryRum.builder(application, otelRumConfig)
             .addLoggerProviderCustomizer { sdkLoggerProviderBuilder, _ ->
                 // TODO: O11Y-627 - need to refactor this so that the disableLogs option is specific to core logging functionality. when logs are disabled, session replay logs should not be blocked
                 return@addLoggerProviderCustomizer if (options.disableLogs && options.disableErrorTracking) {
@@ -122,10 +124,19 @@ class InstrumentationManager(
             }
 
         for (instrumentation in options.instrumentations) {
-            builder.addInstrumentation(instrumentation)
+            rumBuilder.addInstrumentation(instrumentation)
         }
 
-        otelRUM = builder.build()
+        if (!options.disableMetrics) {
+            launchTimeInstrumentation = LaunchTimeInstrumentation(
+                application = application,
+                metricRecorder = this::recordHistogram
+            ).also {
+                rumBuilder.addInstrumentation(it)
+            }
+        }
+
+        otelRUM = rumBuilder.build()
         loadSamplingConfigAsync()
 
         otelMeter = otelRUM.openTelemetry.meterProvider.get(INSTRUMENTATION_SCOPE_NAME)
@@ -190,6 +201,7 @@ class InstrumentationManager(
         return OtlpHttpMetricExporter.builder()
             .setEndpoint(options.otlpEndpoint + METRICS_PATH)
             .setHeaders { options.customHeaders }
+            .setAggregationTemporalitySelector(AggregationTemporalitySelector.deltaPreferred())
             .build()
     }
 
@@ -232,7 +244,7 @@ class InstrumentationManager(
     private fun createPeriodicMetricReader(metricExporter: MetricExporter): PeriodicMetricReader {
         // Configure a periodic reader that pushes metrics every 10 seconds.
         return PeriodicMetricReader.builder(metricExporter)
-            .setInterval(METRICS_EXPORT_INTERVAL_SECONDS, TimeUnit.SECONDS)
+            .setInterval(METRICS_EXPORT_INTERVAL_MS, TimeUnit.MILLISECONDS)
             .build()
     }
 
@@ -280,6 +292,7 @@ class InstrumentationManager(
         val counter = counterCache.getOrPut(metric.name) {
             otelMeter.counterBuilder(metric.name).build()
         }
+        // It increments the value until the metric is exported, then it’s reset.
         counter.add(1, metric.attributes)
     }
 
@@ -382,7 +395,7 @@ class InstrumentationManager(
         private const val BATCH_SCHEDULE_DELAY_MS = 1000L
         private const val BATCH_EXPORTER_TIMEOUT_MS = 5000L
         private const val BATCH_MAX_EXPORT_SIZE = 10
-        private const val METRICS_EXPORT_INTERVAL_SECONDS = 10L
+        private const val METRICS_EXPORT_INTERVAL_MS = 10_000L
         private const val FLUSH_TIMEOUT_SECONDS = 5L
 
         internal fun createLoggerProcessor(
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/client/LaunchTimeInstrumentation.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/client/LaunchTimeInstrumentation.kt
