Skip to content

Commit bed7a6f

Browse files
authored
Read timeout in jetty http client tests (#12184)
1 parent 61326c6 commit bed7a6f

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

instrumentation/jetty-httpclient/jetty-httpclient-12.0/testing/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/AbstractJettyClient12Test.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ public Request buildRequest(String method, URI uri, Map<String, String> headers)
6767
request.agent("Jetty");
6868

6969
request.method(method);
70-
request.timeout(READ_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
70+
if (uri.toString().contains("/read-timeout")) {
71+
request.timeout(READ_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
72+
}
7173

7274
return request;
7375
}

instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/AbstractJettyClient9Test.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public abstract class AbstractJettyClient9Test extends AbstractHttpClientTest<Re
3131
public void before() throws Exception {
3232
// Start the main Jetty HttpClient and a https client
3333
client = createStandardClient();
34-
client.setConnectTimeout(5000L);
34+
client.setConnectTimeout(CONNECTION_TIMEOUT.toMillis());
3535
client.start();
3636

3737
SslContextFactory tlsCtx = new SslContextFactory();
@@ -55,13 +55,15 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
5555
@Override
5656
public Request buildRequest(String method, URI uri, Map<String, String> headers) {
5757
HttpClient theClient = uri.getScheme().equalsIgnoreCase("https") ? httpsClient : client;
58-
Request request =
59-
theClient
60-
.newRequest(uri)
61-
.method(method)
62-
.agent("Jetty")
63-
.timeout(5000L, TimeUnit.MILLISECONDS);
58+
Request request = theClient.newRequest(uri).method(method).agent("Jetty");
6459
headers.forEach(request::header);
60+
61+
if (uri.toString().contains("/read-timeout")) {
62+
request.timeout(READ_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
63+
} else if (uri.toString().contains("192.0.2.1")) {
64+
request.timeout(CONNECTION_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
65+
}
66+
6567
return request;
6668
}
6769

0 commit comments

Comments
 (0)