diff options
3 files changed, 4 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java index fa6b60dd85d..95897dc3fb0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java @@ -72,7 +72,7 @@ public class VespaMetricSet { metrics.add(new Metric("configserver.zkAvgLatency.last", "configserver.zkAvgLatency")); metrics.add(new Metric("configserver.zkMaxLatency.last", "configserver.zkMaxLatency")); metrics.add(new Metric("configserver.zkConnections.last", "configserver.zkConnections")); - metrics.add(new Metric("configserver.zkOutstandingConnections.last", "configserver.zkOutstandingConnections")); + metrics.add(new Metric("configserver.zkOutstandingRequests.last", "configserver.zkOutstandingRequests")); return metrics; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java index fc0845d71ca..a08be228e48 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdater.java @@ -32,7 +32,7 @@ public class ZKMetricUpdater extends TimerTask { public static final String METRIC_ZK_LATENCY_AVERAGE = getMetricName("zkAvgLatency"); public static final String METRIC_ZK_LATENCY_MAX = getMetricName("zkMaxLatency"); public static final String METRIC_ZK_CONNECTIONS = getMetricName("zkConnections"); - public static final String METRIC_ZK_OUTSTANDING_CONNECTIONS = getMetricName("zkOutstandingConnections"); + public static final String METRIC_ZK_OUTSTANDING_REQUESTS = getMetricName("zkOutstandingRequests"); private final int CONNECTION_TIMEOUT_MS = 500; private final int WRITE_TIMEOUT_MS = 250; @@ -64,7 +64,7 @@ public class ZKMetricUpdater extends TimerTask { data.put(METRIC_ZK_CONNECTIONS, value); break; case "zk_outstanding_requests": - data.put(METRIC_ZK_OUTSTANDING_CONNECTIONS, value); + data.put(METRIC_ZK_OUTSTANDING_REQUESTS, value); break; } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdaterTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdaterTest.java index 86aeff9be1e..46a6047bb68 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdaterTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/monitoring/ZKMetricUpdaterTest.java @@ -54,7 +54,7 @@ public class ZKMetricUpdaterTest { assertThat(reportedMetrics.get(ZKMetricUpdater.METRIC_ZK_CONNECTIONS), equalTo(2L)); assertThat(reportedMetrics.get(ZKMetricUpdater.METRIC_ZK_LATENCY_AVERAGE), equalTo(444L)); assertThat(reportedMetrics.get(ZKMetricUpdater.METRIC_ZK_LATENCY_MAX), equalTo(1234L)); - assertThat(reportedMetrics.get(ZKMetricUpdater.METRIC_ZK_OUTSTANDING_CONNECTIONS), equalTo(12L)); + assertThat(reportedMetrics.get(ZKMetricUpdater.METRIC_ZK_OUTSTANDING_REQUESTS), equalTo(12L)); assertThat(reportedMetrics.get(ZKMetricUpdater.METRIC_ZK_ZNODES), equalTo(4L)); } |