aboutsummaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorYngve Aasheim <yngveaasheim@users.noreply.github.com>2023-01-20 12:32:36 +0100
committerGitHub <noreply@github.com>2023-01-20 12:32:36 +0100
commit2109bfbb0b594d890bc92369adb68afbd22d5ece (patch)
tree80abf4699a8f91f7d045d14ec72ebbb854f83921 /container-disc
parentb908de265c23ba30d3badc3f7fb300089eca2677 (diff)
Use ContainerMetrics enum
Diffstat (limited to 'container-disc')
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java25
1 files changed, 13 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 3f7990288f5..ae8e2bbbe48 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
@@ -5,6 +5,7 @@ import com.yahoo.component.annotation.Inject;
import com.yahoo.component.AbstractComponent;
import com.yahoo.jdisc.Metric;
import com.yahoo.jdisc.statistics.ContainerWatchdogMetrics;
+import com.yahoo.metrics.ContainerMetrics;
import com.yahoo.nativec.NativeHeap;
import java.lang.management.BufferPoolMXBean;
@@ -28,18 +29,18 @@ import java.util.TimerTask;
*/
public class MetricUpdater extends AbstractComponent {
- private static final String NATIVE_FREE_MEMORY_BYTES = "mem.native.free";
- private static final String NATIVE_USED_MEMORY_BYTES = "mem.native.used";
- private static final String NATIVE_TOTAL_MEMORY_BYTES = "mem.native.total";
- private static final String HEAP_FREE_MEMORY_BYTES = "mem.heap.free";
- private static final String HEAP_USED_MEMORY_BYTES = "mem.heap.used";
- private static final String HEAP_TOTAL_MEMORY_BYTES = "mem.heap.total";
- private static final String DIRECT_FREE_MEMORY_BYTES = "mem.direct.free";
- private static final String DIRECT_USED_MEMORY_BYTES = "mem.direct.used";
- private static final String DIRECT_TOTAL_MEMORY_BYTES = "mem.direct.total";
- private static final String DIRECT_COUNT = "mem.direct.count";
- private static final String MEMORY_MAPPINGS_COUNT = "jdisc.memory_mappings";
- private static final String OPEN_FILE_DESCRIPTORS = "jdisc.open_file_descriptors";
+ private static final String NATIVE_FREE_MEMORY_BYTES = ContainerMetrics.MEM_NATIVE_FREE.baseName();
+ private static final String NATIVE_USED_MEMORY_BYTES = ContainerMetrics.MEM_NATIVE_USED.baseName();
+ private static final String NATIVE_TOTAL_MEMORY_BYTES = ContainerMetrics.MEM_NATIVE_TOTAL.baseName();
+ private static final String HEAP_FREE_MEMORY_BYTES = ContainerMetrics.MEM_HEAP_FREE.baseName();
+ private static final String HEAP_USED_MEMORY_BYTES = ContainerMetrics.MEM_HEAP_USED.baseName();
+ private static final String HEAP_TOTAL_MEMORY_BYTES = ContainerMetrics.MEM_HEAP_TOTAL.baseName();
+ private static final String DIRECT_FREE_MEMORY_BYTES = ContainerMetrics.MEM_DIRECT_FREE.baseName();
+ private static final String DIRECT_USED_MEMORY_BYTES = ContainerMetrics.MEM_DIRECT_USED.baseName();
+ private static final String DIRECT_TOTAL_MEMORY_BYTES = ContainerMetrics.MEM_DIRECT_TOTAL.baseName();
+ private static final String DIRECT_COUNT = ContainerMetrics.MEM_DIRECT_COUNT.baseName();
+ private static final String MEMORY_MAPPINGS_COUNT = ContainerMetrics.JDISC_MEMORY_MAPPINGS.baseName();
+ private static final String OPEN_FILE_DESCRIPTORS = ContainerMetrics.JDISC_OPEN_FILE_DESCRIPTORS.baseName();
private static final String TOTAL_THREADS = "jdisc.threads.total";
private final Scheduler scheduler;