diff --git a/build.gradle b/build.gradle index d13928d7..29a7ac05 100644 --- a/build.gradle +++ b/build.gradle @@ -294,7 +294,7 @@ dependencies { implementation 'org.bouncycastle:bcprov-jdk15on:1.70' implementation 'org.bouncycastle:bcpkix-jdk15on:1.70' implementation "org.opensearch:performanceanalyzer-rca:${version}" - implementation "org.opensearch:performanceanalyzer-commons:${version}" + implementation "org.opensearch:performance-analyzer-commons:1.0.0-SNAPSHOT" implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}" implementation "com.fasterxml.jackson.module:jackson-module-paranamer:${jacksonVersion}" diff --git a/licenses/performanceanalyzer-commons-LICENSE.txt b/licenses/performance-analyzer-commons-LICENSE.txt similarity index 100% rename from licenses/performanceanalyzer-commons-LICENSE.txt rename to licenses/performance-analyzer-commons-LICENSE.txt diff --git a/licenses/performanceanalyzer-commons-NOTICE.txt b/licenses/performance-analyzer-commons-NOTICE.txt similarity index 100% rename from licenses/performanceanalyzer-commons-NOTICE.txt rename to licenses/performance-analyzer-commons-NOTICE.txt diff --git a/licenses/performanceanalyzer-rca-3.0.0.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-3.0.0.0-SNAPSHOT.jar.sha1 index c02c8181..fc7475a1 100644 --- a/licenses/performanceanalyzer-rca-3.0.0.0-SNAPSHOT.jar.sha1 +++ b/licenses/performanceanalyzer-rca-3.0.0.0-SNAPSHOT.jar.sha1 @@ -1 +1 @@ -d21b82df3d449849330ddeaed77c381827a82a3e \ No newline at end of file +e0fec4269e7851599e1d0b77e4f42edc6154b46b \ No newline at end of file diff --git a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java index 9af2259a..9858158f 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java +++ b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java @@ -68,11 +68,11 @@ import org.opensearch.performanceanalyzer.collectors.ShardStateCollector; import org.opensearch.performanceanalyzer.collectors.ThreadPoolMetricsCollector; import org.opensearch.performanceanalyzer.commons.collectors.StatsCollector; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.EventLog; import org.opensearch.performanceanalyzer.commons.event_process.EventLogFileHandler; import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; import org.opensearch.performanceanalyzer.config.setting.ClusterSettingsManager; import org.opensearch.performanceanalyzer.config.setting.PerformanceAnalyzerClusterSettings; diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/AdmissionControlMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/AdmissionControlMetricsCollector.java index 065f026d..71f4b74f 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/AdmissionControlMetricsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/AdmissionControlMetricsCollector.java @@ -17,8 +17,8 @@ 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.rca.framework.metrics.WriterMetrics; /** AdmissionControlMetricsCollector collects `UsedQuota`, `TotalQuota`, RejectionCount */ public class AdmissionControlMetricsCollector extends PerformanceAnalyzerMetricsCollector diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/CacheConfigMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/CacheConfigMetricsCollector.java index 1f1b8738..c8bffd42 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/CacheConfigMetricsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/CacheConfigMetricsCollector.java @@ -24,8 +24,8 @@ 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.rca.framework.metrics.WriterMetrics; /* * Unlike Cache Hit, Miss, Eviction Count and Size, which is tracked on a per shard basis, diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollector.java index d7e715ca..7ca9ff24 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollector.java @@ -18,8 +18,8 @@ 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.rca.framework.metrics.WriterMetrics; public class CircuitBreakerCollector extends PerformanceAnalyzerMetricsCollector implements MetricsProcessor { diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterApplierServiceStatsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterApplierServiceStatsCollector.java index 6243d646..881ce3fc 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterApplierServiceStatsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterApplierServiceStatsCollector.java @@ -24,10 +24,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.config.PerformanceAnalyzerController; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; -import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics; public class ClusterApplierServiceStatsCollector extends PerformanceAnalyzerMetricsCollector implements MetricsProcessor { diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java index 1ea16155..030e5844 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java @@ -28,9 +28,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.metrics.ThreadIDUtil; -import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics; @SuppressWarnings("unchecked") public class ClusterManagerServiceEventMetrics extends PerformanceAnalyzerMetricsCollector diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java index f0d9bd30..7da5e74b 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java @@ -20,8 +20,8 @@ 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.rca.framework.metrics.WriterMetrics; @SuppressWarnings("unchecked") public class ClusterManagerServiceMetrics extends PerformanceAnalyzerMetricsCollector diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollector.java index 7fe80e47..2d7a486d 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerThrottlingMetricsCollector.java @@ -18,10 +18,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.config.PerformanceAnalyzerController; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; -import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics; public class ClusterManagerThrottlingMetricsCollector extends PerformanceAnalyzerMetricsCollector implements MetricsProcessor { diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ElectionTermCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ElectionTermCollector.java index 2b607072..e014cebf 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ElectionTermCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ElectionTermCollector.java @@ -16,10 +16,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.config.PerformanceAnalyzerController; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; -import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics; /** * This class starts publishing election term metric. These metric is emitted from cluster state. diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/FaultDetectionMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/FaultDetectionMetricsCollector.java index c07047e3..26b47f9d 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/FaultDetectionMetricsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/FaultDetectionMetricsCollector.java @@ -21,10 +21,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.config.PerformanceAnalyzerController; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; -import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics; public class FaultDetectionMetricsCollector extends PerformanceAnalyzerMetricsCollector implements MetricsProcessor { diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollector.java index 389439ba..5ab176f6 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollector.java @@ -21,10 +21,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.config.overrides.ConfigOverridesHelper; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; -import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics; public class NodeDetailsCollector extends PerformanceAnalyzerMetricsCollector implements MetricsProcessor { diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollector.java index ed8fe634..ae98d984 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollector.java @@ -29,9 +29,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.config.PerformanceAnalyzerController; -import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics; import org.opensearch.performanceanalyzer.util.Utils; /** diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollector.java index acb776a8..ec470aba 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollector.java @@ -29,9 +29,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.config.PerformanceAnalyzerController; -import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics; import org.opensearch.performanceanalyzer.util.Utils; /** diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ShardIndexingPressureMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ShardIndexingPressureMetricsCollector.java index d5a7fe4b..03441024 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ShardIndexingPressureMetricsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ShardIndexingPressureMetricsCollector.java @@ -26,10 +26,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.config.PerformanceAnalyzerController; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; -import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics; public class ShardIndexingPressureMetricsCollector extends PerformanceAnalyzerMetricsCollector implements MetricsProcessor { diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ShardStateCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ShardStateCollector.java index 4139f365..a202aa9b 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ShardStateCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ShardStateCollector.java @@ -25,10 +25,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.config.PerformanceAnalyzerController; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; -import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics; public class ShardStateCollector extends PerformanceAnalyzerMetricsCollector implements MetricsProcessor { diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ThreadPoolMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ThreadPoolMetricsCollector.java index 5713f344..72355492 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ThreadPoolMetricsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ThreadPoolMetricsCollector.java @@ -25,8 +25,8 @@ 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.rca.framework.metrics.WriterMetrics; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPoolStats.Stats; diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java index 0688f514..535e4a8c 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java @@ -18,7 +18,7 @@ import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentType; import org.opensearch.core.xcontent.XContentBuilder; -import org.opensearch.performanceanalyzer.config.PluginSettings; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.config.setting.handler.NodeStatsSettingHandler; import org.opensearch.performanceanalyzer.config.setting.handler.PerformanceAnalyzerClusterSettingHandler; import org.opensearch.rest.BaseRestHandler; diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java index a2dac15d..493cd1ca 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java @@ -17,8 +17,8 @@ import org.opensearch.common.inject.Inject; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.core.xcontent.XContentBuilder; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestController; diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProvider.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProvider.java index 5c33836f..7098120f 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProvider.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProvider.java @@ -30,7 +30,7 @@ import org.opensearch.client.node.NodeClient; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; -import org.opensearch.performanceanalyzer.config.PluginSettings; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestController; diff --git a/src/main/java/org/opensearch/performanceanalyzer/writer/EventLogQueueProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/writer/EventLogQueueProcessor.java index 1d68eda5..703a01c7 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/writer/EventLogQueueProcessor.java +++ b/src/main/java/org/opensearch/performanceanalyzer/writer/EventLogQueueProcessor.java @@ -19,6 +19,7 @@ import java.util.stream.LongStream; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.Event; import org.opensearch.performanceanalyzer.commons.event_process.EventLogFileHandler; import org.opensearch.performanceanalyzer.commons.metrics.ExceptionsAndErrors; @@ -26,7 +27,6 @@ import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; import org.opensearch.performanceanalyzer.commons.stats.CommonStats; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.http_action.config.PerformanceAnalyzerConfigAction; public class EventLogQueueProcessor { diff --git a/src/test/java/org/opensearch/performanceanalyzer/CustomMetricsLocationTestBase.java b/src/test/java/org/opensearch/performanceanalyzer/CustomMetricsLocationTestBase.java index 6ce065e4..d14d7931 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/CustomMetricsLocationTestBase.java +++ b/src/test/java/org/opensearch/performanceanalyzer/CustomMetricsLocationTestBase.java @@ -11,7 +11,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import org.junit.Before; -import org.opensearch.performanceanalyzer.config.PluginSettings; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; public class CustomMetricsLocationTestBase { diff --git a/src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListenerTests.java b/src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListenerTests.java index 38407f9a..b122e63b 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListenerTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListenerTests.java @@ -18,9 +18,9 @@ import org.opensearch.action.ActionResponse; import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.search.SearchResponse; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.Event; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.util.TestUtil; import org.opensearch.rest.RestStatus; diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/CacheConfigMetricsCollectorTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/CacheConfigMetricsCollectorTests.java index 055c4e14..94fcffb1 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/collectors/CacheConfigMetricsCollectorTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/CacheConfigMetricsCollectorTests.java @@ -16,11 +16,11 @@ import org.junit.Test; import org.opensearch.indices.IndicesService; import org.opensearch.performanceanalyzer.OpenSearchResources; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.Event; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.CacheType; import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.util.TestUtil; import org.opensearch.test.OpenSearchSingleNodeTestCase; diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java index b7636143..0adee06c 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java @@ -17,10 +17,10 @@ import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.indices.IndicesService; import org.opensearch.performanceanalyzer.OpenSearchResources; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.Event; import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.util.TestUtil; import org.opensearch.test.OpenSearchSingleNodeTestCase; diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetricsTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetricsTests.java index 385ef84d..59167702 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetricsTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetricsTests.java @@ -20,11 +20,11 @@ import org.opensearch.common.Priority; import org.opensearch.common.util.concurrent.PrioritizedOpenSearchThreadPoolExecutor; import org.opensearch.performanceanalyzer.OpenSearchResources; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.Event; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics; import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.util.TestUtil; import org.opensearch.performanceanalyzer.util.Utils; import org.opensearch.test.ClusterServiceUtils; diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetricsTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetricsTests.java index 02dfd1fd..7199e808 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetricsTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetricsTests.java @@ -16,11 +16,11 @@ import org.mockito.Mock; import org.opensearch.cluster.service.ClusterService; import org.opensearch.performanceanalyzer.OpenSearchResources; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.Event; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.ClusterManagerPendingValue; import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.util.TestUtil; import org.opensearch.test.ClusterServiceUtils; import org.opensearch.threadpool.TestThreadPool; diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/ElectionTermCollectorTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/ElectionTermCollectorTests.java index e6bb859c..4b04907e 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/collectors/ElectionTermCollectorTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/ElectionTermCollectorTests.java @@ -19,12 +19,12 @@ import org.mockito.Mockito; import org.opensearch.cluster.service.ClusterService; import org.opensearch.performanceanalyzer.OpenSearchResources; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.Event; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.ElectionTermValue; import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; import org.opensearch.performanceanalyzer.util.TestUtil; import org.opensearch.test.ClusterServiceUtils; diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollectorTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollectorTests.java index 434ffe83..66cdcfcd 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollectorTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/NodeDetailsCollectorTests.java @@ -21,11 +21,11 @@ import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.cluster.service.ClusterService; import org.opensearch.performanceanalyzer.OpenSearchResources; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.Event; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.NodeRole; import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; import org.opensearch.performanceanalyzer.util.TestUtil; import org.opensearch.test.ClusterServiceUtils; diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollectorTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollectorTests.java index 8eab12e6..9e09893a 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollectorTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollectorTests.java @@ -16,10 +16,10 @@ import org.junit.Test; import org.opensearch.indices.IndicesService; import org.opensearch.performanceanalyzer.OpenSearchResources; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.Event; import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.util.TestUtil; import org.opensearch.test.OpenSearchSingleNodeTestCase; diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollectorTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollectorTests.java index b0638497..a5dbfb49 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollectorTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollectorTests.java @@ -15,12 +15,12 @@ import org.mockito.Mockito; import org.opensearch.indices.IndicesService; import org.opensearch.performanceanalyzer.OpenSearchResources; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.Event; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.ShardStatsValue; import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.util.TestUtil; import org.opensearch.test.OpenSearchSingleNodeTestCase; diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/ShardStateCollectorTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/ShardStateCollectorTests.java index 01d8f2d5..b0de47e3 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/collectors/ShardStateCollectorTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/ShardStateCollectorTests.java @@ -31,11 +31,11 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.performanceanalyzer.OpenSearchResources; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.event_process.Event; import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; import org.opensearch.performanceanalyzer.util.TestUtil; diff --git a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProviderTests.java b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProviderTests.java index bfede227..dc419329 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProviderTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProviderTests.java @@ -20,7 +20,7 @@ import org.mockito.Mockito; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.Settings; -import org.opensearch.performanceanalyzer.config.PluginSettings; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.rest.RestController; import org.opensearch.rest.RestRequest; import org.powermock.api.mockito.PowerMockito; diff --git a/src/test/java/org/opensearch/performanceanalyzer/hwnet/CollectMetricsTests.java b/src/test/java/org/opensearch/performanceanalyzer/hwnet/CollectMetricsTests.java index 54489313..6a67ec1e 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/hwnet/CollectMetricsTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/hwnet/CollectMetricsTests.java @@ -46,6 +46,7 @@ import org.opensearch.performanceanalyzer.collectors.NetworkE2ECollector; import org.opensearch.performanceanalyzer.collectors.NetworkInterfaceCollector; import org.opensearch.performanceanalyzer.collectors.NodeDetailsCollector; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.CircuitBreakerDimension; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.CircuitBreakerValue; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.IPDimension; @@ -55,7 +56,6 @@ import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.TCPValue; import org.opensearch.performanceanalyzer.commons.metrics.MetricsProcessor; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; import org.opensearch.performanceanalyzer.metrics_generator.IPMetricsGenerator; import org.opensearch.performanceanalyzer.metrics_generator.TCPMetricsGenerator; diff --git a/src/test/java/org/opensearch/performanceanalyzer/listener/PerformanceAnalyzerSearchListenerTests.java b/src/test/java/org/opensearch/performanceanalyzer/listener/PerformanceAnalyzerSearchListenerTests.java index ad17c718..7e5255f0 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/listener/PerformanceAnalyzerSearchListenerTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/listener/PerformanceAnalyzerSearchListenerTests.java @@ -22,11 +22,11 @@ import org.opensearch.index.shard.ShardId; import org.opensearch.performanceanalyzer.commons.collectors.StatExceptionCode; import org.opensearch.performanceanalyzer.commons.collectors.StatsCollector; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics; import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; -import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.jvm.ThreadList; import org.opensearch.performanceanalyzer.util.TestUtil; import org.opensearch.performanceanalyzer.util.Utils; diff --git a/src/test/java/org/opensearch/performanceanalyzer/listener/SearchListenerTests.java b/src/test/java/org/opensearch/performanceanalyzer/listener/SearchListenerTests.java index 348c6900..c7d64303 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/listener/SearchListenerTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/listener/SearchListenerTests.java @@ -12,9 +12,9 @@ import org.junit.Test; import org.mockito.Mock; import org.opensearch.performanceanalyzer.CustomMetricsLocationTestBase; +import org.opensearch.performanceanalyzer.commons.config.PluginSettings; import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; -import org.opensearch.performanceanalyzer.config.PluginSettings; @Ignore public class SearchListenerTests extends CustomMetricsLocationTestBase {