diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-05-30 17:12:40 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-05-30 17:12:40 +0200 |
commit | 319a78e6c340889beb7185b88d9195e99238d410 (patch) | |
tree | 1acea130bb4f42c8e7e987aa7393758b088f89be /container-disc | |
parent | d0f53d3a20495b595c3b2f6684be0fae5f9e1f20 (diff) |
Revert "Use ActiveContainerStatistics"
This reverts commit 606acc8e051d983698099f9ec1bcbfcde10a2690.
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java | 10 | ||||
-rw-r--r-- | container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java | 10 |
2 files changed, 8 insertions, 12 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 180813f9a89..74e2c243c89 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 @@ -4,7 +4,6 @@ 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.core.ActiveContainerStatistics; import java.nio.file.DirectoryStream; import java.nio.file.Files; @@ -32,19 +31,17 @@ public class MetricUpdater extends AbstractComponent { private static final String OPEN_FILE_DESCRIPTORS = "jdisc.open_file_descriptors"; private final Metric metric; - private final ActiveContainerStatistics activeContainerStatistics; private final Timer timer = new Timer(); long freeMemory = -1; long totalMemory = -1; @Inject - public MetricUpdater(Metric metric, ActiveContainerStatistics activeContainerStatistics) { - this(metric, activeContainerStatistics, 10*1000); + public MetricUpdater(Metric metric) { + this(metric, 10*1000); } - public MetricUpdater(Metric metric, ActiveContainerStatistics activeContainerStatistics, long delayMillis) { + public MetricUpdater(Metric metric, long delayMillis) { this.metric = metric; - this.activeContainerStatistics = activeContainerStatistics; timer.schedule(new UpdaterTask(), delayMillis, delayMillis); } @@ -72,7 +69,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); - activeContainerStatistics.outputMetrics(metric); } // Note: Linux-specific 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 88d410734a8..1067b572644 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,13 +1,13 @@ // Copyright 2016 Yahoo Inc. 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.application.MetricConsumer; -import com.yahoo.jdisc.core.ActiveContainerStatistics; +import static org.junit.Assert.assertTrue; + import org.junit.Test; import org.mockito.Mockito; -import static org.junit.Assert.assertTrue; +import com.yahoo.jdisc.Metric; +import com.yahoo.jdisc.application.MetricConsumer; public class MetricUpdaterTest { @@ -17,7 +17,7 @@ public class MetricUpdaterTest { MetricProvider provider = MetricProviders.newInstance(consumer); Metric metric = provider.get(); - MetricUpdater updater = new MetricUpdater(metric, new ActiveContainerStatistics(), 10); + MetricUpdater updater = new MetricUpdater(metric, 10); long start = System.currentTimeMillis(); boolean updated = false; while (System.currentTimeMillis() - start < 60000 && !updated) { |