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(logs): move the list row filter chips off v3 attribute keys (#13148)
Aditya Singh39b752c4281e
diff --git a/frontend/src/components/LogDetail/LogDetail.interfaces.ts b/frontend/src/components/LogDetail/LogDetail.interfaces.tsindex 6e609f5f84..314937008d 100644--- a/frontend/src/components/LogDetail/LogDetail.interfaces.ts+++ b/frontend/src/components/LogDetail/LogDetail.interfaces.ts@@ -1,7 +1,5 @@import { DrawerProps } from 'antd';import { ChangeViewFunctionType } from 'container/ExplorerOptions/types';-import { AddToQueryHOCProps } from 'components/Logs/AddToQueryHOC';-import { ActionItemProps } from 'container/LogDetailedView/LogDetailedView.types';import { IField } from 'types/api/logs/fields';import { ILog } from 'types/api/logs/log';@@ -20,9 +18,7 @@ export type LogDetailProps = {handleOpenInExplorer?: MouseEventHandler;getContainer?: DrawerProps['getContainer'];onApplyLogFilter?: (expression: string) => void;-} & Pick<AddToQueryHOCProps, 'onAddToQuery'> &- Partial<Pick<ActionItemProps, 'onClickActionItem'>> &- Pick<DrawerProps, 'onClose'>;+} & Pick<DrawerProps, 'onClose'>;export type LogDetailInnerProps = LogDetailProps & {log: NonNullable<LogDetailProps['log']>;diff --git a/frontend/src/components/LogDetail/__tests__/LogDetail.test.tsx b/frontend/src/components/LogDetail/__tests__/LogDetail.test.tsxindex 520ee6353a..88b18fa95e 100644--- a/frontend/src/components/LogDetail/__tests__/LogDetail.test.tsx+++ b/frontend/src/components/LogDetail/__tests__/LogDetail.test.tsx@@ -46,8 +46,6 @@ function renderDrawer(props: Partial<LogDetailProps> = {}): void {<LogDetaillog={mockLog}selectedTab={VIEW_TYPES.OVERVIEW}- onAddToQuery={jest.fn()}- onClickActionItem={jest.fn()}onClose={jest.fn()}{...props}/>,diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityLogs/EntityLogs.tsx b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityLogs/EntityLogs.tsxindex c101ba9912..7d6f2fe49e 100644--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityLogs/EntityLogs.tsx+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityLogs/EntityLogs.tsx@@ -25,10 +25,8 @@ import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants'import { LogsLoading } from 'container/LogsLoading/LogsLoading';import { FontSize } from 'container/OptionsMenu/types';import RunQueryBtn from 'container/QueryBuilder/components/RunQueryBtn/RunQueryBtn';-import { getOldLogsOperatorFromNew } from 'hooks/logs/useActiveLog';import useLogDetailHandlers from 'hooks/logs/useLogDetailHandlers';import useScrollToLog from 'hooks/logs/useScrollToLog';-import { generateFilterQuery } from 'lib/logs/generateFilterQuery';import { saveRecentQueryByExpression } from 'lib/recentQueries/saveRecentQuery';import { ILog } from 'types/api/logs/log';import { DataSource } from 'types/common/queryBuilder';@@ -82,29 +80,6 @@ function EntityLogsContent({const { activeLog, selectedTab, handleSetActiveLog, handleCloseLogDetail } =useLogDetailHandlers();- // TODO: Move away from using onAddToQuery after old drawer cleanup- const onAddToQuery = useCallback(- (fieldKey: string, fieldValue: string, operator: string): void => {- handleCloseLogDetail();-- const partExpression = generateFilterQuery({- fieldKey,- fieldValue,- type: getOldLogsOperatorFromNew(operator),- });-- const currentUser = userExpression;- const newUser = currentUser.trim()- ? `${currentUser} AND ${partExpression}`- : partExpression;-- querySearchOnRun(newUser);-- logInfraDrawerFilterCustomizedEvent(category, 'logs', newUser, 'logs');- },- [userExpression, querySearchOnRun, handleCloseLogDetail, category],- );-const onApplyLogFilter = useCallback((expression: string): void => {handleCloseLogDetail();@@ -342,8 +317,6 @@ function EntityLogsContent({logs={logs}onNavigateLog={handleSetActiveLog}selectedTab={selectedTab}- onAddToQuery={onAddToQuery}- onClickActionItem={onAddToQuery}onApplyLogFilter={onApplyLogFilter}onScrollToLog={handleScrollToLog}handleOpenInExplorer={(e) => handleOpenInExplorer(e, activeLog)}diff --git a/frontend/src/container/LiveLogs/LiveLogsList/index.tsx b/frontend/src/container/LiveLogs/LiveLogsList/index.tsxindex 2a94600d46..09cd0ffd58 100644--- a/frontend/src/container/LiveLogs/LiveLogsList/index.tsx+++ b/frontend/src/container/LiveLogs/LiveLogsList/index.tsx@@ -259,8 +259,6 @@ function LiveLogsList({selectedTab={selectedTab}log={activeLog}onClose={handleCloseLogDetail}- onAddToQuery={onAddToQuery}- onClickActionItem={onAddToQuery}handleChangeSelectedView={handleChangeSelectedView}logs={formattedLogs}onNavigateLog={handleSetActiveLog}diff --git a/frontend/src/container/LogDetailedView/LogDetailedView.types.ts b/frontend/src/container/LogDetailedView/LogDetailedView.types.tsindex 5c57d5c08f..31d65e2c8c 100644--- a/frontend/src/container/LogDetailedView/LogDetailedView.types.ts+++ b/frontend/src/container/LogDetailedView/LogDetailedView.types.ts@@ -1,5 +1,4 @@import { MetricsType } from 'container/MetricsApplication/constant';-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';export type AnyObject = { [key: string]: any };@@ -19,15 +18,3 @@ export interface DataType {field: string;value: string;}--export interface ActionItemProps {- fieldKey: string;- fieldValue: string;- onClickActionItem: (- fieldKey: string,- fieldValue: string,- operator: string,- dataType?: DataTypes,- fieldType?: string,- ) => void;-}diff --git a/frontend/src/container/LogDetailedView/logAttributeActions.utils.ts b/frontend/src/container/LogDetailedView/logAttributeActions.utils.tsindex 31d9ea0cf0..6733fa2e8e 100644--- a/frontend/src/container/LogDetailedView/logAttributeActions.utils.ts+++ b/frontend/src/container/LogDetailedView/logAttributeActions.utils.ts@@ -172,7 +172,7 @@ const normalizeDataType = (// key is fabricated locally (empty source list), so no click-time getAggregateKeys fetch.export const getFilterQueryData = (item: IBuilderQuery,- target: LogFilterTarget,+ target: Pick<LogFilterTarget, 'fieldKey' | 'dataType' | 'metricsType'>,value: unknown,operator: string,): IBuilderQuery => {diff --git a/frontend/src/container/LogsExplorerList/index.tsx b/frontend/src/container/LogsExplorerList/index.tsxindex fc27046025..2bba30c781 100644--- a/frontend/src/container/LogsExplorerList/index.tsx+++ b/frontend/src/container/LogsExplorerList/index.tsx@@ -381,8 +381,6 @@ function LogsExplorerList({selectedTab={selectedTab}log={activeLog}onClose={handleCloseLogDetail}- onAddToQuery={onAddToQuery}- onClickActionItem={onAddToQuery}handleChangeSelectedView={handleChangeSelectedView}logs={logs}onNavigateLog={handleSetActiveLog}diff --git a/frontend/src/container/LogsPanelTable/LogsPanelComponent.tsx b/frontend/src/container/LogsPanelTable/LogsPanelComponent.tsxindex 3ce4bfabe5..82558f7f8f 100644--- a/frontend/src/container/LogsPanelTable/LogsPanelComponent.tsx+++ b/frontend/src/container/LogsPanelTable/LogsPanelComponent.tsx@@ -91,13 +91,8 @@ function LogsPanelComponent({() => logs.map((log) => FlatLogData(log) as RowData),[logs],);- const {- activeLog,- onAddToQuery,- selectedTab,- handleSetActiveLog,- handleCloseLogDetail,- } = useLogDetailHandlers();+ const { activeLog, selectedTab, handleSetActiveLog, handleCloseLogDetail } =+ useLogDetailHandlers();const handleRow = useCallback((record: RowData): HTMLAttributes<RowData> => ({@@ -179,8 +174,6 @@ function LogsPanelComponent({selectedTab={selectedTab}log={activeLog}onClose={handleCloseLogDetail}- onAddToQuery={onAddToQuery}- onClickActionItem={onAddToQuery}isListViewPanellistViewPanelSelectedFields={widget?.selectedLogFields}logs={logs}diff --git a/frontend/src/container/PipelinePage/PipelineListsView/Preview/components/LogsList/index.tsx b/frontend/src/container/PipelinePage/PipelineListsView/Preview/components/LogsList/index.tsxindex 5b20e97aba..b7d2480588 100644--- a/frontend/src/container/PipelinePage/PipelineListsView/Preview/components/LogsList/index.tsx+++ b/frontend/src/container/PipelinePage/PipelineListsView/Preview/components/LogsList/index.tsx@@ -10,8 +10,7 @@ import { ILog } from 'types/api/logs/log';import './styles.scss';function LogsList({ logs }: LogsListProps): JSX.Element {- const { activeLog, onSetActiveLog, onClearActiveLog, onAddToQuery } =- useActiveLog();+ const { activeLog, onSetActiveLog, onClearActiveLog } = useActiveLog();const makeLogDetailsHandler = (log: ILog) => (): void => onSetActiveLog(log);@@ -45,8 +44,6 @@ function LogsList({ logs }: LogsListProps): JSX.Element {selectedTab={VIEW_TYPES.OVERVIEW}log={activeLog}onClose={onClearActiveLog}- onAddToQuery={onAddToQuery}- onClickActionItem={onAddToQuery}/></div>);diff --git a/frontend/src/hooks/logs/__tests__/useActiveLog.test.ts b/frontend/src/hooks/logs/__tests__/useActiveLog.test.tsnew file mode 100644index 0000000000..037fecb044--- /dev/null+++ b/frontend/src/hooks/logs/__tests__/useActiveLog.test.ts@@ -0,0 +1,61 @@+import { renderHook } from '@testing-library/react';+import { initialQueriesMap } from 'constants/queryBuilder';+import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';+import { Query } from 'types/api/queryBuilder/queryBuilderData';++import { useActiveLog } from '../useActiveLog';++const mockRedirect = jest.fn();++jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({+ useQueryBuilder: (): unknown => ({+ currentQuery: initialQueriesMap.logs,+ redirectWithQueryBuilderData: mockRedirect,+ }),+}));++jest.mock('hooks/useUrlQuery', () => ({+ __esModule: true,+ default: (): URLSearchParams => new URLSearchParams(),+}));++describe('useActiveLog', () => {+ beforeEach(() => {+ mockRedirect.mockClear();+ });++ it('adds the chip field as a filter with its data type and redirects', () => {+ const { result } = renderHook(() => useActiveLog());++ result.current.onAddToQuery(+ 'service.name',+ 'frontend',+ '=',+ DataTypes.String,+ );++ expect(mockRedirect).toHaveBeenCalledTimes(1);+ const query = mockRedirect.mock.calls[0][0] as Query;+ const item = query.builder.queryData[0].filters?.items.at(-1);+ expect(item?.key).toMatchObject({+ key: 'service.name',+ dataType: DataTypes.String,+ type: '',+ });+ expect(item?.op).toBe('=');+ expect(item?.value).toBe('frontend');+ });++ it('keeps the existing filter items ahead of the new one', () => {+ const { result } = renderHook(() => useActiveLog());++ result.current.onAddToQuery('k8s.pod.name', 'pod-1', '=');++ const query = mockRedirect.mock.calls[0][0] as Query;+ const items = query.builder.queryData[0].filters?.items ?? [];+ expect(items).toHaveLength(+ (initialQueriesMap.logs.builder.queryData[0].filters?.items.length ?? 0) + 1,+ );+ expect(items.at(-1)?.key?.key).toBe('k8s.pod.name');+ });+});diff --git a/frontend/src/hooks/logs/__tests__/useLogDetailHandlers.test.ts b/frontend/src/hooks/logs/__tests__/useLogDetailHandlers.test.tsindex 085a39951d..eee4b02bef 100644--- a/frontend/src/hooks/logs/__tests__/useLogDetailHandlers.test.ts+++ b/frontend/src/hooks/logs/__tests__/useLogDetailHandlers.test.ts@@ -11,7 +11,6 @@ jest.mock('hooks/useIsTextSelected');const mockOnSetActiveLog = jest.fn();const mockOnClearActiveLog = jest.fn();const mockOnAddToQuery = jest.fn();-const mockOnGroupByAttribute = jest.fn();const mockIsTextSelected = jest.fn();const mockLog: ILog = {@@ -44,7 +43,6 @@ beforeEach(() => {onSetActiveLog: mockOnSetActiveLog,onClearActiveLog: mockOnClearActiveLog,onAddToQuery: mockOnAddToQuery,- onGroupByAttribute: mockOnGroupByAttribute,});});@@ -80,7 +78,6 @@ it('should toggle off when clicking the same active log', () => {onSetActiveLog: mockOnSetActiveLog,onClearActiveLog: mockOnClearActiveLog,onAddToQuery: mockOnAddToQuery,- onGroupByAttribute: mockOnGroupByAttribute,});const { result } = renderHook(() => useLogDetailHandlers());diff --git a/frontend/src/hooks/logs/types.ts b/frontend/src/hooks/logs/types.tsindex a36d565ab9..08530de8ec 100644--- a/frontend/src/hooks/logs/types.ts+++ b/frontend/src/hooks/logs/types.ts@@ -25,5 +25,4 @@ export type UseActiveLog = {operator: string,dataType?: DataTypes,) => void;- onGroupByAttribute: (fieldKey: string, dataType?: DataTypes) => Promise<void>;};diff --git a/frontend/src/hooks/logs/useActiveLog.ts b/frontend/src/hooks/logs/useActiveLog.tsindex 0bb53e8a12..78c054918b 100644--- a/frontend/src/hooks/logs/useActiveLog.ts+++ b/frontend/src/hooks/logs/useActiveLog.ts@@ -1,40 +1,16 @@import { useCallback, useEffect, useRef, useState } from 'react';-import { useQueryClient } from 'react-query';-import { getAggregateKeys } from 'api/queryBuilder/getAttributeKeys';-import { SOMETHING_WENT_WRONG } from 'constants/api';import { QueryParams } from 'constants/query';-import { OPERATORS, QueryBuilderKeys } from 'constants/queryBuilder';-import { MetricsType } from 'container/MetricsApplication/constant';-import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearchV2/utils';+import { getFilterQueryData } from 'container/LogDetailedView/logAttributeActions.utils';import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';-import { useNotifications } from 'hooks/useNotifications';import useUrlQuery from 'hooks/useUrlQuery';-import { chooseAutocompleteFromCustomValue } from 'lib/newQueryBuilder/chooseAutocompleteFromCustomValue';import { ILog } from 'types/api/logs/log';-import {- BaseAutocompleteData,- DataTypes,-} from 'types/api/queryBuilder/queryAutocompleteResponse';+import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';import { Query } from 'types/api/queryBuilder/queryBuilderData';-import { v4 as uuid } from 'uuid';import { UseActiveLog } from './types';-export function getOldLogsOperatorFromNew(operator: string): string {- switch (operator) {- case OPERATORS['=']:- return OPERATORS.IN;- case OPERATORS['!=']:- return OPERATORS.NIN;- default:- return operator;- }-}-// eslint-disable-next-line sonarjs/cognitive-complexityexport const useActiveLog = (): UseActiveLog => {- const queryClient = useQueryClient();const { currentQuery, redirectWithQueryBuilderData } = useQueryBuilder();- const { notifications } = useNotifications();const [activeLog, setActiveLog] = useState<ILog | null>(null);@@ -58,121 +34,32 @@ export const useActiveLog = (): UseActiveLog => {const onClearActiveLog = useCallback((): void => setActiveLog(null), []);- const onAddToQueryExplorer = useCallback(- async (+ const onAddToQuery = useCallback(+ (fieldKey: string,fieldValue: string,operator: string,dataType?: DataTypes,- fieldType?: MetricsType | undefined,- ): Promise<void> => {- try {- const keysAutocompleteResponse = await queryClient.fetchQuery(- [QueryBuilderKeys.GET_AGGREGATE_KEYS, fieldKey],- async () =>- getAggregateKeys({- searchText: fieldKey,- aggregateOperator:- currentQuery.builder.queryData[0].aggregateOperator || '',- dataSource: currentQuery.builder.queryData[0].dataSource,- aggregateAttribute:- currentQuery.builder.queryData[0].aggregateAttribute?.key || '',- }),- );-- const keysAutocomplete: BaseAutocompleteData[] =- keysAutocompleteResponse.payload?.attributeKeys || [];-- const existAutocompleteKey = chooseAutocompleteFromCustomValue(- keysAutocomplete,- fieldKey,- dataType,- fieldType,- );-- const currentOperator = getOperatorValue(operator);-- const nextQuery: Query = {- ...currentQuery,- builder: {- ...currentQuery.builder,- queryData: currentQuery.builder.queryData.map((item) => ({- ...item,- filters: {- ...item.filters,- items: [- ...(item.filters?.items || []),- {- id: uuid(),- key: existAutocompleteKey,- op: currentOperator,- value: fieldValue,- },- ],- op: item.filters?.op || 'AND',- },- })),- },- };-- redirectWithQueryBuilderData(nextQuery);- } catch {- notifications.error({ message: SOMETHING_WENT_WRONG });- }- },- [currentQuery, notifications, queryClient, redirectWithQueryBuilderData],- );-- const onGroupByAttribute = useCallback(- async (fieldKey: string, dataType?: DataTypes): Promise<void> => {- try {- const keysAutocompleteResponse = await queryClient.fetchQuery(- [QueryBuilderKeys.GET_AGGREGATE_KEYS, fieldKey],- // eslint-disable-next-line sonarjs/no-identical-functions- async () =>- getAggregateKeys({- searchText: fieldKey,- aggregateOperator:- currentQuery.builder.queryData[0].aggregateOperator || '',- dataSource: currentQuery.builder.queryData[0].dataSource,- aggregateAttribute:- currentQuery.builder.queryData[0].aggregateAttribute?.key || '',- }),- );-- const keysAutocomplete: BaseAutocompleteData[] =- keysAutocompleteResponse.payload?.attributeKeys || [];-- const existAutocompleteKey = chooseAutocompleteFromCustomValue(- keysAutocomplete,- fieldKey,- dataType,- );-- const nextQuery: Query = {- ...currentQuery,- builder: {- ...currentQuery.builder,- queryData: currentQuery.builder.queryData.map((item) => ({- ...item,- groupBy: [...item.groupBy, existAutocompleteKey],- })),- },- };-- redirectWithQueryBuilderData(nextQuery);- } catch {- notifications.error({ message: SOMETHING_WENT_WRONG });- }+ ): void => {+ const nextQuery: Query = {+ ...currentQuery,+ builder: {+ ...currentQuery.builder,+ queryData: currentQuery.builder.queryData.map((item) =>+ getFilterQueryData(item, { fieldKey, dataType }, fieldValue, operator),+ ),+ },+ };++ redirectWithQueryBuilderData(nextQuery);},- [currentQuery, notifications, queryClient, redirectWithQueryBuilderData],+ [currentQuery, redirectWithQueryBuilderData],);return {activeLog,onSetActiveLog,onClearActiveLog,- onAddToQuery: onAddToQueryExplorer,- onGroupByAttribute,+ onAddToQuery,};};diff --git a/frontend/src/lib/logs/generateFilterQuery.ts b/frontend/src/lib/logs/generateFilterQuery.tsdeleted file mode 100644index 953eff9988..0000000000--- a/frontend/src/lib/logs/generateFilterQuery.ts+++ /dev/null@@ -1,24 +0,0 @@-import { QueryOperatorsMultiVal } from 'lib/logql/tokens';--type Keys = keyof typeof QueryOperatorsMultiVal;-type Values = (typeof QueryOperatorsMultiVal)[Keys];--interface GenerateFilterQueryParams {- fieldKey: string;- fieldValue: string;- type: Values;-}-export const generateFilterQuery = ({- fieldKey,- fieldValue,- type,-}: GenerateFilterQueryParams): string => {- let generatedQueryString = `${fieldKey} ${type} `;- if (typeof fieldValue === 'number') {- generatedQueryString += `(${fieldValue})`;- } else {- generatedQueryString += `('${fieldValue}')`;- }-- return generatedQueryString;-};diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/Renderer.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/Renderer.tsxindex 867c09ca37..598b88e169 100644--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/Renderer.tsx+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/Renderer.tsx@@ -217,8 +217,6 @@ function ListPanelRenderer({log={logDetail.activeLog}selectedTab={logDetail.selectedTab}onClose={logDetail.onClose}- onAddToQuery={logDetail.onAddToQuery}- onClickActionItem={logDetail.onAddToQuery}onNavigateLog={logDetail.onNavigateLog}logs={logDetail.logs}isListViewPaneldiff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/useListRowInteraction.ts b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/useListRowInteraction.tsindex eeb473b3d4..eddbec7d6a 100644--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/useListRowInteraction.ts+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/useListRowInteraction.ts@@ -18,7 +18,6 @@ export interface ListLogDetail {selectedTab: VIEWS;logs: ILog[];onClose: () => void;- onAddToQuery: ReturnType<typeof useLogDetailHandlers>['onAddToQuery'];onNavigateLog: (log: ILog) => void;}@@ -49,13 +48,8 @@ export function useListRowInteraction({const isLogs = signal === TelemetrytypesSignalDTO.logs;const isTraces = signal === TelemetrytypesSignalDTO.traces;- const {- activeLog,- onAddToQuery,- selectedTab,- handleSetActiveLog,- handleCloseLogDetail,- } = useLogDetailHandlers();+ const { activeLog, selectedTab, handleSetActiveLog, handleCloseLogDetail } =+ useLogDetailHandlers();const logs = useMemo(() => (isLogs ? rows.map(rawRowToILog) : []),@@ -90,7 +84,6 @@ export function useListRowInteraction({selectedTab: selectedTab ?? VIEW_TYPES.OVERVIEW,logs,onClose: handleCloseLogDetail,- onAddToQuery,onNavigateLog: handleSetActiveLog,}: null,@@ -100,7 +93,6 @@ export function useListRowInteraction({selectedTab,logs,handleCloseLogDetail,- onAddToQuery,handleSetActiveLog,],);