aboutsummaryrefslogtreecommitdiffstats
path: root/container-disc/src/main/java/com/yahoo/container/jdisc/metric
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-05-30 17:12:40 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-05-30 17:12:40 +0200
commit319a78e6c340889beb7185b88d9195e99238d410 (patch)
tree1acea130bb4f42c8e7e987aa7393758b088f89be /container-disc/src/main/java/com/yahoo/container/jdisc/metric
parentd0f53d3a20495b595c3b2f6684be0fae5f9e1f20 (diff)
Revert "Use ActiveContainerStatistics"
This reverts commit 606acc8e051d983698099f9ec1bcbfcde10a2690.
Diffstat (limited to 'container-disc/src/main/java/com/yahoo/container/jdisc/metric')
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java10
1 files changed, 3 insertions, 7 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