Backporting changes from main to 2.x (#445)

* Update RestController constructor for tests. (#440) Signed-off-by: Filip Drobnjakovic <[email protected]> * Fixing ShardStateCollector; impacted by core refactoring Signed-off-by: Khushboo Rajput <[email protected]> * [Collector] Adding Latency and Error service metrics (#442) * [Collector] Adding Latency and Error service metrics Signed-off-by: Khushboo Rajput <[email protected]> * Removing fastdoubleparser-LICENSE.txt and fastdoubleparser-NOTICE.txt Signed-off-by: Khushboo Rajput <[email protected]> --------- Signed-off-by: Khushboo Rajput <[email protected]> * License changes Signed-off-by: Khushboo Rajput <[email protected]> --------- Signed-off-by: Filip Drobnjakovic <[email protected]> Signed-off-by: Khushboo Rajput <[email protected]> Co-authored-by: Filip Drobnjaković <[email protected]>
opensearch-project · May 17, 2023 · 483c52a · 483c52a
1 parent b159f65
commit 483c52a
Show file tree

Hide file tree

Showing 33 changed files with 154 additions and 94 deletions.
diff --git a/licenses/fastdoubleparser-LICENSE.txt b/licenses/fastdoubleparser-LICENSE.txt
diff --git a/licenses/fastdoubleparser-NOTICE.txt b/licenses/fastdoubleparser-NOTICE.txt
diff --git a/licenses/jackson-annotations-2.14.2.jar.sha1 b/licenses/jackson-annotations-2.14.2.jar.sha1
diff --git a/licenses/jackson-annotations-2.15.1.jar.sha1 b/licenses/jackson-annotations-2.15.1.jar.sha1
@@ -0,0 +1 @@
+092a90d3739e970e03b5971839e4fe51f13c1fa3
diff --git a/licenses/jackson-databind-2.14.2.jar.sha1 b/licenses/jackson-databind-2.14.2.jar.sha1
diff --git a/licenses/jackson-databind-2.15.1.jar.sha1 b/licenses/jackson-databind-2.15.1.jar.sha1
@@ -0,0 +1 @@
+ac9ba74d208faf356e4719a49e59c6ea9237c01d
diff --git a/licenses/jackson-module-paranamer-2.14.2.jar.sha1 b/licenses/jackson-module-paranamer-2.14.2.jar.sha1
diff --git a/licenses/jackson-module-paranamer-2.15.1.jar.sha1 b/licenses/jackson-module-paranamer-2.15.1.jar.sha1
@@ -0,0 +1 @@
+1eee39f6a814b12d92a936cd198657ff26970215
diff --git a/licenses/performanceanalyzer-rca-2.7.0.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-2.7.0.0-SNAPSHOT.jar.sha1
diff --git a/licenses/performanceanalyzer-rca-2.8.0.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-2.8.0.0-SNAPSHOT.jar.sha1
@@ -0,0 +1 @@
+66be71c6f8a1defa1206b6389c43634c9a452e86
diff --git a/.../java/org/opensearch/performanceanalyzer/collectors/AdmissionControlMetricsCollector.java b/.../java/org/opensearch/performanceanalyzer/collectors/AdmissionControlMetricsCollector.java
@@ -60,7 +60,7 @@ public void collectMetrics(long startTime) {
             return;
         }
 
-        long startTimeMillis = System.currentTimeMillis();
+        long mCurrT = System.currentTimeMillis();
         try {
 
             Method getAdmissionController =
@@ -110,17 +110,15 @@ public void collectMetrics(long startTime) {
             PerformanceAnalyzerApp.WRITER_METRICS_AGGREGATOR.updateStat(
                     WriterMetrics.ADMISSION_CONTROL_COLLECTOR_EXECUTION_TIME,
                     "",
-                    System.currentTimeMillis() - startTimeMillis);
+                    System.currentTimeMillis() - mCurrT);
 
         } catch (Exception ex) {
-            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
-                    ExceptionsAndErrors.ADMISSION_CONTROL_COLLECTOR_ERROR,
-                    getCollectorName(),
-                    System.currentTimeMillis() - startTimeMillis);
             LOG.debug(
                     "Exception in collecting AdmissionControl Metrics: {} for startTime {}",
                     ex::toString,
                     () -> startTime);
+            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
+                    ExceptionsAndErrors.ADMISSION_CONTROL_COLLECTOR_ERROR, "", 1);
         }
     }
 
@@ -183,6 +181,8 @@ private boolean canLoadAdmissionControllerClasses() {
                     Class.forName(ADMISSION_CONTROL_SERVICE, false, admissionControlClassLoader);
         } catch (Exception e) {
             LOG.debug("Failed to load AdmissionControllerService classes : {}", e::toString);
+            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
+                    ExceptionsAndErrors.ADMISSION_CONTROL_COLLECTOR_ERROR, "", 1);
             return false;
         }
         return true;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/CacheConfigMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/CacheConfigMetricsCollector.java
@@ -18,11 +18,13 @@
 import org.opensearch.common.cache.Cache;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.performanceanalyzer.OpenSearchResources;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
 import org.opensearch.performanceanalyzer.metrics.AllMetrics.CacheConfigDimension;
 import org.opensearch.performanceanalyzer.metrics.AllMetrics.CacheConfigValue;
 import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
 import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
 import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
 
 /*
  * Unlike Cache Hit, Miss, Eviction Count and Size, which is tracked on a per shard basis,
@@ -54,6 +56,7 @@ public void collectMetrics(long startTime) {
             return;
         }
 
+        long mCurrT = System.currentTimeMillis();
         value.setLength(0);
         value.append(PerformanceAnalyzerMetrics.getJsonCurrentMilliSeconds());
         // This is for backward compatibility. Core OpenSearch may or may not emit maxWeight metric.
@@ -117,6 +120,10 @@ public void collectMetrics(long startTime) {
         value.append(PerformanceAnalyzerMetrics.sMetricNewLineDelimitor)
                 .append(shardRequestCacheMaxSizeStatus.serialize());
         saveMetricValues(value.toString(), startTime);
+        PerformanceAnalyzerApp.WRITER_METRICS_AGGREGATOR.updateStat(
+                WriterMetrics.CACHE_CONFIG_METRICS_COLLECTOR_EXECUTION_TIME,
+                "",
+                System.currentTimeMillis() - mCurrT);
     }
 
     @Override

diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollector.java
@@ -25,8 +25,7 @@ public class CircuitBreakerCollector extends PerformanceAnalyzerMetricsCollector
     public static final int SAMPLING_TIME_INTERVAL =
             MetricsConfiguration.CONFIG_MAP.get(CircuitBreakerCollector.class).samplingInterval;
 
-    private static final Logger LOG =
-            LogManager.getLogger(CircuitBreakerCollector.class);
+    private static final Logger LOG = LogManager.getLogger(CircuitBreakerCollector.class);
     private static final int KEYS_PATH_LENGTH = 0;
     private StringBuilder value;
 
@@ -54,10 +53,10 @@ public void collectMetrics(long startTime) {
                 value.append(PerformanceAnalyzerMetrics.sMetricNewLineDelimitor)
                         .append(
                                 new CircuitBreakerStatus(
-                                        stats.getName(),
-                                        stats.getEstimated(),
-                                        stats.getTrippedCount(),
-                                        stats.getLimit())
+                                                stats.getName(),
+                                                stats.getEstimated(),
+                                                stats.getTrippedCount(),
+                                                stats.getLimit())
                                         .serialize());
             }
 
@@ -69,14 +68,13 @@ public void collectMetrics(long startTime) {
                     System.currentTimeMillis() - mCurrT);
 
         } catch (Exception ex) {
-            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
-                    ExceptionsAndErrors.CIRCUIT_BREAKER_COLLECTOR_ERROR, "", 1);
             LOG.debug(
                     "Exception in Collecting CircuitBreaker Metrics: {} for startTime {}",
                     () -> ex.toString(),
                     () -> startTime);
+            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
+                    ExceptionsAndErrors.CIRCUIT_BREAKER_COLLECTOR_ERROR, "", 1);
         }
-
     }
 
     @Override

diff --git a/...va/org/opensearch/performanceanalyzer/collectors/ClusterApplierServiceStatsCollector.java b/...va/org/opensearch/performanceanalyzer/collectors/ClusterApplierServiceStatsCollector.java
@@ -104,12 +104,12 @@ public void collectMetrics(long startTime) {
                     "",
                     System.currentTimeMillis() - mCurrT);
         } catch (Exception ex) {
-            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
-                    ExceptionsAndErrors.CLUSTER_APPLIER_SERVICE_STATS_COLLECTOR_ERROR, "", 1);
             LOG.debug(
                     "Exception in Collecting Cluster Applier Service Metrics: {} for startTime {}",
                     () -> ex.toString(),
                     () -> startTime);
+            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
+                    ExceptionsAndErrors.CLUSTER_APPLIER_SERVICE_STATS_COLLECTOR_ERROR, "", 1);
         }
     }
 

diff --git a/...java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java b/...java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java
@@ -27,6 +27,7 @@
 import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
 import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 import org.opensearch.performanceanalyzer.metrics.ThreadIDUtil;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
 import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
 
 @SuppressWarnings("unchecked")
@@ -83,6 +84,8 @@ public void collectMetrics(long startTime) {
                 return;
             }
 
+            long mCurrT = System.currentTimeMillis();
+
             value.setLength(0);
             Queue<Runnable> current = getClusterManagerServiceCurrentQueue();
 
@@ -145,19 +148,24 @@ public void collectMetrics(long startTime) {
                             PerformanceAnalyzerMetrics.START_FILE_NAME);
 
                     value.setLength(0);
+                    PerformanceAnalyzerApp.WRITER_METRICS_AGGREGATOR.updateStat(
+                            WriterMetrics
+                                    .CLUSTER_MANAGER_SERVICE_EVENTS_METRICS_COLLECTOR_EXECUTION_TIME,
+                            "",
+                            System.currentTimeMillis() - mCurrT);
                 }
             } else {
                 generateFinishMetrics(startTime);
             }
             LOG.debug(() -> "Successfully collected ClusterManager Event Metrics.");
         } catch (Exception ex) {
-            PerformanceAnalyzerApp.WRITER_METRICS_AGGREGATOR.updateStat(
-                    WriterMetrics.CLUSTER_MANAGER_METRICS_ERROR, "", 1);
             LOG.debug(
                     "Exception in Collecting ClusterManager Metrics: {} for startTime {} with ExceptionCode: {}",
                     () -> ex.toString(),
                     () -> startTime,
                     () -> StatExceptionCode.CLUSTER_MANAGER_METRICS_ERROR.toString());
+            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
+                    ExceptionsAndErrors.CLUSTER_MANAGER_METRICS_ERROR, "", 1);
         }
     }
 
@@ -235,8 +243,8 @@ Queue<Runnable> getClusterManagerServiceCurrentQueue() throws Exception {
                                         getPrioritizedTPExecutorCurrentField()
                                                 .get(prioritizedOpenSearchThreadPoolExecutor);
                     } else {
-                        PerformanceAnalyzerApp.WRITER_METRICS_AGGREGATOR.updateStat(
-                                WriterMetrics.CLUSTER_MANAGER_NODE_NOT_UP, "", 1);
+                        PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
+                                ExceptionsAndErrors.CLUSTER_MANAGER_NODE_NOT_UP, "", 1);
                     }
                 }
             }

diff --git a/...main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java b/...main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java
@@ -19,6 +19,7 @@
 import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
 import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
 import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
 import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
 
 @SuppressWarnings("unchecked")
@@ -57,6 +58,7 @@ public void collectMetrics(long startTime) {
                 return;
             }
 
+            long mCurrT = System.currentTimeMillis();
             /*
             pendingTasks API returns object of PendingClusterTask which contains insertOrder, priority, source, timeInQueue.
                 Example :
@@ -98,13 +100,17 @@ public void collectMetrics(long startTime) {
                     startTime,
                     PerformanceAnalyzerMetrics.CLUSTER_MANAGER_CURRENT,
                     PerformanceAnalyzerMetrics.CLUSTER_MANAGER_META_DATA);
-        } catch (Exception ex) {
             PerformanceAnalyzerApp.WRITER_METRICS_AGGREGATOR.updateStat(
-                    WriterMetrics.CLUSTER_MANAGER_METRICS_ERROR, "", 1);
+                    WriterMetrics.CLUSTER_MANAGER_SERVICE_METRICS_COLLECTOR_EXECUTION_TIME,
+                    "",
+                    System.currentTimeMillis() - mCurrT);
+        } catch (Exception ex) {
             LOG.debug(
                     "Exception in Collecting ClusterManager Metrics: {} for startTime {}",
                     () -> ex.toString(),
                     () -> startTime);
+            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
+                    ExceptionsAndErrors.CLUSTER_MANAGER_METRICS_ERROR, "", 1);
         }
     }
 

diff --git a/...g/opensearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollector.java b/...g/opensearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollector.java
@@ -85,12 +85,12 @@ public void collectMetrics(long startTime) {
                     System.currentTimeMillis() - mCurrT);
 
         } catch (Exception ex) {
-            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
-                    ExceptionsAndErrors.CLUSTER_MANAGER_THROTTLING_COLLECTOR_ERROR, "", 1);
             LOG.debug(
                     "Exception in Collecting ClusterManager Throttling Metrics: {} for startTime {}",
                     () -> ex.toString(),
                     () -> startTime);
+            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
+                    ExceptionsAndErrors.CLUSTER_MANAGER_THROTTLING_COLLECTOR_ERROR, "", 1);
         }
     }
 

diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ElectionTermCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ElectionTermCollector.java
@@ -80,14 +80,12 @@ public void collectMetrics(long startTime) {
                     System.currentTimeMillis() - mCurrT);
 
         } catch (Exception ex) {
-            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
-                    ExceptionsAndErrors.ELECTION_TERM_COLLECTOR_ERROR,
-                    "",
-                    System.currentTimeMillis() - mCurrT);
             LOG.debug(
                     "Exception in Collecting Election term Metrics: {} for startTime {}",
                     () -> ex.toString(),
                     () -> startTime);
+            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
+                    ExceptionsAndErrors.ELECTION_TERM_COLLECTOR_ERROR, "", 1);
         }
     }
 

diff --git a/...in/java/org/opensearch/performanceanalyzer/collectors/FaultDetectionMetricsCollector.java b/...in/java/org/opensearch/performanceanalyzer/collectors/FaultDetectionMetricsCollector.java
@@ -123,14 +123,12 @@ public void collectMetrics(long startTime) {
                     "",
                     System.currentTimeMillis() - mCurrT);
         } catch (Exception ex) {
-            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
-                    ExceptionsAndErrors.FAULT_DETECTION_COLLECTOR_ERROR,
-                    "",
-                    System.currentTimeMillis() - mCurrT);
             LOG.debug(
                     "Exception in Collecting FaultDetection Metrics: {} for startTime {}",
                     () -> ex.toString(),
                     () -> startTime);
+            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
+                    ExceptionsAndErrors.FAULT_DETECTION_COLLECTOR_ERROR, "", 1);
         }
     }
 

diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollector.java
@@ -14,13 +14,16 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.performanceanalyzer.OpenSearchResources;
+import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
 import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesHelper;
 import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper;
 import org.opensearch.performanceanalyzer.metrics.AllMetrics.NodeDetailColumns;
 import org.opensearch.performanceanalyzer.metrics.AllMetrics.NodeRole;
 import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
 import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
 import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
 
 public class NodeDetailsCollector extends PerformanceAnalyzerMetricsCollector
         implements MetricsProcessor {
@@ -43,6 +46,8 @@ public void collectMetrics(long startTime) {
             return;
         }
 
+        long mCurrT = System.currentTimeMillis();
+
         StringBuilder value = new StringBuilder();
         value.append(PerformanceAnalyzerMetrics.getJsonCurrentMilliSeconds())
                 .append(PerformanceAnalyzerMetrics.sMetricNewLineDelimitor);
@@ -62,6 +67,8 @@ public void collectMetrics(long startTime) {
             }
         } catch (IOException ioe) {
             LOG.error("Unable to serialize rca config overrides.", ioe);
+            PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
+                    ExceptionsAndErrors.CONFIG_OVERRIDES_SER_FAILED, "", 1);
         }
         value.append(PerformanceAnalyzerMetrics.sMetricNewLineDelimitor);
 
@@ -87,6 +94,10 @@ public void collectMetrics(long startTime) {
                     discoveryNodeIterator.next(), value, localNodeID, clusterManagerNode);
         }
         saveMetricValues(value.toString(), startTime);
+        PerformanceAnalyzerApp.WRITER_METRICS_AGGREGATOR.updateStat(
+                WriterMetrics.NODE_DETAILS_COLLECTOR_EXECUTION_TIME,
+                "",
+                System.currentTimeMillis() - mCurrT);
     }
 
     private void addMetricsToStringBuilder(

diff --git a/...ava/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollector.java b/...ava/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollector.java
@@ -29,6 +29,7 @@
 import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
 import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
 import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
+import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
 import org.opensearch.performanceanalyzer.util.Utils;
 
 /**
@@ -146,6 +147,8 @@ public void collectMetrics(long startTime) {
             return;
         }
 
+        long mCurrT = System.currentTimeMillis();
+
         try {
             populateCurrentShards();
             populatePerShardStats(indicesService);
@@ -173,6 +176,11 @@ public void collectMetrics(long startTime) {
                         new NodeStatsMetricsAllShardsPerCollectionStatus(currentShardStats);
                 populateDiffMetricValue(
                         prevValue, currValue, startTime, shardId.getIndexName(), shardId.id());
+
+                PerformanceAnalyzerApp.WRITER_METRICS_AGGREGATOR.updateStat(
+                        WriterMetrics.NODE_STATS_ALL_SHARDS_METRICS_COLLECTOR_EXECUTION_TIME,
+                        "",
+                        System.currentTimeMillis() - mCurrT);
             }
         } catch (Exception ex) {
             LOG.debug(