(shardingsphere) branch master updated: Add log when configuration file for advice of plugins is not found (#35160)

[chengzhang]

This is an automated email from the ASF dual-hosted git repository.

chengzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new cb2a43e563b Add log when configuration file for advice of plugins is 
not found (#35160)
cb2a43e563b is described below

commit cb2a43e563bbfe7d3494ad6b0d9abb19f444ea63
Author: jiangML <1060319...@qq.com>
AuthorDate: Fri Apr 11 09:56:20 2025 +0800

    Add log when configuration file for advice of plugins is not found (#35160)
---
 .../agent/core/advisor/config/AdvisorConfigurationLoader.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
 
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
index 048623b5788..6085c36d9d6 100644
--- 
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
+++ 
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
@@ -27,7 +27,10 @@ import java.io.InputStream;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.jar.JarFile;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Advisor configuration loader.
@@ -35,6 +38,8 @@ import java.util.jar.JarFile;
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class AdvisorConfigurationLoader {
     
+    private static final Logger LOGGER = 
Logger.getLogger(AdvisorConfigurationLoader.class.getName());
+    
     /**
      * Load advisor configurations.
      *
@@ -47,9 +52,11 @@ public final class AdvisorConfigurationLoader {
         AgentPluginClassLoader agentPluginClassLoader = new 
AgentPluginClassLoader(Thread.currentThread().getContextClassLoader(), 
pluginJars);
         for (String each : pluginTypes) {
             InputStream advisorsResourceStream = 
getResourceStream(agentPluginClassLoader, each);
-            if (null != advisorsResourceStream) {
-                mergeConfigurations(result, 
YamlAdvisorsConfigurationSwapper.swap(YamlAdvisorsConfigurationLoader.load(advisorsResourceStream),
 each));
+            if (null == advisorsResourceStream) {
+                LOGGER.log(Level.WARNING, "The configuration file for advice 
of plugin `{0}` is not found", new String[]{each});
             }
+            Optional.ofNullable(advisorsResourceStream)
+                    .ifPresent(optional -> mergeConfigurations(result, 
YamlAdvisorsConfigurationSwapper.swap(YamlAdvisorsConfigurationLoader.load(optional),
 each)));
         }
         return result;
     }