From 52b23d116e9557edc8d7bba199aaf69cfe40b6bb Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 10 Jun 2021 18:44:36 +0300 Subject: [PATCH] Add connection timeout for forked ratpack http client (#3239) --- .../src/test/groovy/client/RatpackForkedHttpClientTest.groovy | 3 +++ .../src/test/groovy/client/RatpackHttpClientTest.groovy | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackForkedHttpClientTest.groovy b/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackForkedHttpClientTest.groovy index dacf647dc8..5e9d2733db 100644 --- a/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackForkedHttpClientTest.groovy +++ b/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackForkedHttpClientTest.groovy @@ -5,6 +5,7 @@ package client +import java.time.Duration import ratpack.exec.Promise import ratpack.http.client.HttpClient @@ -13,6 +14,8 @@ class RatpackForkedHttpClientTest extends RatpackHttpClientTest { @Override Promise internalSendRequest(HttpClient client, String method, URI uri, Map headers) { def resp = client.request(uri) { spec -> + // Connect timeout for the whole client was added in 1.5 so we need to add timeout for each request + spec.connectTimeout(Duration.ofSeconds(2)) spec.method(method) spec.headers { headersSpec -> headers.entrySet().each { diff --git a/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy b/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy index 4f9490d65e..8bab828832 100644 --- a/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy +++ b/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy @@ -46,7 +46,6 @@ class RatpackHttpClientTest extends HttpClientTest implements AgentTestTra HttpClient buildHttpClient(Action action) { HttpClient.of { it.readTimeout(Duration.ofSeconds(2)) - // Connect timeout added in 1.5 // execController method added in 1.9 if (HttpClientSpec.metaClass.getMetaMethod("execController") != null) { it.execController(exec.getController()) @@ -81,6 +80,7 @@ class RatpackHttpClientTest extends HttpClientTest implements AgentTestTra // overridden in RatpackForkedHttpClientTest Promise internalSendRequest(HttpClient client, String method, URI uri, Map headers) { def resp = client.request(uri) { spec -> + // Connect timeout for the whole client was added in 1.5 so we need to add timeout for each request spec.connectTimeout(Duration.ofSeconds(2)) spec.method(method) spec.headers { headersSpec ->