diff options
author | gjoranv <gv@verizonmedia.com> | 2021-01-26 10:35:40 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2021-01-26 10:40:33 +0100 |
commit | 8038fbd66c920b4847f356111f60aa9e4b44b0ba (patch) | |
tree | 29199a9b160e1eb03f0f1cb49a3ce7d2b5a77897 /container-disc/src/main/java | |
parent | 6d4bd3b3b522a199261eb8a92f13f31a67a44186 (diff) |
Never provide a StateMetricConsumer.
- It was only provided when MetricsPresentationConfig.slidingwindow
was set to false (the config model always adds the
JdiscMetricsFactory).
Diffstat (limited to 'container-disc/src/main/java')
2 files changed, 5 insertions, 18 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProvider.java index a300364d848..9b907639e57 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProvider.java @@ -4,10 +4,7 @@ package com.yahoo.container.jdisc.metric; import com.google.inject.Inject; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.container.jdisc.MetricConsumerFactory; -import com.yahoo.container.jdisc.metric.state.StateMetricConsumerFactory; -import com.yahoo.container.jdisc.state.StateMonitor; import com.yahoo.jdisc.application.MetricConsumer; -import com.yahoo.metrics.MetricsPresentationConfig; /** @@ -27,17 +24,9 @@ public class MetricConsumerProvider { private final MetricConsumerFactory[] factories; @Inject - public MetricConsumerProvider(ComponentRegistry<MetricConsumerFactory> factoryRegistry, - MetricsPresentationConfig presentationConfig, - StateMonitor stateMonitor) { - MetricConsumerFactory[] factories; - if (factoryRegistry.getComponentCount() == 0 || ! presentationConfig.slidingwindow()) { - factories = new MetricConsumerFactory[1]; - factories[0] = new StateMetricConsumerFactory(stateMonitor); - } else { - factories = new MetricConsumerFactory[factoryRegistry.getComponentCount()]; - factoryRegistry.allComponents().toArray(factories); - } + public MetricConsumerProvider(ComponentRegistry<MetricConsumerFactory> factoryRegistry) { + MetricConsumerFactory[] factories = new MetricConsumerFactory[factoryRegistry.getComponentCount()]; + factoryRegistry.allComponents().toArray(factories); this.factories = factories; } 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 a44650a153d..ca3d47bc338 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 @@ -20,10 +20,8 @@ public class MetricConsumerProviderProvider implements Provider<MetricConsumerPr private final MetricConsumerProvider provided; @Inject - public MetricConsumerProviderProvider(ComponentRegistry<MetricConsumerFactory> factoryRegistry, - MetricsPresentationConfig presentationConfig, - StateMonitor stateMonitor) { - provided = new MetricConsumerProvider(factoryRegistry, presentationConfig, stateMonitor); + public MetricConsumerProviderProvider(ComponentRegistry<MetricConsumerFactory> factoryRegistry) { + provided = new MetricConsumerProvider(factoryRegistry); } @Override |