@@ -639,41 +639,18 @@ private static boolean supportsLogstashStructuredArguments() {
639639 @ NoMuzzle
640640 private void captureLogstashStructuredArguments (LogRecordBuilder builder , Object [] arguments ) {
641641 for (Object argument : arguments ) {
642- if (isLogstashSingleStructuredArgument (argument )) {
643- captureLogstashSingleStructuredArgument (builder , argument );
644- }
645- if (isLogstashMapStructuredArgument (argument )) {
646- captureLogstashMapStructuredArgument (builder , argument );
642+ if (isLogstashStructuredArgument (argument )) {
643+ captureLogstashMarker (builder , argument );
647644 }
648645 }
649646 }
650647
651648 @ NoMuzzle
652- private static boolean isLogstashSingleStructuredArgument (Object argument ) {
653- // StructuredArguments implement the marker interface, so we can check for it
654- // without importing the class directly (which may not be available at runtime)
655- return argument instanceof SingleFieldAppendingMarker ;
656- }
657-
658- @ NoMuzzle
659- private void captureLogstashSingleStructuredArgument (LogRecordBuilder builder , Object argument ) {
660- // StructuredArguments created by v() or keyValue() extend SingleFieldAppendingMarker
661- // which has getFieldName() and provides field value via reflection
662- SingleFieldAppendingMarker marker = (SingleFieldAppendingMarker ) argument ;
663- captureLogstashMarker (builder , marker );
664- }
665-
666- @ NoMuzzle
667- private static boolean isLogstashMapStructuredArgument (Object argument ) {
649+ private static boolean isLogstashStructuredArgument (Object argument ) {
668650 // StructuredArguments implement the marker interface, so we can check for it
669651 // without importing the class directly (which may not be available at runtime)
670- return argument instanceof MapEntriesAppendingMarker ;
671- }
672-
673- @ NoMuzzle
674- private void captureLogstashMapStructuredArgument (LogRecordBuilder builder , Object argument ) {
675- MapEntriesAppendingMarker marker = (MapEntriesAppendingMarker ) argument ;
676- captureLogstashMarker (builder , marker );
652+ return argument instanceof SingleFieldAppendingMarker
653+ || argument instanceof MapEntriesAppendingMarker ;
677654 }
678655
679656 private interface FieldReader {
0 commit comments