diff options
5 files changed, 20 insertions, 13 deletions
diff --git a/metrics/src/main/java/com/yahoo/metrics/DoubleValue.java b/metrics/src/main/java/com/yahoo/metrics/DoubleValue.java index 76a559cd150..d102f5f7bd8 100644 --- a/metrics/src/main/java/com/yahoo/metrics/DoubleValue.java +++ b/metrics/src/main/java/com/yahoo/metrics/DoubleValue.java @@ -2,7 +2,6 @@ package com.yahoo.metrics; import com.yahoo.metrics.util.ValueType; -import com.yahoo.metrics.util.HasCopy; import java.util.Collection; import java.util.Locale; diff --git a/metrics/src/main/java/com/yahoo/metrics/LongValue.java b/metrics/src/main/java/com/yahoo/metrics/LongValue.java index 1f925559d89..c18d2a5f25b 100644 --- a/metrics/src/main/java/com/yahoo/metrics/LongValue.java +++ b/metrics/src/main/java/com/yahoo/metrics/LongValue.java @@ -2,7 +2,6 @@ package com.yahoo.metrics; import com.yahoo.metrics.util.ValueType; -import com.yahoo.metrics.util.HasCopy; import java.util.Collection; diff --git a/metrics/src/main/java/com/yahoo/metrics/MetricSet.java b/metrics/src/main/java/com/yahoo/metrics/MetricSet.java index a9fea1c65a4..8f3039bff18 100644 --- a/metrics/src/main/java/com/yahoo/metrics/MetricSet.java +++ b/metrics/src/main/java/com/yahoo/metrics/MetricSet.java @@ -3,7 +3,12 @@ package com.yahoo.metrics; import com.yahoo.text.XMLWriter; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; import java.util.logging.Logger; public abstract class MetricSet extends Metric { @@ -147,7 +152,7 @@ public abstract class MetricSet extends Metric { } Map<String, Metric> createMetricMap() { - Map<String, Metric> map = new TreeMap<String, Metric>(); + Map<String, Metric> map = new TreeMap<>(); for (Metric m : metricOrder) { map.put(m.getName(), m); @@ -161,7 +166,7 @@ public abstract class MetricSet extends Metric { MetricSet o = (MetricSet)snapshotMetric; Map<String, Metric> map1 = createMetricMap(); - Set<String> seen = new HashSet<String>(); + Set<String> seen = new HashSet<>(); // For all the metrics in the other's order, join ours to the snapshot. for (Metric m : o.metricOrder) { diff --git a/metrics/src/main/java/com/yahoo/metrics/ValueMetric.java b/metrics/src/main/java/com/yahoo/metrics/ValueMetric.java index d1d68b771d4..d0bc8f39140 100644 --- a/metrics/src/main/java/com/yahoo/metrics/ValueMetric.java +++ b/metrics/src/main/java/com/yahoo/metrics/ValueMetric.java @@ -2,7 +2,11 @@ package com.yahoo.metrics; import com.yahoo.log.LogLevel; -import com.yahoo.metrics.util.*; +import com.yahoo.metrics.util.HasCopy; +import com.yahoo.metrics.util.MetricValueKeeper; +import com.yahoo.metrics.util.SimpleMetricValueKeeper; +import com.yahoo.metrics.util.ThreadLocalDirectoryValueKeeper; +import com.yahoo.metrics.util.ValueType; import com.yahoo.text.XMLWriter; import com.yahoo.text.Utf8String; @@ -18,7 +22,7 @@ public class ValueMetric<N extends Number> private static Logger log = Logger.getLogger(ValueMetric.class.getName()); private static AtomicBoolean hasWarnedOnNonFinite = new AtomicBoolean(false); - public static interface Value<N extends Number> extends ValueType, HasCopy<Value<N>> { + public interface Value<N extends Number> extends ValueType, HasCopy<Value<N>> { void add(N v); void join(Value<N> v2, boolean createAverageOnJoin); boolean overflow(Value<N> v2); @@ -61,17 +65,17 @@ public class ValueMetric<N extends Number> public ValueMetric(String name, String tags, String description, MetricSet owner) { super(name, tags, description, owner); //values = new MetricValueSet(); - values = new ThreadLocalDirectoryValueKeeper<Value<N>>(); + values = new ThreadLocalDirectoryValueKeeper<>(); } public ValueMetric(ValueMetric<N> other, CopyType copyType, MetricSet owner) { super(other, owner); if (copyType == CopyType.INACTIVE || other.values instanceof SimpleMetricValueKeeper) { - values = new SimpleMetricValueKeeper<Value<N>>(); + values = new SimpleMetricValueKeeper<>(); values.set(other.values.get(getJoinBehavior())); } else { //values = new MetricValueSet((MetricValueSet) other.values, ((MetricValueSet) other.values).size()); - values = new ThreadLocalDirectoryValueKeeper<Value<N>>(other.values); + values = new ThreadLocalDirectoryValueKeeper<>(other.values); } this.flags = other.flags; } @@ -215,7 +219,7 @@ public class ValueMetric<N extends Number> @Override public ValueMetric<N> clone(CopyType type, MetricSet owner, boolean includeUnused) { - return new ValueMetric<N>(this, type, owner); + return new ValueMetric<>(this, type, owner); } @Override @@ -228,7 +232,7 @@ public class ValueMetric<N extends Number> return; } logger.value(fullName, val == null ? 0 - : isAverageMetric() ? val.getAverage().doubleValue() + : isAverageMetric() ? val.getAverage() : val.getLast().doubleValue()); } diff --git a/vespaclient-core/src/main/java/com/yahoo/clientmetrics/MessageTypeMetricSet.java b/vespaclient-core/src/main/java/com/yahoo/clientmetrics/MessageTypeMetricSet.java index f63f6a7f958..731a08513e9 100644 --- a/vespaclient-core/src/main/java/com/yahoo/clientmetrics/MessageTypeMetricSet.java +++ b/vespaclient-core/src/main/java/com/yahoo/clientmetrics/MessageTypeMetricSet.java @@ -51,7 +51,7 @@ public class MessageTypeMetricSet extends MetricSet { public MessageTypeMetricSet(String msgName, MetricSet owner) { super(msgName.toLowerCase(), "", "", owner); this.msgName = msgName; - latency = new ValueMetric<Long>("latency", "", "Latency (in ms)", this).averageMetric(); + latency = new ValueMetric<Long>("latency", "", "Latency (in ms)", this).averageMetric().createAverageOnJoin(); count = new CountMetric("count", "", "Number received", this); ignored = new CountMetric("ignored", "", "Number ignored due to no matching document routing selectors", this); errors = new SimpleMetricSet("errors", "", "The errors returned", this); |