Skip to content

Commit 1f894bf

Browse files
authored
Consider log4j2.formatMsgNoLookups for additionalFields (#157)
1 parent 9e8822d commit 1f894bf

File tree

1 file changed

+4
-1
lines changed
  • log4j2-ecs-layout/src/main/java/co/elastic/logging/log4j2

1 file changed

+4
-1
lines changed

log4j2-ecs-layout/src/main/java/co/elastic/logging/log4j2/EcsLayout.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.apache.logging.log4j.message.Message;
4949
import org.apache.logging.log4j.message.MultiformatMessage;
5050
import org.apache.logging.log4j.message.ObjectMessage;
51+
import org.apache.logging.log4j.util.PropertiesUtil;
5152
import org.apache.logging.log4j.util.StringBuilderFormattable;
5253

5354
import java.nio.charset.Charset;
@@ -63,6 +64,8 @@ public class EcsLayout extends AbstractStringLayout {
6364
private static final ObjectMessageJacksonSerializer JACKSON_SERIALIZER = ObjectMessageJacksonSerializer.Resolver.resolve();
6465
private static final MdcSerializer MDC_SERIALIZER = MdcSerializer.Resolver.resolve();
6566
private static final MultiFormatHandler MULTI_FORMAT_HANDLER = MultiFormatHandler.Resolver.resolve();
67+
private static final boolean FORMAT_MESSAGES_PATTERN_DISABLE_LOOKUPS = PropertiesUtil.getProperties().getBooleanProperty(
68+
"log4j2.formatMsgNoLookups", false);
6669

6770
private final KeyValuePair[] additionalFields;
6871
private final PatternFormatter[][] fieldValuePatternFormatter;
@@ -156,7 +159,7 @@ private void serializeAdditionalFieldsAndMDC(LogEvent event, StringBuilder build
156159
if (buffer.length() > 0) {
157160
value = buffer;
158161
}
159-
} else if (valueNeedsLookup(additionalField.getValue())) {
162+
} else if (valueNeedsLookup(additionalField.getValue()) && !FORMAT_MESSAGES_PATTERN_DISABLE_LOOKUPS) {
160163
StringBuilder lookupValue = EcsJsonSerializer.getMessageStringBuilder();
161164
lookupValue.append(additionalField.getValue());
162165
if (strSubstitutor.replaceIn(event, lookupValue)) {

0 commit comments

Comments
 (0)