From 5a516d9b6d564da0a1a51571a1fe33817a87fd41 Mon Sep 17 00:00:00 2001
From: Chenyang Ji <cyji@amazon.com>
Date: Tue, 2 Jan 2024 14:18:07 -0800
Subject: [PATCH] rename SearchRequestListenerManager to
 SearchRequestOperationsListeners

---
 .idea/runConfigurations/Debug_OpenSearch.xml  |  6 ++-
 ... => SearchRequestOperationsListeners.java} | 13 +++---
 .../action/search/SearchRequestStats.java     |  8 ++--
 .../action/search/TransportSearchAction.java  | 12 +++--
 .../main/java/org/opensearch/node/Node.java   | 10 ++---
 .../cluster/node/stats/NodeStatsTests.java    |  9 +---
 .../AbstractSearchAsyncActionTests.java       | 25 +++--------
 ...earchRequestOperationsListenersTests.java} | 44 +++++++++----------
 .../search/SearchRequestSlowLogTests.java     |  2 +-
 .../search/SearchRequestStatsTests.java       | 41 +++++------------
 .../index/search/stats/SearchStatsTests.java  |  9 +---
 .../indices/NodeIndicesStatsTests.java        |  9 +---
 .../snapshots/SnapshotResiliencyTests.java    |  6 +--
 13 files changed, 72 insertions(+), 122 deletions(-)
 rename server/src/main/java/org/opensearch/action/search/{SearchRequestListenerManager.java => SearchRequestOperationsListeners.java} (84%)
 rename server/src/test/java/org/opensearch/action/search/{SearchRequestListenerManagerTests.java => SearchRequestOperationsListenersTests.java} (72%)

diff --git a/.idea/runConfigurations/Debug_OpenSearch.xml b/.idea/runConfigurations/Debug_OpenSearch.xml
index 0d8bf59823acf..c18046f873477 100644
--- a/.idea/runConfigurations/Debug_OpenSearch.xml
+++ b/.idea/runConfigurations/Debug_OpenSearch.xml
@@ -6,6 +6,10 @@
     <option name="HOST" value="localhost" />
     <option name="PORT" value="5005" />
     <option name="AUTO_RESTART" value="true" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="5005" />
+      <option name="LOCAL" value="false" />
+    </RunnerSettings>
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/server/src/main/java/org/opensearch/action/search/SearchRequestListenerManager.java b/server/src/main/java/org/opensearch/action/search/SearchRequestOperationsListeners.java
similarity index 84%
rename from server/src/main/java/org/opensearch/action/search/SearchRequestListenerManager.java
rename to server/src/main/java/org/opensearch/action/search/SearchRequestOperationsListeners.java
index 884a09a60ec49..f20c52b9d97d4 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchRequestListenerManager.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchRequestOperationsListeners.java
@@ -17,33 +17,30 @@
 import java.util.stream.Stream;
 
 /**
- * SearchRequestListenerManager manages listeners registered to search requests,
+ * SearchRequestOperationsListeners contains listeners registered to search requests,
  * and is responsible for creating the {@link SearchRequestOperationsListener.CompositeListener}
  * with the all listeners enabled at cluster-level and request-level.
  *
  *
  * @opensearch.internal
  */
-public class SearchRequestListenerManager {
+public class SearchRequestOperationsListeners {
     private final List<SearchRequestOperationsListener> searchRequestListenersList;
 
     /**
-     * Create the SearchRequestListenerManager and add multiple {@link SearchRequestOperationsListener}
+     * Create the SearchRequestOperationsListeners and add multiple {@link SearchRequestOperationsListener}
      * to the searchRequestListenersList.
      * Those enabled listeners will be executed during each search request.
      *
      * @param listeners Multiple SearchRequestOperationsListener object to add.
-     * @throws IllegalArgumentException if any input listener is null or already exists in the list.
+     * @throws IllegalArgumentException if any input listener is null.
      */
-    public SearchRequestListenerManager(SearchRequestOperationsListener... listeners) {
+    public SearchRequestOperationsListeners(SearchRequestOperationsListener... listeners) {
         searchRequestListenersList = new ArrayList<>();
         for (SearchRequestOperationsListener listener : listeners) {
             if (listener == null) {
                 throw new IllegalArgumentException("listener must not be null");
             }
-            if (searchRequestListenersList.contains(listener)) {
-                throw new IllegalArgumentException("listener already added");
-            }
             searchRequestListenersList.add(listener);
         }
     }
diff --git a/server/src/main/java/org/opensearch/action/search/SearchRequestStats.java b/server/src/main/java/org/opensearch/action/search/SearchRequestStats.java
index 2b01be8149331..88d599a0dcdaa 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchRequestStats.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchRequestStats.java
@@ -8,11 +8,11 @@
 
 package org.opensearch.action.search;
 
-import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.metrics.CounterMetric;
 import org.opensearch.common.metrics.MeanMetric;
+import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 
 import java.util.EnumMap;
@@ -37,9 +37,9 @@ public final class SearchRequestStats extends SearchRequestOperationsListener {
     );
 
     @Inject
-    public SearchRequestStats(ClusterService clusterService) {
-        this.setEnabled(clusterService.getClusterSettings().get(SEARCH_REQUEST_STATS_ENABLED));
-        clusterService.getClusterSettings().addSettingsUpdateConsumer(SEARCH_REQUEST_STATS_ENABLED, this::setEnabled);
+    public SearchRequestStats(ClusterSettings clusterSettings) {
+        this.setEnabled(clusterSettings.get(SEARCH_REQUEST_STATS_ENABLED));
+        clusterSettings.addSettingsUpdateConsumer(SEARCH_REQUEST_STATS_ENABLED, this::setEnabled);
         for (SearchPhaseName searchPhaseName : SearchPhaseName.values()) {
             phaseStatsMap.put(searchPhaseName, new StatsHolder());
         }
diff --git a/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java b/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java
index 2f03d21723b27..ca7853cd78031 100644
--- a/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java
+++ b/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java
@@ -173,7 +173,7 @@ public class TransportSearchAction extends HandledTransportAction<SearchRequest,
     private final NamedWriteableRegistry namedWriteableRegistry;
     private final CircuitBreaker circuitBreaker;
     private final SearchPipelineService searchPipelineService;
-    private final SearchRequestListenerManager searchRequestListenerManager;
+    private final SearchRequestOperationsListeners searchRequestOperationsListeners;
 
     private volatile boolean searchQueryMetricsEnabled;
 
@@ -196,7 +196,7 @@ public TransportSearchAction(
         NamedWriteableRegistry namedWriteableRegistry,
         SearchPipelineService searchPipelineService,
         MetricsRegistry metricsRegistry,
-        SearchRequestListenerManager searchRequestListenerManager
+        SearchRequestOperationsListeners searchRequestOperationsListeners
     ) {
         super(SearchAction.NAME, transportService, actionFilters, (Writeable.Reader<SearchRequest>) SearchRequest::new);
         this.client = client;
@@ -213,7 +213,7 @@ public TransportSearchAction(
         this.searchPipelineService = searchPipelineService;
         this.metricsRegistry = metricsRegistry;
         this.searchQueryMetricsEnabled = clusterService.getClusterSettings().get(SEARCH_QUERY_METRICS_ENABLED_SETTING);
-        this.searchRequestListenerManager = searchRequestListenerManager;
+        this.searchRequestOperationsListeners = searchRequestOperationsListeners;
         clusterService.getClusterSettings()
             .addSettingsUpdateConsumer(SEARCH_QUERY_METRICS_ENABLED_SETTING, this::setSearchQueryMetricsEnabled);
     }
@@ -480,10 +480,8 @@ private void executeRequest(
             System::nanoTime
         );
         timeProvider.setEnabled(clusterService.getClusterSettings().get(SEARCH_PHASE_TOOK_ENABLED), originalSearchRequest);
-        SearchRequestOperationsListener.CompositeListener requestOperationsListeners = searchRequestListenerManager.buildCompositeListener(
-            logger,
-            timeProvider
-        );
+        SearchRequestOperationsListener.CompositeListener requestOperationsListeners = searchRequestOperationsListeners
+            .buildCompositeListener(logger, timeProvider);
         SearchRequestContext searchRequestContext = new SearchRequestContext(requestOperationsListeners);
         searchRequestContext.getSearchRequestOperationsListener().onRequestStart(searchRequestContext);
 
diff --git a/server/src/main/java/org/opensearch/node/Node.java b/server/src/main/java/org/opensearch/node/Node.java
index aadac4324211d..0a08885006809 100644
--- a/server/src/main/java/org/opensearch/node/Node.java
+++ b/server/src/main/java/org/opensearch/node/Node.java
@@ -46,8 +46,8 @@
 import org.opensearch.action.admin.cluster.snapshots.status.TransportNodesSnapshotsStatus;
 import org.opensearch.action.search.SearchExecutionStatsCollector;
 import org.opensearch.action.search.SearchPhaseController;
-import org.opensearch.action.search.SearchRequestListenerManager;
 import org.opensearch.action.search.SearchRequestOperationsListener;
+import org.opensearch.action.search.SearchRequestOperationsListeners;
 import org.opensearch.action.search.SearchRequestSlowLog;
 import org.opensearch.action.search.SearchRequestStats;
 import org.opensearch.action.search.SearchTransportService;
@@ -785,7 +785,7 @@ protected Node(
                 threadPool
             );
 
-            final SearchRequestStats searchRequestStats = new SearchRequestStats(clusterService);
+            final SearchRequestStats searchRequestStats = new SearchRequestStats(clusterService.getClusterSettings());
             final SearchRequestSlowLog searchRequestSlowLog = new SearchRequestSlowLog(clusterService);
 
             remoteStoreStatsTrackerFactory = new RemoteStoreStatsTrackerFactory(clusterService, settings);
@@ -881,8 +881,8 @@ protected Node(
                 )
                 .collect(Collectors.toList());
 
-            // register all standard SearchRequestOperationsListeners to the SearchRequestListenerManager
-            final SearchRequestListenerManager searchRequestListenerManager = new SearchRequestListenerManager(
+            // register all standard SearchRequestOperationsListeners to the SearchRequestOperationsListeners
+            final SearchRequestOperationsListeners searchRequestOperationsListeners = new SearchRequestOperationsListeners(
                 Stream.concat(
                     Stream.of(searchRequestStats, searchRequestSlowLog),
                     pluginComponents.stream()
@@ -1287,7 +1287,7 @@ protected Node(
                 b.bind(RemoteClusterStateService.class).toProvider(() -> remoteClusterStateService);
                 b.bind(PersistedStateRegistry.class).toInstance(persistedStateRegistry);
                 b.bind(SegmentReplicationStatsTracker.class).toInstance(segmentReplicationStatsTracker);
-                b.bind(SearchRequestListenerManager.class).toInstance(searchRequestListenerManager);
+                b.bind(SearchRequestOperationsListeners.class).toInstance(searchRequestOperationsListeners);
             });
             injector = modules.createInjector();
 
diff --git a/server/src/test/java/org/opensearch/action/admin/cluster/node/stats/NodeStatsTests.java b/server/src/test/java/org/opensearch/action/admin/cluster/node/stats/NodeStatsTests.java
index c59342d0f4292..a5ca08f141560 100644
--- a/server/src/test/java/org/opensearch/action/admin/cluster/node/stats/NodeStatsTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/cluster/node/stats/NodeStatsTests.java
@@ -41,7 +41,6 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.routing.WeightedRoutingStats;
 import org.opensearch.cluster.service.ClusterManagerThrottlingStats;
-import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.cluster.service.ClusterStateStats;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.metrics.OperationStats;
@@ -964,15 +963,11 @@ public void apply(String action, AdmissionControlActionType admissionControlActi
     private static NodeIndicesStats getNodeIndicesStats(boolean remoteStoreStats) {
         NodeIndicesStats indicesStats = null;
         if (remoteStoreStats) {
-            ClusterService clusterService = new ClusterService(
-                Settings.EMPTY,
-                new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-                null
-            );
+            ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
             indicesStats = new NodeIndicesStats(
                 new CommonStats(CommonStatsFlags.ALL),
                 new HashMap<>(),
-                new SearchRequestStats(clusterService)
+                new SearchRequestStats(clusterSettings)
             );
             RemoteSegmentStats remoteSegmentStats = indicesStats.getSegments().getRemoteSegmentStats();
             remoteSegmentStats.addUploadBytesStarted(10L);
diff --git a/server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java b/server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java
index d1362acdc3e34..e7d3f4108a4b9 100644
--- a/server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java
+++ b/server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java
@@ -36,7 +36,6 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.routing.GroupShardsIterator;
-import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.settings.ClusterSettings;
@@ -331,12 +330,8 @@ public void testSendSearchResponseDisallowPartialFailures() {
     }
 
     public void testOnPhaseFailureAndVerifyListeners() {
-        ClusterService clusterService = new ClusterService(
-            Settings.EMPTY,
-            new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-            null
-        );
-        SearchRequestStats testListener = new SearchRequestStats(clusterService);
+        ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        SearchRequestStats testListener = new SearchRequestStats(clusterSettings);
 
         final List<SearchRequestOperationsListener> requestOperationListeners = new ArrayList<>(List.of(testListener));
         SearchQueryThenFetchAsyncAction action = createSearchQueryThenFetchAsyncAction(requestOperationListeners);
@@ -599,12 +594,8 @@ public void onFailure(Exception e) {
     }
 
     public void testOnPhaseListenersWithQueryAndThenFetchType() throws InterruptedException {
-        ClusterService clusterService = new ClusterService(
-            Settings.EMPTY,
-            new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-            null
-        );
-        SearchRequestStats testListener = new SearchRequestStats(clusterService);
+        ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        SearchRequestStats testListener = new SearchRequestStats(clusterSettings);
         final List<SearchRequestOperationsListener> requestOperationListeners = new ArrayList<>(List.of(testListener));
 
         long delay = (randomIntBetween(1, 5));
@@ -653,12 +644,8 @@ public void testOnPhaseListenersWithQueryAndThenFetchType() throws InterruptedEx
     }
 
     public void testOnPhaseListenersWithDfsType() throws InterruptedException {
-        ClusterService clusterService = new ClusterService(
-            Settings.EMPTY,
-            new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-            null
-        );
-        SearchRequestStats testListener = new SearchRequestStats(clusterService);
+        ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        SearchRequestStats testListener = new SearchRequestStats(clusterSettings);
         final List<SearchRequestOperationsListener> requestOperationListeners = new ArrayList<>(List.of(testListener));
 
         SearchDfsQueryThenFetchAsyncAction searchDfsQueryThenFetchAsyncAction = createSearchDfsQueryThenFetchAsyncAction(
diff --git a/server/src/test/java/org/opensearch/action/search/SearchRequestListenerManagerTests.java b/server/src/test/java/org/opensearch/action/search/SearchRequestOperationsListenersTests.java
similarity index 72%
rename from server/src/test/java/org/opensearch/action/search/SearchRequestListenerManagerTests.java
rename to server/src/test/java/org/opensearch/action/search/SearchRequestOperationsListenersTests.java
index c16841ae1ee17..d935431f935f9 100644
--- a/server/src/test/java/org/opensearch/action/search/SearchRequestListenerManagerTests.java
+++ b/server/src/test/java/org/opensearch/action/search/SearchRequestOperationsListenersTests.java
@@ -14,31 +14,31 @@
 
 import java.util.List;
 
-public class SearchRequestListenerManagerTests extends OpenSearchTestCase {
+public class SearchRequestOperationsListenersTests extends OpenSearchTestCase {
     public void testAddAndGetListeners() {
         SearchRequestOperationsListener testListener = createTestSearchRequestOperationsListener();
-        SearchRequestListenerManager listenerManager = new SearchRequestListenerManager(testListener);
-        assertEquals(1, listenerManager.getListeners().size());
-        assertEquals(testListener, listenerManager.getListeners().get(0));
+        SearchRequestOperationsListeners requestListeners = new SearchRequestOperationsListeners(testListener);
+        assertEquals(1, requestListeners.getListeners().size());
+        assertEquals(testListener, requestListeners.getListeners().get(0));
     }
 
     public void testStandardListenersEnabled() {
         SearchRequestOperationsListener testListener1 = createTestSearchRequestOperationsListener();
         SearchRequestOperationsListener testListener2 = createTestSearchRequestOperationsListener();
-        SearchRequestListenerManager listenerManager = new SearchRequestListenerManager(testListener1, testListener2);
+        SearchRequestOperationsListeners requestListeners = new SearchRequestOperationsListeners(testListener1, testListener2);
         testListener2.setEnabled(true);
-        SearchRequestOperationsListener.CompositeListener compositeListener = listenerManager.buildCompositeListener(logger);
+        SearchRequestOperationsListener.CompositeListener compositeListener = requestListeners.buildCompositeListener(logger);
         List<SearchRequestOperationsListener> listeners = compositeListener.getListeners();
         assertEquals(1, listeners.size());
         assertEquals(testListener2, listeners.get(0));
-        assertEquals(2, listenerManager.getListeners().size());
-        assertEquals(testListener1, listenerManager.getListeners().get(0));
-        assertEquals(testListener2, listenerManager.getListeners().get(1));
+        assertEquals(2, requestListeners.getListeners().size());
+        assertEquals(testListener1, requestListeners.getListeners().get(0));
+        assertEquals(testListener2, requestListeners.getListeners().get(1));
     }
 
     public void testStandardListenersAndTimeProvider() {
         SearchRequestOperationsListener testListener1 = createTestSearchRequestOperationsListener();
-        SearchRequestListenerManager listenerManager = new SearchRequestListenerManager(testListener1);
+        SearchRequestOperationsListeners requestListeners = new SearchRequestOperationsListeners(testListener1);
 
         testListener1.setEnabled(true);
         TransportSearchAction.SearchTimeProvider timeProviderListener = new TransportSearchAction.SearchTimeProvider(
@@ -50,7 +50,7 @@ public void testStandardListenersAndTimeProvider() {
         SearchRequest searchRequest = new SearchRequest().source(source);
         searchRequest.setPhaseTook(true);
         timeProviderListener.setEnabled(false, searchRequest);
-        SearchRequestOperationsListener.CompositeListener compositeListener = listenerManager.buildCompositeListener(
+        SearchRequestOperationsListener.CompositeListener compositeListener = requestListeners.buildCompositeListener(
             logger,
             timeProviderListener
         );
@@ -58,13 +58,13 @@ public void testStandardListenersAndTimeProvider() {
         assertEquals(2, listeners.size());
         assertEquals(testListener1, listeners.get(0));
         assertEquals(timeProviderListener, listeners.get(1));
-        assertEquals(1, listenerManager.getListeners().size());
-        assertEquals(testListener1, listenerManager.getListeners().get(0));
+        assertEquals(1, requestListeners.getListeners().size());
+        assertEquals(testListener1, requestListeners.getListeners().get(0));
     }
 
     public void testStandardListenersDisabledAndTimeProvider() {
         SearchRequestOperationsListener testListener1 = createTestSearchRequestOperationsListener();
-        SearchRequestListenerManager listenerManager = new SearchRequestListenerManager(testListener1);
+        SearchRequestOperationsListeners requestListeners = new SearchRequestOperationsListeners(testListener1);
         TransportSearchAction.SearchTimeProvider timeProviderListener = new TransportSearchAction.SearchTimeProvider(
             0,
             System.nanoTime(),
@@ -74,21 +74,21 @@ public void testStandardListenersDisabledAndTimeProvider() {
         SearchRequest searchRequest = new SearchRequest().source(source);
         searchRequest.setPhaseTook(true);
         timeProviderListener.setEnabled(false, searchRequest);
-        SearchRequestOperationsListener.CompositeListener compositeListener = listenerManager.buildCompositeListener(
+        SearchRequestOperationsListener.CompositeListener compositeListener = requestListeners.buildCompositeListener(
             logger,
             timeProviderListener
         );
         List<SearchRequestOperationsListener> listeners = compositeListener.getListeners();
         assertEquals(1, listeners.size());
         assertEquals(timeProviderListener, listeners.get(0));
-        assertEquals(1, listenerManager.getListeners().size());
-        assertEquals(testListener1, listenerManager.getListeners().get(0));
-        assertFalse(listenerManager.getListeners().get(0).getEnabled());
+        assertEquals(1, requestListeners.getListeners().size());
+        assertEquals(testListener1, requestListeners.getListeners().get(0));
+        assertFalse(requestListeners.getListeners().get(0).getEnabled());
     }
 
     public void testStandardListenerAndTimeProviderDisabled() {
         SearchRequestOperationsListener testListener1 = createTestSearchRequestOperationsListener();
-        SearchRequestListenerManager listenerManager = new SearchRequestListenerManager(testListener1);
+        SearchRequestOperationsListeners requestListeners = new SearchRequestOperationsListeners(testListener1);
 
         testListener1.setEnabled(true);
         SearchRequestOperationsListener timeProviderListener = new TransportSearchAction.SearchTimeProvider(
@@ -99,15 +99,15 @@ public void testStandardListenerAndTimeProviderDisabled() {
         SearchSourceBuilder source = SearchSourceBuilder.searchSource().query(QueryBuilders.matchAllQuery());
         SearchRequest searchRequest = new SearchRequest().source(source);
         searchRequest.setPhaseTook(false);
-        SearchRequestOperationsListener.CompositeListener compositeListener = listenerManager.buildCompositeListener(
+        SearchRequestOperationsListener.CompositeListener compositeListener = requestListeners.buildCompositeListener(
             logger,
             timeProviderListener
         );
         List<SearchRequestOperationsListener> listeners = compositeListener.getListeners();
         assertEquals(1, listeners.size());
         assertEquals(testListener1, listeners.get(0));
-        assertEquals(1, listenerManager.getListeners().size());
-        assertEquals(testListener1, listenerManager.getListeners().get(0));
+        assertEquals(1, requestListeners.getListeners().size());
+        assertEquals(testListener1, requestListeners.getListeners().get(0));
     }
 
     public SearchRequestOperationsListener createTestSearchRequestOperationsListener() {
diff --git a/server/src/test/java/org/opensearch/action/search/SearchRequestSlowLogTests.java b/server/src/test/java/org/opensearch/action/search/SearchRequestSlowLogTests.java
index e70bba36445e0..d2e5c95862fd9 100644
--- a/server/src/test/java/org/opensearch/action/search/SearchRequestSlowLogTests.java
+++ b/server/src/test/java/org/opensearch/action/search/SearchRequestSlowLogTests.java
@@ -104,7 +104,7 @@ public void testMultipleSlowLoggersUseSingleLog4jLogger() {
             new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
             null
         );
-        SearchRequestListenerManager listenerManager2 = new SearchRequestListenerManager();
+        SearchRequestOperationsListeners searchRequestListeners = new SearchRequestOperationsListeners();
         SearchRequestSlowLog searchRequestSlowLog2 = new SearchRequestSlowLog(clusterService2);
 
         int numberOfLoggersAfter = context.getLoggers().size();
diff --git a/server/src/test/java/org/opensearch/action/search/SearchRequestStatsTests.java b/server/src/test/java/org/opensearch/action/search/SearchRequestStatsTests.java
index e2b21689bdb03..25559482d095c 100644
--- a/server/src/test/java/org/opensearch/action/search/SearchRequestStatsTests.java
+++ b/server/src/test/java/org/opensearch/action/search/SearchRequestStatsTests.java
@@ -8,7 +8,6 @@
 
 package org.opensearch.action.search;
 
-import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.test.OpenSearchTestCase;
@@ -25,12 +24,8 @@
 
 public class SearchRequestStatsTests extends OpenSearchTestCase {
     public void testSearchRequestPhaseFailure() {
-        ClusterService clusterService = new ClusterService(
-            Settings.EMPTY,
-            new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-            null
-        );
-        SearchRequestStats testRequestStats = new SearchRequestStats(clusterService);
+        ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        SearchRequestStats testRequestStats = new SearchRequestStats(clusterSettings);
         SearchPhaseContext ctx = mock(SearchPhaseContext.class);
         SearchPhase mockSearchPhase = mock(SearchPhase.class);
         when(ctx.getCurrentPhase()).thenReturn(mockSearchPhase);
@@ -45,12 +40,8 @@ public void testSearchRequestPhaseFailure() {
     }
 
     public void testSearchRequestStats() {
-        ClusterService clusterService = new ClusterService(
-            Settings.EMPTY,
-            new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-            null
-        );
-        SearchRequestStats testRequestStats = new SearchRequestStats(clusterService);
+        ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        SearchRequestStats testRequestStats = new SearchRequestStats(clusterSettings);
 
         SearchPhaseContext ctx = mock(SearchPhaseContext.class);
         SearchPhase mockSearchPhase = mock(SearchPhase.class);
@@ -71,12 +62,8 @@ public void testSearchRequestStats() {
     }
 
     public void testSearchRequestStatsOnPhaseStartConcurrently() throws InterruptedException {
-        ClusterService clusterService = new ClusterService(
-            Settings.EMPTY,
-            new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-            null
-        );
-        SearchRequestStats testRequestStats = new SearchRequestStats(clusterService);
+        ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        SearchRequestStats testRequestStats = new SearchRequestStats(clusterSettings);
         int numTasks = randomIntBetween(5, 50);
         Thread[] threads = new Thread[numTasks * SearchPhaseName.values().length];
         Phaser phaser = new Phaser(numTasks * SearchPhaseName.values().length + 1);
@@ -103,12 +90,8 @@ public void testSearchRequestStatsOnPhaseStartConcurrently() throws InterruptedE
     }
 
     public void testSearchRequestStatsOnPhaseEndConcurrently() throws InterruptedException {
-        ClusterService clusterService = new ClusterService(
-            Settings.EMPTY,
-            new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-            null
-        );
-        SearchRequestStats testRequestStats = new SearchRequestStats(clusterService);
+        ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        SearchRequestStats testRequestStats = new SearchRequestStats(clusterSettings);
         int numTasks = randomIntBetween(5, 50);
         Thread[] threads = new Thread[numTasks * SearchPhaseName.values().length];
         Phaser phaser = new Phaser(numTasks * SearchPhaseName.values().length + 1);
@@ -144,12 +127,8 @@ public void testSearchRequestStatsOnPhaseEndConcurrently() throws InterruptedExc
     }
 
     public void testSearchRequestStatsOnPhaseFailureConcurrently() throws InterruptedException {
-        ClusterService clusterService = new ClusterService(
-            Settings.EMPTY,
-            new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-            null
-        );
-        SearchRequestStats testRequestStats = new SearchRequestStats(clusterService);
+        ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        SearchRequestStats testRequestStats = new SearchRequestStats(clusterSettings);
         int numTasks = randomIntBetween(5, 50);
         Thread[] threads = new Thread[numTasks * SearchPhaseName.values().length];
         Phaser phaser = new Phaser(numTasks * SearchPhaseName.values().length + 1);
diff --git a/server/src/test/java/org/opensearch/index/search/stats/SearchStatsTests.java b/server/src/test/java/org/opensearch/index/search/stats/SearchStatsTests.java
index ea370ebc6cf76..5656b77445772 100644
--- a/server/src/test/java/org/opensearch/index/search/stats/SearchStatsTests.java
+++ b/server/src/test/java/org/opensearch/index/search/stats/SearchStatsTests.java
@@ -37,7 +37,6 @@
 import org.opensearch.action.search.SearchPhaseName;
 import org.opensearch.action.search.SearchRequestOperationsListenerSupport;
 import org.opensearch.action.search.SearchRequestStats;
-import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.index.search.stats.SearchStats.Stats;
@@ -80,12 +79,8 @@ public void testShardLevelSearchGroupStats() throws Exception {
         long paramValue = randomIntBetween(2, 50);
 
         // Testing for request stats
-        ClusterService clusterService = new ClusterService(
-            Settings.EMPTY,
-            new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-            null
-        );
-        SearchRequestStats testRequestStats = new SearchRequestStats(clusterService);
+        ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        SearchRequestStats testRequestStats = new SearchRequestStats(clusterSettings);
         SearchPhaseContext ctx = mock(SearchPhaseContext.class);
         for (SearchPhaseName searchPhaseName : SearchPhaseName.values()) {
             SearchPhase mockSearchPhase = mock(SearchPhase.class);
diff --git a/server/src/test/java/org/opensearch/indices/NodeIndicesStatsTests.java b/server/src/test/java/org/opensearch/indices/NodeIndicesStatsTests.java
index b07dc6d298045..2424e38636466 100644
--- a/server/src/test/java/org/opensearch/indices/NodeIndicesStatsTests.java
+++ b/server/src/test/java/org/opensearch/indices/NodeIndicesStatsTests.java
@@ -34,7 +34,6 @@
 
 import org.opensearch.action.admin.indices.stats.CommonStats;
 import org.opensearch.action.search.SearchRequestStats;
-import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.xcontent.ToXContent;
@@ -49,12 +48,8 @@ public class NodeIndicesStatsTests extends OpenSearchTestCase {
 
     public void testInvalidLevel() {
         CommonStats oldStats = new CommonStats();
-        ClusterService clusterService = new ClusterService(
-            Settings.EMPTY,
-            new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS),
-            null
-        );
-        SearchRequestStats requestStats = new SearchRequestStats(clusterService);
+        ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        SearchRequestStats requestStats = new SearchRequestStats(clusterSettings);
         final NodeIndicesStats stats = new NodeIndicesStats(oldStats, Collections.emptyMap(), requestStats);
         final String level = randomAlphaOfLength(16);
         final ToXContent.Params params = new ToXContent.MapParams(Collections.singletonMap("level", level));
diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java
index e631d3e67a484..752d88b677a9c 100644
--- a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java
+++ b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java
@@ -90,7 +90,7 @@
 import org.opensearch.action.search.SearchExecutionStatsCollector;
 import org.opensearch.action.search.SearchPhaseController;
 import org.opensearch.action.search.SearchRequest;
-import org.opensearch.action.search.SearchRequestListenerManager;
+import org.opensearch.action.search.SearchRequestOperationsListeners;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchTransportService;
 import org.opensearch.action.search.TransportSearchAction;
@@ -2285,7 +2285,7 @@ public void onFailure(final Exception e) {
                     writableRegistry(),
                     searchService::aggReduceContextBuilder
                 );
-                SearchRequestListenerManager listenerManager = new SearchRequestListenerManager();
+                SearchRequestOperationsListeners searchRequestOperationsListeners = new SearchRequestOperationsListeners();
                 actions.put(
                     SearchAction.INSTANCE,
                     new TransportSearchAction(
@@ -2312,7 +2312,7 @@ public void onFailure(final Exception e) {
                             client
                         ),
                         NoopMetricsRegistry.INSTANCE,
-                        listenerManager
+                        searchRequestOperationsListeners
                     )
                 );
                 actions.put(