From 3bf0f3d6e2530d7cea7665d6dc67a2d912a369e9 Mon Sep 17 00:00:00 2001 From: wonyongg <111210881+wonyongg@users.noreply.github.com> Date: Sun, 15 Jun 2025 03:59:16 +0900 Subject: [PATCH 1/2] Unify use of org.apache.logging.log4j.core.LoggerContext See gh-45967 Signed-off-by: wonyongg <111210881+wonyongg@users.noreply.github.com> --- .../metrics/Log4J2MetricsAutoConfiguration.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java index 9da1b3aef57..6a704717519 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java @@ -54,20 +54,20 @@ public class Log4J2MetricsAutoConfiguration { static class Log4JCoreLoggerContextCondition extends SpringBootCondition { + private static final String LOGGER_CONTEXT_CLASS_NAME = "org.apache.logging.log4j.core.LoggerContext"; + @Override public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { LoggerContext loggerContext = LogManager.getContext(false); try { - if (Class.forName("org.apache.logging.log4j.core.LoggerContext").isInstance(loggerContext)) { - return ConditionOutcome - .match("LoggerContext was an instance of org.apache.logging.log4j.core.LoggerContext"); + if (Class.forName(LOGGER_CONTEXT_CLASS_NAME).isInstance(loggerContext)) { + return ConditionOutcome.match("LoggerContext was an instance of " + LOGGER_CONTEXT_CLASS_NAME); } } catch (Throwable ex) { // Continue with no match } - return ConditionOutcome - .noMatch("Logger context was not an instance of org.apache.logging.log4j.core.LoggerContext"); + return ConditionOutcome.noMatch("LoggerContext was not an instance of " + LOGGER_CONTEXT_CLASS_NAME); } } From 543ac3617bf335347ade410d558dbb31e9ae7cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 17 Jun 2025 14:23:44 +0200 Subject: [PATCH 2/2] Update copyright year of changed file See gh-45967 --- .../autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java index 6a704717519..bfed81461ac 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.