From be205010c11a50c4e322e6d9481336bdb08428fa Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Thu, 18 Oct 2018 11:00:52 +1000 Subject: [PATCH] Add additional retries for ES tests. --- .../latestDepTest/groovy/Elasticsearch6RestClientTest.groovy | 2 +- .../src/test/groovy/Elasticsearch5RestClientTest.groovy | 2 +- .../latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy | 2 +- .../groovy/Elasticsearch2TransportClientTest.groovy | 2 +- .../springdata/Elasticsearch2SpringRepositoryTest.groovy | 2 +- .../groovy/springdata/Elasticsearch2SpringTemplateTest.groovy | 3 +-- .../src/test/groovy/Elasticsearch2NodeClientTest.groovy | 2 +- .../src/test/groovy/Elasticsearch2TransportClientTest.groovy | 2 +- .../springdata/Elasticsearch2SpringRepositoryTest.groovy | 2 +- .../groovy/springdata/Elasticsearch2SpringTemplateTest.groovy | 3 +-- .../src/test/groovy/Elasticsearch53NodeClientTest.groovy | 2 +- .../src/test/groovy/Elasticsearch53TransportClientTest.groovy | 2 +- .../springdata/Elasticsearch53SpringRepositoryTest.groovy | 2 +- .../groovy/springdata/Elasticsearch53SpringTemplateTest.groovy | 3 +-- .../latestDepTest/groovy/Elasticsearch5NodeClientTest.groovy | 2 +- .../groovy/Elasticsearch5TransportClientTest.groovy | 3 +-- .../src/test/groovy/Elasticsearch5NodeClientTest.groovy | 2 +- .../src/test/groovy/Elasticsearch5TransportClientTest.groovy | 2 +- .../src/test/groovy/Elasticsearch6NodeClientTest.groovy | 2 +- .../src/test/groovy/Elasticsearch6TransportClientTest.groovy | 2 +- 20 files changed, 20 insertions(+), 24 deletions(-) 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 0dbda26c58..1fc9276a03 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 @@ -18,7 +18,7 @@ import org.elasticsearch.node.Node import org.elasticsearch.transport.Netty4Plugin import spock.lang.Shared -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) 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 94dce9c521..f85041226a 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 @@ -21,7 +21,7 @@ import spock.lang.Shared import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch5RestClientTest extends AgentTestRunner { @Shared int httpPort diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy index eb296c567f..54378e16f0 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy @@ -14,7 +14,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch2NodeClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy index 1bc2b5478f..ee852fd43c 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy @@ -17,7 +17,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch2TransportClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy index 83e271399d..82c64eac0f 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy @@ -11,7 +11,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { @Shared ApplicationContext applicationContext = new AnnotationConfigApplicationContext(Config) diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy index c9c6efcf21..6a53d40c14 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy @@ -23,7 +23,7 @@ import spock.lang.Shared import java.util.concurrent.atomic.AtomicLong -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch2SpringTemplateTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds @@ -68,7 +68,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner { } } - @RetryOnFailure def "test elasticsearch error"() { when: template.refresh(indexName) 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 323eb6da20..3b181492ab 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 @@ -14,7 +14,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) 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 5d1dd4882f..e5cfda5e0b 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 @@ -17,7 +17,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) 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 041f2cd9e9..1155ecf534 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 @@ -11,7 +11,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) 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 e665932e38..690dbfcb51 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 @@ -23,7 +23,7 @@ import spock.lang.Shared import java.util.concurrent.atomic.AtomicLong -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch2SpringTemplateTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds @@ -68,7 +68,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner { } } - @RetryOnFailure def "test elasticsearch error"() { when: template.refresh(indexName) diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy index 37eb5dde74..450eb4eebc 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy @@ -17,7 +17,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch53NodeClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy index 1a8d23190e..01088ccd2a 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy @@ -21,7 +21,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch53TransportClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy index 417805156e..118a982b28 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy @@ -11,7 +11,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch53SpringRepositoryTest extends AgentTestRunner { @Shared ApplicationContext applicationContext = new AnnotationConfigApplicationContext(Config) diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy index 6614c334c3..d39d6da76d 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicLong import static datadog.trace.agent.test.TestUtils.runUnderTrace import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch53SpringTemplateTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds @@ -82,7 +82,6 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner { } } - @RetryOnFailure def "test elasticsearch error"() { when: template.refresh(indexName) diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/latestDepTest/groovy/Elasticsearch5NodeClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/latestDepTest/groovy/Elasticsearch5NodeClientTest.groovy index 8a8dd3c4a7..db793c33c1 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/latestDepTest/groovy/Elasticsearch5NodeClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/latestDepTest/groovy/Elasticsearch5NodeClientTest.groovy @@ -17,7 +17,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch5NodeClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/latestDepTest/groovy/Elasticsearch5TransportClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/latestDepTest/groovy/Elasticsearch5TransportClientTest.groovy index 13ade0f1d4..ff7395efa4 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/latestDepTest/groovy/Elasticsearch5TransportClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/latestDepTest/groovy/Elasticsearch5TransportClientTest.groovy @@ -21,7 +21,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch5TransportClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds @@ -80,7 +80,6 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner { } } - @RetryOnFailure def "test elasticsearch status"() { setup: def result = client.admin().cluster().health(new ClusterHealthRequest()) 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 8a8dd3c4a7..db793c33c1 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 @@ -17,7 +17,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) 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 41043f76d9..748e309e1b 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 @@ -21,7 +21,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) 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 d6c2bad19b..3e5bbabf66 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 @@ -16,7 +16,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) 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 2d26d50c6a..05c439a310 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 @@ -20,7 +20,7 @@ import spock.lang.Shared import static datadog.trace.agent.test.TestUtils.runUnderTrace import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -@RetryOnFailure +@RetryOnFailure(times = 3, delaySeconds = 1) class Elasticsearch6TransportClientTest extends AgentTestRunner { public static final long TIMEOUT = 10000; // 10 seconds