Remove container watchdog

- Remove ActiveContainerDeactivationWatchdog
- Move deconstruction enforcer to ActiveContainer

2 files changed, 8 insertions, 15 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java
index 05445d26e27..3d026172c86 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java
@@ -1,10 +1,9 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.jdisc.metric;
 
 import com.google.inject.Inject;
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.jdisc.Metric;
-import com.yahoo.jdisc.statistics.ActiveContainerMetrics;
 
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
@@ -35,13 +34,13 @@ public class MetricUpdater extends AbstractComponent {
     private final Scheduler scheduler;
 
     @Inject
-    public MetricUpdater(Metric metric, ActiveContainerMetrics activeContainerMetrics) {
-        this(new TimerScheduler(), metric, activeContainerMetrics);
+    public MetricUpdater(Metric metric) {
+        this(new TimerScheduler(), metric);
     }
 
-    MetricUpdater(Scheduler scheduler, Metric metric, ActiveContainerMetrics activeContainerMetrics) {
+    MetricUpdater(Scheduler scheduler, Metric metric) {
         this.scheduler = scheduler;
-        scheduler.schedule(new UpdaterTask(metric, activeContainerMetrics), Duration.ofSeconds(10));
+        scheduler.schedule(new UpdaterTask(metric), Duration.ofSeconds(10));
     }
 
     @Override
@@ -88,11 +87,9 @@ public class MetricUpdater extends AbstractComponent {
 
         private final Runtime runtime = Runtime.getRuntime();
         private final Metric metric;
-        private final ActiveContainerMetrics activeContainerMetrics;
 
-        public UpdaterTask(Metric metric, ActiveContainerMetrics activeContainerMetrics) {
+        public UpdaterTask(Metric metric) {
             this.metric = metric;
-            this.activeContainerMetrics = activeContainerMetrics;
         }
 
         @SuppressWarnings("deprecation")
@@ -109,7 +106,6 @@ public class MetricUpdater extends AbstractComponent {
             metric.set(TOTAL_MEMORY_BYTES, totalMemory, null);
             metric.set(MEMORY_MAPPINGS_COUNT, count_mappings(), null);
             metric.set(OPEN_FILE_DESCRIPTORS, count_open_files(), null);
-            activeContainerMetrics.emitMetrics(metric);
         }
 
     }
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java
index 66d0686244d..d94cea033f5 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java
@@ -1,8 +1,7 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.jdisc.metric;
 
 import com.yahoo.jdisc.Metric;
-import com.yahoo.jdisc.statistics.ActiveContainerMetrics;
 import org.junit.Test;
 
 import java.time.Duration;
@@ -21,9 +20,7 @@ public class MetricUpdaterTest {
     @Test
     public void metrics_are_updated_in_scheduler_cycle() throws InterruptedException {
         Metric metric = mock(Metric.class);
-        ActiveContainerMetrics activeContainerMetrics = mock(ActiveContainerMetrics.class);
-        new MetricUpdater(new MockScheduler(), metric, activeContainerMetrics);
-        verify(activeContainerMetrics, times(1)).emitMetrics(any());
+        new MetricUpdater(new MockScheduler(), metric);
         verify(metric, times(8)).set(anyString(), any(), any());
     }