From 0b418bf37942ed03e5c495e5bae03117ddb97b88 Mon Sep 17 00:00:00 2001
From: ThisSeanZhang <46880100+ThisSeanZhang@users.noreply.github.com>
Date: Mon, 2 Aug 2021 11:16:21 +0800
Subject: [PATCH] Support Multiple DNS period resolving mechanism (#7398)

---
 CHANGES.md                                    |  1 +
 .../agent/core/remote/GRPCChannelManager.java | 38 ++++++++++++-------
 .../rabbitmq-scenario/configuration.yml       |  2 +-
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9ac17108f..f5f4bedf7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@ Release Notes.
 #### Project
 
 #### Java Agent
+* Support Multiple DNS period resolving mechanism
 
 #### OAP-Backend
 
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java
index 503bbf192..2d2308809 100755
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java
@@ -32,6 +32,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.skywalking.apm.agent.core.boot.BootService;
 import org.apache.skywalking.apm.agent.core.boot.DefaultImplementor;
@@ -40,6 +41,7 @@ import org.apache.skywalking.apm.agent.core.conf.Config;
 import org.apache.skywalking.apm.agent.core.logging.api.ILog;
 import org.apache.skywalking.apm.agent.core.logging.api.LogManager;
 import org.apache.skywalking.apm.util.RunnableWithExceptionProtection;
+import org.apache.skywalking.apm.util.StringUtil;
 
 import static org.apache.skywalking.apm.agent.core.conf.Config.Collector.IS_RESOLVE_DNS_PERIODICALLY;
 
@@ -99,20 +101,28 @@ public class GRPCChannelManager implements BootService, Runnable {
     public void run() {
         LOGGER.debug("Selected collector grpc service running, reconnect:{}.", reconnect);
         if (IS_RESOLVE_DNS_PERIODICALLY && reconnect) {
-            String backendService = Config.Collector.BACKEND_SERVICE.split(",")[0];
-            try {
-                String[] domainAndPort = backendService.split(":");
-
-                List<String> newGrpcServers = Arrays
-                        .stream(InetAddress.getAllByName(domainAndPort[0]))
-                        .map(InetAddress::getHostAddress)
-                        .map(ip -> String.format("%s:%s", ip, domainAndPort[1]))
-                        .collect(Collectors.toList());
-
-                grpcServers = newGrpcServers;
-            } catch (Throwable t) {
-                LOGGER.error(t, "Failed to resolve {} of backend service.", backendService);
-            }
+            grpcServers = Arrays.stream(Config.Collector.BACKEND_SERVICE.split(","))
+                    .filter(StringUtil::isNotBlank)
+                    .map(eachBackendService -> eachBackendService.split(":"))
+                    .filter(domainPortPairs -> {
+                        if (domainPortPairs.length < 2) {
+                            LOGGER.debug("Service address [{}] format error. The expected format is IP:port", domainPortPairs[0]);
+                            return false;
+                        }
+                        return true;
+                    })
+                    .flatMap(domainPortPairs -> {
+                        try {
+                            return Arrays.stream(InetAddress.getAllByName(domainPortPairs[0]))
+                                    .map(InetAddress::getHostAddress)
+                                    .map(ip -> String.format("%s:%s", ip, domainPortPairs[1]));
+                        } catch (Throwable t) {
+                            LOGGER.error(t, "Failed to resolve {} of backend service.", domainPortPairs[0]);
+                        }
+                        return Stream.empty();
+                    })
+                    .distinct()
+                    .collect(Collectors.toList());
         }
 
         if (reconnect) {
diff --git a/test/plugin/scenarios/rabbitmq-scenario/configuration.yml b/test/plugin/scenarios/rabbitmq-scenario/configuration.yml
index f622cf454..e14e803c3 100644
--- a/test/plugin/scenarios/rabbitmq-scenario/configuration.yml
+++ b/test/plugin/scenarios/rabbitmq-scenario/configuration.yml
@@ -20,7 +20,7 @@ environment:
   - RABBITMQ_HOST=rabbitmq-server
 dependencies:
   rabbitmq-server:
-    image: rabbitmq:latest
+    image: rabbitmq:3.8.18
     hostname: rabbitmq-server
     expose:
       - 5672