Override default timeout for DefaultZtsClient + DefaultIdentityDocumentClient

2 files changed, 13 insertions, 0 deletions

diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
index 9d1b16da42a..dfe49d1b407 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
@@ -20,6 +20,7 @@ import com.yahoo.vespa.athenz.identity.ServiceIdentityProvider;
 import com.yahoo.vespa.athenz.tls.Pkcs10Csr;
 import com.yahoo.vespa.athenz.tls.Pkcs10CsrBuilder;
 import org.apache.http.HttpResponse;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.methods.RequestBuilder;
@@ -246,6 +247,11 @@ public class DefaultZtsClient implements ZtsClient {
                 .setRetryHandler(new DefaultHttpRequestRetryHandler(3, /*requestSentRetryEnabled*/true))
                 .setUserAgent("vespa-zts-client")
                 .setSSLContext(sslContext)
+                .setDefaultRequestConfig(RequestConfig.custom()
+                                                 .setConnectTimeout((int)Duration.ofSeconds(10).toMillis())
+                                                 .setConnectionRequestTimeout((int)Duration.ofSeconds(10).toMillis())
+                                                 .setSocketTimeout((int)Duration.ofSeconds(20).toMillis())
+                                                 .build())
                 .build();
     }
 
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java
index b9aba6e66b0..c99e40732bb 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/DefaultIdentityDocumentClient.java
@@ -8,6 +8,7 @@ import com.yahoo.vespa.athenz.identityprovider.api.EntityBindingsMapper;
 import com.yahoo.vespa.athenz.identityprovider.api.IdentityDocumentClient;
 import com.yahoo.vespa.athenz.identityprovider.api.SignedIdentityDocument;
 import com.yahoo.vespa.athenz.identityprovider.api.bindings.SignedIdentityDocumentEntity;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.methods.RequestBuilder;
@@ -22,6 +23,7 @@ import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
+import java.time.Duration;
 import java.util.function.Supplier;
 
 /**
@@ -102,6 +104,11 @@ public class DefaultIdentityDocumentClient implements IdentityDocumentClient {
                 .setSSLContext(sslContext)
                 .setSSLHostnameVerifier(hostnameVerifier)
                 .setUserAgent("default-identity-document-client")
+                .setDefaultRequestConfig(RequestConfig.custom()
+                                                    .setConnectTimeout((int)Duration.ofSeconds(10).toMillis())
+                                                    .setConnectionRequestTimeout((int)Duration.ofSeconds(10).toMillis())
+                                                    .setSocketTimeout((int)Duration.ofSeconds(20).toMillis())
+                                                    .build())
                 .build();
     }