*修复netty一直重连的bug

sermant-io · Aug 27, 2022 · a0a0d79 · a0a0d79
1 parent 8d14be7
commit a0a0d79
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/sermant-agentcore/sermant-agentcore-config/config/all/config.properties b/sermant-agentcore/sermant-agentcore-config/config/all/config.properties
@@ -2,8 +2,7 @@
 agent.config.isEnhanceBootStrapEnable=false
 agent.config.ignoredPrefixes=com.huawei.sermant,com.huaweicloud.sermant
 agent.config.combineStrategy=ALL
-agent.config.serviceBlackList=com.huaweicloud.sermant.core.service.heartbeat.HeartbeatServiceImpl
-
+agent.config.serviceBlackList=com.huaweicloud.sermant.core.service.heartbeat.HeartbeatServiceImpl,com.huaweicloud.sermant.core.service.send.NettyGatewayClient,com.huaweicloud.sermant.core.service.tracing.TracingServiceImpl
 # adaptor config
 adaptor.config.isLoadExtAgentEnable=false
 

diff --git a/sermant-agentcore/sermant-agentcore-config/config/config.properties b/sermant-agentcore/sermant-agentcore-config/config/config.properties
@@ -2,8 +2,7 @@
 agent.config.isEnhanceBootStrapEnable=false
 agent.config.ignoredPrefixes=com.huawei.sermant,com.huaweicloud.sermant
 agent.config.combineStrategy=ALL
-agent.config.serviceBlackList=com.huaweicloud.sermant.core.service.heartbeat.HeartbeatServiceImpl
-
+agent.config.serviceBlackList=com.huaweicloud.sermant.core.service.heartbeat.HeartbeatServiceImpl,com.huaweicloud.sermant.core.service.send.NettyGatewayClient,com.huaweicloud.sermant.core.service.tracing.TracingServiceImpl
 # adaptor config
 adaptor.config.isLoadExtAgentEnable=false
 

diff --git a/sermant-agentcore/sermant-agentcore-config/config/example/config.properties b/sermant-agentcore/sermant-agentcore-config/config/example/config.properties
@@ -2,8 +2,7 @@
 agent.config.isEnhanceBootStrapEnable=false
 agent.config.ignoredPrefixes=com.huawei.sermant,com.huaweicloud.sermant
 agent.config.combineStrategy=ALL
-agent.config.serviceBlackList=com.huaweicloud.sermant.core.service.heartbeat.HeartbeatServiceImpl
-
+agent.config.serviceBlackList=com.huaweicloud.sermant.core.service.heartbeat.HeartbeatServiceImpl,com.huaweicloud.sermant.core.service.send.NettyGatewayClient,com.huaweicloud.sermant.core.service.tracing.TracingServiceImpl
 # adaptor config
 adaptor.config.isLoadExtAgentEnable=false
 

diff --git a/...wcontrol-common/src/main/java/com/huawei/flowcontrol/common/config/FlowControlConfig.java b/...wcontrol-common/src/main/java/com/huawei/flowcontrol/common/config/FlowControlConfig.java
@@ -177,9 +177,9 @@ public class FlowControlConfig implements PluginConfig {
     private boolean needThrowBizException = false;
 
     /**
-     * 指标数据发送方式 默认Netty
+     * 指标数据发送方式 默认KAFKA
      */
-    private MetricSendWay sendWay = MetricSendWay.NETTY;
+    private MetricSendWay sendWay = MetricSendWay.KAFKA;
 
     /**
      * 等待指标数据写入文件的等待时间 单位MS

diff --git a/...l/flowcontrol-common/src/main/java/com/huawei/flowcontrol/common/enums/MetricSendWay.java b/...l/flowcontrol-common/src/main/java/com/huawei/flowcontrol/common/enums/MetricSendWay.java
@@ -18,7 +18,6 @@
 package com.huawei.flowcontrol.common.enums;
 
 import com.huawei.flowcontrol.common.metric.MetricSender;
-import com.huawei.flowcontrol.common.metric.NettyMetricSender;
 import com.huawei.flowcontrol.common.metric.SimpleKafkaMetricSender;
 
 /**
@@ -31,12 +30,7 @@ public enum MetricSendWay {
     /**
      * Kafka发送方式
      */
-    KAFKA(new SimpleKafkaMetricSender()),
-
-    /**
-     * Netty发送方式
-     */
-    NETTY(new NettyMetricSender());
+    KAFKA(new SimpleKafkaMetricSender());
 
     private final MetricSender sender;