diff options
author | gjoranv <gv@verizonmedia.com> | 2021-02-03 11:09:39 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2021-02-03 11:09:39 +0100 |
commit | df7fe29af9e21075bea016959a2563cfdee90f53 (patch) | |
tree | 183dabbc89e648e2d874a7e20dde143c0b159e97 /container-core | |
parent | a87262be1e7aadeef29181e4b43e8f5dcbb688b5 (diff) |
Throw if no snapshot provider is given.
+ Rename field and parameter to 'snapshotProvider'
Diffstat (limited to 'container-core')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java | 13 | ||||
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java | 23 |
2 files changed, 19 insertions, 17 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java index 8d63dc54d80..6f6bab01ab5 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java @@ -17,7 +17,6 @@ import com.yahoo.jdisc.handler.ContentChannel; import com.yahoo.jdisc.handler.ResponseDispatch; import com.yahoo.jdisc.handler.ResponseHandler; import com.yahoo.jdisc.http.HttpHeaders; -import com.yahoo.metrics.MetricsPresentationConfig; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -29,7 +28,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import static com.yahoo.container.jdisc.state.JsonUtil.sanitizeDouble; -import static com.yahoo.container.jdisc.state.StateHandler.getSnapshotPreprocessor; +import static com.yahoo.container.jdisc.state.StateHandler.getSnapshotProviderOrThrow; /** * This handler outputs metrics in a json-like format, consisting of a series of metrics packets. @@ -60,17 +59,17 @@ public class MetricsPacketsHandler extends AbstractRequestHandler { private final StateMonitor monitor; private final Timer timer; - private final SnapshotProvider snapshotPreprocessor; + private final SnapshotProvider snapshotProvider; private final String applicationName; @Inject public MetricsPacketsHandler(StateMonitor monitor, Timer timer, - ComponentRegistry<SnapshotProvider> preprocessors, + ComponentRegistry<SnapshotProvider> snapshotProviders, MetricsPacketsHandlerConfig config) { this.monitor = monitor; this.timer = timer; - snapshotPreprocessor = getSnapshotPreprocessor(preprocessors); + snapshotProvider = getSnapshotProviderOrThrow(snapshotProviders); applicationName = config.application(); } @@ -147,11 +146,11 @@ public class MetricsPacketsHandler extends AbstractRequestHandler { } private MetricSnapshot getSnapshot() { - if (snapshotPreprocessor == null) { + if (snapshotProvider == null) { // TODO: throw exception in ctor instead return new MetricSnapshot(0L, 0L, TimeUnit.MILLISECONDS); } else { - return snapshotPreprocessor.latestSnapshot(); + return snapshotProvider.latestSnapshot(); } } 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 572742d11e1..8f0c661ed98 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 @@ -19,7 +19,6 @@ import com.yahoo.jdisc.handler.ContentChannel; import com.yahoo.jdisc.handler.ResponseDispatch; import com.yahoo.jdisc.handler.ResponseHandler; import com.yahoo.jdisc.http.HttpHeaders; -import com.yahoo.metrics.MetricsPresentationConfig; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -54,20 +53,24 @@ public class StateHandler extends AbstractRequestHandler { private final StateMonitor monitor; private final Timer timer; private final byte[] config; - private final SnapshotProvider snapshotPreprocessor; + private final SnapshotProvider snapshotProvider; @Inject public StateHandler(StateMonitor monitor, Timer timer, ApplicationMetadataConfig config, - ComponentRegistry<SnapshotProvider> preprocessors) { + ComponentRegistry<SnapshotProvider> snapshotProviders) { this.monitor = monitor; this.timer = timer; this.config = buildConfigOutput(config); - snapshotPreprocessor = getSnapshotPreprocessor(preprocessors); + snapshotProvider = getSnapshotProviderOrThrow(snapshotProviders); } - static SnapshotProvider getSnapshotPreprocessor(ComponentRegistry<SnapshotProvider> preprocessors) { + static SnapshotProvider getSnapshotProviderOrThrow(ComponentRegistry<SnapshotProvider> preprocessors) { List<SnapshotProvider> allPreprocessors = preprocessors.allComponents(); - return (allPreprocessors.size() > 0) ? allPreprocessors.get(0) : null; + if (allPreprocessors.size() > 0) { + return allPreprocessors.get(0); + } else { + throw new IllegalArgumentException("At least one snapshot provider is required."); + } } @Override @@ -188,8 +191,8 @@ public class StateHandler extends AbstractRequestHandler { private byte[] buildHistogramsOutput() { ByteArrayOutputStream baos = new ByteArrayOutputStream(); - if (snapshotPreprocessor != null) { - snapshotPreprocessor.histogram(new PrintStream(baos)); + if (snapshotProvider != null) { + snapshotProvider.histogram(new PrintStream(baos)); } return baos.toByteArray(); } @@ -203,11 +206,11 @@ public class StateHandler extends AbstractRequestHandler { } private MetricSnapshot getSnapshot() { - if (snapshotPreprocessor == null) { + if (snapshotProvider == null) { // TODO: throw exception in ctor instead return new MetricSnapshot(0L, 0L, TimeUnit.MILLISECONDS); } else { - return snapshotPreprocessor.latestSnapshot(); + return snapshotProvider.latestSnapshot(); } } |