From 979aa7838f577eca79e4a8f9204d68b5d1fa05ce Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Tue, 5 Jun 2018 14:49:17 +1000 Subject: [PATCH] Clear TEST_WRITER before waiting to ensure accurate timing Otherwise the waitForTraces at the end might be triggered prematurely. --- .../src/test/groovy/Elasticsearch2NodeClientTest.groovy | 1 + .../src/test/groovy/Elasticsearch2TransportClientTest.groovy | 1 + .../src/test/groovy/Elasticsearch5NodeClientTest.groovy | 1 + .../src/test/groovy/Elasticsearch5TransportClientTest.groovy | 1 + .../src/test/groovy/Elasticsearch6NodeClientTest.groovy | 1 + .../src/test/groovy/Elasticsearch6TransportClientTest.groovy | 1 + 6 files changed, 6 insertions(+) diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy index 20d2883c8a..cf96507b5f 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy @@ -39,6 +39,7 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner { .build() testNode = NodeBuilder.newInstance().clusterName("test-cluster").settings(settings).build() testNode.start() + TEST_WRITER.clear() testNode.client().admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(5000) TEST_WRITER.waitForTraces(1) } diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy index a284f44921..0886d2c694 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy @@ -50,6 +50,7 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner { .build() ).build() client.addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName("localhost"), TCP_PORT)) + TEST_WRITER.clear() client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(5000) TEST_WRITER.waitForTraces(1) } diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy index 4da1acfbbb..19f1a9cf2c 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy @@ -45,6 +45,7 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner { .build() testNode = new Node(new Environment(InternalSettingsPreparer.prepareSettings(settings)), [Netty3Plugin]) testNode.start() + TEST_WRITER.clear() testNode.client().admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(5000) TEST_WRITER.waitForTraces(1) } diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy index 3bc49699c9..6e506d8aa1 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy @@ -57,6 +57,7 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner { .build() ) client.addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName("localhost"), TCP_PORT)) + TEST_WRITER.clear() client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(5000) TEST_WRITER.waitForTraces(1) } diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy index 2b69ab27db..90ef3d13fa 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy @@ -42,6 +42,7 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner { .build() testNode = new Node(InternalSettingsPreparer.prepareEnvironment(settings, null), [Netty4Plugin]) testNode.start() + TEST_WRITER.clear() testNode.client().admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(5000) TEST_WRITER.waitForTraces(1) } diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy index 0889db29a3..ddbd8ed953 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy @@ -54,6 +54,7 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner { .build() ) client.addTransportAddress(new TransportAddress(InetAddress.getByName("localhost"), TCP_PORT)) + TEST_WRITER.clear() client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet(5000) TEST_WRITER.waitForTraces(1) }