Log MDC by default

mhalbritter · Jun 20, 2024 · bc46720 · bc46720
1 parent 087ddea
commit bc46720
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/...g-boot/src/main/java/org/springframework/boot/logging/log4j2/StructuredLoggingLayout.java b/...g-boot/src/main/java/org/springframework/boot/logging/log4j2/StructuredLoggingLayout.java
@@ -240,7 +240,7 @@ static final class Builder implements org.apache.logging.log4j.core.util.Builder
 		private String serviceEnvironment;
 
 		@PluginBuilderAttribute
-		private boolean logMdc = true;
+		private boolean logMdc;
 
 		@Override
 		public StructuredLoggingLayout build() {

diff --git a/...t/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java b/...t/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
@@ -161,6 +161,7 @@ private StructuredLoggingEncoder createStructuredLoggingEncoder(LogbackConfigura
 		encoder.setFormat(format);
 		encoder.setCharset(charset);
 		encoder.setPid(resolveLong(config, "${PID:--1}"));
+		encoder.setLogMdc(true);
 		String applicationName = resolve(config, "${APPLICATION_NAME:-}");
 		if (StringUtils.hasLength(applicationName)) {
 			encoder.setServiceName(applicationName);

diff --git a/...ct/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml b/...ct/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml
@@ -11,10 +11,10 @@
 		<Console name="Console" target="SYSTEM_OUT" follow="true">
 			<Select>
 				<StructuredLoggingEnabledArbiter appender="console">
-					<StructuredLoggingLayout format="${sys:CONSOLE_LOG_STRUCTURED}" charset="${sys:CONSOLE_LOG_CHARSET}"/>
+					<StructuredLoggingLayout format="${sys:CONSOLE_LOG_STRUCTURED}" charset="${sys:CONSOLE_LOG_CHARSET}" logMdc="true"/>
 				</StructuredLoggingEnabledArbiter>
 				<DefaultArbiter>
-					<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}" />
+					<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}"/>
 				</DefaultArbiter>
 			</Select>
 			<Filters>

diff --git a/...project/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml b/...project/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml
@@ -11,7 +11,7 @@
 		<Console name="Console" target="SYSTEM_OUT" follow="true">
 			<Select>
 				<StructuredLoggingEnabledArbiter appender="console">
-					<StructuredLoggingLayout format="${sys:CONSOLE_LOG_STRUCTURED}" charset="${sys:CONSOLE_LOG_CHARSET}"/>
+					<StructuredLoggingLayout format="${sys:CONSOLE_LOG_STRUCTURED}" charset="${sys:CONSOLE_LOG_CHARSET}" logMdc="true"/>
 				</StructuredLoggingEnabledArbiter>
 				<DefaultArbiter>
 					<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}"/>

diff --git a/...-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/application.properties b/...-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/resources/application.properties
@@ -4,5 +4,5 @@ sample.name=Andy
 # TODO MH: Remove
 #logging.structured.file=logfmt
 #logging.file.name=/home/mhalbritter/tmp/log.txt
-#logging.structured.console=custom
+logging.structured.console=logfmt
 #logging.structured.console=smoketest.simple.CustomFormat