fix the conditions for resetting uuid in dynamic configuration (#588)

Author: xzyJavaX

CHANGES.md

@@ -149,6 +149,7 @@ Callable {
 * Upgrade guava to 32.0.1
 * Fix issue with duplicate enhancement by ThreadPoolExecutor
 * Add plugin to support for RESTeasy 6.x.
+* Fix the conditions for resetting uuid, avoid the same uuid causing the configuration not to be updated. 
 
 #### Documentation
 

apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/dynamic/ConfigurationDiscoveryService.java

@@ -219,7 +219,7 @@ private void getAgentDynamicConfig() {
                 builder.setService(Config.Agent.SERVICE_NAME);
 
                 // Some plugin will register watcher later.
-                final int size = register.keys().size();
+                final int size = register.getRegisterWatcherSize();
                 if (lastRegisterWatcherSize != size) {
                     // reset uuid, avoid the same uuid causing the configuration not to be updated.
                     uuid = null;
@@ -273,6 +273,12 @@ public Set<String> keys() {
             return register.keySet();
         }
 
+        public int getRegisterWatcherSize() {
+            return register.values().stream()
+                    .mapToInt(List::size)
+                    .sum();
+        }
+
         @Override
         public String toString() {
             ArrayList<String> registerTableDescription = new ArrayList<>(register.size());