diff options
author | Jon Bratseth <bratseth@gmail.com> | 2023-03-03 15:16:12 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2023-03-03 15:16:12 +0100 |
commit | 47188f0c7749ec328e4f9bc555c44b8ab2b90182 (patch) | |
tree | 8216de8385b45ed52364c8e52ae92f00d86c7e1f /container-core/src | |
parent | f3d1ec3b144acbfde712a6cd61a5ff47e1ecf1b1 (diff) |
Use the metric provider returned after configuration
Diffstat (limited to 'container-core/src')
3 files changed, 136 insertions, 135 deletions
diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/MetricAggregator.java b/container-core/src/main/java/com/yahoo/metrics/simple/MetricAggregator.java index 5fd9afa3e4c..d41d2981be8 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/MetricAggregator.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/MetricAggregator.java @@ -46,9 +46,7 @@ class MetricAggregator implements Runnable { private void createSnapshot(Bucket toDelete) { Bucket toPresent = new Bucket(); for (Bucket b : buffer) { - if (b == null) { - continue; - } + if (b == null) continue; toPresent.merge(b); } dimensions.updateDimensionPersistence(toDelete, toPresent); diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/MetricReceiver.java b/container-core/src/main/java/com/yahoo/metrics/simple/MetricReceiver.java index 409e3651091..021f3a170d8 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/MetricReceiver.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/MetricReceiver.java @@ -30,138 +30,6 @@ public class MetricReceiver { private final Object histogramDefinitionsLock = new Object(); private volatile Map<String, MetricSettings> metricSettings; - private static final class NullCounter extends Counter { - - NullCounter() { - super(null, null, null); - } - - @Override - public void add() { - } - - @Override - public void add(long n) { - } - - @Override - public void add(Point p) { - } - - @Override - public void add(long n, Point p) { - } - - @Override - public PointBuilder builder() { - return super.builder(); - } - } - - private static final class NullGauge extends Gauge { - NullGauge() { - super(null, null, null); - } - - @Override - public void sample(double x) { - } - - @Override - public void sample(double x, Point p) { - } - - @Override - public PointBuilder builder() { - return super.builder(); - } - - } - - public static final class MockReceiver extends MetricReceiver { - - private final ThreadLocalDirectory<Bucket, Sample> collection; - - private MockReceiver(ThreadLocalDirectory<Bucket, Sample> collection) { - super(collection, null); - this.collection = collection; - } - - public MockReceiver() { - this(new ThreadLocalDirectory<>(new MetricUpdater())); - } - - /** Gathers all data since last snapshot */ - public Bucket getSnapshot() { - Bucket merged = new Bucket(); - for (Bucket b : collection.fetch()) { - merged.merge(b, true); - } - return merged; - } - - /** Utility method for testing */ - public Point point(String dim, String val) { - return pointBuilder().set(dim, val).build(); - } - - } - - private static final class NullReceiver extends MetricReceiver { - - NullReceiver() { - super(null, null); - } - - @Override - public void update(Sample s) { - } - - @Override - public Counter declareCounter(String name) { - return new NullCounter(); - } - - @Override - public Counter declareCounter(String name, Point boundDimensions) { - return new NullCounter(); - } - - @Override - public Gauge declareGauge(String name) { - return new NullGauge(); - } - - @Override - public Gauge declareGauge(String name, Point boundDimensions) { - return new NullGauge(); - } - - @Override - public Gauge declareGauge(String name, Optional<Point> boundDimensions, MetricSettings customSettings) { - return null; - } - - @Override - public PointBuilder pointBuilder() { - return null; - } - - @Override - public Bucket getSnapshot() { - return null; - } - - @Override - void addMetricDefinition(String metricName, MetricSettings definition) { - } - - @Override - MetricSettings getMetricDefinition(String metricName) { - return null; - } - } - public MetricReceiver(ThreadLocalDirectory<Bucket, Sample> metricsCollection, AtomicReference<Bucket> currentSnapshot) { this.metricsCollection = metricsCollection; this.currentSnapshot = currentSnapshot; @@ -297,4 +165,137 @@ public class MetricReceiver { MetricSettings getMetricDefinition(String metricName) { return metricSettings.get(metricName); } + + private static final class NullCounter extends Counter { + + NullCounter() { + super(null, null, null); + } + + @Override + public void add() { + } + + @Override + public void add(long n) { + } + + @Override + public void add(Point p) { + } + + @Override + public void add(long n, Point p) { + } + + @Override + public PointBuilder builder() { + return super.builder(); + } + } + + private static final class NullGauge extends Gauge { + NullGauge() { + super(null, null, null); + } + + @Override + public void sample(double x) { + } + + @Override + public void sample(double x, Point p) { + } + + @Override + public PointBuilder builder() { + return super.builder(); + } + + } + + public static final class MockReceiver extends MetricReceiver { + + private final ThreadLocalDirectory<Bucket, Sample> collection; + + private MockReceiver(ThreadLocalDirectory<Bucket, Sample> collection) { + super(collection, null); + this.collection = collection; + } + + public MockReceiver() { + this(new ThreadLocalDirectory<>(new MetricUpdater())); + } + + /** Gathers all data since last snapshot */ + public Bucket getSnapshot() { + Bucket merged = new Bucket(); + for (Bucket b : collection.fetch()) { + merged.merge(b, true); + } + return merged; + } + + /** Utility method for testing */ + public Point point(String dim, String val) { + return pointBuilder().set(dim, val).build(); + } + + } + + private static final class NullReceiver extends MetricReceiver { + + NullReceiver() { + super(null, null); + } + + @Override + public void update(Sample s) { + } + + @Override + public Counter declareCounter(String name) { + return new NullCounter(); + } + + @Override + public Counter declareCounter(String name, Point boundDimensions) { + return new NullCounter(); + } + + @Override + public Gauge declareGauge(String name) { + return new NullGauge(); + } + + @Override + public Gauge declareGauge(String name, Point boundDimensions) { + return new NullGauge(); + } + + @Override + public Gauge declareGauge(String name, Optional<Point> boundDimensions, MetricSettings customSettings) { + return null; + } + + @Override + public PointBuilder pointBuilder() { + return null; + } + + @Override + public Bucket getSnapshot() { + return null; + } + + @Override + void addMetricDefinition(String metricName, MetricSettings definition) { + } + + @Override + MetricSettings getMetricDefinition(String metricName) { + return null; + } + } + } diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/jdisc/SimpleMetricConsumer.java b/container-core/src/main/java/com/yahoo/metrics/simple/jdisc/SimpleMetricConsumer.java index 0286684c34c..7cb2f495b3e 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/jdisc/SimpleMetricConsumer.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/jdisc/SimpleMetricConsumer.java @@ -50,4 +50,6 @@ public class SimpleMetricConsumer implements MetricConsumer { return new Point(properties); } + public MetricReceiver receiver() { return receiver; } + } |