feat: add support for span scope (#6910)

* feat: add support for span scope

* refactor: remove inline style
This commit is contained in:
Shaheer Kochai 2025-01-27 12:55:10 +04:30 committed by GitHub
parent bd0c4beeee
commit cc3d78cd71
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 147 additions and 5 deletions

View File

@ -1,3 +1,10 @@
.query-builder-search-container {
position: relative;
display: flex;
align-items: center;
gap: 12px;
}
.selectOptionContainer {
display: flex;
gap: 8px;
@ -410,3 +417,6 @@
}
}
}
.span-scope-selector {
width: 160px;
}

View File

@ -0,0 +1,129 @@
import { Select } from 'antd';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { cloneDeep } from 'lodash-es';
import { useEffect, useState } from 'react';
import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
import { v4 as uuid } from 'uuid';
enum SpanScope {
ALL_SPANS = 'all_spans',
ROOT_SPANS = 'root_spans',
ENTRYPOINT_SPANS = 'entrypoint_spans',
}
interface SpanFilterConfig {
key: string;
type: string;
}
interface SpanScopeSelectorProps {
queryName: string;
}
const SPAN_FILTER_CONFIG: Record<SpanScope, SpanFilterConfig | null> = {
[SpanScope.ALL_SPANS]: null,
[SpanScope.ROOT_SPANS]: {
key: 'isRoot',
type: 'spanSearchScope',
},
[SpanScope.ENTRYPOINT_SPANS]: {
key: 'isEntryPoint',
type: 'spanSearchScope',
},
};
const createFilterItem = (config: SpanFilterConfig): TagFilterItem => ({
id: uuid().slice(0, 8),
key: {
key: config.key,
dataType: undefined,
isColumn: false,
type: config?.type,
},
op: '=',
value: 'true',
});
const SELECT_OPTIONS = [
{ value: SpanScope.ALL_SPANS, label: 'All Spans' },
{ value: SpanScope.ROOT_SPANS, label: 'Root Spans' },
{ value: SpanScope.ENTRYPOINT_SPANS, label: 'Entrypoint Spans' },
];
function SpanScopeSelector({ queryName }: SpanScopeSelectorProps): JSX.Element {
const { currentQuery, redirectWithQueryBuilderData } = useQueryBuilder();
const [selectedScope, setSelectedScope] = useState<SpanScope>(
SpanScope.ALL_SPANS,
);
const getCurrentScopeFromFilters = (
filters: TagFilterItem[] = [],
): SpanScope => {
const hasFilter = (key: string): boolean =>
filters.some(
(filter) =>
filter.key?.type === 'spanSearchScope' &&
filter.key.key === key &&
filter.value === 'true',
);
if (hasFilter('isRoot')) return SpanScope.ROOT_SPANS;
if (hasFilter('isEntryPoint')) return SpanScope.ENTRYPOINT_SPANS;
return SpanScope.ALL_SPANS;
};
useEffect(() => {
const queryData = currentQuery.builder.queryData.find(
(item) => item.queryName === queryName,
);
const filters = queryData?.filters?.items;
const currentScope = getCurrentScopeFromFilters(filters);
setSelectedScope(currentScope);
}, [currentQuery, queryName]);
const handleScopeChange = (newScope: SpanScope): void => {
const newQuery = cloneDeep(currentQuery);
const getUpdatedFilters = (
currentFilters: TagFilterItem[] = [],
isTargetQuery: boolean,
): TagFilterItem[] => {
if (!isTargetQuery) return currentFilters;
const nonScopeFilters = currentFilters.filter(
(filter) =>
!(
filter.key?.type === 'spanSearchScope' &&
(filter.key.key === 'isRoot' || filter.key.key === 'isEntryPoint')
),
);
const config = SPAN_FILTER_CONFIG[newScope];
const newScopeFilter = config !== null ? [createFilterItem(config)] : [];
return [...nonScopeFilters, ...newScopeFilter];
};
newQuery.builder.queryData = newQuery.builder.queryData.map((item) => ({
...item,
filters: {
...item.filters,
items: getUpdatedFilters(item.filters?.items, item.queryName === queryName),
},
}));
redirectWithQueryBuilderData(newQuery);
};
//
return (
<Select
value={selectedScope}
className="span-scope-selector"
onChange={handleScopeChange}
options={SELECT_OPTIONS}
/>
);
}
export default SpanScopeSelector;

View File

@ -56,6 +56,7 @@ import { PLACEHOLDER } from './constant';
import ExampleQueriesRendererForLogs from './ExampleQueriesRendererForLogs';
import OptionRenderer from './OptionRenderer';
import OptionRendererForLogs from './OptionRendererForLogs';
import SpanScopeSelector from './SpanScopeSelector';
import { StyledCheckOutlined, TypographyText } from './style';
import {
convertExampleQueriesToOptions,
@ -82,6 +83,11 @@ function QueryBuilderSearch({
pathname,
]);
const isTracesExplorerPage = useMemo(
() => pathname === ROUTES.TRACES_EXPLORER,
[pathname],
);
const {
updateTag,
handleClearTag,
@ -319,11 +325,7 @@ function QueryBuilderSearch({
));
return (
<div
style={{
position: 'relative',
}}
>
<div className="query-builder-search-container">
<Select
ref={selectRef}
getPopupContainer={popupContainer}
@ -449,6 +451,7 @@ function QueryBuilderSearch({
</Select.Option>
))}
</Select>
{isTracesExplorerPage && <SpanScopeSelector queryName={query.queryName} />}
</div>
);
}