Merge pull request #25578 from vespa-engine/yngveaasheim/more-general-unit-names

Use more general unit names

2 files changed, 8 insertions, 8 deletions

diff --git a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java
index 5c2f1c1be79..a3a0068a105 100644
--- a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java
+++ b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java
@@ -82,15 +82,15 @@ public enum ContainerMetrics {
     DOCUMENTS_TOTAL("documents_total", Unit.DOCUMENT, "The number of documents to be evaluated if all requests had been fully executed"),
     DOCUMENTS_TARGET_TOTAL("documents_target_total", Unit.DOCUMENT, "The target number of total documents to be evaluated when when all data is in sync"),
     JDISC_RENDER_LATENCY("jdisc.render.latency", Unit.MILLISECOND, "The time used by the container to render responses"),
-    QUERY_ITEM_COUNT("query_item_count", Unit.QUERY_ITEM, "The number of query items (terms, phrases, etc)"),
+    QUERY_ITEM_COUNT("query_item_count", Unit.ITEM, "The number of query items (terms, phrases, etc)"),
     
     TOTAL_HITS_PER_QUERY("totalhits_per_query", Unit.HIT, "The total number of documents found to match queries"),
     EMPTY_RESULTS("empty_results", Unit.OPERATION, "Number of queries matching no documents"),
     REQUESTS_OVER_QUOTA("requestsOverQuota", Unit.OPERATION, "The number of requests rejected due to exceeding quota"),
     
-    RELEVANCE_AT_1("relevance.at_1", Unit.RELEVANCE, "The relevance of hit number 1"),
-    RELEVANCE_AT_3("relevance.at_3", Unit.RELEVANCE, "The relevance of hit number 3"),
-    RELEVANCE_AT_10("relevance.at_10", Unit.RELEVANCE, "The relevance of hit number 10"),
+    RELEVANCE_AT_1("relevance.at_1", Unit.SCORE, "The relevance of hit number 1"),
+    RELEVANCE_AT_3("relevance.at_3", Unit.SCORE, "The relevance of hit number 3"),
+    RELEVANCE_AT_10("relevance.at_10", Unit.SCORE, "The relevance of hit number 10"),
 
     // Errors from search container
     ERROR_TIMEOUT("error.timeout", Unit.OPERATION, "Requests that timed out"),
diff --git a/container-core/src/main/java/com/yahoo/metrics/Unit.java b/container-core/src/main/java/com/yahoo/metrics/Unit.java
index 58960170325..6f60ce9056b 100644
--- a/container-core/src/main/java/com/yahoo/metrics/Unit.java
+++ b/container-core/src/main/java/com/yahoo/metrics/Unit.java
@@ -12,16 +12,16 @@ public enum Unit {
     FRACTION(BaseUnit.FRACTION),
     HIT(BaseUnit.HIT),
     HIT_PER_QUERY(BaseUnit.HIT, BaseUnit.QUERY),
+    ITEM(BaseUnit.ITEM),
     MILLISECOND(BaseUnit.MILLISECOND),
     OPERATION(BaseUnit.OPERATION),
     OPERATION_PER_SECOND(BaseUnit.OPERATION, BaseUnit.SECOND),
     QUERY(BaseUnit.QUERY),
     QUERY_PER_SECOND(BaseUnit.QUERY, BaseUnit.SECOND),
-    QUERY_ITEM(BaseUnit.QUERY_ITEM),
-    RELEVANCE(BaseUnit.RELEVANCE),
     REQUEST(BaseUnit.REQUEST),
     RESPONSE(BaseUnit.RESPONSE),
     RESPONSE_PER_SECOND(BaseUnit.RESPONSE, BaseUnit.SECOND),
+    SCORE(BaseUnit.SCORE),
     SECOND(BaseUnit.SECOND),
     THREAD(BaseUnit.THREAD);
 
@@ -57,13 +57,13 @@ public enum Unit {
         DOCUMENT("document"),
         FRACTION("fraction"),
         HIT("hit"),
+        ITEM("item"),
         MILLISECOND("millisecond", "ms"),
         OPERATION("operation"),
         QUERY("query"),
-        QUERY_ITEM("query-item"),
-        RELEVANCE("relevance"),
         REQUEST("request"),
         RESPONSE("response"),
+        SCORE("score"),
         SECOND("second", "s"),
         THREAD("thread");