IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Traces: Order keys in span filter select (#66689)

Browse Source 
* Order logs keys last

* Add tests
This commit is contained in:
Joey 2023-04-25 08:56:06 +01:00 committed by GitHub
parent 3bc002cd27
commit 5c2a344ce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.test.tsx
View File

@ -151,6 +151,23 @@ describe('SpanFilters', () => {
await selectAndCheckValue(user, tagValue, 'TagValue0'); await selectAndCheckValue(user, tagValue, 'TagValue0');
}); });
it('should order tag filters', async () => {
render(<SpanFiltersWithProps />);
const tagKey = screen.getByLabelText('Select tag key');
await user.click(tagKey);
jest.advanceTimersByTime(1000);
await waitFor(() => {
const container = screen.getByText('TagKey0').parentElement?.parentElement?.parentElement;
expect(container?.childNodes[0].textContent).toBe('ProcessKey0');
expect(container?.childNodes[1].textContent).toBe('ProcessKey1');
expect(container?.childNodes[2].textContent).toBe('TagKey0');
expect(container?.childNodes[3].textContent).toBe('TagKey1');
expect(container?.childNodes[4].textContent).toBe('LogKey0');
expect(container?.childNodes[5].textContent).toBe('LogKey1');
});
});
it('should allow adding/removing tags', async () => { it('should allow adding/removing tags', async () => {
render(<SpanFiltersWithProps />); render(<SpanFiltersWithProps />);
expect(screen.getAllByLabelText('Select tag key').length).toBe(1); expect(screen.getAllByLabelText('Select tag key').length).toBe(1);

15
public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx
View File

@ -112,7 +112,8 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
const getTagKeys = () => { const getTagKeys = () => {
if (!tagKeys) { if (!tagKeys) {
const keys: string[] = []; let keys: string[] = [];
let logKeys: string[] = [];
trace.spans.forEach((span) => { trace.spans.forEach((span) => {
span.tags.forEach((tag) => { span.tags.forEach((tag) => {
@ -124,18 +125,18 @@ export const SpanFilters = memo((props: SpanFilterProps) => {
if (span.logs !== null) { if (span.logs !== null) {
span.logs.forEach((log) => { span.logs.forEach((log) => {
log.fields.forEach((field) => { log.fields.forEach((field) => {
keys.push(field.key); logKeys.push(field.key);
}); });
}); });
} }
}); });
keys = uniq(keys).sort();
logKeys = uniq(logKeys).sort();
setTagKeys( setTagKeys(
uniq(keys) [...keys, ...logKeys].map((name) => {
.sort() return toOption(name);
.map((name) => { })
return toOption(name);
})
); );
} }
}; };