This is an automated email from the ASF dual-hosted git repository.
vernedeng pushed a commit to branch branch-1.10
in repository https://gitbox.apache.org/repos/asf/inlong.git
commit cca37ec2654c268d35d70842eebf2171ae272221
Author: castor <58140421+castor...@users.noreply.github.com>
AuthorDate: Wed Dec 6 19:54:06 2023 +0800
[INLONG-9307][SDK] Improve DataProxy SDK code readability (#9426)
(cherry picked from commit 6376d46304682080e336b9911b91e18120d4d5d8)
---
.../org/apache/inlong/agent/plugin/sinks/SenderManager.java | 2 +-
.../agent/plugin/sinks/filecollect/SenderManager.java | 2 +-
.../org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java | 13 +++----------
.../inlong/sdk/dataproxy/config/ProxyConfigManager.java | 1 -
.../inlong/sdk/dataproxy/example/HttpClientExample.java | 7 +++----
.../inlong/sdk/dataproxy/example/TcpClientExample.java | 7 +++----
.../org/apache/inlong/sdk/dataproxy/network/ClientMgr.java | 3 ---
7 files changed, 11 insertions(+), 24 deletions(-)
diff --git
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/SenderManager.java
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/SenderManager.java
index 7e69d5d94d..fcbac27121 100755
---
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/SenderManager.java
+++
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/SenderManager.java
@@ -201,7 +201,7 @@ public class SenderManager {
private DefaultMessageSender createMessageSender(String tagName) throws
Exception {
ProxyClientConfig proxyClientConfig = new ProxyClientConfig(
- localhost, isLocalVisit, managerHost, managerPort, tagName,
netTag, authSecretId, authSecretKey);
+ localhost, isLocalVisit, managerHost, managerPort, tagName,
authSecretId, authSecretKey);
proxyClientConfig.setTotalAsyncCallbackSize(totalAsyncBufSize);
proxyClientConfig.setFile(isFile);
proxyClientConfig.setAliveConnections(aliveConnectionNum);
diff --git
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/SenderManager.java
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/SenderManager.java
index d027672b18..933ed23583 100755
---
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/SenderManager.java
+++
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/SenderManager.java
@@ -207,7 +207,7 @@ public class SenderManager {
private void createMessageSender(String tagName) throws Exception {
ProxyClientConfig proxyClientConfig = new ProxyClientConfig(
- localhost, isLocalVisit, managerHost, managerPort, tagName,
netTag, authSecretId, authSecretKey);
+ localhost, isLocalVisit, managerHost, managerPort, tagName,
authSecretId, authSecretKey);
proxyClientConfig.setTotalAsyncCallbackSize(totalAsyncBufSize);
proxyClientConfig.setFile(isFile);
proxyClientConfig.setAliveConnections(aliveConnectionNum);
diff --git
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java
index f5552b17f9..2b2b1fef5c 100644
---
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java
+++
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/ProxyClientConfig.java
@@ -36,7 +36,6 @@ public class ProxyClientConfig {
private String proxyIPServiceURL = "";
private int proxyUpdateIntervalMinutes;
private int proxyUpdateMaxRetry;
- private String netTag;
private String inlongGroupId;
private boolean isFile = false;
private boolean isLocalVisit = true;
@@ -103,7 +102,7 @@ public class ProxyClientConfig {
/* pay attention to the last url parameter ip */
public ProxyClientConfig(String localHost, boolean isLocalVisit, String
managerIp,
- int managerPort, String inlongGroupId, String netTag, String
authSecretId, String authSecretKey,
+ int managerPort, String inlongGroupId, String authSecretId, String
authSecretKey,
LoadBalance loadBalance, int virtualNode, int maxRetry) throws
ProxysdkException {
if (Utils.isBlank(localHost)) {
throw new ProxysdkException("localHost is blank!");
@@ -117,7 +116,6 @@ public class ProxyClientConfig {
this.proxyIPServiceURL =
getProxyIPServiceURL(managerIp, managerPort, inlongGroupId,
isLocalVisit);
this.inlongGroupId = inlongGroupId;
- this.netTag = netTag;
this.isLocalVisit = isLocalVisit;
this.managerPort = managerPort;
this.managerIP = managerIp;
@@ -146,9 +144,8 @@ public class ProxyClientConfig {
}
public ProxyClientConfig(String localHost, boolean isLocalVisit, String
managerIp, int managerPort,
- String inlongGroupId,
- String netTag, String authSecretId, String authSecretKey) throws
ProxysdkException {
- this(localHost, isLocalVisit, managerIp, managerPort, inlongGroupId,
netTag, authSecretId, authSecretKey,
+ String inlongGroupId, String authSecretId, String authSecretKey)
throws ProxysdkException {
+ this(localHost, isLocalVisit, managerIp, managerPort, inlongGroupId,
authSecretId, authSecretKey,
ConfigConstants.DEFAULT_LOAD_BALANCE,
ConfigConstants.DEFAULT_VIRTUAL_NODE,
ConfigConstants.DEFAULT_RANDOM_MAX_RETRY);
}
@@ -297,10 +294,6 @@ public class ProxyClientConfig {
this.requestTimeoutMillis = requestTimeoutMillis;
}
- public String getNetTag() {
- return netTag;
- }
-
public String getRsaPubKeyUrl() {
return rsaPubKeyUrl;
}
diff --git
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
index 65762e2af4..811bafcfcc 100644
---
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
+++
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
@@ -591,7 +591,6 @@ public class ProxyConfigManager extends Thread {
public ProxyConfigEntry requestProxyList(String url) {
ArrayList<BasicNameValuePair> params = new
ArrayList<BasicNameValuePair>();
- params.add(new BasicNameValuePair("extTag", clientConfig.getNetTag()));
params.add(new BasicNameValuePair("ip", this.localIP));
params.add(new BasicNameValuePair("protocolType",
clientConfig.getProtocolType()));
LOGGER.info("Begin to get configure from manager {}, param is {}",
url, params);
diff --git
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/HttpClientExample.java
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/HttpClientExample.java
index 539cbeaf69..22274fcf7c 100644
---
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/HttpClientExample.java
+++
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/HttpClientExample.java
@@ -44,18 +44,17 @@ public class HttpClientExample {
String inLongManagerAddr = "127.0.0.1";
String inLongManagerPort = "8080";
String localIP = "127.0.0.1";
- String netTag = "";
String messageBody = "inlong message body!";
HttpProxySender sender = getMessageSender(localIP, inLongManagerAddr,
- inLongManagerPort, netTag, inlongGroupId, false, false,
+ inLongManagerPort, inlongGroupId, false, false,
configBasePath);
sendHttpMessage(sender, inlongGroupId, inlongStreamId, messageBody);
}
public static HttpProxySender getMessageSender(String localIP, String
inLongManagerAddr,
- String inLongManagerPort, String netTag, String inlongGroupId,
+ String inLongManagerPort, String inlongGroupId,
boolean isLocalVisit, boolean isReadProxyIPFromLocal,
String configBasePath) {
ProxyClientConfig proxyConfig = null;
@@ -63,7 +62,7 @@ public class HttpClientExample {
try {
proxyConfig = new ProxyClientConfig(localIP, isLocalVisit,
inLongManagerAddr,
Integer.valueOf(inLongManagerPort),
- inlongGroupId, netTag, "test", "123456");
+ inlongGroupId, "test", "123456");
proxyConfig.setInlongGroupId(inlongGroupId);
proxyConfig.setConfStoreBasePath(configBasePath);
proxyConfig.setReadProxyIPFromLocal(isReadProxyIPFromLocal);
diff --git
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/TcpClientExample.java
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/TcpClientExample.java
index d4eee4a052..993b7750f7 100644
---
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/TcpClientExample.java
+++
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/example/TcpClientExample.java
@@ -42,7 +42,6 @@ public class TcpClientExample {
String inlongGroupId = "test_test";
String inlongStreamId = "test_test";
- String netTag = "";
/*
* 1. if isLocalVisit is true, will get dataproxy server info from
local file in
@@ -66,20 +65,20 @@ public class TcpClientExample {
TcpClientExample tcpClientExample = new TcpClientExample();
DefaultMessageSender sender = tcpClientExample
- .getMessageSender(localIP, inLongManagerAddr,
inLongManagerPort, netTag,
+ .getMessageSender(localIP, inLongManagerAddr,
inLongManagerPort,
inlongGroupId, false, false, configBasePath, msgType);
tcpClientExample.sendTcpMessage(sender, inlongGroupId, inlongStreamId,
messageBody, System.currentTimeMillis());
}
public DefaultMessageSender getMessageSender(String localIP, String
inLongManagerAddr, String inLongManagerPort,
- String netTag, String inlongGroupId, boolean isLocalVisit, boolean
isReadProxyIPFromLocal,
+ String inlongGroupId, boolean isLocalVisit, boolean
isReadProxyIPFromLocal,
String configBasePath, int msgType) {
ProxyClientConfig dataProxyConfig = null;
DefaultMessageSender messageSender = null;
try {
dataProxyConfig = new ProxyClientConfig(localIP, isLocalVisit,
inLongManagerAddr,
- Integer.valueOf(inLongManagerPort), inlongGroupId, netTag,
"test", "123456");
+ Integer.valueOf(inLongManagerPort), inlongGroupId, "test",
"123456");
if (StringUtils.isNotEmpty(configBasePath)) {
dataProxyConfig.setConfStoreBasePath(configBasePath);
}
diff --git
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/ClientMgr.java
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/ClientMgr.java
index 86ca8bd243..cba5367806 100644
---
a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/ClientMgr.java
+++
b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/ClientMgr.java
@@ -112,9 +112,6 @@ public class ClientMgr {
bootstrap.channel(EventLoopUtil.getClientSocketChannelClass(eventLoopGroup));
bootstrap.option(ChannelOption.SO_RCVBUF,
ConfigConstants.DEFAULT_RECEIVE_BUFFER_SIZE);
bootstrap.option(ChannelOption.SO_SNDBUF,
ConfigConstants.DEFAULT_SEND_BUFFER_SIZE);
- if (configure.getNetTag().equals("bobcat")) {
- bootstrap.option(ChannelOption.IP_TOS, 96);
- }
bootstrap.handler(new ClientPipelineFactory(this, sender));
/* ready to Start the thread which refreshes the proxy list. */
ipManager = new ProxyConfigManager(configure, Utils.getLocalIp(),
this);
