Avoid creating many sets and lists containing the same list of consumers.

Use a dictionary to keep track of the unique ones.

2 files changed, 8 insertions, 6 deletions

diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/ExternalMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/ExternalMetricsTest.java
index 002e6334141..581367878ca 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/ExternalMetricsTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/ExternalMetricsTest.java
@@ -10,11 +10,12 @@ import com.google.common.collect.ImmutableList;
 import org.junit.Test;
 
 import java.util.List;
+import java.util.Set;
 
-import static ai.vespa.metricsproxy.metric.ExternalMetrics.VESPA_NODE_SERVICE_ID;
 import static ai.vespa.metricsproxy.metric.model.ConsumerId.toConsumerId;
 import static ai.vespa.metricsproxy.metric.model.ServiceId.toServiceId;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author gjoranv
@@ -64,10 +65,10 @@ public class ExternalMetricsTest {
         List<MetricsPacket.Builder> packets = externalMetrics.getMetrics();
         assertEquals(1, packets.size());
 
-        List<ConsumerId> consumerIds = packets.get(0).build().consumers();
+        Set<ConsumerId> consumerIds = packets.get(0).build().consumers();
         assertEquals(2, consumerIds.size());
-        assertEquals(CUSTOM_CONSUMER_1, consumerIds.get(0));
-        assertEquals(CUSTOM_CONSUMER_2, consumerIds.get(1));
+        assertTrue(consumerIds.contains(CUSTOM_CONSUMER_1));
+        assertTrue(consumerIds.contains(CUSTOM_CONSUMER_2));
     }
 
 }
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java
index 9b889085a87..540445fba5b 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java
@@ -16,6 +16,7 @@ import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId;
 import static ai.vespa.metricsproxy.metric.model.ServiceId.toServiceId;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests for YamasJsonModel and YamasArrayJsonModel
@@ -43,7 +44,7 @@ public class YamasJsonModelTest {
 
         // Do some sanity checking
         assertEquals("vespa.searchnode", jsonModel.application);
-        assertEquals("Vespa", jsonModel.routing.get("yamas").namespaces.get(0));
+        assertTrue(jsonModel.routing.get("yamas").namespaces.contains("Vespa"));
         assertEquals(5.555555555E9, jsonModel.metrics.get("memory_rss"), 0.1d); //Not using custom double renderer
 
         // Serialize and verify
@@ -60,7 +61,7 @@ public class YamasJsonModelTest {
 
         // Do some sanity checking
         assertEquals(toServiceId("vespa.searchnode"), metricsPacket.service);
-        assertEquals(toConsumerId("Vespa"), metricsPacket.consumers().get(0));
+        assertTrue(metricsPacket.consumers().contains(toConsumerId("Vespa")));
         assertEquals(5.555555555E9, metricsPacket.metrics().get(toMetricId("memory_rss")).doubleValue(), 0.1d); //Not using custom double rendrer
 
         // Serialize and verify