SigNoz is an open-source, OpenTelemetry-native observability platform for your team and their AI agents. Get logs, metrics, and traces in one tool with features like APM, distributed tracing, log management, infra monitoring, etc. Combined with SigNoz MCP and a native AI teammate (in SigNoz Cloud) it helps you build more resilient apps.
TypeScript apmapplication-monitoringdistributed-tracinggogood-first-issuejaegerloglogsmetricsmonitoringnextjsobservabilityopen-sourceopentelemetryprometheusreactreactjsself-hostedtracingtypescript
feat(llm-observability): AI explorer QB and builder_ai_query wiring (#12683)
Gaurav Tewari391f685e577d
diff --git a/frontend/src/api/v5/queryRange/convertV5Response.ts b/frontend/src/api/v5/queryRange/convertV5Response.tsindex 6e9bd73dea..1452c2025f 100644--- a/frontend/src/api/v5/queryRange/convertV5Response.ts+++ b/frontend/src/api/v5/queryRange/convertV5Response.ts@@ -2,8 +2,10 @@ import { cloneDeep, isEmpty } from 'lodash-es';import { SuccessResponse, Warning } from 'types/api';import { MetricRangePayloadV3 } from 'types/api/metrics/getQueryRange';import {+ BuilderQuery,DistributionData,MetricRangePayloadV5,+ QueryEnvelope,QueryRangeRequestV5,RawData,ScalarData,@@ -11,6 +13,11 @@ import {} from 'types/api/v5/queryRange';import { QueryDataV3 } from 'types/api/widgets/getQuery';+const isBuilderQueryEnvelope = (+ envelope: QueryEnvelope,+): envelope is QueryEnvelope & { spec: BuilderQuery } =>+ envelope.type === 'builder_query' || envelope.type === 'builder_ai_query';+function getColName(col: ScalarData['columns'][number],legendMap: Record<string, string>,@@ -409,21 +416,19 @@ export function convertV5ResponseToLegacy(const v5Data = payload?.data;const aggregationPerQuery =- params?.compositeQuery?.queries- ?.filter((query) => query.type === 'builder_query')- .reduce(- (acc, query) => {- if (- query.type === 'builder_query' &&- 'aggregations' in query.spec &&- query.spec.name- ) {- acc[query.spec.name] = query.spec.aggregations;- }- return acc;- },- {} as Record<string, any>,- ) || {};+ params?.compositeQuery?.queries?.filter(isBuilderQueryEnvelope).reduce(+ (acc, query) => {+ if (+ isBuilderQueryEnvelope(query) &&+ 'aggregations' in query.spec &&+ query.spec.name+ ) {+ acc[query.spec.name] = query.spec.aggregations;+ }+ return acc;+ },+ {} as Record<string, any>,+ ) || {};// clickhouse_sql queries have no aggregation metadata; their value columns// are named/keyed by the real SQL alias the response carries (see getColId).diff --git a/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.test.ts b/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.test.tsindex e1d91dcce8..2364bec690 100644--- a/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.test.ts+++ b/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.test.ts@@ -14,6 +14,7 @@ import {QueryBuilderFormula as V5QueryBuilderFormula,QueryEnvelope,QueryRangePayloadV5,+ RequestType,} from 'types/api/v5/queryRange';import { EQueryType } from 'types/common/dashboard';import { DataSource, ReduceOperators } from 'types/common/queryBuilder';@@ -935,3 +936,41 @@ describe('convertBuilderQueriesToV5 having normalization', () => {});});});++describe('convertBuilderQueriesToV5 builder query type', () => {+ const buildEnvelope = (+ builderQueryType: IBuilderQuery['builderQueryType'],+ requestType: RequestType,+ ): QueryEnvelope => {+ const [envelope] = convertBuilderQueriesToV5(+ {+ A: {+ dataSource: DataSource.TRACES,+ queryName: 'A',+ builderQueryType,+ } as unknown as IBuilderQuery,+ },+ requestType,+ );+ return envelope;+ };++ it.each<[RequestType]>([+ ['trace'],+ ['raw'],+ ['time_series'],+ ['scalar'],+ ['distribution'],+ ])('sends builder_ai_query for the %s request type', (requestType) => {+ expect(buildEnvelope('builder_ai_query', requestType).type).toBe(+ 'builder_ai_query',+ );+ });++ it.each<[string, IBuilderQuery['builderQueryType']]>([+ ['an unmarked query', undefined],+ ['an explicitly generic query', 'builder_query'],+ ])('sends builder_query for %s', (_label, builderQueryType) => {+ expect(buildEnvelope(builderQueryType, 'trace').type).toBe('builder_query');+ });+});diff --git a/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.ts b/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.tsindex c45d62be3a..b2586c1ff8 100644--- a/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.ts+++ b/frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.ts@@ -365,7 +365,7 @@ export function convertBuilderQueriesToV5(}return {- type: 'builder_query' as QueryType,+ type: queryData.builderQueryType ?? 'builder_query',spec,};},diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsxindex 29ea70e8c8..78a857338d 100644--- a/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx@@ -16,8 +16,6 @@ import { githubLight } from '@uiw/codemirror-theme-github';import CodeMirror, { EditorView, keymap, Prec } from '@uiw/react-codemirror';import { Button, Card, Collapse, Popover, Tooltip } from 'antd';import { Badge } from '@signozhq/ui/badge';-import { getKeySuggestions } from 'api/querySuggestions/getKeySuggestions';-import { getValueSuggestions } from 'api/querySuggestions/getValueSuggestion';import cx from 'classnames';import {negationQueryOperatorSuggestions,@@ -54,6 +52,12 @@ import {SUGGESTION_FETCH_DEBOUNCE_MS,SUGGESTIONS_SECTION,} from './constants';+import {+ fetchFieldKeysForQuery,+ fetchFieldValuesForQuery,+ SuggestedFieldKey,+ SuggestedFieldKeysByName,+} from './fieldSuggestions';import {combineInitialAndUserExpression,dedupeOptionsByLabel,@@ -261,10 +265,8 @@ function QuerySearch({const dashboardDynamicVariables = useDynamicVariableSuggestions();// Add back the generateOptions function and useEffect- const generateOptions = (keys: {- [key: string]: QueryKeyDataSuggestionsProps[];- }): any[] =>- Object.values(keys).flatMap((items: QueryKeyDataSuggestionsProps[]) =>+ const generateOptions = (keys: SuggestedFieldKeysByName): any[] =>+ Object.values(keys).flatMap((items: SuggestedFieldKey[]) =>items.map(({ name, fieldDataType, fieldContext }) => ({label: name,type: fieldDataType === 'string' ? 'keyword' : fieldDataType,@@ -317,8 +319,9 @@ function QuerySearch({lastFetchedKeyRef.current = searchText || '';- const response = await getKeySuggestions({- signal: dataSource,+ const response = await fetchFieldKeysForQuery({+ builderQueryType: queryData.builderQueryType,+ dataSource,searchText: searchText || '',metricName: debouncedMetricName ?? undefined,signalSource: signalSource as 'meter' | '',@@ -360,6 +363,7 @@ function QuerySearch({hardcodedAttributeKeys,showFilterSuggestionsWithoutMetric,metricNamespace,+ queryData.builderQueryType,],);@@ -493,10 +497,11 @@ function QuerySearch({try {const values = valueSuggestionsOverride? await valueSuggestionsOverride(key, sanitizedSearchText)- : await getValueSuggestions({+ : await fetchFieldValuesForQuery({+ builderQueryType: queryData.builderQueryType,+ dataSource,key,searchText: sanitizedSearchText,- signal: dataSource,signalSource: signalSource as 'meter' | '',metricName: debouncedMetricName ?? undefined,}).then((response) => {@@ -601,6 +606,7 @@ function QuerySearch({signalSource,toggleSuggestions,valueSuggestionsOverride,+ queryData.builderQueryType,],);diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/__tests__/fieldSuggestions.test.ts b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/__tests__/fieldSuggestions.test.tsnew file mode 100644index 0000000000..d37d11c4e2--- /dev/null+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/__tests__/fieldSuggestions.test.ts@@ -0,0 +1,215 @@+import {+ getAIObservabilityFieldsKeys,+ getAIObservabilityFieldsValues,+} from 'api/generated/services/ai-observability';+import { getKeySuggestions } from 'api/querySuggestions/getKeySuggestions';+import { getValueSuggestions } from 'api/querySuggestions/getValueSuggestion';+import { DataSource } from 'types/common/queryBuilder';++import {+ fetchFieldKeysForQuery,+ fetchFieldValuesForQuery,+} from '../fieldSuggestions';++jest.mock('api/generated/services/ai-observability', () => ({+ getAIObservabilityFieldsKeys: jest.fn(),+ getAIObservabilityFieldsValues: jest.fn(),+}));++jest.mock('api/querySuggestions/getKeySuggestions', () => ({+ getKeySuggestions: jest.fn(),+}));++jest.mock('api/querySuggestions/getValueSuggestion', () => ({+ getValueSuggestions: jest.fn(),+}));++const mockedAIKeys = getAIObservabilityFieldsKeys as jest.MockedFunction<+ typeof getAIObservabilityFieldsKeys+>;+const mockedGenericKeys = getKeySuggestions as jest.MockedFunction<+ typeof getKeySuggestions+>;+const mockedAIValues = getAIObservabilityFieldsValues as jest.MockedFunction<+ typeof getAIObservabilityFieldsValues+>;+const mockedGenericValues = getValueSuggestions as jest.MockedFunction<+ typeof getValueSuggestions+>;++const aiValuesResponse = (+ values: { stringValues?: string[]; numberValues?: number[] } | null,+ complete = true,+): Awaited<ReturnType<typeof getAIObservabilityFieldsValues>> =>+ ({+ status: 'success',+ data: { complete, values },+ }) as Awaited<ReturnType<typeof getAIObservabilityFieldsValues>>;++describe('fetchFieldKeysForQuery', () => {+ beforeEach(() => {+ jest.clearAllMocks();+ });++ it('reads the ai_observability endpoint for a builder_ai_query', async () => {+ mockedAIKeys.mockResolvedValue({+ status: 'success',+ data: {+ complete: true,+ keys: { llm_call_count: [{ name: 'llm_call_count' }] },+ },+ } as Awaited<ReturnType<typeof getAIObservabilityFieldsKeys>>);++ const keys = await fetchFieldKeysForQuery({+ builderQueryType: 'builder_ai_query',+ dataSource: DataSource.TRACES,+ searchText: 'llm',+ });++ expect(mockedAIKeys).toHaveBeenCalledWith({ searchText: 'llm' });+ expect(mockedGenericKeys).not.toHaveBeenCalled();+ expect(keys.data.data).toStrictEqual({+ complete: true,+ keys: { llm_call_count: [{ name: 'llm_call_count' }] },+ });+ });++ it.each<[string, 'builder_query' | undefined]>([+ ['an unmarked query', undefined],+ ['an explicitly generic query', 'builder_query'],+ ])('reads the generic endpoint for %s', async (_label, builderQueryType) => {+ mockedGenericKeys.mockResolvedValue({+ data: { status: 'success', data: { complete: true, keys: {} } },+ } as Awaited<ReturnType<typeof getKeySuggestions>>);++ await fetchFieldKeysForQuery({+ builderQueryType,+ dataSource: DataSource.TRACES,+ searchText: 'svc',+ });++ expect(mockedAIKeys).not.toHaveBeenCalled();+ expect(mockedGenericKeys).toHaveBeenCalledWith(+ expect.objectContaining({ signal: DataSource.TRACES, searchText: 'svc' }),+ );+ });++ it('normalizes a null ai_observability keys payload to an empty map', async () => {+ mockedAIKeys.mockResolvedValue({+ status: 'success',+ data: { complete: false, keys: null },+ } as Awaited<ReturnType<typeof getAIObservabilityFieldsKeys>>);++ const response = await fetchFieldKeysForQuery({+ builderQueryType: 'builder_ai_query',+ dataSource: DataSource.TRACES,+ searchText: '',+ });++ expect(response.data.data).toStrictEqual({ complete: false, keys: {} });+ });++ it('passes the generic response through untouched', async () => {+ const genericResponse = {+ data: { status: 'success', data: { complete: true, keys: {} } },+ } as unknown as Awaited<ReturnType<typeof getKeySuggestions>>;+ mockedGenericKeys.mockResolvedValue(genericResponse);++ await expect(+ fetchFieldKeysForQuery({+ builderQueryType: 'builder_query',+ dataSource: DataSource.TRACES,+ searchText: '',+ }),+ ).resolves.toBe(genericResponse);+ });+});++describe('fetchFieldValuesForQuery', () => {+ beforeEach(() => {+ jest.clearAllMocks();+ });++ it('reads the ai_observability endpoint for a builder_ai_query', async () => {+ mockedAIValues.mockResolvedValue(+ aiValuesResponse({ stringValues: ['gpt-4o'], numberValues: [] }),+ );++ const response = await fetchFieldValuesForQuery({+ builderQueryType: 'builder_ai_query',+ dataSource: DataSource.TRACES,+ key: 'gen_ai.request.model',+ searchText: 'gpt',+ });++ expect(mockedGenericValues).not.toHaveBeenCalled();+ expect(response).toStrictEqual({+ data: {+ data: {+ complete: true,+ values: { stringValues: ['gpt-4o'], numberValues: [] },+ },+ },+ });+ });++ it('forwards the key as the name the endpoint expects', async () => {+ mockedAIValues.mockResolvedValue(aiValuesResponse({}));++ await fetchFieldValuesForQuery({+ builderQueryType: 'builder_ai_query',+ dataSource: DataSource.TRACES,+ key: 'total_tokens',+ searchText: '',+ });++ expect(mockedAIValues).toHaveBeenCalledWith({+ name: 'total_tokens',+ searchText: '',+ });+ });++ it('wraps the ai_observability payload in the envelope the call site unwraps', async () => {+ mockedAIValues.mockResolvedValue(aiValuesResponse(null, false));++ await expect(+ fetchFieldValuesForQuery({+ builderQueryType: 'builder_ai_query',+ dataSource: DataSource.TRACES,+ key: 'llm_call_count',+ searchText: '',+ }),+ ).resolves.toStrictEqual({+ data: { data: { complete: false, values: null } },+ });+ });++ it.each<[string, 'builder_query' | undefined]>([+ ['an unmarked query', undefined],+ ['an explicitly generic query', 'builder_query'],+ ])('reads the generic endpoint for %s', async (_label, builderQueryType) => {+ const genericResponse = {+ data: {+ data: { complete: false, values: { stringValues: ['frontend'] } },+ },+ } as unknown as Awaited<ReturnType<typeof getValueSuggestions>>;+ mockedGenericValues.mockResolvedValue(genericResponse);++ const response = await fetchFieldValuesForQuery({+ builderQueryType,+ dataSource: DataSource.TRACES,+ key: 'service.name',+ searchText: 'front',+ });++ expect(mockedAIValues).not.toHaveBeenCalled();+ expect(mockedGenericValues).toHaveBeenCalledWith(+ expect.objectContaining({+ signal: DataSource.TRACES,+ key: 'service.name',+ searchText: 'front',+ }),+ );+ expect(response).toBe(genericResponse);+ });+});diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/fieldSuggestions.ts b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/fieldSuggestions.tsnew file mode 100644index 0000000000..02db944393--- /dev/null+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/fieldSuggestions.ts@@ -0,0 +1,111 @@+import {+ getAIObservabilityFieldsKeys,+ getAIObservabilityFieldsValues,+} from 'api/generated/services/ai-observability';+import { getKeySuggestions } from 'api/querySuggestions/getKeySuggestions';+import { getValueSuggestions } from 'api/querySuggestions/getValueSuggestion';+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';+import { DataSource } from 'types/common/queryBuilder';++export interface SuggestedFieldKey {+ name: string;+ fieldContext?: string;+ fieldDataType?: string;+}++export type SuggestedFieldKeysByName = Record<string, SuggestedFieldKey[]>;++export interface SuggestedFieldKeysPayload {+ complete: boolean;+ keys: SuggestedFieldKeysByName;+}++export interface SuggestedFieldKeysResponse {+ data: { data?: SuggestedFieldKeysPayload };+}++export interface SuggestedFieldValuesPayload {+ complete?: boolean;+ values?: {+ stringValues?: string[] | null;+ numberValues?: number[] | null;+ } | null;+}++export interface SuggestedFieldValuesResponse {+ data: { data?: SuggestedFieldValuesPayload };+}++interface FetchFieldKeysParams {+ builderQueryType: IBuilderQuery['builderQueryType'];+ dataSource: DataSource;+ searchText: string;+ metricName?: string;+ signalSource?: 'meter' | '';+ metricNamespace?: string;+}++interface FetchFieldValuesParams {+ builderQueryType: IBuilderQuery['builderQueryType'];+ dataSource: DataSource;+ key: string;+ searchText: string;+ metricName?: string;+ signalSource?: 'meter' | '';+}++export const fetchFieldKeysForQuery = async ({+ builderQueryType,+ dataSource,+ searchText,+ metricName,+ signalSource,+ metricNamespace,+}: FetchFieldKeysParams): Promise<SuggestedFieldKeysResponse> => {+ if (builderQueryType === 'builder_ai_query') {+ const response = await getAIObservabilityFieldsKeys({ searchText });++ return {+ data: {+ data: response.data+ ? { complete: response.data.complete, keys: response.data.keys ?? {} }+ : undefined,+ },+ };+ }++ return getKeySuggestions({+ signal: dataSource,+ searchText,+ metricName,+ signalSource,+ metricNamespace,+ });+};++export const fetchFieldValuesForQuery = async ({+ builderQueryType,+ dataSource,+ key,+ searchText,+ metricName,+ signalSource,+}: FetchFieldValuesParams): Promise<SuggestedFieldValuesResponse> => {+ if (builderQueryType === 'builder_ai_query') {+ const response = await getAIObservabilityFieldsValues({+ name: key,+ searchText,+ });++ return { data: { data: response.data } };+ }++ // getValueSuggestions' declared response type does not match what the endpoint returns.+ return getValueSuggestions({+ signal: dataSource,+ key,+ searchText,+ signalSource,+ metricName,+ }) as unknown as Promise<SuggestedFieldValuesResponse>;+};diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsxindex 92f91be919..f47cea5011 100644--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx@@ -54,7 +54,7 @@ export const QueryV2 = forwardRef(function QueryV2(const { cloneQuery, panelType } = useQueryBuilder();const showFunctions = query?.functions?.length > 0;- const { dataSource } = query;+ const { dataSource, builderQueryType } = query;const [isCollapsed, setIsCollapsed] = useState(false);@@ -94,8 +94,9 @@ export const QueryV2 = forwardRef(function QueryV2();const showSpanScopeSelector = useMemo(- () => dataSource === DataSource.TRACES,- [dataSource],+ () =>+ dataSource === DataSource.TRACES && builderQueryType !== 'builder_ai_query',+ [dataSource, builderQueryType],);const showInlineQuerySearch = useMemo(() => {diff --git a/frontend/src/constants/queryBuilder.ts b/frontend/src/constants/queryBuilder.tsindex 180a9a6ef8..9e291296e1 100644--- a/frontend/src/constants/queryBuilder.ts+++ b/frontend/src/constants/queryBuilder.ts@@ -348,6 +348,19 @@ export const initialQueryMeterWithType: Query = {},};+export const initialQueryAIWithType: Query = {+ ...initialQueryWithType,+ builder: {+ ...initialQueryWithType.builder,+ queryData: [+ {+ ...initialQueryBuilderFormValuesMap.traces,+ builderQueryType: 'builder_ai_query',+ },+ ],+ },+};+export const operatorsByTypes: Record<LocalDataType, string[]> = {string: Object.values(StringOperators),number: Object.values(NumberOperators),diff --git a/frontend/src/container/LLMObservability/Explorer/Explorer.tsx b/frontend/src/container/LLMObservability/Explorer/Explorer.tsxindex a3815bdd6b..31ca77a3b0 100644--- a/frontend/src/container/LLMObservability/Explorer/Explorer.tsx+++ b/frontend/src/container/LLMObservability/Explorer/Explorer.tsx@@ -11,17 +11,13 @@ import QuickFilters from 'components/QuickFilters/QuickFilters';import { QuickFiltersSource, SignalType } from 'components/QuickFilters/types';import WarningPopover from 'components/WarningPopover/WarningPopover';import { AVAILABLE_EXPORT_PANEL_TYPES } from 'constants/panelTypes';-import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';+import { initialQueryAIWithType, PANEL_TYPES } from 'constants/queryBuilder';import { usePageActions } from 'container/AIAssistant/pageActions/usePageActions';import ExplorerOptionWrapper from 'container/ExplorerOptions/ExplorerOptionWrapper';import { useOptionsMenu } from 'container/OptionsMenu';import LeftToolbarActions from 'container/QueryBuilder/components/ToolbarActions/LeftToolbarActions';import RightToolbarActions from 'container/QueryBuilder/components/ToolbarActions/RightToolbarActions';import Toolbar from 'container/Toolbar/Toolbar';-import {- getExportQueryData,- getQueryByPanelType,-} from 'container/TracesExplorer/explorerUtils';import { ExportDashboard } from 'hooks/dashboard/useExportDashboards';import { useGetExportToDashboardLink } from 'hooks/dashboard/useGetExportToDashboardLink';import { useGetPanelTypesQueryParam } from 'hooks/queryBuilder/useGetPanelTypesQueryParam';@@ -52,6 +48,7 @@ import {import { v4 } from 'uuid';import { TOOLBAR_VIEWS } from './constants';+import { getExportQueryData, getQueryByPanelType } from './explorerUtils';import ListView from './ListView/ListView';import { defaultSelectedColumns } from './ListView/configs';import QuerySection from './QuerySection/QuerySection';@@ -118,7 +115,7 @@ function Explorer(): JSX.Element {const defaultQuery = useMemo((): Query =>updateAllQueriesOperators(- initialQueriesMap.traces,+ initialQueryAIWithType,PANEL_TYPES.LIST,DataSource.TRACES,),@@ -185,7 +182,7 @@ function Explorer(): JSX.Element {const exportDefaultQuery = useMemo(() =>getQueryByPanelType(- stagedQuery || initialQueriesMap.traces,+ stagedQuery || initialQueryAIWithType,panelType || PANEL_TYPES.LIST,),[stagedQuery, panelType],diff --git a/frontend/src/container/LLMObservability/Explorer/ListView/ListView.tsx b/frontend/src/container/LLMObservability/Explorer/ListView/ListView.tsxindex 7283552e26..50f19e7079 100644--- a/frontend/src/container/LLMObservability/Explorer/ListView/ListView.tsx+++ b/frontend/src/container/LLMObservability/Explorer/ListView/ListView.tsx@@ -17,12 +17,11 @@ import ListViewOrderBy from 'components/OrderBy/ListViewOrderBy';import type { TableColumnDef } from 'components/TanStackTableView/types';import { ENTITY_VERSION_V5 } from 'constants/app';import { QueryParams } from 'constants/query';-import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';+import { initialQueryAIWithType, PANEL_TYPES } from 'constants/queryBuilder';import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';import { useOptionsMenu } from 'container/OptionsMenu';import { CustomTimeType } from 'container/TopNav/DateTimeSelectionV2/types';import TraceExplorerControls from 'container/TracesExplorer/Controls';-import { getListViewQuery } from 'container/TracesExplorer/explorerUtils';import {getTraceLink,transformSpanRows,@@ -43,6 +42,7 @@ import { Warning } from 'types/api';import { DataSource } from 'types/common/queryBuilder';import { GlobalReducer } from 'types/reducer/globalTime';+import { getListViewQuery } from '../explorerUtils';import {defaultSelectedColumns,PER_PAGE_OPTIONS,@@ -94,7 +94,7 @@ function ListView({paginationQueryData ?? getDefaultPaginationConfig(PER_PAGE_OPTIONS);const requestQuery = useMemo(- () => getListViewQuery(stagedQuery || initialQueriesMap.traces, orderBy),+ () => getListViewQuery(stagedQuery || initialQueryAIWithType, orderBy),[stagedQuery, orderBy],);diff --git a/frontend/src/container/LLMObservability/Explorer/QuerySection/QuerySection.tsx b/frontend/src/container/LLMObservability/Explorer/QuerySection/QuerySection.tsxindex aa664aa8b0..606c5f01dc 100644--- a/frontend/src/container/LLMObservability/Explorer/QuerySection/QuerySection.tsx+++ b/frontend/src/container/LLMObservability/Explorer/QuerySection/QuerySection.tsx@@ -1,8 +1,6 @@-import { memo, useCallback, useMemo } from 'react';+import { memo, useMemo } from 'react';import { QueryBuilderV2 } from 'components/QueryBuilderV2/QueryBuilderV2';import { PANEL_TYPES } from 'constants/queryBuilder';-import ExplorerOrderBy from 'container/ExplorerOrderBy';-import { OrderByFilterProps } from 'container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces';import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';import { useGetPanelTypesQueryParam } from 'hooks/queryBuilder/useGetPanelTypesQueryParam';import { DataSource } from 'types/common/queryBuilder';@@ -10,33 +8,16 @@ import { DataSource } from 'types/common/queryBuilder';function QuerySection(): JSX.Element {const panelTypes = useGetPanelTypesQueryParam(PANEL_TYPES.LIST);- const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(() => {- const isList = panelTypes === PANEL_TYPES.LIST;- const config: QueryBuilderProps['filterConfigs'] = {+ // Only reaches the builder for timeseries/table; list/trace panels use QueryBuilderV2's listViewTracesFilterConfigs.+ const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(+ () => ({stepInterval: { isHidden: false, isDisabled: false },- limit: { isHidden: isList, isDisabled: true },- having: { isHidden: isList, isDisabled: true },- };-- return config;- }, [panelTypes]);-- const renderOrderBy = useCallback(- ({ query, onChange }: OrderByFilterProps) => (- <ExplorerOrderBy query={query} onChange={onChange} />- ),+ limit: { isHidden: false, isDisabled: true },+ having: { isHidden: false, isDisabled: true },+ }),[],);- const queryComponents = useMemo((): QueryBuilderProps['queryComponents'] => {- const shouldRenderCustomOrderBy =- panelTypes === PANEL_TYPES.LIST || panelTypes === PANEL_TYPES.TRACE;-- return {- ...(shouldRenderCustomOrderBy ? { renderOrderBy } : {}),- };- }, [panelTypes, renderOrderBy]);-const isListViewPanel = useMemo(() => panelTypes === PANEL_TYPES.LIST || panelTypes === PANEL_TYPES.TRACE,[panelTypes],@@ -45,14 +26,10 @@ function QuerySection(): JSX.Element {return (<QueryBuilderV2isListViewPanel={isListViewPanel}- showTraceOperatorconfig={{ initialDataSource: DataSource.TRACES, queryVariant: 'static' }}- queryComponents={queryComponents}panelType={panelTypes}filterConfigs={filterConfigs}- showOnlyWhereClause={- panelTypes === PANEL_TYPES.LIST || panelTypes === PANEL_TYPES.TRACE- }+ showOnlyWhereClause={isListViewPanel}version="v3" // setting this to v3 as we this is rendered in logs explorer/>);diff --git a/frontend/src/container/LLMObservability/Explorer/TracesView/TracesView.tsx b/frontend/src/container/LLMObservability/Explorer/TracesView/TracesView.tsxindex 374024e730..73ca1a44eb 100644--- a/frontend/src/container/LLMObservability/Explorer/TracesView/TracesView.tsx+++ b/frontend/src/container/LLMObservability/Explorer/TracesView/TracesView.tsx@@ -14,10 +14,9 @@ import logEvent from 'api/common/logEvent';import DownloadOptionsMenu from 'components/DownloadOptionsMenu/DownloadOptionsMenu';import { ENTITY_VERSION_V5 } from 'constants/app';import { QueryParams } from 'constants/query';-import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';+import { initialQueryAIWithType, PANEL_TYPES } from 'constants/queryBuilder';import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';import TraceExplorerControls from 'container/TracesExplorer/Controls';-import { getListViewQuery } from 'container/TracesExplorer/explorerUtils';import { getTraceLink } from 'container/TracesExplorer/ListView/utils';import { TracesTableRow } from 'container/TracesExplorer/TracesTable/getFieldColumn';import TracesTable from 'container/TracesExplorer/TracesTable/TracesTable';@@ -31,6 +30,7 @@ import { DataSource } from 'types/common/queryBuilder';import { GlobalReducer } from 'types/reducer/globalTime';import DOCLINKS from 'utils/docLinks';+import { getListViewQuery } from '../explorerUtils';import { columns, PER_PAGE_OPTIONS } from './configs';import styles from './TracesView.module.scss';@@ -60,7 +60,7 @@ function TracesView({);const transformedQuery = useMemo(- () => getListViewQuery(stagedQuery || initialQueriesMap.traces),+ () => getListViewQuery(stagedQuery || initialQueryAIWithType),[stagedQuery],);diff --git a/frontend/src/container/LLMObservability/Explorer/explorerUtils.ts b/frontend/src/container/LLMObservability/Explorer/explorerUtils.tsnew file mode 100644index 0000000000..9e41324913--- /dev/null+++ b/frontend/src/container/LLMObservability/Explorer/explorerUtils.ts@@ -0,0 +1,61 @@+import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';+import { OptionsQuery } from 'container/OptionsMenu/types';+import { cloneDeep, set } from 'lodash-es';+import { OrderByPayload, Query } from 'types/api/queryBuilder/queryBuilderData';++export const getListViewQuery = (+ stagedQuery: Query,+ orderBy?: string,+): Query => {+ const query = stagedQuery+ ? cloneDeep(stagedQuery)+ : cloneDeep(initialQueriesMap.traces);++ const orderByPayload: OrderByPayload[] = orderBy+ ? [+ {+ columnName: orderBy.split(':')[0],+ order: orderBy.split(':')[1] as 'asc' | 'desc',+ },+ ]+ : [];++ for (let i = 0; i < query.builder.queryData.length; i++) {+ const queryData = query.builder.queryData[i];+ queryData.groupBy = [];+ queryData.having = {+ expression: '',+ };+ queryData.orderBy = orderByPayload;+ }++ return query;+};++export const getQueryByPanelType = (+ stagedQuery: Query,+ panelType: PANEL_TYPES,+): Query => {+ if (panelType === PANEL_TYPES.LIST || panelType === PANEL_TYPES.TRACE) {+ return getListViewQuery(stagedQuery);+ }+ return stagedQuery;+};++export const getExportQueryData = (+ query: Query,+ panelType: PANEL_TYPES,+ options: OptionsQuery,+): Query => {+ if (panelType === PANEL_TYPES.LIST) {+ const updatedQuery = cloneDeep(query);+ set(+ updatedQuery,+ 'builder.queryData[0].selectColumns',+ options.selectColumns,+ );++ return updatedQuery;+ }+ return query;+};diff --git a/frontend/src/providers/QueryBuilder.tsx b/frontend/src/providers/QueryBuilder.tsxindex ddaad6f740..cac01d54dc 100644--- a/frontend/src/providers/QueryBuilder.tsx+++ b/frontend/src/providers/QueryBuilder.tsx@@ -475,6 +475,7 @@ export function QueryBuilderProvider({const newQuery: IBuilderQuery = {...initialBuilderQuery,source: queries?.[0]?.source || '',+ builderQueryType: queries?.[0]?.builderQueryType,queryName: createNewBuilderItemName({ existNames, sourceNames: alphabet }),expression: createNewBuilderItemName({existNames,diff --git a/frontend/src/providers/__tests__/QueryBuilder.createNewBuilderQuery.test.tsx b/frontend/src/providers/__tests__/QueryBuilder.createNewBuilderQuery.test.tsxnew file mode 100644index 0000000000..64cdb09efb--- /dev/null+++ b/frontend/src/providers/__tests__/QueryBuilder.createNewBuilderQuery.test.tsx@@ -0,0 +1,55 @@+import {+ initialQueriesMap,+ initialQueryAIWithType,+} from 'constants/queryBuilder';+import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';+import { act, AllTheProviders, renderHook } from 'tests/test-utils';+import { Query } from 'types/api/queryBuilder/queryBuilderData';++const renderQueryBuilder = (+ initialQuery: Query,+): ReturnType<+ typeof renderHook<ReturnType<typeof useQueryBuilder>, unknown>+> => {+ const hook = renderHook(() => useQueryBuilder(), {+ wrapper: AllTheProviders,+ });++ act(() => {+ hook.result.current.initQueryBuilderData(initialQuery);+ });++ return hook;+};++describe('createNewBuilderQuery builderQueryType propagation', () => {+ it('carries builderQueryType from the first query onto an added query', () => {+ const { result } = renderQueryBuilder(initialQueryAIWithType);++ expect(+ result.current.currentQuery.builder.queryData[0].builderQueryType,+ ).toBe('builder_ai_query');++ act(() => {+ result.current.addNewBuilderQuery();+ });++ expect(result.current.currentQuery.builder.queryData).toHaveLength(2);+ expect(+ result.current.currentQuery.builder.queryData[1].builderQueryType,+ ).toBe('builder_ai_query');+ });++ it('leaves builderQueryType unset when the first query has none', () => {+ const { result } = renderQueryBuilder(initialQueriesMap.traces);++ act(() => {+ result.current.addNewBuilderQuery();+ });++ expect(result.current.currentQuery.builder.queryData).toHaveLength(2);+ expect(+ result.current.currentQuery.builder.queryData[1].builderQueryType,+ ).toBeUndefined();+ });+});diff --git a/frontend/src/types/api/queryBuilder/queryBuilderData.ts b/frontend/src/types/api/queryBuilder/queryBuilderData.tsindex 346a7bf5c0..1c02b312d1 100644--- a/frontend/src/types/api/queryBuilder/queryBuilderData.ts+++ b/frontend/src/types/api/queryBuilder/queryBuilderData.ts@@ -8,6 +8,7 @@ import {} from 'types/common/queryBuilder';import {+ BuilderQueryType,Filter,Having as HavingV5,LogAggregation,@@ -90,6 +91,7 @@ export type IBuilderQuery = {offset?: number;selectColumns?: BaseAutocompleteData[] | TelemetryFieldKey[];source?: 'meter' | '';+ builderQueryType?: BuilderQueryType;};export interface IClickHouseQuery {diff --git a/frontend/src/types/api/v5/queryRange.ts b/frontend/src/types/api/v5/queryRange.tsindex 7e284d280e..8bab6a9aa8 100644--- a/frontend/src/types/api/v5/queryRange.ts+++ b/frontend/src/types/api/v5/queryRange.ts@@ -16,6 +16,7 @@ export type RequestType =export type QueryType =| 'builder_query'+ | 'builder_ai_query'| 'builder_trace_operator'| 'builder_formula'| 'builder_sub_query'@@ -23,6 +24,11 @@ export type QueryType =| 'clickhouse_sql'| 'promql';+export type BuilderQueryType = Extract<+ QueryType,+ 'builder_query' | 'builder_ai_query'+>;+export type OrderDirection = 'asc' | 'desc';export type JoinType = 'inner' | 'left' | 'right' | 'full' | 'cross';