From a1e216b148a7821c0b7cee8b336939dfd75a4dfb Mon Sep 17 00:00:00 2001 From: Sergi Massaneda Date: Mon, 26 Aug 2024 19:23:54 +0200 Subject: [PATCH] [Timeline] Events request end tracking (#191289) ## Summary Bring APM `endTracking` calls back in the timeline events request, since they were accidentally removed [here](https://github.com/elastic/kibana/commit/f1dc15ae4b99791616295e4c6832ee8a10d9eab6#diff-982a0a7f37bfa4c40cc92dc21648118bb152723ad895d932da368341ddea1628L263) --- .../components/events_viewer/use_timelines_events.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/use_timelines_events.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/use_timelines_events.tsx index 375346e42c834e..4455e613b87765 100644 --- a/x-pack/plugins/security_solution/public/common/components/events_viewer/use_timelines_events.tsx +++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/use_timelines_events.tsx @@ -126,7 +126,7 @@ const useApmTracking = (tableId: string) => { // The blocking span needs to be ended manually when the batched request finishes. const span = transaction?.startSpan('batched search', 'http-request', { blocking: true }); return { - endTracking: (result: 'success' | 'error' | 'aborted' | 'invalid') => { + endTracking: (result: 'success' | 'error' | 'aborted') => { transaction?.addLabels({ result }); span?.end(); }, @@ -230,7 +230,7 @@ export const useTimelineEventsHandler = ({ abortCtrl.current = new AbortController(); setLoading(true); if (data && data.search) { - startTracking(); + const { endTracking } = startTracking(); const abortSignal = abortCtrl.current.signal; searchSubscription$.current = data.search .search>( @@ -249,6 +249,7 @@ export const useTimelineEventsHandler = ({ next: (response) => { if (!isRunningResponse(response)) { setTimelineResponse((prevResponse) => { + endTracking('success'); const newTimelineResponse = { ...prevResponse, consumers: response.consumers, @@ -271,6 +272,7 @@ export const useTimelineEventsHandler = ({ } }, error: (msg) => { + endTracking(abortSignal.aborted ? 'aborted' : 'error'); setLoading(false); data.search.showError(msg); searchSubscription$.current.unsubscribe();