Unify on using the MetricId class to avoid creating many instances on the fly.

9 files changed, 41 insertions, 34 deletions

diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/core/MetricsManagerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/core/MetricsManagerTest.java
index fd1961fc168..36a6aa01620 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/core/MetricsManagerTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/core/MetricsManagerTest.java
@@ -11,6 +11,7 @@ import ai.vespa.metricsproxy.metric.dimensions.ApplicationDimensionsConfig;
 import ai.vespa.metricsproxy.metric.dimensions.NodeDimensions;
 import ai.vespa.metricsproxy.metric.dimensions.NodeDimensionsConfig;
 import ai.vespa.metricsproxy.metric.model.DimensionId;
+import ai.vespa.metricsproxy.metric.model.MetricId;
 import ai.vespa.metricsproxy.metric.model.MetricsPacket;
 import ai.vespa.metricsproxy.metric.model.ServiceId;
 import ai.vespa.metricsproxy.service.DownService;
@@ -54,7 +55,7 @@ public class MetricsManagerTest {
             new DummyService(0, SERVICE_0_ID),
             new DummyService(1, SERVICE_1_ID));
 
-    private static final String WHITELISTED_METRIC_ID = "whitelisted";
+    private static final MetricId WHITELISTED_METRIC_ID = toMetricId("whitelisted");
 
     @Before
     public void setupMetricsManager() {
@@ -127,7 +128,7 @@ public class MetricsManagerTest {
         VespaService service0 = testServices.get(0);
         Metrics oldSystemMetrics = service0.getSystemMetrics();
 
-        service0.getSystemMetrics().add(new Metric("cpu", 1));
+        service0.getSystemMetrics().add(new Metric(toMetricId("cpu"), 1));
 
         List<MetricsPacket> packets = metricsManager.getMetrics(testServices, Instant.EPOCH);
         assertEquals(3, packets.size());
@@ -154,7 +155,7 @@ public class MetricsManagerTest {
     public void extra_metrics_packets_without_whitelisted_metrics_are_not_added() {
         metricsManager.setExtraMetrics(ImmutableList.of(
                 new MetricsPacket.Builder(toServiceId("foo"))
-                        .putMetrics(ImmutableList.of(new Metric("not-whitelisted", 0)))));
+                        .putMetrics(ImmutableList.of(new Metric(toMetricId("not-whitelisted"), 0)))));
 
         List<MetricsPacket> packets = metricsManager.getMetrics(testServices, Instant.EPOCH);
         assertThat(packets.size(), is(2));
@@ -243,8 +244,8 @@ public class MetricsManagerTest {
                                             .consumer(new Consumer.Builder()
                                                               .name(vespaMetricsConsumerId.id)
                                                               .metric(new Consumer.Metric.Builder()
-                                                                              .name(WHITELISTED_METRIC_ID)
-                                                                              .outputname(WHITELISTED_METRIC_ID))
+                                                                              .name(WHITELISTED_METRIC_ID.id)
+                                                                              .outputname(WHITELISTED_METRIC_ID.id))
                                                               .metric(new Consumer.Metric.Builder()
                                                                               .name(DummyService.METRIC_1)
                                                                               .outputname(DummyService.METRIC_1)
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/HttpHandlerTestBase.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/HttpHandlerTestBase.java
index ab586334baa..4bfb80e0f07 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/HttpHandlerTestBase.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/HttpHandlerTestBase.java
@@ -11,6 +11,7 @@ import ai.vespa.metricsproxy.metric.dimensions.ApplicationDimensions;
 import ai.vespa.metricsproxy.metric.dimensions.ApplicationDimensionsConfig;
 import ai.vespa.metricsproxy.metric.dimensions.NodeDimensions;
 import ai.vespa.metricsproxy.metric.dimensions.NodeDimensionsConfig;
+import ai.vespa.metricsproxy.metric.model.MetricId;
 import ai.vespa.metricsproxy.metric.model.MetricsPacket;
 import ai.vespa.metricsproxy.service.DownService;
 import ai.vespa.metricsproxy.service.DummyService;
@@ -57,7 +58,7 @@ public class HttpHandlerTestBase {
         metricsManager.setExtraMetrics(ImmutableList.of(
                 new MetricsPacket.Builder(VESPA_NODE_SERVICE_ID)
                         .timestamp(Instant.now().getEpochSecond())
-                        .putMetrics(ImmutableList.of(new Metric(CPU_METRIC, 12.345)))));
+                        .putMetrics(ImmutableList.of(new Metric(MetricId.toMetricId(CPU_METRIC), 12.345)))));
         return metricsManager;
     }
 
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/MetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/MetricsTest.java
index 84f40592f46..57446395afe 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/MetricsTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/MetricsTest.java
@@ -8,6 +8,7 @@ import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Map;
+import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -21,16 +22,16 @@ public class MetricsTest {
     public void testIterator() {
         Metrics m = new Metrics();
         long now = System.currentTimeMillis() / 1000;
-        m.add(new Metric("a", 1, now));
-        m.add(new Metric("b", 2.5, now));
+        m.add(new Metric(toMetricId("a"), 1, now));
+        m.add(new Metric(toMetricId("b"), 2.5, now));
 
         //should expire after 0 seconds
-        m.add(new Metric("c", 2, now));
+        m.add(new Metric(toMetricId("c"), 2, now));
 
         Map<String, Number> map = new HashMap<>();
 
         for (Metric metric: m.getMetrics()) {
-            String k = metric.getName();
+            String k = metric.getName().id;
 
             assertThat(map.containsKey(k), is(false));
             map.put(k, metric.getValue());
@@ -43,9 +44,9 @@ public class MetricsTest {
     @Test
     public void testBasicMetric() {
         Metrics m = new Metrics();
-        m.add(new Metric("count", 1, System.currentTimeMillis() / 1000));
+        m.add(new Metric(toMetricId("count"), 1, System.currentTimeMillis() / 1000));
         assertThat(m.getMetrics().size(), is(1));
-        assertThat(m.getMetrics().get(0).getName(), is("count"));
+        assertThat(m.getMetrics().get(0).getName(), is(toMetricId("count")));
     }
 
     @Test
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/MetricsPacketTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/MetricsPacketTest.java
index 78c80689299..7c16fe9f8f6 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/MetricsPacketTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/MetricsPacketTest.java
@@ -7,7 +7,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import org.junit.Test;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -66,8 +65,8 @@ public class MetricsPacketTest {
     public void builder_can_retain_subset_of_metrics() {
         MetricsPacket packet = new MetricsPacket.Builder(toServiceId("foo"))
                 .putMetrics(ImmutableList.of(
-                        new Metric("remove", 1),
-                        new Metric("keep", 2)))
+                        new Metric(toMetricId("remove"), 1),
+                        new Metric(toMetricId("keep"), 2)))
                 .retainMetrics(ImmutableSet.of(toMetricId("keep"), toMetricId("non-existent")))
                 .build();
 
@@ -87,17 +86,17 @@ public class MetricsPacketTest {
         MetricId THREE_ID        = toMetricId(THREE);
         MetricId NON_EXISTENT_ID = toMetricId(NON_EXISTENT);
 
-        Map<MetricId, List<String>> outputNamesById = ImmutableMap.of(
-                toMetricId(ONE),          ImmutableList.of(ONE),
-                toMetricId(TWO),          ImmutableList.of(TWO, "dos"),
-                toMetricId(THREE),        ImmutableList.of("3"),
-                toMetricId(NON_EXISTENT), ImmutableList.of(NON_EXISTENT));
+        Map<MetricId, List<MetricId>> outputNamesById = ImmutableMap.of(
+                ONE_ID,          ImmutableList.of(ONE_ID),
+                TWO_ID,          ImmutableList.of(TWO_ID, toMetricId("dos")),
+                THREE_ID,        ImmutableList.of(toMetricId("3")),
+                NON_EXISTENT_ID, ImmutableList.of(NON_EXISTENT_ID));
 
         MetricsPacket packet = new MetricsPacket.Builder(toServiceId("foo"))
                 .putMetrics(ImmutableList.of(
-                        new Metric(ONE, 1),
-                        new Metric(TWO, 2),
-                        new Metric(THREE, 3)))
+                        new Metric(ONE_ID, 1),
+                        new Metric(TWO_ID, 2),
+                        new Metric(THREE_ID, 3)))
                 .applyOutputNames(outputNamesById)
                 .build();
 
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java
index f4acb8c312f..f13e63edc81 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java
@@ -19,6 +19,7 @@ import org.junit.Test;
 import java.io.IOException;
 import java.util.List;
 
+import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId;
 import static ai.vespa.metricsproxy.TestUtil.getFileContents;
 import static ai.vespa.metricsproxy.core.VespaMetrics.vespaMetricsConsumerId;
 import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId;
@@ -107,9 +108,9 @@ public class RpcMetricsTest {
 
             Metrics metrics = qrserver.getMetrics();
             assertThat("Fetched number of metrics is not correct", metrics.size(), is(2));
-            Metric m = metrics.getMetric("foo.count");
+            Metric m = metrics.getMetric(toMetricId("foo.count"));
             assertNotNull("Did not find expected metric with name 'foo.count'", m);
-            Metric m2 = metrics.getMetric("bar.count");
+            Metric m2 = metrics.getMetric(toMetricId("bar.count"));
             assertNotNull("Did not find expected metric with name 'bar.count'", m2);
 
             try (RpcClient rpcClient = new RpcClient(tester.rpcPort())) {
@@ -160,7 +161,7 @@ public class RpcMetricsTest {
     private void verfiyMetricsFromServiceObject(VespaService service) {
         Metrics storageMetrics = service.getMetrics();
         assertThat(storageMetrics.size(), is(2));
-        Metric foo = storageMetrics.getMetric("foo.count");
+        Metric foo = storageMetrics.getMetric(toMetricId("foo.count"));
         assertNotNull("Did not find expected metric with name 'foo.count'", foo);
         assertThat("Expected 2 dimensions for metric foo", foo.getDimensions().size(), is(2));
         assertThat("Metric foo did not contain correct dimension mapping for key = foo.count", foo.getDimensions().containsKey(toDimensionId("foo")), is(true));
@@ -186,10 +187,10 @@ public class RpcMetricsTest {
             assertThat(services.size(), is(1));
             Metrics metrics = services.get(0).getMetrics();
             assertThat("Fetched number of metrics is not correct", metrics.size(), is(2));
-            Metric m = metrics.getMetric("foo.count");
+            Metric m = metrics.getMetric(toMetricId("foo.count"));
             assertNotNull("Did not find expected metric with name 'foo.count'", m);
 
-            Metric m2 = metrics.getMetric("bar.count");
+            Metric m2 = metrics.getMetric(toMetricId("bar.count"));
             assertNotNull("Did not find expected metric with name 'bar'", m2);
 
             try (RpcClient rpcClient = new RpcClient(tester.rpcPort())) {
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ContainerServiceTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ContainerServiceTest.java
index 7ff179e5528..1fbdaadab25 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ContainerServiceTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ContainerServiceTest.java
@@ -9,6 +9,7 @@ import org.junit.Test;
 
 import static ai.vespa.metricsproxy.TestUtil.getFileContents;
 import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId;
+import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId;
 import static ai.vespa.metricsproxy.service.RemoteMetricsFetcher.METRICS_PATH;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -40,7 +41,7 @@ public class ContainerServiceTest {
         int count = 0;
         VespaService service = VespaService.create("service1", "id", httpServer.port());
         for (Metric m : service.getMetrics().getMetrics()) {
-            if (m.getName().equals("queries.rate")) {
+            if (m.getName().equals(toMetricId("queries.rate"))) {
                 count++;
                 System.out.println("Name: " + m.getName() + " value: " + m.getValue());
                 if (m.getDimensions().get(toDimensionId("chain")).equals("asvBlendingResult")) {
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/DummyService.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/DummyService.java
index 7b36e1d4b8b..ccbb237ae37 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/DummyService.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/DummyService.java
@@ -3,6 +3,7 @@ package ai.vespa.metricsproxy.service;
 
 import ai.vespa.metricsproxy.metric.Metric;
 import ai.vespa.metricsproxy.metric.Metrics;
+import ai.vespa.metricsproxy.metric.model.MetricId;
 
 /**
  * @author Unknown
@@ -24,8 +25,8 @@ public class DummyService extends VespaService {
         Metrics m = new Metrics();
 
         long timestamp = System.currentTimeMillis() / 1000;
-        m.add(new Metric(METRIC_1, 5 * num + 1, timestamp));
-        m.add(new Metric(METRIC_2, 1.3 * num + 1.05, timestamp));
+        m.add(new Metric(MetricId.toMetricId(METRIC_1), 5 * num + 1, timestamp));
+        m.add(new Metric(MetricId.toMetricId(METRIC_2), 1.3 * num + 1.05, timestamp));
 
         return m;
     }
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java
index 57185d55131..defcf4bfaaa 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java
@@ -3,6 +3,7 @@ package ai.vespa.metricsproxy.service;
 
 import ai.vespa.metricsproxy.TestUtil;
 import ai.vespa.metricsproxy.metric.Metrics;
+import ai.vespa.metricsproxy.metric.model.MetricId;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -20,8 +21,8 @@ public class MetricsFetcherTest {
         RemoteMetricsFetcher fetcher = new RemoteMetricsFetcher(new DummyService(0, "dummy/id/0"), port);
         Metrics metrics = fetcher.createMetrics(jsonData, 0);
         assertThat(metrics.size(), is(10));
-        assertThat(metrics.getMetric("query_hits.count").getValue().intValue(), is(28));
-        assertThat(metrics.getMetric("queries.rate").getValue().doubleValue(), is(0.4667));
+        assertThat(metrics.getMetric(MetricId.toMetricId("query_hits.count")).getValue().intValue(), is(28));
+        assertThat(metrics.getMetric(MetricId.toMetricId("queries.rate")).getValue().doubleValue(), is(0.4667));
         assertThat(metrics.getTimeStamp(), is(1334134700L));
     }
 
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServiceTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServiceTest.java
index 9400d74fa3a..87b55b3b00b 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServiceTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServiceTest.java
@@ -2,6 +2,7 @@
 package ai.vespa.metricsproxy.service;
 
 import ai.vespa.metricsproxy.metric.Metrics;
+import ai.vespa.metricsproxy.metric.model.MetricId;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -53,7 +54,7 @@ public class VespaServiceTest {
     public void testMetricsFetching() {
         VespaService service = VespaService.create("service1", "id", httpServer.port());
         Metrics metrics = service.getMetrics();
-        assertThat(metrics.getMetric("queries.count").getValue().intValue(), is(28));
+        assertThat(metrics.getMetric(MetricId.toMetricId("queries.count")).getValue().intValue(), is(28));
 
         // Shutdown server and check that no metrics are returned (should use empty metrics
         // when unable to fetch new metrics)