Ignore case when looking up metrics consumer.

2 files changed, 10 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 b316a620a9b..037fca95588 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
@@ -10,6 +10,7 @@ import ai.vespa.metricsproxy.service.VespaServices;
 
 import java.time.Instant;
 import java.util.List;
+import java.util.Optional;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -65,12 +66,14 @@ public class ValuesFetcher {
     public static ConsumerId getConsumerOrDefault(String requestedConsumer, MetricsConsumers consumers) {
         if (requestedConsumer == null) return defaultMetricsConsumerId;
 
-        ConsumerId consumerId = toConsumerId(requestedConsumer);
-        if (! consumers.getAllConsumers().contains(consumerId)) {
-            log.info("No consumer with id '" + requestedConsumer + "' - using the default consumer instead.");
-            return defaultMetricsConsumerId;
-        }
-        return consumerId;
+        Optional<ConsumerId> consumerId = consumers.getAllConsumers().stream()
+                .filter(consumer -> consumer.id.equalsIgnoreCase(requestedConsumer))
+                .findFirst();
+
+        if (consumerId.isPresent()) return consumerId.get();
+
+        log.info("No consumer with id '" + requestedConsumer + "' - using the default consumer instead.");
+        return defaultMetricsConsumerId;
     }
 
 }
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/ConsumerId.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/ConsumerId.java
index 9ec22154627..693a1217119 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/ConsumerId.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/ConsumerId.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.metricsproxy.metric.model;
 
+import java.util.Locale;
 import java.util.Objects;
 
 /**