Stop the polling thread prior to shutting down the http client.

3 files changed, 11 insertions, 11 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
index 87a0d7d8ad9..1bbda1a463c 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
@@ -104,13 +104,13 @@ public class ApplicationMetricsRetriever extends AbstractComponent implements Ru
             pollThread.notifyAll();
         }
         try {
+            pollThread.join();
+        } catch (InterruptedException e) {}
+        try {
             httpClient.close();
         } catch (IOException e) {
             log.warning("Failed closing httpclient: " + e);
         }
-        try {
-            pollThread.join();
-        } catch (InterruptedException e) {}
         super.deconstruct();
     }
 
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java
index 4a6eeae474a..f9106b60ab2 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java
@@ -1,6 +1,7 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.metricsproxy.node;
 
+import ai.vespa.metricsproxy.metric.HealthMetric;
 import ai.vespa.metricsproxy.metric.model.ConsumerId;
 import ai.vespa.metricsproxy.metric.model.DimensionId;
 import ai.vespa.metricsproxy.metric.model.MetricsPacket;
@@ -19,15 +20,16 @@ public class ServiceHealthGatherer {
     protected static List<MetricsPacket.Builder> gatherServiceHealthMetrics(VespaServices vespaServices)  {
         return vespaServices.getVespaServices()
                 .stream()
-                .map(service ->
-                     new MetricsPacket.Builder(service.getMonitoringName())
+                .map(service -> {
+                    HealthMetric healt = service.getHealth();
+                    return new MetricsPacket.Builder(service.getMonitoringName())
                             .timestamp(Instant.now().getEpochSecond())
-                            .statusMessage(service.getHealth().getStatus().status)
-                            .statusCode(service.getHealth().getStatus().code)
+                            .statusMessage(healt.getStatus().status)
+                            .statusCode(healt.getStatus().code)
                             .putDimension(DimensionId.toDimensionId("instance"), service.getInstanceName())
                             .putDimension(DimensionId.toDimensionId("metrictype"), "health")
-                            .addConsumers(Set.of(ConsumerId.toConsumerId("Vespa")))
-                )
+                            .addConsumers(Set.of(ConsumerId.toConsumerId("Vespa")));
+                })
                 .collect(Collectors.toList());
     }
 
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteMetricsFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteMetricsFetcher.java
index 8acaa0fb58e..3ff0daf37a7 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteMetricsFetcher.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteMetricsFetcher.java
@@ -1,8 +1,6 @@
 // Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.metricsproxy.service;
 
-import ai.vespa.metricsproxy.metric.Metrics;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.ExecutionException;