From bfa98c78e653d57e7ba044205403a503e580d577 Mon Sep 17 00:00:00 2001 From: Khushboo Rajput <59671881+khushbr@users.noreply.github.com> Date: Tue, 10 Oct 2023 12:55:55 -0700 Subject: [PATCH] Add separate metric for cluster manager service events and metrics (#579) * Add separate metric for cluster manager service events and metrics * Fix build error related to missing import Signed-off-by: Khushboo Rajput * Fix test build failure Signed-off-by: Khushboo Rajput --------- Signed-off-by: Khushboo Rajput (cherry picked from commit 951df934428562f1c0978310c6e3909c03e4aeda) --- .../ClusterManagerServiceEventMetrics.java | 7 ++++--- .../collectors/ClusterManagerServiceMetrics.java | 4 ++-- .../collectors/StatsTests.java | 15 +++++++++------ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java index c90c02ab..f35d4ce6 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java @@ -5,8 +5,8 @@ package org.opensearch.performanceanalyzer.collectors; -import static org.opensearch.performanceanalyzer.commons.stats.metrics.StatExceptionCode.CLUSTER_MANAGER_METRICS_ERROR; import static org.opensearch.performanceanalyzer.commons.stats.metrics.StatExceptionCode.CLUSTER_MANAGER_NODE_NOT_UP; +import static org.opensearch.performanceanalyzer.commons.stats.metrics.StatExceptionCode.CLUSTER_MANAGER_SERVICE_EVENTS_METRICS_COLLECTOR_ERROR; import static org.opensearch.performanceanalyzer.commons.stats.metrics.StatMetrics.CLUSTER_MANAGER_SERVICE_EVENTS_METRICS_COLLECTOR_EXECUTION_TIME; import com.google.common.annotations.VisibleForTesting; @@ -51,7 +51,7 @@ public ClusterManagerServiceEventMetrics() { SAMPLING_TIME_INTERVAL, "ClusterManagerServiceEventMetrics", CLUSTER_MANAGER_SERVICE_EVENTS_METRICS_COLLECTOR_EXECUTION_TIME, - CLUSTER_MANAGER_METRICS_ERROR); + CLUSTER_MANAGER_SERVICE_EVENTS_METRICS_COLLECTOR_ERROR); clusterManagerServiceCurrentQueue = null; clusterManagerServiceWorkers = null; prioritizedOpenSearchThreadPoolExecutor = null; @@ -163,7 +163,8 @@ public void collectMetrics(long startTime) { "[ {} ] Exception raised while getting Cluster Manager throttling metrics: {} ", this::getCollectorName, e::getMessage); - StatsCollector.instance().logException(CLUSTER_MANAGER_METRICS_ERROR); + StatsCollector.instance() + .logException(CLUSTER_MANAGER_SERVICE_EVENTS_METRICS_COLLECTOR_ERROR); } } diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java index 25229d50..43f577aa 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java @@ -5,7 +5,7 @@ package org.opensearch.performanceanalyzer.collectors; -import static org.opensearch.performanceanalyzer.commons.stats.metrics.StatExceptionCode.CLUSTER_MANAGER_METRICS_ERROR; +import static org.opensearch.performanceanalyzer.commons.stats.metrics.StatExceptionCode.CLUSTER_MANAGER_SERVICE_METRICS_COLLECTOR_ERROR; import static org.opensearch.performanceanalyzer.commons.stats.metrics.StatMetrics.CLUSTER_MANAGER_SERVICE_METRICS_COLLECTOR_EXECUTION_TIME; import com.fasterxml.jackson.annotation.JsonProperty; @@ -39,7 +39,7 @@ public ClusterManagerServiceMetrics() { SAMPLING_TIME_INTERVAL, "ClusterManagerServiceMetrics", CLUSTER_MANAGER_SERVICE_METRICS_COLLECTOR_EXECUTION_TIME, - CLUSTER_MANAGER_METRICS_ERROR); + CLUSTER_MANAGER_SERVICE_METRICS_COLLECTOR_ERROR); value = new StringBuilder(); } diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/StatsTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/StatsTests.java index 9eecd0dd..5ac11bf8 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/collectors/StatsTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/StatsTests.java @@ -43,13 +43,13 @@ public void run() { static Random RANDOM = new Random(); private static final int MAX_COUNT = 500; - private static final int CLUSTER_MANAGER_METRICS_ERRORS = + private static final int CLUSTER_MANAGER_SERVICE_EVENTS_METRICS_ERROR = Math.abs(RANDOM.nextInt() % MAX_COUNT); private static final int REQUEST_REMOTE_ERRORS = Math.abs(RANDOM.nextInt() % MAX_COUNT); private static final int READER_PARSER_ERRORS = Math.abs(RANDOM.nextInt() % MAX_COUNT); private static final int READER_RESTART_PROCESSINGS = Math.abs(RANDOM.nextInt() % MAX_COUNT); private static final int TOTAL_ERRORS = - CLUSTER_MANAGER_METRICS_ERRORS + CLUSTER_MANAGER_SERVICE_EVENTS_METRICS_ERROR + REQUEST_REMOTE_ERRORS + READER_PARSER_ERRORS + READER_RESTART_PROCESSINGS; @@ -63,8 +63,9 @@ public void testStats() throws Exception { LinkedList exceptionCodeList = new LinkedList<>(); - for (int i = 0; i < CLUSTER_MANAGER_METRICS_ERRORS; i++) { - exceptionCodeList.add(StatExceptionCode.CLUSTER_MANAGER_METRICS_ERROR); + for (int i = 0; i < CLUSTER_MANAGER_SERVICE_EVENTS_METRICS_ERROR; i++) { + exceptionCodeList.add( + StatExceptionCode.CLUSTER_MANAGER_SERVICE_EVENTS_METRICS_COLLECTOR_ERROR); } for (int i = 0; i < REQUEST_REMOTE_ERRORS; i++) { @@ -101,10 +102,12 @@ private static void assertExpected(StatsCollector sc) { assertEquals( sc.getCounters() .getOrDefault( - StatExceptionCode.CLUSTER_MANAGER_METRICS_ERROR.toString(), + StatExceptionCode + .CLUSTER_MANAGER_SERVICE_EVENTS_METRICS_COLLECTOR_ERROR + .toString(), DEFAULT_VAL) .get(), - CLUSTER_MANAGER_METRICS_ERRORS); + CLUSTER_MANAGER_SERVICE_EVENTS_METRICS_ERROR); assertEquals( sc.getCounters() .getOrDefault(