This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new 7678c3f13 fix some bug in service discovery: (#3804)
7678c3f13 is described below
commit 7678c3f1392a345d69d321b64dab654e4791cbe2
Author: pentium100 <[email protected]>
AuthorDate: Wed Oct 8 00:29:30 2025 +0800
fix some bug in service discovery: (#3804)
Co-authored-by: Tomsun28 <[email protected]>
---
.../org/apache/hertzbeat/collector/collect/sd/DnsSdCollectImpl.java | 2 +-
.../apache/hertzbeat/manager/component/sd/ServiceDiscoveryWorker.java | 4 +++-
.../org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/sd/DnsSdCollectImpl.java
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/sd/DnsSdCollectImpl.java
index ba9186cc6..a9c427f42 100644
---
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/sd/DnsSdCollectImpl.java
+++
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/sd/DnsSdCollectImpl.java
@@ -43,7 +43,7 @@ import java.util.Arrays;
@Slf4j
public class DnsSdCollectImpl extends AbstractCollect {
- private static final int DEFAULT_TIME_OUT = 3;
+ private static final int DEFAULT_TIME_OUT = 3000;
@Override
public void preCheck(Metrics metrics) throws IllegalArgumentException {
diff --git
a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/sd/ServiceDiscoveryWorker.java
b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/sd/ServiceDiscoveryWorker.java
index 29af6f912..740f4277a 100644
---
a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/sd/ServiceDiscoveryWorker.java
+++
b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/sd/ServiceDiscoveryWorker.java
@@ -110,7 +110,9 @@ public class ServiceDiscoveryWorker implements
InitializingBean {
fieldsValue.put(cell.getField().getName(), value);
});
final String host = fieldsValue.get(FILED_HOST);
- final String port =
fieldsValue.getOrDefault(FILED_PORT, defaultPort);
+ final String port =
Optional.ofNullable(fieldsValue.get(FILED_PORT))
+ .filter(p -> !p.isEmpty())
+ .orElse(defaultPort);
final String keyStr = host + ":" + port;
if (subMonitorBindMap.containsKey(keyStr)) {
subMonitorBindMap.remove(keyStr);
diff --git
a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
index 0661d6c1b..00496ff3f 100644
---
a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
+++
b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
@@ -181,6 +181,7 @@ public class MonitorServiceImpl implements MonitorService {
Job appDefine = appService.getAppDefine(app);
if (!isStatic) {
appDefine.setSd(true);
+ monitor.setHost("unknow");
}
if (CommonConstants.PROMETHEUS.equals(monitor.getApp())) {
appDefine.setApp(CommonConstants.PROMETHEUS_APP_PREFIX +
monitor.getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
