Allow using getConsumerOrDefault from outside the class.

1 files changed, 6 insertions, 6 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java
index 41acd934333..b47665c2536 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java
@@ -41,7 +41,7 @@ public class ValuesFetcher {
     }
 
     public List<MetricsPacket> fetch(String requestedConsumer) throws JsonRenderingException {
-        ConsumerId consumer = getConsumerOrDefault(requestedConsumer);
+        ConsumerId consumer = getConsumerOrDefault(requestedConsumer, metricsConsumers);
 
         return fetchAllMetrics()
                 .stream()
@@ -53,12 +53,12 @@ public class ValuesFetcher {
         return metricsManager.getMetrics(vespaServices.getVespaServices(), Instant.now());
     }
 
-    private ConsumerId getConsumerOrDefault(String consumer) {
-        if (consumer == null) return DEFAULT_PUBLIC_CONSUMER_ID;
+    public static ConsumerId getConsumerOrDefault(String requestedConsumer, MetricsConsumers consumers) {
+        if (requestedConsumer == null) return DEFAULT_PUBLIC_CONSUMER_ID;
 
-        ConsumerId consumerId = toConsumerId(consumer);
-        if (! metricsConsumers.getAllConsumers().contains(consumerId)) {
-            log.info("No consumer with id '" + consumer + "' - using the default consumer instead.");
+        ConsumerId consumerId = toConsumerId(requestedConsumer);
+        if (! consumers.getAllConsumers().contains(consumerId)) {
+            log.info("No consumer with id '" + requestedConsumer + "' - using the default consumer instead.");
             return DEFAULT_PUBLIC_CONSUMER_ID;
         }
         return consumerId;