Add separate metric for cluster manager service events and metrics (#579

) (#581) * Add separate metric for cluster manager service events and metrics * Fix build error related to missing import Signed-off-by: Khushboo Rajput <[email protected]> * Fix test build failure Signed-off-by: Khushboo Rajput <[email protected]> --------- Signed-off-by: Khushboo Rajput <[email protected]> (cherry picked from commit 951df93) Co-authored-by: Khushboo Rajput <[email protected]>
opensearch-project · Oct 10, 2023 · dc38a65 · dc38a65
1 parent 391d668
commit dc38a65
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/...java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java b/...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/...main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java b/...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
@@ -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<StatExceptionCode> 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(