diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-05-16 14:24:13 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-05-16 15:05:45 +0200 |
commit | d844ee7803209ea123751ba40b589afa9e8a93be (patch) | |
tree | 0001f34926211da71d0977857634fd95ffcf48bb /container-disc/src/main | |
parent | 958dc05771460cf6264b0ed03a812d152d429deb (diff) |
Deprecate Manhattan metrics
Diffstat (limited to 'container-disc/src/main')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java | 33 |
1 files changed, 17 insertions, 16 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 1c6e85a177a..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 @@ -1,17 +1,17 @@ // 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 java.util.Timer; -import java.util.TimerTask; -import java.nio.file.DirectoryStream; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.Files; - import com.google.inject.Inject; import com.yahoo.component.AbstractComponent; import com.yahoo.jdisc.Metric; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Timer; +import java.util.TimerTask; + /** * Uses a timer to emit metrics * @@ -21,12 +21,12 @@ import com.yahoo.jdisc.Metric; */ public class MetricUpdater extends AbstractComponent { - private static final String FREE_MEMORY_BYTES = "freeMemoryBytes"; - private static final String USED_MEMORY_BYTES = "usedMemoryBytes"; - private static final String TOTAL_MEMORY_BYTES = "totalMemoryBytes"; - private static final String MANHATTAN_FREE_MEMORY_BYTES = "mem.heap.free"; - private static final String MANHATTAN_USED_MEMORY_BYTES = "mem.heap.used"; - private static final String MANHATTAN_TOTAL_MEMORY_BYTES = "mem.heap.total"; + @Deprecated private static final String DEPRECATED_FREE_MEMORY_BYTES = "freeMemoryBytes"; + @Deprecated private static final String DEPRECATED_USED_MEMORY_BYTES = "usedMemoryBytes"; + @Deprecated private static final String DEPRECATED_TOTAL_MEMORY_BYTES = "totalMemoryBytes"; + private static final String FREE_MEMORY_BYTES = "mem.heap.free"; + private static final String USED_MEMORY_BYTES = "mem.heap.used"; + private static final String TOTAL_MEMORY_BYTES = "mem.heap.total"; private static final String MEMORY_MAPPINGS_COUNT = "jdisc.memory_mappings"; private static final String OPEN_FILE_DESCRIPTORS = "jdisc.open_file_descriptors"; @@ -55,17 +55,18 @@ public class MetricUpdater extends AbstractComponent { long getTotalMemory() { return totalMemory; } private class UpdaterTask extends TimerTask { + @SuppressWarnings("deprecation") @Override public void run() { freeMemory = Runtime.getRuntime().freeMemory(); totalMemory = Runtime.getRuntime().totalMemory(); long usedMemory = totalMemory - freeMemory; + metric.set(DEPRECATED_FREE_MEMORY_BYTES, freeMemory, null); + metric.set(DEPRECATED_USED_MEMORY_BYTES, usedMemory, null); + metric.set(DEPRECATED_TOTAL_MEMORY_BYTES, totalMemory, null); metric.set(FREE_MEMORY_BYTES, freeMemory, null); metric.set(USED_MEMORY_BYTES, usedMemory, null); metric.set(TOTAL_MEMORY_BYTES, totalMemory, null); - metric.set(MANHATTAN_FREE_MEMORY_BYTES, freeMemory, null); - metric.set(MANHATTAN_USED_MEMORY_BYTES, usedMemory, null); - metric.set(MANHATTAN_TOTAL_MEMORY_BYTES, totalMemory, null); metric.set(MEMORY_MAPPINGS_COUNT, count_mappings(), null); metric.set(OPEN_FILE_DESCRIPTORS, count_open_files(), null); } |