From 6c7336b9784f4fc3fa6eac1d1309408972d85d3d Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Fri, 1 Apr 2022 12:27:06 +0300 Subject: [PATCH] Fix awaitility import (#5731) --- .../src/test/groovy/Elasticsearch5NodeClientTest.groovy | 2 +- .../src/test/groovy/Elasticsearch5TransportClientTest.groovy | 2 +- .../src/test/groovy/Elasticsearch53NodeClientTest.groovy | 2 +- .../src/test/groovy/Elasticsearch53TransportClientTest.groovy | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy index 23116e394a..14822a873c 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy @@ -22,8 +22,8 @@ import java.util.concurrent.TimeUnit import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.INTERNAL import static io.opentelemetry.api.trace.StatusCode.ERROR +import static org.awaitility.Awaitility.await import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -import static org.testcontainers.shaded.org.awaitility.Awaitility.await class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { public static final long TIMEOUT = 10000 // 10 seconds diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy index b3245ed4ff..817f0ae13d 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy @@ -26,8 +26,8 @@ import java.util.concurrent.TimeUnit import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.INTERNAL import static io.opentelemetry.api.trace.StatusCode.ERROR +import static org.awaitility.Awaitility.await import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -import static org.testcontainers.shaded.org.awaitility.Awaitility.await class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportClientTest { public static final long TIMEOUT = 10000 // 10 seconds diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy index df24a96f97..f26356d8df 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy @@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.INTERNAL import static io.opentelemetry.api.trace.StatusCode.ERROR +import static org.awaitility.Awaitility.await import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -import static org.testcontainers.shaded.org.awaitility.Awaitility.await class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest { public static final long TIMEOUT = 10000 // 10 seconds diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy index 8abebd52ae..6c5d9390e1 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy @@ -27,8 +27,8 @@ import java.util.concurrent.TimeUnit import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.INTERNAL import static io.opentelemetry.api.trace.StatusCode.ERROR +import static org.awaitility.Awaitility.await import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING -import static org.testcontainers.shaded.org.awaitility.Awaitility.await class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportClientTest { public static final long TIMEOUT = 10000 // 10 seconds