Merge pull request #26116 from vespa-engine/bratseth/read-content-config-generation

Read content config generation

5 files changed, 9 insertions, 16 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 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<VespaService> services, Instant startTime, ConsumerId consumerId) {
+    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[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;
     }
+
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java
index 0be4175c2c1..6c02f7466eb 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java
@@ -6,10 +6,8 @@ import com.yahoo.vespa.hosted.provision.applications.Cluster;
 
 import java.time.Duration;
 import java.util.List;
-import java.util.Optional;
 import java.util.OptionalDouble;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import static com.yahoo.vespa.hosted.provision.autoscale.ClusterModel.warmupDuration;
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java
index dc0327c9537..428ea784115 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java
@@ -162,7 +162,8 @@ public class MetricsResponse {
         generation { // application config generation active on the node
 
             @Override
-            public List<String> metricResponseNames() { return List.of("application_generation"); }
+            public List<String> metricResponseNames() { return List.of("application_generation",
+                                                                       "content.proton.config.generation"); }
 
             @Override
             double computeFinal(ListMap<String, Double> values) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java
index c25b0684f5a..17444ef9d2e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java
@@ -11,7 +11,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.OptionalDouble;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import static com.yahoo.vespa.hosted.provision.autoscale.ClusterModel.warmupDuration;
 
@@ -98,7 +97,6 @@ public class NodeTimeseries {
     }
 
     private boolean onAtLeastGeneration(long generation, NodeMetricSnapshot snapshot) {
-        if (snapshot.generation() < 0) return true; // Content nodes do not yet send generation
         return snapshot.generation() >= generation;
     }