From a0a0d79e2932f0ce22ce09fd225534c0e657ef31 Mon Sep 17 00:00:00 2001
From: provenceee <83857838+provenceee@users.noreply.github.com>
Date: Sat, 27 Aug 2022 11:16:52 +0800
Subject: [PATCH] =?UTF-8?q?*=E4=BF=AE=E5=A4=8Dnetty=E4=B8=80=E7=9B=B4?=
 =?UTF-8?q?=E9=87=8D=E8=BF=9E=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sermant-agentcore-config/config/all/config.properties | 3 +--
 .../sermant-agentcore-config/config/config.properties     | 3 +--
 .../config/example/config.properties                      | 3 +--
 .../flowcontrol/common/config/FlowControlConfig.java      | 4 ++--
 .../huawei/flowcontrol/common/enums/MetricSendWay.java    | 8 +-------
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/sermant-agentcore/sermant-agentcore-config/config/all/config.properties b/sermant-agentcore/sermant-agentcore-config/config/all/config.properties
index b361b11a29..26a9d277e3 100644
--- 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
index 3fe940cf14..877918a539 100644
--- 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
index 2dda480b7e..ca2c09c5bc 100644
--- 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/sermant-plugins/sermant-flowcontrol/flowcontrol-common/src/main/java/com/huawei/flowcontrol/common/config/FlowControlConfig.java b/sermant-plugins/sermant-flowcontrol/flowcontrol-common/src/main/java/com/huawei/flowcontrol/common/config/FlowControlConfig.java
index 3224d1f485..a4bbd46617 100644
--- a/sermant-plugins/sermant-flowcontrol/flowcontrol-common/src/main/java/com/huawei/flowcontrol/common/config/FlowControlConfig.java
+++ b/sermant-plugins/sermant-flowcontrol/flowcontrol-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/sermant-plugins/sermant-flowcontrol/flowcontrol-common/src/main/java/com/huawei/flowcontrol/common/enums/MetricSendWay.java b/sermant-plugins/sermant-flowcontrol/flowcontrol-common/src/main/java/com/huawei/flowcontrol/common/enums/MetricSendWay.java
index 8d278d6d81..01f452d922 100644
--- a/sermant-plugins/sermant-flowcontrol/flowcontrol-common/src/main/java/com/huawei/flowcontrol/common/enums/MetricSendWay.java
+++ b/sermant-plugins/sermant-flowcontrol/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;