WriterMetrics and config classes removal (#373)

* Replace majority of dependencies. Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com> * Config folder removal and dependency redirection. Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com> * Version dependency from commons. Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com> * WriterMetrics removal and dependency redirection. Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com> * Update with new commons dependency. Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com> --------- Signed-off-by: Filip Drobnjakovic <drobnjakovicfilip@gmail.com> (cherry picked from commit 9d100f9)
opensearch-project · May 30, 2023 · 09db6f1 · 09db6f1
1 parent 669346d
commit 09db6f1
Show file tree

Hide file tree

Showing 44 changed files with 45 additions and 689 deletions.
diff --git a/build.gradle b/build.gradle
@@ -346,11 +346,11 @@ dependencies {
     implementation 'org.checkerframework:checker-qual:3.29.0'
     implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
     implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
+    implementation "org.opensearch:performance-analyzer-commons:1.0.0-SNAPSHOT"
     implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4jVersion}"
     implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}"
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
     implementation group: 'commons-io', name: 'commons-io', version: '2.7'
-    implementation group: 'org.opensearch', name: 'performanceanalyzer-commons', version: "${version}"
     implementation group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.9.0'
     implementation group: 'com.google.protobuf', name: 'protobuf-java', version: "${protobufVersion}"
     implementation 'io.grpc:grpc-netty:1.52.1'

diff --git a/src/main/java/org/opensearch/performanceanalyzer/CertificateUtils.java b/src/main/java/org/opensearch/performanceanalyzer/CertificateUtils.java
@@ -23,7 +23,7 @@
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.openssl.PEMParser;
-import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.commons.config.PluginSettings;
 
 public class CertificateUtils {
 

diff --git a/src/main/java/org/opensearch/performanceanalyzer/ConfigStatus.java b/src/main/java/org/opensearch/performanceanalyzer/ConfigStatus.java
diff --git a/src/main/java/org/opensearch/performanceanalyzer/OSMetricsGeneratorFactory.java b/src/main/java/org/opensearch/performanceanalyzer/OSMetricsGeneratorFactory.java
@@ -6,6 +6,7 @@
 package org.opensearch.performanceanalyzer;
 
 
+import org.opensearch.performanceanalyzer.commons.config.ConfigStatus;
 import org.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
 import org.opensearch.performanceanalyzer.metrics_generator.linux.LinuxOSMetricsGenerator;
 

diff --git a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerApp.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerApp.java
@@ -23,15 +23,16 @@
 import org.opensearch.performanceanalyzer.collectors.*;
 import org.opensearch.performanceanalyzer.commons.collectors.StatExceptionCode;
 import org.opensearch.performanceanalyzer.commons.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.commons.config.ConfigStatus;
+import org.opensearch.performanceanalyzer.commons.config.PluginSettings;
 import org.opensearch.performanceanalyzer.commons.metrics.ExceptionsAndErrors;
 import org.opensearch.performanceanalyzer.commons.metrics.MeasurementSet;
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration;
 import org.opensearch.performanceanalyzer.commons.stats.CommonStats;
 import org.opensearch.performanceanalyzer.commons.stats.IListener;
 import org.opensearch.performanceanalyzer.commons.stats.SampleAggregator;
-import org.opensearch.performanceanalyzer.config.PluginSettings;
+import org.opensearch.performanceanalyzer.commons.util.Util;
 import org.opensearch.performanceanalyzer.config.TroubleshootingConfig;
-import org.opensearch.performanceanalyzer.core.Util;
 import org.opensearch.performanceanalyzer.jvm.GCMetrics;
 import org.opensearch.performanceanalyzer.jvm.HeapMetrics;
 import org.opensearch.performanceanalyzer.jvm.ThreadList;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/DisksCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/DisksCollector.java
@@ -13,10 +13,10 @@
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration;
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsProcessor;
 import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.commons.metrics.WriterMetrics;
 import org.opensearch.performanceanalyzer.commons.stats.CommonStats;
 import org.opensearch.performanceanalyzer.metrics_generator.DiskMetricsGenerator;
 import org.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
-import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
 
 public class DisksCollector extends PerformanceAnalyzerMetricsCollector
         implements MetricsProcessor {

diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/GCInfoCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/GCInfoCollector.java
@@ -14,9 +14,9 @@
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration;
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsProcessor;
 import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.commons.metrics.WriterMetrics;
 import org.opensearch.performanceanalyzer.commons.stats.CommonStats;
 import org.opensearch.performanceanalyzer.jvm.GarbageCollectorInfo;
-import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
 
 /**
  * A collector that collects info about the current garbage collectors for various regions in the

diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/HeapMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/HeapMetricsCollector.java
@@ -20,10 +20,10 @@
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration;
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsProcessor;
 import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.commons.metrics.WriterMetrics;
 import org.opensearch.performanceanalyzer.commons.stats.CommonStats;
 import org.opensearch.performanceanalyzer.jvm.GCMetrics;
 import org.opensearch.performanceanalyzer.jvm.HeapMetrics;
-import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
 
 public class HeapMetricsCollector extends PerformanceAnalyzerMetricsCollector
         implements MetricsProcessor {

diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/NetworkInterfaceCollector.java
@@ -15,10 +15,10 @@
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration;
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsProcessor;
 import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.commons.metrics.WriterMetrics;
 import org.opensearch.performanceanalyzer.commons.stats.CommonStats;
 import org.opensearch.performanceanalyzer.metrics_generator.IPMetricsGenerator;
 import org.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
-import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
 
 public class NetworkInterfaceCollector extends PerformanceAnalyzerMetricsCollector
         implements MetricsProcessor {

diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/OSMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/OSMetricsCollector.java
@@ -13,13 +13,13 @@
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration;
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsProcessor;
 import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics;
+import org.opensearch.performanceanalyzer.commons.metrics.WriterMetrics;
 import org.opensearch.performanceanalyzer.commons.stats.CommonStats;
 import org.opensearch.performanceanalyzer.jvm.ThreadList;
 import org.opensearch.performanceanalyzer.metrics_generator.CPUPagingActivityGenerator;
 import org.opensearch.performanceanalyzer.metrics_generator.DiskIOMetricsGenerator;
 import org.opensearch.performanceanalyzer.metrics_generator.OSMetricsGenerator;
 import org.opensearch.performanceanalyzer.metrics_generator.SchedMetricsGenerator;
-import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
 
 public class OSMetricsCollector extends PerformanceAnalyzerMetricsCollector
         implements MetricsProcessor {

diff --git a/...java/org/opensearch/performanceanalyzer/collectors/ScheduledMetricCollectorsExecutor.java b/...java/org/opensearch/performanceanalyzer/collectors/ScheduledMetricCollectorsExecutor.java
@@ -17,8 +17,8 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.performanceanalyzer.commons.collectors.PerformanceAnalyzerMetricsCollector;
 import org.opensearch.performanceanalyzer.commons.collectors.StatsCollector;
+import org.opensearch.performanceanalyzer.commons.metrics.WriterMetrics;
 import org.opensearch.performanceanalyzer.commons.stats.CommonStats;
-import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;
 
 public class ScheduledMetricCollectorsExecutor extends Thread {
     private static final Logger LOG = LogManager.getLogger(ScheduledMetricCollectorsExecutor.class);

diff --git a/src/main/java/org/opensearch/performanceanalyzer/config/ConfigFatalException.java b/src/main/java/org/opensearch/performanceanalyzer/config/ConfigFatalException.java
diff --git a/src/main/java/org/opensearch/performanceanalyzer/config/ConfigFileException.java b/src/main/java/org/opensearch/performanceanalyzer/config/ConfigFileException.java