Merge pull request #1350 from hanbingleixue/develop

修改指标采集
sermant-io · Nov 6, 2023 · 81edb23 · 81edb23
2 parents 40880b9 + bec2992
commit 81edb23
Show file tree

Hide file tree

Showing 40 changed files with 1,195 additions and 1,489 deletions.
diff --git a/sermant-agentcore/sermant-agentcore-config/config/plugins.yaml b/sermant-agentcore/sermant-agentcore-config/config/plugins.yaml
@@ -22,7 +22,7 @@ plugins:
 #  2. passive类型插件需通过指令或接口调用启用
 dynamicPlugins:
   active:
-    - jsse
+    - metrics
 #    - active-plugin
   passive:
 #    - passive-plugin

diff --git a/sermant-plugins/pom.xml b/sermant-plugins/pom.xml
@@ -42,7 +42,7 @@
                 <module>sermant-service-removal</module>
                 <module>sermant-spring-beans-deal</module>
                 <module>sermant-tag-transmission</module>
-                <module>sermant-jsse</module>
+                <module>sermant-metrics</module>
             </modules>
             <build>
                 <pluginManagement>
@@ -75,7 +75,7 @@
                 <module>sermant-service-removal</module>
                 <module>sermant-spring-beans-deal</module>
                 <module>sermant-tag-transmission</module>
-                <module>sermant-jsse</module>
+                <module>sermant-metrics</module>
             </modules>
             <build>
                 <pluginManagement>
@@ -108,7 +108,7 @@
                 <module>sermant-service-removal</module>
                 <module>sermant-spring-beans-deal</module>
                 <module>sermant-tag-transmission</module>
-                <module>sermant-jsse</module>
+                <module>sermant-metrics</module>
             </modules>
         </profile>
     </profiles>

diff --git a/...mant-jsse/jsse-plugin/src/main/java/com/huawei/jsse/declarer/alibaba/HandlerDeclarer.java b/...mant-jsse/jsse-plugin/src/main/java/com/huawei/jsse/declarer/alibaba/HandlerDeclarer.java
diff --git a/...rmant-jsse/jsse-plugin/src/main/java/com/huawei/jsse/declarer/alibaba/InvokeDeclarer.java b/...rmant-jsse/jsse-plugin/src/main/java/com/huawei/jsse/declarer/alibaba/InvokeDeclarer.java
diff --git a/...rmant-jsse/jsse-plugin/src/main/java/com/huawei/jsse/declarer/apache/HandlerDeclarer.java b/...rmant-jsse/jsse-plugin/src/main/java/com/huawei/jsse/declarer/apache/HandlerDeclarer.java
diff --git a/...ermant-jsse/jsse-plugin/src/main/java/com/huawei/jsse/declarer/apache/InvokeDeclarer.java b/...ermant-jsse/jsse-plugin/src/main/java/com/huawei/jsse/declarer/apache/InvokeDeclarer.java
diff --git a/...-jsse/jsse-plugin/src/main/java/com/huawei/jsse/interceptor/alibaba/CodecInterceptor.java b/...-jsse/jsse-plugin/src/main/java/com/huawei/jsse/interceptor/alibaba/CodecInterceptor.java