Merge branch 'develop' into fix_version_b

Signed-off-by: TangLeDaily <96809227+TangLeDaily@users.noreply.github.com>
sermant-io · Dec 7, 2023 · 421097e · 421097e
2 parents f9706df + 6520598
commit 421097e
Show file tree

Hide file tree

Showing 35 changed files with 541 additions and 780 deletions.
diff --git a/.github/actions/common/plugin-change-check/action.yml b/.github/actions/common/plugin-change-check/action.yml
@@ -76,13 +76,14 @@ runs:
       run: |
         echo "sermantSpringbootRegistryChanged=${{ steps.changed-sermant-springboot-registry.outputs.changed }}" >> $GITHUB_ENV
     - uses: marceloprado/has-changed-path@v1.0.1
-      id: changed-sermant-mq-consumer-deny
+      id: changed-sermant-mq-consume-prohibition
       with:
-        paths: sermant-plugins/sermant-mq-consumer-deny
-    - name: env sermant-sermant-mq-consumer-deny
+        paths: sermant-plugins/sermant-mq-consume-prohibition
+    - name: env sermant-sermant-mq-consume-prohibition
       shell: bash
       run: |
-        echo "sermantMqConsumerDenyChanged=${{ steps.changed-sermant-mq-consumer-deny.outputs.changed }}" >> $GITHUB_ENV
+        echo "sermantMqConsumeProhibitionChanged=${{ steps.changed-sermant-mq-consume-prohibition.outputs.changed
+        }}" >> $GITHUB_ENV
     - uses: marceloprado/has-changed-path@v1.0.1
       id: changed-sermant-removal
       with:
@@ -172,7 +173,7 @@ runs:
             ${{ env.sermantSpringbootRegistryChanged }} == 'true' -o ${{ env.sermantServiceRegistryChanged }} == 'true' ];then
           echo "enableSpringLane=true" >> $GITHUB_ENV
         fi
-        
+
         # ==========removal is needed to test?==========
         if [ ${{ env.sermantAgentCoreChanged }} == 'true' -o ${{ env.sermantServiceRemovalChanged }} == 'true' -o \
             ${{ env.sermantSpringbootRegistryChanged }} == 'true' -o ${{ env.sermantServiceRegistryChanged }} == 'true' ];then

diff --git a/pom.xml b/pom.xml
@@ -51,15 +51,15 @@
         <zookeeper.version>3.8.3</zookeeper.version>
         <lombok.version>1.18.22</lombok.version>
         <asm.version>8.0.1</asm.version>
-        <common.io.version>1.3.2</common.io.version>
+        <common.io.version>2.7</common.io.version>
         <org.jacoco.version>0.8.8</org.jacoco.version>
         <simpleclient.version>0.16.0</simpleclient.version>
 
         <slf4j.version>1.7.35</slf4j.version>
         <log4j2.version>2.17.2</log4j2.version>
         <logback.version>1.2.9</logback.version>
 
-        <junit.version>4.12</junit.version>
+        <junit.version>4.13.1</junit.version>
         <junit.jupiter.version>5.8.1</junit.jupiter.version>
         <mockito-core.version>3.9.0</mockito-core.version>
         <mockito-inline.version>3.9.0</mockito-inline.version>

diff --git a/sermant-agentcore/sermant-agentcore-config/config/plugins.yaml b/sermant-agentcore/sermant-agentcore-config/config/plugins.yaml
@@ -13,7 +13,7 @@ plugins:
   - dynamic-config
   - monitor
   - springboot-registry
-  - mq-consume-deny
+  - mq-consume-prohibition
   - service-removal
   - service-visibility
   - tag-transmission

diff --git a/sermant-agentcore/sermant-agentcore-config/config/test/plugins.yaml b/sermant-agentcore/sermant-agentcore-config/config/test/plugins.yaml
@@ -13,7 +13,7 @@ plugins:
   - dynamic-config
   - monitor
   - springboot-registry
-  - mq-consume-deny
+  - mq-consume-prohibition
   - service-removal
   - service-visibility
   - tag-transmission

diff --git a/sermant-plugins/pom.xml b/sermant-plugins/pom.xml
@@ -36,7 +36,7 @@
                 <module>sermant-router</module>
                 <module>sermant-loadbalancer</module>
                 <module>sermant-springboot-registry</module>
-                <module>sermant-mq-consume-deny</module>
+                <module>sermant-mq-consume-prohibition</module>
                 <module>sermant-monitor</module>
                 <module>sermant-service-visibility</module>
                 <module>sermant-service-removal</module>
@@ -69,7 +69,7 @@
                 <module>sermant-dynamic-config</module>
                 <module>sermant-monitor</module>
                 <module>sermant-springboot-registry</module>
-                <module>sermant-mq-consume-deny</module>
+                <module>sermant-mq-consume-prohibition</module>
                 <module>sermant-service-visibility</module>
                 <module>sermant-service-removal</module>
                 <module>sermant-spring-beans-deal</module>
@@ -101,7 +101,7 @@
                 <module>sermant-loadbalancer</module>
                 <module>sermant-monitor</module>
                 <module>sermant-springboot-registry</module>
-                <module>sermant-mq-consume-deny</module>
+                <module>sermant-mq-consume-prohibition</module>
                 <module>sermant-service-visibility</module>
                 <module>sermant-service-removal</module>
                 <module>sermant-spring-beans-deal</module>

diff --git a/sermant-plugins/sermant-mq-consume-deny/config/config.yaml b/sermant-plugins/sermant-mq-consume-deny/config/config.yaml
diff --git a/...c/main/java/com/huaweicloud/sermant/kafka/interceptor/KafkaConsumerMethodInterceptor.java b/...c/main/java/com/huaweicloud/sermant/kafka/interceptor/KafkaConsumerMethodInterceptor.java
diff --git a/...lugin/src/main/java/com/huaweicloud/sermant/kafka/matcher/KafkaConsumerMethodMatcher.java b/...lugin/src/main/java/com/huaweicloud/sermant/kafka/matcher/KafkaConsumerMethodMatcher.java