diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/testing/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/AbstractJettyClient12Test.java b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/testing/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/AbstractJettyClient12Test.java index c4e7a2f5b822..1352269c4030 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/testing/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/AbstractJettyClient12Test.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/testing/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/AbstractJettyClient12Test.java @@ -67,7 +67,9 @@ public Request buildRequest(String method, URI uri, Map headers) request.agent("Jetty"); request.method(method); - request.timeout(READ_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS); + if (uri.toString().contains("/read-timeout")) { + request.timeout(READ_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS); + } return request; } diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/AbstractJettyClient9Test.java b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/AbstractJettyClient9Test.java index 98a0ca4390f6..e85ca66601c2 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/AbstractJettyClient9Test.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/AbstractJettyClient9Test.java @@ -31,7 +31,7 @@ public abstract class AbstractJettyClient9Test extends AbstractHttpClientTest headers) { HttpClient theClient = uri.getScheme().equalsIgnoreCase("https") ? httpsClient : client; - Request request = - theClient - .newRequest(uri) - .method(method) - .agent("Jetty") - .timeout(5000L, TimeUnit.MILLISECONDS); + Request request = theClient.newRequest(uri).method(method).agent("Jetty"); headers.forEach(request::header); + + if (uri.toString().contains("/read-timeout")) { + request.timeout(READ_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS); + } else if (uri.toString().contains("192.0.2.1")) { + request.timeout(CONNECTION_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS); + } + return request; }