diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-26 16:57:19 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-26 16:57:19 +0100 |
commit | f521407e98bfdeea801f6c8e46e2d1edd234bf12 (patch) | |
tree | 7b9c0382a3164942ec5f37d8d64993fd0f6c0c35 /container-core | |
parent | 8dce093d125005b1d490e6edd4e87eb0c522a6e6 (diff) |
Avoid deprecated apache http 5.2 methods, by adding it to the builder.
Diffstat (limited to 'container-core')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java | 4 | ||||
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java index 4a74d841ce2..7c1b0cc3099 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java @@ -61,12 +61,10 @@ public class MetricsV2Handler extends HttpHandlerBase { } } - @SuppressWarnings("deprecation") private static CloseableHttpClient createHttpClient() { - return VespaHttpClientBuilder.create() + return VespaHttpClientBuilder.custom().connectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS).apacheBuilder() .setUserAgent("application-metrics-retriever") .setDefaultRequestConfig(RequestConfig.custom() - .setConnectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS) .setResponseTimeout(HTTP_SOCKET_TIMEOUT, MILLISECONDS) .build()) .build(); diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java index f830a55e940..960cb795ad6 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java @@ -62,12 +62,10 @@ public class PrometheusV1Handler extends HttpHandlerBase { } } - @SuppressWarnings("deprecation") private static CloseableHttpClient createHttpClient() { - return VespaHttpClientBuilder.create() + return VespaHttpClientBuilder.custom().connectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS).apacheBuilder() .setUserAgent("application-prometheus-receiver") .setDefaultRequestConfig(RequestConfig.custom() - .setConnectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS) .setResponseTimeout(HTTP_SOCKET_TIMEOUT, MILLISECONDS) .build()) .build(); |