fix map structured args in logstash

instrumentation/logback/logback-appender-1.0/library/src/logstashStructuredArgsTest/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogstashStructuredArgsTest.java

@@ -9,6 +9,8 @@
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
+import java.util.HashMap;
+import java.util.Map;
 import net.logstash.logback.argument.StructuredArguments;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -90,4 +92,17 @@ void structuredArgumentsWithTypedValues() {
                 equalTo(AttributeKey.longKey("timestamp"), timestamp),
                 equalTo(AttributeKey.booleanKey("session_active"), true)));
   }
+
+  @Test
+  void logWithStructuredArgument() {
+    Map<String, Object> eventData = new HashMap<>();
+    eventData.put("foo", "bar");
+    logger.info("message: {}", StructuredArguments.entries(eventData));
+
+    testing.waitAndAssertLogRecords(
+        logRecord ->
+            logRecord
+                .hasBody("message: {foo=bar}")
+                .hasAttributesSatisfying(equalTo(AttributeKey.stringKey("foo"), "bar")));
+  }
 }

instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java

@@ -639,27 +639,43 @@ private static boolean supportsLogstashStructuredArguments() {
   @NoMuzzle
   private void captureLogstashStructuredArguments(LogRecordBuilder builder, Object[] arguments) {
     for (Object argument : arguments) {
-      if (isLogstashStructuredArgument(argument)) {
-        captureLogstashStructuredArgument(builder, argument);
+      if (isLogstashSingleStructuredArgument(argument)) {
+        captureLogstashSingleStructuredArgument(builder, argument);
+      }
+      if (isLogstashMapStructuredArgument(argument)) {
+        captureLogstashMapStructuredArgument(builder, argument);
       }
     }
   }
 
   @NoMuzzle
-  private static boolean isLogstashStructuredArgument(Object argument) {
+  private static boolean isLogstashSingleStructuredArgument(Object argument) {
     // StructuredArguments implement the marker interface, so we can check for it
     // without importing the class directly (which may not be available at runtime)
     return argument instanceof SingleFieldAppendingMarker;
   }
 
   @NoMuzzle
-  private void captureLogstashStructuredArgument(LogRecordBuilder builder, Object argument) {
+  private void captureLogstashSingleStructuredArgument(LogRecordBuilder builder, Object argument) {
     // StructuredArguments created by v() or keyValue() extend SingleFieldAppendingMarker
     // which has getFieldName() and provides field value via reflection
     SingleFieldAppendingMarker marker = (SingleFieldAppendingMarker) argument;
     captureLogstashMarker(builder, marker);
   }
 
+  @NoMuzzle
+  private static boolean isLogstashMapStructuredArgument(Object argument) {
+    // StructuredArguments implement the marker interface, so we can check for it
+    // without importing the class directly (which may not be available at runtime)
+    return argument instanceof MapEntriesAppendingMarker;
+  }
+
+  @NoMuzzle
+  private void captureLogstashMapStructuredArgument(LogRecordBuilder builder, Object argument) {
+    MapEntriesAppendingMarker marker = (MapEntriesAppendingMarker) argument;
+    captureLogstashMarker(builder, marker);
+  }
+
   private interface FieldReader {
     void read(LogRecordBuilder builder, Object logstashMarker, boolean captureEventName);
   }