1 files changed, 11 insertions, 25 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java
index 2348970ed1a..6f4535bf4a1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultMetrics.java
@@ -2,14 +2,11 @@
 
 package com.yahoo.vespa.model.admin.monitoring;
 
-
-import com.google.common.collect.ImmutableSet;
-
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
 import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet;
-import static java.util.Collections.singleton;
 
 /**
  * Metrics for the 'default' consumer, which is used by default for the generic metrics api and
@@ -26,20 +23,19 @@ public class DefaultMetrics {
     private static MetricSet createMetricSet() {
         return new MetricSet(defaultMetricSetId,
                              getAllMetrics(),
-                             singleton(defaultVespaMetricSet));
+                             Set.of(defaultVespaMetricSet));
     }
 
     private static Set<Metric> getAllMetrics() {
-        return ImmutableSet.<Metric>builder()
-                .addAll(getContentMetrics())
-                .addAll(getContainerMetrics())
-                .addAll(getSearchChainMetrics())
-                .build();
-    }
-
-    private static Set<Metric> getContainerMetrics() {
         Set<Metric> metrics = new LinkedHashSet<>();
 
+        addContentMetrics(metrics);
+        addContainerMetrics(metrics);
+        addSearchChainMetrics(metrics);
+        return Collections.unmodifiableSet(metrics);
+    }
+
+    private static void addContainerMetrics(Set<Metric> metrics) {
         metrics.add(new Metric("http.status.1xx.rate"));
         metrics.add(new Metric("http.status.2xx.rate"));
         metrics.add(new Metric("http.status.3xx.rate"));
@@ -47,13 +43,9 @@ public class DefaultMetrics {
         metrics.add(new Metric("http.status.5xx.rate"));
         metrics.add(new Metric("jdisc.gc.ms.average"));
         metrics.add(new Metric("mem.heap.free.average"));
-
-        return metrics;
     }
 
-    private static Set<Metric> getSearchChainMetrics() {
-        Set<Metric> metrics = new LinkedHashSet<>();
-
+    private static void addSearchChainMetrics(Set<Metric> metrics) {
         metrics.add(new Metric("queries.rate"));
         metrics.add(new Metric("query_latency.sum"));
         metrics.add(new Metric("query_latency.count"));
@@ -72,13 +64,9 @@ public class DefaultMetrics {
         metrics.add(new Metric("degraded_queries.rate"));
         metrics.add(new Metric("failed_queries.rate"));
         metrics.add(new Metric("serverActiveThreads.average"));
-
-        return metrics;
     }
 
-    private static Set<Metric> getContentMetrics() {
-        Set<Metric> metrics = new LinkedHashSet<>();
-
+    private static void addContentMetrics(Set<Metric> metrics) {
         metrics.add(new Metric("content.proton.search_protocol.docsum.requested_documents.rate"));
         metrics.add(new Metric("content.proton.search_protocol.docsum.latency.sum"));
         metrics.add(new Metric("content.proton.search_protocol.docsum.latency.count"));
@@ -114,8 +102,6 @@ public class DefaultMetrics {
         metrics.add(new Metric("content.proton.documentdb.matching.rank_profile.rerank_time.average")); // TODO: Remove with Vespa 9
 
         metrics.add(new Metric("content.proton.transactionlog.disk_usage.last"));
-
-        return metrics;
     }
 
     private DefaultMetrics() { }