Merge branch '3.3.x' into enable_monitoring_filter_for_event_based_reloading

Author: wind57

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/PollingConfigMapChangeDetector.java

@@ -19,12 +19,11 @@
 import java.time.Duration;
 
 import jakarta.annotation.PostConstruct;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
 import org.springframework.core.env.AbstractEnvironment;
 import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.log.LogAccessor;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.support.PeriodicTrigger;
 
@@ -38,7 +37,7 @@
  */
 public class PollingConfigMapChangeDetector extends ConfigurationChangeDetector {
 
-	protected Log log = LogFactory.getLog(getClass());
+	private static final LogAccessor LOG = new LogAccessor(PollingConfigMapChangeDetector.class);
 
 	private final PropertySourceLocator propertySourceLocator;
 
@@ -48,6 +47,8 @@ public class PollingConfigMapChangeDetector extends ConfigurationChangeDetector
 
 	private final long period;
 
+	// this beans has already a Conditional on this property, we only have it here
+	// in case it is created manually.
 	private final boolean monitorConfigMaps;
 
 	public PollingConfigMapChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties,
@@ -63,19 +64,22 @@ public PollingConfigMapChangeDetector(AbstractEnvironment environment, ConfigRel
 
 	@PostConstruct
 	private void init() {
-		log.info("Kubernetes polling configMap change detector activated");
-		PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMillis(period));
-		trigger.setInitialDelay(Duration.ofMillis(period));
-		taskExecutor.schedule(this::executeCycle, trigger);
+		if (monitorConfigMaps) {
+			LOG.info(() -> "Kubernetes polling configMap change detector activated");
+			PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMillis(period));
+			trigger.setInitialDelay(Duration.ofMillis(period));
+			taskExecutor.schedule(this::executeCycle, trigger);
+		}
+		else {
+			LOG.debug(() -> "Kubernetes polling configMap change detector disabled");
+		}
 	}
 
 	private void executeCycle() {
-		if (monitorConfigMaps) {
-			boolean changedConfigMap = ConfigReloadUtil.reload(propertySourceLocator, environment, propertySourceClass);
-			if (changedConfigMap) {
-				log.info("Detected change in config maps");
-				reloadProperties();
-			}
+		boolean changedConfigMap = ConfigReloadUtil.reload(propertySourceLocator, environment, propertySourceClass);
+		if (changedConfigMap) {
+			LOG.info(() -> "Detected change in config maps");
+			reloadProperties();
 		}
 	}
 

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/PollingSecretsChangeDetector.java

@@ -19,12 +19,11 @@
 import java.time.Duration;
 
 import jakarta.annotation.PostConstruct;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
 import org.springframework.core.env.AbstractEnvironment;
 import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.log.LogAccessor;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.support.PeriodicTrigger;
 
@@ -38,7 +37,7 @@
  */
 public class PollingSecretsChangeDetector extends ConfigurationChangeDetector {
 
-	protected Log log = LogFactory.getLog(getClass());
+	private static final LogAccessor LOG = new LogAccessor(PollingSecretsChangeDetector.class);
 
 	private final PropertySourceLocator propertySourceLocator;
 
@@ -48,6 +47,8 @@ public class PollingSecretsChangeDetector extends ConfigurationChangeDetector {
 
 	private final long period;
 
+	// this beans has already a Conditional on this property, we only have it here
+	// in case it is created manually.
 	private final boolean monitorSecrets;
 
 	public PollingSecretsChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties,
@@ -63,19 +64,22 @@ public PollingSecretsChangeDetector(AbstractEnvironment environment, ConfigReloa
 
 	@PostConstruct
 	private void init() {
-		log.info("Kubernetes polling secrets change detector activated");
-		PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMillis(period));
-		trigger.setInitialDelay(Duration.ofMillis(period));
-		taskExecutor.schedule(this::executeCycle, trigger);
+		if (monitorSecrets) {
+			LOG.info(() -> "Kubernetes polling secrets change detector activated");
+			PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMillis(period));
+			trigger.setInitialDelay(Duration.ofMillis(period));
+			taskExecutor.schedule(this::executeCycle, trigger);
+		}
+		else {
+			LOG.info(() -> "Kubernetes polling secrets change detector disabled");
+		}
 	}
 
 	private void executeCycle() {
-		if (monitorSecrets) {
-			boolean changedSecrets = ConfigReloadUtil.reload(propertySourceLocator, environment, propertySourceClass);
-			if (changedSecrets) {
-				log.info("Detected change in secrets");
-				reloadProperties();
-			}
+		boolean changedSecrets = ConfigReloadUtil.reload(propertySourceLocator, environment, propertySourceClass);
+		if (changedSecrets) {
+			LOG.info(() -> "Detected change in secrets");
+			reloadProperties();
 		}
 	}