Always use 'last' suffix

2 files changed, 116 insertions, 109 deletions

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 c6f9c6fdd36..84988be99ec 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
@@ -21,6 +21,7 @@ import java.util.Map;
 import java.util.Optional;
 
 import static com.yahoo.metrics.ContainerMetrics.APPLICATION_GENERATION;
+import static com.yahoo.metrics.ContainerMetrics.IN_SERVICE;
 
 /**
  * A response containing metrics for a collection of nodes.
@@ -165,7 +166,7 @@ public class MetricsResponse {
 
             @Override
             public List<String> metricResponseNames() {
-                return List.of(APPLICATION_GENERATION.baseName() /*, "content.proton.config.generation" */);
+                return List.of(APPLICATION_GENERATION.last() /*, "content.proton.config.generation" */);
             }
 
             @Override
@@ -177,7 +178,7 @@ public class MetricsResponse {
         inService {
 
             @Override
-            public List<String> metricResponseNames() { return List.of("in_service"); }
+            public List<String> metricResponseNames() { return List.of(IN_SERVICE.last()); }
 
             @Override
             double computeFinal(ListMap<String, Double> values) {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java
index e83880404f4..24697d02681 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java
@@ -76,6 +76,7 @@ public class MetricsV2MetricsFetcherTest {
             assertEquals(0.15, values.get(0).getSecond().load().memory(), delta);
             assertEquals(0.20, values.get(0).getSecond().load().disk(), delta);
             assertEquals(3, values.get(0).getSecond().generation(), delta);
+            assertFalse(values.get(0).getSecond().inService());
             assertTrue(values.get(0).getSecond().stable());
         }
 
@@ -108,114 +109,119 @@ public class MetricsV2MetricsFetcherTest {
     }
 
     final String cannedResponseForApplication1 =
-            "{\n" +
-            "  \"nodes\": [\n" +
-            "    {\n" +
-            "      \"hostname\": \"host-1.yahoo.com\",\n" +
-            "      \"role\": \"role0\",\n" +
-            "      \"node\": {\n" +
-            "        \"timestamp\": 1234,\n" +
-            "        \"metrics\": [\n" +
-            "          {\n" +
-            "            \"values\": {\n" +
-            "              \"cpu.util\": 16.2,\n" +
-            "              \"mem.util\": 23.1,\n" +
-            "              \"disk.util\": 82\n" +
-            "            },\n" +
-            "            \"dimensions\": {\n" +
-            "              \"state\": \"active\"\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    },\n" +
-            "    {\n" +
-            "      \"hostname\": \"host-2.yahoo.com\",\n" +
-            "      \"role\": \"role1\",\n" +
-            "      \"node\": {\n" +
-            "        \"timestamp\": 1200,\n" +
-            "        \"metrics\": [\n" +
-            "          {\n" +
-            "            \"values\": {\n" +
-            "              \"mem.util\": 30,\n" +
-            "              \"disk.util\": 40\n" +
-            "            },\n" +
-            "            \"dimensions\": {\n" +
-            "              \"state\": \"active\"\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      },\n" +
-            "      \"services\": [\n" +
-            "        {\n" +
-            "          \"name\": \"searchnode\",\n" +
-            "          \"timestamp\": 1234,\n" +
-            "          \"status\": {\n" +
-            "            \"code\": \"up\"\n" +
-            "          },\n" +
-            "          \"metrics\": [\n" +
-            "            {\n" +
-            "              \"values\": {\n" +
-            "                \"content.proton.documentdb.matching.queries.rate\": 20.5\n" +
-            "              },\n" +
-            "              \"dimensions\": {\n" +
-            "                \"documentType\": \"music\"\n" +
-            "              }\n" +
-            "            },\n" +
-            "            {\n" +
-            "              \"values\": {\n" +
-            "                \"content.proton.resource_usage.memory.average\": 0.35,\n" +
-            "                \"content.proton.resource_usage.disk.average\": 0.45\n" +
-            "              },\n" +
-            "              \"dimensions\": {\n" +
-            "              }\n" +
-            "            },\n" +
-            "            {\n" +
-            "              \"values\": {\n" +
-            "                \"content.proton.documentdb.matching.queries.rate\": 13.5\n" +
-            "              },\n" +
-            "              \"dimensions\": {\n" +
-            "                \"documentType\": \"books\"\n" +
-            "              }\n" +
-            "            },\n" +
-            "            {\n" +
-            "              \"values\": {\n" +
-            "                \"queries.rate\": 11.0\n" +
-            "              },\n" +
-            "              \"dimensions\": {\n" +
-            "              }\n" +
-            "            }\n" +
-            "          ]\n" +
-            "        }\n" +
-            "      ]\n" +
-            "    }\n" +
-            "  ]\n" +
-            "}\n";
+            """
+                    {
+                      "nodes": [
+                        {
+                          "hostname": "host-1.yahoo.com",
+                          "role": "role0",
+                          "node": {
+                            "timestamp": 1234,
+                            "metrics": [
+                              {
+                                "values": {
+                                  "cpu.util": 16.2,
+                                  "mem.util": 23.1,
+                                  "disk.util": 82
+                                },
+                                "dimensions": {
+                                  "state": "active"
+                                }
+                              }
+                            ]
+                          }
+                        },
+                        {
+                          "hostname": "host-2.yahoo.com",
+                          "role": "role1",
+                          "node": {
+                            "timestamp": 1200,
+                            "metrics": [
+                              {
+                                "values": {
+                                  "mem.util": 30,
+                                  "disk.util": 40
+                                },
+                                "dimensions": {
+                                  "state": "active"
+                                }
+                              }
+                            ]
+                          },
+                          "services": [
+                            {
+                              "name": "searchnode",
+                              "timestamp": 1234,
+                              "status": {
+                                "code": "up"
+                              },
+                              "metrics": [
+                                {
+                                  "values": {
+                                    "content.proton.documentdb.matching.queries.rate": 20.5
+                                  },
+                                  "dimensions": {
+                                    "documentType": "music"
+                                  }
+                                },
+                                {
+                                  "values": {
+                                    "content.proton.resource_usage.memory.average": 0.35,
+                                    "content.proton.resource_usage.disk.average": 0.45
+                                  },
+                                  "dimensions": {
+                                  }
+                                },
+                                {
+                                  "values": {
+                                    "content.proton.documentdb.matching.queries.rate": 13.5
+                                  },
+                                  "dimensions": {
+                                    "documentType": "books"
+                                  }
+                                },
+                                {
+                                  "values": {
+                                    "queries.rate": 11.0
+                                  },
+                                  "dimensions": {
+                                  }
+                                }
+                              ]
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                    """;
 
     final String cannedResponseForApplication2 =
-            "{\n" +
-            "  \"nodes\": [\n" +
-            "    {\n" +
-            "      \"hostname\": \"host-3.yahoo.com\",\n" +
-            "      \"role\": \"role0\",\n" +
-            "      \"node\": {\n" +
-            "        \"timestamp\": 1300,\n" +
-            "        \"metrics\": [\n" +
-            "          {\n" +
-            "            \"values\": {\n" +
-            "              \"cpu.util\": 10,\n" +
-            "              \"mem.util\": 15,\n" +
-            "              \"disk.util\": 20,\n" +
-            "              \"application_generation\": 3\n" +
-            "            },\n" +
-            "            \"dimensions\": {\n" +
-            "              \"state\": \"active\"\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    }\n" +
-            "  ]\n" +
-            "}\n";
+            """
+                    {
+                      "nodes": [
+                        {
+                          "hostname": "host-3.yahoo.com",
+                          "role": "role0",
+                          "node": {
+                            "timestamp": 1300,
+                            "metrics": [
+                              {
+                                "values": {
+                                  "cpu.util": 10,
+                                  "mem.util": 15,
+                                  "disk.util": 20,
+                                  "application_generation.last": 3,
+                                  "in_service.last": 0
+                                },
+                                "dimensions": {
+                                  "state": "active"
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                    """;
 
 }