From 0513dd8d451651f264005e11b565cccacac69a7c Mon Sep 17 00:00:00 2001 From: aderm <394102339@qq.com> Date: Sun, 15 Dec 2019 10:29:00 +0800 Subject: [PATCH] fix es agent remote peers error when multi host. (#4065) --- .../apm/plugin/elasticsearch/v6/RemotePeerCache.java | 2 +- .../RestHighLevelClientConInterceptorTest.java | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java index 4f137ee2d..92475fc9d 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java @@ -34,7 +34,7 @@ public class RemotePeerCache { if (remotePeers.isEmpty()) { remotePeers = hostPort; } else { - remotePeers = "," + hostPort; + remotePeers = remotePeers + "," + hostPort; } } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptorTest.java index be4c2895a..1a4902ed1 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptorTest.java @@ -52,20 +52,15 @@ public class RestHighLevelClientConInterceptorTest { @Mock private RestClient restClient; - @Mock - private HttpHost httpHost; - - private Object[] allArguments; private RestHighLevelClientConInterceptor restHighLevelClientConInterceptor; @Before public void setUp() throws Exception { - when(httpHost.getHostName()).thenReturn("127.0.0.1"); - when(httpHost.getPort()).thenReturn(9200); List nodeList = new ArrayList(); - nodeList.add(new Node(httpHost)); + nodeList.add(new Node(new HttpHost("127.0.0.1", 9200))); + nodeList.add(new Node(new HttpHost("127.0.0.1", 9300))); restHighLevelClientConInterceptor = new RestHighLevelClientConInterceptor(); when(restClientBuilder.build()).thenReturn(restClient); when(restClient.getNodes()).thenReturn(nodeList); @@ -91,6 +86,6 @@ public class RestHighLevelClientConInterceptorTest { restHighLevelClientConInterceptor.onConstruct(objInst, allArguments); assertThat(objInst.getSkyWalkingDynamicField() instanceof RestClientEnhanceInfo, is(true)); - assertThat(((RestClientEnhanceInfo)objInst.getSkyWalkingDynamicField()).getPeers(), is("127.0.0.1:9200")); + assertThat(((RestClientEnhanceInfo)objInst.getSkyWalkingDynamicField()).getPeers(), is("127.0.0.1:9200,127.0.0.1:9300")); } }