diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2019-09-12 11:17:46 +0200 |
---|---|---|
committer | Ola Aunrønning <olaa@verizonmedia.com> | 2019-09-12 11:17:46 +0200 |
commit | 43b15627a436b89450d3ba84ef5a6b24f3a276db (patch) | |
tree | a47f0bb408f9cb4a9f788fd909816fd3234a9aa6 /configserver/src | |
parent | 9be8547f8720e71d4e80582a9ce5f720d2c22d20 (diff) |
Don't recreate client
Diffstat (limited to 'configserver/src')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterMetricsRetriever.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterMetricsRetriever.java index b51f3d01e1a..c23af021e3b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterMetricsRetriever.java @@ -1,18 +1,17 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.metrics; +import ai.vespa.util.http.VespaHttpClientBuilder; import com.yahoo.slime.ArrayTraverser; import com.yahoo.slime.Inspector; import com.yahoo.slime.Slime; import com.yahoo.vespa.config.SlimeUtils; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.client.CloseableHttpClient; import java.io.IOException; import java.io.InputStream; -import java.io.UncheckedIOException; import java.net.URI; import java.util.Collection; import java.util.List; @@ -39,6 +38,9 @@ public class ClusterMetricsRetriever { private static final String VESPA_DISTRIBUTOR = "vespa.distributor"; private static final List<String> WANTED_METRIC_SERVICES = List.of(VESPA_CONTAINER, VESPA_QRSERVER, VESPA_DISTRIBUTOR); + + private static final CloseableHttpClient httpClient = VespaHttpClientBuilder.create().build(); + /** * Call the metrics API on each host and aggregate the metrics * into a single value, grouped by cluster. @@ -79,9 +81,7 @@ public class ClusterMetricsRetriever { private static Slime doMetricsRequest(URI hostURI) { HttpGet get = new HttpGet(hostURI); - try { - HttpClient httpClient = HttpClientBuilder.create().build(); - HttpResponse response = httpClient.execute(get); + try (CloseableHttpResponse response = httpClient.execute(get)) { InputStream is = response.getEntity().getContent(); Slime slime = SlimeUtils.jsonToSlime(is.readAllBytes()); is.close(); |