diff options
13 files changed, 51 insertions, 51 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/DefaultMetricConsumers.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/DefaultMetricConsumers.java index 7bd590f6c84..465b3a18907 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/DefaultMetricConsumers.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/DefaultMetricConsumers.java @@ -145,7 +145,6 @@ public class DefaultMetricConsumers { metrics.add(new Metric("vds.visitor.sum.failed.rate")); // Cluster Controller - metrics.add(new Metric("cluster-controller.down.count.last")); metrics.add(new Metric("cluster-controller.initializing.count.last")); metrics.add(new Metric("cluster-controller.maintenance.count.last")); @@ -159,7 +158,7 @@ public class DefaultMetricConsumers { // DO NOT RELY ON THIS METRIC YET. metrics.add(new Metric("cluster-controller.node-event.count")); - //Errors from qrserver + // Errors from qrserver metrics.add(new Metric("error.timeout.rate","error.timeout")); metrics.add(new Metric("error.backends_oos.rate","error.backends_oos")); metrics.add(new Metric("error.plugin_failure.rate","error.plugin_failure")); 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<Map.Entry<String, MetricValue>> 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 Iterable<Map.Entry<MetricDimensions } return createWithMetrics(newData); } + } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java index 011944c6a23..5a9abd5d2ab 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc.state; -import com.google.common.base.Splitter; import com.google.inject.Inject; import com.yahoo.collections.Tuple2; import com.yahoo.component.provider.ComponentRegistry; @@ -31,7 +30,7 @@ import java.io.ByteArrayOutputStream; /** * A handler which returns state (health) information from this container instance: Status and metrics. * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @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<Tuple> 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<Tuple> collapseAllMetrics(MetricSnapshot snapshot) { - List<Tuple> lst = new ArrayList<>(); + /** Produces a flat list of metric entries from a snapshot (which organizes metrics by dimensions) */ + private static List<Tuple> flattenAllMetrics(MetricSnapshot snapshot) { + List<Tuple> metrics = new ArrayList<>(); for (Map.Entry<MetricDimensions, MetricSet> snapshotEntry : snapshot) { for (Map.Entry<String, MetricValue> 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 <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @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); } + } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderProvider.java index 930773e8546..f1fe6db6818 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderProvider.java @@ -9,7 +9,7 @@ import com.yahoo.container.jdisc.state.StateMonitor; import com.yahoo.metrics.MetricsPresentationConfig; /** - * A dependency injection-provider which providers the default metrics provider + * A dependency injection provider which provides the default metrics provider * if no provider is set up explicitly in the application package. * The purpose of this is to be a fallback if nothing is set up explicitly. * diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/state/StateMetricConsumerFactory.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/state/StateMetricConsumerFactory.java index ae4c7130c76..b01b5950c36 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/state/StateMetricConsumerFactory.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/state/StateMetricConsumerFactory.java @@ -12,7 +12,7 @@ public class StateMetricConsumerFactory implements MetricConsumerFactory { private final StateMonitor stateMonitor; - public StateMetricConsumerFactory(final StateMonitor stateMonitor) { + public StateMetricConsumerFactory(StateMonitor stateMonitor) { this.stateMonitor = stateMonitor; } @@ -20,4 +20,5 @@ public class StateMetricConsumerFactory implements MetricConsumerFactory { public MetricConsumer newInstance() { return stateMonitor.newMetricConsumer(); } + } diff --git a/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java b/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java index 408707db2f3..d43fed4845f 100644 --- a/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java @@ -1,10 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.statistics; -import com.yahoo.component.ComponentId; import com.yahoo.component.chain.dependencies.Before; import com.yahoo.concurrent.CopyOnWriteHashMap; -import com.yahoo.container.QrSearchersConfig; import com.yahoo.container.Server; import com.yahoo.container.protect.Error; import com.yahoo.jdisc.Metric; @@ -100,11 +98,11 @@ public class StatisticsSearcher extends Searcher { private class ActivitySampler implements Callback { public void run(Handle h, boolean firstRun) { if (firstRun) { - metric.set(ACTIVE_QUERIES_METRIC, Integer.valueOf(0), null); + metric.set(ACTIVE_QUERIES_METRIC, 0, null); return; } // TODO Server.get() is to be removed - final int searchQueriesInFlight = Server.get().searchQueriesInFlight(); + int searchQueriesInFlight = Server.get().searchQueriesInFlight(); ((Value) h).put(searchQueriesInFlight); metric.set(ACTIVE_QUERIES_METRIC, searchQueriesInFlight, null); } @@ -256,12 +254,11 @@ public class StatisticsSearcher extends Searcher { * @param result The result to check for errors */ private void incrementYamasOnlyErrors(Result result, Execution execution) { - if(result == null) - return; + if (result == null) return; ErrorHit error = result.hits().getErrorHit(); - if (error == null) - return; + if (error == null) return; + for (ErrorMessage m : error.errors()) { int code = m.getCode(); Metric.Context c = getDimensions(m.getSource(), result, execution); @@ -293,7 +290,6 @@ public class StatisticsSearcher extends Searcher { } } - private Metric.Context getDimensions(String source, Result r, Execution execution) { Metric.Context context = yamasOnlyContexts.get(source == null ? "" : source); if (context == null) { @@ -304,9 +300,9 @@ public class StatisticsSearcher extends Searcher { context = this.metric.createContext(dims); yamasOnlyContexts.put(source == null ? "" : source, context); } - //TODO add other relevant metric dimensions - //Would be nice to have chain as a dimension as - //we can separate errors from different chains + // TODO add other relevant metric dimensions + // Would be nice to have chain as a dimension as + // we can separate errors from different chains return context; } diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/Metric.java b/jdisc_core/src/main/java/com/yahoo/jdisc/Metric.java index 50b25dbbdf0..7a7cbcb071b 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/Metric.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/Metric.java @@ -16,7 +16,7 @@ import java.util.Map; * * <p>An instance of this class can be injected anywhere.</p> * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ @ProvidedBy(MetricProvider.class) public interface Metric { diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerThread.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerThread.java index 38527acc099..7ceb3a1e765 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerThread.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerThread.java @@ -12,15 +12,15 @@ import java.util.concurrent.ThreadFactory; * application should use this class instead of Thread. The {@link ContainerThread.Factory} class is a helper-class for * working with the {@link Executors} framework.</p> * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ public class ContainerThread extends Thread { private final MetricConsumer consumer; /** - * <p>Allocates a new ContainerThread object. This constructor calls the parent {@link Thread#Thread(Runnable)} - * constructor.</p> + * Allocates a new ContainerThread object. This constructor calls the parent {@link Thread#Thread(Runnable)} + * constructor. * * @param target The object whose <code>run</code> method is called. * @param consumer The MetricConsumer of this thread. @@ -40,8 +40,8 @@ public class ContainerThread extends Thread { } /** - * <p>This class implements the {@link ThreadFactory} interface on top of a {@link Provider} for {@link - * MetricConsumer} instances.</p> + * This class implements the {@link ThreadFactory} interface on top of a {@link Provider} for {@link + * MetricConsumer} instances. */ public static class Factory implements ThreadFactory { @@ -57,4 +57,5 @@ public class ContainerThread extends Thread { return new ContainerThread(target, provider.get()); } } + } diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/JdiscMetricsFactory.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/JdiscMetricsFactory.java index f5208b2226c..a4dbdb5790e 100644 --- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/JdiscMetricsFactory.java +++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/JdiscMetricsFactory.java @@ -17,6 +17,7 @@ import com.yahoo.metrics.simple.MetricReceiver; * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public class JdiscMetricsFactory implements MetricConsumerFactory, SnapshotProvider { + private static final Logger log = Logger.getLogger(JdiscMetricsFactory.class.getName()); private final SimpleMetricConsumer metricInstance; private final MetricReceiver metricReceiver; @@ -50,11 +51,9 @@ public class JdiscMetricsFactory implements MetricConsumerFactory, SnapshotProvi Bucket curr = metricReceiver.getSnapshot(); if (curr == null) { log.warning("no snapshot from instance of " + metricInstance.getClass()); - return; } else { SnapshotConverter converter = new SnapshotConverter(curr); converter.outputHistograms(output); - return; } } |