Remove unnecessary ResponseCollectorService dependency from SearchService (#117573)

Small cleanup from a code-review earlier.
SearchService isn't using this thing, it's only used by the transport
action so that's where it should reside.
Adjusted constructors accordingly and removed getter.

Author: original-brownbear

server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java

@@ -69,6 +69,7 @@
 import org.elasticsearch.indices.ExecutorSelector;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.injection.guice.Inject;
+import org.elasticsearch.node.ResponseCollectorService;
 import org.elasticsearch.rest.action.search.SearchResponseMetrics;
 import org.elasticsearch.search.SearchPhaseResult;
 import org.elasticsearch.search.SearchService;
@@ -151,6 +152,7 @@ public class TransportSearchAction extends HandledTransportAction<SearchRequest,
     private final RemoteClusterService remoteClusterService;
     private final SearchPhaseController searchPhaseController;
     private final SearchService searchService;
+    private final ResponseCollectorService responseCollectorService;
     private final IndexNameExpressionResolver indexNameExpressionResolver;
     private final NamedWriteableRegistry namedWriteableRegistry;
     private final CircuitBreaker circuitBreaker;
@@ -168,6 +170,7 @@ public TransportSearchAction(
         CircuitBreakerService circuitBreakerService,
         TransportService transportService,
         SearchService searchService,
+        ResponseCollectorService responseCollectorService,
         SearchTransportService searchTransportService,
         SearchPhaseController searchPhaseController,
         ClusterService clusterService,
@@ -189,6 +192,7 @@ public TransportSearchAction(
         this.clusterService = clusterService;
         this.transportService = transportService;
         this.searchService = searchService;
+        this.responseCollectorService = responseCollectorService;
         this.indexNameExpressionResolver = indexNameExpressionResolver;
         this.namedWriteableRegistry = namedWriteableRegistry;
         this.executorSelector = executorSelector;
@@ -1841,7 +1845,7 @@ List<SearchShardIterator> getLocalShardsIterator(
                 concreteIndices,
                 routingMap,
                 searchRequest.preference(),
-                searchService.getResponseCollectorService(),
+                responseCollectorService,
                 searchTransportService.getPendingSearchRequests()
             );
         final Map<String, OriginalIndices> originalIndices = buildPerIndexOriginalIndices(

server/src/main/java/org/elasticsearch/node/NodeConstruction.java

@@ -921,6 +921,9 @@ private void construct(
         final IndexingPressure indexingLimits = new IndexingPressure(settings);
         final IncrementalBulkService incrementalBulkService = new IncrementalBulkService(client, indexingLimits);
 
+        final ResponseCollectorService responseCollectorService = new ResponseCollectorService(clusterService);
+        modules.bindToInstance(ResponseCollectorService.class, responseCollectorService);
+
         ActionModule actionModule = new ActionModule(
             settings,
             clusterModule.getIndexNameExpressionResolver(),
@@ -1003,7 +1006,6 @@ private void construct(
             taskManager,
             telemetryProvider.getTracer()
         );
-        final ResponseCollectorService responseCollectorService = new ResponseCollectorService(clusterService);
         final SearchResponseMetrics searchResponseMetrics = new SearchResponseMetrics(telemetryProvider.getMeterRegistry());
         final SearchTransportService searchTransportService = new SearchTransportService(
             transportService,
@@ -1100,7 +1102,6 @@ private void construct(
             scriptService,
             bigArrays,
             searchModule.getFetchPhase(),
-            responseCollectorService,
             circuitBreakerService,
             systemIndices.getExecutorSelector(),
             telemetryProvider.getTracer()

server/src/main/java/org/elasticsearch/node/NodeServiceProvider.java

@@ -119,7 +119,6 @@ SearchService newSearchService(
         ScriptService scriptService,
         BigArrays bigArrays,
         FetchPhase fetchPhase,
-        ResponseCollectorService responseCollectorService,
         CircuitBreakerService circuitBreakerService,
         ExecutorSelector executorSelector,
         Tracer tracer
@@ -131,7 +130,6 @@ SearchService newSearchService(
             scriptService,
             bigArrays,
             fetchPhase,
-            responseCollectorService,
             circuitBreakerService,
             executorSelector,
             tracer

server/src/main/java/org/elasticsearch/search/SearchService.java

@@ -73,7 +73,6 @@
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason;
-import org.elasticsearch.node.ResponseCollectorService;
 import org.elasticsearch.script.FieldScript;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.aggregations.AggregationInitializationException;
@@ -279,8 +278,6 @@ public class SearchService extends AbstractLifecycleComponent implements IndexEv
 
     private final ScriptService scriptService;
 
-    private final ResponseCollectorService responseCollectorService;
-
     private final ExecutorSelector executorSelector;
 
     private final BigArrays bigArrays;
@@ -325,7 +322,6 @@ public SearchService(
         ScriptService scriptService,
         BigArrays bigArrays,
         FetchPhase fetchPhase,
-        ResponseCollectorService responseCollectorService,
         CircuitBreakerService circuitBreakerService,
         ExecutorSelector executorSelector,
         Tracer tracer
@@ -335,7 +331,6 @@ public SearchService(
         this.clusterService = clusterService;
         this.indicesService = indicesService;
         this.scriptService = scriptService;
-        this.responseCollectorService = responseCollectorService;
         this.bigArrays = bigArrays;
         this.fetchPhase = fetchPhase;
         this.multiBucketConsumerService = new MultiBucketConsumerService(
@@ -1535,10 +1530,6 @@ public int getOpenScrollContexts() {
         return openScrollContexts.get();
     }
 
-    public ResponseCollectorService getResponseCollectorService() {
-        return this.responseCollectorService;
-    }
-
     public long getDefaultKeepAliveInMillis() {
         return defaultKeepAlive;
     }

server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java

@@ -1758,6 +1758,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
                 new NoneCircuitBreakerService(),
                 transportService,
                 searchService,
+                null,
                 new SearchTransportService(transportService, client, null),
                 null,
                 clusterService,

server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java

@@ -2314,7 +2314,6 @@ public RecyclerBytesStreamOutput newNetworkBytesStream() {
                     scriptService,
                     bigArrays,
                     new FetchPhase(Collections.emptyList()),
-                    responseCollectorService,
                     new NoneCircuitBreakerService(),
                     EmptySystemIndices.INSTANCE.getExecutorSelector(),
                     Tracer.NOOP
@@ -2481,6 +2480,7 @@ public RecyclerBytesStreamOutput newNetworkBytesStream() {
                         new NoneCircuitBreakerService(),
                         transportService,
                         searchService,
+                        responseCollectorService,
                         searchTransportService,
                         searchPhaseController,
                         clusterService,

test/framework/src/main/java/org/elasticsearch/node/MockNode.java

@@ -100,7 +100,6 @@ SearchService newSearchService(
             ScriptService scriptService,
             BigArrays bigArrays,
             FetchPhase fetchPhase,
-            ResponseCollectorService responseCollectorService,
             CircuitBreakerService circuitBreakerService,
             ExecutorSelector executorSelector,
             Tracer tracer
@@ -114,7 +113,6 @@ SearchService newSearchService(
                     scriptService,
                     bigArrays,
                     fetchPhase,
-                    responseCollectorService,
                     circuitBreakerService,
                     executorSelector,
                     tracer
@@ -127,7 +125,6 @@ SearchService newSearchService(
                 scriptService,
                 bigArrays,
                 fetchPhase,
-                responseCollectorService,
                 circuitBreakerService,
                 executorSelector,
                 tracer

test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java

@@ -17,7 +17,6 @@
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.node.MockNode;
-import org.elasticsearch.node.ResponseCollectorService;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.fetch.FetchPhase;
@@ -83,7 +82,6 @@ public MockSearchService(
         ScriptService scriptService,
         BigArrays bigArrays,
         FetchPhase fetchPhase,
-        ResponseCollectorService responseCollectorService,
         CircuitBreakerService circuitBreakerService,
         ExecutorSelector executorSelector,
         Tracer tracer
@@ -95,7 +93,6 @@ public MockSearchService(
             scriptService,
             bigArrays,
             fetchPhase,
-            responseCollectorService,
             circuitBreakerService,
             executorSelector,
             tracer