Merge pull request #29701 from vespa-engine/jonmv/set-correct-timeout

Set socket timeout when intended

2 files changed, 8 insertions, 8 deletions

diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java
index edd10f9297a..4e4e6f2956a 100644
--- a/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java
+++ b/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java
@@ -69,16 +69,16 @@ public class VespaHttpClientBuilder {
         connectionConfigBuilder.setConnectTimeout(connectTimeout);
         return this;
     }
-    public VespaHttpClientBuilder socketTimeout(long connectTimeout, TimeUnit timeUnit) {
-        connectionConfigBuilder.setConnectTimeout(connectTimeout, timeUnit);
+    public VespaHttpClientBuilder socketTimeout(int socketTimeout, TimeUnit timeUnit) {
+        connectionConfigBuilder.setSocketTimeout(socketTimeout, timeUnit);
         return this;
     }
-    public VespaHttpClientBuilder validateAfterInactivity(TimeValue validateAfterInactivity) {
-        connectionConfigBuilder.setValidateAfterInactivity(validateAfterInactivity);
+    public VespaHttpClientBuilder socketTimeout(Timeout socketTimeout) {
+        connectionConfigBuilder.setSocketTimeout(socketTimeout);
         return this;
     }
-    public VespaHttpClientBuilder socketTimeout(Timeout connectTimeout) {
-        connectionConfigBuilder.setConnectTimeout(connectTimeout);
+    public VespaHttpClientBuilder validateAfterInactivity(TimeValue validateAfterInactivity) {
+        connectionConfigBuilder.setValidateAfterInactivity(validateAfterInactivity);
         return this;
     }
 
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
index db53c2db266..ac9063a045f 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
@@ -82,11 +82,11 @@ public abstract class HttpMetricFetcher {
     private static CloseableHttpClient createHttpClient() {
         return VespaHttpClientBuilder.custom()
                 .connectTimeout(Timeout.ofMilliseconds(CONNECTION_TIMEOUT))
-                .socketTimeout(Timeout.ofMilliseconds(CONNECTION_TIMEOUT))
+                .socketTimeout(Timeout.ofMilliseconds(SOCKET_TIMEOUT))
                 .apacheBuilder()
                 .setUserAgent("metrics-proxy-http-client")
                 .setDefaultRequestConfig(RequestConfig.custom()
-                        .setConnectionRequestTimeout(Timeout.ofMilliseconds(SOCKET_TIMEOUT))
+                        .setConnectionRequestTimeout(Timeout.ofMilliseconds(CONNECTION_TIMEOUT))
                         .setResponseTimeout(Timeout.ofMilliseconds(SOCKET_TIMEOUT))
                         .build())
                 .build();