diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-17 13:20:34 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-17 13:20:34 +0100 |
commit | e9c1be52300dec6a8d9d1d32fed2be09a4f3807f (patch) | |
tree | 1eaa9062a196e4ad1edb2e29227f46a8483cf086 /metrics-proxy/src/main/java/ai | |
parent | 2d96663b5067e6646e0e3b737a8607865ea6d586 (diff) |
Simplify and modernize
Diffstat (limited to 'metrics-proxy/src/main/java/ai')
-rw-r--r-- | metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java | 5 | ||||
-rw-r--r-- | metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/metrics/MetricsV2Handler.java | 3 |
2 files changed, 3 insertions, 5 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 a3b02e608c2..ab1c2e70735 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 @@ -24,7 +24,6 @@ import java.util.stream.Collectors; import static ai.vespa.metricsproxy.metric.ExternalMetrics.extractConfigserverDimensions; import static java.util.logging.Level.FINE; -import static java.util.stream.Collectors.toList; /** * Retrieves metrics and performs necessary conversions and additions of metadata. @@ -100,7 +99,7 @@ public class MetricsManager { private MetricsPacket.Builder [] getMetricsBuildersAsArray(List<VespaService> services, Instant startTime, ConsumerId consumerId) { List<MetricsPacket.Builder> builders = getMetricsAsBuilders(services, startTime, consumerId); - return builders.toArray(new MetricsPacket.Builder[builders.size()]); + return builders.toArray(new MetricsPacket.Builder[0]); } /** @@ -119,7 +118,7 @@ public class MetricsManager { purgeStaleMetrics(); List<MetricsPacket.Builder> externalPackets = externalMetrics.getMetrics().stream() .filter(MetricsPacket.Builder::hasMetrics) - .collect(toList()); + .toList(); log.log(FINE, () -> "Got " + externalPackets.size() + " external metrics packets with whitelisted metrics."); result.addAll(externalPackets); diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/metrics/MetricsV2Handler.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/metrics/MetricsV2Handler.java index 468a61baa88..339f06c67b8 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/metrics/MetricsV2Handler.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/metrics/MetricsV2Handler.java @@ -30,7 +30,6 @@ import static ai.vespa.metricsproxy.metric.model.json.GenericJsonUtil.toGenericA import static ai.vespa.metricsproxy.metric.model.processing.MetricsProcessor.applyProcessors; import static com.yahoo.jdisc.Response.Status.INTERNAL_SERVER_ERROR; import static com.yahoo.jdisc.Response.Status.OK; -import static java.util.Collections.singletonMap; /** * Http handler for the metrics/v2 rest api. @@ -72,7 +71,7 @@ public class MetricsV2Handler extends HttpHandlerBase { new PublicDimensionsProcessor(MAX_DIMENSIONS)); Node localNode = new Node(nodeInfoConfig.role(), nodeInfoConfig.hostname(), 0, ""); - Map<Node, List<MetricsPacket>> metricsByNode = singletonMap(localNode, metrics); + Map<Node, List<MetricsPacket>> metricsByNode = Map.of(localNode, metrics); return new JsonResponse(OK, toGenericApplicationModel(metricsByNode).serialize()); } catch (Exception e) { log.log(Level.WARNING, "Got exception when rendering metrics:", e); |