review comments, tweaks to resource attributes for compatibility with ingest

tanderson-ld · tanderson-ld · commit 83ea410a3eee · 2025-07-29T12:46:06.000-04:00
diff --git a/e2e/android/app/.gitignore b/e2e/android/app/.gitignore
@@ -1 +1 @@
-/build
+/build
diff --git a/e2e/android/app/build.gradle.kts b/e2e/android/app/build.gradle.kts
@@ -63,4 +63,4 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-}
+}
diff --git a/e2e/android/app/proguard-rules.pro b/e2e/android/app/proguard-rules.pro
@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
diff --git a/e2e/android/app/src/androidTest/java/com/example/androidobservability/ExampleInstrumentedTest.kt b/e2e/android/app/src/androidTest/java/com/example/androidobservability/ExampleInstrumentedTest.kt
@@ -21,4 +21,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.example.androidobservability", appContext.packageName)
     }
-}
+}
diff --git a/e2e/android/app/src/main/AndroidManifest.xml b/e2e/android/app/src/main/AndroidManifest.xml
@@ -27,4 +27,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
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
@@ -13,6 +13,7 @@ import java.util.Collections
 class BaseApplication : Application() {
 
     companion object {
+        // TODO O11Y-376: Update this credential to be driven by env variable or gradle property
         // Set LAUNCHDARKLY_MOBILE_KEY to your LaunchDarkly SDK mobile key.
         const val LAUNCHDARKLY_MOBILE_KEY = "MOBILE_KEY_GOES_HERE"
     }
@@ -39,4 +40,4 @@ class BaseApplication : Application() {
 
         LDClient.init(this@BaseApplication, ldConfig, context)
     }
-}
+}
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
@@ -14,11 +14,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import com.example.androidobservability.ui.theme.AndroidObservabilityTheme
-import kotlinx.coroutines.launch
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -75,4 +71,4 @@ fun GreetingPreview() {
     AndroidObservabilityTheme {
         Greeting("Android")
     }
-}
+}
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
@@ -25,4 +25,4 @@ class ViewModel : ViewModel() {
             Attributes.of(AttributeKey.stringKey("FakeAttribute"), "FakeVal")
         )
     }
-}
+}
diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/ui/theme/Color.kt b/e2e/android/app/src/main/java/com/example/androidobservability/ui/theme/Color.kt
@@ -8,4 +8,4 @@ val Pink80 = Color(0xFFEFB8C8)
 
 val Purple40 = Color(0xFF6650a4)
 val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
+val Pink40 = Color(0xFF7D5260)
diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/ui/theme/Theme.kt b/e2e/android/app/src/main/java/com/example/androidobservability/ui/theme/Theme.kt
@@ -55,4 +55,4 @@ fun AndroidObservabilityTheme(
         typography = Typography,
         content = content
     )
-}
+}
diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/ui/theme/Type.kt b/e2e/android/app/src/main/java/com/example/androidobservability/ui/theme/Type.kt
@@ -31,4 +31,4 @@ val Typography = Typography(
         letterSpacing = 0.5.sp
     )
     */
-)
+)
diff --git a/e2e/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/e2e/android/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -27,4 +27,4 @@
         android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
         android:strokeWidth="1"
         android:strokeColor="#00000000" />
-</vector>
+</vector>
diff --git a/e2e/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/e2e/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -3,4 +3,4 @@
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
+</adaptive-icon>
diff --git a/e2e/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/e2e/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -3,4 +3,4 @@
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
+</adaptive-icon>
diff --git a/e2e/android/app/src/main/res/values/colors.xml b/e2e/android/app/src/main/res/values/colors.xml
@@ -7,4 +7,4 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-</resources>
+</resources>
diff --git a/e2e/android/app/src/main/res/values/strings.xml b/e2e/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
     <string name="app_name">AndroidObservability</string>
-</resources>
+</resources>
diff --git a/e2e/android/app/src/main/res/values/themes.xml b/e2e/android/app/src/main/res/values/themes.xml
@@ -2,4 +2,4 @@
 <resources>
 
     <style name="Theme.AndroidObservability" parent="android:Theme.Material.Light.NoActionBar" />
-</resources>
+</resources>
diff --git a/e2e/android/app/src/main/res/xml/backup_rules.xml b/e2e/android/app/src/main/res/xml/backup_rules.xml
@@ -10,4 +10,4 @@
    <include domain="sharedpref" path="."/>
    <exclude domain="sharedpref" path="device.xml"/>
 -->
-</full-backup-content>
+</full-backup-content>
diff --git a/e2e/android/app/src/main/res/xml/data_extraction_rules.xml b/e2e/android/app/src/main/res/xml/data_extraction_rules.xml
@@ -16,4 +16,4 @@
         <exclude .../>
     </device-transfer>
     -->
-</data-extraction-rules>
+</data-extraction-rules>
diff --git a/e2e/android/app/src/test/java/com/example/androidobservability/ExampleUnitTest.kt b/e2e/android/app/src/test/java/com/example/androidobservability/ExampleUnitTest.kt
@@ -14,4 +14,4 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
+}
diff --git a/e2e/android/build.gradle.kts b/e2e/android/build.gradle.kts
@@ -3,4 +3,4 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false
-}
+}
diff --git a/e2e/android/gradle.properties b/e2e/android/gradle.properties
@@ -20,4 +20,4 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
diff --git a/sdk/@launchdarkly/observability-android/.gitignore b/sdk/@launchdarkly/observability-android/.gitignore
@@ -4,4 +4,4 @@
 # Ignore Gradle build output directory
 build
 
-.kotlin
+.kotlin
diff --git a/sdk/@launchdarkly/observability-android/lib/build.gradle.kts b/sdk/@launchdarkly/observability-android/lib/build.gradle.kts
@@ -44,4 +44,4 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
-}
+}
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/AndroidManifest.xml b/sdk/@launchdarkly/observability-android/lib/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-</manifest>
+</manifest>
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
@@ -3,19 +3,27 @@ import com.launchdarkly.observability.interfaces.Metric
 import com.launchdarkly.sdk.LDValue
 import com.launchdarkly.sdk.android.LDClient
 import io.opentelemetry.api.common.Attributes
-import io.opentelemetry.api.logs.LoggerProvider
-import io.opentelemetry.api.metrics.MeterProvider
+import io.opentelemetry.api.logs.Logger
+import io.opentelemetry.api.metrics.Meter
 import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter
 import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter
+import io.opentelemetry.sdk.OpenTelemetrySdk
 import io.opentelemetry.sdk.logs.SdkLoggerProvider
 import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor
 import io.opentelemetry.sdk.metrics.SdkMeterProvider
 import io.opentelemetry.sdk.metrics.export.MetricExporter
 import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader
 import io.opentelemetry.sdk.resources.Resource
-import java.time.Instant
 import java.util.concurrent.TimeUnit
 
+private const val URL = "https://otel.observability.app.launchdarkly.com:4318"
+private const val URL_METRICS = URL + "/v1/metrics"
+private const val URL_LOGS = URL + "/v1/logs"
+private const val URL_TRACES = URL + "/v1/traces"
+private const val INSTRUMENTATION_SCOPE_NAME = "com.launchdarkly.observability"
+
+private const val HEADER_LD_PROJECT = "X-LaunchDarkly-Project"
+
 /**
  * Manages instrumentation for LaunchDarkly Observability.
  *
@@ -26,58 +34,70 @@ class InstrumentationManager(
     private val client: LDClient,
     private val resources: Resource,
 ) {
-    private lateinit var meterProvider: MeterProvider
-    private lateinit var loggerProvider: LoggerProvider
+    private var meterProvider: SdkMeterProvider
+    private var meter: Meter
+    private var loggerProvider: SdkLoggerProvider
+    private var logger: Logger
 
     init {
-        initMetrics()
-        initLogs()
+        meterProvider = createMetricsProvider()
+        meter = meterProvider.get(INSTRUMENTATION_SCOPE_NAME)
+        loggerProvider = createLoggerProvider()
+        logger = loggerProvider.get(INSTRUMENTATION_SCOPE_NAME)
+
+        // TODO: pretty sure registering globally is a bad idea, but I'm not sure what the norm is here.
+        // I see documentation that talks about being able to signal to the auto configuration system
+        // via a specially named configurer implementation: autoconfigure SPI interface: SdkTracerProviderConfigurer
+        OpenTelemetrySdk.builder()
+            .setMeterProvider(meterProvider)
+            .setLoggerProvider(loggerProvider)
+            .buildAndRegisterGlobal()
 
-        // TODO: does this meter provider need to be global?
     }
 
     fun recordMetric(metric: Metric) {
-        // TODO: should we hold a reference to the meter?
-        meterProvider.get("com.launchdarkly.observability").gaugeBuilder(metric.name).build().set(metric.value, metric.attributes)
+        meter.gaugeBuilder(metric.name).build()
+            .set(metric.value, metric.attributes)
 
-        // TODO: convert attributes to LDValue object and pass instead of LDValue.ofNull()
+        // TODO: O11Y-362: convert attributes to LDValue object and pass instead of LDValue.ofNull()
         client.trackMetric(metric.name, LDValue.ofNull(), metric.value)
     }
 
     fun recordCount(metric: Metric) {
-        // TODO: should we hold a reference to the meter?
         // TODO: how to handle long and double casting?
-        meterProvider.get("com.launchdarkly.observability").counterBuilder(metric.name).build().add(metric.value.toLong(), metric.attributes)
+        meter.counterBuilder(metric.name).build()
+            .add(metric.value.toLong(), metric.attributes)
     }
 
     fun recordIncr(metric: Metric) {
-        // TODO: should we hold a reference to the meter?
-        meterProvider.get("com.launchdarkly.observability").counterBuilder(metric.name).build().add(1, metric.attributes)
+        meter.counterBuilder(metric.name).build()
+            .add(1, metric.attributes)
     }
 
     fun recordHistogram(metric: Metric) {
-        // TODO: should we hold a reference to the meter?
-        meterProvider.get("com.launchdarkly.observability").histogramBuilder(metric.name).build().record(metric.value, metric.attributes)
+        meter.histogramBuilder(metric.name).build()
+            .record(metric.value, metric.attributes)
     }
 
     fun recordUpDownCounter(metric: Metric) {
-        // TODO: should we hold a reference to the meter?
-        meterProvider.get("com.launchdarkly.observability").upDownCounterBuilder(metric.name).build().add(metric.value.toLong(), metric.attributes)
+        meter.upDownCounterBuilder(metric.name)
+            .build().add(metric.value.toLong(), metric.attributes)
     }
 
     fun recordLog(message: String, level: String, attributes: Attributes) {
-        loggerProvider.get("com.launchdarkly.observability").logRecordBuilder()
+        logger.logRecordBuilder()
             .setBody(message)
             .setTimestamp(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
-            .setAttribute("severityText", level)
+            .setSeverityText(level)
             // TODO: add highlight.session_id when sessions are supported
             .setAllAttributes(attributes)
             .emit()
     }
 
-    // TODO: add otel span optional param
+    // TODO: add otel span optional param that will take precedence over current span and/or created span
     fun recordError(error: Error, attributes: Attributes) {
         // TODO: add error and attributes to span
+        // TODO: add highlight.session_id when sessions are supported
 
         val withExceptionAttrs = attributes.toBuilder()
             .put("exception.type", error.javaClass.simpleName)
@@ -87,13 +107,13 @@ class InstrumentationManager(
 
         this.recordLog(error.message ?: "", "error", withExceptionAttrs)
     }
-    
-    private fun initMetrics() {
+
+    private fun createMetricsProvider(): SdkMeterProvider {
         // Build a default OTLP HTTP exporter. Users can swap this out later if
         // they wish to use a different exporter implementation.
         val metricExporter: MetricExporter = OtlpHttpMetricExporter.builder()
-            .setEndpoint("https://otel.observability.app.launchdarkly.com:4318" + "/v1/metrics")
-            .addHeader("X-LaunchDarkly-Project", sdkKey)
+            .setEndpoint(URL_METRICS)
+            .addHeader(HEADER_LD_PROJECT, sdkKey)
             .build()
 
         // Configure a periodic reader that pushes metrics every 10 seconds.
@@ -104,16 +124,16 @@ class InstrumentationManager(
 
         // Build the SDK MeterProvider with the supplied resources and the
         // configured metric reader.
-        meterProvider = SdkMeterProvider.builder()
+        return SdkMeterProvider.builder()
             .setResource(resources)
             .registerMetricReader(metricReader)
             .build()
     }
 
-    private fun initLogs() {
+    private fun createLoggerProvider(): SdkLoggerProvider {
         val logExporter = OtlpHttpLogRecordExporter.builder()
-            .setEndpoint("https://otel.observability.app.launchdarkly.com:4318" + "/v1/logs")
-            .addHeader("X-LaunchDarkly-Project", sdkKey)
+            .setEndpoint(URL_LOGS)
+            .addHeader(HEADER_LD_PROJECT, sdkKey)
             .build()
 
         // TODO: are these configuration values supposed to be passed in?
@@ -124,9 +144,9 @@ class InstrumentationManager(
             .setMaxExportBatchSize(10)
             .build()
 
-        loggerProvider = SdkLoggerProvider.builder()
+        return SdkLoggerProvider.builder()
             .setResource(resources)
             .addLogRecordProcessor(processor)
             .build()
     }
-}
+}
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/client/ObservabilityClient.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/client/ObservabilityClient.kt
@@ -43,4 +43,4 @@ public class ObservabilityClient: Observe {
     override fun recordLog(message: String, level: String, attributes: Attributes) {
         instrumentationManager.recordLog(message, level, attributes)
     }
-}
+}
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/interfaces/Metric.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/interfaces/Metric.kt
@@ -7,4 +7,4 @@ data class Metric(
     val value: Double,
     val attributes: Attributes = Attributes.empty(),
     val timestamp: Long? = null,
-)
+)
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/plugin/Observability.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/plugin/Observability.kt

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,4 @@ class ExampleInstrumentedTest {`
`21`	`21`	`val appContext = InstrumentationRegistry.getInstrumentation().targetContext`
`22`	`22`	`assertEquals("com.example.androidobservability", appContext.packageName)`
`23`	`23`	`}`
`24`		`-}`
	`24`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import java.util.Collections`
`13`	`13`	`class BaseApplication : Application() {`
`14`	`14`
`15`	`15`	`companion object {`
	`16`	`+ // TODO O11Y-376: Update this credential to be driven by env variable or gradle property`
`16`	`17`	`// Set LAUNCHDARKLY_MOBILE_KEY to your LaunchDarkly SDK mobile key.`
`17`	`18`	`const val LAUNCHDARKLY_MOBILE_KEY = "MOBILE_KEY_GOES_HERE"`
`18`	`19`	`}`
`@@ -39,4 +40,4 @@ class BaseApplication : Application() {`
`39`	`40`
`40`	`41`	`LDClient.init(this@BaseApplication, ldConfig, context)`
`41`	`42`	`}`
`42`		`-}`
	`43`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,4 @@ class ViewModel : ViewModel() {`
`25`	`25`	`Attributes.of(AttributeKey.stringKey("FakeAttribute"), "FakeVal")`
`26`	`26`	`)`
`27`	`27`	`}`
`28`		`-}`
	`28`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -55,4 +55,4 @@ fun AndroidObservabilityTheme(`
`55`	`55`	`typography = Typography,`
`56`	`56`	`content = content`
`57`	`57`	`)`
`58`		`-}`
	`58`	`+}`