diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-05-29 15:43:06 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-05-29 16:30:53 +0200 |
commit | 606acc8e051d983698099f9ec1bcbfcde10a2690 (patch) | |
tree | f6284e0456c3c4d8554d6122ec075a6f5f195353 /container-disc/src/main | |
parent | 41a1db5c510ff536caa3740a0f6df9acf8e0cbef (diff) |
Use ActiveContainerStatistics
Track ActiveContainer instances through ApplicationLoader.
Output ActiveContainer statistics through MetricUpdater.
Diffstat (limited to 'container-disc/src/main')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java | 10 |
1 files changed, 7 insertions, 3 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 74e2c243c89..180813f9a89 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,6 +4,7 @@ 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; @@ -31,17 +32,19 @@ 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) { - this(metric, 10*1000); + public MetricUpdater(Metric metric, ActiveContainerStatistics activeContainerStatistics) { + this(metric, activeContainerStatistics, 10*1000); } - public MetricUpdater(Metric metric, long delayMillis) { + public MetricUpdater(Metric metric, ActiveContainerStatistics activeContainerStatistics, long delayMillis) { this.metric = metric; + this.activeContainerStatistics = activeContainerStatistics; timer.schedule(new UpdaterTask(), delayMillis, delayMillis); } @@ -69,6 +72,7 @@ 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 |