Merge branch 'main' into rlamb/update-log-test-scenarios

Author: kinyoklion

.release-please-manifest.json

@@ -1,11 +1,11 @@
 {
-	"go": "0.3.0",
-	"sdk/@launchdarkly/observability": "0.4.3",
-	"sdk/@launchdarkly/observability-android": "0.9.0",
+	"go": "0.3.1",
+	"sdk/@launchdarkly/observability": "0.4.5",
+	"sdk/@launchdarkly/observability-android": "0.10.0",
 	"sdk/@launchdarkly/observability-dotnet": "0.3.0",
-	"sdk/@launchdarkly/observability-node": "0.3.0",
+	"sdk/@launchdarkly/observability-node": "0.3.1",
 	"sdk/@launchdarkly/observability-python": "0.1.1",
 	"sdk/@launchdarkly/observability-react-native": "0.6.0",
-	"sdk/@launchdarkly/session-replay": "0.4.3",
-	"sdk/highlight-run": "9.22.0"
+	"sdk/@launchdarkly/session-replay": "0.4.5",
+	"sdk/highlight-run": "9.22.2"
 }

e2e/android/app/build.gradle.kts

@@ -65,6 +65,9 @@ dependencies {
     implementation("io.opentelemetry.android.instrumentation:httpurlconnection-library:0.11.0-alpha")
     byteBuddy("io.opentelemetry.android.instrumentation:httpurlconnection-agent:0.11.0-alpha")
 
+    // Used for accessing the SignalFromDiskExporter class in TestApplication
+    implementation("io.opentelemetry.android:core:0.11.0-alpha")
+
     // OkHTTP instrumentation
     implementation("io.opentelemetry.android.instrumentation:okhttp3-library:0.11.0-alpha")
     byteBuddy("io.opentelemetry.android.instrumentation:okhttp3-agent:0.11.0-alpha")

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

@@ -1,6 +1,7 @@
 package com.example.androidobservability
 
 import com.launchdarkly.sdk.android.LDClient
+import io.opentelemetry.android.features.diskbuffering.SignalFromDiskExporter
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import java.net.InetAddress
@@ -48,6 +49,7 @@ class TestApplication : BaseApplication() {
             mockWebServer = null
         }
         LDClient.get().close()
+        SignalFromDiskExporter.resetForTesting()
         super.onTerminate()
     }
 }

go/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.3.1](https://github.com/launchdarkly/observability-sdk/compare/go/v0.3.0...go/v0.3.1) (2025-10-06)
+
+
+### Bug Fixes
+
+* Fix an issue where logging configuration could over-match for log records without a message or severity. ([#261](https://github.com/launchdarkly/observability-sdk/issues/261)) ([500a6bf](https://github.com/launchdarkly/observability-sdk/commit/500a6bf2e7801c8076405257a31ba4a629311e0b))
+
 ## [0.3.0](https://github.com/launchdarkly/observability-sdk/compare/go/v0.2.1...go/v0.3.0) (2025-09-23)
 
 

go/internal/metadata/metadata.go

@@ -6,5 +6,5 @@ const (
 
 	// InstrumentationVersion is the version of the instrumentation.
 	// This is automatically updated by the release process.
-	InstrumentationVersion = "0.0.0" // {{ x-release-please-version }}
+	InstrumentationVersion = "0.3.1" // {{ x-release-please-version }}
 )

go/internal/otel/custom_sampler.go

@@ -625,10 +625,12 @@ func (cs *CustomSampler) matchesLogConfig(
 
 	// Check message if defined
 	if messageConfig := config.GetMessage(); !isMatchConfigEmpty(&messageConfig) {
-		if record.Body().Kind() == log.KindString {
-			if !matchesValue(cs, &messageConfig, record.Body().AsString()) {
-				return false
-			}
+		// We only support string message bodies for now.
+		if record.Body().Kind() != log.KindString {
+			return false
+		}
+		if !matchesValue(cs, &messageConfig, record.Body().AsString()) {
+			return false
 		}
 	}
 

sdk/@launchdarkly/launchdarkly_flutter_observability/example/lib/main.dart

@@ -28,6 +28,9 @@ void main() {
           AutoEnvAttributes.enabled,
           plugins: [
             ObservabilityPlugin(
+              instrumentation: InstrumentationConfig(
+                debugPrint: DebugPrintSetting.always(),
+              ),
               applicationName: 'test-application',
               // This could be a semantic version or a git commit hash.
               // This demonstrates how to use an environment variable to set the hash.
@@ -57,6 +60,9 @@ void main() {
 
       // Any additional default error handling.
     },
+    // Used to intercept print statements. Generally print statements in
+    // production are treated as a warning and this is not required.
+    zoneSpecification: Observe.zoneSpecification(),
   );
 }
 
@@ -197,6 +203,19 @@ class _MyHomePageState extends State<MyHomePage> {
               },
               child: const Text('Record error log with stack trace'),
             ),
+            ElevatedButton(
+              onPressed: () {
+                debugPrint("This is a message from debug print");
+              },
+              child: const Text('Call debugPrint'),
+            ),
+            ElevatedButton(
+              onPressed: () {
+                // ignore: avoid_print
+                print('This is a message from print');
+              },
+              child: const Text('Call print'),
+            ),
             const Text('You have pushed the button this many times:'),
             Text(
               '$_counter',

sdk/@launchdarkly/launchdarkly_flutter_observability/lib/launchdarkly_flutter_observability.dart

@@ -1,4 +1,6 @@
 export 'src/plugin/observability_plugin.dart' show ObservabilityPlugin;
+export 'src/plugin/observability_config.dart'
+    show InstrumentationConfig, DebugPrintSetting;
 export 'src/observe.dart' show Observe;
 export 'src/api/attribute.dart'
     show

sdk/@launchdarkly/launchdarkly_flutter_observability/lib/src/instrumentation/debug_print.dart

@@ -0,0 +1,41 @@
+import 'package:flutter/foundation.dart';
+import 'package:launchdarkly_flutter_observability/src/instrumentation/instrumentation.dart';
+
+import '../plugin/observability_config.dart';
+import '../observe.dart';
+
+class DebugPrintInstrumentation implements Instrumentation {
+  DebugPrintCallback? _originalCallback;
+
+  DebugPrintInstrumentation(InstrumentationConfig config) {
+    switch (config.debugPrint) {
+      case DebugPrintReleaseOnly():
+        if (!kReleaseMode) {
+          return;
+        }
+      case DebugPrintAlways():
+        break;
+      case DebugPrintDisabled():
+        return;
+    }
+    _instrument();
+  }
+
+  void _instrument() {
+    _originalCallback = debugPrint;
+
+    debugPrint = (String? message, {int? wrapWidth}) {
+      if (message != null) {
+        Observe.recordLog(message, severity: 'debug');
+      }
+    };
+  }
+
+  @override
+  void dispose() {
+    if (_originalCallback != null) {
+      debugPrint = _originalCallback!;
+      _originalCallback = null;
+    }
+  }
+}

sdk/@launchdarkly/launchdarkly_flutter_observability/lib/src/instrumentation/instrumentation.dart

@@ -1,2 +1,4 @@
 /// Interfaces which instrumentations should implement.
-interface class Instrumentation {}
+abstract interface class Instrumentation {
+  void dispose();
+}