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

Tempo: Normalize static filter queries (#72794)

Browse Source 
* Only show static filter if tag is defined

* Update previosuly left out test

* Add test

* Add warning if tag is missing
This commit is contained in:
Joey 2023-09-27 09:03:37 +01:00 committed by GitHub
parent 0128d0403f
commit d57aef2eda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.test.tsx
View File

@ -1,6 +1,7 @@
import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import React from 'react';
import { act } from 'react-dom/test-utils';
import { initTemplateSrv } from 'test/helpers/initTemplateSrv';
import { config } from '@grafana/runtime';
@ -121,6 +122,27 @@ describe('TraceQLSearch', () => {
}
});
it('should not render static filter when no tag is configured', async () => {
const datasource: TempoDatasource = {
search: {
filters: [
{
id: 'service-name',
operator: '=',
scope: TraceqlSearchScope.Resource,
},
],
},
} as TempoDatasource;
datasource.languageProvider = new TempoLanguageProvider(datasource);
await act(async () => {
const { container } = render(<TraceQLSearch datasource={datasource} query={query} onChange={onChange} />);
const serviceNameValue = container.querySelector(`input[aria-label="select service-name value"]`);
expect(serviceNameValue).toBeNull();
expect(serviceNameValue).not.toBeInTheDocument();
});
});
it('should not render group by when feature toggle is not enabled', async () => {
await waitFor(() => {
render(<TraceQLSearch datasource={datasource} query={query} onChange={onChange} />);

7
public/app/plugins/datasource/tempo/SearchTraceQLEditor/TraceQLSearch.tsx
View File

@ -104,7 +104,9 @@ const TraceQLSearch = ({ datasource, query, onChange }: Props) => {
<>
<div className={styles.container}>
<div>
{datasource.search?.filters?.map((f) => (
{datasource.search?.filters?.map(
(f) =>
f.tag && (
<InlineSearchField
key={f.id}
label={filterTitle(f)}
@ -123,7 +125,8 @@ const TraceQLSearch = ({ datasource, query, onChange }: Props) => {
query={traceQlQuery}
/>
</InlineSearchField>
))}
)
)}
<InlineSearchField
label={'Duration'}
tooltip="The span duration, i.e. end - start time of the span. Accepted units are ns, ms, s, m, h"

5
public/app/plugins/datasource/tempo/configuration/TraceQLSearchTags.tsx
View File

@ -77,6 +77,8 @@ export function TraceQLSearchTags({ options, onOptionsChange, datasource }: Prop
// filter out tags that already exist in TraceQLSearch editor
const staticTags = ['duration'];
const missingTag = options.jsonData.search?.filters?.find((f) => !f.tag);
return (
<>
{datasource ? (
@ -99,6 +101,9 @@ export function TraceQLSearchTags({ options, onOptionsChange, datasource }: Prop
{error.message}
</Alert>
)}
{missingTag && (
<Alert title={'Please ensure each filter has a selected tag'} severity={'warning'} topSpacing={1}></Alert>
)}
</>
);
}