diff options
Diffstat (limited to 'container-core')
5 files changed, 13 insertions, 8 deletions
diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/Bucket.java b/container-core/src/main/java/com/yahoo/metrics/simple/Bucket.java index 9162571830d..90e0115736f 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/Bucket.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/Bucket.java @@ -175,7 +175,7 @@ public class Bucket { @Override public String toString() { - return "Bucket [values=" + (values != null ? toString(values.entrySet(), 3) : null) + "]"; + return "Bucket [values=" + toString(values.entrySet(), 3) + "]"; } private String toString(Collection<?> collection, int maxLen) { 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 3839de28294..5fd9afa3e4c 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 @@ -23,8 +23,9 @@ class MetricAggregator implements Runnable { private long fromMillis; private final DimensionCache dimensions; - MetricAggregator(ThreadLocalDirectory<Bucket, Sample> metricsCollection, AtomicReference<Bucket> currentSnapshot, - ManagerConfig settings) { + MetricAggregator(ThreadLocalDirectory<Bucket, Sample> metricsCollection, + AtomicReference<Bucket> currentSnapshot, + ManagerConfig settings) { if (settings.reportPeriodSeconds() < 10) { throw new IllegalArgumentException("Do not use this metrics implementation" + " if report periods of less than 10 seconds is desired."); diff --git a/container-core/src/main/java/com/yahoo/metrics/simple/MetricManager.java b/container-core/src/main/java/com/yahoo/metrics/simple/MetricManager.java index 40242285486..99465a55a31 100644 --- a/container-core/src/main/java/com/yahoo/metrics/simple/MetricManager.java +++ b/container-core/src/main/java/com/yahoo/metrics/simple/MetricManager.java @@ -21,11 +21,11 @@ import java.util.logging.Level; */ public class MetricManager extends AbstractComponent implements Provider<MetricReceiver> { - private static Logger log = Logger.getLogger(MetricManager.class.getName()); + private static final Logger log = Logger.getLogger(MetricManager.class.getName()); private final ScheduledThreadPoolExecutor executor; private final MetricReceiver receiver; - private ThreadLocalDirectory<Bucket, Sample> metricsCollection; + private final ThreadLocalDirectory<Bucket, Sample> metricsCollection; public MetricManager(ManagerConfig settings) { this(settings, new MetricUpdater()); @@ -42,7 +42,9 @@ public class MetricManager extends AbstractComponent implements Provider<MetricR // bucket has data for exactly one second, but one should strive for // this.buffer to contain data for as close a period to the report // interval as possible - executor.scheduleAtFixedRate(new MetricAggregator(metricsCollection, currentSnapshot, settings), 1, 1, TimeUnit.SECONDS); + executor.scheduleAtFixedRate(new MetricAggregator(metricsCollection, currentSnapshot, settings), + 1, + 1, TimeUnit.SECONDS); receiver = new MetricReceiver(metricsCollection, currentSnapshot); } 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 c2ef8afd279..409e3651091 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 @@ -22,6 +22,8 @@ public class MetricReceiver { public static final MetricReceiver nullImplementation = new NullReceiver(); private final ThreadLocalDirectory<Bucket, Sample> metricsCollection; + + // A reference to the current snapshot. The *reference* is shared with MetricsAggregator and updated from there :-/ private final AtomicReference<Bucket> currentSnapshot; // metricSettings is volatile for reading, the lock is for updates @@ -91,7 +93,7 @@ public class MetricReceiver { /** Gathers all data since last snapshot */ public Bucket getSnapshot() { - final Bucket merged = new Bucket(); + Bucket merged = new Bucket(); for (Bucket b : collection.fetch()) { merged.merge(b, true); } 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 12f27e9b0ca..bea17bd91bc 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 @@ -14,7 +14,7 @@ import com.yahoo.metrics.simple.Sample; import com.yahoo.metrics.simple.UntypedMetric.AssumedType; /** - * The single user facing part of the JDisc interfaces of simple metrics. + * The metrics consumer in JDisc. * * @author Steinar Knutsen */ |