diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-10-14 11:19:28 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-10-14 11:19:28 +0200 |
commit | ded226f08c2ed37f2e9872028a1c624e0291193f (patch) | |
tree | df3cb0084dd9a7d48d774fdecf2e9e72668ecd01 /metrics-proxy/src/main | |
parent | 8d39bc32a7e48467475d39bf2e81520fe07f9425 (diff) |
cpu.util -> cpu_util
Diffstat (limited to 'metrics-proxy/src/main')
-rw-r--r-- | metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java index 3f0ea4743ad..c68e8214abf 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java @@ -30,6 +30,10 @@ public class SystemPoller { private static final Logger log = Logger.getLogger(SystemPoller.class.getName()); private static final int memoryTypeVirtual = 0; private static final int memoryTypeResident = 1; + private static final MetricId CPU = MetricId.toMetricId("cpu"); + private static final MetricId CPU_UTIL = MetricId.toMetricId("cpu_util"); + private static final MetricId MEMORY_VIRT = MetricId.toMetricId("memory_virt"); + private static final MetricId MEMORY_RSS = MetricId.toMetricId("memory_rss"); private final int pollingIntervalSecs; private final List<VespaService> services; @@ -161,16 +165,16 @@ public class SystemPoller { long[] size = getMemoryUsage(s); log.log(Level.FINE, () -> "Updating memory metric for service " + s); - metrics.add(new Metric(MetricId.toMetricId("memory_virt"), size[memoryTypeVirtual], timeStamp)); - metrics.add(new Metric(MetricId.toMetricId("memory_rss"), size[memoryTypeResident], timeStamp)); + metrics.add(new Metric(MEMORY_VIRT, size[memoryTypeVirtual], timeStamp)); + metrics.add(new Metric(MEMORY_RSS, size[memoryTypeResident], timeStamp)); long procJiffies = getJiffies.getJiffies(s); long last = lastCpuJiffiesMetrics.get(s); long diff = procJiffies - last; if (diff >= 0) { - metrics.add(new Metric(MetricId.toMetricId("cpu"), 100 * ((double) diff) / sysJiffiesDiff.normalizedJiffies(), timeStamp)); - metrics.add(new Metric(MetricId.toMetricId("cpu.util"), 100 * ((double) diff) / sysJiffiesDiff.jiffies, timeStamp)); + metrics.add(new Metric(CPU, 100 * ((double) diff) / sysJiffiesDiff.normalizedJiffies(), timeStamp)); + metrics.add(new Metric(CPU_UTIL, 100 * ((double) diff) / sysJiffiesDiff.jiffies, timeStamp)); } lastCpuJiffiesMetrics.put(s, procJiffies); s.setSystemMetrics(metrics); |