Skip to content

Commit f57c7e8

Browse files
Abdkhan14Abdullah Khan
andauthored
feat(issues-trace-meta): Removing redundant /events-trace-meta/ requests (#94978)
...From issue details trace previews. --------- Co-authored-by: Abdullah Khan <abdullahkhan@PG9Y57YDXQ.local>
1 parent 2769609 commit f57c7e8

File tree

4 files changed

+10
-32
lines changed

4 files changed

+10
-32
lines changed

static/app/components/events/interfaces/performance/eventTraceView.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {IssuesTraceWaterfall} from 'sentry/views/performance/newTraceDetails/iss
2020
import {getTraceLinkForIssue} from 'sentry/views/performance/newTraceDetails/issuesTraceWaterfallOverlay';
2121
import {useIssuesTraceTree} from 'sentry/views/performance/newTraceDetails/traceApi/useIssuesTraceTree';
2222
import {useTrace} from 'sentry/views/performance/newTraceDetails/traceApi/useTrace';
23-
import {useTraceMeta} from 'sentry/views/performance/newTraceDetails/traceApi/useTraceMeta';
2423
import {useTraceRootEvent} from 'sentry/views/performance/newTraceDetails/traceApi/useTraceRootEvent';
2524
import {TraceViewSources} from 'sentry/views/performance/newTraceDetails/traceHeader/breadcrumbs';
2625
import {TraceHeaderComponents} from 'sentry/views/performance/newTraceDetails/traceHeader/styles';
@@ -71,8 +70,7 @@ function EventTraceViewInner({event, organization, traceId}: EventTraceViewInner
7170
const params = useTraceQueryParams({
7271
timestamp,
7372
});
74-
const meta = useTraceMeta([{traceSlug: traceId, timestamp}]);
75-
const tree = useIssuesTraceTree({trace, meta, replay: null});
73+
const tree = useIssuesTraceTree({trace, replay: null});
7674

7775
const rootEventResults = useTraceRootEvent({
7876
tree,
@@ -97,7 +95,6 @@ function EventTraceViewInner({event, organization, traceId}: EventTraceViewInner
9795
rootEventResults={rootEventResults}
9896
organization={organization}
9997
traceEventView={traceEventView}
100-
meta={meta}
10198
source="issues"
10299
replay={null}
103100
event={event}

static/app/components/events/interfaces/performance/spanEvidenceTraceView.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import type {Event} from 'sentry/types/event';
66
import type {Organization} from 'sentry/types/organization';
77
import {useIssuesTraceTree} from 'sentry/views/performance/newTraceDetails/traceApi/useIssuesTraceTree';
88
import {useTrace} from 'sentry/views/performance/newTraceDetails/traceApi/useTrace';
9-
import {useTraceMeta} from 'sentry/views/performance/newTraceDetails/traceApi/useTraceMeta';
109
import {useTraceRootEvent} from 'sentry/views/performance/newTraceDetails/traceApi/useTraceRootEvent';
1110
import {
1211
getInitialTracePreferences,
@@ -82,8 +81,7 @@ function SpanEvidenceTraceViewImpl({
8281
traceSlug: traceId,
8382
limit: 10000,
8483
});
85-
const meta = useTraceMeta([{traceSlug: traceId, timestamp}]);
86-
const tree = useIssuesTraceTree({trace, meta, replay: null});
84+
const tree = useIssuesTraceTree({trace, replay: null});
8785

8886
const rootEventResults = useTraceRootEvent({
8987
tree,
@@ -110,7 +108,6 @@ function SpanEvidenceTraceViewImpl({
110108
rootEventResults={rootEventResults}
111109
organization={organization}
112110
traceEventView={traceEventView}
113-
meta={meta}
114111
source="issues"
115112
replay={null}
116113
event={event}

static/app/views/performance/newTraceDetails/issuesTraceWaterfall.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import {useTraceTimelineChangeSync} from './useTraceTimelineChangeSync';
5252
const noopTraceSearch = () => {};
5353

5454
interface IssuesTraceWaterfallProps
55-
extends Omit<TraceWaterfallProps, 'tree' | 'traceWaterfallScrollHandlers'> {
55+
extends Omit<TraceWaterfallProps, 'tree' | 'traceWaterfallScrollHandlers' | 'meta'> {
5656
event: Event;
5757
tree: IssuesTraceTree;
5858
}

static/app/views/performance/newTraceDetails/traceApi/useIssuesTraceTree.tsx

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,20 @@ import type {TraceTree} from 'sentry/views/performance/newTraceDetails/traceMode
1010
import {useTraceState} from 'sentry/views/performance/newTraceDetails/traceState/traceStateProvider';
1111
import type {HydratedReplayRecord} from 'sentry/views/replays/types';
1212

13-
import type {TraceMetaQueryResults} from './useTraceMeta';
1413
import {isEmptyTrace} from './utils';
1514

1615
type UseTraceTreeParams = {
17-
meta: TraceMetaQueryResults;
1816
replay: HydratedReplayRecord | null;
1917
trace: UseApiQueryResult<TraceTree.Trace | undefined, any>;
2018
traceSlug?: string;
2119
};
2220

23-
function getTraceViewQueryStatus(
24-
traceQueryStatus: QueryStatus,
25-
traceMetaQueryStatus: QueryStatus
26-
): QueryStatus {
27-
if (traceQueryStatus === 'error' || traceMetaQueryStatus === 'error') {
21+
function getTraceViewQueryStatus(traceQueryStatus: QueryStatus): QueryStatus {
22+
if (traceQueryStatus === 'error') {
2823
return 'error';
2924
}
3025

31-
if (traceQueryStatus === 'pending' || traceMetaQueryStatus === 'pending') {
26+
if (traceQueryStatus === 'pending') {
3227
return 'pending';
3328
}
3429

@@ -37,7 +32,6 @@ function getTraceViewQueryStatus(
3732

3833
export function useIssuesTraceTree({
3934
trace,
40-
meta,
4135
replay,
4236
traceSlug,
4337
}: UseTraceTreeParams): IssuesTraceTree {
@@ -49,7 +43,7 @@ export function useIssuesTraceTree({
4943
const [tree, setTree] = useState<IssuesTraceTree>(IssuesTraceTree.Empty());
5044

5145
useEffect(() => {
52-
const status = getTraceViewQueryStatus(trace.status, meta.status);
46+
const status = getTraceViewQueryStatus(trace.status);
5347

5448
if (status === 'error') {
5549
setTree(t =>
@@ -82,9 +76,9 @@ export function useIssuesTraceTree({
8276
return;
8377
}
8478

85-
if (trace.data && meta.data) {
79+
if (trace.data) {
8680
const newTree = IssuesTraceTree.FromTrace(trace.data, {
87-
meta: meta.data,
81+
meta: null,
8882
replay,
8983
preferences: traceState.preferences,
9084
});
@@ -95,17 +89,7 @@ export function useIssuesTraceTree({
9589
}
9690

9791
// eslint-disable-next-line react-hooks/exhaustive-deps
98-
}, [
99-
api,
100-
organization,
101-
projects,
102-
replay,
103-
meta.status,
104-
trace.status,
105-
trace.data,
106-
meta.data,
107-
traceSlug,
108-
]);
92+
}, [api, organization, projects, replay, trace.status, trace.data, traceSlug]);
10993

11094
return tree;
11195
}

0 commit comments

Comments
 (0)