From 79bcd2eaa50ad03ffc05bb417849a47f6e2ea706 Mon Sep 17 00:00:00 2001 From: Paul Jeffrey Date: Wed, 7 Apr 2021 13:52:57 -0600 Subject: [PATCH] Issue-753 Adds debug logging of property source information (#760) Co-authored-by: Paul Jeffrey --- .../reload/ConfigurationChangeDetector.java | 18 ++++++++++++++++++ .../EventBasedConfigurationChangeDetector.java | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetector.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetector.java index 12034a49..3512e2e0 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetector.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetector.java @@ -102,6 +102,15 @@ public abstract class ConfigurationChangeDetector { this.log.warn( "The current number of ConfigMap PropertySources does not match " + "the ones loaded from the Kubernetes - No reload will take place"); + + if (log.isDebugEnabled()) { + this.log.debug(String.format("source 1: %d", l1.size())); + l1.forEach(item -> log.debug(item)); + + this.log.debug(String.format("source 2: %d", l2.size())); + l2.forEach(item -> log.debug(item)); + } + return false; } @@ -142,6 +151,11 @@ public abstract class ConfigurationChangeDetector { LinkedList> sources = toLinkedList( this.environment.getPropertySources()); + + this.log.debug("findPropertySources"); + this.log.debug(String.format("environment: %s", this.environment)); + this.log.debug(String.format("environment sources: %s", sources)); + while (!sources.isEmpty()) { PropertySource source = sources.pop(); if (source instanceof CompositePropertySource) { @@ -197,6 +211,10 @@ public abstract class ConfigurationChangeDetector { + propertySource.getClass()); } + this.log.debug("locateMapPropertySources"); + this.log.debug(String.format("environment: %s", environment)); + this.log.debug(String.format("sources: %s", result)); + return result; } diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetector.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetector.java index 6d7c0eba..8981985f 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetector.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetector.java @@ -141,6 +141,9 @@ public class EventBasedConfigurationChangeDetector extends ConfigurationChangeDe } private void onEvent(ConfigMap configMap) { + + this.log.debug(String.format("onEvent configMap: %s", configMap.toString())); + boolean changed = changed( locateMapPropertySources(this.configMapPropertySourceLocator, this.environment), @@ -152,6 +155,9 @@ public class EventBasedConfigurationChangeDetector extends ConfigurationChangeDe } private void onEvent(Secret secret) { + + this.log.debug(String.format("onEvent configMap: %s", secret.toString())); + boolean changed = changed( locateMapPropertySources(this.secretsPropertySourceLocator, this.environment),