From 0c12b05e67db17208d69c5741f9eb1fefbac2c1a Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 23 Aug 2016 12:16:56 +0200 Subject: Whitespace changes only --- .../yahoo/container/jdisc/state/CountMetric.java | 1 + .../com/yahoo/container/jdisc/state/MetricSet.java | 1 + .../container/jdisc/state/MetricSnapshot.java | 1 + .../yahoo/container/jdisc/state/StateHandler.java | 51 +++++++++++----------- .../container/jdisc/state/StateMetricConsumer.java | 1 + .../container/jdisc/state/StateMetricContext.java | 3 +- 6 files changed, 31 insertions(+), 27 deletions(-) (limited to 'container-core') diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/CountMetric.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/CountMetric.java index a4b6506adb7..91ce3d0c2a7 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/CountMetric.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/CountMetric.java @@ -38,4 +38,5 @@ public final class CountMetric extends MetricValue { public static CountMetric newInstance(long val) { return new CountMetric(val); } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSet.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSet.java index fe24b55798b..35aa97e2da5 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSet.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSet.java @@ -86,4 +86,5 @@ public final class MetricSet implements Iterable> kv -> kv.getKey(), kv -> ((GaugeMetric)kv.getValue()).newWithPreservedLastValue()))); } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSnapshot.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSnapshot.java index 6418f84e95b..3affbb0f8c5 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSnapshot.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSnapshot.java @@ -92,4 +92,5 @@ public final class MetricSnapshot implements IterableSimon Thoresen Hult + * @author Simon Thoresen Hult */ public class StateHandler extends AbstractRequestHandler { @@ -45,7 +44,6 @@ public class StateHandler extends AbstractRequestHandler { private final Timer timer; private final byte[] config; private final SnapshotProvider snapshotPreprocessor; - private static final Splitter onSlash = Splitter.on('/'); @Inject public StateHandler(StateMonitor monitor, Timer timer, ApplicationMetadataConfig config, @@ -91,18 +89,18 @@ public class StateHandler extends AbstractRequestHandler { private ByteBuffer buildContent(URI requestUri) { String suffix = resolvePath(requestUri); switch (suffix) { - case "": - return ByteBuffer.wrap(apiLinks(requestUri)); - case CONFIG_GENERATION_API_NAME: - return ByteBuffer.wrap(config); - case HISTOGRAMS_API_NAME: - return ByteBuffer.wrap(buildHistogramsOutput()); - case HEALTH_API_NAME: - case METRICS_API_NAME: - return ByteBuffer.wrap(buildMetricOutput(suffix)); - default: - // XXX should possibly do something else here - return ByteBuffer.wrap(buildMetricOutput(suffix)); + case "": + return ByteBuffer.wrap(apiLinks(requestUri)); + case CONFIG_GENERATION_API_NAME: + return ByteBuffer.wrap(config); + case HISTOGRAMS_API_NAME: + return ByteBuffer.wrap(buildHistogramsOutput()); + case HEALTH_API_NAME: + case METRICS_API_NAME: + return ByteBuffer.wrap(buildMetricOutput(suffix)); + default: + // XXX should possibly do something else here + return ByteBuffer.wrap(buildMetricOutput(suffix)); } } @@ -244,13 +242,13 @@ public class StateHandler extends AbstractRequestHandler { private static List collapseMetrics(MetricSnapshot snapshot, String consumer) { switch (consumer) { - case HEALTH_API_NAME: - return collapseHealthMetrics(snapshot); - case "all": // deprecated name - case METRICS_API_NAME: - return collapseAllMetrics(snapshot); - default: - throw new IllegalArgumentException("Unknown consumer '" + consumer + "'."); + case HEALTH_API_NAME: + return collapseHealthMetrics(snapshot); + case "all": // deprecated name + case METRICS_API_NAME: + return flattenAllMetrics(snapshot); + default: + throw new IllegalArgumentException("Unknown consumer '" + consumer + "'."); } } @@ -280,14 +278,15 @@ public class StateHandler extends AbstractRequestHandler { return lst; } - private static List collapseAllMetrics(MetricSnapshot snapshot) { - List lst = new ArrayList<>(); + /** Produces a flat list of metric entries from a snapshot (which organizes metrics by dimensions) */ + private static List flattenAllMetrics(MetricSnapshot snapshot) { + List metrics = new ArrayList<>(); for (Map.Entry snapshotEntry : snapshot) { for (Map.Entry metricSetEntry : snapshotEntry.getValue()) { - lst.add(new Tuple(snapshotEntry.getKey(), metricSetEntry.getKey(), metricSetEntry.getValue())); + metrics.add(new Tuple(snapshotEntry.getKey(), metricSetEntry.getKey(), metricSetEntry.getValue())); } } - return lst; + return metrics; } private static class Tuple { diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricConsumer.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricConsumer.java index 31453dfb85b..a309bd01e52 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricConsumer.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricConsumer.java @@ -46,4 +46,5 @@ final class StateMetricConsumer implements MetricConsumer { } return metricSnapshot; } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricContext.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricContext.java index d4568c0dea6..d5f433bc8c3 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricContext.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricContext.java @@ -12,7 +12,7 @@ import java.util.Map; * A context implementation whose identity is the key and values such that this can be used as * a key in metrics lookups. * - * @author Simon Thoresen Hult + * @author Simon Thoresen Hult */ public final class StateMetricContext implements MetricDimensions, Metric.Context { @@ -53,4 +53,5 @@ public final class StateMetricContext implements MetricDimensions, Metric.Contex } return new StateMetricContext(data); } + } -- cgit v1.2.3