diff options
Diffstat (limited to 'statistics/src/main/java/com/yahoo')
20 files changed, 44 insertions, 117 deletions
diff --git a/statistics/src/main/java/com/yahoo/statistics/Axis.java b/statistics/src/main/java/com/yahoo/statistics/Axis.java index f0a5f017984..f0daff92d00 100644 --- a/statistics/src/main/java/com/yahoo/statistics/Axis.java +++ b/statistics/src/main/java/com/yahoo/statistics/Axis.java @@ -10,6 +10,7 @@ import java.util.Arrays; * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated class Axis { private final double[] limits; private final String name; diff --git a/statistics/src/main/java/com/yahoo/statistics/Bucket.java b/statistics/src/main/java/com/yahoo/statistics/Bucket.java index 6977afaac8c..fd69f202d2b 100644 --- a/statistics/src/main/java/com/yahoo/statistics/Bucket.java +++ b/statistics/src/main/java/com/yahoo/statistics/Bucket.java @@ -9,6 +9,7 @@ import java.util.List; * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated interface Bucket { void put(double[] value, int dim); void reset(); diff --git a/statistics/src/main/java/com/yahoo/statistics/Callback.java b/statistics/src/main/java/com/yahoo/statistics/Callback.java index 4bb332c99e4..fad86d38fd7 100644 --- a/statistics/src/main/java/com/yahoo/statistics/Callback.java +++ b/statistics/src/main/java/com/yahoo/statistics/Callback.java @@ -11,6 +11,7 @@ package com.yahoo.statistics; * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> * @since 5.1.4 */ +@Deprecated public interface Callback { /** * Invoked each logging cycle right before the events for a Handle are diff --git a/statistics/src/main/java/com/yahoo/statistics/Counter.java b/statistics/src/main/java/com/yahoo/statistics/Counter.java index f4b477636aa..1425c2a4375 100644 --- a/statistics/src/main/java/com/yahoo/statistics/Counter.java +++ b/statistics/src/main/java/com/yahoo/statistics/Counter.java @@ -1,10 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.statistics; - import java.util.concurrent.atomic.AtomicLong; -import com.yahoo.log.event.Event; import com.yahoo.container.StatisticsConfig; @@ -13,6 +11,7 @@ import com.yahoo.container.StatisticsConfig; * * @author Steinar Knutsen */ +@Deprecated public class Counter extends Handle { // The current value of this counter private AtomicLong current = new AtomicLong(0L); @@ -165,16 +164,10 @@ public class Counter extends Handle { */ @Override public void runHandle() { - String name = getName(); - long lastCurrent; boolean resetState = getResetCounter(); if (resetState) { - lastCurrent = current.getAndSet(0L); - Event.value(name, lastCurrent); - } else { - lastCurrent = current.get(); - Event.count(name, lastCurrent); + current.set(0L); } } diff --git a/statistics/src/main/java/com/yahoo/statistics/CounterGroup.java b/statistics/src/main/java/com/yahoo/statistics/CounterGroup.java index 7e0258b3896..39d8ad19f29 100644 --- a/statistics/src/main/java/com/yahoo/statistics/CounterGroup.java +++ b/statistics/src/main/java/com/yahoo/statistics/CounterGroup.java @@ -15,6 +15,7 @@ import java.util.Iterator; * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated public class CounterGroup extends Group { private final boolean resetCounter; diff --git a/statistics/src/main/java/com/yahoo/statistics/CounterProxy.java b/statistics/src/main/java/com/yahoo/statistics/CounterProxy.java index 11db94673ea..da8a029982a 100644 --- a/statistics/src/main/java/com/yahoo/statistics/CounterProxy.java +++ b/statistics/src/main/java/com/yahoo/statistics/CounterProxy.java @@ -8,6 +8,7 @@ package com.yahoo.statistics; * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated class CounterProxy extends Proxy { private long raw; private boolean hasRaw = false; diff --git a/statistics/src/main/java/com/yahoo/statistics/Group.java b/statistics/src/main/java/com/yahoo/statistics/Group.java index 7b0c1823dbe..2935521b1e0 100644 --- a/statistics/src/main/java/com/yahoo/statistics/Group.java +++ b/statistics/src/main/java/com/yahoo/statistics/Group.java @@ -7,6 +7,7 @@ package com.yahoo.statistics; * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated abstract class Group extends Handle { Group(String name, Statistics manager, Callback parametrizedCallback) { super(name, manager, parametrizedCallback); diff --git a/statistics/src/main/java/com/yahoo/statistics/Handle.java b/statistics/src/main/java/com/yahoo/statistics/Handle.java index 40491241137..d1ad0e26f40 100644 --- a/statistics/src/main/java/com/yahoo/statistics/Handle.java +++ b/statistics/src/main/java/com/yahoo/statistics/Handle.java @@ -1,15 +1,14 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.statistics; - import java.util.TimerTask; - /** * Base class for the interface to the statistics framework. * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated public abstract class Handle { private TimerTask task; diff --git a/statistics/src/main/java/com/yahoo/statistics/Histogram.java b/statistics/src/main/java/com/yahoo/statistics/Histogram.java index df529015d88..98330e80efc 100644 --- a/statistics/src/main/java/com/yahoo/statistics/Histogram.java +++ b/statistics/src/main/java/com/yahoo/statistics/Histogram.java @@ -8,12 +8,12 @@ import java.util.Iterator; import java.util.List; import java.util.ArrayList; - /** * A set of sums or other histograms. * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated public class Histogram implements Bucket { // The upper and lower limit for the bucket in another histogram // this histogram represents. The "outermost" histogram in a diff --git a/statistics/src/main/java/com/yahoo/statistics/HistogramType.java b/statistics/src/main/java/com/yahoo/statistics/HistogramType.java index fe6b9a3341b..cc7ca04dbbf 100644 --- a/statistics/src/main/java/com/yahoo/statistics/HistogramType.java +++ b/statistics/src/main/java/com/yahoo/statistics/HistogramType.java @@ -8,6 +8,7 @@ package com.yahoo.statistics; * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated public final class HistogramType { private final String representation; diff --git a/statistics/src/main/java/com/yahoo/statistics/Limits.java b/statistics/src/main/java/com/yahoo/statistics/Limits.java index 2c6d1cb3119..fc79fd00d19 100644 --- a/statistics/src/main/java/com/yahoo/statistics/Limits.java +++ b/statistics/src/main/java/com/yahoo/statistics/Limits.java @@ -12,6 +12,7 @@ import java.util.ArrayList; * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated public class Limits { private final List<Axis> axes = new ArrayList<>(1); private boolean frozen = false; diff --git a/statistics/src/main/java/com/yahoo/statistics/Proxy.java b/statistics/src/main/java/com/yahoo/statistics/Proxy.java index 5d656897f7b..c4146f4dbf8 100644 --- a/statistics/src/main/java/com/yahoo/statistics/Proxy.java +++ b/statistics/src/main/java/com/yahoo/statistics/Proxy.java @@ -8,6 +8,7 @@ package com.yahoo.statistics; * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated abstract class Proxy { private long timestamp; private String name; diff --git a/statistics/src/main/java/com/yahoo/statistics/SampleDirectory.java b/statistics/src/main/java/com/yahoo/statistics/SampleDirectory.java index 520fd88a042..bac08fe17b6 100644 --- a/statistics/src/main/java/com/yahoo/statistics/SampleDirectory.java +++ b/statistics/src/main/java/com/yahoo/statistics/SampleDirectory.java @@ -4,13 +4,12 @@ package com.yahoo.statistics; import java.util.ArrayList; import java.util.List; -import com.yahoo.statistics.SampleSet.Sampling; - /** * Book-keeping class to know which SampleSet instances have unlogged data. * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated final class SampleDirectory { private final Object directoryLock = new Object(); private List<SampleSet> directory = new ArrayList<>(200); @@ -27,11 +26,11 @@ final class SampleDirectory { * generation. This does the memory barrier two-step for the * client. */ - Sampling[] fetchValues() { - Sampling[] copyToReturn; + SampleSet.Sampling[] fetchValues() { + SampleSet.Sampling[] copyToReturn; synchronized (directoryLock) { List<SampleSet> tmpDir = directory; - copyToReturn = new Sampling[tmpDir.size()]; + copyToReturn = new SampleSet.Sampling[tmpDir.size()]; List<SampleSet> newDir = new ArrayList<>(200); for (int i = 0; i < copyToReturn.length; ++i) { copyToReturn[i] = tmpDir.get(i).getAndReset(); @@ -45,10 +44,10 @@ final class SampleDirectory { * Return a view of the current generation of data. This does the memory * barrier two-step for the client. */ - Sampling[] viewValues() { - Sampling[] copy; + SampleSet.Sampling[] viewValues() { + SampleSet.Sampling[] copy; synchronized (directoryLock) { - copy = new Sampling[directory.size()]; + copy = new SampleSet.Sampling[directory.size()]; for (int i = 0; i < copy.length; ++i) { copy[i] = directory.get(i).values; } diff --git a/statistics/src/main/java/com/yahoo/statistics/SampleSet.java b/statistics/src/main/java/com/yahoo/statistics/SampleSet.java index fa71c8842ed..768ae1433ea 100644 --- a/statistics/src/main/java/com/yahoo/statistics/SampleSet.java +++ b/statistics/src/main/java/com/yahoo/statistics/SampleSet.java @@ -8,6 +8,7 @@ package com.yahoo.statistics; * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated final class SampleSet { Sampling values; final Limits histogramLimits; diff --git a/statistics/src/main/java/com/yahoo/statistics/Statistics.java b/statistics/src/main/java/com/yahoo/statistics/Statistics.java index d261e2d9af3..92d320e0647 100644 --- a/statistics/src/main/java/com/yahoo/statistics/Statistics.java +++ b/statistics/src/main/java/com/yahoo/statistics/Statistics.java @@ -8,7 +8,9 @@ import com.yahoo.container.StatisticsConfig; * * @author steinar * @author Tony Vaagenes + * @deprecated Will be removed on Vespa 8. If required by a method, there exists an alternative to be used instead. */ +@Deprecated public interface Statistics { /** * Add a new handle to be scheduled for periodic logging. If a handle diff --git a/statistics/src/main/java/com/yahoo/statistics/StatisticsImpl.java b/statistics/src/main/java/com/yahoo/statistics/StatisticsImpl.java index 3fb0693648f..f3a0b23a551 100644 --- a/statistics/src/main/java/com/yahoo/statistics/StatisticsImpl.java +++ b/statistics/src/main/java/com/yahoo/statistics/StatisticsImpl.java @@ -21,6 +21,7 @@ import com.yahoo.container.StatisticsConfig; * * @author Steinar Knutsen */ +@SuppressWarnings("deprecation") public final class StatisticsImpl extends AbstractComponent implements Statistics { private final Timer worker; diff --git a/statistics/src/main/java/com/yahoo/statistics/Sum.java b/statistics/src/main/java/com/yahoo/statistics/Sum.java index 534f12f9b5c..5661e82cf1b 100644 --- a/statistics/src/main/java/com/yahoo/statistics/Sum.java +++ b/statistics/src/main/java/com/yahoo/statistics/Sum.java @@ -10,6 +10,7 @@ import java.util.List; * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated class Sum implements Bucket { private long sum = 0L; private double lower; diff --git a/statistics/src/main/java/com/yahoo/statistics/Value.java b/statistics/src/main/java/com/yahoo/statistics/Value.java index fa4b7db0da2..9b41f526f13 100644 --- a/statistics/src/main/java/com/yahoo/statistics/Value.java +++ b/statistics/src/main/java/com/yahoo/statistics/Value.java @@ -8,8 +8,6 @@ import java.util.logging.Logger; import com.yahoo.container.StatisticsConfig; import com.yahoo.container.StatisticsConfig.Values.Operations; import java.util.logging.Level; -import com.yahoo.log.event.Event; -import com.yahoo.statistics.SampleSet.Sampling; /** * A statistical variable, typically representing a sampling of an @@ -17,6 +15,7 @@ import com.yahoo.statistics.SampleSet.Sampling; * * @author Steinar Knutsen */ +@Deprecated public class Value extends Handle { // For accumulated values, SampleSet instances are mem barriers between {n @@ -47,9 +46,7 @@ public class Value extends Handle { private final boolean logHistogram; private final Limits histogram; - private final boolean nameExtension; final HistogramType histogramId; - private final char appendChar; private static final Logger log = Logger.getLogger(Value.class.getName()); static final String HISTOGRAM_TYPE_WARNING = "Histogram types other than REGULAR currently not supported." @@ -354,7 +351,6 @@ public class Value extends Handle { this.logRaw = isTrue(parameters.logRaw); this.logSum = isTrue(parameters.logSum); this.logInsertions = isTrue(parameters.logInsertions); - this.nameExtension = isTrue(parameters.nameExtension); if (logHistogram) { if (!parameters.limits.isFrozen()) { throw new IllegalStateException("The Limits instance must be frozen."); @@ -368,19 +364,14 @@ public class Value extends Handle { this.histogram = null; this.histogramId = HistogramType.REGULAR; } - Character appendChar = parameters.appendChar; - if (appendChar == null) { - this.appendChar = '.'; - } else { - this.appendChar = appendChar.charValue(); - } + if (parameters.register) { manager.register(this); } } private static boolean isTrue(Boolean b) { - return b != null && b.booleanValue(); + return b != null && b; } /** @@ -539,10 +530,10 @@ public class Value extends Handle { * Get mean value since last reset. */ public double getMean() { - Sampling[] values = directory.viewValues(); + SampleSet.Sampling[] values = directory.viewValues(); long insertions = 0L; double sum = 0.0d; - for (Sampling x : values) { + for (var x : values) { insertions += x.insertions; sum += x.sum; } @@ -556,10 +547,10 @@ public class Value extends Handle { * Get minimal value logged since last reset. */ public double getMin() { - Sampling[] values = directory.viewValues(); + SampleSet.Sampling[] values = directory.viewValues(); long insertions = 0L; double min = 0.0d; - for (Sampling x : values) { + for (var x : values) { if (x.insertions == 0) { continue; } @@ -577,10 +568,10 @@ public class Value extends Handle { * Get maximum value logged since last reset. */ public double getMax() { - Sampling[] values = directory.viewValues(); + SampleSet.Sampling[] values = directory.viewValues(); long insertions = 0L; double max = 0.0d; - for (Sampling x : values) { + for (var x : values) { if (x.insertions == 0) { continue; } @@ -598,9 +589,9 @@ public class Value extends Handle { if (histogram == null) { return null; } else { - Sampling[] values = directory.viewValues(); + SampleSet.Sampling[] values = directory.viewValues(); Histogram merged = new Histogram(histogram); - for (Sampling s : values) { + for (var s : values) { merged.merge(s.histogram); } return merged; @@ -632,77 +623,7 @@ public class Value extends Handle { */ @Override public void runHandle() { - String rawImage = null; - String meanImage = null; - String minImage = null; - String maxImage = null; - String sumImage = null; - String insertionsImage = null; - String histImage = null; - String lastHist = null; - String histType = null; - Snapshot now = getCurrentState(); - - if (nameExtension) { - if (logRaw) { - rawImage = getName(); - } - if (logMean) { - meanImage = getName() + appendChar + "mean"; - } - if (logMin) { - minImage = getName() + appendChar + "min"; - } - if (logMax) { - maxImage = getName() + appendChar + "max"; - } - if (logSum) { - sumImage = getName() + appendChar + "sum"; - } - if (logInsertions) { - insertionsImage = getName() + appendChar + "insertions"; - } - } else { - if (logRaw) { - rawImage = getName(); - } else if (logMean) { - meanImage = getName(); - } else if (logMin) { - minImage = getName(); - } else if (logMax) { - maxImage = getName(); - } else if (logSum) { - sumImage = getName(); - } else if (logInsertions) { - insertionsImage = getName(); - } - } - if (logHistogram) { - histImage = getName(); - lastHist = now.histogram.toString(); - histType = histogramId.toString(); - } - if (rawImage != null) { - Event.value(rawImage, now.raw); - } - if (meanImage != null) { - Event.value(meanImage, now.mean); - } - if (minImage != null) { - Event.value(minImage, now.min); - } - if (maxImage != null) { - Event.value(maxImage, now.max); - } - if (histImage != null) { - Event.histogram(histImage, lastHist, histType); - } - if (sumImage != null) { - Event.value(sumImage, now.sum); - } - if (insertionsImage != null) { - Event.value(insertionsImage, now.insertions); - } + getAndSetCurrentState(); } public String toString() { @@ -772,7 +693,7 @@ public class Value extends Handle { } } - private Snapshot getCurrentState() { + private Snapshot getAndSetCurrentState() { double lastInsertions = 0L; double lastMax = 0.0d; double lastMin = 0.0d; @@ -785,11 +706,11 @@ public class Value extends Handle { lastRaw = lastValue; } if (logComposite()) { - Sampling[] lastInterval = directory.fetchValues(); + SampleSet.Sampling[] lastInterval = directory.fetchValues(); if (histogram != null) { mergedHistogram = new Histogram(histogram); } - for (Sampling threadData : lastInterval) { + for (var threadData : lastInterval) { if (threadData.insertions == 0) { continue; } @@ -820,7 +741,7 @@ public class Value extends Handle { ValueProxy getProxyAndReset() { ValueProxy p = new ValueProxy(getName()); - Snapshot now = getCurrentState(); + Snapshot now = getAndSetCurrentState(); if (logRaw) { p.setRaw(now.raw); diff --git a/statistics/src/main/java/com/yahoo/statistics/ValueGroup.java b/statistics/src/main/java/com/yahoo/statistics/ValueGroup.java index 8981a75b578..e8f26e625d4 100644 --- a/statistics/src/main/java/com/yahoo/statistics/ValueGroup.java +++ b/statistics/src/main/java/com/yahoo/statistics/ValueGroup.java @@ -3,7 +3,6 @@ package com.yahoo.statistics; import com.yahoo.log.event.Event; -import com.yahoo.statistics.Value.Parameters; import java.util.Iterator; import java.util.Map; @@ -14,6 +13,7 @@ import java.util.HashMap; * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated public class ValueGroup extends Group { // A map for names of subevents and Value instances private Map<String, Value> subEvents = new HashMap<>(); @@ -67,7 +67,7 @@ public class ValueGroup extends Group { } private Value getNewValue(String subName) { - Value v = Value.initializeUnregisteredValue(subName, new Parameters().setLogRaw(true)); + Value v = Value.initializeUnregisteredValue(subName, new Value.Parameters().setLogRaw(true)); subEvents.put(subName, v); return v; } diff --git a/statistics/src/main/java/com/yahoo/statistics/ValueProxy.java b/statistics/src/main/java/com/yahoo/statistics/ValueProxy.java index 77d2f45fcd6..3146dc7d2d7 100644 --- a/statistics/src/main/java/com/yahoo/statistics/ValueProxy.java +++ b/statistics/src/main/java/com/yahoo/statistics/ValueProxy.java @@ -8,6 +8,7 @@ package com.yahoo.statistics; * * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ +@Deprecated class ValueProxy extends Proxy { private double raw; private boolean hasRaw = false; |