Skip to content

fix map structured args in logstash #15341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trask merged 2 commits into from
Nov 19, 2025
Merged

fix map structured args in logstash #15341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fbc270
fix map structured args in logstash
zeitlinger Nov 17, 2025
426fa27
pr review
zeitlinger Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ...va/io/opentelemetry/instrumentation/logback/appender/v1_0/LogstashStructuredArgsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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")));
}
}
13 changes: 3 additions & 10 deletions ...a/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ private static boolean supportsLogstashStructuredArguments() {
private void captureLogstashStructuredArguments(LogRecordBuilder builder, Object[] arguments) {
for (Object argument : arguments) {
if (isLogstashStructuredArgument(argument)) {
captureLogstashStructuredArgument(builder, argument);
captureLogstashMarker(builder, argument);
}
}
}
Expand All @@ -649,15 +649,8 @@ private void captureLogstashStructuredArguments(LogRecordBuilder builder, Object
private static boolean isLogstashStructuredArgument(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) {
// StructuredArguments created by v() or keyValue() extend SingleFieldAppendingMarker
// which has getFieldName() and provides field value via reflection
SingleFieldAppendingMarker marker = (SingleFieldAppendingMarker) argument;
captureLogstashMarker(builder, marker);
return argument instanceof SingleFieldAppendingMarker
|| argument instanceof MapEntriesAppendingMarker;
}

private interface FieldReader {
Expand Down
Loading