From 39d1271add1a2eee1af0c4338f8ad436c4308b57 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Wed, 21 Jun 2023 17:43:15 +0200 Subject: Replace metrics strings with the corresponding enum constants. - Add 'metrics' as provided dep for clustercontroller-core --- .../com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'node-admin') diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java index cd7eee8ba50..ad067110f59 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.node.admin.nodeadmin; +import ai.vespa.metrics.ContainerMetrics; import com.yahoo.jdisc.Timer; import com.yahoo.vespa.hosted.node.admin.container.ContainerStats; import com.yahoo.vespa.hosted.node.admin.container.metrics.Counter; @@ -80,9 +81,9 @@ public class NodeAdminImpl implements NodeAdmin { new Dimensions(Map.of("src", "node-agents"))); this.procMeminfoReader = procMeminfoReader; - this.jvmHeapUsed = metrics.declareGauge("mem.heap.used"); - this.jvmHeapFree = metrics.declareGauge("mem.heap.free"); - this.jvmHeapTotal = metrics.declareGauge("mem.heap.total"); + this.jvmHeapUsed = metrics.declareGauge(ContainerMetrics.MEM_HEAP_USED.baseName()); + this.jvmHeapFree = metrics.declareGauge(ContainerMetrics.MEM_HEAP_FREE.baseName()); + this.jvmHeapTotal = metrics.declareGauge(ContainerMetrics.MEM_HEAP_TOTAL.baseName()); this.containerCount = metrics.declareGauge("container.count"); this.metrics = metrics; } -- cgit v1.2.3