Skip to content

Commit

Permalink
[Timeline] Events request end tracking (#191289)
Browse files Browse the repository at this point in the history
## Summary

Bring APM `endTracking` calls back in the timeline events request, since
they were accidentally removed
[here](f1dc15a#diff-982a0a7f37bfa4c40cc92dc21648118bb152723ad895d932da368341ddea1628L263)
  • Loading branch information
semd committed Aug 26, 2024
1 parent 64b79d7 commit a1e216b
Showing 1 changed file with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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();
},
Expand Down Expand Up @@ -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<TimelineRequest, TimelineResponse<typeof language>>(
Expand All @@ -249,6 +249,7 @@ export const useTimelineEventsHandler = ({
next: (response) => {
if (!isRunningResponse(response)) {
setTimelineResponse((prevResponse) => {
endTracking('success');
const newTimelineResponse = {
...prevResponse,
consumers: response.consumers,
Expand All @@ -271,6 +272,7 @@ export const useTimelineEventsHandler = ({
}
},
error: (msg) => {
endTracking(abortSignal.aborted ? 'aborted' : 'error');
setLoading(false);
data.search.showError(msg);
searchSubscription$.current.unsubscribe();
Expand Down

0 comments on commit a1e216b

Please sign in to comment.