diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2022-02-16 00:32:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-16 00:32:17 +0100 |
commit | 90694216f0c1cd2dcb43fa346051949c72a9a438 (patch) | |
tree | 9385a9e9ae0e8f1d59939b9cf33e28a0c2a30cd9 | |
parent | af93ad3cb787dfaea088aff9b4786d846c7e8991 (diff) | |
parent | 5f17c984e7b16b26734250d267103d834edef67a (diff) |
Merge pull request #21212 from vespa-engine/vespa-metric-setv7.544.23
Vespa metric set
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricSet.java | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java | 3 |
2 files changed, 2 insertions, 4 deletions
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 cd6035204e2..41204ce6e9a 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 @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.admin.monitoring; -import javax.annotation.concurrent.Immutable; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; @@ -14,10 +13,10 @@ import static java.util.Collections.unmodifiableMap; /** * Models a metric set containing a set of metrics and child metric sets. + * This should be immutable. * * @author gjoranv */ -@Immutable public class MetricSet { private final String id; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java index 05f2ebee446..6aec922af85 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java @@ -627,8 +627,7 @@ public class VespaMetricSet { // TODO: For the purpose of this file and likely elsewhere, all but the last aggregate specifier, // TODO: such as 'average' and 'sum' in the metric names below are just confusing and can be mentally - // TODO: disregarded when considering metric names. Consider cleaning up for Vespa 8. - // TODO Vespa 8 all metrics with .sum in the name should have that removed. + // TODO: disregarded when considering metric names. Consider cleaning up for Vespa 9. metrics.add(new Metric("vds.datastored.alldisks.docs.average")); metrics.add(new Metric("vds.datastored.alldisks.bytes.average")); metrics.add(new Metric("vds.visitor.allthreads.averagevisitorlifetime.sum.max")); |