(inlong) branch master updated: [INLONG-10520][Manager] Fix the problem of protocol type reported by dataproxy not correctly accepted (#10521)

[vernedeng]

This is an automated email from the ASF dual-hosted git repository.

vernedeng 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 396ae72e0f [INLONG-10520][Manager] Fix the problem of protocol type 
reported by dataproxy not correctly accepted (#10521)
396ae72e0f is described below

commit 396ae72e0f8c8966e7f3096a5e74c80704d4fbe9
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Thu Jun 27 14:48:53 2024 +0800

    [INLONG-10520][Manager] Fix the problem of protocol type reported by 
dataproxy not correctly accepted (#10521)
    
    * [INLONG-10520][Manager] Fix the problem of protocol type reported by 
dataproxy not correctly accepted
    
    * [INLONG-10520][Manager] Fix error
    
    * [INLONG-10520][Manager] Fix error
---
 docker/docker-compose/docker-compose.yml                       |  2 +-
 .../java/org/apache/inlong/common/heartbeat/HeartbeatMsg.java  | 10 ++++++++++
 .../inlong/manager/service/heartbeat/HeartbeatManager.java     |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docker/docker-compose/docker-compose.yml 
b/docker/docker-compose/docker-compose.yml
index f086ef0ce7..1e894b00b8 100644
--- a/docker/docker-compose/docker-compose.yml
+++ b/docker/docker-compose/docker-compose.yml
@@ -60,7 +60,7 @@ services:
       - ZK_URL=tubemq-server:2181
       - FLINK_HOST=jobmanager
       - FLINK_PORT=8081
-      - AUDIT_QUERY_URL=audit:10080
+      - AUDIT_QUERY_URL=http://audit:10080
 
   dashboard:
     image: inlong/dashboard:${VERSION_TAG}
diff --git 
a/inlong-common/src/main/java/org/apache/inlong/common/heartbeat/HeartbeatMsg.java
 
b/inlong-common/src/main/java/org/apache/inlong/common/heartbeat/HeartbeatMsg.java
index 43ede0823b..07ef09a402 100644
--- 
a/inlong-common/src/main/java/org/apache/inlong/common/heartbeat/HeartbeatMsg.java
+++ 
b/inlong-common/src/main/java/org/apache/inlong/common/heartbeat/HeartbeatMsg.java
@@ -19,12 +19,14 @@ package org.apache.inlong.common.heartbeat;
 
 import org.apache.inlong.common.enums.NodeSrvStatus;
 
+import com.google.common.base.Joiner;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Heartbeat template for all components.
@@ -113,6 +115,14 @@ public class HeartbeatMsg {
     private Integer load = 0xffff;
 
     public ComponentHeartbeat componentHeartbeat() {
+        if (addressInfos != null) {
+            port = 
Joiner.on(",").join(addressInfos.stream().map(AddressInfo::getPort).collect(Collectors.toList()));
+            ip = 
Joiner.on(",").join(addressInfos.stream().map(AddressInfo::getIp).collect(Collectors.toList()));
+            reportSourceType = Joiner.on(",")
+                    
.join(addressInfos.stream().map(AddressInfo::getReportSourceType).collect(Collectors.toList()));
+            protocolType = Joiner.on(",")
+                    
.join(addressInfos.stream().map(AddressInfo::getProtocolType).collect(Collectors.toList()));
+        }
         return new ComponentHeartbeat(nodeSrvStatus, clusterTag, extTag, 
clusterName,
                 componentType, ip, port, inCharges, protocolType, load);
     }
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatManager.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatManager.java
index f9ffa90178..e8add054d9 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatManager.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/heartbeat/HeartbeatManager.java
@@ -162,6 +162,8 @@ public class HeartbeatManager implements 
AbstractHeartbeatManager {
                     
.join(heartbeat.getAddressInfos().stream().map(AddressInfo::getIp).collect(Collectors.toList())));
             
heartbeat.setReportSourceType(Joiner.on(InlongConstants.COMMA).join(heartbeat.getAddressInfos().stream()
                     
.map(AddressInfo::getReportSourceType).collect(Collectors.toList())));
+            
heartbeat.setProtocolType(Joiner.on(InlongConstants.COMMA).join(heartbeat.getAddressInfos().stream()
+                    
.map(AddressInfo::getProtocolType).collect(Collectors.toList())));
         }
 
         // protocolType may be null, and the protocolTypes' length may be less 
than ports' length