@@ -220,10 +220,6 @@ public void onRequestFailure(final SearchPhaseContext context, final SearchReque
220
220
constructSearchQueryRecord (context , searchRequestContext );
221
221
}
222
222
223
- private boolean shouldCollect (MetricType metricType ) {
224
- return queryInsightsService .isSearchQueryMetricsFeatureEnabled () || queryInsightsService .isCollectionEnabled (metricType );
225
- }
226
-
227
223
private void constructSearchQueryRecord (final SearchPhaseContext context , final SearchRequestContext searchRequestContext ) {
228
224
SearchTask searchTask = context .getTask ();
229
225
List <TaskResourceInfo > tasksResourceUsages = searchRequestContext .getPhaseResourceUsage ();
@@ -240,28 +236,22 @@ private void constructSearchQueryRecord(final SearchPhaseContext context, final
240
236
final SearchRequest request = context .getRequest ();
241
237
try {
242
238
Map <MetricType , Measurement > measurements = new HashMap <>();
243
- if (shouldCollect (MetricType .LATENCY )) {
244
- measurements .put (
245
- MetricType .LATENCY ,
246
- new Measurement (TimeUnit .NANOSECONDS .toMillis (System .nanoTime () - searchRequestContext .getAbsoluteStartNanos ()))
247
- );
248
- }
249
- if (shouldCollect (MetricType .CPU )) {
250
- measurements .put (
251
- MetricType .CPU ,
252
- new Measurement (
253
- tasksResourceUsages .stream ().map (a -> a .getTaskResourceUsage ().getCpuTimeInNanos ()).mapToLong (Long ::longValue ).sum ()
254
- )
255
- );
256
- }
257
- if (shouldCollect (MetricType .MEMORY )) {
258
- measurements .put (
259
- MetricType .MEMORY ,
260
- new Measurement (
261
- tasksResourceUsages .stream ().map (a -> a .getTaskResourceUsage ().getMemoryInBytes ()).mapToLong (Long ::longValue ).sum ()
262
- )
263
- );
264
- }
239
+ measurements .put (
240
+ MetricType .LATENCY ,
241
+ new Measurement (TimeUnit .NANOSECONDS .toMillis (System .nanoTime () - searchRequestContext .getAbsoluteStartNanos ()))
242
+ );
243
+ measurements .put (
244
+ MetricType .CPU ,
245
+ new Measurement (
246
+ tasksResourceUsages .stream ().map (a -> a .getTaskResourceUsage ().getCpuTimeInNanos ()).mapToLong (Long ::longValue ).sum ()
247
+ )
248
+ );
249
+ measurements .put (
250
+ MetricType .MEMORY ,
251
+ new Measurement (
252
+ tasksResourceUsages .stream ().map (a -> a .getTaskResourceUsage ().getMemoryInBytes ()).mapToLong (Long ::longValue ).sum ()
253
+ )
254
+ );
265
255
266
256
Map <Attribute , Object > attributes = new HashMap <>();
267
257
attributes .put (Attribute .SEARCH_TYPE , request .searchType ().toString ().toLowerCase (Locale .ROOT ));
0 commit comments