fix: Fixed jar package mounting and startup problem in Agent mode

opengoofy · Sep 30, 2024 · a043504 · a043504
1 parent 1d8d116
commit a043504
Show file tree

Hide file tree

Showing 30 changed files with 232 additions and 298 deletions.
diff --git a/...hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/conf/SnifferConfigInitializer.java b/...hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/conf/SnifferConfigInitializer.java
@@ -18,16 +18,16 @@
 package cn.hippo4j.agent.core.conf;
 
 import cn.hippo4j.agent.core.boot.AgentPackagePath;
+import cn.hippo4j.agent.core.util.PropertyPlaceholderHelper;
+import cn.hippo4j.agent.core.util.StringUtil;
 import cn.hippo4j.common.boot.AgentPackageNotFoundException;
 import cn.hippo4j.common.conf.Config;
 import cn.hippo4j.common.conf.ConfigNotFoundException;
 import cn.hippo4j.common.logging.api.ILog;
 import cn.hippo4j.common.logging.api.LogManager;
 import cn.hippo4j.common.logging.core.JsonLogResolver;
 import cn.hippo4j.common.logging.core.PatternLogResolver;
-import cn.hippo4j.common.toolkit.StringUtil;
 import cn.hippo4j.common.toolkit.agent.ConfigInitializer;
-import cn.hippo4j.common.toolkit.agent.PropertyPlaceholderHelper;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/...ugin/src/main/java/cn/hippo4j/agent/plugin/nacos/NacosDynamicThreadPoolChangeHandler.java b/...ugin/src/main/java/cn/hippo4j/agent/plugin/nacos/NacosDynamicThreadPoolChangeHandler.java
@@ -17,11 +17,14 @@
 
 package cn.hippo4j.agent.plugin.nacos;
 
+import cn.hippo4j.agent.plugin.spring.common.conf.NacosCloudConfig;
+import cn.hippo4j.agent.plugin.spring.common.conf.NacosConfig;
 import cn.hippo4j.agent.plugin.spring.common.conf.SpringBootConfig;
 import cn.hippo4j.agent.plugin.spring.common.toolkit.SpringPropertyBinder;
 import cn.hippo4j.common.executor.ThreadFactoryBuilder;
 import cn.hippo4j.common.logging.api.ILog;
 import cn.hippo4j.common.logging.api.LogManager;
+import cn.hippo4j.common.toolkit.StringUtil;
 import cn.hippo4j.threadpool.dynamic.mode.config.parser.ConfigParserHandler;
 import cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties;
 import cn.hippo4j.threadpool.dynamic.mode.config.refresher.AbstractConfigThreadPoolDynamicRefresh;
@@ -34,6 +37,7 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -64,7 +68,13 @@ public class NacosDynamicThreadPoolChangeHandler extends AbstractConfigThreadPoo
     public void registerListener() {
         // Retrieve necessary configuration properties
         String configFileType = SpringBootConfig.Spring.Dynamic.Thread_Pool.CONFIG_FILE_TYPE;
-        String serverAddr = SpringBootConfig.Spring.Dynamic.Thread_Pool.Nacos.SERVER_ADDR;
+        String serverAddr = Optional.ofNullable(NacosCloudConfig.Spring.Cloud.Nacos.Config.SERVER_ADDR).filter(s -> !StringUtil.isEmpty(s))
+                .orElse(Optional.ofNullable(NacosConfig.Nacos.Config.SERVER_ADDR).filter(s -> !StringUtil.isEmpty(s))
+                        .orElse(""));
+        if (StringUtil.isEmpty(serverAddr)) {
+            LOGGER.error("[Hippo4j-Agent] add Nacos listener failure. Nacos Registry address not configured");
+            return;
+        }
         String dataId = SpringBootConfig.Spring.Dynamic.Thread_Pool.Nacos.DATA_ID;
         String group = SpringBootConfig.Spring.Dynamic.Thread_Pool.Nacos.GROUP;
         String namespace = SpringBootConfig.Spring.Dynamic.Thread_Pool.Nacos.NAMESPACE.get(0);
@@ -105,9 +115,9 @@ public Executor getExecutor() {
             };
             // Add the listener to the Nacos ConfigService
             configService.addListener(dataId, group, configChangeListener);
-            LOGGER.info("[Hippo4j-Agent] Dynamic thread pool refresher, add Nacos listener successfully. namespace: {} data-id: {} group: {}", namespace, dataId, group);
+            LOGGER.info("[Hippo4j-Agent] Dynamic thread pool refresher, add Nacos listener successfully. serverAddr: {} namespace: {} data-id: {} group: {}", serverAddr, namespace, dataId, group);
         } catch (Exception e) {
-            LOGGER.error(e, "[Hippo4j-Agent] Dynamic thread pool refresher, add Nacos listener failure. namespace: {} data-id: {} group: {}", namespace, dataId, group);
+            LOGGER.error(e, "[Hippo4j-Agent] Dynamic thread pool refresher, add Nacos listener failure. serverAddr: {} namespace: {} data-id: {} group: {}", serverAddr, namespace, dataId, group);
         }
     }
 

diff --git a/...po4j/agent/plugin/nacos/interceptor/NacosCloudAdapterConfigInstanceMethodInterceptor.java b/...po4j/agent/plugin/nacos/interceptor/NacosCloudAdapterConfigInstanceMethodInterceptor.java
@@ -41,9 +41,6 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
 
     }
 
-    /**
-     *
-     */
     @Override
     public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes, Object ret) throws Throwable {
         // This logic will only be executed once

diff --git a/...ain/java/cn/hippo4j/agent/plugin/nacos/interceptor/NacosConfigConstructorInterceptor.java b/...ain/java/cn/hippo4j/agent/plugin/nacos/interceptor/NacosConfigConstructorInterceptor.java
@@ -38,7 +38,7 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) throws
         // This logic will only be executed once
         if (isExecuted.compareAndSet(false, true)) {
 
-            // 判断 SpringPropertiesLoader 是否初始化
+            // Determine whether SpringPropertiesLoader is initialized
             AtomicBoolean active = SpringPropertiesLoader.getActive();
 
             // For Nacos-Cloud, the SpringPropertiesLoader environment initialization is triggered first, and then the logic to register listeners is triggered
@@ -51,7 +51,7 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) throws
             // The Nacos plugin triggers before the Spring configuration plug-in.
             // This means that when the Apollo plug-in executes, Spring's Environment is not yet ready,
             // so the configuration cannot be read
-            // After listening to the AGENT_SPRING_PROPERTIES_LOADER_COMPLETED event, register the listener for Apollo
+            // After listening to the AGENT_SPRING_PROPERTIES_LOADER_COMPLETED event, register the listener for Nacos
             AbstractSubjectCenter.register(AbstractSubjectCenter.SubjectType.AGENT_SPRING_PROPERTIES_LOADER_COMPLETED, new NacosConfigPropertiesLoaderCompletedListener());
         }
     }

diff --git a/agent/hippo4j-agent-plugin/spring-plugins/spring-boot-1x-plugin/pom.xml b/agent/hippo4j-agent-plugin/spring-plugins/spring-boot-1x-plugin/pom.xml
@@ -29,13 +29,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>cn.hippo4j</groupId>
-            <artifactId>hippo4j-agent-spring-plugin-common</artifactId>
-            <scope>provided</scope>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -45,9 +38,8 @@
 
         <dependency>
             <groupId>cn.hippo4j</groupId>
-            <artifactId>hippo4j-threadpool-config-spring-boot-1x-starter</artifactId>
+            <artifactId>hippo4j-agent-spring-plugin-common</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

diff --git a/...ava/cn/hippo4j/agent/plugin/spring/boot/v1/interceptor/ApplicationContextInterceptor.java b/...ava/cn/hippo4j/agent/plugin/spring/boot/v1/interceptor/ApplicationContextInterceptor.java
@@ -25,7 +25,9 @@
 import cn.hippo4j.agent.plugin.spring.common.support.SpringThreadPoolRegisterSupport;
 import cn.hippo4j.common.extension.design.AbstractSubjectCenter;
 import cn.hippo4j.core.config.ApplicationContextHolder;
+import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.event.ContextRefreshedEvent;
 
 import java.lang.reflect.Method;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -50,7 +52,18 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA
         ConfigurableApplicationContext context = (ConfigurableApplicationContext) objInst;
         if (context.getParent() != null) {
             // After the child container is started, the thread pool registration will be carried out
-            SpringThreadPoolRegisterSupport.registerThreadPoolInstances(context);
+            // IDEA's runtime environment or debugging mechanisms make context refresh speeds different.
+            // Ensure that thread pool registration logic is executed only after the context is fully started
+            if (context.isActive()) {
+                SpringThreadPoolRegisterSupport.registerThreadPoolInstances(context);
+                return ret;
+            }
+            // However, the packaged JAR runtime may refresh the context faster
+            // resulting in the context not being refreshed yet when registerThreadPoolInstances is called
+            // Register listener to handle the registration after the context has been fully refreshed
+            context.addApplicationListener((ApplicationListener<ContextRefreshedEvent>) event -> {
+                SpringThreadPoolRegisterSupport.registerThreadPoolInstances(event.getApplicationContext());
+            });
             return ret;
         }
         // This logic will only be executed once

diff --git a/agent/hippo4j-agent-plugin/spring-plugins/spring-boot-2x-plugin/pom.xml b/agent/hippo4j-agent-plugin/spring-plugins/spring-boot-2x-plugin/pom.xml
@@ -17,13 +17,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>cn.hippo4j</groupId>
-            <artifactId>hippo4j-agent-spring-plugin-common</artifactId>
-            <scope>provided</scope>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -33,28 +26,15 @@
 
         <dependency>
             <groupId>cn.hippo4j</groupId>
-            <artifactId>hippo4j-threadpool-dynamic-mode-config</artifactId>
+            <artifactId>hippo4j-agent-spring-plugin-common</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>cn.hippo4j</groupId>
-            <artifactId>hippo4j-threadpool-core</artifactId>
+            <artifactId>hippo4j-threadpool-dynamic-mode-config</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.ctrip.framework.apollo</groupId>
-            <artifactId>apollo-client</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-            <version>2.2.1</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/...n/java/cn/hippo4j/agent/plugin/spring/boot/v2/DynamicThreadPoolChangeHandlerSpring2x.java b/...n/java/cn/hippo4j/agent/plugin/spring/boot/v2/DynamicThreadPoolChangeHandlerSpring2x.java