cpu.util -> cpu_util

2 files changed, 9 insertions, 5 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);
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java
index 64b19b5d91b..a1ce2b7c890 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java
@@ -150,7 +150,7 @@ public class SystemPollerTest {
         double expected_util = 100.0*diffProcJiffies/diff.jiffies;
         assertEquals(0.3908945442609743, expected_util, 0.0000000000001);
         assertEquals(new Metric(MetricId.toMetricId("cpu"), expected, 1), metricList.get(2));
-        assertEquals(new Metric(MetricId.toMetricId("cpu.util"), expected_util, 1), metricList.get(3));
+        assertEquals(new Metric(MetricId.toMetricId("cpu_util"), expected_util, 1), metricList.get(3));
     }
 
 }