diff options
Diffstat (limited to 'metrics-proxy')
5 files changed, 12 insertions, 19 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java index b610c57cd99..60e85f3f9e4 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java @@ -13,7 +13,6 @@ import ai.vespa.metricsproxy.service.VespaServices; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -107,7 +106,7 @@ public class MetricsManager { * NOTE: Use {@link #getMetrics(List, Instant)} instead, unless further processing of the metrics is necessary. */ public List<MetricsPacket.Builder> getMetricsAsBuilders(List<VespaService> services, Instant startTime, ConsumerId consumerId) { - if (services.isEmpty()) return Collections.emptyList(); + if (services.isEmpty()) return List.of(); log.log(FINE, () -> "Updating services prior to fetching metrics, number of services= " + services.size()); vespaServices.updateServices(services); @@ -164,7 +163,7 @@ public class MetricsManager { * @return Health metrics for all matching services. */ public List<MetricsPacket> getHealthMetrics(List<VespaService> services) { - if (services.isEmpty()) return Collections.emptyList(); + if (services.isEmpty()) return List.of(); vespaServices.updateServices(services); // TODO: Add global dimensions to health metrics? @@ -190,7 +189,7 @@ public class MetricsManager { public void purgeExtraMetrics() { extraDimensions = new HashMap<>(); - externalMetrics.setExtraMetrics(Collections.emptyList()); + externalMetrics.setExtraMetrics(List.of()); } /** diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java index 9fe5983d5b9..4dabc7a66d8 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/VespaMetrics.java @@ -17,7 +17,6 @@ import ai.vespa.metricsproxy.service.VespaService; import java.time.Instant; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -140,7 +139,7 @@ public class VespaMetrics { if ( ! configuredDimensions.isEmpty()) { Map<DimensionId, String> dims = new HashMap<>(dimensions); configuredDimensions.forEach(d -> dims.put(d.key(), d.value())); - dimensions = Collections.unmodifiableMap(dims); + dimensions = Map.copyOf(dims); } return dimensions; } @@ -222,10 +221,10 @@ public class VespaMetrics { } private List<ConfiguredMetric> getMetricDefinitions(ConsumerId consumer) { - if (metricsConsumers == null) return Collections.emptyList(); + if (metricsConsumers == null) return List.of(); List<ConfiguredMetric> definitions = metricsConsumers.getMetricDefinitions(consumer); - return definitions == null ? Collections.emptyList() : definitions; + return definitions == null ? List.of() : definitions; } private static void setMetaInfo(MetricsPacket.Builder builder, Instant timestamp) { diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java index c32e90ecc9f..3d2bf7aaecf 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java @@ -18,8 +18,7 @@ import static ai.vespa.metricsproxy.metric.ExternalMetrics.VESPA_NODE_SERVICE_ID import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId; import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId; import static ai.vespa.metricsproxy.metric.model.json.JacksonUtil.objectMapper; -import static java.util.Collections.emptyList; -import static java.util.Collections.singletonList; + import static java.util.logging.Level.WARNING; import static java.util.stream.Collectors.toList; @@ -90,7 +89,7 @@ public class GenericJsonUtil { return toMetricsPackets(jsonModel); } catch (IOException e) { log.log(WARNING, "Could not create metrics packet from string:\n" + jsonString, e); - return emptyList(); + return List.of(); } } @@ -106,7 +105,7 @@ public class GenericJsonUtil { if (node == null) return packets; if (node.metrics == null || node.metrics.isEmpty()) { - return singletonList(new MetricsPacket.Builder(VESPA_NODE_SERVICE_ID) + return List.of(new MetricsPacket.Builder(VESPA_NODE_SERVICE_ID) .statusCode(StatusCode.UP.ordinal()) .timestamp(node.timestamp)); } @@ -124,7 +123,7 @@ public class GenericJsonUtil { private static List<MetricsPacket.Builder> toServicePackets(GenericService service) { List<MetricsPacket.Builder> packets = new ArrayList<>(); if (service.metrics == null || service.metrics.isEmpty()) - return singletonList(newServicePacket(service)); + return List.of(newServicePacket(service)); for (var genericMetrics : service.metrics) { var packet = newServicePacket(service); diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java index 82049da5115..649a4978ed9 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java @@ -21,7 +21,6 @@ import java.util.stream.Collectors; import static ai.vespa.metricsproxy.http.ValuesFetcher.defaultMetricsConsumerId; import static ai.vespa.metricsproxy.metric.model.json.JacksonUtil.objectMapper; -import static java.util.Collections.emptyList; import static java.util.logging.Level.WARNING; /** @@ -65,7 +64,7 @@ public class YamasJsonUtil { return packets; } catch (IOException e) { log.log(WARNING, "Could not create metrics packet from string:\n" + jsonString, e); - return emptyList(); + return List.of(); } } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/prometheus/PrometheusUtil.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/prometheus/PrometheusUtil.java index 973e1adb96d..d7436ccf404 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/prometheus/PrometheusUtil.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/prometheus/PrometheusUtil.java @@ -13,9 +13,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static java.util.Collections.emptyList; -import static java.util.Collections.singletonList; - /** * @author yj-jtakagi * @author gjoranv @@ -62,7 +59,7 @@ public class PrometheusUtil { var statusMetricName = serviceName + "_status"; // MetricsPacket status 0 means OK, but it's the opposite in Prometheus. var statusMetricValue = (firstPacket.statusCode == 0) ? 1 : 0; - var sampleList = singletonList(new Sample(statusMetricName, emptyList(), emptyList(), + var sampleList = List.of(new Sample(statusMetricName, List.of(), List.of(), statusMetricValue, firstPacket.timestamp * 1000)); metricFamilySamples.add(new MetricFamilySamples(statusMetricName, Collector.Type.UNKNOWN, "status of service", sampleList)); } |