From 62ad8433bf44ac72871f47a7bf008cc8a78e1840 Mon Sep 17 00:00:00 2001 From: dhrubesh Date: Sun, 2 May 2021 20:02:44 +0530 Subject: [PATCH 1/3] adds service name in the trace when visiting from error --- frontend/src/modules/Traces/TraceFilter.tsx | 30 ++++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/frontend/src/modules/Traces/TraceFilter.tsx b/frontend/src/modules/Traces/TraceFilter.tsx index 20baf744b9..c1e04c8f89 100644 --- a/frontend/src/modules/Traces/TraceFilter.tsx +++ b/frontend/src/modules/Traces/TraceFilter.tsx @@ -62,6 +62,10 @@ const _TraceFilter = (props: TraceFilterProps) => { setServiceList(response.data); }) .then(() => { + /* + Todo + revisit this flow post refactoring store + */ const operationName = urlParams.get(METRICS_PAGE_QUERY_PARAM.operation); const serviceName = urlParams.get(METRICS_PAGE_QUERY_PARAM.service); const errorTag = urlParams.get(METRICS_PAGE_QUERY_PARAM.error); @@ -72,6 +76,18 @@ const _TraceFilter = (props: TraceFilterProps) => { service: serviceName, }); populateData(serviceName); + } else if (serviceName && errorTag) { + props.updateTraceFilters({ + ...props.traceFilters, + service: serviceName, + tags: [ + { + key: METRICS_PAGE_QUERY_PARAM.error, + value: errorTag, + operator: "EQUAL", + }, + ], + }); } else { if (operationName) { handleChangeOperation(operationName); @@ -79,13 +95,13 @@ const _TraceFilter = (props: TraceFilterProps) => { if (serviceName) { handleChangeService(serviceName); } - } - if (errorTag) { - onTagFormSubmit({ - tag_key: METRICS_PAGE_QUERY_PARAM.error, - tag_value: errorTag, - operator: "EQUAL", - }); + if (errorTag) { + onTagFormSubmit({ + tag_key: METRICS_PAGE_QUERY_PARAM.error, + tag_value: errorTag, + operator: "EQUAL", + }); + } } }); }, []); From fc2d32e72d9ccd2819bc3fa5abcb0b298c632de1 Mon Sep 17 00:00:00 2001 From: dhrubesh Date: Sun, 2 May 2021 20:04:12 +0530 Subject: [PATCH 2/3] removes *100 since the logic hsa been moved to BE --- frontend/src/modules/Metrics/ServicesTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/modules/Metrics/ServicesTable.tsx b/frontend/src/modules/Metrics/ServicesTable.tsx index 30df4fdf84..5da9568f98 100644 --- a/frontend/src/modules/Metrics/ServicesTable.tsx +++ b/frontend/src/modules/Metrics/ServicesTable.tsx @@ -75,7 +75,7 @@ const columns = [ key: "errorRate", sorter: (a: any, b: any) => a.errorRate - b.errorRate, // sortDirections: ['descend', 'ascend'], - render: (value: number) => (value * 100).toFixed(2), + render: (value: number) => (value).toFixed(2), }, { title: "Requests Per Second", From 9010d1631972bb44e4dfcadc0eeb61d10b4d5356 Mon Sep 17 00:00:00 2001 From: dhrubesh Date: Sun, 2 May 2021 20:31:30 +0530 Subject: [PATCH 3/3] equal --> equals --- frontend/src/modules/Traces/TraceFilter.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/modules/Traces/TraceFilter.tsx b/frontend/src/modules/Traces/TraceFilter.tsx index c1e04c8f89..839ef64d12 100644 --- a/frontend/src/modules/Traces/TraceFilter.tsx +++ b/frontend/src/modules/Traces/TraceFilter.tsx @@ -84,7 +84,7 @@ const _TraceFilter = (props: TraceFilterProps) => { { key: METRICS_PAGE_QUERY_PARAM.error, value: errorTag, - operator: "EQUAL", + operator: "equals", }, ], }); @@ -99,7 +99,7 @@ const _TraceFilter = (props: TraceFilterProps) => { onTagFormSubmit({ tag_key: METRICS_PAGE_QUERY_PARAM.error, tag_value: errorTag, - operator: "EQUAL", + operator: "equals", }); } }