aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2023-03-03 10:54:10 +0100
committergjoranv <gv@verizonmedia.com>2023-03-03 10:54:10 +0100
commit06aaa4deb49a47ff8f35c2de953d76c2512e5f7e (patch)
tree1725b2ba26e4e2c229f4d6d1f0822528732c1fa9
parent5ee812d587eb747b2de460c6cee64c72b60464c6 (diff)
Use the APPLICATION_GENERATION constant.
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java3
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java4
2 files changed, 5 insertions, 2 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index fc49ae18b99..b7381631251 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -62,6 +62,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import static com.yahoo.collections.CollectionUtil.first;
+import static com.yahoo.metrics.ContainerMetrics.APPLICATION_GENERATION;
/**
* @author Tony Vaagenes
@@ -304,7 +305,7 @@ public final class ConfiguredApplication implements Application {
log.info("Switching to the latest deployed set of configurations and components. " +
"Application config generation: " + configurer.generation());
- metric.set("application_generation", configurer.generation(), metric.createContext(Map.of()));
+ metric.set(APPLICATION_GENERATION.baseName(), configurer.generation(), metric.createContext(Map.of()));
}
private void activateContainer(ContainerBuilder builder, Runnable onPreviousContainerTermination) {
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 ce2e7aa816f..c6f9c6fdd36 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
@@ -20,6 +20,8 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
+import static com.yahoo.metrics.ContainerMetrics.APPLICATION_GENERATION;
+
/**
* A response containing metrics for a collection of nodes.
*
@@ -163,7 +165,7 @@ public class MetricsResponse {
@Override
public List<String> metricResponseNames() {
- return List.of("application_generation" /*, "content.proton.config.generation" */);
+ return List.of(APPLICATION_GENERATION.baseName() /*, "content.proton.config.generation" */);
}
@Override