Deprecate statistics

25 files changed, 32 insertions, 10 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 2e39cfa6e70..1425c2a4375 100644
--- a/statistics/src/main/java/com/yahoo/statistics/Counter.java
+++ b/statistics/src/main/java/com/yahoo/statistics/Counter.java
@@ -11,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);
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 f67dafa9309..d1ad0e26f40 100644
--- a/statistics/src/main/java/com/yahoo/statistics/Handle.java
+++ b/statistics/src/main/java/com/yahoo/statistics/Handle.java
@@ -8,6 +8,7 @@ import java.util.TimerTask;
  *
  * @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..7d17ffe76e5 100644
--- a/statistics/src/main/java/com/yahoo/statistics/SampleDirectory.java
+++ b/statistics/src/main/java/com/yahoo/statistics/SampleDirectory.java
@@ -11,6 +11,7 @@ import com.yahoo.statistics.SampleSet.Sampling;
  *
  * @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);
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 98446a10135..30d0920701e 100644
--- a/statistics/src/main/java/com/yahoo/statistics/Value.java
+++ b/statistics/src/main/java/com/yahoo/statistics/Value.java
@@ -16,6 +16,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
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;
diff --git a/statistics/src/test/java/com/yahoo/statistics/CounterGroupTestCase.java b/statistics/src/test/java/com/yahoo/statistics/CounterGroupTestCase.java
index 57a321e126f..323a4fd23c6 100644
--- a/statistics/src/test/java/com/yahoo/statistics/CounterGroupTestCase.java
+++ b/statistics/src/test/java/com/yahoo/statistics/CounterGroupTestCase.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.assertFalse;
  *
  * @author Steinar Knutsen
  */
+@SuppressWarnings("deprecation")
 public class CounterGroupTestCase {
 
     private volatile boolean gotRecord = false;
diff --git a/statistics/src/test/java/com/yahoo/statistics/CounterTestCase.java b/statistics/src/test/java/com/yahoo/statistics/CounterTestCase.java
index c4dd5dd9c67..8c17fd936a0 100644
--- a/statistics/src/test/java/com/yahoo/statistics/CounterTestCase.java
+++ b/statistics/src/test/java/com/yahoo/statistics/CounterTestCase.java
@@ -15,7 +15,7 @@ import static org.junit.Assert.assertFalse;
  *
  * @author Steinar Knutsen
  */
-
+@SuppressWarnings("deprecation")
 public class CounterTestCase {
 
     @Test
diff --git a/statistics/src/test/java/com/yahoo/statistics/StatisticsImplTestCase.java b/statistics/src/test/java/com/yahoo/statistics/StatisticsImplTestCase.java
index f0f951610f5..1ae8725ffe2 100644
--- a/statistics/src/test/java/com/yahoo/statistics/StatisticsImplTestCase.java
+++ b/statistics/src/test/java/com/yahoo/statistics/StatisticsImplTestCase.java
@@ -16,6 +16,7 @@ import com.yahoo.container.StatisticsConfig;
  *
  * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  */
+@SuppressWarnings("deprecation")
 public class StatisticsImplTestCase {
     private static class TestHandle extends Handle {
 
diff --git a/statistics/src/test/java/com/yahoo/statistics/ValueGroupTestCase.java b/statistics/src/test/java/com/yahoo/statistics/ValueGroupTestCase.java
index 35db53b3316..f9c3ee79ad7 100644
--- a/statistics/src/test/java/com/yahoo/statistics/ValueGroupTestCase.java
+++ b/statistics/src/test/java/com/yahoo/statistics/ValueGroupTestCase.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.assertTrue;
  *
  * @author Steinar Knutsen
  */
+@SuppressWarnings("deprecation")
 public class ValueGroupTestCase {
 
     private volatile boolean gotRecord = false;
diff --git a/statistics/src/test/java/com/yahoo/statistics/ValueTestCase.java b/statistics/src/test/java/com/yahoo/statistics/ValueTestCase.java
index 72825ffd6ad..91a02d90a6e 100644
--- a/statistics/src/test/java/com/yahoo/statistics/ValueTestCase.java
+++ b/statistics/src/test/java/com/yahoo/statistics/ValueTestCase.java
@@ -14,7 +14,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import com.yahoo.statistics.Value.Parameters;
 import org.junit.Test;
 
 /**
@@ -22,6 +21,7 @@ import org.junit.Test;
  *
  * @author Steinar Knutsen
  */
+@SuppressWarnings("deprecation")
 public class ValueTestCase {
 
     private static final double delta = 0.0000000001;
@@ -46,7 +46,7 @@ public class ValueTestCase {
 
     @Test
     public void testMean() {
-        Value v = new Value("thingie", Statistics.nullImplementation, new Parameters().setLogMean(true));
+        Value v = new Value("thingie", Statistics.nullImplementation, new Value.Parameters().setLogMean(true));
         v.put(1.0);
         v.put(2.0);
         v.put(4.0);
@@ -59,7 +59,7 @@ public class ValueTestCase {
 
     @Test
     public void testMin() {
-        Value v = new Value("thingie", Statistics.nullImplementation, new Parameters().setLogMin(true));
+        Value v = new Value("thingie", Statistics.nullImplementation, new Value.Parameters().setLogMin(true));
         v.put(2.0);
         assertTrue("Min should be 2.0", 2.0 == v.getMin());
         v.put(1.0);
@@ -71,7 +71,7 @@ public class ValueTestCase {
 
     @Test
     public void testMax() {
-        Value v = new Value("thingie", Statistics.nullImplementation, new Parameters().setLogMax(true));
+        Value v = new Value("thingie", Statistics.nullImplementation, new Value.Parameters().setLogMax(true));
         v.put(-1.0);
         assertTrue("Max should be -1.0", -1.0 == v.getMax());
         v.put(1.0);
@@ -84,7 +84,7 @@ public class ValueTestCase {
 
     @Test
     public void testHistogram() {
-        Value v = new Value("thingie", Statistics.nullImplementation, new Parameters()
+        Value v = new Value("thingie", Statistics.nullImplementation, new Value.Parameters()
                 .setLogHistogram(true).setHistogramId(HistogramType.REGULAR)
                 .setLimits(new Limits(new double[] { 0.0, 1.0, 2.0 })));
         v.put(-1.0);
@@ -101,7 +101,7 @@ public class ValueTestCase {
         Logger logger = Logger.getLogger(Value.class.getName());
         boolean initUseParentHandlers = logger.getUseParentHandlers();
         logger.setUseParentHandlers(false);
-        Value v = new Value("thingie", Statistics.nullImplementation, new Parameters()
+        Value v = new Value("thingie", Statistics.nullImplementation, new Value.Parameters()
                 .setLogRaw(true).setCallback(new TrivialCallback()));
         v.run();
         assertEquals(FIRST, v.get(), delta);