From 110a0d88c1dadf587cb16a058c7ea6bcf93b9cd9 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 20 Feb 2023 16:12:21 +0100 Subject: Read content config generation --- .../java/ai/vespa/metricsproxy/core/MetricsManager.java | 2 +- .../ai/vespa/metricsproxy/http/application/Node.java | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'metrics-proxy/src') 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 ab1c2e70735..ba51bed4407 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 @@ -97,7 +97,7 @@ public class MetricsManager { return metricsPackets; } - private MetricsPacket.Builder [] getMetricsBuildersAsArray(List services, Instant startTime, ConsumerId consumerId) { + private MetricsPacket.Builder[] getMetricsBuildersAsArray(List services, Instant startTime, ConsumerId consumerId) { List builders = getMetricsAsBuilders(services, startTime, consumerId); return builders.toArray(new MetricsPacket.Builder[0]); } diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java index 821636336a8..21c7c78a224 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java @@ -25,14 +25,10 @@ public class Node { } public Node(String role, String hostname, int port, String path) { - Objects.requireNonNull(role, "Null role is not allowed"); - Objects.requireNonNull(hostname, "Null hostname is not allowed"); - Objects.requireNonNull(path, "Null path is not allowed"); - - this.role = role; - this.hostname = hostname; + this.role = Objects.requireNonNull(role, "Null role is not allowed"); + this.hostname = Objects.requireNonNull(hostname, "Null hostname is not allowed"); this.port = port; - this.path = path; + this.path = Objects.requireNonNull(path, "Null path is not allowed"); metricsUriBase = "http://" + hostname + ":" + port + path; } @@ -55,10 +51,10 @@ public class Node { public int hashCode() { return Objects.hash(role, hostname, port, path); } + @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(role).append(":").append(metricsUriBase); - return sb.toString(); + return role + ":" + metricsUriBase; } + } -- cgit v1.2.3