Polish "Add standardized property to distinguish a group of applicati…

…ons" See gh-39957
spring-projects · Jul 3, 2024 · de001f5 · de001f5
1 parent 8ddb77f
commit de001f5
Show file tree

Hide file tree

Showing 20 changed files with 73 additions and 44 deletions.
diff --git a/...framework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesConfigAdapter.java b/...framework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesConfigAdapter.java
@@ -28,6 +28,7 @@
 import org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryProperties;
 import org.springframework.core.env.Environment;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * Adapter to convert {@link OtlpProperties} to an {@link OtlpConfig}.
@@ -43,11 +44,6 @@ class OtlpPropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter<Ot
 	 */
 	private static final String DEFAULT_APPLICATION_NAME = "unknown_service";
 
-	/**
-	 * Default value for application group if {@code spring.application.group} is not set.
-	 */
-	private static final String DEFAULT_APPLICATION_GROUP = "unknown_group";
-
 	private final OpenTelemetryProperties openTelemetryProperties;
 
 	private final OtlpMetricsConnectionDetails connectionDetails;
@@ -93,7 +89,8 @@ private String getApplicationName() {
 	}
 
 	private String getApplicationGroup() {
-		return this.environment.getProperty("spring.application.group", DEFAULT_APPLICATION_GROUP);
+		String applicationGroup = this.environment.getProperty("spring.application.group");
+		return (StringUtils.hasLength(applicationGroup)) ? applicationGroup : null;
 	}
 
 	@Override

diff --git a/...ingframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryAutoConfiguration.java b/...ingframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryAutoConfiguration.java
@@ -36,6 +36,7 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for OpenTelemetry.
@@ -53,11 +54,6 @@ public class OpenTelemetryAutoConfiguration {
 	 */
 	private static final String DEFAULT_APPLICATION_NAME = "unknown_service";
 
-	/**
-	 * Default value for application group if {@code spring.application.group} is not set.
-	 */
-	private static final String DEFAULT_APPLICATION_GROUP = "unknown_group";
-
 	private static final AttributeKey<String> ATTRIBUTE_KEY_SERVICE_NAME = AttributeKey.stringKey("service.name");
 
 	private static final AttributeKey<String> ATTRIBUTE_KEY_SERVICE_GROUP = AttributeKey.stringKey("service.group");
@@ -79,11 +75,13 @@ OpenTelemetrySdk openTelemetry(ObjectProvider<SdkTracerProvider> tracerProvider,
 	@ConditionalOnMissingBean
 	Resource openTelemetryResource(Environment environment, OpenTelemetryProperties properties) {
 		String applicationName = environment.getProperty("spring.application.name", DEFAULT_APPLICATION_NAME);
-		String applicationGroup = environment.getProperty("spring.application.group", DEFAULT_APPLICATION_GROUP);
-		return Resource.getDefault()
-			.merge(Resource.create(Attributes.of(ATTRIBUTE_KEY_SERVICE_NAME, applicationName)))
-			.merge(Resource.create(Attributes.of(ATTRIBUTE_KEY_SERVICE_GROUP, applicationGroup)))
-			.merge(toResource(properties));
+		String applicationGroup = environment.getProperty("spring.application.group");
+		Resource resource = Resource.getDefault()
+			.merge(Resource.create(Attributes.of(ATTRIBUTE_KEY_SERVICE_NAME, applicationName)));
+		if (StringUtils.hasLength(applicationGroup)) {
+			resource = resource.merge(Resource.create(Attributes.of(ATTRIBUTE_KEY_SERVICE_GROUP, applicationGroup)));
+		}
+		return resource.merge(toResource(properties));
 	}
 
 	private static Resource toResource(OpenTelemetryProperties properties) {

diff --git a/...work/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesConfigAdapterTests.java b/...work/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesConfigAdapterTests.java
@@ -162,7 +162,7 @@ void shouldUseApplicationGroupIfServiceGroupIsNotSet() {
 
 	@Test
 	void shouldUseDefaultApplicationGroupIfApplicationGroupIsNotSet() {
-		assertThat(createAdapter().resourceAttributes()).containsEntry("service.group", "unknown_group");
+		assertThat(createAdapter().resourceAttributes()).doesNotContainKey("service.group");
 	}
 
 	private OtlpPropertiesConfigAdapter createAdapter() {

diff --git a/...amework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryAutoConfigurationTests.java b/...amework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryAutoConfigurationTests.java
@@ -90,6 +90,23 @@ void shouldApplySpringApplicationNameToResource() {
 		});
 	}
 
+	@Test
+	void shouldApplySpringApplicationGroupToResource() {
+		this.runner.withPropertyValues("spring.application.group=my-group").run((context) -> {
+			Resource resource = context.getBean(Resource.class);
+			assertThat(resource.getAttributes().asMap())
+				.contains(entry(AttributeKey.stringKey("service.group"), "my-group"));
+		});
+	}
+
+	@Test
+	void shouldNotApplySpringApplicationGroupIfNotSet() {
+		this.runner.run((context) -> {
+			Resource resource = context.getBean(Resource.class);
+			assertThat(resource.getAttributes().asMap()).doesNotContainKey(AttributeKey.stringKey("service.group"));
+		});
+	}
+
 	@Test
 	void shouldFallbackToDefaultApplicationNameIfSpringApplicationNameIsNotSet() {
 		this.runner.run((context) -> {

diff --git a/...oot-docs/src/docs/antora/modules/how-to/pages/properties-and-configuration.adoc b/...oot-docs/src/docs/antora/modules/how-to/pages/properties-and-configuration.adoc
@@ -204,7 +204,6 @@ The preceding example YAML corresponds to the following `application.properties`
 [source,properties,subs="verbatim",configprops]
 ----
 spring.application.name=cruncher
-spring.application.group=crunchGroup
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost/test
 server.port=9000

diff --git a/.../spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/tracing.adoc b/.../spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/tracing.adoc
@@ -88,10 +88,9 @@ logging:
   pattern:
     correlation: "[${spring.application.name:},%X{traceId:-},%X{spanId:-}] "
   include-application-name: false
-  include-application-group: false
 ----
 
-NOTE: In the example above, configprop:logging.include-application-name[] and configprop:logging.include-application-group[] is set to `false` to avoid the application name being duplicated in the log messages (configprop:logging.pattern.correlation[] already contains it).
+NOTE: In the example above, configprop:logging.include-application-name[] is set to `false` to avoid the application name being duplicated in the log messages (configprop:logging.pattern.correlation[] already contains it).
 It's also worth mentioning that configprop:logging.pattern.correlation[] contains a trailing space so that it is separated from the logger name that comes right after it by default.
 
 

diff --git a/.../spring-boot-docs/src/docs/antora/modules/reference/pages/features/logging.adoc b/.../spring-boot-docs/src/docs/antora/modules/reference/pages/features/logging.adoc
@@ -44,6 +44,7 @@ NOTE: Logback does not have a `FATAL` level.
 It is mapped to `ERROR`.
 
 TIP: If you have a configprop:spring.application.name[] property but don't want it logged you can set configprop:logging.include-application-name[] to `false`.
+
 TIP: If you have a configprop:spring.application.group[] property but don't want it logged you can set configprop:logging.include-application-group[] to `false`.
 
 

diff --git a/...t/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java b/...t/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java
@@ -260,7 +260,7 @@ private void setApplicationGroupSystemProperty(PropertyResolver resolver) {
 		if (resolver.getProperty("logging.include-application-group", Boolean.class, Boolean.TRUE)) {
 			String applicationGroup = resolver.getProperty("spring.application.group");
 			if (StringUtils.hasText(applicationGroup)) {
-				setSystemProperty(LoggingSystemProperty.APPLICATION_GROUP.getEnvironmentVariableName(),
+				setSystemProperty(LoggingSystemProperty.LOGGED_APPLICATION_GROUP.getEnvironmentVariableName(),
 						"[%s] ".formatted(applicationGroup));
 			}
 		}

diff --git a/...ect/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperty.java b/...ect/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperty.java
@@ -33,7 +33,7 @@ public enum LoggingSystemProperty {
 	/**
 	 * Logging system property for the application group that should be logged.
 	 */
-	APPLICATION_GROUP("LOGGED_APPLICATION_GROUP"),
+	LOGGED_APPLICATION_GROUP("LOGGED_APPLICATION_GROUP"),
 
 	/**
 	 * Logging system property for the process ID.

diff --git a/...oot/src/main/java/org/springframework/boot/logging/logback/ApplicationGroupConverter.java b/...oot/src/main/java/org/springframework/boot/logging/logback/ApplicationGroupConverter.java
@@ -24,9 +24,9 @@
 
 /**
  * Logback {@link ClassicConverter} to convert the
- * {@link LoggingSystemProperty#APPLICATION_GROUP APPLICATION_GROUP} into a value suitable
- * for logging. Similar to Logback's {@link PropertyConverter} but a non-existent property
- * is logged as an empty string rather than {@code null}.
+ * {@link LoggingSystemProperty#LOGGED_APPLICATION_GROUP APPLICATION_GROUP} into a value
+ * suitable for logging. Similar to Logback's {@link PropertyConverter} but a non-existent
+ * property is logged as an empty string rather than {@code null}.
  *
  * @author Jakob Wanger
  * @since 3.4.0
@@ -37,9 +37,10 @@ public class ApplicationGroupConverter extends ClassicConverter {
 	public String convert(ILoggingEvent event) {
 		String applicationGroup = event.getLoggerContextVO()
 			.getPropertyMap()
-			.get(LoggingSystemProperty.APPLICATION_GROUP.getEnvironmentVariableName());
+			.get(LoggingSystemProperty.LOGGED_APPLICATION_GROUP.getEnvironmentVariableName());
 		if (applicationGroup == null) {
-			applicationGroup = System.getProperty(LoggingSystemProperty.APPLICATION_GROUP.getEnvironmentVariableName());
+			applicationGroup = System
+				.getProperty(LoggingSystemProperty.LOGGED_APPLICATION_GROUP.getEnvironmentVariableName());
 			if (applicationGroup == null) {
 				applicationGroup = "";
 			}

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
@@ -68,16 +68,16 @@ void apply(LogbackConfigurator config) {
 	}
 
 	private void defaults(LogbackConfigurator config) {
-		config.conversionRule("applicationName", ApplicationNameConverter.class);
 		config.conversionRule("applicationGroup", ApplicationGroupConverter.class);
+		config.conversionRule("applicationName", ApplicationNameConverter.class);
 		config.conversionRule("clr", ColorConverter.class);
 		config.conversionRule("correlationId", CorrelationIdConverter.class);
 		config.conversionRule("wex", WhitespaceThrowableProxyConverter.class);
 		config.conversionRule("wEx", ExtendedWhitespaceThrowableProxyConverter.class);
 		config.getContext()
 			.putProperty("CONSOLE_LOG_PATTERN", resolve(config, "${CONSOLE_LOG_PATTERN:-"
 					+ "%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) "
-					+ "%clr(${PID:- }){magenta} %clr(---){faint} %clr(%applicationName[%15.15t]){faint} %clr(---){faint} %clr(%applicationGroup[%15.15t]){faint} "
+					+ "%clr(${PID:- }){magenta} %clr(---){faint} %clr(%applicationName%applicationGroup[%15.15t]){faint} "
 					+ "%clr(${LOG_CORRELATION_PATTERN:-}){faint}%clr(%-40.40logger{39}){cyan} "
 					+ "%clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"));
 		String defaultCharset = Charset.defaultCharset().name();
@@ -86,7 +86,7 @@ private void defaults(LogbackConfigurator config) {
 		config.getContext().putProperty("CONSOLE_LOG_THRESHOLD", resolve(config, "${CONSOLE_LOG_THRESHOLD:-TRACE}"));
 		config.getContext()
 			.putProperty("FILE_LOG_PATTERN", resolve(config, "${FILE_LOG_PATTERN:-"
-					+ "%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- %applicationName[%t] --- %applicationGroup[%t] "
+					+ "%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- %applicationName%applicationGroup[%t] "
 					+ "${LOG_CORRELATION_PATTERN:-}"
 					+ "%-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"));
 		config.getContext()

diff --git a/...ect/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...ect/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -103,6 +103,13 @@
       "description": "Log groups to quickly change multiple loggers at the same time. For instance, `logging.group.db=org.hibernate,org.springframework.jdbc`.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
     },
+    {
+      "name": "logging.include-application-group",
+      "type": "java.lang.Boolean",
+      "description": "Whether to include the application group in the logs.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": true
+    },
     {
       "name": "logging.include-application-name",
       "type": "java.lang.Boolean",
@@ -228,6 +235,11 @@
       "description": "Log level threshold for file output.",
       "defaultValue": "TRACE"
     },
+    {
+      "name": "spring.application.group",
+      "type": "java.lang.String",
+      "description": "Application group."
+    },
     {
       "name": "spring.application.index",
       "type": "java.lang.Integer",

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
@@ -4,8 +4,8 @@
 		<Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
 		<Property name="LOG_LEVEL_PATTERN">%5p</Property>
 		<Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd'T'HH:mm:ss.SSSXXX</Property>
-		<Property name="CONSOLE_LOG_PATTERN">%clr{%d{${sys:LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${sys:LOG_LEVEL_PATTERN}} %clr{%pid}{magenta} %clr{---}{faint} %clr{${sys:LOGGED_APPLICATION_NAME:-}[%15.15t]}{faint} %clr{---}{faint} %clr{${sys:LOGGED_APPLICATION_GROUP:-}[%15.15t]}{faint} %clr{${sys:LOG_CORRELATION_PATTERN:-}}{faint}%clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-		<Property name="FILE_LOG_PATTERN">%d{${sys:LOG_DATEFORMAT_PATTERN}} ${sys:LOG_LEVEL_PATTERN} %pid --- ${sys:LOGGED_APPLICATION_NAME:-} --- ${sys:LOGGED_APPLICATION_GROUP:-}[%t] ${sys:LOG_CORRELATION_PATTERN:-}%-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
+		<Property name="CONSOLE_LOG_PATTERN">%clr{%d{${sys:LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${sys:LOG_LEVEL_PATTERN}} %clr{%pid}{magenta} %clr{---}{faint} %clr{${sys:LOGGED_APPLICATION_NAME:-}${sys:LOGGED_APPLICATION_GROUP:-}[%15.15t]}{faint} %clr{${sys:LOG_CORRELATION_PATTERN:-}}{faint}%clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
+		<Property name="FILE_LOG_PATTERN">%d{${sys:LOG_DATEFORMAT_PATTERN}} ${sys:LOG_LEVEL_PATTERN} %pid --- ${sys:LOGGED_APPLICATION_NAME:-}${sys:LOGGED_APPLICATION_GROUP:-}[%t] ${sys:LOG_CORRELATION_PATTERN:-}%-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
 	</Properties>
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT" follow="true">

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
@@ -4,8 +4,8 @@
 		<Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
 		<Property name="LOG_LEVEL_PATTERN">%5p</Property>
 		<Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd'T'HH:mm:ss.SSSXXX</Property>
-		<Property name="CONSOLE_LOG_PATTERN">%clr{%d{${sys:LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${sys:LOG_LEVEL_PATTERN}} %clr{%pid}{magenta} %clr{---}{faint} %clr{${sys:LOGGED_APPLICATION_NAME:-}[%15.15t]} {faint}%clr{---}{faint} %clr{${sys:LOGGED_APPLICATION_GROUP:-}[%15.15t]}{faint} %clr{${sys:LOG_CORRELATION_PATTERN:-}}{faint}%clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-		<Property name="FILE_LOG_PATTERN">%d{${sys:LOG_DATEFORMAT_PATTERN}} ${sys:LOG_LEVEL_PATTERN} %pid --- ${sys:LOGGED_APPLICATION_NAME:-} --- ${sys:LOGGED_APPLICATION_GROUP:-}[%t] ${sys:LOG_CORRELATION_PATTERN:-}%-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
+		<Property name="CONSOLE_LOG_PATTERN">%clr{%d{${sys:LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${sys:LOG_LEVEL_PATTERN}} %clr{%pid}{magenta} %clr{---}{faint} %clr{${sys:LOGGED_APPLICATION_NAME:-}${sys:LOGGED_APPLICATION_GROUP:-}[%15.15t]}{faint} %clr{${sys:LOG_CORRELATION_PATTERN:-}}{faint}%clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
+		<Property name="FILE_LOG_PATTERN">%d{${sys:LOG_DATEFORMAT_PATTERN}} ${sys:LOG_LEVEL_PATTERN} %pid --- ${sys:LOGGED_APPLICATION_NAME:-}${sys:LOGGED_APPLICATION_GROUP:-}[%t] ${sys:LOG_CORRELATION_PATTERN:-}%-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
 	</Properties>
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT" follow="true">

diff --git a/...ject/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml b/...ject/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml
@@ -5,17 +5,17 @@ Default logback configuration provided for import
 -->
 
 <included>
-	<conversionRule conversionWord="applicationName" converterClass="org.springframework.boot.logging.logback.ApplicationNameConverter" />
 	<conversionRule conversionWord="applicationGroup" converterClass="org.springframework.boot.logging.logback.ApplicationGroupConverter" />
+	<conversionRule conversionWord="applicationName" converterClass="org.springframework.boot.logging.logback.ApplicationNameConverter" />
 	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
 	<conversionRule conversionWord="correlationId" converterClass="org.springframework.boot.logging.logback.CorrelationIdConverter" />
 	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
 	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
 
-	<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr(%applicationName[%15.15t]){faint} %clr(---){faint} %clr(%applicationGroup[%15.15t]){faint} %clr(${LOG_CORRELATION_PATTERN:-}){faint}%clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr(%applicationName%applicationGroup[%15.15t]){faint} %clr(${LOG_CORRELATION_PATTERN:-}){faint}%clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 	<property name="CONSOLE_LOG_CHARSET" value="${CONSOLE_LOG_CHARSET:-${file.encoding:-UTF-8}}"/>
 	<property name="CONSOLE_LOG_THRESHOLD" value="${CONSOLE_LOG_THRESHOLD:-TRACE}"/>
-	<property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- %applicationName[%t] --- %applicationGroup[%t] ${LOG_CORRELATION_PATTERN:-}%-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- %applicationName%applicationGroup[%t] ${LOG_CORRELATION_PATTERN:-}%-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 	<property name="FILE_LOG_CHARSET" value="${FILE_LOG_CHARSET:-${file.encoding:-UTF-8}}"/>
 	<property name="FILE_LOG_THRESHOLD" value="${FILE_LOG_THRESHOLD:-TRACE}"/>
 

diff --git a/...ing-boot/src/test/java/org/springframework/boot/logging/LoggingSystemPropertiesTests.java b/...ing-boot/src/test/java/org/springframework/boot/logging/LoggingSystemPropertiesTests.java
@@ -159,20 +159,20 @@ void loggedApplicationNameWhenApplicationNameLoggingDisabled() {
 	@Test
 	void loggedApplicationGroupWhenHasApplicationGroup() {
 		new LoggingSystemProperties(new MockEnvironment().withProperty("spring.application.group", "test")).apply(null);
-		assertThat(getSystemProperty(LoggingSystemProperty.APPLICATION_GROUP)).isEqualTo("[test] ");
+		assertThat(getSystemProperty(LoggingSystemProperty.LOGGED_APPLICATION_GROUP)).isEqualTo("[test] ");
 	}
 
 	@Test
 	void loggedApplicationGroupWhenHasNoApplicationGroup() {
 		new LoggingSystemProperties(new MockEnvironment()).apply(null);
-		assertThat(getSystemProperty(LoggingSystemProperty.APPLICATION_GROUP)).isNull();
+		assertThat(getSystemProperty(LoggingSystemProperty.LOGGED_APPLICATION_GROUP)).isNull();
 	}
 
 	@Test
 	void loggedApplicationGroupWhenApplicationGroupLoggingDisabled() {
 		new LoggingSystemProperties(new MockEnvironment().withProperty("spring.application.group", "test")
 			.withProperty("logging.include-application-group", "false")).apply(null);
-		assertThat(getSystemProperty(LoggingSystemProperty.APPLICATION_GROUP)).isNull();
+		assertThat(getSystemProperty(LoggingSystemProperty.LOGGED_APPLICATION_GROUP)).isNull();
 	}
 
 	@Test

diff --git a/...rc/test/java/org/springframework/boot/logging/logback/ApplicationGroupConverterTests.java b/...rc/test/java/org/springframework/boot/logging/logback/ApplicationGroupConverterTests.java
@@ -65,16 +65,16 @@ void whenLoggedApplicationGroupConvertReturnsIt() {
 
 	private void withLoggedApplicationGroup(String group, Runnable action) {
 		if (group == null) {
-			System.clearProperty(LoggingSystemProperty.APPLICATION_GROUP.getEnvironmentVariableName());
+			System.clearProperty(LoggingSystemProperty.LOGGED_APPLICATION_GROUP.getEnvironmentVariableName());
 		}
 		else {
-			System.setProperty(LoggingSystemProperty.APPLICATION_GROUP.getEnvironmentVariableName(), group);
+			System.setProperty(LoggingSystemProperty.LOGGED_APPLICATION_GROUP.getEnvironmentVariableName(), group);
 		}
 		try {
 			action.run();
 		}
 		finally {
-			System.clearProperty(LoggingSystemProperty.APPLICATION_GROUP.getEnvironmentVariableName());
+			System.clearProperty(LoggingSystemProperty.LOGGED_APPLICATION_GROUP.getEnvironmentVariableName());
 		}
 	}
 

diff --git a/...ke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/application.properties b/...ke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/application.properties
@@ -1,4 +1,7 @@
 spring.application.name=sample
+spring.application.group=sample-group
+#logging.include-application-name=false
+#logging.include-application-group=false
 spring.security.user.name=user
 spring.security.user.password=password
 management.endpoint.shutdown.enabled=true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,6 +44,7 @@ NOTE: Logback does not have a `FATAL` level.
		It is mapped to `ERROR`.

		TIP: If you have a configprop:spring.application.name[] property but don't want it logged you can set configprop:logging.include-application-name[] to `false`.

		TIP: If you have a configprop:spring.application.group[] property but don't want it logged you can set configprop:logging.include-application-group[] to `false`.


Expand Down