Never provide a StateMetricConsumer.

- It was only provided when MetricsPresentationConfig.slidingwindow
  was set to false (the config model always adds the
  JdiscMetricsFactory).

4 files changed, 6 insertions, 33 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
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderTest.java
index 5e3a49c2dda..0acbb701612 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderTest.java
@@ -34,10 +34,4 @@ public class MetricConsumerProviderTest {
         Mockito.verify(bar, Mockito.times(1)).add("foo", 6, null);
     }
 
-    @Test
-    public void requireThatDefaultConsumerFactoryIsStateMetric() {
-        MetricConsumer consumer = MetricConsumerProviders.newDefaultInstance().newInstance();
-        assertEquals("StateMetricConsumer", consumer.getClass().getSimpleName());
-    }
-
 }
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviders.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviders.java
index dd96414bbc7..4e576d2cd8c 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviders.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviders.java
@@ -22,15 +22,7 @@ class MetricConsumerProviders {
     }
 
     public static MetricConsumerProvider newInstance(MetricConsumerFactory... factories) {
-        return new MetricConsumerProvider(newComponentRegistry(factories),
-                                          new MetricsPresentationConfig(new MetricsPresentationConfig.Builder()),
-                                          StateMonitor.createForTesting());
-    }
-
-    public static MetricConsumerProvider newDefaultInstance() {
-        return new MetricConsumerProvider(newComponentRegistry(),
-                                          new MetricsPresentationConfig(new MetricsPresentationConfig.Builder()),
-                                          StateMonitor.createForTesting());
+        return new MetricConsumerProvider(newComponentRegistry(factories));
     }
 
     public static ComponentRegistry<MetricConsumerFactory> newComponentRegistry(MetricConsumerFactory... factories) {