This is an automated email from the ASF dual-hosted git repository.
woofyzhao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 9a49f1641 [INLONG-7086][DataProxy] Add default ext tag report value
(#7087)
9a49f1641 is described below
commit 9a49f16415a759a3a78de93458ea2410acae98e9
Author: woofyzhao <[email protected]>
AuthorDate: Thu Dec 29 20:18:49 2022 +0800
[INLONG-7086][DataProxy] Add default ext tag report value (#7087)
* [INLONG-7086][DataProxy] Add default ext tag report value
---
.../java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java
index 5ae3001e3..72f753680 100644
---
a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java
+++
b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/heartbeat/HeartbeatManager.java
@@ -57,6 +57,8 @@ public class HeartbeatManager implements
AbstractHeartbeatManager {
public static final String DEFAULT_CLUSTER_TAG = "default_cluster";
public static final String DEFAULT_CLUSTER_NAME = "default_dataproxy";
public static final String DEFAULT_CLUSTER_INCHARGES = "admin";
+ // predefined format of ext tag: {key}={value}
+ public static final String DEFAULT_CLUSTER_EXT_TAG = "default=true";
private final CloseableHttpClient httpClient;
private final Gson gson;
@@ -144,7 +146,8 @@ public class HeartbeatManager implements
AbstractHeartbeatManager {
ConfigConstants.PROXY_CLUSTER_NAME, DEFAULT_CLUSTER_NAME));
heartbeatMsg.setInCharges(commonProperties.getOrDefault(
ConfigConstants.PROXY_CLUSTER_INCHARGES,
DEFAULT_CLUSTER_INCHARGES));
-
heartbeatMsg.setExtTag(commonProperties.get(ConfigConstants.PROXY_CLUSTER_EXT_TAG));
+ heartbeatMsg.setExtTag(commonProperties.getOrDefault(
+ ConfigConstants.PROXY_CLUSTER_EXT_TAG,
DEFAULT_CLUSTER_EXT_TAG));
Map<String, String> groupIdMappings =
configManager.getGroupIdMappingProperties();
Map<String, Map<String, String>> streamIdMappings =
configManager.getStreamIdMappingProperties();