Remove redundant ClusterManagerThrottlingMetricsCollector (#582)

* Remove redundant ClusterManagerThrottlingMetricsCollector Signed-off-by: Khushboo Rajput <[email protected]> * Fix typo in ClusterManagerServiceEventMetrics Signed-off-by: Khushboo Rajput <[email protected]> --------- Signed-off-by: Khushboo Rajput <[email protected]>
opensearch-project · Oct 10, 2023 · 9e2b749 · 9e2b749
1 parent 951df93
commit 9e2b749
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 231 deletions.
diff --git a/build.gradle b/build.gradle
@@ -229,7 +229,6 @@ jacocoTestReport {
                     ],
                     exclude: [
                             '**/FaultDetectionMetricsCollector.class',
-                            '**/ClusterManagerThrottlingMetricsCollector.class',
                             '**/ClusterSettingsManager.class',
                     ])
         })

diff --git a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java
@@ -47,7 +47,6 @@
 import org.opensearch.performanceanalyzer.collectors.ClusterApplierServiceStatsCollector;
 import org.opensearch.performanceanalyzer.collectors.ClusterManagerServiceEventMetrics;
 import org.opensearch.performanceanalyzer.collectors.ClusterManagerServiceMetrics;
-import org.opensearch.performanceanalyzer.collectors.ClusterManagerThrottlingMetricsCollector;
 import org.opensearch.performanceanalyzer.collectors.ElectionTermCollector;
 import org.opensearch.performanceanalyzer.collectors.FaultDetectionMetricsCollector;
 import org.opensearch.performanceanalyzer.collectors.NodeDetailsCollector;
@@ -217,9 +216,6 @@ public PerformanceAnalyzerPlugin(final Settings settings, final java.nio.file.Pa
                         performanceAnalyzerController, configOverridesWrapper));
         scheduledMetricCollectorsExecutor.addScheduledMetricCollector(
                 new ShardStateCollector(performanceAnalyzerController, configOverridesWrapper));
-        scheduledMetricCollectorsExecutor.addScheduledMetricCollector(
-                new ClusterManagerThrottlingMetricsCollector(
-                        performanceAnalyzerController, configOverridesWrapper));
         scheduledMetricCollectorsExecutor.addScheduledMetricCollector(
                 new ClusterApplierServiceStatsCollector(
                         performanceAnalyzerController, configOverridesWrapper));

diff --git a/...java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java b/...java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java
@@ -160,7 +160,7 @@ public void collectMetrics(long startTime) {
                 | IllegalAccessException
                 | ClassNotFoundException e) {
             LOG.debug(
-                    "[ {} ] Exception raised while getting Cluster Manager throttling metrics: {} ",
+                    "[ {} ] Exception raised while getting Cluster Manager Service Event metrics: {} ",
                     this::getCollectorName,
                     e::getMessage);
             StatsCollector.instance()

diff --git a/...g/opensearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollector.java b/...g/opensearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollector.java
diff --git a/src/main/java/org/opensearch/performanceanalyzer/util/Utils.java b/src/main/java/org/opensearch/performanceanalyzer/util/Utils.java
@@ -40,8 +40,6 @@ public static void configureMetrics() {
         MetricsConfiguration.CONFIG_MAP.put(ClusterManagerServiceMetrics.class, cdefault);
         MetricsConfiguration.CONFIG_MAP.put(FaultDetectionMetricsCollector.class, cdefault);
         MetricsConfiguration.CONFIG_MAP.put(ShardStateCollector.class, cdefault);
-        MetricsConfiguration.CONFIG_MAP.put(
-                ClusterManagerThrottlingMetricsCollector.class, cdefault);
         MetricsConfiguration.CONFIG_MAP.put(ClusterApplierServiceStatsCollector.class, cdefault);
         MetricsConfiguration.CONFIG_MAP.put(SearchBackPressureStatsCollector.class, cdefault);
         MetricsConfiguration.CONFIG_MAP.put(ElectionTermCollector.class, cdefault);

diff --git a/...nsearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollectorTests.java b/...nsearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollectorTests.java