From b4c8b7e538accbb969fce4aa4032ec5c8a93d261 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Wed, 5 Sep 2018 12:31:40 +1000 Subject: [PATCH] Add @RetryOnFailure to ES tests. --- .../latestDepTest/groovy/Elasticsearch6RestClientTest.groovy | 2 ++ .../src/test/groovy/Elasticsearch5RestClientTest.groovy | 2 ++ .../src/test/groovy/Elasticsearch2NodeClientTest.groovy | 2 ++ .../src/test/groovy/Elasticsearch2TransportClientTest.groovy | 2 ++ .../groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy | 2 ++ .../groovy/springdata/Elasticsearch2SpringTemplateTest.groovy | 2 ++ .../src/test/groovy/Elasticsearch5NodeClientTest.groovy | 2 ++ .../src/test/groovy/Elasticsearch5TransportClientTest.groovy | 2 ++ .../src/test/groovy/Elasticsearch6NodeClientTest.groovy | 2 ++ .../src/test/groovy/Elasticsearch6TransportClientTest.groovy | 2 ++ gradle/java.gradle | 2 ++ 11 files changed, 22 insertions(+) diff --git a/dd-java-agent/instrumentation/elasticsearch-rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy index ff629bab86..edb042d205 100644 --- a/dd-java-agent/instrumentation/elasticsearch-rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy @@ -1,3 +1,4 @@ +import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils import datadog.trace.api.DDSpanTypes @@ -19,6 +20,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces +@RetryOnFailure class Elasticsearch6RestClientTest extends AgentTestRunner { @Shared int httpPort diff --git a/dd-java-agent/instrumentation/elasticsearch-rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy index d790c17c45..498d61e876 100644 --- a/dd-java-agent/instrumentation/elasticsearch-rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy @@ -1,3 +1,4 @@ +import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils import datadog.trace.api.DDSpanTypes @@ -21,6 +22,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING +@RetryOnFailure class Elasticsearch5RestClientTest extends AgentTestRunner { @Shared int httpPort 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 43bfdc4dbe..027925043d 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 @@ -1,3 +1,4 @@ +import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils import datadog.trace.api.DDSpanTypes @@ -14,6 +15,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces +@RetryOnFailure class Elasticsearch2NodeClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds 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 742216cc64..a61a46812a 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 @@ -1,3 +1,4 @@ +import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils import datadog.trace.api.DDSpanTypes @@ -17,6 +18,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces +@RetryOnFailure class Elasticsearch2TransportClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy index 83da31a49b..85e156f661 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy @@ -1,5 +1,6 @@ package springdata +import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure import datadog.trace.agent.test.AgentTestRunner import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDTags @@ -10,6 +11,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces +@RetryOnFailure class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { @Shared ApplicationContext applicationContext = new AnnotationConfigApplicationContext(Config) diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy index 92817c1fe3..0e85f885f1 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy @@ -1,5 +1,6 @@ package springdata +import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils import datadog.trace.api.DDSpanTypes @@ -24,6 +25,7 @@ import java.util.concurrent.atomic.AtomicLong import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces +@RetryOnFailure class Elasticsearch2SpringTemplateTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds 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 954a36ba08..4958fed34b 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 @@ -1,3 +1,4 @@ +import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils import datadog.trace.api.DDSpanTypes @@ -17,6 +18,7 @@ import static datadog.trace.agent.test.TestUtils.runUnderTrace import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING +@RetryOnFailure class Elasticsearch5NodeClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds 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 0c11210132..313b75fed5 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 @@ -1,3 +1,4 @@ +import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils import datadog.trace.api.DDSpanTypes @@ -21,6 +22,7 @@ import static datadog.trace.agent.test.TestUtils.runUnderTrace import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING +@RetryOnFailure class Elasticsearch5TransportClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds 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 48c1375e6a..a9e7929942 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 @@ -1,3 +1,4 @@ +import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils import datadog.trace.api.DDSpanTypes @@ -16,6 +17,7 @@ import static datadog.trace.agent.test.TestUtils.runUnderTrace import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING +@RetryOnFailure class Elasticsearch6NodeClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds 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 655837519f..dc1e0b06f6 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 @@ -1,3 +1,4 @@ +import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils import datadog.trace.api.DDSpanTypes @@ -20,6 +21,7 @@ import static datadog.trace.agent.test.TestUtils.runUnderTrace import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING +@RetryOnFailure class Elasticsearch6TransportClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds diff --git a/gradle/java.gradle b/gradle/java.gradle index 0db7dac9f3..d253375699 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -69,6 +69,8 @@ dependencies { testCompile deps.testLogging testCompile 'info.solidsoft.spock:spock-global-unroll:0.5.1' testCompile group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.17.1' + + testCompile group: 'com.anotherchrisberry', name: 'spock-retry', version: '0.6.4' } tasks.withType(Javadoc) {