kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix es agent remote peers error when multi host. (#4065)

This commit is contained in:
aderm 2019-12-15 10:29:00 +08:00 committed by 吴晟 Wu Sheng
parent 4c6a323e4d
commit 0513dd8d45
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java
View File

@ -34,7 +34,7 @@ public class RemotePeerCache {
if (remotePeers.isEmpty()) {
remotePeers = hostPort;
} else {
remotePeers = "," + hostPort;
remotePeers = remotePeers + "," + hostPort;
}
}

11
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptorTest.java
View File

@ -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<Node> nodeList = new ArrayList<Node>();
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"));
}
}