Merge branch 'opengoofy:develop' into develop

.codecov.yml

@@ -26,10 +26,10 @@ coverage:
       default:
         informational: true
 ignore:
-  - "hippo4j-example/.*"
+  - "examples/.*"
   - "docs/.*"
-  - "dev-support/.*"
+  - "tests/.*"
-  - "hippo4j-ui/.*"
-  - "hippo4j-ui-new/.*"
   - "checkstyle/.*"
   - "format/.*"
+  - "threadpool/console-new/.*"
+  - "threadpool/console/.*"

.gitignore

@@ -7,7 +7,7 @@ target/
 !**/dist/
 
 ### Agent ###
-/hippo4j-agent/hippo4j-agent/
+hippo4j-agent/
 **/dependency-reduced-pom.xml
 
 ### STS ###
@@ -46,3 +46,8 @@ build/
 docs/node_modules
 docs/build
 docs/.docusaurus
+
+
+### Docker ###
+docker/conf
+docker/target

agent/hippo4j-agent-bootstrap/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>cn.hippo4j</groupId>
-        <artifactId>hippo4j-threadpool-agent</artifactId>
+        <artifactId>hippo4j-agent</artifactId>
         <version>${revision}</version>
     </parent>
 
@@ -29,7 +29,7 @@
     </dependencies>
 
     <build>
-        <finalName>hippo4j-agent</finalName>
+        <finalName>hippo4j-threadpool-agent</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -109,7 +109,7 @@
                         <configuration>
                             <target>
                                 <mkdir dir="${project.basedir}/../hippo4j-agent" />
-                                <copy file="${project.build.directory}/hippo4j-agent.jar" tofile="${project.basedir}/../hippo4j-agent/hippo4j-agent.jar" overwrite="true" />
+                                <copy file="${project.build.directory}/hippo4j-threadpool-agent.jar" tofile="${project.basedir}/../hippo4j-agent/hippo4j-threadpool-agent.jar" overwrite="true" />
                                 <mkdir dir="${project.basedir}/../hippo4j-agent/config" />
                                 <mkdir dir="${project.basedir}/../hippo4j-agent/logs" />
                                 <copydir src="${project.basedir}/../config" dest="${project.basedir}/../hippo4j-agent/config" forceoverwrite="true" />

agent/hippo4j-agent-bootstrap/src/main/java/cn/hippo4j/agent/bootstrap/Hippo4jAgent.java

@@ -18,7 +18,6 @@
 package cn.hippo4j.agent.bootstrap;
 
 import cn.hippo4j.agent.core.boot.AgentPackageNotFoundException;
-import cn.hippo4j.agent.core.boot.DefaultNamedThreadFactory;
 import cn.hippo4j.agent.core.boot.ServiceManager;
 import cn.hippo4j.agent.core.conf.Config;
 import cn.hippo4j.agent.core.conf.SnifferConfigInitializer;
@@ -49,15 +48,14 @@ import java.security.ProtectionDomain;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 
 import static net.bytebuddy.matcher.ElementMatchers.nameContains;
 import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
 import static net.bytebuddy.matcher.ElementMatchers.not;
 
+/**
+ * Hippo4j Agent
+ */
 public class Hippo4jAgent {
 
     private static ILog LOGGER = LogManager.getLogger(Hippo4jAgent.class);
@@ -151,6 +149,9 @@ public class Hippo4jAgent {
                 .addShutdownHook(new Thread(ServiceManager.INSTANCE::shutdown, "hippo4j service shutdown thread"));
     }
 
+    /**
+     * transformer
+     */
     private static class Transformer implements AgentBuilder.Transformer {
 
         private PluginFinder pluginFinder;
@@ -193,6 +194,9 @@ public class Hippo4jAgent {
         return nameStartsWith("cn.hippo4j").and(not(nameStartsWith("cn.hippo4j.agent.toolkit.")));
     }
 
+    /**
+     * listener
+     */
     private static class Listener implements AgentBuilder.Listener {
 
         @Override
@@ -235,6 +239,9 @@ public class Hippo4jAgent {
         }
     }
 
+    /**
+     * redefinition listener
+     */
     private static class RedefinitionListener implements AgentBuilder.RedefinitionStrategy.Listener {
 
         @Override

agent/hippo4j-agent-core/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>cn.hippo4j</groupId>
-        <artifactId>hippo4j-threadpool-agent</artifactId>
+        <artifactId>hippo4j-agent</artifactId>
         <version>${revision}</version>
     </parent>
 
@@ -75,9 +75,13 @@
         </dependency>
         <dependency>
             <groupId>cn.hippo4j</groupId>
-            <artifactId>hippo4j-threadpool-common</artifactId>
+            <artifactId>hippo4j-threadpool-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hippo4j</groupId>
+            <artifactId>hippo4j-threadpool-dynamic-mode-config</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>