Use ENUM for searchChainMetrics

1 files changed, 38 insertions, 68 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
index 6bbd1b7eef2..47e1b55e742 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
@@ -294,75 +294,45 @@ public class VespaMetricSet {
     private static Set<Metric> getSearchChainMetrics() {
         Set<Metric> metrics = new LinkedHashSet<>();
 
-        metrics.add(new Metric("peak_qps.max"));
-        metrics.add(new Metric("search_connections.max"));
-        metrics.add(new Metric("search_connections.sum"));
-        metrics.add(new Metric("search_connections.count"));
-        metrics.add(new Metric("feed.latency.max"));
-        metrics.add(new Metric("feed.latency.sum"));
-        metrics.add(new Metric("feed.latency.count"));
-        metrics.add(new Metric("feed.http-requests.count"));
-        metrics.add(new Metric("feed.http-requests.rate"));
-        metrics.add(new Metric("queries.rate"));
-        metrics.add(new Metric("query_container_latency.max"));
-        metrics.add(new Metric("query_container_latency.sum"));
-        metrics.add(new Metric("query_container_latency.count"));
-        metrics.add(new Metric("query_latency.max"));
-        metrics.add(new Metric("query_latency.sum"));
-        metrics.add(new Metric("query_latency.count"));
-        metrics.add(new Metric("query_latency.95percentile"));
-        metrics.add(new Metric("query_latency.99percentile"));
-        metrics.add(new Metric("query_timeout.min"));
-        metrics.add(new Metric("query_timeout.max"));
-        metrics.add(new Metric("query_timeout.sum"));
-        metrics.add(new Metric("query_timeout.count"));
-        metrics.add(new Metric("query_timeout.95percentile"));
-        metrics.add(new Metric("query_timeout.99percentile"));
-        metrics.add(new Metric("failed_queries.rate"));
-        metrics.add(new Metric("degraded_queries.rate"));
-        metrics.add(new Metric("hits_per_query.max"));
-        metrics.add(new Metric("hits_per_query.sum"));
-        metrics.add(new Metric("hits_per_query.count"));
-        metrics.add(new Metric("hits_per_query.95percentile"));
-        metrics.add(new Metric("hits_per_query.99percentile"));
-        metrics.add(new Metric("query_hit_offset.max"));
-        metrics.add(new Metric("query_hit_offset.sum"));
-        metrics.add(new Metric("query_hit_offset.count"));
-        metrics.add(new Metric("documents_covered.count"));
-        metrics.add(new Metric("documents_total.count"));
-        metrics.add(new Metric("documents_target_total.count"));
-        addMetric(metrics, "jdisc.render.latency", Set.of("min", "max", "count", "sum", "last", "average"));
-        addMetric(metrics, "query_item_count", Set.of("max", "sum", "count"));
-
-        metrics.add(new Metric("totalhits_per_query.max"));
-        metrics.add(new Metric("totalhits_per_query.sum"));
-        metrics.add(new Metric("totalhits_per_query.count"));
-        metrics.add(new Metric("totalhits_per_query.95percentile"));
-        metrics.add(new Metric("totalhits_per_query.99percentile"));
-        metrics.add(new Metric("empty_results.rate"));
-        metrics.add(new Metric("requestsOverQuota.rate"));
-        metrics.add(new Metric("requestsOverQuota.count"));
-
-        metrics.add(new Metric("relevance.at_1.sum"));
-        metrics.add(new Metric("relevance.at_1.count"));
-        metrics.add(new Metric("relevance.at_3.sum"));
-        metrics.add(new Metric("relevance.at_3.count"));
-        metrics.add(new Metric("relevance.at_10.sum"));
-        metrics.add(new Metric("relevance.at_10.count"));
-
+        addMetric(metrics, ContainerMetrics.PEAK_QPS.max());
+        addMetric(metrics, ContainerMetrics.SEARCH_CONNECTIONS.baseName(), Set.of("sum", "count", "max"));
+        addMetric(metrics, ContainerMetrics.FEED_LATENCY.baseName(), Set.of("sum", "count", "max"));
+        addMetric(metrics, ContainerMetrics.FEED_HTTP_REQUESTS.baseName(), Set.of("count", "rate"));
+        addMetric(metrics, ContainerMetrics.QUERIES.rate());
+        addMetric(metrics, ContainerMetrics.QUERY_CONTAINER_LATENCY.baseName(), Set.of("sum", "count", "max"));
+        addMetric(metrics, ContainerMetrics.QUERY_LATENCY.baseName(), Set.of("sum", "count", "max", "95percentile", "99percentile"));
+        addMetric(metrics, ContainerMetrics.QUERY_TIMEOUT.baseName(), Set.of("sum", "count", "max", "min", "95percentile", "99percentile"));
+        addMetric(metrics, ContainerMetrics.FAILED_QUERIES.rate());
+        addMetric(metrics, ContainerMetrics.DEGRADED_QUERIES.rate());
+        addMetric(metrics, ContainerMetrics.HITS_PER_QUERY.baseName(), Set.of("sum", "count", "max", "95percentile", "99percentile"));
+        addMetric(metrics, ContainerMetrics.SEARCH_CONNECTIONS.baseName(), Set.of("sum", "count", "max"));
+        addMetric(metrics, ContainerMetrics.QUERY_HIT_OFFSET.baseName(), Set.of("sum", "count", "max"));
+        addMetric(metrics, ContainerMetrics.DOCUMENTS_COVERED.count());
+        addMetric(metrics, ContainerMetrics.DOCUMENTS_TOTAL.count());
+        addMetric(metrics, ContainerMetrics.DOCUMENTS_TARGET_TOTAL.count());
+        addMetric(metrics, ContainerMetrics.JDISC_RENDER_LATENCY.baseName(), Set.of("min", "max", "count", "sum", "last", "average"));
+        addMetric(metrics, ContainerMetrics.QUERY_ITEM_COUNT.baseName(), Set.of("max", "sum", "count"));
+        addMetric(metrics, ContainerMetrics.TOTAL_HITS_PER_QUERY.baseName(), Set.of("sum", "count", "max", "95percentile", "99percentile"));
+        addMetric(metrics, ContainerMetrics.EMPTY_RESULTS.rate());
+        addMetric(metrics, ContainerMetrics.REQUESTS_OVER_QUOTA.baseName(), Set.of("rate", "count"));
+
+        addMetric(metrics, ContainerMetrics.RELEVANCE_AT_1.baseName(), Set.of("sum", "count"));
+        addMetric(metrics, ContainerMetrics.RELEVANCE_AT_3.baseName(), Set.of("sum", "count"));
+        addMetric(metrics, ContainerMetrics.RELEVANCE_AT_10.baseName(), Set.of("sum", "count"));
+                
         // Errors from search container
-        metrics.add(new Metric("error.timeout.rate"));
-        metrics.add(new Metric("error.backends_oos.rate"));
-        metrics.add(new Metric("error.plugin_failure.rate"));
-        metrics.add(new Metric("error.backend_communication_error.rate"));
-        metrics.add(new Metric("error.empty_document_summaries.rate"));
-        metrics.add(new Metric("error.invalid_query_parameter.rate"));
-        metrics.add(new Metric("error.internal_server_error.rate"));
-        metrics.add(new Metric("error.misconfigured_server.rate"));
-        metrics.add(new Metric("error.invalid_query_transformation.rate"));
-        metrics.add(new Metric("error.result_with_errors.rate"));
-        metrics.add(new Metric("error.unspecified.rate"));
-        metrics.add(new Metric("error.unhandled_exception.rate"));
+        addMetric(metrics, ContainerMetrics.ERROR_TIMEOUT.rate());
+        addMetric(metrics, ContainerMetrics.ERROR_BACKENDS_OOS.rate());
+        addMetric(metrics, ContainerMetrics.ERROR_PLUGIN_FAILURE.rate());
+        addMetric(metrics, ContainerMetrics.ERROR_BACKEND_COMMUNICATION_ERROR.rate());
+        addMetric(metrics, ContainerMetrics.ERROR_EMPTY_DOCUMENT_SUMMARIES.rate());
+        addMetric(metrics, ContainerMetrics.ERROR_INVALID_QUERY_PARAMETER.rate());
+        addMetric(metrics, ContainerMetrics.ERROR_INTERNAL_SERVER_ERROR.rate());
+        addMetric(metrics, ContainerMetrics.ERROR_MISCONFIGURED_SERVER.rate());
+        addMetric(metrics, ContainerMetrics.ERROR_INVALID_QUERY_TRANSFORMATION.rate());
+        addMetric(metrics, ContainerMetrics.ERROR_RESULT_WITH_ERRORS.rate());
+        addMetric(metrics, ContainerMetrics.ERROR_UNSPECIFIED.rate());
+        addMetric(metrics, ContainerMetrics.ERROR_UNHANDLED_EXCEPTION.rate());
 
         return metrics;
     }