Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 6 commits into from
Sep 11, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a9b22d
feat: add resource_deployment_environment as fast filter in traces page
ahmadshaheer Sep 5, 2024
8cb2bd5
chore: directly use deployment.environment, rather than converting re…
ahmadshaheer Sep 6, 2024
f845ed0
chore: make environment filter expanded by default
ahmadshaheer Sep 9, 2024
8cbac1d
Merge branch 'develop' into feat/add-environment-as-fast-filter-to-tr…
ankitnayan Sep 9, 2024
0fd6872
chore: add deployment.environment to defaultOpenSections to pass the …
ahmadshaheer Sep 10, 2024
20726fa
Merge branch 'develop' into feat/add-environment-as-fast-filter-to-tr…
ahmadshaheer Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/src/pages/TracesExplorer/Filter/Section.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export function Section(props: SectionProps): JSX.Element {
'hasError',
'durationNano',
'serviceName',
'deployment.environment',
]),
),
[selectedFilters],
Expand Down
20 changes: 15 additions & 5 deletions frontend/src/pages/TracesExplorer/Filter/filterUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ import {
import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder';

export const AllTraceFilterKeyValue = {
export const AllTraceFilterKeyValue: Record<string, string> = {
durationNanoMin: 'Duration',
durationNano: 'Duration',
durationNanoMax: 'Duration',
'deployment.environment': 'Environment',
hasError: 'Status',
serviceName: 'Service Name',
name: 'Operation / Name',
Expand All @@ -22,7 +23,7 @@ export const AllTraceFilterKeyValue = {
httpRoute: 'HTTP Route',
httpUrl: 'HTTP URL',
traceID: 'Trace ID',
};
} as const;

export type AllTraceFilterKeys = keyof typeof AllTraceFilterKeyValue;

Expand Down Expand Up @@ -64,7 +65,7 @@ export const addFilter = (
| undefined
>
>,
keys?: BaseAutocompleteData,
keys: BaseAutocompleteData,
): void => {
setSelectedFilters((prevFilters) => {
const isDuration = [
Expand Down Expand Up @@ -122,7 +123,7 @@ export const removeFilter = (
| undefined
>
>,
keys?: BaseAutocompleteData,
keys: BaseAutocompleteData,
): void => {
setSelectedFilters((prevFilters) => {
if (!prevFilters || !prevFilters[filterType]?.values.length) {
Expand Down Expand Up @@ -202,6 +203,15 @@ export const traceFilterKeys: Record<
isJSON: false,
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: {
key: 'name',
dataType: DataTypes.String,
Expand Down Expand Up @@ -282,7 +292,7 @@ export const traceFilterKeys: Record<
isJSON: false,
id: 'durationNanoMax--float64--tag--true',
},
};
} as const;

interface AggregateValuesProps {
value: AllTraceFilterKeys;
Expand Down
7 changes: 6 additions & 1 deletion frontend/src/pages/TracesExplorer/__test__/testUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,12 @@ export function checkIfSectionIsNotOpen(
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(
(section) =>
Expand Down
Loading