Use dollar and hour base units

2 files changed, 5 insertions, 4 deletions

diff --git a/linguistics/src/main/java/com/yahoo/language/simple/SimpleTokenizer.java b/linguistics/src/main/java/com/yahoo/language/simple/SimpleTokenizer.java
index b791c843357..2728249333e 100644
--- a/linguistics/src/main/java/com/yahoo/language/simple/SimpleTokenizer.java
+++ b/linguistics/src/main/java/com/yahoo/language/simple/SimpleTokenizer.java
@@ -57,7 +57,7 @@ public class SimpleTokenizer implements Tokenizer {
     }
 
     /** Tokenize the input, and apply the given transform to each token string. */
-    public Iterable<Token> tokenize(String input, Function<String, String> tokenProocessor) {
+    public Iterable<Token> tokenize(String input, Function<String, String> tokenProcessor) {
         if (input.isEmpty()) return List.of();
 
         List<Token> tokens = new ArrayList<>();
@@ -71,7 +71,7 @@ public class SimpleTokenizer implements Tokenizer {
                 String original = input.substring(prev, next);
                 tokens.add(new SimpleToken(original).setOffset(prev)
                                                     .setType(tokenType)
-                                                    .setTokenString(tokenProocessor.apply(original)));
+                                                    .setTokenString(tokenProcessor.apply(original)));
                 prev = next;
                 prevType = nextType;
                 tokenType = prevType;
diff --git a/metrics/src/main/java/ai/vespa/metrics/Unit.java b/metrics/src/main/java/ai/vespa/metrics/Unit.java
index d5769707b76..451a886d88d 100644
--- a/metrics/src/main/java/ai/vespa/metrics/Unit.java
+++ b/metrics/src/main/java/ai/vespa/metrics/Unit.java
@@ -12,7 +12,7 @@ public enum Unit {
     CONNECTION(BaseUnit.CONNECTION, "A link used for communication between a client and a server"),
     DOCUMENT(BaseUnit.DOCUMENT, "Vespa document, a collection of fields defined in a schema file"),
     DOCUMENTID(BaseUnit.DOCUMENTID, "A unique document identifier"),
-    DOLLAR_PER_HOUR(BaseUnit.MAGNITUDE, "$/hr"),
+    DOLLAR_PER_HOUR(BaseUnit.DOLLAR, BaseUnit.HOUR, "Total current cost of the cluster in $/hr"),
     FAILURE(BaseUnit.FAILURE, "Failures, typically for requests, operations or nodes"),
     FILE(BaseUnit.FILE, "Data file stored on the disk on a node"),
     FRACTION(BaseUnit.FRACTION, "A value in the range [0..1]. Higher values can occur for some metrics, but would indicate the value is outside of the allowed range."),
@@ -81,13 +81,14 @@ public enum Unit {
         CONNECTION("connection"),
         DOCUMENT("document"),
         DOCUMENTID("documentid"),
+        DOLLAR("dollar"),
         FAILURE("failure"),
         FILE("file"),
         FRACTION("fraction"),
         HIT("hit"),
+        HOUR("hout"),
         INSTANCE("instance"),
         ITEM("item"),
-        MAGNITUDE("magnitude"),
         MILLISECOND("millisecond", "ms"),
         NANOSECOND("nanosecond", "ns"),
         NODE("node"),