Yaml

kderusso · kderusso · commit 9f4e40dccb27 · 2025-09-24T11:20:09.000-04:00
diff --git a/x-pack/plugin/inference/build.gradle b/x-pack/plugin/inference/build.gradle
@@ -12,7 +12,7 @@ apply plugin: 'elasticsearch.internal-test-artifact'
 
 restResources {
   restApi {
-    include '_common', 'bulk', 'indices', 'inference', 'index', 'get', 'update', 'reindex', 'search', 'field_caps', 'capabilities'
+    include '_common', 'bulk', 'cluster', 'indices', 'inference', 'index', 'get', 'update', 'reindex', 'search', 'field_caps', 'capabilities'
   }
 }
 
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferenceFeatures.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferenceFeatures.java
@@ -49,10 +49,11 @@ public class InferenceFeatures implements FeatureSpecification {
     private static final NodeFeature COHERE_V2_API = new NodeFeature("inference.cohere.v2");
     public static final NodeFeature SEMANTIC_TEXT_HIGHLIGHTING_FLAT = new NodeFeature("semantic_text.highlighter.flat_index_options");
     private static final NodeFeature SEMANTIC_TEXT_FIELDS_CHUNKS_FORMAT = new NodeFeature("semantic_text.fields_chunks_format");
+    private static final NodeFeature CHUNK_RESCORER_TELEMETRY = new NodeFeature("retrievers.extended_telemetry_chunk_rescorer");
 
     @Override
     public Set<NodeFeature> getTestFeatures() {
-        var testFeatures = new HashSet<>(
+        return new HashSet<>(
             Set.of(
                 SemanticTextFieldMapper.SEMANTIC_TEXT_IN_OBJECT_FIELD_FIX,
                 SemanticTextFieldMapper.SEMANTIC_TEXT_SINGLE_FIELD_UPDATE_FIX,
@@ -87,9 +88,9 @@ public Set<NodeFeature> getTestFeatures() {
                 SemanticQueryBuilder.SEMANTIC_QUERY_MULTIPLE_INFERENCE_IDS,
                 SemanticQueryBuilder.SEMANTIC_QUERY_FILTER_FIELD_CAPS_FIX,
                 InterceptedInferenceQueryBuilder.NEW_SEMANTIC_QUERY_INTERCEPTORS,
-                TEXT_SIMILARITY_RERANKER_SNIPPETS
+                TEXT_SIMILARITY_RERANKER_SNIPPETS,
+                CHUNK_RESCORER_TELEMETRY
             )
         );
-        return testFeatures;
     }
 }
diff --git a/x-pack/plugin/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/70_text_similarity_rank_retriever.yml b/x-pack/plugin/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/70_text_similarity_rank_retriever.yml
@@ -859,3 +859,47 @@ setup:
 
   - match: { hits.hits.0._id: "doc_1" }
   - match: { hits.hits.1._id: "doc_2" }
+
+---
+"Chunk rescorer usage is accurately reflected in cluster stats":
+
+  - requires:
+      cluster_features: "retrievers.extended_telemetry_chunk_rescorer"
+      reason: rescore_chunks introduced in 9.2.0
+
+  # Start with empty cluster stats
+  - do:
+      cluster.stats: {}
+
+  - match: { indices.search: {total: 0, queries: {}, rescorers: {}, sections: {}, retrievers: {}, extended: {}}}
+
+  - do:
+      search:
+        index: test-index
+        body:
+          track_total_hits: true
+          fields: [ "text", "semantic_text_field", "topic" ]
+          retriever:
+            text_similarity_reranker:
+              retriever:
+                standard:
+                  query:
+                    match:
+                      topic:
+                        query: "science"
+              rank_window_size: 10
+              inference_id: my-rerank-model
+              inference_text: "how often does the moon hide the sun?"
+              field: semantic_text_field
+              chunk_rescorer: { }
+          size: 10
+
+  # Should now be populated with retriever usage from the query we just ran
+  - do:
+      cluster.stats: { }
+
+  - match: { indices.search.total: 1 }
+  - match: { indices.search.queries.match: 1 }
+  - match: { indices.search.retrievers.text_similarity_reranker: 1 }
+  - match: { indices.search.retrievers.standard: 1 }
+  - match: { indices.search.extended.retrievers.text_similarity_reranker.chunk_rescorer: 1 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ apply plugin: 'elasticsearch.internal-test-artifact'`
`12`	`12`
`13`	`13`	`restResources {`
`14`	`14`	`restApi {`
`15`		`- include '_common', 'bulk', 'indices', 'inference', 'index', 'get', 'update', 'reindex', 'search', 'field_caps', 'capabilities'`
	`15`	`+ include '_common', 'bulk', 'cluster', 'indices', 'inference', 'index', 'get', 'update', 'reindex', 'search', 'field_caps', 'capabilities'`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`