This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 6d3209a349 Increase Awaitility timeout in tracing tests from 1s to 5s
(#2962)
6d3209a349 is described below
commit 6d3209a3490419f0f5b386cd1e82b4103e49fb9a
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Mar 13 11:13:30 2026 +0100
Increase Awaitility timeout in tracing tests from 1s to 5s (#2962)
The 1-second timeout in testThatNewSpanIsCreatedOnClientTimeout and
similar tests is too tight for CI environments, causing flaky failures.
Increase to 5 seconds to allow sufficient time for span collection
while still catching genuine timeout issues.
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../cxf/systest/brave/jaxrs/AbstractBraveTracingTest.java | 6 +++---
.../cxf/systest/brave/jaxws/AbstractBraveTracingTest.java | 2 +-
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 14 +++++++-------
.../jaxrs/tracing/opentracing/OpenTracingTracingTest.java | 14 +++++++-------
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 4 ++--
.../jaxws/tracing/opentracing/OpenTracingTracingTest.java | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git
a/systests/tracing/src/test/java/org/apache/cxf/systest/brave/jaxrs/AbstractBraveTracingTest.java
b/systests/tracing/src/test/java/org/apache/cxf/systest/brave/jaxrs/AbstractBraveTracingTest.java
index 0a248da9e7..a7db3b275a 100644
---
a/systests/tracing/src/test/java/org/apache/cxf/systest/brave/jaxrs/AbstractBraveTracingTest.java
+++
b/systests/tracing/src/test/java/org/apache/cxf/systest/brave/jaxrs/AbstractBraveTracingTest.java
@@ -265,7 +265,7 @@ public abstract class AbstractBraveTracingTest extends
AbstractClientServerTestB
}
// Await till flush happens, usually a second is enough
- await().atMost(Duration.ofSeconds(1L)).until(()->
TestSpanHandler.getAllSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(5L)).until(()->
TestSpanHandler.getAllSpans().size() == 4);
assertThat(TestSpanHandler.getAllSpans().size(), equalTo(4));
assertThat(TestSpanHandler.getAllSpans().get(3).name(), equalTo("test
span"));
@@ -292,7 +292,7 @@ public abstract class AbstractBraveTracingTest extends
AbstractClientServerTestB
}
// Await till flush happens, usually a second is enough
- await().atMost(Duration.ofSeconds(1L)).until(()->
TestSpanHandler.getAllSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(5L)).until(()->
TestSpanHandler.getAllSpans().size() == 4);
assertThat(TestSpanHandler.getAllSpans().size(), equalTo(4));
assertThat(TestSpanHandler.getAllSpans().get(3).name(), equalTo("test
span"));
@@ -340,7 +340,7 @@ public abstract class AbstractBraveTracingTest extends
AbstractClientServerTestB
try {
client.get();
} finally {
- await().atMost(Duration.ofSeconds(1L)).until(()->
TestSpanHandler.getAllSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(5L)).until(()->
TestSpanHandler.getAllSpans().size() == 2);
assertThat(TestSpanHandler.getAllSpans().size(), equalTo(2));
assertThat(TestSpanHandler.getAllSpans().get(0).name(),
equalTo("GET " + client.getCurrentURI()));
assertThat(TestSpanHandler.getAllSpans().get(0).tags(),
hasKey("error"));
diff --git
a/systests/tracing/src/test/java/org/apache/cxf/systest/brave/jaxws/AbstractBraveTracingTest.java
b/systests/tracing/src/test/java/org/apache/cxf/systest/brave/jaxws/AbstractBraveTracingTest.java
index 07991044f4..64f6ebbaba 100644
---
a/systests/tracing/src/test/java/org/apache/cxf/systest/brave/jaxws/AbstractBraveTracingTest.java
+++
b/systests/tracing/src/test/java/org/apache/cxf/systest/brave/jaxws/AbstractBraveTracingTest.java
@@ -204,7 +204,7 @@ public abstract class AbstractBraveTracingTest extends
AbstractClientServerTestB
service.orderBooks();
// Await till flush happens, usually every second
- await().atMost(Duration.ofSeconds(1L)).until(() ->
TestSpanHandler.getAllSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(5L)).until(() ->
TestSpanHandler.getAllSpans().size() == 2);
assertThat(TestSpanHandler.getAllSpans().get(0).name(),
equalTo("POST /BookStore"));
assertThat(TestSpanHandler.getAllSpans().get(1).name(),
diff --git
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
index 280bf80996..6b218a49df 100644
---
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
+++
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
@@ -257,7 +257,7 @@ public class OpenTelemetryTracingTest extends
AbstractClientServerTestBase {
final Response r =
withTrace(createWebClient("/bookstore/books/async")).get();
assertEquals(Status.OK.getStatusCode(), r.getStatus());
- await().atMost(Duration.ofSeconds(1L)).until(() ->
otelRule.getSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(5L)).until(() ->
otelRule.getSpans().size() == 2);
final List<SpanData> spans = getSpansSorted();
assertThat(spans.size(), equalTo(2));
@@ -287,7 +287,7 @@ public class OpenTelemetryTracingTest extends
AbstractClientServerTestBase {
final Response r = createWebClient("/bookstore/books/async").get();
assertEquals(Status.OK.getStatusCode(), r.getStatus());
- await().atMost(Duration.ofSeconds(1L)).until(() ->
otelRule.getSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(5L)).until(() ->
otelRule.getSpans().size() == 2);
final List<SpanData> spans = getSpansSorted();
assertThat(spans.size(), equalTo(2));
@@ -303,7 +303,7 @@ public class OpenTelemetryTracingTest extends
AbstractClientServerTestBase {
final Response r = client.async().get().get(1L, TimeUnit.SECONDS);
assertEquals(Status.OK.getStatusCode(), r.getStatus());
- await().atMost(Duration.ofSeconds(1L)).until(() ->
otelRule.getSpans().size() == 3);
+ await().atMost(Duration.ofSeconds(5L)).until(() ->
otelRule.getSpans().size() == 3);
assertThat(otelRule.getSpans().size(), equalTo(3));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("Get Books"));
@@ -373,7 +373,7 @@ public class OpenTelemetryTracingTest extends
AbstractClientServerTestBase {
}
// Await till flush happens, usually every second
- await().atMost(Duration.ofSeconds(1L)).until(() ->
otelRule.getSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(5L)).until(() ->
otelRule.getSpans().size() == 4);
assertThat(otelRule.getSpans().size(), equalTo(4));
assertThat(otelRule.getSpans().get(3).getName(), equalTo("test span"));
@@ -392,7 +392,7 @@ public class OpenTelemetryTracingTest extends
AbstractClientServerTestBase {
assertThat(Span.current().getSpanContext().getSpanId(),
equalTo(span.getSpanContext().getSpanId()));
- await().atMost(Duration.ofSeconds(1L)).until(() ->
otelRule.getSpans().size() == 3);
+ await().atMost(Duration.ofSeconds(5L)).until(() ->
otelRule.getSpans().size() == 3);
assertThat(otelRule.getSpans().size(), equalTo(3));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("Get
Books"));
@@ -406,7 +406,7 @@ public class OpenTelemetryTracingTest extends
AbstractClientServerTestBase {
}
// Await till flush happens, usually every second
- await().atMost(Duration.ofSeconds(1L)).until(() ->
otelRule.getSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(5L)).until(() ->
otelRule.getSpans().size() == 4);
assertThat(otelRule.getSpans().size(), equalTo(4));
assertThat(otelRule.getSpans().get(3).getName(), equalTo("test span"));
@@ -443,7 +443,7 @@ public class OpenTelemetryTracingTest extends
AbstractClientServerTestBase {
try {
client.get();
} finally {
- await().atMost(Duration.ofSeconds(1L)).until(() ->
otelRule.getSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(5L)).until(() ->
otelRule.getSpans().size() == 2);
assertThat(otelRule.getSpans().toString(),
otelRule.getSpans().size(), equalTo(2));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("GET " +
client.getCurrentURI()));
assertThat(otelRule.getSpans().get(0).getStatus().getStatusCode(),
equalTo(StatusCode.ERROR));
diff --git
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
index 7b816cf4ff..6566e21358 100644
---
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
+++
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
@@ -199,7 +199,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
final Response r =
withTrace(createWebClient("/bookstore/books/async"), spanId).get();
assertEquals(Status.OK.getStatusCode(), r.getStatus());
- await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(5L)).until(()->
REPORTER.getSpans().size() == 2);
final List<JaegerSpan> spans = getSpansSorted();
assertThat(spans.size(), equalTo(2));
@@ -226,7 +226,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
final Response r = createWebClient("/bookstore/books/async").get();
assertEquals(Status.OK.getStatusCode(), r.getStatus());
- await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(5L)).until(()->
REPORTER.getSpans().size() == 2);
final List<JaegerSpan> spans = getSpansSorted();
assertThat(spans.size(), equalTo(2));
@@ -241,7 +241,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
final Response r = client.async().get().get(1L, TimeUnit.SECONDS);
assertEquals(Status.OK.getStatusCode(), r.getStatus());
- await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 3);
+ await().atMost(Duration.ofSeconds(5L)).until(()->
REPORTER.getSpans().size() == 3);
assertThat(REPORTER.getSpans().size(), equalTo(3));
assertThat(REPORTER.getSpans().get(0).getOperationName(), equalTo("Get
Books"));
@@ -325,7 +325,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
}
// Await till flush happens, usually every second
- await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(5L)).until(()->
REPORTER.getSpans().size() == 4);
assertThat(REPORTER.getSpans().size(), equalTo(4));
assertThat(REPORTER.getSpans().get(3).getOperationName(),
equalTo("test span"));
@@ -342,7 +342,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
assertEquals(Status.OK.getStatusCode(), r.getStatus());
assertThat(tracer.activeSpan().context(), equalTo(span.context()));
- await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 3);
+ await().atMost(Duration.ofSeconds(5L)).until(()->
REPORTER.getSpans().size() == 3);
assertThat(REPORTER.getSpans().size(), equalTo(3));
assertThat(REPORTER.getSpans().get(0).getOperationName(),
equalTo("Get Books"));
@@ -356,7 +356,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
}
// Await till flush happens, usually every second
- await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(5L)).until(()->
REPORTER.getSpans().size() == 4);
assertThat(REPORTER.getSpans().size(), equalTo(4));
assertThat(REPORTER.getSpans().get(3).getOperationName(),
equalTo("test span"));
@@ -391,7 +391,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
try {
client.get();
} finally {
- await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(5L)).until(()->
REPORTER.getSpans().size() == 2);
assertThat(REPORTER.getSpans().toString(),
REPORTER.getSpans().size(), equalTo(2));
assertThat(REPORTER.getSpans().get(0).getOperationName(),
equalTo("GET " + client.getCurrentURI()));
assertThat(REPORTER.getSpans().get(0).getTags(),
hasItem(Tags.ERROR.getKey(), Boolean.TRUE));
diff --git
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
index 71a9f499e2..295ae79fd7 100644
---
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
+++
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
@@ -247,7 +247,7 @@ public class OpenTelemetryTracingTest extends
AbstractClientServerTestBase {
}
// Await till flush happens, usually every second
- await().atMost(Duration.ofSeconds(1L)).until(() ->
otelRule.getSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(5L)).until(() ->
otelRule.getSpans().size() == 4);
assertThat(otelRule.getSpans().size(), equalTo(4));
assertThat(otelRule.getSpans().get(3).getName(), equalTo("test
span"));
@@ -331,7 +331,7 @@ public class OpenTelemetryTracingTest extends
AbstractClientServerTestBase {
service.orderBooks();
// Await till flush happens, usually every second
- await().atMost(Duration.ofSeconds(1L)).until(() ->
otelRule.getSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(5L)).until(() ->
otelRule.getSpans().size() == 2);
assertThat(otelRule.getSpans().get(0).getName(), equalTo("POST
/BookStore"));
assertThat(otelRule.getSpans().get(1).getName(),
diff --git
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
index c5ff413c2a..bdbdceb6f0 100644
---
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
+++
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
@@ -178,7 +178,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
}
// Await till flush happens, usually every second
- await().atMost(Duration.ofSeconds(1L)).until(()->
REPORTER.getSpans().size() == 4);
+ await().atMost(Duration.ofSeconds(5L)).until(()->
REPORTER.getSpans().size() == 4);
assertThat(REPORTER.getSpans().size(), equalTo(4));
assertThat(REPORTER.getSpans().get(3).getOperationName(),
equalTo("test span"));
@@ -234,7 +234,7 @@ public class OpenTracingTracingTest extends
AbstractClientServerTestBase {
service.orderBooks();
// Await till flush happens, usually every second
- await().atMost(Duration.ofSeconds(1L)).until(() ->
REPORTER.getSpans().size() == 2);
+ await().atMost(Duration.ofSeconds(5L)).until(() ->
REPORTER.getSpans().size() == 2);
assertThat(REPORTER.getSpans().get(0).getOperationName(),
equalTo("POST /BookStore"));
assertThat(REPORTER.getSpans().get(1).getOperationName(),
