Address core changes (#522) (#523)

Signed-off-by: Khushboo Rajput <[email protected]>
(cherry picked from commit 2046483)

Co-authored-by: Khushboo Rajput <[email protected]>

licenses/netty-buffer-4.1.96.Final.jar.sha1

@@ -0,0 +1 @@
+4b80fffbe77485b457bf844289bf1801f61b9e91

licenses/netty-codec-4.1.96.Final.jar.sha1

@@ -0,0 +1 @@
+9cfe430f8b14e7ba86969d8e1126aa0aae4d18f0

licenses/netty-codec-http-4.1.96.Final.jar.sha1

@@ -0,0 +1 @@
+a4d0d95df5026965c454902ef3d6d84b81f89626

licenses/netty-codec-http2-4.1.96.Final.jar.sha1

@@ -0,0 +1 @@
+cc8baf4ff67c1bcc0cde60bc5c2bb9447d92d9e6

licenses/netty-codec-socks-4.1.96.Final.jar.sha1

@@ -0,0 +1 @@
+f53c52dbddaa4a02a51430405792d3f30a89b147

licenses/netty-common-4.1.96.Final.jar.sha1

@@ -0,0 +1 @@
+d10c167623cbc471753f950846df241d1021655c

licenses/netty-handler-4.1.96.Final.jar.sha1

@@ -0,0 +1 @@
+7840d7523d709e02961b647546f9d9dde1699306

licenses/netty-handler-proxy-4.1.96.Final.jar.sha1

@@ -0,0 +1 @@
+dcabd63f4aaec2b4cad7588bfdd4cd2c82287e38

licenses/netty-resolver-4.1.96.Final.jar.sha1

@@ -0,0 +1 @@
+0e51db5568a881e0f9b013b35617c597dc32f130

licenses/netty-transport-4.1.96.Final.jar.sha1

@@ -0,0 +1 @@
+dbd15ca244be28e1a98ed29b9d755edbfa737e02

licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1

@@ -0,0 +1 @@
+daf8578cade63a01525ee9d70371fa78e6e91094

licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1

@@ -1 +1 @@
-679c2774d78459d76b1edf492670dfec2e47e54f
+50c9a65da3acb24e94c6dbb5e2afda2d7dd536ad

src/main/java/org/opensearch/performanceanalyzer/OpenSearchResources.java

@@ -9,9 +9,9 @@
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.indices.breaker.CircuitBreakerService;
 import org.opensearch.env.Environment;
 import org.opensearch.indices.IndicesService;
-import org.opensearch.indices.breaker.CircuitBreakerService;
 import org.opensearch.threadpool.ThreadPool;
 
 public final class OpenSearchResources {

src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java

@@ -19,13 +19,11 @@
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.opensearch.SpecialPermission;
 import org.opensearch.action.ActionRequest;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.support.ActionFilter;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.network.NetworkService;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.IndexScopedSettings;
@@ -34,12 +32,14 @@
 import org.opensearch.common.settings.SettingsFilter;
 import org.opensearch.common.util.PageCacheRecycler;
 import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
+import org.opensearch.core.indices.breaker.CircuitBreakerService;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.discovery.Discovery;
 import org.opensearch.env.Environment;
 import org.opensearch.env.NodeEnvironment;
 import org.opensearch.index.IndexModule;
-import org.opensearch.indices.breaker.CircuitBreakerService;
 import org.opensearch.performanceanalyzer.action.PerformanceAnalyzerActionFilter;
 import org.opensearch.performanceanalyzer.collectors.AdmissionControlMetricsCollector;
 import org.opensearch.performanceanalyzer.collectors.CacheConfigMetricsCollector;

src/main/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionFilter.java

@@ -9,14 +9,14 @@
 import java.util.concurrent.atomic.AtomicLong;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.ActionRequest;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.bulk.BulkRequest;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.support.ActionFilter;
 import org.opensearch.action.support.ActionFilterChain;
 import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics;
 import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController;
 import org.opensearch.tasks.Task;

src/main/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListener.java

@@ -7,9 +7,9 @@
 
 
 import org.opensearch.OpenSearchException;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.bulk.BulkResponse;
 import org.opensearch.action.search.SearchResponse;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.HttpDimension;
 import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.HttpMetric;
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsProcessor;

src/main/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollector.java

@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.indices.breaker.CircuitBreakerStats;
+import org.opensearch.core.indices.breaker.CircuitBreakerStats;
 import org.opensearch.performanceanalyzer.OpenSearchResources;
 import org.opensearch.performanceanalyzer.commons.collectors.MetricStatus;
 import org.opensearch.performanceanalyzer.commons.collectors.PerformanceAnalyzerMetricsCollector;

src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsAllShardsMetricsCollector.java

@@ -19,8 +19,8 @@
 import org.opensearch.action.admin.indices.stats.CommonStatsFlags;
 import org.opensearch.action.admin.indices.stats.IndexShardStats;
 import org.opensearch.action.admin.indices.stats.ShardStats;
+import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.index.shard.IndexShard;
-import org.opensearch.index.shard.ShardId;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.indices.NodeIndicesStats;
 import org.opensearch.performanceanalyzer.OpenSearchResources;

src/main/java/org/opensearch/performanceanalyzer/collectors/NodeStatsFixedShardsMetricsCollector.java

@@ -19,8 +19,8 @@
 import org.opensearch.action.admin.indices.stats.CommonStatsFlags;
 import org.opensearch.action.admin.indices.stats.IndexShardStats;
 import org.opensearch.action.admin.indices.stats.ShardStats;
+import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.index.shard.IndexShard;
-import org.opensearch.index.shard.ShardId;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.indices.NodeIndicesStats;
 import org.opensearch.performanceanalyzer.OpenSearchResources;

src/main/java/org/opensearch/performanceanalyzer/config/setting/ClusterSettingsManager.java

@@ -14,7 +14,6 @@
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
 import org.opensearch.action.admin.cluster.state.ClusterStateRequest;
 import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
@@ -23,6 +22,7 @@
 import org.opensearch.cluster.ClusterStateListener;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.performanceanalyzer.OpenSearchResources;
 import org.opensearch.performanceanalyzer.commons.collectors.StatsCollector;
 

src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java

@@ -17,6 +17,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.performanceanalyzer.commons.config.PluginSettings;
 import org.opensearch.performanceanalyzer.config.setting.handler.NodeStatsSettingHandler;
@@ -25,7 +26,6 @@
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestController;
 import org.opensearch.rest.RestRequest;
-import org.opensearch.rest.RestStatus;
 
 /**
  * Rest request handler for handling cluster-wide enabling and disabling of performance analyzer

src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java

@@ -16,14 +16,14 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.xcontent.XContentHelper;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.performanceanalyzer.commons.config.PluginSettings;
 import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestController;
 import org.opensearch.rest.RestRequest;
-import org.opensearch.rest.RestStatus;
 
 @SuppressWarnings("deprecation")
 public class PerformanceAnalyzerConfigAction extends BaseRestHandler {

src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigAction.java

@@ -17,6 +17,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.performanceanalyzer.commons.config.overrides.ConfigOverrides;
 import org.opensearch.performanceanalyzer.commons.config.overrides.ConfigOverridesHelper;
@@ -26,7 +27,6 @@
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestController;
 import org.opensearch.rest.RestRequest;
-import org.opensearch.rest.RestStatus;
 
 /** Rest request handler for handling config overrides for various performance analyzer features. */
 public class PerformanceAnalyzerOverridesClusterConfigAction extends BaseRestHandler {

src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerResourceProvider.java

@@ -30,14 +30,14 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.performanceanalyzer.commons.config.PluginSettings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestController;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.RestRequest.Method;
 import org.opensearch.rest.RestResponse;
-import org.opensearch.rest.RestStatus;
 
 public class PerformanceAnalyzerResourceProvider extends BaseRestHandler {
     private static final Logger LOG =

src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/TransportWhoAmIAction.java

@@ -6,10 +6,10 @@
 package org.opensearch.performanceanalyzer.http_action.whoami;
 
 
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.common.inject.Inject;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.performanceanalyzer.OpenSearchResources;
 import org.opensearch.tasks.Task;

src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIAction.java

@@ -7,7 +7,7 @@
 
 
 import org.opensearch.action.ActionType;
-import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.io.stream.Writeable;
 
 public class WhoAmIAction extends ActionType<WhoAmIResponse> {
 

src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIRequest.java

@@ -7,7 +7,7 @@
 
 
 import org.opensearch.action.support.nodes.BaseNodesRequest;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 public class WhoAmIRequest extends BaseNodesRequest<WhoAmIRequest> {
 

src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIResponse.java

@@ -7,8 +7,8 @@
 
 
 import java.io.IOException;
-import org.opensearch.action.ActionResponse;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 

src/main/java/org/opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportChannel.java

@@ -10,13 +10,13 @@
 import java.util.concurrent.atomic.AtomicLong;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.opensearch.core.transport.TransportResponse;
 import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.ShardBulkDimension;
 import org.opensearch.performanceanalyzer.commons.metrics.AllMetrics.ShardBulkMetric;
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsProcessor;
 import org.opensearch.performanceanalyzer.commons.metrics.PerformanceAnalyzerMetrics;
 import org.opensearch.performanceanalyzer.commons.util.ThreadIDUtil;
 import org.opensearch.transport.TransportChannel;
-import org.opensearch.transport.TransportResponse;
 
 public class PerformanceAnalyzerTransportChannel implements TransportChannel, MetricsProcessor {
     private static final Logger LOG =

src/main/java/org/opensearch/performanceanalyzer/util/Utils.java

@@ -13,10 +13,10 @@
 import org.opensearch.action.admin.indices.stats.CommonStatsFlags;
 import org.opensearch.action.admin.indices.stats.IndexShardStats;
 import org.opensearch.action.admin.indices.stats.ShardStats;
+import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.index.IndexService;
 import org.opensearch.index.shard.IndexShard;
 import org.opensearch.index.shard.IndexShardState;
-import org.opensearch.index.shard.ShardId;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.performanceanalyzer.OpenSearchResources;
 import org.opensearch.performanceanalyzer.collectors.*;

src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPluginTests.java

@@ -20,18 +20,18 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.opensearch.action.ActionRequest;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.support.ActionFilter;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.indices.breaker.CircuitBreakerService;
 import org.opensearch.env.Environment;
 import org.opensearch.env.TestEnvironment;
 import org.opensearch.identity.IdentityService;
 import org.opensearch.indices.breaker.BreakerSettings;
-import org.opensearch.indices.breaker.CircuitBreakerService;
 import org.opensearch.indices.breaker.HierarchyCircuitBreakerService;
 import org.opensearch.performanceanalyzer.action.PerformanceAnalyzerActionFilter;
 import org.opensearch.performanceanalyzer.config.setting.PerformanceAnalyzerClusterSettings;

src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionFilterTests.java

@@ -15,12 +15,12 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.ActionRequest;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.bulk.BulkRequest;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.support.ActionFilterChain;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.core.action.ActionResponse;
 import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController;
 import org.opensearch.tasks.Task;
 

src/test/java/org/opensearch/performanceanalyzer/action/PerformanceAnalyzerActionListenerTests.java

@@ -14,15 +14,15 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.opensearch.OpenSearchException;
-import org.opensearch.action.ActionListener;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.bulk.BulkResponse;
 import org.opensearch.action.search.SearchResponse;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.rest.RestStatus;
 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.util.TestUtil;
-import org.opensearch.rest.RestStatus;
 
 @SuppressWarnings("unchecked")
 public class PerformanceAnalyzerActionListenerTests {

src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java

@@ -14,7 +14,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.opensearch.common.breaker.CircuitBreaker;
+import org.opensearch.core.common.breaker.CircuitBreaker;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.performanceanalyzer.OpenSearchResources;
 import org.opensearch.performanceanalyzer.commons.config.PluginSettings;