Rename hybrid query stats

q-andy · q-andy · commit c7f39e91ec06 · 2025-06-02T16:00:50.000-07:00
Signed-off-by: Andy Qin &lt;qinandy@amazon.com&gt;
diff --git a/src/main/java/org/opensearch/neuralsearch/query/HybridQueryBuilder.java b/src/main/java/org/opensearch/neuralsearch/query/HybridQueryBuilder.java
@@ -427,15 +427,15 @@ protected void extractInnerHitBuilders(Map<String, InnerHitContextBuilder> inner
     }
 
     private static void updateQueryStats(boolean hasFilter, boolean hasPagination, boolean hasInnerHits) {
-        EventStatsManager.increment(EventStatName.HYBRID_QUERY_COUNT);
+        EventStatsManager.increment(EventStatName.HYBRID_QUERY_REQUESTS);
         if (hasFilter) {
-            EventStatsManager.increment(EventStatName.HYBRID_QUERY_FILTER_COUNT);
+            EventStatsManager.increment(EventStatName.HYBRID_QUERY_FILTER_REQUESTS);
         }
         if (hasPagination) {
-            EventStatsManager.increment(EventStatName.HYBRID_QUERY_PAGINATION_COUNT);
+            EventStatsManager.increment(EventStatName.HYBRID_QUERY_PAGINATION_REQUESTS);
         }
         if (hasInnerHits) {
-            EventStatsManager.increment(EventStatName.HYBRID_QUERY_INNER_HITS_COUNT);
+            EventStatsManager.increment(EventStatName.HYBRID_QUERY_INNER_HITS_REQUESTS);
         }
     }
 }
diff --git a/src/main/java/org/opensearch/neuralsearch/stats/events/EventStatName.java b/src/main/java/org/opensearch/neuralsearch/stats/events/EventStatName.java
@@ -52,10 +52,10 @@ public enum EventStatName implements StatName {
     ),
     COMB_TECHNIQUE_RRF_EXECUTIONS("comb_rrf_executions", "processors.search.hybrid", EventStatType.TIMESTAMPED_EVENT_COUNTER),
     // Hybrid query stats
-    HYBRID_QUERY_COUNT("hybrid_query_count", "query.hybrid", EventStatType.TIMESTAMPED_EVENT_COUNTER),
-    HYBRID_QUERY_INNER_HITS_COUNT("hybrid_query_with_inner_hits_count", "query.hybrid", EventStatType.TIMESTAMPED_EVENT_COUNTER),
-    HYBRID_QUERY_FILTER_COUNT("hybrid_query_with_filter_count", "query.hybrid", EventStatType.TIMESTAMPED_EVENT_COUNTER),
-    HYBRID_QUERY_PAGINATION_COUNT("hybrid_query_with_pagination_count", "query.hybrid", EventStatType.TIMESTAMPED_EVENT_COUNTER),;
+    HYBRID_QUERY_REQUESTS("hybrid_query_requests", "query.hybrid", EventStatType.TIMESTAMPED_EVENT_COUNTER),
+    HYBRID_QUERY_INNER_HITS_REQUESTS("hybrid_query_with_inner_hits_requests", "query.hybrid", EventStatType.TIMESTAMPED_EVENT_COUNTER),
+    HYBRID_QUERY_FILTER_REQUESTS("hybrid_query_with_filter_requests", "query.hybrid", EventStatType.TIMESTAMPED_EVENT_COUNTER),
+    HYBRID_QUERY_PAGINATION_REQUESTS("hybrid_query_with_pagination_requests", "query.hybrid", EventStatType.TIMESTAMPED_EVENT_COUNTER),;
 
     private final String nameString;
     private final String path;
diff --git a/src/test/java/org/opensearch/neuralsearch/query/HybridQueryFilterIT.java b/src/test/java/org/opensearch/neuralsearch/query/HybridQueryFilterIT.java
@@ -145,8 +145,8 @@ public void testFilterOnHybridQuery_statsEnabled() {
         Map<String, Object> allNodesStats = parseAggregatedNodeStatsResponse(responseBody);
 
         // Parse json to get stats
-        assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_COUNT));
-        assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_FILTER_COUNT));
+        assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_REQUESTS));
+        assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_FILTER_REQUESTS));
 
         updateClusterSettings("plugins.neural_search.stats_enabled", false);
     }
diff --git a/src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java b/src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java
@@ -893,12 +893,12 @@ public void testComplexQuery_whenMultipleSubqueries_statsEnabled_thenSuccessful(
         Map<String, Object> allNodesStats = parseAggregatedNodeStatsResponse(responseBody);
 
         // Parse json to get stats
-        assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_COUNT));
+        assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_REQUESTS));
 
         // Verify optional stats are not incremented
-        assertEquals(0, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_INNER_HITS_COUNT));
-        assertEquals(0, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_PAGINATION_COUNT));
-        assertEquals(0, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_FILTER_COUNT));
+        assertEquals(0, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_INNER_HITS_REQUESTS));
+        assertEquals(0, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_PAGINATION_REQUESTS));
+        assertEquals(0, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_FILTER_REQUESTS));
 
         updateClusterSettings("plugins.neural_search.stats_enabled", false);
     }
@@ -918,8 +918,8 @@ public void testPaginationOnSingleShard_statsEnabled_thenSuccessful() {
         Map<String, Object> allNodesStats = parseAggregatedNodeStatsResponse(responseBody);
 
         // Parse json to get stats
-        assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_COUNT));
-        assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_PAGINATION_COUNT));
+        assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_REQUESTS));
+        assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_PAGINATION_REQUESTS));
 
         updateClusterSettings("plugins.neural_search.stats_enabled", false);
     }
diff --git a/src/test/java/org/opensearch/neuralsearch/query/HybridQueryInnerHitsIT.java b/src/test/java/org/opensearch/neuralsearch/query/HybridQueryInnerHitsIT.java
@@ -592,8 +592,8 @@ public void testInnerHits_whenMultipleSubqueriesOnNestedFields_statsEnabled_then
         Map<String, Object> allNodesStats = parseAggregatedNodeStatsResponse(responseBody);
 
         // Parse json to get stats
-        assertEquals(2, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_COUNT));
-        assertEquals(2, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_INNER_HITS_COUNT));
+        assertEquals(2, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_REQUESTS));
+        assertEquals(2, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_INNER_HITS_REQUESTS));
 
         updateClusterSettings("plugins.neural_search.stats_enabled", false);
     }

Original file line number	Diff line number	Diff line change
`@@ -427,15 +427,15 @@ protected void extractInnerHitBuilders(Map<String, InnerHitContextBuilder> inner`
`427`	`427`	`}`
`428`	`428`
`429`	`429`	`private static void updateQueryStats(boolean hasFilter, boolean hasPagination, boolean hasInnerHits) {`
`430`		`- EventStatsManager.increment(EventStatName.HYBRID_QUERY_COUNT);`
	`430`	`+ EventStatsManager.increment(EventStatName.HYBRID_QUERY_REQUESTS);`
`431`	`431`	`if (hasFilter) {`
`432`		`- EventStatsManager.increment(EventStatName.HYBRID_QUERY_FILTER_COUNT);`
	`432`	`+ EventStatsManager.increment(EventStatName.HYBRID_QUERY_FILTER_REQUESTS);`
`433`	`433`	`}`
`434`	`434`	`if (hasPagination) {`
`435`		`- EventStatsManager.increment(EventStatName.HYBRID_QUERY_PAGINATION_COUNT);`
	`435`	`+ EventStatsManager.increment(EventStatName.HYBRID_QUERY_PAGINATION_REQUESTS);`
`436`	`436`	`}`
`437`	`437`	`if (hasInnerHits) {`
`438`		`- EventStatsManager.increment(EventStatName.HYBRID_QUERY_INNER_HITS_COUNT);`
	`438`	`+ EventStatsManager.increment(EventStatName.HYBRID_QUERY_INNER_HITS_REQUESTS);`
`439`	`439`	`}`
`440`	`440`	`}`
`441`	`441`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,8 @@ public void testFilterOnHybridQuery_statsEnabled() {`
`145`	`145`	`Map<String, Object> allNodesStats = parseAggregatedNodeStatsResponse(responseBody);`
`146`	`146`
`147`	`147`	`// Parse json to get stats`
`148`		`- assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_COUNT));`
`149`		`- assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_FILTER_COUNT));`
	`148`	`+ assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_REQUESTS));`
	`149`	`+ assertEquals(1, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_FILTER_REQUESTS));`
`150`	`150`
`151`	`151`	`updateClusterSettings("plugins.neural_search.stats_enabled", false);`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -592,8 +592,8 @@ public void testInnerHits_whenMultipleSubqueriesOnNestedFields_statsEnabled_then`
`592`	`592`	`Map<String, Object> allNodesStats = parseAggregatedNodeStatsResponse(responseBody);`
`593`	`593`
`594`	`594`	`// Parse json to get stats`
`595`		`- assertEquals(2, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_COUNT));`
`596`		`- assertEquals(2, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_INNER_HITS_COUNT));`
	`595`	`+ assertEquals(2, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_REQUESTS));`
	`596`	`+ assertEquals(2, getNestedValue(allNodesStats, EventStatName.HYBRID_QUERY_INNER_HITS_REQUESTS));`
`597`	`597`
`598`	`598`	`updateClusterSettings("plugins.neural_search.stats_enabled", false);`
`599`	`599`	`}`