diff options
Diffstat (limited to 'metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java')
-rw-r--r-- | metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java | 15 |
1 files changed, 9 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; } } |