Skip to content

Commit c10108b

Browse files
author
Mateusz Rzeszutek
authored
Enable HTTP client read timeout tests by default (#8530)
1 parent 6c34365 commit c10108b

File tree

44 files changed

+90
-53
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+90
-53
lines changed

‎instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationTest.scala

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ import akka.dispatch.ExecutionContexts
1010
import akka.http.scaladsl.Http
1111
import akka.http.scaladsl.model._
1212
import akka.http.javadsl.model.HttpHeader
13+
import akka.http.scaladsl.settings.ClientConnectionSettings
1314
import akka.http.scaladsl.model.headers.RawHeader
15+
import akka.http.scaladsl.settings.ConnectionPoolSettings
1416
import akka.stream.ActorMaterializer
1517
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension
1618
import io.opentelemetry.instrumentation.testing.junit.http.{
1719
AbstractHttpClientTest,
1820
HttpClientInstrumentationExtension,
19-
HttpClientTestOptions,
2021
HttpClientResult,
22+
HttpClientTestOptions,
2123
SingleConnection
2224
}
2325

@@ -64,8 +66,24 @@ class AkkaHttpClientInstrumentationTest
6466
uri: URI,
6567
headers: util.Map[String, String]
6668
): Int = {
69+
val settings = ConnectionPoolSettings(system)
70+
.withConnectionSettings(
71+
ClientConnectionSettings(system)
72+
.withConnectingTimeout(
73+
FiniteDuration(
74+
AbstractHttpClientTest.CONNECTION_TIMEOUT.toMillis,
75+
MILLISECONDS
76+
)
77+
)
78+
.withIdleTimeout(
79+
FiniteDuration(
80+
AbstractHttpClientTest.READ_TIMEOUT.toMillis,
81+
MILLISECONDS
82+
)
83+
)
84+
)
6785
val response = Await.result(
68-
Http.get(system).singleRequest(request),
86+
Http.get(system).singleRequest(request, settings = settings),
6987
10 seconds
7088
)
7189
response.discardEntityBytes(materializer)

‎instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ public void cancelled() {
226226

227227
void configureTest(HttpClientTestOptions.Builder optionsBuilder) {
228228
optionsBuilder.setUserAgent("httpasyncclient");
229-
optionsBuilder.enableTestReadTimeout();
230229
optionsBuilder.setHttpAttributes(
231230
endpoint -> {
232231
Set<AttributeKey<?>> attributes =

‎instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/test/groovy/AbstractCommonsHttpClientTest.groovy

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ abstract class AbstractCommonsHttpClientTest extends HttpClientTest<HttpMethod>
9393
false
9494
}
9595

96-
@Override
97-
boolean testReadTimeout() {
98-
true
99-
}
100-
10196
@Override
10297
Set<AttributeKey<?>> httpAttributes(URI uri) {
10398
Set<AttributeKey<?>> extra = [

‎instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/AbstractApacheHttpClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ abstract class AbstractApacheHttpClientTest<T extends HttpRequest>
2626
@Override
2727
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
2828
optionsBuilder.setUserAgent(USER_AGENT);
29-
optionsBuilder.enableTestReadTimeout();
3029
optionsBuilder.setHttpAttributes(AbstractApacheHttpClientTest::getHttpAttributes);
3130
}
3231

‎instrumentation/apache-httpclient/apache-httpclient-4.3/testing/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/AbstractApacheHttpClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ static ResponseHandler<HttpResponse> responseCallback(HttpClientResult httpClien
337337

338338
static void configureTest(HttpClientTestOptions.Builder optionsBuilder) {
339339
optionsBuilder.setUserAgent("apachehttpclient");
340-
optionsBuilder.enableTestReadTimeout();
341340
optionsBuilder.setHttpAttributes(
342341
endpoint -> {
343342
Set<AttributeKey<?>> attributes =

‎instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/AbstractApacheHttpClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ abstract class AbstractApacheHttpClientTest<T extends HttpRequest>
3232
@Override
3333
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
3434
optionsBuilder.setUserAgent(USER_AGENT);
35-
optionsBuilder.enableTestReadTimeout();
3635
optionsBuilder.setHttpAttributes(this::getHttpAttributes);
3736
}
3837

‎instrumentation/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
109109
optionsBuilder.disableTestRedirects();
110110
// armeria requests can't be reused
111111
optionsBuilder.disableTestReusedRequest();
112-
optionsBuilder.enableTestReadTimeout();
113112
}
114113

115114
@Test

‎instrumentation/async-http-client/async-http-client-1.9/javaagent/src/test/groovy/AsyncHttpClientTest.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ class AsyncHttpClientTest extends HttpClientTest<Request> implements AgentTestTr
2525
@AutoCleanup
2626
@Shared
2727
def client = new AsyncHttpClient(new AsyncHttpClientConfig.Builder()
28-
.setConnectTimeout(CONNECT_TIMEOUT_MS).build())
28+
.setConnectTimeout(CONNECT_TIMEOUT_MS)
29+
.setReadTimeout(READ_TIMEOUT_MS)
30+
.build())
2931

3032
@Override
3133
Request buildRequest(String method, URI uri, Map<String, String> headers) {

‎instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
115115
// context propagation, as there is no possible context propagation.
116116
optionsBuilder.disableTestCallback();
117117

118-
optionsBuilder.enableTestReadTimeout();
119-
120118
// Circular redirects don't throw an exception with Google Http Client
121119
optionsBuilder.disableTestCircularRedirects();
122120

‎instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionResponseCodeOnlyTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,5 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
5050
// HttpURLConnection can't be reused
5151
optionsBuilder.disableTestReusedRequest();
5252
optionsBuilder.disableTestCallback();
53-
optionsBuilder.enableTestReadTimeout();
5453
}
5554
}

‎instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
7878
// HttpURLConnection can't be reused
7979
optionsBuilder.disableTestReusedRequest();
8080
optionsBuilder.disableTestCallback();
81-
optionsBuilder.enableTestReadTimeout();
8281
}
8382

8483
@ParameterizedTest

‎instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionUseCachesFalseTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,5 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
6060
// HttpURLConnection can't be reused
6161
optionsBuilder.disableTestReusedRequest();
6262
optionsBuilder.disableTestCallback();
63-
optionsBuilder.enableTestReadTimeout();
6463
}
6564
}

‎instrumentation/java-http-client/testing/src/main/java/io/opentelemetry/instrumentation/httpclient/AbstractJavaHttpClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public void sendRequestWithCallback(
8080
@Override
8181
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
8282
optionsBuilder.disableTestCircularRedirects();
83-
optionsBuilder.enableTestReadTimeout();
8483
// TODO nested client span is not created, but context is still injected
8584
// which is not what the test expects
8685
optionsBuilder.disableTestWithClientParent();

‎instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/test/groovy/JaxRsClientV1Test.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class JaxRsClientV1Test extends HttpClientTest<WebResource.Builder> implements A
2222

2323
def setupSpec() {
2424
client.setConnectTimeout(CONNECT_TIMEOUT_MS)
25+
client.setReadTimeout(READ_TIMEOUT_MS)
2526
// Add filters to ensure spans aren't duplicated.
2627
client.addFilter(new LoggingFilter())
2728
client.addFilter(new GZIPContentEncodingFilter())

‎instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ class JerseyClientTest extends JaxRsClientTest {
136136
ClientBuilder builder() {
137137
ClientConfig config = new ClientConfig()
138138
config.property(ClientProperties.CONNECT_TIMEOUT, CONNECT_TIMEOUT_MS)
139+
config.property(ClientProperties.READ_TIMEOUT, READ_TIMEOUT_MS)
139140
return new JerseyClientBuilder().withConfig(config)
140141
}
141142

@@ -160,6 +161,7 @@ class ResteasyClientTest extends JaxRsClientTest {
160161
ClientBuilder builder() {
161162
return new ResteasyClientBuilder()
162163
.establishConnectionTimeout(CONNECT_TIMEOUT_MS, TimeUnit.MILLISECONDS)
164+
.socketTimeout(READ_TIMEOUT_MS, TimeUnit.MILLISECONDS)
163165
}
164166

165167
@Override
@@ -191,6 +193,11 @@ class CxfClientTest extends JaxRsClientTest {
191193
!Boolean.getBoolean("testLatestDeps")
192194
}
193195

196+
@Override
197+
boolean testReadTimeout() {
198+
return false
199+
}
200+
194201
@Override
195202
String userAgent() {
196203
"Apache"

‎instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/ResteasyProxyClientTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ class ResteasyProxyClientTest extends HttpClientTest<ResteasyProxyResource> impl
7979
boolean testCapturedHttpHeaders() {
8080
false
8181
}
82+
83+
@Override
84+
boolean testReadTimeout() {
85+
return false
86+
}
8287
}
8388

8489
@Path("")

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ abstract class AbstractJettyClient9Test extends HttpClientTest<Request> {
3636

3737
def setupSpec() {
3838
//Start the main Jetty HttpClient and a https client
39+
client.setConnectTimeout(CONNECT_TIMEOUT_MS)
3940
client.start()
4041

4142
SslContextFactory tlsCtx = new SslContextFactory()

‎instrumentation/jodd-http-4.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/joddhttp/v4_2/JoddHttpTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public int sendRequest(HttpRequest request, String method, URI uri, Map<String,
5151

5252
@Override
5353
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
54-
optionsBuilder.enableTestReadTimeout();
5554
optionsBuilder.disableTestCallback();
5655
// Circular Redirects are not explicitly handled by jodd-http
5756
optionsBuilder.disableTestCircularRedirects();

‎instrumentation/ktor/ktor-2.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorHttpClientTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class KtorHttpClientTest : AbstractHttpClientTest<HttpRequestBuilder>() {
5454

5555
override fun configure(optionsBuilder: HttpClientTestOptions.Builder) {
5656
with(optionsBuilder) {
57+
disableTestReadTimeout()
5758
// this instrumentation creates a span per each physical request
5859
// related issue https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/5722
5960
disableTestRedirects()

‎instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/Netty38ClientTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ public void onThrowable(Throwable throwable) {
138138
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
139139
optionsBuilder.disableTestRedirects();
140140
optionsBuilder.disableTestHttps();
141+
optionsBuilder.disableTestReadTimeout();
141142

142143
optionsBuilder.setUserAgent(USER_AGENT);
143144

‎instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ClientTest.groovy

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,4 @@ class Netty40ClientTest extends HttpClientTest<DefaultFullHttpRequest> implement
147147
boolean testHttps() {
148148
false
149149
}
150-
151-
@Override
152-
boolean testReadTimeout() {
153-
true
154-
}
155150
}

‎instrumentation/netty/netty-4.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/Netty41ClientTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import io.opentelemetry.instrumentation.netty.v4_1.Netty41ClientExtension;
1111
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1212
import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension;
13-
import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions;
1413
import org.junit.jupiter.api.extension.RegisterExtension;
1514

1615
public class Netty41ClientTest extends AbstractNetty41ClientTest {
@@ -29,11 +28,4 @@ protected Netty41ClientExtension clientExtension() {
2928

3029
@Override
3130
protected void configureChannel(Channel channel) {}
32-
33-
@Override
34-
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
35-
super.configure(optionsBuilder);
36-
37-
optionsBuilder.enableTestReadTimeout();
38-
}
3931
}

‎instrumentation/netty/netty-4.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/Netty41NativeClientTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.opentelemetry.instrumentation.netty.v4_1.Netty41ClientExtension;
2020
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
2121
import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension;
22-
import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions;
2322
import org.junit.jupiter.api.Assumptions;
2423
import org.junit.jupiter.api.extension.RegisterExtension;
2524

@@ -79,11 +78,4 @@ protected Netty41ClientExtension clientExtension() {
7978

8079
@Override
8180
protected void configureChannel(Channel channel) {}
82-
83-
@Override
84-
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
85-
super.configure(optionsBuilder);
86-
87-
optionsBuilder.enableTestReadTimeout();
88-
}
8981
}

‎instrumentation/netty/netty-4.1/library/src/test/java/io/opentelemetry/instrumentation/netty/v4_1/Netty41ClientTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,6 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
5252
optionsBuilder.disableTestWithClientParent();
5353
optionsBuilder.disableTestConnectionFailure();
5454
optionsBuilder.disableTestRemoteConnection();
55+
optionsBuilder.disableTestReadTimeout();
5556
}
5657
}

‎instrumentation/okhttp/okhttp-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2Test.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ private static OkHttpClient getClient(URI uri) {
9595
@Override
9696
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
9797
optionsBuilder.disableTestCircularRedirects();
98-
optionsBuilder.enableTestReadTimeout();
9998

10099
optionsBuilder.setHttpAttributes(
101100
uri -> {

‎instrumentation/okhttp/okhttp-3.0/testing/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/AbstractOkHttp3Test.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
117117
optionsBuilder.markAsLowLevelInstrumentation();
118118
optionsBuilder.setMaxRedirects(21); // 1st send + 20 retries
119119

120-
optionsBuilder.enableTestReadTimeout();
121-
122120
optionsBuilder.setHttpAttributes(
123121
uri -> {
124122
Set<AttributeKey<?>> attributes =

‎instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/client/PlayWsClientTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ class PlayWsClientTest extends HttpClientTest<WSRequest> implements AgentTestTra
7272
false
7373
}
7474

75+
@Override
76+
boolean testReadTimeout() {
77+
return false
78+
}
79+
7580
@Override
7681
Set<AttributeKey<?>> httpAttributes(URI uri) {
7782
def attributes = super.httpAttributes(uri)

‎instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/groovy/client/PlayWsClientTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ class PlayWsClientTest extends HttpClientTest<WSRequest> implements AgentTestTra
6363
false
6464
}
6565

66+
@Override
67+
boolean testReadTimeout() {
68+
return false
69+
}
70+
6671
@Override
6772
Set<AttributeKey<?>> httpAttributes(URI uri) {
6873
Set<AttributeKey<?>> extra = [

‎instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ abstract class PlayWsClientTestBaseBase<REQUEST> extends HttpClientTest<REQUEST>
5151
.setShutdownTimeout(0)
5252
.setMaxRedirects(3)
5353
.setConnectTimeout(CONNECT_TIMEOUT_MS)
54+
.setReadTimeout(READ_TIMEOUT_MS)
5455
.build()
5556

5657
asyncHttpClient = new DefaultAsyncHttpClient(asyncHttpClientConfig)

‎instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,6 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
148148

149149
// these tests will pass, but they don't really test anything since REQUEST is Void
150150
optionsBuilder.disableTestReusedRequest();
151-
152-
optionsBuilder.enableTestReadTimeout();
153151
}
154152

155153
protected Set<AttributeKey<?>> computeHttpAttributes(URI uri) {

‎instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/AbstractRatpackHttpClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
151151

152152
optionsBuilder.disableTestRedirects();
153153
optionsBuilder.disableTestReusedRequest();
154-
optionsBuilder.enableTestReadTimeout();
155154

156155
optionsBuilder.setHttpAttributes(this::getHttpAttributes);
157156
}

‎instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ public void sendRequestWithCallback(
9292
@Override
9393
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
9494
optionsBuilder.disableTestRedirects();
95-
optionsBuilder.enableTestReadTimeout();
9695
optionsBuilder.setUserAgent(USER_AGENT);
9796

9897
optionsBuilder.setExpectedClientSpanNameMapper(

‎instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ public void sendRequestWithCallback(
106106
@Override
107107
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
108108
optionsBuilder.disableTestRedirects();
109-
optionsBuilder.enableTestReadTimeout();
110109
optionsBuilder.setUserAgent(USER_AGENT);
111110
optionsBuilder.enableTestCallbackWithImplicitParent();
112111

‎instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public void sendRequestWithCallback(
9797
@Override
9898
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
9999
optionsBuilder.disableTestCircularRedirects();
100+
optionsBuilder.disableTestReadTimeout();
100101
optionsBuilder.setHttpAttributes(
101102
uri -> {
102103
Set<AttributeKey<?>> attributes =

‎instrumentation/spring/spring-web/spring-web-3.1/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/web/SpringRestTemplateTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public class SpringRestTemplateTest extends AbstractHttpClientTest<HttpEntity<St
3535
static void setUp() {
3636
SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
3737
factory.setConnectTimeout((int) CONNECTION_TIMEOUT.toMillis());
38+
factory.setReadTimeout((int) READ_TIMEOUT.toMillis());
3839
restTemplate = new RestTemplate(factory);
3940
}
4041

‎instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ public void sendRequestWithCallback(
6767
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
6868
optionsBuilder.disableTestRedirects();
6969

70+
// timeouts leak the scope
71+
optionsBuilder.disableTestReadTimeout();
72+
7073
optionsBuilder.setHttpAttributes(
7174
uri -> {
7275
Set<AttributeKey<?>> attributes =

0 commit comments

Comments
 (0)