Merge branch 'main' into agrognetti/O11Y-362

Author: agrognetti

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
-	"go": "0.3.1",
+	"go": "0.4.0",
 	"sdk/@launchdarkly/observability": "0.4.5",
 	"sdk/@launchdarkly/observability-android": "0.10.0",
 	"sdk/@launchdarkly/observability-dotnet": "0.3.0",

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

@@ -9,6 +9,7 @@ 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
@@ -27,22 +28,23 @@ class DisablingConfigOptionsE2ETest {
     private val application = ApplicationProvider.getApplicationContext<Application>() as TestApplication
 
     @Test
-    fun `Logs should not be exported when disableLogs is set to true`() {
-        application.pluginOptions = application.pluginOptions.copy(disableLogs = true)
+    fun `Logs should NOT be exported when disableLogs is set to true`() {
+        application.pluginOptions = getOptionsAllEnabled().copy(disableLogs = true)
         application.initForTest()
         val logsUrl = "http://localhost:${application.mockWebServer?.port}/v1/logs"
 
         triggerTestLog()
         LDObserve.flush()
         waitForTelemetryData(telemetryInspector = application.telemetryInspector, telemetryType = TelemetryType.LOGS)
+        val logsExported = application.telemetryInspector?.logExporter?.finishedLogRecordItems
 
-        assertNull(application.telemetryInspector?.logExporter)
+        assertTrue(logsExported?.isEmpty() == true)
         assertFalse(requestsContainsUrl(logsUrl))
     }
 
     @Test
     fun `Logs should be exported when disableLogs is set to false`() {
-        application.pluginOptions = application.pluginOptions.copy(disableLogs = false)
+        application.pluginOptions = getOptionsAllEnabled().copy(disableLogs = false)
         application.initForTest()
         val logsUrl = "http://localhost:${application.mockWebServer?.port}/v1/logs"
 
@@ -56,21 +58,23 @@ class DisablingConfigOptionsE2ETest {
 
     @Test
     fun `Spans should NOT be exported when disableTraces is set to true`() {
-        application.pluginOptions = application.pluginOptions.copy(disableTraces = true)
+        application.pluginOptions = getOptionsAllEnabled().copy(disableTraces = true)
         application.initForTest()
         val tracesUrl = "http://localhost:${application.mockWebServer?.port}/v1/traces"
 
         triggerTestSpan()
         LDObserve.flush()
+
         waitForTelemetryData(telemetryInspector = application.telemetryInspector, telemetryType = TelemetryType.SPANS)
+        val spansExported = application.telemetryInspector?.spanExporter?.finishedSpanItems
 
-        assertNull(application.telemetryInspector?.spanExporter)
+        assertTrue(spansExported?.isEmpty() == true)
         assertFalse(requestsContainsUrl(tracesUrl))
     }
 
     @Test
     fun `Spans should be exported when disableTraces is set to false`() {
-        application.pluginOptions = application.pluginOptions.copy(disableTraces = false)
+        application.pluginOptions = getOptionsAllEnabled().copy(disableTraces = false)
         application.initForTest()
         val tracesUrl = "http://localhost:${application.mockWebServer?.port}/v1/traces"
 
@@ -84,7 +88,7 @@ class DisablingConfigOptionsE2ETest {
 
     @Test
     fun `Metrics should NOT be exported when disableMetrics is set to true`() {
-        application.pluginOptions = application.pluginOptions.copy(disableMetrics = true)
+        application.pluginOptions = getOptionsAllEnabled().copy(disableMetrics = true)
         application.initForTest()
         val metricsUrl = "http://localhost:${application.mockWebServer?.port}/v1/metrics"
 
@@ -98,7 +102,7 @@ class DisablingConfigOptionsE2ETest {
 
     @Test
     fun `Metrics should be exported when disableMetrics is set to false`() {
-        application.pluginOptions = application.pluginOptions.copy(disableMetrics = false)
+        application.pluginOptions = getOptionsAllEnabled().copy(disableMetrics = false)
         application.initForTest()
         val metricsUrl = "http://localhost:${application.mockWebServer?.port}/v1/metrics"
 
@@ -112,7 +116,7 @@ class DisablingConfigOptionsE2ETest {
 
     @Test
     fun `Errors should NOT be exported when disableErrorTracking is set to true`() {
-        application.pluginOptions = application.pluginOptions.copy(disableErrorTracking = true)
+        application.pluginOptions = getOptionsAllEnabled().copy(disableErrorTracking = true)
         application.initForTest()
         val tracesUrl = "http://localhost:${application.mockWebServer?.port}/v1/traces"
 
@@ -127,8 +131,8 @@ class DisablingConfigOptionsE2ETest {
     }
 
     @Test
-    fun `Errors should be exported when disableErrorTracking is set to false`() {
-        application.pluginOptions = application.pluginOptions.copy(disableErrorTracking = false)
+    fun `Errors should be exported as spans when disableErrorTracking is set to false and disableTraces set to true`() {
+        application.pluginOptions = getOptionsAllEnabled().copy(disableTraces = true, disableErrorTracking = false)
         application.initForTest()
         val tracesUrl = "http://localhost:${application.mockWebServer?.port}/v1/traces"
 
@@ -146,6 +150,41 @@ class DisablingConfigOptionsE2ETest {
         )
     }
 
+    @Test
+    fun `Crashes should NOT be exported when disableErrorTracking is set to true`() {
+        application.pluginOptions = getOptionsAllEnabled().copy(disableErrorTracking = true)
+        application.initForTest()
+        val logsUrl = "http://localhost:${application.mockWebServer?.port}/v1/logs"
+
+        Thread { throw RuntimeException("Exception for testing") }.start()
+
+        waitForTelemetryData(telemetryInspector = application.telemetryInspector, telemetryType = TelemetryType.LOGS)
+        val logsExported = application.telemetryInspector?.logExporter?.finishedLogRecordItems
+
+        assertFalse(requestsContainsUrl(logsUrl))
+        assertEquals(0, logsExported?.size)
+    }
+
+    @Test
+    fun `Crashes should be exported as logs when disableErrorTracking is set to false and disableLogs set to true`() {
+        application.pluginOptions = getOptionsAllEnabled().copy(disableLogs = true, disableErrorTracking = false)
+        application.initForTest()
+        val logsUrl = "http://localhost:${application.mockWebServer?.port}/v1/logs"
+        val exceptionMessage = "Exception for testing"
+
+        Thread { throw RuntimeException(exceptionMessage) }.start()
+
+        waitForTelemetryData(telemetryInspector = application.telemetryInspector, telemetryType = TelemetryType.LOGS)
+        val logsExported = application.telemetryInspector?.logExporter?.finishedLogRecordItems
+
+        assertTrue(requestsContainsUrl(logsUrl))
+        assertEquals(1, logsExported?.size)
+        assertEquals(
+            exceptionMessage,
+            logsExported?.get(0)?.attributes?.get(AttributeKey.stringKey("exception.message"))
+        )
+    }
+
     private fun requestsContainsUrl(url: String): Boolean {
         while (true) {
             val request = application.mockWebServer?.takeRequest(100, TimeUnit.MILLISECONDS)
@@ -180,4 +219,14 @@ class DisablingConfigOptionsE2ETest {
     private fun triggerTestMetric() {
         LDObserve.recordMetric(Metric("test", 50.0))
     }
+
+    private fun getOptionsAllEnabled(): Options {
+        return Options(
+            debug = true,
+            disableTraces = false,
+            disableLogs = false,
+            disableMetrics = false,
+            disableErrorTracking = false
+        )
+    }
 }

e2e/go-plugin/go.mod

@@ -21,6 +21,7 @@ require (
 	github.com/bytedance/sonic v1.13.3 // indirect
 	github.com/bytedance/sonic/loader v0.2.4 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.9 // indirect
 	github.com/gin-contrib/sse v1.1.0 // indirect
@@ -38,13 +39,17 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/samber/lo v1.51.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.3.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.64.0 // indirect
-	github.com/vektah/gqlparser/v2 v2.5.19 // indirect
+	github.com/vektah/gqlparser/v2 v2.5.25 // indirect
 	go.opentelemetry.io/contrib v1.37.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect
+	go.opentelemetry.io/otel/sdk/log/logtest v0.14.0 // indirect
 	golang.org/x/arch v0.18.0 // indirect
 	golang.org/x/crypto v0.40.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -56,7 +61,7 @@ require (
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gregjones/httpcache v0.0.0-20171119193500-2bcd89a1743f // indirect
+	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/launchdarkly/ccache v1.1.0 // indirect
@@ -72,22 +77,22 @@ require (
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/bridges/otellogrus v0.12.0
 	go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.62.0
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0
-	go.opentelemetry.io/otel v1.37.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
+	go.opentelemetry.io/otel v1.38.0
 	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.13.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.37.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
-	go.opentelemetry.io/otel/log v0.13.0 // indirect
-	go.opentelemetry.io/otel/metric v1.37.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
-	go.opentelemetry.io/otel/sdk/log v0.13.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
-	go.opentelemetry.io/otel/trace v1.37.0
+	go.opentelemetry.io/otel/log v0.14.0 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
+	go.opentelemetry.io/otel/sdk/log v0.14.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
+	go.opentelemetry.io/otel/trace v1.38.0
 	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
 	golang.org/x/net v0.42.0 // indirect
 	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.34.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
 	golang.org/x/text v0.27.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect