Always collect available metrics in top queries service

Signed-off-by: Chenyang Ji <[email protected]>
ansjcy · Jan 23, 2025 · 4cf233b · 4cf233b
1 parent 210ce5d
commit 4cf233b
Showing 1 changed file with 16 additions and 26 deletions.
diff --git a/src/main/java/org/opensearch/plugin/insights/core/listener/QueryInsightsListener.java b/src/main/java/org/opensearch/plugin/insights/core/listener/QueryInsightsListener.java
@@ -220,10 +220,6 @@ public void onRequestFailure(final SearchPhaseContext context, final SearchReque
         constructSearchQueryRecord(context, searchRequestContext);
     }
 
-    private boolean shouldCollect(MetricType metricType) {
-        return queryInsightsService.isSearchQueryMetricsFeatureEnabled() || queryInsightsService.isCollectionEnabled(metricType);
-    }
-
     private void constructSearchQueryRecord(final SearchPhaseContext context, final SearchRequestContext searchRequestContext) {
         SearchTask searchTask = context.getTask();
         List<TaskResourceInfo> tasksResourceUsages = searchRequestContext.getPhaseResourceUsage();
@@ -240,28 +236,22 @@ private void constructSearchQueryRecord(final SearchPhaseContext context, final
         final SearchRequest request = context.getRequest();
         try {
             Map<MetricType, Measurement> measurements = new HashMap<>();
-            if (shouldCollect(MetricType.LATENCY)) {
-                measurements.put(
-                    MetricType.LATENCY,
-                    new Measurement(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - searchRequestContext.getAbsoluteStartNanos()))
-                );
-            }
-            if (shouldCollect(MetricType.CPU)) {
-                measurements.put(
-                    MetricType.CPU,
-                    new Measurement(
-                        tasksResourceUsages.stream().map(a -> a.getTaskResourceUsage().getCpuTimeInNanos()).mapToLong(Long::longValue).sum()
-                    )
-                );
-            }
-            if (shouldCollect(MetricType.MEMORY)) {
-                measurements.put(
-                    MetricType.MEMORY,
-                    new Measurement(
-                        tasksResourceUsages.stream().map(a -> a.getTaskResourceUsage().getMemoryInBytes()).mapToLong(Long::longValue).sum()
-                    )
-                );
-            }
+            measurements.put(
+                MetricType.LATENCY,
+                new Measurement(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - searchRequestContext.getAbsoluteStartNanos()))
+            );
+            measurements.put(
+                MetricType.CPU,
+                new Measurement(
+                    tasksResourceUsages.stream().map(a -> a.getTaskResourceUsage().getCpuTimeInNanos()).mapToLong(Long::longValue).sum()
+                )
+            );
+            measurements.put(
+                MetricType.MEMORY,
+                new Measurement(
+                    tasksResourceUsages.stream().map(a -> a.getTaskResourceUsage().getMemoryInBytes()).mapToLong(Long::longValue).sum()
+                )
+            );
 
             Map<Attribute, Object> attributes = new HashMap<>();
             attributes.put(Attribute.SEARCH_TYPE, request.searchType().toString().toLowerCase(Locale.ROOT));