No functional changes

14 files changed, 85 insertions, 109 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index 1b5be1c2f97..3f432620b90 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -31,7 +31,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-import static com.yahoo.vespa.model.admin.monitoring.MetricSet.emptyMetricSet;
+import static com.yahoo.vespa.model.admin.monitoring.MetricSet.empty;
 
 /**
  * This is the admin pseudo-plugin of the Vespa model, responsible for
@@ -49,7 +49,7 @@ public class Admin extends AbstractConfigProducer implements Serializable {
 
     private final Metrics metrics;
     private MetricsProxyContainerCluster metricsProxyCluster;
-    private MetricSet additionalDefaultMetrics = emptyMetricSet();
+    private MetricSet additionalDefaultMetrics = empty();
 
     private final List<Slobrok> slobroks = new ArrayList<>();
     private Configserver defaultConfigserver;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java
index 3f9edae10c0..5c1b8cd1b7a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.VESPA_CONSUMER_ID;
+import static com.yahoo.vespa.model.admin.monitoring.MetricsConsumers.vespaMetricsConsumerId;
 
 /**
  * Helper class to generate config for metrics consumers.
@@ -22,14 +22,15 @@ import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.VESPA_
 class ConsumersConfigGenerator {
 
     /**
-     * @param userConsumers The consumers set up by the user in services.xml
-     * @return A list of consumer builders (a mapping from consumer to its metrics)
+     * @param userConsumers the consumers set up by the user in services.xml
+     * @return a list of consumer builders (a mapping from consumer to its metrics)
      */
     static List<Consumer.Builder> generateConsumers(MetricsConsumer defaultConsumer,
                                                     Map<String, MetricsConsumer> userConsumers) {
-        // Normally, the user given consumers should not contain VESPA_CONSUMER_ID, but it's allowed for some internally used applications.
+        // Normally, the user given consumers should not contain VESPA_CONSUMER_ID,
+        // but it's allowed for some internally used applications.
         var allConsumers = new LinkedHashMap<>(userConsumers);
-        allConsumers.put(VESPA_CONSUMER_ID, combineConsumers(defaultConsumer, allConsumers.get(VESPA_CONSUMER_ID)));
+        allConsumers.put(vespaMetricsConsumerId, combineConsumers(defaultConsumer, allConsumers.get(vespaMetricsConsumerId)));
 
         return allConsumers.values().stream()
                 .map(ConsumersConfigGenerator::toConsumerBuilder)
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
index b5936887b50..59a7ae739a9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
@@ -56,9 +56,9 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerClus
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.LEGACY_APPLICATION;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.SYSTEM;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames.TENANT;
-import static com.yahoo.vespa.model.admin.monitoring.DefaultPublicConsumer.getDefaultPublicConsumer;
-import static com.yahoo.vespa.model.admin.monitoring.MetricSet.emptyMetricSet;
-import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.getVespaMetricsConsumer;
+import static com.yahoo.vespa.model.admin.monitoring.MetricsConsumers.defaultPublicConsumer;
+import static com.yahoo.vespa.model.admin.monitoring.MetricsConsumers.vespaMetricsConsumer;
+import static com.yahoo.vespa.model.admin.monitoring.MetricSet.empty;
 
 /**
  * Container cluster for metrics proxy containers.
@@ -161,10 +161,10 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
 
     @Override
     public void getConfig(ConsumersConfig.Builder builder) {
-        var amendedVespaConsumer = addMetrics(getVespaMetricsConsumer(), getAdditionalDefaultMetrics().getMetrics());
+        var amendedVespaConsumer = addMetrics(vespaMetricsConsumer(), getAdditionalDefaultMetrics().getMetrics());
         builder.consumer.addAll(generateConsumers(amendedVespaConsumer, getUserMetricsConsumers()));
 
-        builder.consumer.add(toConsumerBuilder(getDefaultPublicConsumer()));
+        builder.consumer.add(toConsumerBuilder(defaultPublicConsumer()));
     }
 
     @Override
@@ -210,7 +210,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
     private MetricSet getAdditionalDefaultMetrics() {
         return getAdmin()
                 .map(Admin::getAdditionalDefaultMetrics)
-                .orElse(emptyMetricSet());
+                .orElse(empty());
     }
 
     // Returns the metrics consumers from services.xml
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/CloudWatch.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/CloudWatch.java
index 5351c3fb3a7..966c3f760ed 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/CloudWatch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/CloudWatch.java
@@ -8,6 +8,7 @@ import java.util.Optional;
  * @author gjoranv
  */
 public class CloudWatch {
+
     private final String region;
     private final String namespace;
     private final MetricsConsumer consumer;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java
index c80cebe3d5b..adc0d0b1db8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicMetrics.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java
@@ -9,7 +9,6 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet;
-import static java.util.Collections.emptyList;
 import static java.util.Collections.singleton;
 
 /**
@@ -18,14 +17,14 @@ import static java.util.Collections.singleton;
  *
  * @author gjoranv
  */
-public class DefaultPublicMetrics {
+public class DefaultMetrics {
 
-    public static final String DEFAULT_METRIC_SET_ID = "default";
+    public static final String defaultMetricSetId = "default";
 
-    public static MetricSet defaultPublicMetricSet = createMetricSet();
+    public static MetricSet defaultMetricSet = createMetricSet();
 
     private static MetricSet createMetricSet() {
-        return new MetricSet(DEFAULT_METRIC_SET_ID,
+        return new MetricSet(defaultMetricSetId,
                              getAllMetrics(),
                              singleton(defaultVespaMetricSet));
     }
@@ -95,6 +94,6 @@ public class DefaultPublicMetrics {
         return metrics;
     }
 
-    private DefaultPublicMetrics() { }
+    private DefaultMetrics() { }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicConsumer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicConsumer.java
deleted file mode 100644
index 68b1fc3c983..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultPublicConsumer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-package com.yahoo.vespa.model.admin.monitoring;
-
-import ai.vespa.metricsproxy.http.ValuesFetcher;
-import com.google.common.collect.ImmutableList;
-
-import static com.yahoo.vespa.model.admin.monitoring.DefaultPublicMetrics.defaultPublicMetricSet;
-import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet;
-import static com.yahoo.vespa.model.admin.monitoring.SystemMetrics.systemMetricSet;
-import static java.util.Collections.emptyList;
-
-/**
- * @author gjoranv
- */
-public class DefaultPublicConsumer {
-
-    public static final String DEFAULT_PUBLIC_CONSUMER_ID = ValuesFetcher.DEFAULT_PUBLIC_CONSUMER_ID.id;
-
-    private static final MetricSet publicConsumerMetrics = new MetricSet("public-consumer-metrics",
-                                                                         emptyList(),
-                                                                         ImmutableList.of(defaultPublicMetricSet,
-                                                                                          systemMetricSet));
-
-    public static MetricsConsumer getDefaultPublicConsumer() {
-        return new MetricsConsumer(DEFAULT_PUBLIC_CONSUMER_ID, publicConsumerMetrics);
-    }
-
-}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java
index d879a6f445d..30797f27789 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java
@@ -24,21 +24,19 @@ public class MetricSet {
     private final Map<String, Metric> metrics;
     private final Set<MetricSet> children;
 
+    public MetricSet(String id, Collection<Metric> metrics) {
+        this(id, metrics, Collections.emptySet());
+    }
 
     public MetricSet(String id, Collection<Metric> metrics, Collection<MetricSet> children) {
-        Objects.requireNonNull(id, "Id cannot be null or empty.");
+        this.id = Objects.requireNonNull(id, "Id cannot be null or empty.");
 
-        this.id = id;
         this.metrics = toMapByName(metrics);
         this.children = new LinkedHashSet<>(children);
     }
 
-    public MetricSet(String id, Collection<Metric> metrics) {
-        this(id, metrics, Collections.emptySet());
-    }
-
-    public static MetricSet emptyMetricSet() {
-        return new MetricSet("empty", Collections.emptySet());
+    public static MetricSet empty() {
+        return new MetricSet("empty", Set.of());
     }
 
     public final String getId() { return id; }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java
index a8fbcf50b02..672723f65b2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java
@@ -10,11 +10,12 @@ import java.util.Objects;
 import static java.util.Collections.unmodifiableList;
 
 /**
- * Represents an arbitrary metric consumer
+ * A metric consumer is a set of metrics given an id that can be requested at runtime.
  *
  * @author trygve
  * @author gjoranv
  */
+// TODO: This construct seems redundant when we have metrics sets
 @Immutable
 public class MetricsConsumer {
 
@@ -39,7 +40,7 @@ public class MetricsConsumer {
     public MetricSet getMetricSet() { return metricSet; }
 
     /**
-     * @return Map of metric with metric name as key
+     * @return map of metric with metric name as key
      */
     public Map<String, Metric> getMetrics() {
         return metricSet.getMetrics();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumers.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumers.java
new file mode 100644
index 00000000000..cc1c50ca6e1
--- /dev/null
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumers.java
@@ -0,0 +1,37 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.model.admin.monitoring;
+
+import ai.vespa.metricsproxy.core.VespaMetrics;
+import ai.vespa.metricsproxy.http.ValuesFetcher;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static com.yahoo.vespa.model.admin.monitoring.DefaultMetrics.defaultMetricSet;
+import static com.yahoo.vespa.model.admin.monitoring.NetworkMetrics.networkMetricSet;
+import static com.yahoo.vespa.model.admin.monitoring.SystemMetrics.systemMetricSet;
+import static com.yahoo.vespa.model.admin.monitoring.VespaMetricSet.vespaMetricSet;
+
+/**
+ * Built-in metric consumers
+ *
+ * @author bratseth
+ */
+public class MetricsConsumers {
+
+    public static final String defaultMetricsConsumerId = ValuesFetcher.defaultMetricsConsumerId.id;
+    public static final String vespaMetricsConsumerId = VespaMetrics.vespaMetricsConsumerId.id;
+
+    public static MetricsConsumer defaultPublicConsumer() {
+        return consumer("default-consumer-metrics", defaultMetricSet, systemMetricSet);
+    }
+
+    public static MetricsConsumer vespaMetricsConsumer() {
+        return consumer("vespa-consumer-metrics", vespaMetricSet, systemMetricSet, networkMetricSet);
+    }
+
+    private static MetricsConsumer consumer(String id, MetricSet ... metricSets) {
+        return new MetricsConsumer(vespaMetricsConsumerId, new MetricSet(id, List.of(), Arrays.asList(metricSets)));
+    }
+
+}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricsConsumer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricsConsumer.java
deleted file mode 100644
index 9f3bfdc8ae8..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricsConsumer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.admin.monitoring;
-
-import ai.vespa.metricsproxy.core.VespaMetrics;
-import com.google.common.collect.ImmutableList;
-
-import static com.yahoo.vespa.model.admin.monitoring.NetworkMetrics.networkMetricSet;
-import static com.yahoo.vespa.model.admin.monitoring.SystemMetrics.systemMetricSet;
-import static com.yahoo.vespa.model.admin.monitoring.VespaMetricSet.vespaMetricSet;
-import static java.util.Collections.emptyList;
-
-/**
- * This class sets up the 'Vespa' metrics consumer, which is mainly used for Yamas in hosted Vespa.
- *
- * @author trygve
- * @author gjoranv
- */
-public class VespaMetricsConsumer {
-
-    public static final String VESPA_CONSUMER_ID = VespaMetrics.VESPA_CONSUMER_ID.id;
-
-    private static final MetricSet vespaConsumerMetrics = new MetricSet("vespa-consumer-metrics",
-                                                                        emptyList(),
-                                                                        ImmutableList.of(vespaMetricSet,
-                                                                                         systemMetricSet,
-                                                                                         networkMetricSet));
-
-    public static MetricsConsumer getVespaMetricsConsumer() {
-        return new MetricsConsumer(VESPA_CONSUMER_ID, vespaConsumerMetrics);
-    }
-
-}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/PredefinedMetricSets.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/PredefinedMetricSets.java
index 694108d4bb1..fac6e37feec 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/PredefinedMetricSets.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/PredefinedMetricSets.java
@@ -7,7 +7,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import static com.yahoo.vespa.model.admin.monitoring.DefaultPublicMetrics.defaultPublicMetricSet;
+import static com.yahoo.vespa.model.admin.monitoring.DefaultMetrics.defaultMetricSet;
 import static com.yahoo.vespa.model.admin.monitoring.NetworkMetrics.networkMetricSet;
 import static com.yahoo.vespa.model.admin.monitoring.SystemMetrics.systemMetricSet;
 import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet;
@@ -21,7 +21,7 @@ import static com.yahoo.vespa.model.admin.monitoring.VespaMetricSet.vespaMetricS
 public class PredefinedMetricSets {
 
     public static final Map<String, MetricSet> predefinedMetricSets = toMapById(
-            defaultPublicMetricSet,
+            defaultMetricSet,
             defaultVespaMetricSet,
             vespaMetricSet,
             systemMetricSet,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/xml/MetricsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/xml/MetricsBuilder.java
index b686288868f..39f890fb9c3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/xml/MetricsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/xml/MetricsBuilder.java
@@ -14,8 +14,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.yahoo.vespa.model.admin.monitoring.DefaultPublicConsumer.DEFAULT_PUBLIC_CONSUMER_ID;
-import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.VESPA_CONSUMER_ID;
+import static com.yahoo.vespa.model.admin.monitoring.MetricsConsumers.defaultMetricsConsumerId;
+import static com.yahoo.vespa.model.admin.monitoring.MetricsConsumers.vespaMetricsConsumerId;
 import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet;
 import static com.yahoo.vespa.model.admin.monitoring.SystemMetrics.systemMetricSet;
 
@@ -85,11 +85,11 @@ public class MetricsBuilder {
     }
 
     private void throwIfIllegalConsumerId(Metrics metrics, String consumerId) {
-        if (consumerId.equalsIgnoreCase(VESPA_CONSUMER_ID) && applicationType != ApplicationType.HOSTED_INFRASTRUCTURE)
+        if (consumerId.equalsIgnoreCase(vespaMetricsConsumerId) && applicationType != ApplicationType.HOSTED_INFRASTRUCTURE)
             throw new IllegalArgumentException("'Vespa' is not allowed as metrics consumer id (case is ignored.)");
 
-        if (consumerId.equalsIgnoreCase(DEFAULT_PUBLIC_CONSUMER_ID))
-            throw new IllegalArgumentException("'" + DEFAULT_PUBLIC_CONSUMER_ID + "' is not allowed as metrics consumer id (case is ignored.)");
+        if (consumerId.equalsIgnoreCase(defaultMetricsConsumerId))
+            throw new IllegalArgumentException("'" + defaultMetricsConsumerId + "' is not allowed as metrics consumer id (case is ignored.)");
 
         if (metrics.hasConsumerIgnoreCase(consumerId))
             throw new IllegalArgumentException("'" + consumerId + "' is used as id for two metrics consumers (case is ignored.)");
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsConsumersTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsConsumersTest.java
index 12a10a7e354..4b4b02c8b76 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsConsumersTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsConsumersTest.java
@@ -16,13 +16,13 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.c
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getCustomConsumer;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.servicesWithAdminOnly;
-import static com.yahoo.vespa.model.admin.monitoring.DefaultPublicConsumer.DEFAULT_PUBLIC_CONSUMER_ID;
-import static com.yahoo.vespa.model.admin.monitoring.DefaultPublicMetrics.defaultPublicMetricSet;
+import static com.yahoo.vespa.model.admin.monitoring.MetricsConsumers.defaultMetricsConsumerId;
+import static com.yahoo.vespa.model.admin.monitoring.DefaultMetrics.defaultMetricSet;
 import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet;
 import static com.yahoo.vespa.model.admin.monitoring.NetworkMetrics.networkMetricSet;
 import static com.yahoo.vespa.model.admin.monitoring.SystemMetrics.systemMetricSet;
 import static com.yahoo.vespa.model.admin.monitoring.VespaMetricSet.vespaMetricSet;
-import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.VESPA_CONSUMER_ID;
+import static com.yahoo.vespa.model.admin.monitoring.MetricsConsumers.vespaMetricsConsumerId;
 import static java.util.Collections.singleton;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue;
  */
 public class MetricsConsumersTest {
 
-    private static int numPublicDefaultMetrics = defaultPublicMetricSet.getMetrics().size();
+    private static int numPublicDefaultMetrics = defaultMetricSet.getMetrics().size();
     private static int numDefaultVespaMetrics = defaultVespaMetricSet.getMetrics().size();
     private static int numVespaMetrics = vespaMetricSet.getMetrics().size();
     private static int numSystemMetrics = systemMetricSet.getMetrics().size();
@@ -48,9 +48,9 @@ public class MetricsConsumersTest {
     public void default_public_consumer_is_set_up_for_self_hosted() {
         ConsumersConfig config = consumersConfigFromXml(servicesWithAdminOnly(), self_hosted);
         assertEquals(2, config.consumer().size());
-        assertEquals(config.consumer(1).name(), DEFAULT_PUBLIC_CONSUMER_ID);
+        assertEquals(config.consumer(1).name(), defaultMetricsConsumerId);
 
-        int numMetricsForPublicDefaultConsumer = defaultPublicMetricSet.getMetrics().size() + numSystemMetrics;
+        int numMetricsForPublicDefaultConsumer = defaultMetricSet.getMetrics().size() + numSystemMetrics;
         assertEquals(numMetricsForPublicDefaultConsumer, config.consumer(1).metric().size());
     }
 
@@ -58,14 +58,14 @@ public class MetricsConsumersTest {
     public void vespa_consumer_and_default_public_consumer_is_set_up_for_hosted() {
         ConsumersConfig config = consumersConfigFromXml(servicesWithAdminOnly(), hosted);
         assertEquals(2, config.consumer().size());
-        assertEquals(config.consumer(0).name(), VESPA_CONSUMER_ID);
-        assertEquals(config.consumer(1).name(), DEFAULT_PUBLIC_CONSUMER_ID);
+        assertEquals(config.consumer(0).name(), vespaMetricsConsumerId);
+        assertEquals(config.consumer(1).name(), defaultMetricsConsumerId);
     }
 
     @Test
     public void vespa_consumer_is_always_present_and_has_all_vespa_metrics_and_all_system_metrics() {
         ConsumersConfig config = consumersConfigFromXml(servicesWithAdminOnly(), self_hosted);
-        assertEquals(config.consumer(0).name(), VESPA_CONSUMER_ID);
+        assertEquals(config.consumer(0).name(), vespaMetricsConsumerId);
         assertEquals(numMetricsForVespaConsumer, config.consumer(0).metric().size());
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
index 8ecb13d7ae5..7439c09f2c8 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
@@ -18,8 +18,8 @@ import com.yahoo.vespa.model.test.VespaModelTester;
 
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.hosted;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.self_hosted;
-import static com.yahoo.vespa.model.admin.monitoring.DefaultPublicConsumer.DEFAULT_PUBLIC_CONSUMER_ID;
-import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.VESPA_CONSUMER_ID;
+import static com.yahoo.vespa.model.admin.monitoring.MetricsConsumers.defaultMetricsConsumerId;
+import static com.yahoo.vespa.model.admin.monitoring.MetricsConsumers.vespaMetricsConsumerId;
 
 /**
  * @author gjoranv
@@ -76,7 +76,7 @@ class MetricsProxyModelTester {
     static ConsumersConfig.Consumer getCustomConsumer(String servicesXml) {
         ConsumersConfig config = consumersConfigFromXml(servicesXml, self_hosted);
         for (ConsumersConfig.Consumer consumer : config.consumer()) {
-            if (! consumer.name().equals(VESPA_CONSUMER_ID) && ! consumer.name().equals(DEFAULT_PUBLIC_CONSUMER_ID))
+            if (! consumer.name().equals(vespaMetricsConsumerId) && ! consumer.name().equals(defaultMetricsConsumerId))
                 return consumer;
         }
         throw new RuntimeException("Custom consumer not found!");