Skip to content

Commit f2f3eca

Browse files
Add MDS support for missing datasourceId in traceGroup requests (#2333)
* Add MDS support for missing datasourceId in traceGroup requests Signed-off-by: Shenoy Pratik <[email protected]> * remove unused mode variable Signed-off-by: Shenoy Pratik <[email protected]> --------- Signed-off-by: Shenoy Pratik <[email protected]> (cherry picked from commit 622f617) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 036a4f9 commit f2f3eca

File tree

2 files changed

+31
-25
lines changed

2 files changed

+31
-25
lines changed

public/components/trace_analytics/components/traces/span_detail_table.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ export function SpanDetailTable(props: SpanDetailTableProps) {
172172
const [items, setItems] = useState<Span[]>([]);
173173
const [total, setTotal] = useState(0);
174174
const [isSpansTableDataLoading, setIsSpansTableDataLoading] = useState(false);
175-
const { mode } = props;
176175

177176
const fetchData = async () => {
178177
setIsSpansTableDataLoading(true);

public/components/trace_analytics/requests/dashboard_request_handler.ts

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,21 @@ export const handleDashboardRequest = async (
6262
latencyTrendDSL,
6363
getLatencyTrendQuery(),
6464
mode,
65-
setShowTimeoutToast
65+
setShowTimeoutToast,
66+
dataSourceMDSId
6667
)
6768
.then((response) => {
6869
const map: any = {};
69-
response.aggregations.trace_group_name.buckets.map((bucket) => {
70-
const latencyTrend = bucket.group_by_hour.buckets
70+
response.aggregations.trace_group_name.buckets.map((aggBucket) => {
71+
const latencyTrend = aggBucket.group_by_hour.buckets
7172
.slice(-24)
72-
.filter((bucket) => bucket.average_latency?.value || bucket.average_latency?.value === 0);
73+
.filter(
74+
(filterBucket) =>
75+
filterBucket.average_latency?.value || filterBucket.average_latency?.value === 0
76+
);
7377
const values = {
74-
x: latencyTrend.map((bucket) => bucket.key),
75-
y: latencyTrend.map((bucket) => bucket.average_latency?.value || 0),
78+
x: latencyTrend.map((xBucket) => xBucket.key),
79+
y: latencyTrend.map((yBucket) => yBucket.average_latency?.value || 0),
7680
};
7781
const latencyTrendData =
7882
values.x?.length > 0
@@ -115,7 +119,7 @@ export const handleDashboardRequest = async (
115119
},
116120
}
117121
: {};
118-
map[bucket.key] = latencyTrendData;
122+
map[aggBucket.key] = latencyTrendData;
119123
});
120124
return map;
121125
})
@@ -152,8 +156,7 @@ export const handleJaegerDashboardRequest = async (
152156
setItems,
153157
mode,
154158
setShowTimeoutToast,
155-
dataSourceMDSId?,
156-
setPercentileMap?
159+
dataSourceMDSId?
157160
) => {
158161
const latencyTrends = await handleDslRequest(
159162
http,
@@ -165,13 +168,16 @@ export const handleJaegerDashboardRequest = async (
165168
)
166169
.then((response) => {
167170
const map: any = {};
168-
response.aggregations.trace_group_name.buckets.map((bucket) => {
169-
const latencyTrend = bucket.group_by_hour.buckets
171+
response.aggregations.trace_group_name.buckets.map((aggBucket) => {
172+
const latencyTrend = aggBucket.group_by_hour.buckets
170173
.slice(-24)
171-
.filter((bucket) => bucket.average_latency?.value || bucket.average_latency?.value === 0);
174+
.filter(
175+
(filterBucket) =>
176+
filterBucket.average_latency?.value || filterBucket.average_latency?.value === 0
177+
);
172178
const values = {
173-
x: latencyTrend.map((bucket) => bucket.key),
174-
y: latencyTrend.map((bucket) => bucket.average_latency?.value || 0),
179+
x: latencyTrend.map((xBucket) => xBucket.key),
180+
y: latencyTrend.map((yBucket) => yBucket.average_latency?.value || 0),
175181
};
176182
const latencyTrendData =
177183
values.x?.length > 0
@@ -211,7 +217,7 @@ export const handleJaegerDashboardRequest = async (
211217
},
212218
}
213219
: {};
214-
map[bucket.key] = latencyTrendData;
220+
map[aggBucket.key] = latencyTrendData;
215221
});
216222
return map;
217223
})
@@ -251,7 +257,7 @@ export const handleJaegerDashboardRequest = async (
251257
newItems.map((a) => a.dashboard_trace_group_name)
252258
),
253259
mode,
254-
true,
260+
dataSourceMDSId,
255261
setShowTimeoutToast
256262
)
257263
.then((response) => {
@@ -281,8 +287,7 @@ export const handleJaegerErrorDashboardRequest = async (
281287
setItems,
282288
mode,
283289
setShowTimeoutToast,
284-
dataSourceMDSId?,
285-
setPercentileMap?
290+
dataSourceMDSId?
286291
) => {
287292
const errorTrends = await handleDslRequest(
288293
http,
@@ -294,13 +299,15 @@ export const handleJaegerErrorDashboardRequest = async (
294299
)
295300
.then((response) => {
296301
const map: any = {};
297-
response.aggregations.trace_group_name.buckets.map((bucket) => {
298-
const errorTrend = bucket.group_by_hour.buckets
302+
response.aggregations.trace_group_name.buckets.map((aggBucket) => {
303+
const errorTrend = aggBucket.group_by_hour.buckets
299304
.slice(-24)
300-
.filter((bucket) => bucket.error_rate?.value || bucket.error_rate?.value === 0);
305+
.filter(
306+
(filterBucket) => filterBucket.error_rate?.value || filterBucket.error_rate?.value === 0
307+
);
301308
const values = {
302-
x: errorTrend.map((bucket) => bucket.key),
303-
y: errorTrend.map((bucket) => bucket.error_rate?.value || 0),
309+
x: errorTrend.map((xBucket) => xBucket.key),
310+
y: errorTrend.map((yBucket) => yBucket.error_rate?.value || 0),
304311
};
305312
const errorTrendData =
306313
values.x?.length > 0
@@ -340,7 +347,7 @@ export const handleJaegerErrorDashboardRequest = async (
340347
},
341348
}
342349
: {};
343-
map[bucket.key] = errorTrendData;
350+
map[aggBucket.key] = errorTrendData;
344351
});
345352
return map;
346353
})

0 commit comments

Comments
 (0)