Never provide a StateMetricConsumer.

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

2 files changed, 1 insertions, 15 deletions

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) {