GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-10-13 09:41:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add resource_deployment_environment as fast filter in traces page (#5864)

Browse Source 
* feat: add resource_deployment_environment as fast filter in traces page

* chore: directly use deployment.environment, rather than converting resource_deployment_environment

* chore: make environment filter expanded by default

* chore: add deployment.environment to defaultOpenSections to pass the test

---------

Co-authored-by: Ankit Nayan <ankit@signoz.io>
This commit is contained in:
Shaheer Kochai 2024-09-11 08:52:45 +04:30 committed by GitHub
parent 47d42e6a57
commit 2cc2a43e17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/pages/TracesExplorer/Filter/Section.tsx
View File

@ -37,6 +37,7 @@ export function Section(props: SectionProps): JSX.Element {
'hasError', 'hasError',
'durationNano', 'durationNano',
'serviceName', 'serviceName',
'deployment.environment',
]), ]),
), ),
[selectedFilters], [selectedFilters],

20
frontend/src/pages/TracesExplorer/Filter/filterUtils.ts
View File

@ -8,10 +8,11 @@ import {
import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData'; import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder'; import { DataSource } from 'types/common/queryBuilder';
export const AllTraceFilterKeyValue = { export const AllTraceFilterKeyValue: Record<string, string> = {
durationNanoMin: 'Duration', durationNanoMin: 'Duration',
durationNano: 'Duration', durationNano: 'Duration',
durationNanoMax: 'Duration', durationNanoMax: 'Duration',
'deployment.environment': 'Environment',
hasError: 'Status', hasError: 'Status',
serviceName: 'Service Name', serviceName: 'Service Name',
name: 'Operation / Name', name: 'Operation / Name',
@ -22,7 +23,7 @@ export const AllTraceFilterKeyValue = {
httpRoute: 'HTTP Route', httpRoute: 'HTTP Route',
httpUrl: 'HTTP URL', httpUrl: 'HTTP URL',
traceID: 'Trace ID', traceID: 'Trace ID',
}; } as const;
export type AllTraceFilterKeys = keyof typeof AllTraceFilterKeyValue; export type AllTraceFilterKeys = keyof typeof AllTraceFilterKeyValue;
@ -64,7 +65,7 @@ export const addFilter = (
| undefined | undefined
> >
>, >,
keys?: BaseAutocompleteData, keys: BaseAutocompleteData,
): void => { ): void => {
setSelectedFilters((prevFilters) => { setSelectedFilters((prevFilters) => {
const isDuration = [ const isDuration = [
@ -122,7 +123,7 @@ export const removeFilter = (
| undefined | undefined
> >
>, >,
keys?: BaseAutocompleteData, keys: BaseAutocompleteData,
): void => { ): void => {
setSelectedFilters((prevFilters) => { setSelectedFilters((prevFilters) => {
if (!prevFilters || !prevFilters[filterType]?.values.length) { if (!prevFilters || !prevFilters[filterType]?.values.length) {
@ -202,6 +203,15 @@ export const traceFilterKeys: Record<
isJSON: false, isJSON: false,
id: 'serviceName--string--tag--true', id: 'serviceName--string--tag--true',
}, },
'deployment.environment': {
key: 'deployment.environment',
dataType: DataTypes.String,
type: 'resource',
isColumn: false,
isJSON: false,
id: 'deployment.environment--string--resource--false',
},
name: { name: {
key: 'name', key: 'name',
dataType: DataTypes.String, dataType: DataTypes.String,
@ -282,7 +292,7 @@ export const traceFilterKeys: Record<
isJSON: false, isJSON: false,
id: 'durationNanoMax--float64--tag--true', id: 'durationNanoMax--float64--tag--true',
}, },
}; } as const;
interface AggregateValuesProps { interface AggregateValuesProps {
value: AllTraceFilterKeys; value: AllTraceFilterKeys;

7
frontend/src/pages/TracesExplorer/__test__/testUtils.ts
View File

@ -244,7 +244,12 @@ export function checkIfSectionIsNotOpen(
expect(section.querySelector('.ant-collapse-item-active')).toBeNull(); expect(section.querySelector('.ant-collapse-item-active')).toBeNull();
} }
export const defaultOpenSections = ['hasError', 'durationNano', 'serviceName']; export const defaultOpenSections = [
'hasError',
'durationNano',
'serviceName',
'deployment.environment',
];
export const defaultClosedSections = Object.keys(AllTraceFilterKeyValue).filter( export const defaultClosedSections = Object.keys(AllTraceFilterKeyValue).filter(
(section) => (section) =>