add search context

Author: chrisparrinello

server/src/main/java/org/elasticsearch/index/search/stats/ShardSearchPhaseAPMMetrics.java

@@ -57,8 +57,10 @@ public ShardSearchPhaseAPMMetrics(MeterRegistry meterRegistry) {
     }
 
     @Override
-    public void onCanMatchPhase(long tookInNanos) {
-        recordPhaseLatency(canMatchPhaseMetric, tookInNanos);
+    public void onCanMatchPhase(SearchContext searchContext, long tookInNanos) {
+        SearchExecutionContext searchExecutionContext = searchContext.getSearchExecutionContext();
+        Long timeRangeFilterFromMillis = searchExecutionContext.getTimeRangeFilterFromMillis();
+        recordPhaseLatency(canMatchPhaseMetric, tookInNanos, searchContext.request(), timeRangeFilterFromMillis);
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/shard/SearchOperationListener.java

@@ -91,9 +91,10 @@ default void onFailedDfsPhase(SearchContext searchContext) {}
      * Executed after the can-match phase successfully finished.
      * Note: this is not invoked if the can match phase execution failed.
      *
+     * @param searchContext the current search context
      * @param tookInNanos the number of nanoseconds the can-match execution took
      */
-    default void onCanMatchPhase(long tookInNanos) {}
+    default void onCanMatchPhase(SearchContext searchContext, long tookInNanos) {}
 
     /**
      * Executed when a new reader context was created
@@ -246,10 +247,10 @@ public void onDfsPhase(SearchContext searchContext, long tookInNanos) {
         }
 
         @Override
-        public void onCanMatchPhase(long tookInNanos) {
+        public void onCanMatchPhase(SearchContext searchContext, long tookInNanos) {
             for (SearchOperationListener listener : listeners) {
                 try {
-                    listener.onCanMatchPhase(tookInNanos);
+                    listener.onCanMatchPhase(searchContext, tookInNanos);
                 } catch (Exception e) {
                     logger.warn(() -> "onCanMatchPhase listener [" + listener + "] failed", e);
                 }

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

@@ -1938,14 +1938,13 @@ public void canMatch(CanMatchNodeRequest request, ActionListener<CanMatchNodeRes
         final List<CanMatchNodeResponse.ResponseOrFailure> responses = new ArrayList<>(shardLevelRequests.size());
         for (var shardLevelRequest : shardLevelRequests) {
             long shardCanMatchStartTimeInNanos = System.nanoTime();
-            ShardSearchRequest shardSearchRequest = request.createShardSearchRequest(shardLevelRequest);
+            final ShardSearchRequest shardSearchRequest = request.createShardSearchRequest(shardLevelRequest);
             final IndexService indexService = indicesService.indexServiceSafe(shardSearchRequest.shardId().getIndex());
             final IndexShard indexShard = indexService.getShard(shardSearchRequest.shardId().id());
-            try {
-                // TODO remove the exception handling as it's now in canMatch itself
+            try (SearchContext searchContext = createSearchContext(shardSearchRequest, defaultSearchTimeout)) {
                 responses.add(new CanMatchNodeResponse.ResponseOrFailure(canMatch(shardSearchRequest)));
-                indexShard.getSearchOperationListener().onCanMatchPhase(System.nanoTime() - shardCanMatchStartTimeInNanos);
-            } catch (Exception e) {
+                indexShard.getSearchOperationListener().onCanMatchPhase(searchContext, System.nanoTime() - shardCanMatchStartTimeInNanos);
+            } catch (IOException e) {
                 responses.add(new CanMatchNodeResponse.ResponseOrFailure(e));
             }
         }

server/src/test/java/org/elasticsearch/search/TelemetryMetrics/ShardSearchPhaseAPMMetricsTests.java

@@ -265,8 +265,15 @@ public void testCanMatchSearch() {
             "1"
         );
 
-        final List<Measurement> fetchMeasurements = getTestTelemetryPlugin().getLongHistogramMeasurement(CAN_MATCH_SEARCH_PHASE_METRIC);
-        assertEquals(num_primaries, fetchMeasurements.size());
+        final List<Measurement> canMatchMeasurements = getTestTelemetryPlugin().getLongHistogramMeasurement(CAN_MATCH_SEARCH_PHASE_METRIC);
+        assertEquals(num_primaries, canMatchMeasurements.size());
+        assertAttributes(canMatchMeasurements, false, false);
+        final List<Measurement> queryMeasurements = getTestTelemetryPlugin().getLongHistogramMeasurement(QUERY_SEARCH_PHASE_METRIC);
+        assertEquals(num_primaries, queryMeasurements.size());
+        assertAttributes(queryMeasurements, false, false);
+        final List<Measurement> fetchMeasurements = getTestTelemetryPlugin().getLongHistogramMeasurement(FETCH_SEARCH_PHASE_METRIC);
+        assertEquals(1, fetchMeasurements.size());
+        assertAttributes(fetchMeasurements, false, false);
     }
 
     private static void assertAttributes(List<Measurement> measurements, boolean isSystem, boolean isScroll) {
@@ -360,6 +367,8 @@ public void testTimeRangeFilterAllResults() {
             assertSearchHits(searchResponse, "1", "2");
             assertThat(searchResponse.getSkippedShards(), Matchers.greaterThanOrEqualTo(num_primaries - 2));
         });
+        final List<Measurement> canMatchMeasurements = getTestTelemetryPlugin().getLongHistogramMeasurement(CAN_MATCH_SEARCH_PHASE_METRIC);
+        assertEquals(num_primaries, canMatchMeasurements.size());
         final List<Measurement> queryMeasurements = getTestTelemetryPlugin().getLongHistogramMeasurement(QUERY_SEARCH_PHASE_METRIC);
         // the two docs are at most spread across two shards, other shards are empty and get filtered out
         assertThat(queryMeasurements.size(), Matchers.lessThanOrEqualTo(2));