Skip to content

Commit 0c242db

Browse files
opensearch-trigger-bot[bot]github-actions[bot]Du Tran
authored
Skip profile queries (#298) (#304) (#319)
(cherry picked from commit dc1c3f2) (cherry picked from commit 38cb816) Signed-off-by: Du Tran <quangdutran809@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Du Tran <du.tran@array.world>
1 parent 6074654 commit 0c242db

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

src/main/java/org/opensearch/plugin/insights/core/listener/QueryInsightsListener.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,11 @@ public void onRequestFailure(final SearchPhaseContext context, final SearchReque
221221
}
222222

223223
private void constructSearchQueryRecord(final SearchPhaseContext context, final SearchRequestContext searchRequestContext) {
224+
// Skip profile queries
225+
if (searchRequestContext.getRequest().source().profile()) {
226+
return;
227+
}
228+
224229
SearchTask searchTask = context.getTask();
225230
List<TaskResourceInfo> tasksResourceUsages = searchRequestContext.getPhaseResourceUsage();
226231
tasksResourceUsages.add(

src/test/java/org/opensearch/plugin/insights/core/listener/QueryInsightsListenerTests.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void setup() {
7979
ClusterServiceUtils.setState(clusterService, state);
8080
when(queryInsightsService.isCollectionEnabled(MetricType.LATENCY)).thenReturn(true);
8181
when(queryInsightsService.getTopQueriesService(MetricType.LATENCY)).thenReturn(topQueriesService);
82-
82+
when(searchRequestContext.getRequest()).thenReturn(searchRequest);
8383
ThreadContext threadContext = new ThreadContext(Settings.EMPTY);
8484
threadPool.getThreadContext().setHeaders(new Tuple<>(Collections.singletonMap(Task.X_OPAQUE_ID, "userLabel"), new HashMap<>()));
8585
}
@@ -345,4 +345,12 @@ private QueryInsightsListener testFeatureEnableDisableSetup(
345345

346346
return queryInsightsListener;
347347
}
348+
349+
public void testSkipProfileQuery() {
350+
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().profile(true);
351+
when(searchRequest.source()).thenReturn(searchSourceBuilder);
352+
QueryInsightsListener queryInsightsListener = new QueryInsightsListener(clusterService, queryInsightsService);
353+
queryInsightsListener.onRequestEnd(searchPhaseContext, searchRequestContext);
354+
verify(queryInsightsService, times(0)).addRecord(any());
355+
}
348356
}

0 commit comments

Comments
 (0)