feat(querier): add the pattern request type for log patterns

A pattern request groups the logs of one logs builder query by pattern: the
message (body_v2.message) with variable parts such as IDs, IPs, timestamps
and numbers replaced by placeholders. It returns the top patterns per
service with an estimated count, samples, severities and a trend, counted
on a hash sample of at most about 100k logs.

The new pattern('<text>'[, ...]) filter function keeps the logs of the given
patterns. A placeholder in the filter matches the same placeholder or <*>
in a log's pattern, and the body is searched for the pattern's fixed words
first so the masks run only on the logs that can match.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QvYb7kcQPeRsTAoedAsb5W

docs/api/openapi.yml

@@ -10141,6 +10141,113 @@ components:
       - asc
       - desc
       type: string
+    Querybuildertypesv5Pattern:
+      properties:
+        count:
+          description: 'The estimated number of logs of the pattern in the time range:
+            the sampled count times sampleRate.'
+          minimum: 0
+          type: integer
+        firstSeen:
+          description: The Unix time in milliseconds of the earliest sampled log of
+            the pattern in the time range.
+          format: int64
+          type: integer
+        id:
+          description: The pattern's ID, the decimal cityHash64 of its text.
+          type: string
+        labels:
+          description: 'The group-by field values the pattern was counted for: always
+            service.name first, then the query''s own group by.'
+          items:
+            $ref: '#/components/schemas/Querybuildertypesv5Label'
+          type: array
+        lastSeen:
+          description: The Unix time in milliseconds of the latest sampled log of
+            the pattern in the time range.
+          format: int64
+          type: integer
+        pattern:
+          description: 'The pattern text: the log message with the values that change
+            replaced by placeholders such as <*>, <IP> or <UUID>. Filter on it with
+            pattern(''<pattern text>'').'
+          type: string
+        percent:
+          description: The pattern's count as a percentage of total.
+          format: double
+          type: number
+        samples:
+          description: Up to three sampled log messages of the pattern.
+          items:
+            type: string
+          nullable: true
+          type: array
+        severities:
+          description: The most common severity texts of the pattern's logs, most
+            common first.
+          items:
+            type: string
+          nullable: true
+          type: array
+        trend:
+          description: The estimated number of logs of the pattern in each step of
+            the time range, oldest first. Steps without a sampled log are left out.
+          items:
+            $ref: '#/components/schemas/Querybuildertypesv5PatternTrendPoint'
+          nullable: true
+          type: array
+      required:
+      - id
+      - pattern
+      - count
+      - percent
+      - firstSeen
+      - lastSeen
+      - samples
+      - severities
+      - trend
+      type: object
+    Querybuildertypesv5PatternTrendPoint:
+      properties:
+        count:
+          description: The estimated number of logs of the pattern in the step.
+          minimum: 0
+          type: integer
+        timestamp:
+          description: The Unix time in milliseconds the step starts at.
+          format: int64
+          type: integer
+      required:
+      - timestamp
+      - count
+      type: object
+    Querybuildertypesv5PatternsData:
+      properties:
+        patterns:
+          description: The patterns, most logs first.
+          items:
+            $ref: '#/components/schemas/Querybuildertypesv5Pattern'
+          nullable: true
+          type: array
+        queryName:
+          description: The name of the query that produced this result.
+          type: string
+        sampleRate:
+          description: One in sampleRate of the matching logs was read and every count
+            is scaled up by it. 1 means every log was read and the counts are exact.
+          minimum: 0
+          type: integer
+        total:
+          description: The number of logs the query matched in the time range, over
+            every pattern.
+          minimum: 0
+          type: integer
+      required:
+      - queryName
+      - sampleRate
+      - total
+      - patterns
+      type: object
     Querybuildertypesv5PreviewStatement:
       properties:
         db.statement.args:
@@ -10702,11 +10809,12 @@ components:
       - $ref: '#/components/schemas/Querybuildertypesv5ScalarData'
       - $ref: '#/components/schemas/Querybuildertypesv5RawData'
       - $ref: '#/components/schemas/Querybuildertypesv5DistributionData'
+      - $ref: '#/components/schemas/Querybuildertypesv5PatternsData'
       properties:
         results:
           description: 'One result per enabled query, typed by the request type: TimeSeriesData
-            for time_series and heatmap, ScalarData for scalar, RawData for raw and
-            DistributionData for distribution requests.'
+            for time_series and heatmap, ScalarData for scalar, RawData for raw, DistributionData
+            for distribution and PatternsData for pattern requests.'
           items: {}
           nullable: true
           type: array
@@ -10897,8 +11005,8 @@ components:
     Querybuildertypesv5QueryRangeResponse:
       description: 'Response from the v5 query range endpoint. The data.results array
         contains typed results depending on the requestType: TimeSeriesData for time_series
-        and heatmap, ScalarData for scalar, RawData for raw, or DistributionData for
-        distribution requests.'
+        and heatmap, ScalarData for scalar, RawData for raw, DistributionData for
+        distribution, or PatternsData for pattern requests.'
       properties:
         data:
           allOf:
@@ -10996,6 +11104,7 @@ components:
       - trace
       - heatmap
       - distribution
+      - pattern
       type: string
     Querybuildertypesv5ScalarData:
       properties:

frontend/src/api/generated/services/sigNoz.schemas.ts

@@ -6964,6 +6964,7 @@ export enum Querybuildertypesv5RequestTypeDTO {
 	trace = 'trace',
 	heatmap = 'heatmap',
 	distribution = 'distribution',
+	pattern = 'pattern',
 }
 /**
  * The query kind.
@@ -11881,6 +11882,103 @@ export interface Querybuildertypesv5FormatOptionsDTO {
 	formatTableResultForUI?: boolean;
 }
 
+export interface Querybuildertypesv5PatternTrendPointDTO {
+	/**
+	 * @type integer
+	 * @minimum 0
+	 * @description The estimated number of logs of the pattern in the step.
+	 */
+	count: number;
+	/**
+	 * @type integer
+	 * @format int64
+	 * @description The Unix time in milliseconds the step starts at.
+	 */
+	timestamp: number;
+}
+
+export interface Querybuildertypesv5PatternDTO {
+	/**
+	 * @type integer
+	 * @minimum 0
+	 * @description The estimated number of logs of the pattern in the time range: the sampled count times sampleRate.
+	 */
+	count: number;
+	/**
+	 * @type integer
+	 * @format int64
+	 * @description The Unix time in milliseconds of the earliest sampled log of the pattern in the time range.
+	 */
+	firstSeen: number;
+	/**
+	 * @type string
+	 * @description The pattern's ID, the decimal cityHash64 of its text.
+	 */
+	id: string;
+	/**
+	 * @type array
+	 * @description The group-by field values the pattern was counted for: always service.name first, then the query's own group by.
+	 */
+	labels?: Querybuildertypesv5LabelDTO[];
+	/**
+	 * @type integer
+	 * @format int64
+	 * @description The Unix time in milliseconds of the latest sampled log of the pattern in the time range.
+	 */
+	lastSeen: number;
+	/**
+	 * @type string
+	 * @description The pattern text: the log message with the values that change replaced by placeholders such as <*>, <IP> or <UUID>. Filter on it with pattern('<pattern text>').
+	 */
+	pattern: string;
+	/**
+	 * @type number
+	 * @format double
+	 * @description The pattern's count as a percentage of total.
+	 */
+	percent: number;
+	/**
+	 * @type array,null
+	 * @description Up to three sampled log messages of the pattern.
+	 */
+	samples: string[] | null;
+	/**
+	 * @type array,null
+	 * @description The most common severity texts of the pattern's logs, most common first.
+	 */
+	severities: string[] | null;
+	/**
+	 * @type array,null
+	 * @description The estimated number of logs of the pattern in each step of the time range, oldest first. Steps without a sampled log are left out.
+	 */
+	trend: Querybuildertypesv5PatternTrendPointDTO[] | null;
+}
+
+export interface Querybuildertypesv5PatternsDataDTO {
+	/**
+	 * @type array,null
+	 * @description The patterns, most logs first.
+	 */
+	patterns: Querybuildertypesv5PatternDTO[] | null;
+	/**
+	 * @type string
+	 * @description The name of the query that produced this result.
+	 */
+	queryName: string;
+	/**
+	 * @type integer
+	 * @minimum 0
+	 * @description One in sampleRate of the matching logs was read and every count is scaled up by it. 1 means every log was read and the counts are exact.
+	 */
+	sampleRate: number;
+	/**
+	 * @type integer
+	 * @minimum 0
+	 * @description The number of logs the query matched in the time range, over every pattern.
+	 */
+	total: number;
+}
+
 export interface TelemetrystoretypesIndexStepDTO {
 	/**
 	 * @type string
@@ -12087,28 +12185,35 @@ export type Querybuildertypesv5QueryDataDTO =
 	| (Querybuildertypesv5TimeSeriesDataDTO & {
 			/**
 			 * @type array,null
-			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw and DistributionData for distribution requests.
+			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw, DistributionData for distribution and PatternsData for pattern requests.
 			 */
 			results?: unknown[] | null;
 	  })
 	| (Querybuildertypesv5ScalarDataDTO & {
 			/**
 			 * @type array,null
-			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw and DistributionData for distribution requests.
+			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw, DistributionData for distribution and PatternsData for pattern requests.
 			 */
 			results?: unknown[] | null;
 	  })
 	| (Querybuildertypesv5RawDataDTO & {
 			/**
 			 * @type array,null
-			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw and DistributionData for distribution requests.
+			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw, DistributionData for distribution and PatternsData for pattern requests.
 			 */
 			results?: unknown[] | null;
 	  })
 	| (Querybuildertypesv5DistributionDataDTO & {
 			/**
 			 * @type array,null
-			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw and DistributionData for distribution requests.
+			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw, DistributionData for distribution and PatternsData for pattern requests.
+			 */
+			results?: unknown[] | null;
+	  })
+	| (Querybuildertypesv5PatternsDataDTO & {
+			/**
+			 * @type array,null
+			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw, DistributionData for distribution and PatternsData for pattern requests.
 			 */
 			results?: unknown[] | null;
 	  });
@@ -12242,7 +12347,7 @@ export interface Querybuildertypesv5QueryRangeRequestDTO {
 }
 
 /**
- * Response from the v5 query range endpoint. The data.results array contains typed results depending on the requestType: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw, or DistributionData for distribution requests.
+ * Response from the v5 query range endpoint. The data.results array contains typed results depending on the requestType: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw, DistributionData for distribution, or PatternsData for pattern requests.
  */
 export interface Querybuildertypesv5QueryRangeResponseDTO {
 	/**

frontend/src/api/generatedAPIInstance.ts

@@ -11,8 +11,6 @@ import axios, { AxiosError, AxiosRequestConfig } from 'axios';
 // generated API Instance
 const generatedAPIAxiosInstance = axios.create({
 	baseURL: ENVIRONMENT.baseURL,
-	// The backend binds repeated keys (`states=a&states=b`); axios' default sends `states[]=`.
-	paramsSerializer: { indexes: null },
 });
 
 let generatedAPIQueryKeyHeaderContext: Record<string, unknown> | undefined;

frontend/src/assets/Logos/pixeltable.svg

@@ -1 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect x="1.25" y="1.25" width="21.5" height="21.5" rx="3.5" fill="none" stroke="#7A8291" stroke-width="1.5"/><g fill="#7A8291"><circle cx="7" cy="4.5" r="1.05"/><circle cx="9.5" cy="4.5" r="1.05"/><circle cx="12" cy="4.5" r="1.05"/><circle cx="14.5" cy="4.5" r="1.05"/><circle cx="7" cy="7" r="1.05"/><circle cx="17" cy="7" r="1.05"/><circle cx="7" cy="9.5" r="1.05"/><circle cx="17" cy="9.5" r="1.05"/><circle cx="7" cy="12" r="1.05"/><circle cx="9.5" cy="12" r="1.05"/><circle cx="12" cy="12" r="1.05"/><circle cx="14.5" cy="12" r="1.05"/><circle cx="7" cy="14.5" r="1.05"/><circle cx="7" cy="17" r="1.05"/><circle cx="7" cy="19.5" r="1.05"/></g></svg>

frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/Provider/QuerySearchV2.provider.tsx

@@ -48,59 +48,22 @@ export function QuerySearchV2Provider({
 	}, [initialExpression, store]);
 
 	const isInitialized = useRef(false);
-	const lastCommittedRef = useRef(committedExpression);
 	useEffect(() => {
-		if (isInitialized.current || !urlExpression) {
-			return;
-		}
-		isInitialized.current = true;
-		store
-			.getState()
-			.initializeFromUrl(
-				getUserExpressionFromCombined(initialExpression, urlExpression),
+		if (!isInitialized.current && urlExpression) {
+			const cleanedExpression = getUserExpressionFromCombined(
+				initialExpression,
+				urlExpression,
 			);
+			store.getState().initializeFromUrl(cleanedExpression);
+			isInitialized.current = true;
+		}
 	}, [urlExpression, initialExpression, store]);
 
-	// Back and Forward. Reads the browser's URL: after a write, nuqs can briefly
-	// report the value it replaced.
 	useEffect(() => {
-		const onPopState = (): void => {
-			isInitialized.current = true;
-			const urlValue = new URLSearchParams(window.location.search).get(
-				queryParamKey,
-			);
-			const expression = urlValue
-				? getUserExpressionFromCombined(initialExpression, urlValue)
-				: '';
-			// Another param changed; keep any text typed but not run.
-			if (expression === store.getState().committedExpression) {
-				return;
-			}
-			// Already in the URL, so the write below must not run for it.
-			lastCommittedRef.current = expression;
-			if (expression) {
-				store.getState().initializeFromUrl(expression);
-			} else {
-				store.getState().resetExpression();
-			}
-		};
-		window.addEventListener('popstate', onPopState);
-		return (): void => window.removeEventListener('popstate', onPopState);
-	}, [queryParamKey, initialExpression, store]);
-
-	// Write only when the committed filter changes, never in reply to a URL change.
-	useEffect(() => {
-		if (committedExpression === lastCommittedRef.current) {
-			return;
+		if (isInitialized.current || !urlExpression) {
+			setUrlExpression(committedExpression || null);
 		}
-		lastCommittedRef.current = committedExpression;
-		isInitialized.current = true;
-		const next = committedExpression || null;
-		if (next === urlExpression) {
-			return;
-		}
-		void setUrlExpression(next);
-	}, [committedExpression, urlExpression, setUrlExpression]);
+	}, [committedExpression, setUrlExpression, urlExpression]);
 
 	useEffect(() => {
 		return (): void => {

frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/Provider/__tests__/QuerySearchExpressionProvider.test.tsx

@@ -1,10 +1,9 @@
 import { ReactNode } from 'react';
-import { act, renderHook } from 'tests/test-utils';
+import { act, renderHook } from '@testing-library/react';
 
 import {
 	useExpression,
 	useInitialExpression,
-	useInputExpression,
 	useQuerySearchInitialExpressionProp,
 	useQuerySearchOnChange,
 	useQuerySearchOnRun,
@@ -35,22 +34,10 @@ function createWrapper(
 	};
 }
 
-// Back or Forward. nuqs has not caught up yet, so its value is still the old one.
-function goTo(expression: string | null): void {
-	act(() => {
-		const search = expression
-			? `?${new URLSearchParams({ testExpression: expression })}`
-			: '';
-		window.history.pushState(null, '', `/${search}`);
-		window.dispatchEvent(new PopStateEvent('popstate'));
-	});
-}
-
 function useTestHooks(): {
 	expression: string;
 	userExpression: string;
 	initialExpression: string;
-	inputExpression: string;
 	querySearchInitialExpressionProp: string | undefined;
 	onChange: (expr: string) => void;
 	onRun: (expr: string) => void;
@@ -59,7 +46,6 @@ function useTestHooks(): {
 		expression: useExpression(),
 		userExpression: useUserExpression(),
 		initialExpression: useInitialExpression(),
-		inputExpression: useInputExpression(),
 		querySearchInitialExpressionProp: useQuerySearchInitialExpressionProp(),
 		onChange: useQuerySearchOnChange(),
 		onRun: useQuerySearchOnRun(),
@@ -70,7 +56,6 @@ describe('QuerySearchExpressionProvider', () => {
 	beforeEach(() => {
 		jest.clearAllMocks();
 		mockUrlValue = null;
-		window.history.replaceState(null, '', '/');
 	});
 
 	it('should provide initial context values', () => {
@@ -125,96 +110,6 @@ describe('QuerySearchExpressionProvider', () => {
 		expect(result.current.expression).toBe('status = 500');
 	});
 
-	it('follows Back and Forward from the browser URL', () => {
-		mockUrlValue = 'status = 500';
-		const { result } = renderHook(() => useTestHooks(), {
-			wrapper: createWrapper(),
-		});
-
-		goTo('status = 404');
-
-		expect(result.current.userExpression).toBe('status = 404');
-		expect(mockSetQueryState).not.toHaveBeenCalled();
-	});
-
-	it('clears the filter on Back to a URL without the param', () => {
-		mockUrlValue = 'status = 500';
-		const { result } = renderHook(() => useTestHooks(), {
-			wrapper: createWrapper(),
-		});
-
-		goTo(null);
-
-		expect(result.current.userExpression).toBe('');
-		expect(mockSetQueryState).not.toHaveBeenCalled();
-	});
-
-	it('keeps text typed but not run when Back changes another param', () => {
-		mockUrlValue = 'status = 500';
-		const { result } = renderHook(() => useTestHooks(), {
-			wrapper: createWrapper(),
-		});
-		act(() => {
-			result.current.onChange('status = 404');
-		});
-
-		goTo('status = 500');
-
-		expect(result.current.inputExpression).toBe('status = 404');
-	});
-
-	it('writes a run filter to the URL once and ignores it coming back', () => {
-		const { result, rerender } = renderHook(() => useTestHooks(), {
-			wrapper: createWrapper(),
-		});
-
-		act(() => {
-			result.current.onRun('status = 500');
-		});
-		expect(mockSetQueryState).toHaveBeenCalledTimes(1);
-		expect(mockSetQueryState).toHaveBeenLastCalledWith('status = 500');
-
-		mockUrlValue = 'status = 500';
-		rerender();
-
-		expect(result.current.userExpression).toBe('status = 500');
-		expect(mockSetQueryState).toHaveBeenCalledTimes(1);
-	});
-
-	it('keeps a run filter when the URL briefly reports the value it replaced', () => {
-		mockUrlValue = 'status = 500';
-		const { result, rerender } = renderHook(() => useTestHooks(), {
-			wrapper: createWrapper(),
-		});
-
-		act(() => {
-			result.current.onRun('status = 404');
-		});
-		mockUrlValue = 'status = 404';
-		rerender();
-		mockUrlValue = 'status = 500';
-		rerender();
-
-		expect(result.current.userExpression).toBe('status = 404');
-	});
-
-	it('keeps a newer run when a late URL value arrives after an empty mount', () => {
-		const { result, rerender } = renderHook(() => useTestHooks(), {
-			wrapper: createWrapper(),
-		});
-
-		act(() => {
-			result.current.onRun('status = 500');
-		});
-		act(() => {
-			result.current.onRun('status = 404');
-		});
-		mockUrlValue = 'status = 500';
-		rerender();
-
-		expect(result.current.userExpression).toBe('status = 404');
-	});
-
 	it('should throw error when used outside provider', () => {
 		expect(() => {
 			renderHook(() => useExpression());

frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.styles.scss

@@ -15,41 +15,11 @@ $max-recents-shown: 5;
 		Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
 		'Helvetica Neue', sans-serif;
 
-	.query-where-clause-row {
-		display: flex;
-		align-items: flex-start;
-		gap: 8px;
-		// single-line editor: 36px .cm-line + 1px .cm-content border on each side
-		--button-height: 38px;
-
-		.query-where-clause-editor-container {
-			flex: 1;
-			min-width: 0;
-		}
-	}
-
 	.query-where-clause-editor-container {
 		position: relative;
 		display: flex;
 		flex-direction: row;
 
-		// The field draws one outline around the scope chip and the editor, so
-		// the editor inside draws none
-		&.hasScopeChip {
-			align-items: center;
-			gap: var(--spacing-3);
-			padding-left: var(--spacing-3);
-			border: 1px solid var(--l2-border);
-			border-radius: 2px;
-			background: var(--l1-background);
-			--query-builder-v2-border-color: transparent;
-			--query-builder-v2-background-color: transparent;
-
-			.query-where-clause-editor {
-				min-width: 0;
-			}
-		}
-
 		.query-search-initial-scope-label {
 			position: absolute;
 			left: 8px;

frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx

@@ -1,12 +1,6 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import {
-	CircleCheck,
-	Info,
-	TriangleAlert,
-	Filter,
-	Play,
-} from '@signozhq/icons';
+import { CircleCheck, Info, TriangleAlert, Filter } from '@signozhq/icons';
 import {
 	autocompletion,
 	closeCompletion,
@@ -22,7 +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 { Button as SignozButton } from '@signozhq/ui/button';
 import cx from 'classnames';
 import {
 	negationQueryOperatorSuggestions,
@@ -66,7 +59,6 @@ import {
 	SUGGESTION_FETCH_DEBOUNCE_MS,
 	SUGGESTIONS_SECTION,
 } from './constants';
-import { ScopeChip } from './ScopeChip/ScopeChip';
 import {
 	combineInitialAndUserExpression,
 	dedupeOptionsByLabel,
@@ -113,14 +105,9 @@ interface QuerySearchProps {
 	signalSource?: string;
 	hardcodedAttributeKeys?: QueryKeyDataSuggestionsProps[];
 	onRun?: (query: string) => void;
-	showRunButton?: boolean;
-	/** Shows the Run button busy while the page's queries fetch. */
-	isLoadingQueries?: boolean;
 	showFilterSuggestionsWithoutMetric?: boolean;
 	/** When set, the editor shows only the user expression; API/filter uses `initial AND (user)`. */
 	initialExpression?: string;
-	/** Shows `initialExpression` as a locked chip in the field instead of the scope icon. */
-	showScopeChip?: boolean;
 	/** When set, replaces the generic value-suggestion API with a custom fetcher. */
 	valueSuggestionsOverride?: (
 		key: string,
@@ -138,13 +125,10 @@ function QuerySearch({
 	queryData,
 	dataSource,
 	onRun,
-	showRunButton,
-	isLoadingQueries,
 	signalSource,
 	hardcodedAttributeKeys,
 	showFilterSuggestionsWithoutMetric,
 	initialExpression,
-	showScopeChip: showScopeChipProp,
 	metricNamespace,
 	valueSuggestionsOverride,
 }: QuerySearchProps): JSX.Element {
@@ -164,7 +148,6 @@ function QuerySearch({
 	const editorRef = useRef<EditorView | null>(null);
 
 	const isScopedFilter = initialExpression !== undefined;
-	const showScopeChip = !!showScopeChipProp && !!initialExpression;
 
 	const validateExpressionForEditor = useCallback(
 		(editorDoc: string): void => {
@@ -190,18 +173,6 @@ function QuerySearch({
 		[],
 	);
 
-	const handleRun = useCallback((): void => {
-		if (!onRun) {
-			return;
-		}
-		const user = getCurrentExpression();
-		onRun(
-			isScopedFilter
-				? combineInitialAndUserExpression(initialExpression ?? '', user)
-				: user,
-		);
-	}, [onRun, getCurrentExpression, isScopedFilter, initialExpression]);
-
 	const updateEditorValue = useCallback(
 		(value: string, options: { skipOnChange?: boolean } = {}): void => {
 			const view = editorRef.current;
@@ -1586,182 +1557,169 @@ function QuerySearch({
 				</div>
 			)}
 
-			<div className="query-where-clause-row">
-				<div
-					className={cx('query-where-clause-editor-container', {
-						hasScopeChip: showScopeChip,
-					})}
-				>
-					{showScopeChip && <ScopeChip expression={initialExpression ?? ''} />}
-					{isScopedFilter && !showScopeChip ? (
-						<Tooltip title={initialExpression || ''} placement="left">
-							<div className="query-search-initial-scope-label">
-								<Filter
-									size={14}
-									style={{
-										opacity: 0.9,
-										color: isDarkMode ? Color.BG_VANILLA_100 : Color.BG_INK_500,
-									}}
-								/>
-							</div>
-						</Tooltip>
-					) : null}
-					<Tooltip
-						title={<div data-log-detail-ignore="true">{getTooltipContent()}</div>}
-						placement="left"
-					>
-						<a
-							href="https://signoz.io/docs/userguide/search-syntax/"
-							target="_blank"
-							rel="noopener noreferrer"
-							style={{
-								position: 'absolute',
-								top: 8,
-								right: validation.isValid === false && getCurrentExpression() ? 40 : 8, // Move left when error shown
-								cursor: 'help',
-								zIndex: 10,
-								transition: 'right 0.2s ease',
-								display: 'inline-flex',
-								alignItems: 'center',
-								color: '#8c8c8c',
-							}}
-							onClick={(e): void => e.stopPropagation()}
-						>
-							<Info
+			<div className="query-where-clause-editor-container">
+				{isScopedFilter ? (
+					<Tooltip title={initialExpression || ''} placement="left">
+						<div className="query-search-initial-scope-label">
+							<Filter
 								size={14}
 								style={{
 									opacity: 0.9,
 									color: isDarkMode ? Color.BG_VANILLA_100 : Color.BG_INK_500,
 								}}
 							/>
-						</a>
+						</div>
 					</Tooltip>
+				) : null}
+				<Tooltip
+					title={<div data-log-detail-ignore="true">{getTooltipContent()}</div>}
+					placement="left"
+				>
+					<a
+						href="https://signoz.io/docs/userguide/search-syntax/"
+						target="_blank"
+						rel="noopener noreferrer"
+						style={{
+							position: 'absolute',
+							top: 8,
+							right: validation.isValid === false && getCurrentExpression() ? 40 : 8, // Move left when error shown
+							cursor: 'help',
+							zIndex: 10,
+							transition: 'right 0.2s ease',
+							display: 'inline-flex',
+							alignItems: 'center',
+							color: '#8c8c8c',
+						}}
+						onClick={(e): void => e.stopPropagation()}
+					>
+						<Info
+							size={14}
+							style={{
+								opacity: 0.9,
+								color: isDarkMode ? Color.BG_VANILLA_100 : Color.BG_INK_500,
+							}}
+						/>
+					</a>
+				</Tooltip>
 
-					<CodeMirror
-						theme={isDarkMode ? copilot : githubLight}
-						onChange={handleChange}
-						onUpdate={handleUpdate}
-						onCreateEditor={handleEditorCreate}
-						data-testid="query-where-clause-editor"
-						className={cx('query-where-clause-editor', {
-							isValid: validation.isValid === true,
+				<CodeMirror
+					theme={isDarkMode ? copilot : githubLight}
+					onChange={handleChange}
+					onUpdate={handleUpdate}
+					onCreateEditor={handleEditorCreate}
+					data-testid="query-where-clause-editor"
+					className={cx('query-where-clause-editor', {
+						isValid: validation.isValid === true,
+						hasErrors: validation.errors.length > 0,
+						hasInitialExpression: isScopedFilter,
+					})}
+					extensions={[
+						autocompletion({
+							override: [combinedSuggestions],
+							defaultKeymap: true,
+							closeOnBlur: true,
+							activateOnTyping: true,
+							maxRenderedOptions: 50,
+							addToOptions: [{ render: renderRecentDeleteButton, position: 100 }],
+						}),
+						javascript({ jsx: false, typescript: false }),
+						EditorView.lineWrapping,
+						stopEventsExtension,
+						Prec.highest(
+							keymap.of([
+								...completionKeymap,
+								{
+									key: 'Escape',
+									run: closeCompletion,
+								},
+								{
+									key: 'Enter',
+									preventDefault: true,
+									// Prevent default behavior of Enter to add new line
+									// and instead run a custom action
+									run: (): boolean => true,
+								},
+								{
+									key: 'Mod-Enter',
+									preventDefault: true,
+									// Prevent default behavior of Mod-Enter to add new line
+									// and instead run a custom action
+									// Mod-Enter is usually Ctrl-Enter or Cmd-Enter based on OS
+									run: (): boolean => {
+										if (onRun && typeof onRun === 'function') {
+											const user = getCurrentExpression();
+											onRun(
+												isScopedFilter
+													? combineInitialAndUserExpression(initialExpression ?? '', user)
+													: user,
+											);
+										}
+										return true;
+									},
+								},
+								{
+									key: 'Shift-Enter',
+									preventDefault: true,
+									// Prevent default behavior of Shift-Enter to add new line
+									run: (): boolean => true,
+								},
+							]),
+						),
+					]}
+					placeholder={placeholder}
+					basicSetup={{
+						lineNumbers: false,
+					}}
+					onFocus={(): void => {
+						setIsFocused(true);
+					}}
+					onBlur={handleBlur}
+				/>
+
+				{getCurrentExpression() && validation.isValid === false && !isFocused && (
+					<div
+						className={cx('query-status-container', {
 							hasErrors: validation.errors.length > 0,
-							hasInitialExpression: isScopedFilter && !showScopeChip,
 						})}
-						extensions={[
-							autocompletion({
-								override: [combinedSuggestions],
-								defaultKeymap: true,
-								closeOnBlur: true,
-								activateOnTyping: true,
-								maxRenderedOptions: 50,
-								addToOptions: [{ render: renderRecentDeleteButton, position: 100 }],
-							}),
-							javascript({ jsx: false, typescript: false }),
-							EditorView.lineWrapping,
-							stopEventsExtension,
-							Prec.highest(
-								keymap.of([
-									...completionKeymap,
-									{
-										key: 'Escape',
-										run: closeCompletion,
-									},
-									{
-										key: 'Enter',
-										preventDefault: true,
-										// Prevent default behavior of Enter to add new line
-										// and instead run a custom action
-										run: (): boolean => true,
-									},
-									{
-										key: 'Mod-Enter',
-										preventDefault: true,
-										// Prevent default behavior of Mod-Enter to add new line
-										// and instead run a custom action
-										// Mod-Enter is usually Ctrl-Enter or Cmd-Enter based on OS
-										run: (): boolean => {
-											handleRun();
-											return true;
-										},
-									},
-									{
-										key: 'Shift-Enter',
-										preventDefault: true,
-										// Prevent default behavior of Shift-Enter to add new line
-										run: (): boolean => true,
-									},
-								]),
-							),
-						]}
-						placeholder={placeholder}
-						basicSetup={{
-							lineNumbers: false,
-						}}
-						onFocus={(): void => {
-							setIsFocused(true);
-						}}
-						onBlur={handleBlur}
-					/>
-
-					{getCurrentExpression() && validation.isValid === false && !isFocused && (
-						<div
-							className={cx('query-status-container', {
-								hasErrors: validation.errors.length > 0,
-							})}
-							data-testid="query-validation-status"
-						>
-							<Popover
-								placement="bottomRight"
-								showArrow={false}
-								content={
-									<div className="query-status-content">
-										<div className="query-status-content-header">
-											<div className="query-validation">
-												<div className="query-validation-errors">
-													{validation.errors.map((error) => (
-														<div key={error.message} className="query-validation-error">
-															<div className="query-validation-error">
-																{error.line}:{error.column} - {error.message}
-															</div>
+						data-testid="query-validation-status"
+					>
+						<Popover
+							placement="bottomRight"
+							showArrow={false}
+							content={
+								<div className="query-status-content">
+									<div className="query-status-content-header">
+										<div className="query-validation">
+											<div className="query-validation-errors">
+												{validation.errors.map((error) => (
+													<div key={error.message} className="query-validation-error">
+														<div className="query-validation-error">
+															{error.line}:{error.column} - {error.message}
 														</div>
-													))}
-												</div>
+													</div>
+												))}
 											</div>
 										</div>
 									</div>
-								}
-								overlayClassName="query-status-popover"
-							>
-								{validation.isValid ? (
-									<Button
-										type="text"
-										icon={<CircleCheck size="md" />}
-										className="periscope-btn ghost"
-									/>
-								) : (
-									<Button
-										type="text"
-										icon={<TriangleAlert size={14} color={Color.BG_CHERRY_500} />}
-										className="periscope-btn ghost"
-									/>
-								)}
-							</Popover>
-						</div>
-					)}
-				</div>
-				{showRunButton && (
-					<SignozButton
-						variant="solid"
-						color="secondary"
-						size="md"
-						prefix={<Play size={14} />}
-						loading={isLoadingQueries}
-						onClick={handleRun}
-						testId="query-search-run-button"
-					>
-						Run
-					</SignozButton>
+								</div>
+							}
+							overlayClassName="query-status-popover"
+						>
+							{validation.isValid ? (
+								<Button
+									type="text"
+									icon={<CircleCheck size="md" />}
+									className="periscope-btn ghost"
+								/>
+							) : (
+								<Button
+									type="text"
+									icon={<TriangleAlert size={14} color={Color.BG_CHERRY_500} />}
+									className="periscope-btn ghost"
+								/>
+							)}
+						</Popover>
+					</div>
 				)}
 			</div>
 
@@ -1855,15 +1813,12 @@ function QuerySearch({
 
 QuerySearch.defaultProps = {
 	onRun: undefined,
-	showRunButton: false,
-	isLoadingQueries: false,
 	signalSource: '',
 	hardcodedAttributeKeys: undefined,
 	placeholder:
 		"Enter your filter query (e.g., http.status_code >= 500 AND service.name = 'frontend')",
 	showFilterSuggestionsWithoutMetric: false,
 	initialExpression: undefined,
-	showScopeChip: false,
 };
 
 export default QuerySearch;

frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/ScopeChip/ScopeChip.module.scss

@@ -1,57 +0,0 @@
-.scopeChip {
-	display: inline-flex;
-	align-items: center;
-	gap: var(--spacing-2);
-	flex: 0 1 auto;
-	min-width: 0;
-	max-width: 420px;
-	padding: var(--spacing-1) var(--spacing-3);
-	border-radius: 2px;
-	background: var(--l3-background);
-	color: var(--l2-foreground);
-	font-size: 12px;
-	line-height: 20px;
-	cursor: default;
-}
-
-.scopeIcon {
-	flex: none;
-}
-
-.scopeMore {
-	flex: none;
-	color: var(--l3-foreground);
-}
-
-// The editor beside it is CodeMirror on the copilot theme in dark and
-// githubLight in light; the chip borrows those token colours so one filter
-// does not read as two
-.scopeKey {
-	color: #939da5;
-}
-
-.scopeOperator {
-	color: #939da5;
-}
-
-.scopeValue {
-	color: #5bec95;
-}
-
-:global(.lightMode) {
-	.scopeKey,
-	.scopeOperator {
-		color: #005cc5;
-	}
-
-	.scopeValue {
-		color: #032f62;
-	}
-}
-
-.scopeExpression {
-	font-family: var(--font-mono, monospace);
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}

frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/ScopeChip/ScopeChip.tsx

@@ -1,41 +0,0 @@
-import { useMemo } from 'react';
-import { Lock } from '@signozhq/icons';
-import { Tooltip } from '@signozhq/ui/tooltip';
-import { extractQueryPairs } from 'utils/queryContextUtils';
-
-import styles from './ScopeChip.module.scss';
-
-interface ScopeChipProps {
-	expression: string;
-}
-
-/**
- * The locked half of the filter. It reads like the editor beside it: the last
- * clause carries the relation, the ones scoping it are counted instead.
- */
-export function ScopeChip({ expression }: ScopeChipProps): JSX.Element {
-	const clauses = useMemo(() => extractQueryPairs(expression), [expression]);
-	const relation = clauses[clauses.length - 1];
-
-	return (
-		<Tooltip title={expression} side="top">
-			<span className={styles.scopeChip} data-testid="query-search-scope-chip">
-				<Lock size={12} className={styles.scopeIcon} />
-				<span className={styles.scopeExpression}>
-					{relation ? (
-						<>
-							<span className={styles.scopeKey}>{relation.key}</span>
-							<span className={styles.scopeOperator}>{` ${relation.operator} `}</span>
-							<span className={styles.scopeValue}>{relation.value}</span>
-						</>
-					) : (
-						expression
-					)}
-				</span>
-				{clauses.length > 1 && (
-					<span className={styles.scopeMore}>{`+${clauses.length - 1}`}</span>
-				)}
-			</span>
-		</Tooltip>
-	);
-}

frontend/src/components/QueryBuilderV2/QueryV2/__tests__/QuerySearch.test.tsx

@@ -224,134 +224,6 @@ describe('QuerySearch (Integration with Real CodeMirror)', () => {
 		await waitFor(() => expect(onRun).toHaveBeenCalled(), { timeout: 2000 });
 	});
 
-	it('does not render the run button by default', () => {
-		render(
-			<QuerySearch
-				onChange={jest.fn() as jest.MockedFunction<(v: string) => void>}
-				queryData={initialQueriesMap.logs.builder.queryData[0]}
-				dataSource={DataSource.LOGS}
-				onRun={jest.fn()}
-			/>,
-		);
-
-		expect(
-			screen.queryByTestId('query-search-run-button'),
-		).not.toBeInTheDocument();
-	});
-
-	it('calls onRun with the editor text when the run button is clicked', async () => {
-		const onRun = jest.fn() as jest.MockedFunction<(q: string) => void>;
-
-		render(
-			<QuerySearch
-				onChange={jest.fn() as jest.MockedFunction<(v: string) => void>}
-				queryData={{
-					...initialQueriesMap.logs.builder.queryData[0],
-					filter: { expression: SAMPLE_STATUS_QUERY },
-				}}
-				dataSource={DataSource.LOGS}
-				onRun={onRun}
-				showRunButton
-			/>,
-		);
-
-		await waitFor(() =>
-			expect(document.querySelector(CM_EDITOR_SELECTOR)?.textContent).toBe(
-				SAMPLE_STATUS_QUERY,
-			),
-		);
-
-		await userEvent.click(screen.getByTestId('query-search-run-button'));
-
-		expect(onRun).toHaveBeenCalledWith(SAMPLE_STATUS_QUERY);
-	});
-
-	it('shows the locked scope as a chip in place of the scope icon', () => {
-		const scope = "kind_string = 'Client' AND http_host = 'api.example.com'";
-		const { container } = render(
-			<QuerySearch
-				onChange={jest.fn() as jest.MockedFunction<(v: string) => void>}
-				queryData={initialQueriesMap.traces.builder.queryData[0]}
-				dataSource={DataSource.TRACES}
-				initialExpression={scope}
-				showScopeChip
-			/>,
-		);
-
-		const chip = screen.getByTestId('query-search-scope-chip');
-		expect(chip).toHaveTextContent("http_host = 'api.example.com'");
-		expect(chip).toHaveTextContent('+1');
-		expect(chip).not.toHaveTextContent('kind_string');
-		expect(
-			container.querySelector('.query-search-initial-scope-label'),
-		).not.toBeInTheDocument();
-	});
-
-	it('keeps the scope icon unless the chip is asked for', () => {
-		const { container } = render(
-			<QuerySearch
-				onChange={jest.fn() as jest.MockedFunction<(v: string) => void>}
-				queryData={initialQueriesMap.traces.builder.queryData[0]}
-				dataSource={DataSource.TRACES}
-				initialExpression="kind_string = 'Client'"
-			/>,
-		);
-
-		expect(
-			screen.queryByTestId('query-search-scope-chip'),
-		).not.toBeInTheDocument();
-		expect(
-			container.querySelector('.query-search-initial-scope-label'),
-		).toBeInTheDocument();
-	});
-
-	it('shows the run button busy while the queries load', () => {
-		render(
-			<QuerySearch
-				onChange={jest.fn() as jest.MockedFunction<(v: string) => void>}
-				queryData={initialQueriesMap.logs.builder.queryData[0]}
-				dataSource={DataSource.LOGS}
-				onRun={jest.fn()}
-				showRunButton
-				isLoadingQueries
-			/>,
-		);
-
-		expect(screen.getByTestId('query-search-run-button')).toHaveAttribute(
-			'aria-busy',
-			'true',
-		);
-	});
-
-	it('runs the locked scope combined with the editor text', async () => {
-		const onRun = jest.fn() as jest.MockedFunction<(q: string) => void>;
-		const scope = "kind_string = 'Client'";
-
-		render(
-			<QuerySearch
-				onChange={jest.fn() as jest.MockedFunction<(v: string) => void>}
-				queryData={{
-					...initialQueriesMap.traces.builder.queryData[0],
-					filter: { expression: SAMPLE_STATUS_QUERY },
-				}}
-				dataSource={DataSource.TRACES}
-				onRun={onRun}
-				initialExpression={scope}
-				showRunButton
-			/>,
-		);
-
-		await waitFor(() =>
-			expect(document.querySelector(CM_EDITOR_SELECTOR)?.textContent).toBe(
-				SAMPLE_STATUS_QUERY,
-			),
-		);
-
-		await userEvent.click(screen.getByTestId('query-search-run-button'));
-
-		expect(onRun).toHaveBeenCalledWith(`${scope} AND (${SAMPLE_STATUS_QUERY})`);
-	});
-
 	it('initializes CodeMirror with expression from queryData.filter.expression on mount', async () => {
 		const testExpression =
 			"http.status_code >= 500 AND service.name = 'frontend'";

frontend/src/constants/reactQueryKeys.ts

@@ -69,6 +69,8 @@ export const REACT_QUERY_KEY = {
 	GET_NESTED_ENDPOINTS_LIST: 'GET_NESTED_ENDPOINTS_LIST',
 	GET_ENDPOINT_METRICS_DATA: 'GET_ENDPOINT_METRICS_DATA',
 	GET_ENDPOINT_STATUS_CODE_DATA: 'GET_ENDPOINT_STATUS_CODE_DATA',
+	GET_ENDPOINT_RATE_OVER_TIME_DATA: 'GET_ENDPOINT_RATE_OVER_TIME_DATA',
+	GET_ENDPOINT_LATENCY_OVER_TIME_DATA: 'GET_ENDPOINT_LATENCY_OVER_TIME_DATA',
 	GET_ENDPOINT_DROPDOWN_DATA: 'GET_ENDPOINT_DROPDOWN_DATA',
 	GET_ENDPOINT_DEPENDENT_SERVICES_DATA: 'GET_ENDPOINT_DEPENDENT_SERVICES_DATA',
 	GET_ENDPOINT_STATUS_CODE_BAR_CHARTS_DATA:

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/AllEndPoints.tsx

@@ -1,24 +1,20 @@
-import { useCallback, useEffect, useMemo } from 'react';
-import QuerySearch from 'components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch';
-import { combineInitialAndUserExpression } from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { Select } from 'antd';
 import { ENTITY_VERSION_V5 } from 'constants/app';
+import { initialQueriesMap } from 'constants/queryBuilder';
 import {
 	getAllEndpointsWidgetData,
-	getGroupByExpressionFromRowData,
+	getGroupByFiltersFromGroupByValues,
 } from 'container/ApiMonitoring/utils';
 import GridCard from 'container/WidgetCard/Card';
-import { GroupByFilter } from 'container/QueryBuilder/filters/GroupByFilter/GroupByFilter';
-import { chooseAutocompleteFromCustomValue } from 'lib/newQueryBuilder/chooseAutocompleteFromCustomValue';
+import QueryBuilderSearchV2 from 'container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2';
+import { useGetAggregateKeys } from 'hooks/queryBuilder/useGetAggregateKeys';
 import { isEqual } from 'lodash-es';
-import { parseAsString, useQueryState } from 'nuqs';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
 
-import { ENDPOINT_STATS_EXPRESSION_KEY } from '../../../filterParamKeys';
 import { useApiMonitoringParams } from '../../../queryParams';
 import { SPAN_ATTRIBUTES, VIEWS } from './constants';
-import { useFilterExpression } from './hooks/useFilterExpression';
-import { useWidgetQueries } from './hooks/useWidgetQueries';
 
 function AllEndPoints({
 	domainName,
@@ -27,6 +23,8 @@ function AllEndPoints({
 	groupBy,
 	setGroupBy,
 	timeRange,
+	initialFilters,
+	setInitialFiltersEndPointStats,
 }: {
 	domainName: string;
 	setSelectedEndPointName: (name: string) => void;
@@ -37,50 +35,113 @@ function AllEndPoints({
 		startTime: number;
 		endTime: number;
 	};
+	initialFilters: IBuilderQuery['filters'];
+	setInitialFiltersEndPointStats: (filters: IBuilderQuery['filters']) => void;
 }): JSX.Element {
 	const [params, setParams] = useApiMonitoringParams();
-	const [, setEndPointStatsExpression] = useQueryState(
-		ENDPOINT_STATS_EXPRESSION_KEY,
-		parseAsString,
-	);
+	const [groupBySearchValue, setGroupBySearchValue] = useState<string>('');
+	const [allAvailableGroupByOptions, setAllAvailableGroupByOptions] = useState<{
+		[key: string]: any;
+	}>({});
+
+	const { data: groupByFiltersData, isLoading: isLoadingGroupByFilters } =
+		useGetAggregateKeys({
+			dataSource: DataSource.TRACES,
+			aggregateAttribute: '',
+			aggregateOperator: 'noop',
+			searchText: groupBySearchValue,
+			tagType: '',
+		});
+
+	const [groupByOptions, setGroupByOptions] = useState<
+		{ value: string; label: string }[]
+	>([]);
 
 	// --- FILTERS STATE SYNC ---
-	const {
-		expression: filterExpression,
-		initialExpression: scopeExpression,
-		queryData,
-		onDraftChange,
-		onRun,
-		onBlur: handleFilterBlur,
-	} = useFilterExpression({
-		groupBy,
+	const [filters, setFilters] = useState<IBuilderQuery['filters']>(() => {
+		if (params.allEndpointsLocalFilters) {
+			return params.allEndpointsLocalFilters;
+		}
+		// Initialize filters based on the initial endPointName prop
+		const initialItems = [...(initialFilters?.items || [])];
+		return { op: 'AND', items: initialItems };
 	});
 
+	// Sync params to local filters state on param change
+	useEffect(() => {
+		if (
+			params.allEndpointsLocalFilters &&
+			!isEqual(params.allEndpointsLocalFilters, filters)
+		) {
+			setFilters(params.allEndpointsLocalFilters);
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [params.allEndpointsLocalFilters]);
+
+	// Handler for changes from the QueryBuilderSearchV2 component
+	const handleFilterChange = useCallback(
+		(newFilters: IBuilderQuery['filters']): void => {
+			setFilters(newFilters);
+			setParams({ allEndpointsLocalFilters: newFilters });
+		},
+		[setParams],
+	);
+
+	const currentQuery = initialQueriesMap[DataSource.TRACES];
+
+	const updatedCurrentQuery = useMemo(
+		() => ({
+			...currentQuery,
+			builder: {
+				...currentQuery.builder,
+				queryData: [
+					{
+						...currentQuery.builder.queryData[0],
+						dataSource: DataSource.TRACES,
+						filters, // Use the local filters state
+					},
+				],
+			},
+		}),
+		[filters, currentQuery],
+	);
+
+	const query = updatedCurrentQuery?.builder?.queryData[0] || null;
+
 	const allEndpointsWidgetData = useMemo(
-		() => getAllEndpointsWidgetData(groupBy, domainName, filterExpression),
-		[groupBy, domainName, filterExpression],
-	);
-
-	const tableWidgets = useMemo(
-		() => [allEndpointsWidgetData],
-		[allEndpointsWidgetData],
-	);
-	const { isFetching: isFetchingTable, refetch: refetchTable } =
-		useWidgetQueries(tableWidgets);
-
-	const handleRun = useCallback(
-		(value: string): void => onRun(value, refetchTable),
-		[onRun, refetchTable],
+		() => getAllEndpointsWidgetData(groupBy, domainName, filters),
+		[groupBy, domainName, filters],
 	);
 
 	// --- GROUP BY STATE SYNC (existing) ---
 	const handleGroupByChange = useCallback(
 		(value: IBuilderQuery['groupBy']) => {
-			setGroupBy(value);
+			const newGroupBy = [];
+
+			for (let index = 0; index < value.length; index++) {
+				const element = value[index] as unknown as string;
+
+				// Check if the key exists in our cached options first
+				if (allAvailableGroupByOptions[element]) {
+					newGroupBy.push(allAvailableGroupByOptions[element]);
+				} else {
+					// If not found in cache, check the current filtered results
+					const key = groupByFiltersData?.payload?.attributeKeys?.find(
+						(key) => key.key === element,
+					);
+
+					if (key) {
+						newGroupBy.push(key);
+					}
+				}
+			}
+
+			setGroupBy(newGroupBy);
+			setGroupBySearchValue('');
 			// Update params
-			setParams({ groupBy: value.map((g) => g.key) });
+			setParams({ groupBy: newGroupBy.map((g) => g.key) });
 		},
-		[setGroupBy, setParams],
+		[groupByFiltersData, setGroupBy, allAvailableGroupByOptions, setParams],
 	);
 
 	// Sync params to local groupBy state on param change
@@ -93,31 +154,77 @@ function AllEndPoints({
 				groupBy.map((g) => g.key),
 			)
 		) {
-			setGroupBy(
-				params.groupBy.map((key) => chooseAutocompleteFromCustomValue([], key)),
-			);
+			// Only update if different
+			const newGroupBy = params.groupBy
+				.map((key) => allAvailableGroupByOptions[key])
+				.filter(Boolean);
+			if (newGroupBy.length === params.groupBy.length) {
+				setGroupBy(newGroupBy);
+			}
 		}
-	}, [params.groupBy, groupBy, setGroupBy]);
+	}, [params.groupBy, allAvailableGroupByOptions, groupBy, setGroupBy]);
+
+	useEffect(() => {
+		if (groupByFiltersData?.payload) {
+			// Update dropdown options
+			setGroupByOptions(
+				groupByFiltersData?.payload?.attributeKeys?.map((filter) => ({
+					value: filter.key,
+					label: filter.key,
+				})) || [],
+			);
+
+			// Cache all available options to preserve selected values using functional update
+			setAllAvailableGroupByOptions((prevOptions) => {
+				const newOptions = { ...prevOptions };
+				groupByFiltersData?.payload?.attributeKeys?.forEach((filter) => {
+					newOptions[filter.key] = filter;
+				});
+				return newOptions;
+			});
+		}
+	}, [groupByFiltersData]); // Only depends on groupByFiltersData now
+
+	// Cache existing selected options on component mount
+	useEffect(() => {
+		if (groupBy && groupBy.length > 0) {
+			setAllAvailableGroupByOptions((prevOptions) => {
+				const newOptions = { ...prevOptions };
+				groupBy.forEach((option) => {
+					newOptions[option.key] = option;
+				});
+				return newOptions;
+			});
+		}
+	}, [groupBy]);
 
 	const onRowClick = useCallback(
 		(props: any): void => {
 			setSelectedEndPointName(props[SPAN_ATTRIBUTES.HTTP_URL] as string);
 			setSelectedView(VIEWS.ENDPOINT_STATS);
-			const statsExpression = combineInitialAndUserExpression(
-				getGroupByExpressionFromRowData(props),
-				filterExpression,
-			);
-			void setEndPointStatsExpression(statsExpression || null);
+			const initialItems = [
+				...(filters?.items || []),
+				...(getGroupByFiltersFromGroupByValues(props, groupBy)?.items || []),
+			];
+			setInitialFiltersEndPointStats({
+				items: initialItems,
+				op: 'AND',
+			});
 			setParams({
 				selectedEndPointName: props[SPAN_ATTRIBUTES.HTTP_URL] as string,
 				selectedView: VIEWS.ENDPOINT_STATS,
+				endPointDetailsLocalFilters: {
+					items: initialItems,
+					op: 'AND',
+				},
 			});
 		},
 		[
-			filterExpression,
-			setEndPointStatsExpression,
+			filters,
+			setInitialFiltersEndPointStats,
 			setSelectedEndPointName,
 			setSelectedView,
+			groupBy,
 			setParams,
 		],
 	);
@@ -125,28 +232,28 @@ function AllEndPoints({
 	return (
 		<div className="all-endpoints-container">
 			<div className="all-endpoints-header">
-				<div className="filter-container" onBlur={handleFilterBlur}>
-					<QuerySearch
-						queryData={queryData}
-						onChange={onDraftChange}
-						onRun={handleRun}
-						showRunButton
-						isLoadingQueries={isFetchingTable}
-						initialExpression={scopeExpression}
-						showScopeChip
-						dataSource={DataSource.TRACES}
+				<div className="filter-container">
+					<QueryBuilderSearchV2
+						query={query}
+						onChange={handleFilterChange}
 						placeholder="Search for filters..."
 					/>
 				</div>
 			</div>
 			<div className="group-by-container">
 				<div className="group-by-label"> Group by </div>
-				<GroupByFilter
-					query={queryData}
-					onChange={handleGroupByChange}
-					disabled={false}
+				<Select
+					className="group-by-select"
+					loading={isLoadingGroupByFilters}
+					mode="multiple"
+					value={groupBy}
+					allowClear
+					maxTagCount="responsive"
 					placeholder="Search for attribute"
-				/>
+					options={groupByOptions}
+					onChange={handleGroupByChange}
+					onSearch={(value: string): void => setGroupBySearchValue(value)}
+				/>{' '}
 			</div>
 			<div className="endpoints-table-container">
 				<GridCard

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.styles.scss

@@ -195,6 +195,16 @@
 			line-height: 18px;
 			letter-spacing: -0.07px;
 		}
+
+		.group-by-select {
+			width: 100%;
+			.ant-select-selector {
+				font-size: 14px;
+				border-radius: 2px 0px 0px 2px;
+				border: 1px solid var(--l1-border);
+				background: var(--l3-background);
+			}
+		}
 	}
 	// Add border-bottom to table cells when pagination is not present
 	.ant-spin-container:not(:has(.ant-pagination)) .ant-table-cell {
@@ -355,9 +365,16 @@
 .top-errors-dropdown-container {
 	display: flex;
 	flex-direction: row;
-	justify-content: space-between;
 	gap: 10px;
 	align-items: center;
+
+	.endpoint-details-filters-container-dropdown {
+		width: 100%;
+	}
+
+	.endpoint-details-filters-container-search {
+		flex: 1;
+	}
 }
 
 .endpoint-details-container {
@@ -399,8 +416,29 @@
 
 	.endpoint-details-filters-container {
 		display: flex;
-		flex-direction: column;
-		gap: 8px;
+		flex-direction: row;
+		align-items: center;
+		border: 1px solid var(--l1-border);
+		height: 36px;
+		box-sizing: content-box;
+		.ant-select-selector {
+			border: none !important;
+		}
+
+		.endpoint-details-filters-container-dropdown {
+			width: 120px;
+			border-right: 1px solid var(--l1-border);
+			height: 36px;
+			display: flex;
+			align-items: center;
+			.ant-select-single {
+				height: 32px;
+			}
+		}
+
+		.endpoint-details-filters-container-search {
+			flex: 1;
+		}
 	}
 
 	.ant-select-item,

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.tsx

@@ -6,7 +6,6 @@ import { Button, Drawer } from 'antd';
 import { ToggleGroup } from '@signozhq/ui/toggle-group';
 import { Divider } from '@signozhq/ui/divider';
 import { Typography } from '@signozhq/ui/typography';
-import { QuerySearchV2Provider } from 'components/QueryBuilderV2';
 import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
 import {
 	CustomTimeType,
@@ -18,12 +17,7 @@ import { AppState } from 'store/reducers';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { GlobalReducer } from 'types/reducer/globalTime';
 
-import {
-	ALL_ENDPOINTS_EXPRESSION_KEY,
-	ENDPOINT_STATS_EXPRESSION_KEY,
-} from '../../../filterParamKeys';
 import { useApiMonitoringParams } from '../../../queryParams';
-import { getDomainScopeExpression } from '../../../utils';
 import AllEndPoints from './AllEndPoints';
 import DomainMetrics from './components/DomainMetrics';
 import { VIEW_TYPES, VIEWS } from './constants';
@@ -40,14 +34,14 @@ function DomainDetails({
 	selectedDomainIndex,
 	setSelectedDomainIndex,
 	domainListLength,
-	domainListFilterExpression,
+	domainListFilters,
 }: {
 	domainData: any;
 	handleClose: () => void;
 	selectedDomainIndex: number;
 	setSelectedDomainIndex: (index: number) => void;
 	domainListLength: number;
-	domainListFilterExpression: string;
+	domainListFilters: IBuilderQuery['filters'];
 }): JSX.Element {
 	const [params, setParams] = useApiMonitoringParams();
 	const [selectedView, setSelectedView] = useState<VIEWS>(
@@ -59,16 +53,8 @@ function DomainDetails({
 	const [endPointsGroupBy, setEndPointsGroupBy] = useState<
 		IBuilderQuery['groupBy']
 	>([]);
-
-	const domainName = domainData?.domainName ?? '';
-	const allEndpointsScope = useMemo(
-		() => getDomainScopeExpression(domainName),
-		[domainName],
-	);
-	const endPointStatsScope = useMemo(
-		() => getDomainScopeExpression(domainName, selectedEndPointName),
-		[domainName, selectedEndPointName],
-	);
+	const [initialFiltersEndPointStats, setInitialFiltersEndPointStats] =
+		useState<IBuilderQuery['filters']>(domainListFilters);
 
 	const handleTabChange = (value: string): void => {
 		setSelectedView(value as VIEWS);
@@ -236,7 +222,7 @@ function DomainDetails({
 				<>
 					<DomainMetrics
 						domainName={domainData.domainName}
-						domainListFilterExpression={domainListFilterExpression}
+						domainListFilters={domainListFilters}
 						timeRange={modalTimeRange}
 					/>
 					<div className="views-tabs-container">
@@ -267,43 +253,34 @@ function DomainDetails({
 						/>
 					</div>
 					{selectedView === VIEW_TYPES.ALL_ENDPOINTS && (
-						<QuerySearchV2Provider
-							queryParamKey={ALL_ENDPOINTS_EXPRESSION_KEY}
-							initialExpression={allEndpointsScope}
-							persistOnUnmount
-						>
-							<AllEndPoints
-								domainName={domainData.domainName}
-								setSelectedEndPointName={handleEndPointChange}
-								setSelectedView={setSelectedView}
-								groupBy={endPointsGroupBy}
-								setGroupBy={setEndPointsGroupBy}
-								timeRange={modalTimeRange}
-							/>
-						</QuerySearchV2Provider>
+						<AllEndPoints
+							domainName={domainData.domainName}
+							setSelectedEndPointName={handleEndPointChange}
+							setSelectedView={setSelectedView}
+							groupBy={endPointsGroupBy}
+							setGroupBy={setEndPointsGroupBy}
+							timeRange={modalTimeRange}
+							initialFilters={domainListFilters}
+							setInitialFiltersEndPointStats={setInitialFiltersEndPointStats}
+						/>
 					)}
 
 					{selectedView === VIEW_TYPES.ENDPOINT_STATS && (
-						<QuerySearchV2Provider
-							queryParamKey={ENDPOINT_STATS_EXPRESSION_KEY}
-							initialExpression={endPointStatsScope}
-							persistOnUnmount
-						>
-							<EndPointDetails
-								domainName={domainData.domainName}
-								endPointName={selectedEndPointName}
-								setSelectedEndPointName={handleEndPointChange}
-								timeRange={modalTimeRange}
-								handleTimeChange={handleTimeChange}
-							/>
-						</QuerySearchV2Provider>
+						<EndPointDetails
+							domainName={domainData.domainName}
+							endPointName={selectedEndPointName}
+							setSelectedEndPointName={handleEndPointChange}
+							initialFilters={initialFiltersEndPointStats}
+							timeRange={modalTimeRange}
+							handleTimeChange={handleTimeChange}
+						/>
 					)}
 
 					{selectedView === VIEW_TYPES.TOP_ERRORS && (
 						<TopErrors
 							domainName={domainData.domainName}
 							timeRange={modalTimeRange}
-							initialFilterExpression={domainListFilterExpression}
+							initialFilters={domainListFilters}
 						/>
 					)}
 				</>

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/EndPointDetails.tsx

@@ -1,17 +1,17 @@
-import { useCallback, useMemo } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useQueries } from 'react-query';
-import QuerySearch from 'components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch';
-import { combineInitialAndUserExpression } from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
-import { ENTITY_VERSION_V5 } from 'constants/app';
+import { ENTITY_VERSION_V4, ENTITY_VERSION_V5 } from 'constants/app';
+import { initialQueriesMap } from 'constants/queryBuilder';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
+import { useApiMonitoringParams } from 'container/ApiMonitoring/queryParams';
 import {
 	END_POINT_DETAILS_QUERY_KEYS_ARRAY,
 	extractPortAndEndpoint,
 	getEndPointDetailsQueryPayload,
-	getHttpUrlExpression,
 	getLatencyOverTimeWidgetData,
 	getRateOverTimeWidgetData,
 } from 'container/ApiMonitoring/utils';
+import QueryBuilderSearchV2 from 'container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2';
 import {
 	CustomTimeType,
 	Time,
@@ -19,28 +19,36 @@ import {
 import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
 import { SuccessResponse } from 'types/api';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
-import { extractQueryPairs } from 'utils/queryContextUtils';
 
 import DependentServices from './components/DependentServices';
 import EndPointMetrics from './components/EndPointMetrics';
-import EndPointPicker from './components/EndPointPicker';
+import EndPointsDropDown from './components/EndPointsDropDown';
 import MetricOverTimeGraph from './components/MetricOverTimeGraph';
 import StatusCodeBarCharts from './components/StatusCodeBarCharts';
 import StatusCodeTable from './components/StatusCodeTable';
-import { useFilterExpression } from './hooks/useFilterExpression';
-import { useWidgetQueries } from './hooks/useWidgetQueries';
+import { SPAN_ATTRIBUTES } from './constants';
+
+const httpUrlKey = {
+	dataType: DataTypes.String,
+	key: SPAN_ATTRIBUTES.HTTP_URL,
+	type: 'tag',
+};
 
 function EndPointDetails({
 	domainName,
 	endPointName,
 	setSelectedEndPointName,
+	initialFilters,
 	timeRange,
 	handleTimeChange,
 }: {
 	domainName: string;
 	endPointName: string;
 	setSelectedEndPointName: (value: string) => void;
+	initialFilters: IBuilderQuery['filters'];
 	timeRange: {
 		startTime: number;
 		endTime: number;
@@ -51,66 +59,159 @@ function EndPointDetails({
 	) => void;
 }): JSX.Element {
 	const { startTime: minTime, endTime: maxTime } = timeRange;
+	const [params, setParams] = useApiMonitoringParams();
 
-	// Search filters; the endpoint filter is combined in at query time
-	const {
-		expression: filterExpression,
-		initialExpression: scopeExpression,
-		queryData,
-		onDraftChange,
-		onRun,
-		onBlur: handleFilterBlur,
-	} = useFilterExpression();
+	const currentQuery = initialQueriesMap[DataSource.TRACES];
 
-	const httpUrlExpression = useMemo(
-		() => getHttpUrlExpression(endPointName),
-		[endPointName],
+	// Local state for filters, combining endpoint filter and search filters
+	const [filters, setFilters] = useState<IBuilderQuery['filters']>(() => {
+		// Initialize filters based on the initial endPointName prop
+		const initialItems = params.endPointDetailsLocalFilters
+			? [...(params.endPointDetailsLocalFilters?.items || [])]
+			: [...(initialFilters?.items || [])];
+		if (endPointName) {
+			initialItems.push({
+				id: '92b8a1c1',
+				key: httpUrlKey,
+				op: '=',
+				value: endPointName,
+			});
+		}
+		return { op: 'AND', items: initialItems };
+	});
+
+	// Effect to synchronize local filters when the endPointName prop changes (e.g., from dropdown)
+	useEffect(() => {
+		setFilters((currentFilters) => {
+			const existingHttpUrlFilter = currentFilters?.items?.find(
+				(item) => item.key?.key === httpUrlKey.key,
+			);
+			const existingHttpUrlValue = (existingHttpUrlFilter?.value as string) || '';
+
+			// Only update filters if the prop value is different from what's already in filters
+			if (endPointName === existingHttpUrlValue) {
+				return currentFilters; // No change needed, prevents loop
+			}
+
+			// Rebuild filters: Keep non-http_url filters and add/update http_url filter based on prop
+			const otherFilters = currentFilters?.items?.filter(
+				(item) => item.key?.key !== httpUrlKey.key,
+			);
+			const newItems = [...(otherFilters || [])];
+			if (endPointName) {
+				newItems.push({
+					id: '92b8a1c1',
+					key: httpUrlKey,
+					op: '=',
+					value: endPointName,
+				});
+			}
+			return { op: 'AND', items: newItems };
+		});
+	}, [endPointName]);
+
+	// Separate effect to update params when filters change
+	useEffect(() => {
+		const filtersWithoutHttpUrl = {
+			op: 'AND',
+			items:
+				filters?.items?.filter((item) => item.key?.key !== httpUrlKey.key) || [],
+		};
+		setParams({ endPointDetailsLocalFilters: filtersWithoutHttpUrl });
+	}, [filters, setParams]);
+
+	// Handler for changes from the QueryBuilderSearchV2 component
+	const handleFilterChange = useCallback(
+		(newFilters: IBuilderQuery['filters']): void => {
+			// 1. Update local filters state immediately
+			setFilters(newFilters);
+			// Filter out http_url filter before saving to params
+			const filteredNewFilters = {
+				op: 'AND',
+				items:
+					newFilters?.items?.filter((item) => item.key?.key !== httpUrlKey.key) ||
+					[],
+			};
+			setParams({ endPointDetailsLocalFilters: filteredNewFilters });
+
+			// 2. Derive the endpoint name from the *new* filters state
+			const httpUrlFilter = newFilters?.items?.find(
+				(item) => item.key?.key === httpUrlKey.key,
+			);
+			const derivedEndPointName = (httpUrlFilter?.value as string) || '';
+
+			// 3. If the derived endpoint name is different from the current prop,
+			//    it means the search change modified the effective endpoint.
+			//    Notify the parent component.
+			if (derivedEndPointName !== endPointName) {
+				setSelectedEndPointName(derivedEndPointName);
+			}
+		},
+		[endPointName, setSelectedEndPointName, setParams], // Dependencies for the callback
 	);
 
-	const scopedExpression = useMemo(
-		() => combineInitialAndUserExpression(httpUrlExpression, filterExpression),
-		[httpUrlExpression, filterExpression],
+	const updatedCurrentQuery = useMemo(
+		() => ({
+			...currentQuery,
+			builder: {
+				...currentQuery.builder,
+				queryData: [
+					{
+						...currentQuery.builder.queryData[0],
+						dataSource: DataSource.TRACES,
+						filters, // Use the local filters state
+					},
+				],
+			},
+		}),
+		[filters, currentQuery],
 	);
 
+	const query = updatedCurrentQuery?.builder?.queryData[0] || null;
+
 	const isServicesFilterApplied = useMemo(
-		() =>
-			extractQueryPairs(filterExpression).some(
-				(pair) => pair.key === 'service.name',
-			),
-		[filterExpression],
+		() => filters?.items?.some((item) => item.key?.key === 'service.name'),
+		[filters],
 	);
 
 	const endPointDetailsQueryPayload = useMemo(
-		() =>
-			getEndPointDetailsQueryPayload(
-				domainName,
-				minTime,
-				maxTime,
-				scopedExpression,
-			),
-		[domainName, scopedExpression, minTime, maxTime],
+		() => getEndPointDetailsQueryPayload(domainName, minTime, maxTime, filters),
+		[domainName, filters, minTime, maxTime],
 	);
 
+	const V5_QUERIES = [
+		REACT_QUERY_KEY.GET_ENDPOINT_STATUS_CODE_DATA,
+		REACT_QUERY_KEY.GET_ENDPOINT_STATUS_CODE_BAR_CHARTS_DATA,
+		REACT_QUERY_KEY.GET_ENDPOINT_STATUS_CODE_LATENCY_BAR_CHARTS_DATA,
+		REACT_QUERY_KEY.GET_ENDPOINT_METRICS_DATA,
+		REACT_QUERY_KEY.GET_ENDPOINT_DEPENDENT_SERVICES_DATA,
+		REACT_QUERY_KEY.GET_ENDPOINT_DROPDOWN_DATA,
+	] as const;
+
 	const endPointDetailsDataQueries = useQueries(
-		endPointDetailsQueryPayload.map((payload, index) => ({
-			queryKey: [
-				END_POINT_DETAILS_QUERY_KEYS_ARRAY[index],
-				payload,
-				ENTITY_VERSION_V5,
-			],
-			queryFn: (): Promise<SuccessResponse<MetricRangePayloadProps>> =>
-				GetMetricQueryRange(payload, ENTITY_VERSION_V5),
-			enabled: !!payload,
-			// Keeps the table's rows, and so its height, while a new filter loads
-			keepPreviousData:
-				END_POINT_DETAILS_QUERY_KEYS_ARRAY[index] ===
-				REACT_QUERY_KEY.GET_ENDPOINT_DEPENDENT_SERVICES_DATA,
-		})),
+		endPointDetailsQueryPayload.map((payload, index) => {
+			const queryKey = END_POINT_DETAILS_QUERY_KEYS_ARRAY[index];
+			const version = (V5_QUERIES as readonly string[]).includes(queryKey)
+				? ENTITY_VERSION_V5
+				: ENTITY_VERSION_V4;
+			return {
+				queryKey: [
+					END_POINT_DETAILS_QUERY_KEYS_ARRAY[index],
+					payload,
+					...(filters?.items?.length ? filters.items : []), // Include filters.items in queryKey for better caching
+					version,
+				],
+				queryFn: (): Promise<SuccessResponse<MetricRangePayloadProps>> =>
+					GetMetricQueryRange(payload, version),
+				enabled: !!payload,
+			};
+		}),
 	);
 
 	const [
 		endPointMetricsDataQuery,
 		endPointStatusCodeDataQuery,
+		endPointDropDownDataQuery,
 		endPointDependentServicesDataQuery,
 		endPointStatusCodeBarChartsDataQuery,
 		endPointStatusCodeLatencyBarChartsDataQuery,
@@ -121,6 +222,7 @@ function EndPointDetails({
 			endPointDetailsDataQueries[2],
 			endPointDetailsDataQueries[3],
 			endPointDetailsDataQueries[4],
+			endPointDetailsDataQueries[5],
 		],
 		[endPointDetailsDataQueries],
 	);
@@ -132,32 +234,10 @@ function EndPointDetails({
 
 	const [rateOverTimeWidget, latencyOverTimeWidget] = useMemo(
 		() => [
-			getRateOverTimeWidgetData(domainName, endPointName, scopedExpression),
-			getLatencyOverTimeWidgetData(domainName, endPointName, scopedExpression),
+			getRateOverTimeWidgetData(domainName, endPointName, filters),
+			getLatencyOverTimeWidgetData(domainName, endPointName, filters),
 		],
-		[domainName, endPointName, scopedExpression],
-	);
-
-	const graphWidgets = useMemo(
-		() => [rateOverTimeWidget, latencyOverTimeWidget],
-		[rateOverTimeWidget, latencyOverTimeWidget],
-	);
-	const { isFetching: isFetchingGraphs, refetch: refetchGraphs } =
-		useWidgetQueries(graphWidgets);
-	const isFetchingQueries =
-		isFetchingGraphs ||
-		endPointDetailsDataQueries.some((query) => query.isFetching);
-
-	const refetchQueries = useCallback((): void => {
-		refetchGraphs();
-		endPointDetailsDataQueries.forEach((query) => {
-			void query.refetch();
-		});
-	}, [refetchGraphs, endPointDetailsDataQueries]);
-
-	const handleRun = useCallback(
-		(value: string): void => onRun(value, refetchQueries),
-		[onRun, refetchQueries],
+		[domainName, endPointName, filters], // Use combinedFilters
 	);
 
 	// // [TODO] Fix this later
@@ -177,23 +257,19 @@ function EndPointDetails({
 	return (
 		<div className="endpoint-details-container">
 			<div className="endpoint-details-filters-container">
-				<EndPointPicker
-					domainName={domainName}
-					timeRange={timeRange}
-					filterExpression={filterExpression}
-					value={endPointName}
-					onChange={setSelectedEndPointName}
-				/>
-				<div onBlur={handleFilterBlur}>
-					<QuerySearch
-						queryData={queryData}
-						onChange={onDraftChange}
-						onRun={handleRun}
-						showRunButton
-						isLoadingQueries={isFetchingQueries}
-						initialExpression={scopeExpression}
-						showScopeChip
-						dataSource={DataSource.TRACES}
+				<div className="endpoint-details-filters-container-dropdown">
+					<EndPointsDropDown
+						selectedEndPointName={endPointName}
+						setSelectedEndPointName={setSelectedEndPointName}
+						endPointDropDownDataQuery={endPointDropDownDataQuery}
+						parentContainerDiv=".endpoint-details-filters-container"
+						dropdownStyle={{ width: 'calc(100% - 36px)' }}
+					/>
+				</div>
+				<div className="endpoint-details-filters-container-search">
+					<QueryBuilderSearchV2
+						query={query}
+						onChange={handleFilterChange}
 						placeholder="Search for filters..."
 					/>
 				</div>
@@ -223,7 +299,7 @@ function EndPointDetails({
 					endPointStatusCodeLatencyBarChartsDataQuery
 				}
 				domainName={domainName}
-				filterExpression={scopedExpression}
+				filters={filters}
 				timeRange={timeRange}
 				onDragSelect={onDragSelect}
 			/>

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx

@@ -1,5 +1,5 @@
 import { useMemo, useState } from 'react';
-import { QueryFunctionContext, useQuery } from 'react-query';
+import { QueryFunctionContext, useQueries, useQuery } from 'react-query';
 import { Spin, Table, Tooltip } from 'antd';
 import { Info, Loader } from '@signozhq/icons';
 import { Switch } from '@signozhq/ui/switch';
@@ -7,36 +7,41 @@ import { Typography } from '@signozhq/ui/typography';
 import { getQueryRangeV5 } from 'api/v5/queryRange/getQueryRange';
 import { MetricRangePayloadV5, ScalarData } from 'api/v5/v5';
 import { useNavigateToExplorer } from 'components/CeleryTask/useNavigateToExplorer';
-import { combineInitialAndUserExpression } from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
 import { withErrorBoundary } from 'components/ErrorBoundaryHOC';
 import { ENTITY_VERSION_V5 } from 'constants/app';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
 import {
+	END_POINT_DETAILS_QUERY_KEYS_ARRAY,
 	formatTopErrorsDataForTable,
-	getHttpUrlExpression,
+	getEndPointDetailsQueryPayload,
 	getTopErrorsColumnsConfig,
 	getTopErrorsCoRelationQueryFilters,
 	getTopErrorsQueryPayload,
 } from 'container/ApiMonitoring/utils';
-import { SuccessResponseV2 } from 'types/api';
+import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
+import { SuccessResponse, SuccessResponseV2 } from 'types/api';
+import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
 
 import emptyStateUrl from '@/assets/Icons/emptyState.svg';
 
-import EndPointPicker from './components/EndPointPicker';
+import EndPointsDropDown from './components/EndPointsDropDown';
 import ErrorState from './components/ErrorState';
+import { SPAN_ATTRIBUTES } from './constants';
 
 function TopErrors({
 	domainName,
 	timeRange,
-	initialFilterExpression,
+	initialFilters,
 }: {
 	domainName: string;
 	timeRange: {
 		startTime: number;
 		endTime: number;
 	};
-	initialFilterExpression: string;
+	initialFilters: IBuilderQuery['filters'];
 }): JSX.Element {
 	const { startTime: minTime, endTime: maxTime } = timeRange;
 
@@ -50,10 +55,27 @@ function TopErrors({
 				domainName,
 				minTime,
 				maxTime,
-				combineInitialAndUserExpression(
-					getHttpUrlExpression(endPointName),
-					initialFilterExpression,
-				),
+				{
+					items: endPointName
+						? [
+								// Remove any existing http_url filters from initialFilters to avoid duplicates
+								...(initialFilters?.items?.filter(
+									(item) => item.key?.key !== SPAN_ATTRIBUTES.HTTP_URL,
+								) || []),
+								{
+									id: '92b8a1c1',
+									key: {
+										dataType: DataTypes.String,
+										key: SPAN_ATTRIBUTES.HTTP_URL,
+										type: 'tag',
+									},
+									op: '=',
+									value: endPointName,
+								},
+							]
+						: [...(initialFilters?.items || [])],
+					op: 'AND',
+				},
 				showStatusCodeErrors,
 			),
 		[
@@ -61,7 +83,7 @@ function TopErrors({
 			endPointName,
 			minTime,
 			maxTime,
-			initialFilterExpression,
+			initialFilters,
 			showStatusCodeErrors,
 		],
 	);
@@ -98,6 +120,35 @@ function TopErrors({
 		[topErrorsData],
 	);
 
+	const endPointDropDownQueryPayload = useMemo(
+		() => [
+			getEndPointDetailsQueryPayload(domainName, minTime, maxTime, {
+				items: [],
+				op: 'AND',
+			})[2],
+		],
+		[domainName, minTime, maxTime],
+	);
+
+	const endPointDropDownDataQueries = useQueries(
+		endPointDropDownQueryPayload.map((payload) => ({
+			queryKey: [
+				END_POINT_DETAILS_QUERY_KEYS_ARRAY[2],
+				payload,
+				ENTITY_VERSION_V5,
+			],
+			queryFn: (): Promise<SuccessResponse<MetricRangePayloadProps>> =>
+				GetMetricQueryRange(payload, ENTITY_VERSION_V5),
+			enabled: !!payload,
+			staleTime: 60 * 1000,
+		})),
+	);
+
+	const [endPointDropDownDataQuery] = useMemo(
+		() => [endPointDropDownDataQueries[0]],
+		[endPointDropDownDataQueries],
+	);
+
 	const navigateToExplorer = useNavigateToExplorer();
 
 	if (isError) {
@@ -111,13 +162,14 @@ function TopErrors({
 	return (
 		<div className="all-endpoints-container">
 			<div className="top-errors-dropdown-container">
-				<EndPointPicker
-					domainName={domainName}
-					timeRange={timeRange}
-					filterExpression=""
-					value={endPointName}
-					onChange={setSelectedEndPointName}
-				/>
+				<div className="endpoint-details-filters-container-dropdown">
+					<EndPointsDropDown
+						selectedEndPointName={endPointName}
+						setSelectedEndPointName={setSelectedEndPointName}
+						endPointDropDownDataQuery={endPointDropDownDataQuery}
+						parentContainerDiv=".endpoint-details-filters-container"
+					/>
+				</div>
 				<div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
 					<Switch
 						color="primary"

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/DependentServices.tsx

@@ -1,6 +1,6 @@
 import { useMemo, useState } from 'react';
 import { UseQueryResult } from 'react-query';
-import { Table, TablePaginationConfig } from 'antd';
+import { Skeleton, Table, TablePaginationConfig } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { QueryParams } from 'constants/query';
 import {
@@ -54,6 +54,10 @@ function DependentServices({
 		[isExpanded, dependentServicesData.length],
 	);
 
+	if (isLoading || isRefetching) {
+		return <Skeleton />;
+	}
+
 	if (isError) {
 		return <ErrorState refetch={refetch} />;
 	}

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/DomainMetrics.test.tsx

@@ -3,6 +3,7 @@ import { render, screen, waitFor } from '@testing-library/react';
 import { TraceAggregation } from 'api/v5/v5';
 import { ENTITY_VERSION_V5 } from 'constants/app';
 import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 import { SPAN_ATTRIBUTES } from '../constants';
 import DomainMetrics from './DomainMetrics';
@@ -33,7 +34,10 @@ describe('DomainMetrics - V5 Query Payload Tests', () => {
 			startTime: 1758259531000,
 			endTime: 1758261331000,
 		},
-		domainListFilterExpression: '',
+		domainListFilters: {
+			items: [],
+			op: 'AND' as const,
+		} as IBuilderQuery['filters'],
 	};
 
 	const mockSuccessResponse = {
@@ -170,12 +174,35 @@ describe('DomainMetrics - V5 Query Payload Tests', () => {
 		it('includes custom filters in filter expressions', async () => {
 			(GetMetricQueryRange as jest.Mock).mockResolvedValue(mockSuccessResponse);
 
-			const customFilterExpression =
-				"service.name = 'my-service' AND deployment.environment = 'production'";
+			const customFilters: IBuilderQuery['filters'] = {
+				items: [
+					{
+						id: 'test-1',
+						key: {
+							key: 'service.name',
+							dataType: 'string' as any,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'my-service',
+					},
+					{
+						id: 'test-2',
+						key: {
+							key: 'deployment.environment',
+							dataType: 'string' as any,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'production',
+					},
+				],
+				op: 'AND' as const,
+			};
 
 			renderComponent({
 				...mockProps,
-				domainListFilterExpression: customFilterExpression,
+				domainListFilters: customFilters,
 			});
 
 			await waitFor(() => {

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/DomainMetrics.tsx

@@ -14,17 +14,18 @@ import {
 import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
 import { SuccessResponse } from 'types/api';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 import ErrorState from './ErrorState';
 
 function DomainMetrics({
 	domainName,
 	timeRange,
-	domainListFilterExpression,
+	domainListFilters,
 }: {
 	domainName: string;
 	timeRange: { startTime: number; endTime: number };
-	domainListFilterExpression: string;
+	domainListFilters: IBuilderQuery['filters'];
 }): JSX.Element {
 	const { startTime: minTime, endTime: maxTime } = timeRange;
 
@@ -34,9 +35,9 @@ function DomainMetrics({
 				domainName,
 				minTime,
 				maxTime,
-				domainListFilterExpression,
+				domainListFilters,
 			),
-		[domainName, minTime, maxTime, domainListFilterExpression],
+		[domainName, minTime, maxTime, domainListFilters],
 	);
 
 	// Since only one query here

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/EndPointMetrics.test.tsx

@@ -114,7 +114,10 @@ describe('EndPointMetrics - V5 Query Payload Tests', () => {
 			const domainName = 'api.example.com';
 			const startTime = 1758259531000;
 			const endTime = 1758261331000;
-			const filters = '';
+			const filters = {
+				items: [],
+				op: 'AND' as const,
+			};
 
 			// Get the actual payload that would be generated
 			const payloads = getEndPointDetailsQueryPayload(
@@ -234,8 +237,31 @@ describe('EndPointMetrics - V5 Query Payload Tests', () => {
 		it('includes custom domainListFilters in all query expressions', async () => {
 			(GetMetricQueryRange as jest.Mock).mockResolvedValue(mockSuccessResponse);
 
-			const customFilters =
-				"service.name = 'payment-service' AND deployment.environment = 'staging'";
+			const customFilters = {
+				items: [
+					{
+						id: 'test-1',
+						key: {
+							key: 'service.name',
+							dataType: 'string' as any,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'payment-service',
+					},
+					{
+						id: 'test-2',
+						key: {
+							key: 'deployment.environment',
+							dataType: 'string' as any,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'staging',
+					},
+				],
+				op: 'AND' as const,
+			};
 
 			const payloads = getEndPointDetailsQueryPayload(
 				'api.internal.com',

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/EndPointPicker.module.scss

@@ -1,18 +0,0 @@
-.picker {
-	width: 460px;
-	max-width: 100%;
-
-	// Popover fits its longest option by default; match the trigger so long URLs truncate.
-	[data-slot='combobox-content'] {
-		--popover-width: var(--radix-popover-trigger-width);
-	}
-}
-
-.option {
-	display: block;
-	flex: 1;
-	min-width: 0;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/EndPointPicker.tsx

@@ -1,92 +0,0 @@
-import { useMemo } from 'react';
-import { useQuery } from 'react-query';
-import { ComboboxSimple, ComboboxSimpleItem } from '@signozhq/ui/combobox';
-import { ENTITY_VERSION_V5 } from 'constants/app';
-import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import {
-	getEndPointDropDownQueryPayload,
-	getFormattedEndPointDropDownData,
-} from 'container/ApiMonitoring/utils';
-import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
-
-import styles from './EndPointPicker.module.scss';
-
-const VIRTUALIZE_AFTER = 100;
-const ALL_ENDPOINTS = '__all_endpoints__';
-
-interface EndPointPickerProps {
-	domainName: string;
-	timeRange: {
-		startTime: number;
-		endTime: number;
-	};
-	filterExpression: string;
-	value: string;
-	onChange: (endPointName: string) => void;
-}
-
-function EndPointPicker({
-	domainName,
-	timeRange,
-	filterExpression,
-	value,
-	onChange,
-}: EndPointPickerProps): JSX.Element {
-	const payload = useMemo(
-		() =>
-			getEndPointDropDownQueryPayload(
-				domainName,
-				timeRange.startTime,
-				timeRange.endTime,
-				filterExpression,
-			),
-		[domainName, timeRange.startTime, timeRange.endTime, filterExpression],
-	);
-
-	const { data, isLoading, isFetching } = useQuery({
-		queryKey: [
-			REACT_QUERY_KEY.GET_ENDPOINT_DROPDOWN_DATA,
-			payload,
-			ENTITY_VERSION_V5,
-		],
-		queryFn: () => GetMetricQueryRange(payload, ENTITY_VERSION_V5),
-		staleTime: 60 * 1000,
-	});
-
-	const items = useMemo(
-		(): ComboboxSimpleItem[] => [
-			{ value: ALL_ENDPOINTS, label: 'All endpoints' },
-			...getFormattedEndPointDropDownData(
-				data?.payload?.data?.result?.[0]?.table?.rows ?? [],
-			).map(({ value: url }) => ({
-				value: url,
-				label: (
-					<span className={styles.option} title={url}>
-						{url}
-					</span>
-				),
-			})),
-		],
-		[data],
-	);
-
-	return (
-		<div className={styles.picker}>
-			<ComboboxSimple
-				items={items}
-				value={value || ALL_ENDPOINTS}
-				onChange={(next): void =>
-					onChange(!next || next === ALL_ENDPOINTS ? '' : (next as string))
-				}
-				inputPlaceholder="Search endpoints"
-				emptyPlaceholder="No endpoints found"
-				loading={isLoading || isFetching}
-				virtualized={items.length > VIRTUALIZE_AFTER}
-				withPortal={false}
-				testId="endpoint-picker"
-			/>
-		</div>
-	);
-}
-
-export default EndPointPicker;

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/EndPointsDropDown.tsx

@@ -0,0 +1,65 @@
+import { useMemo } from 'react';
+import { UseQueryResult } from 'react-query';
+import { Select } from 'antd';
+import { getFormattedEndPointDropDownData } from 'container/ApiMonitoring/utils';
+import { SuccessResponse } from 'types/api';
+
+interface EndPointsDropDownProps {
+	selectedEndPointName?: string;
+	setSelectedEndPointName: (value: string) => void;
+	endPointDropDownDataQuery: UseQueryResult<SuccessResponse<any>, unknown>;
+	parentContainerDiv?: string;
+	dropdownStyle?: React.CSSProperties;
+}
+
+const defaultProps = {
+	selectedEndPointName: '',
+	parentContainerDiv: '',
+	dropdownStyle: {},
+};
+
+function EndPointsDropDown({
+	selectedEndPointName,
+	setSelectedEndPointName,
+	endPointDropDownDataQuery,
+	parentContainerDiv,
+	dropdownStyle,
+}: EndPointsDropDownProps): JSX.Element {
+	const { data, isLoading, isFetching } = endPointDropDownDataQuery;
+
+	const handleChange = (value: string): void => {
+		setSelectedEndPointName(value);
+	};
+
+	const formattedData = useMemo(
+		() =>
+			getFormattedEndPointDropDownData(data?.payload.data.result[0].table.rows),
+		[data?.payload.data.result],
+	);
+
+	return (
+		<Select
+			value={selectedEndPointName || undefined}
+			placeholder="Select endpoint"
+			loading={isLoading || isFetching}
+			style={{ width: '100%' }}
+			onChange={handleChange}
+			options={formattedData}
+			getPopupContainer={
+				parentContainerDiv
+					? (): HTMLElement =>
+							document.querySelector(parentContainerDiv) as HTMLElement
+					: (triggerNode): HTMLElement => triggerNode.parentNode as HTMLElement
+			}
+			dropdownStyle={dropdownStyle}
+			allowClear
+			onClear={(): void => {
+				setSelectedEndPointName('');
+			}}
+		/>
+	);
+}
+
+EndPointsDropDown.defaultProps = defaultProps;
+
+export default EndPointsDropDown;

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/StatusCodeBarCharts.tsx

@@ -24,6 +24,7 @@ import { LegendPosition } from 'lib/uPlotV2/components/types';
 import { useTimezone } from 'providers/Timezone';
 import { SuccessResponse } from 'types/api';
 import { Widgets } from 'types/api/widgets/widget';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 import ErrorState from './ErrorState';
 import {
@@ -36,7 +37,7 @@ function StatusCodeBarCharts({
 	endPointStatusCodeBarChartsDataQuery,
 	endPointStatusCodeLatencyBarChartsDataQuery,
 	domainName,
-	filterExpression,
+	filters,
 	timeRange,
 	onDragSelect,
 }: {
@@ -49,7 +50,7 @@ function StatusCodeBarCharts({
 		unknown
 	>;
 	domainName: string;
-	filterExpression: string;
+	filters: IBuilderQuery['filters'];
 	timeRange: {
 		startTime: number;
 		endTime: number;
@@ -129,8 +130,12 @@ function StatusCodeBarCharts({
 	);
 
 	const widget = useMemo<Widgets>(
-		() => getStatusCodeBarChartWidgetData(domainName, filterExpression),
-		[domainName, filterExpression],
+		() =>
+			getStatusCodeBarChartWidgetData(domainName, {
+				items: [...(filters?.items || [])],
+				op: filters?.op || 'AND',
+			}),
+		[domainName, filters],
 	);
 
 	const activeApiResponse = useMemo(

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/hooks/__tests__/useFilterExpression.test.tsx

@@ -1,157 +0,0 @@
-import { combineInitialAndUserExpression } from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
-import { FilterProviders } from 'container/ApiMonitoring/__tests__/FilterProviders';
-import { getCurrentNuqsSearchParams, resetNuqsState } from 'tests/nuqs-helpers';
-import {
-	act,
-	render,
-	renderHook,
-	screen,
-	userEvent,
-	waitFor,
-} from 'tests/test-utils';
-
-import { useFilterExpression } from '../useFilterExpression';
-
-const PARAM_KEY = 'testExpression';
-const linkExpression = "service.name = 'frontend'";
-const linkSearch = `${PARAM_KEY}=${encodeURIComponent(linkExpression)}`;
-
-function renderFilterHook(
-	searchParams = '',
-): ReturnType<
-	typeof renderHook<ReturnType<typeof useFilterExpression>, unknown>
-> {
-	return renderHook(() => useFilterExpression(), {
-		wrapper: ({ children }) => (
-			<FilterProviders queryParamKey={PARAM_KEY} searchParams={searchParams}>
-				{children}
-			</FilterProviders>
-		),
-	});
-}
-
-function FilterBox(): JSX.Element {
-	const { expression, onDraftChange, onBlur } = useFilterExpression();
-
-	return (
-		<div onBlur={onBlur}>
-			<span data-testid="applied">{expression}</span>
-			<input
-				data-testid="filter-input"
-				onChange={(e): void => onDraftChange(e.target.value)}
-			/>
-			<button type="button" data-testid="inside-button">
-				Run
-			</button>
-		</div>
-	);
-}
-
-describe('useFilterExpression', () => {
-	beforeEach(() => {
-		resetNuqsState();
-	});
-
-	it('reads the filter from the link', async () => {
-		const { result } = renderFilterHook(linkSearch);
-
-		await waitFor(() => expect(result.current.expression).toBe(linkExpression));
-		expect(result.current.queryData.dataSource).toBe('traces');
-		expect(result.current.queryData.filter?.expression).toBe(linkExpression);
-	});
-
-	it('applies a valid expression on run and ignores an invalid one', async () => {
-		const { result } = renderFilterHook(linkSearch);
-		await waitFor(() => expect(result.current.expression).toBe(linkExpression));
-
-		act(() => {
-			result.current.onRun('service.name =');
-		});
-		expect(result.current.expression).toBe(linkExpression);
-
-		act(() => {
-			result.current.onRun('http.status_code = 500');
-		});
-		expect(result.current.expression).toBe('http.status_code = 500');
-		await waitFor(() =>
-			expect(getCurrentNuqsSearchParams().get(PARAM_KEY)).toBe(
-				'http.status_code = 500',
-			),
-		);
-	});
-
-	it('runs again instead of applying when the filter is already applied', async () => {
-		const scope = "http_host = 'api.example.com'";
-		const { result } = renderHook(() => useFilterExpression(), {
-			wrapper: ({ children }) => (
-				<FilterProviders
-					queryParamKey={PARAM_KEY}
-					initialExpression={scope}
-					searchParams={linkSearch}
-				>
-					{children}
-				</FilterProviders>
-			),
-		});
-		await waitFor(() => expect(result.current.expression).toBe(linkExpression));
-		const onUnchanged = jest.fn() as jest.MockedFunction<() => void>;
-
-		act(() => {
-			result.current.onRun(
-				combineInitialAndUserExpression(scope, linkExpression),
-				onUnchanged,
-			);
-		});
-		expect(onUnchanged).toHaveBeenCalledTimes(1);
-
-		act(() => {
-			result.current.onRun(
-				combineInitialAndUserExpression(scope, 'http.status_code = 500'),
-				onUnchanged,
-			);
-		});
-		expect(onUnchanged).toHaveBeenCalledTimes(1);
-		expect(result.current.expression).toBe('http.status_code = 500');
-	});
-
-	it('applies the draft on blur only when focus leaves the container', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		render(
-			<FilterProviders queryParamKey={PARAM_KEY}>
-				<FilterBox />
-			</FilterProviders>,
-		);
-
-		await user.type(screen.getByTestId('filter-input'), "service.name = 'cart'");
-		await user.click(screen.getByTestId('inside-button'));
-		expect(screen.getByTestId('applied')).toHaveTextContent('');
-
-		await user.click(document.body);
-		expect(screen.getByTestId('applied')).toHaveTextContent(
-			"service.name = 'cart'",
-		);
-	});
-
-	it('keeps only the user text when the scope is set', async () => {
-		const scope = "http_host = 'api.example.com'";
-		const { result } = renderHook(() => useFilterExpression(), {
-			wrapper: ({ children }) => (
-				<FilterProviders queryParamKey={PARAM_KEY} initialExpression={scope}>
-					{children}
-				</FilterProviders>
-			),
-		});
-		await waitFor(() => expect(result.current.initialExpression).toBe(scope));
-
-		act(() => {
-			result.current.onRun(`${scope} AND (service.name = 'cart')`);
-		});
-
-		expect(result.current.expression).toBe("service.name = 'cart'");
-		await waitFor(() =>
-			expect(getCurrentNuqsSearchParams().get(PARAM_KEY)).toBe(
-				"service.name = 'cart'",
-			),
-		);
-	});
-});

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/hooks/__tests__/useWidgetQueries.test.tsx

@@ -1,82 +0,0 @@
-import { ReactNode } from 'react';
-import { QueryClient, QueryClientProvider, QueryObserver } from 'react-query';
-import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
-import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import { getWidgetQueryBuilder } from 'container/MetricsApplication/MetricsApplication.factory';
-import { act, renderHook, waitFor } from 'tests/test-utils';
-import { Widgets } from 'types/api/widgets/widget';
-
-import { useWidgetQueries } from '../useWidgetQueries';
-
-const widgetWithQueryId = (id: string): Widgets =>
-	getWidgetQueryBuilder({
-		query: { ...initialQueriesMap.traces, id },
-		panelTypes: PANEL_TYPES.TABLE,
-	});
-
-const gridCardKey = (queryId: string): unknown[] => [
-	REACT_QUERY_KEY.DASHBOARD_GRID_CARD_QUERY_RANGE,
-	0,
-	0,
-	{ id: queryId },
-];
-
-function startGridCardFetch(client: QueryClient, queryId: string): void {
-	void client.prefetchQuery(gridCardKey(queryId), () => new Promise(() => {}));
-}
-
-function renderWidgetQueries(
-	client: QueryClient,
-	widgets: Widgets[],
-): ReturnType<typeof renderHook<ReturnType<typeof useWidgetQueries>, unknown>> {
-	return renderHook(() => useWidgetQueries(widgets), {
-		wrapper: ({ children }: { children: ReactNode }) => (
-			<QueryClientProvider client={client}>{children}</QueryClientProvider>
-		),
-	});
-}
-
-describe('useWidgetQueries', () => {
-	it('counts only the given widgets’ grid card queries', async () => {
-		const client = new QueryClient();
-		const { result } = renderWidgetQueries(client, [widgetWithQueryId('table')]);
-
-		await act(async () => {
-			startGridCardFetch(client, 'other-tab-chart');
-			await new Promise((resolve) => setTimeout(resolve, 50));
-		});
-		expect(client.isFetching()).toBe(1);
-		expect(result.current.isFetching).toBe(false);
-
-		act(() => startGridCardFetch(client, 'table'));
-		await waitFor(() => expect(result.current.isFetching).toBe(true));
-	});
-
-	it('refetches only the given widgets’ grid card queries', async () => {
-		const client = new QueryClient();
-		const fetchTable = jest.fn(() =>
-			Promise.resolve('table'),
-		) as jest.MockedFunction<() => Promise<string>>;
-		const fetchOther = jest.fn(() =>
-			Promise.resolve('other'),
-		) as jest.MockedFunction<() => Promise<string>>;
-		const unsubscribers = [
-			new QueryObserver(client, {
-				queryKey: gridCardKey('table'),
-				queryFn: fetchTable,
-			}).subscribe(() => {}),
-			new QueryObserver(client, {
-				queryKey: gridCardKey('other-tab-chart'),
-				queryFn: fetchOther,
-			}).subscribe(() => {}),
-		];
-		await waitFor(() => expect(client.isFetching()).toBe(0));
-		const { result } = renderWidgetQueries(client, [widgetWithQueryId('table')]);
-
-		act(() => result.current.refetch());
-
-		await waitFor(() => expect(fetchTable).toHaveBeenCalledTimes(2));
-		expect(fetchOther).toHaveBeenCalledTimes(1);
-		unsubscribers.forEach((unsubscribe) => unsubscribe());
-	});
-});

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/hooks/useFilterExpression.ts

@@ -1,93 +0,0 @@
-import { FocusEvent, useCallback, useEffect, useMemo, useRef } from 'react';
-import {
-	useInitialExpression,
-	useQuerySearchInitialExpressionProp,
-	useQuerySearchOnRun,
-	useUserExpression,
-} from 'components/QueryBuilderV2';
-import {
-	combineInitialAndUserExpression,
-	getUserExpressionFromCombined,
-} from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
-import { initialQueriesMap } from 'constants/queryBuilder';
-import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource } from 'types/common/queryBuilder';
-import { validateQuery } from 'utils/queryValidationUtils';
-
-interface UseFilterExpressionParams {
-	groupBy?: IBuilderQuery['groupBy'];
-}
-
-interface UseFilterExpressionReturn {
-	expression: string;
-	/** The provider's locked scope, for `QuerySearch`'s `initialExpression` */
-	initialExpression: string | undefined;
-	queryData: IBuilderQuery;
-	onDraftChange: (value: string) => void;
-	/** `onUnchanged` runs instead when the filter is already applied. */
-	onRun: (value: string, onUnchanged?: () => void) => void;
-	onBlur: (event: FocusEvent<HTMLDivElement>) => void;
-}
-
-/** Must be used inside a `QuerySearchV2Provider`. */
-export function useFilterExpression({
-	groupBy,
-}: UseFilterExpressionParams = {}): UseFilterExpressionReturn {
-	const expression = useUserExpression();
-	const scope = useInitialExpression();
-	const initialExpression = useQuerySearchInitialExpressionProp();
-	const querySearchOnRun = useQuerySearchOnRun();
-
-	const queryData = useMemo(
-		(): IBuilderQuery => ({
-			...initialQueriesMap[DataSource.TRACES].builder.queryData[0],
-			dataSource: DataSource.TRACES,
-			filter: { expression },
-			...(groupBy ? { groupBy } : {}),
-		}),
-		[expression, groupBy],
-	);
-
-	const onRun = useCallback(
-		(value: string, onUnchanged?: () => void): void => {
-			if (!validateQuery(value).isValid) {
-				return;
-			}
-			if (getUserExpressionFromCombined(scope, value) === expression) {
-				onUnchanged?.();
-				return;
-			}
-			querySearchOnRun(value);
-		},
-		[querySearchOnRun, scope, expression],
-	);
-
-	// A ref, not the provider's draft, so typing does not re-render the page.
-	const draftRef = useRef(expression);
-	useEffect(() => {
-		draftRef.current = expression;
-	}, [expression]);
-
-	const onDraftChange = useCallback((value: string): void => {
-		draftRef.current = value;
-	}, []);
-
-	const onBlur = useCallback(
-		(event: FocusEvent<HTMLDivElement>): void => {
-			if (event.currentTarget.contains(event.relatedTarget as Node | null)) {
-				return;
-			}
-			onRun(combineInitialAndUserExpression(scope, draftRef.current));
-		},
-		[onRun, scope],
-	);
-
-	return {
-		expression,
-		initialExpression,
-		queryData,
-		onDraftChange,
-		onRun,
-		onBlur,
-	};
-}

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/hooks/useWidgetQueries.ts

@@ -1,45 +0,0 @@
-import { useCallback, useMemo } from 'react';
-import {
-	Query as ReactQuery,
-	useIsFetching,
-	useQueryClient,
-} from 'react-query';
-import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { Widgets } from 'types/api/widgets/widget';
-
-interface UseWidgetQueriesReturn {
-	isFetching: boolean;
-	refetch: () => void;
-}
-
-/**
- * These widgets' `GridCard` queries. Matches on the widget's query id, so
- * another tab's cards are neither counted nor refetched.
- */
-export function useWidgetQueries(widgets: Widgets[]): UseWidgetQueriesReturn {
-	const queryClient = useQueryClient();
-
-	const predicate = useMemo(() => {
-		const queryIds = new Set(
-			widgets
-				.map((widget) => widget.query?.id)
-				.filter((id): id is string => Boolean(id)),
-		);
-		return ({ queryKey }: ReactQuery): boolean =>
-			Array.isArray(queryKey) &&
-			queryKey[0] === REACT_QUERY_KEY.DASHBOARD_GRID_CARD_QUERY_RANGE &&
-			queryKey.some((part) => {
-				const id = (part as Query | undefined)?.id;
-				return !!id && queryIds.has(id);
-			});
-	}, [widgets]);
-
-	const isFetching = useIsFetching({ predicate }) > 0;
-
-	const refetch = useCallback((): void => {
-		void queryClient.refetchQueries({ predicate, active: true });
-	}, [queryClient, predicate]);
-
-	return { isFetching, refetch };
-}

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainList.tsx

@@ -19,7 +19,6 @@ import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations
 import { useShareBuilderUrl } from 'hooks/queryBuilder/useShareBuilderUrl';
 import { useListOverview } from 'hooks/thirdPartyApis/useListOverview';
 import { get } from 'lodash-es';
-import { parseAsString, useQueryStates } from 'nuqs';
 import { AppState } from 'store/reducers';
 import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { HandleChangeQueryDataV5 } from 'types/common/operations.types';
@@ -28,26 +27,16 @@ import { GlobalReducer } from 'types/reducer/globalTime';
 import DOCLINKS from 'utils/docLinks';
 
 import { ApiMonitoringHardcodedAttributeKeys } from '../../constants';
-import {
-	ALL_ENDPOINTS_EXPRESSION_KEY,
-	ENDPOINT_STATS_EXPRESSION_KEY,
-} from '../../filterParamKeys';
 import { DEFAULT_PARAMS, useApiMonitoringParams } from '../../queryParams';
 import { columnsConfig, formatDataForTable } from '../../utils';
 import DomainDetails from './DomainDetails/DomainDetails';
-import { useConvertLegacyFilterLinks } from './hooks/useConvertLegacyFilterLinks';
 
 import '../Explorer.styles.scss';
 
 function DomainList(): JSX.Element {
 	const [params, setParams] = useApiMonitoringParams();
 	const { showIP, selectedDomain } = params;
-	const [, setDrawerFilters] = useQueryStates({
-		[ALL_ENDPOINTS_EXPRESSION_KEY]: parseAsString,
-		[ENDPOINT_STATS_EXPRESSION_KEY]: parseAsString,
-	});
 	const [selectedDomainIndex, setSelectedDomainIndex] = useState<number>(-1);
-	useConvertLegacyFilterLinks();
 	const { maxTime, minTime } = useSelector<AppState, GlobalReducer>(
 		(state) => state.globalTime,
 	);
@@ -66,8 +55,6 @@ function DomainList(): JSX.Element {
 	});
 
 	const compositeData = useGetCompositeQueryParam();
-	const listFilterExpression =
-		compositeData?.builder?.queryData[0]?.filter?.expression ?? '';
 
 	const [isCancelled, setIsCancelled] = useState(false);
 
@@ -168,7 +155,6 @@ function DomainList(): JSX.Element {
 					dataSource={DataSource.TRACES}
 					queryData={query}
 					onChange={handleSearchChange}
-					onRun={handleStageAndRunQuery}
 					placeholder="Enter your filter query (e.g., deployment.environment = 'otel-demo' AND service.name = 'frontend')"
 					hardcodedAttributeKeys={ApiMonitoringHardcodedAttributeKeys}
 				/>
@@ -239,11 +225,6 @@ function DomainList(): JSX.Element {
 								);
 								setSelectedDomainIndex(dataIndex);
 								setParams({ selectedDomain: record.domainName });
-								// The drawer tabs start from the list's filter
-								void setDrawerFilters({
-									[ALL_ENDPOINTS_EXPRESSION_KEY]: listFilterExpression || null,
-									[ENDPOINT_STATS_EXPRESSION_KEY]: listFilterExpression || null,
-								});
 								logEvent('API Monitoring: Domain name row clicked', {});
 							}
 						},
@@ -264,12 +245,8 @@ function DomainList(): JSX.Element {
 					handleClose={(): void => {
 						setSelectedDomainIndex(-1);
 						setParams(DEFAULT_PARAMS);
-						void setDrawerFilters({
-							[ALL_ENDPOINTS_EXPRESSION_KEY]: null,
-							[ENDPOINT_STATS_EXPRESSION_KEY]: null,
-						});
 					}}
-					domainListFilterExpression={listFilterExpression}
+					domainListFilters={query?.filters}
 				/>
 			)}
 		</section>

frontend/src/container/ApiMonitoring/Explorer/Domains/hooks/__tests__/useConvertLegacyFilterLinks.test.tsx

@@ -1,122 +0,0 @@
-import { ReactNode, useEffect, useState } from 'react';
-import {
-	ALL_ENDPOINTS_EXPRESSION_KEY,
-	ENDPOINT_STATS_EXPRESSION_KEY,
-} from 'container/ApiMonitoring/filterParamKeys';
-import { getApiMonitoringParams } from 'container/ApiMonitoring/queryParams';
-import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
-import {
-	getCurrentNuqsSearchParams,
-	onNuqsUrlUpdate,
-	resetNuqsState,
-} from 'tests/nuqs-helpers';
-import { mockAppLocation, mockNavigate } from 'tests/router-mocks';
-import { renderHook, waitFor } from 'tests/test-utils';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
-import {
-	__resetSearchParamsGetter,
-	__setSearchParamsGetterForTest,
-} from 'utils/getUnstableCurrentSearchParams';
-
-import { useConvertLegacyFilterLinks } from '../useConvertLegacyFilterLinks';
-
-const legacyFilter = (key: string, value: string): TagFilter => ({
-	op: 'AND',
-	items: [
-		{
-			id: key,
-			key: { key, dataType: DataTypes.String, type: 'tag' },
-			op: '=',
-			value,
-		},
-	],
-});
-
-// NuqsTestingAdapter resets its update queue on every render, not only on mount,
-// dropping writes queued just before it re-renders.
-function UrlAdapter({
-	searchParams,
-	children,
-}: {
-	searchParams: string;
-	children: ReactNode;
-}): JSX.Element {
-	const [mounted, setMounted] = useState(false);
-	useEffect(() => {
-		setMounted(true);
-	}, []);
-	return (
-		<NuqsTestingAdapter
-			searchParams={searchParams}
-			onUrlUpdate={onNuqsUrlUpdate}
-			rateLimitFactor={0}
-			resetUrlUpdateQueueOnMount={!mounted}
-			hasMemory
-		>
-			{children}
-		</NuqsTestingAdapter>
-	);
-}
-
-function renderWithLink(linkParams: object): jest.SpyInstance {
-	const search = `?apiMonitoringParams=${encodeURIComponent(
-		encodeURIComponent(JSON.stringify(linkParams)),
-	)}`;
-	__setSearchParamsGetterForTest(() => new URLSearchParams(search));
-	mockAppLocation({ search });
-	const navigateSpy = mockNavigate();
-	renderHook(() => useConvertLegacyFilterLinks(), {
-		wrapper: ({ children }: { children: ReactNode }) => (
-			<UrlAdapter searchParams={search}>{children}</UrlAdapter>
-		),
-	});
-	return navigateSpy;
-}
-
-describe('useConvertLegacyFilterLinks', () => {
-	beforeEach(() => {
-		resetNuqsState();
-	});
-
-	afterEach(() => {
-		__resetSearchParamsGetter();
-	});
-
-	it('moves an older link’s filters into the drawer params once', async () => {
-		const navigateSpy = renderWithLink({
-			selectedDomain: 'api.example.com',
-			allEndpointsLocalFilters: legacyFilter('service.name', 'cart'),
-			endPointDetailsLocalFilters: legacyFilter('http.status_code', '500'),
-		});
-
-		await waitFor(() => {
-			const params = getCurrentNuqsSearchParams();
-			expect(params.get(ALL_ENDPOINTS_EXPRESSION_KEY)).toBe(
-				"service.name = 'cart'",
-			);
-			expect(params.get(ENDPOINT_STATS_EXPRESSION_KEY)).toBe(
-				"http.status_code = '500'",
-			);
-		});
-		const [to, options] = navigateSpy.mock.calls[0];
-		const rewritten = getApiMonitoringParams(
-			typeof to === 'string' ? to : (to.search ?? ''),
-		);
-		expect(rewritten.selectedDomain).toBe('api.example.com');
-		expect(rewritten).not.toHaveProperty('allEndpointsLocalFilters');
-		expect(options).toStrictEqual({ replace: true });
-	});
-
-	it('leaves a link without legacy filters alone', () => {
-		const navigateSpy = renderWithLink({ selectedDomain: 'api.example.com' });
-
-		expect(navigateSpy).not.toHaveBeenCalledWith(
-			expect.objectContaining({ search: expect.any(String) }),
-			expect.anything(),
-		);
-		expect(getCurrentNuqsSearchParams().has(ALL_ENDPOINTS_EXPRESSION_KEY)).toBe(
-			false,
-		);
-	});
-});

frontend/src/container/ApiMonitoring/Explorer/Domains/hooks/useConvertLegacyFilterLinks.ts

@@ -1,42 +0,0 @@
-import { useEffect } from 'react';
-import { parseAsString, useQueryStates } from 'nuqs';
-import { getUnstableCurrentSearchParams } from 'utils/getUnstableCurrentSearchParams';
-
-import {
-	ALL_ENDPOINTS_EXPRESSION_KEY,
-	ENDPOINT_STATS_EXPRESSION_KEY,
-} from '../../../filterParamKeys';
-import {
-	getLegacyFilterExpressions,
-	useApiMonitoringParams,
-} from '../../../queryParams';
-
-/**
- * Moves the filters an older link keeps inside `apiMonitoringParams` into the
- * drawer's own params, then rewrites `apiMonitoringParams` without them, so it
- * happens once.
- */
-export function useConvertLegacyFilterLinks(): void {
-	const [, setParams] = useApiMonitoringParams();
-	const [, setDrawerFilters] = useQueryStates({
-		[ALL_ENDPOINTS_EXPRESSION_KEY]: parseAsString,
-		[ENDPOINT_STATS_EXPRESSION_KEY]: parseAsString,
-	});
-
-	useEffect(() => {
-		const legacy = getLegacyFilterExpressions(
-			`?${getUnstableCurrentSearchParams().toString()}`,
-		);
-		if (
-			legacy.allEndpoints === undefined &&
-			legacy.endPointDetails === undefined
-		) {
-			return;
-		}
-		void setDrawerFilters({
-			[ALL_ENDPOINTS_EXPRESSION_KEY]: legacy.allEndpoints || null,
-			[ENDPOINT_STATS_EXPRESSION_KEY]: legacy.endPointDetails || null,
-		});
-		setParams({}, true);
-	}, [setParams, setDrawerFilters]);
-}

frontend/src/container/ApiMonitoring/__tests__/APIMonitoringUtils.test.tsx

@@ -1,4 +1,6 @@
 import { PANEL_TYPES } from 'constants/queryBuilder';
+import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 import { SPAN_ATTRIBUTES } from '../Explorer/Domains/DomainDetails/constants';
 import {
@@ -9,14 +11,20 @@ import {
 	getFormattedEndPointDropDownData,
 	getFormattedEndPointStatusCodeChartData,
 	getFormattedEndPointStatusCodeData,
-	getGroupByExpressionFromRowData,
-	getHttpUrlExpression,
+	getGroupByFiltersFromGroupByValues,
 	getStatusCodeBarChartWidgetData,
 	getTopErrorsColumnsConfig,
 	getTopErrorsCoRelationQueryFilters,
 } from '../utils';
 import { APIMonitoringColumnsMock } from './mock';
 
+// Mock or define DataTypes since it seems to be missing from imports
+const DataTypes = {
+	String: 'string',
+	Float64: 'float64',
+	bool: 'bool',
+};
+
 // Mock the external utils dependencies that are used within our tested functions
 jest.mock('../utils', () => {
 	// Import the actual module to partial mock
@@ -82,39 +90,140 @@ describe('API Monitoring Utils', () => {
 			expect(result[0].lastUsed).toBe('-');
 		});
 	});
-	describe('getGroupByExpressionFromRowData', () => {
-		it('builds an AND expression from the row values, skipping the url and metric columns', () => {
-			expect(
-				getGroupByExpressionFromRowData({
-					http_url: '/api/test',
-					key: '3f2a-row-uuid',
-					A: 10,
-					B: 20,
-					C: 1,
-					F1: 5,
-					'service.name': 'api-service',
-					'http.status_code': 200,
-				}),
-			).toBe("service.name = 'api-service' AND http.status_code = 200");
-		});
+	describe('getGroupByFiltersFromGroupByValues', () => {
+		it('should convert row data to filters correctly', () => {
+			// Arrange
+			const rowData = {
+				'http.method': 'GET',
+				'http.status_code': '200',
+				'service.name': 'api-service',
+				// Fields that should be filtered out
+				data: 'someValue',
+				key: 'someKey',
+			};
 
-		it('escapes quotes in values', () => {
-			expect(getGroupByExpressionFromRowData({ 'user.name': "o'brien" })).toBe(
-				"user.name = 'o\\'brien'",
+			const groupBy = [
+				{
+					id: 'group-by-1',
+					key: 'http.method',
+					dataType: DataTypes.String,
+					type: '',
+				},
+				{
+					id: 'group-by-2',
+					key: 'http.status_code',
+					dataType: DataTypes.String,
+					type: '',
+				},
+				{
+					id: 'group-by-3',
+					key: 'service.name',
+					dataType: DataTypes.String,
+					type: 'tag',
+				},
+			];
+
+			// Act
+			const result = getGroupByFiltersFromGroupByValues(
+				rowData,
+				groupBy as BaseAutocompleteData[],
 			);
-		});
 
-		it('matches spans without the attribute when the group has no value', () => {
+			// Assert
+			expect(result).toBeDefined();
+			expect(result?.op).toBe('AND');
+			// The implementation includes all keys from rowData, not just those in groupBy
+			expect(result?.items?.length).toBeGreaterThanOrEqual(3);
+
+			// Verify each filter matches the corresponding groupBy
 			expect(
-				getGroupByExpressionFromRowData({
-					'service.name': 'cart',
-					'ai.embeddings': null,
-				}),
-			).toBe("service.name = 'cart' AND ai.embeddings NOT EXISTS");
+				result?.items?.some(
+					(item) =>
+						item.key &&
+						item.key.key === 'http.method' &&
+						item.value === 'GET' &&
+						item.op === '=',
+				),
+			).toBe(true);
+
+			expect(
+				result?.items?.some(
+					(item) =>
+						item.key &&
+						item.key.key === 'http.status_code' &&
+						item.value === '200' &&
+						item.op === '=',
+				),
+			).toBe(true);
+
+			expect(
+				result?.items?.some(
+					(item) =>
+						item.key &&
+						item.key.key === 'service.name' &&
+						item.value === 'api-service' &&
+						item.op === '=',
+				),
+			).toBe(true);
 		});
 
-		it('returns an empty expression for a row without group columns', () => {
-			expect(getGroupByExpressionFromRowData({ http_url: '/x', A: 1 })).toBe('');
+		it('should handle fields not in groupBy', () => {
+			// Arrange
+			const rowData = {
+				'http.method': 'GET',
+				'unknown.field': 'someValue',
+			};
+
+			const groupBy = [
+				{
+					id: 'group-by-1',
+					key: 'http.method',
+					dataType: DataTypes.String,
+					type: '',
+				},
+			];
+			// Act
+			const result = getGroupByFiltersFromGroupByValues(
+				rowData,
+				groupBy as BaseAutocompleteData[],
+			);
+
+			// Assert
+			expect(result).toBeDefined();
+			// The implementation includes all keys from rowData, not just those in groupBy
+			expect(result?.items?.length).toBeGreaterThanOrEqual(1);
+
+			// Should include the known field with the proper dataType from groupBy
+			const knownField = result?.items?.find(
+				(item) => item.key && item.key.key === 'http.method',
+			);
+			expect(knownField).toBeDefined();
+			if (knownField && knownField.key) {
+				expect(knownField.key.dataType).toBe(DataTypes.String);
+			}
+
+			// Should include the unknown field
+			const unknownField = result?.items?.find(
+				(item) => item.key && item.key.key === 'unknown.field',
+			);
+			expect(unknownField).toBeDefined();
+			if (unknownField && unknownField.key) {
+				expect(unknownField.key.dataType).toBe(DataTypes.String); // Default
+			}
+		});
+
+		it('should handle empty input', () => {
+			// Arrange
+			const rowData = {};
+			const groupBy: any[] = [];
+
+			// Act
+			const result = getGroupByFiltersFromGroupByValues(rowData, groupBy);
+
+			// Assert
+			expect(result).toBeDefined();
+			expect(result?.op).toBe('AND');
+			expect(result?.items).toHaveLength(0);
 		});
 	});
 
@@ -594,9 +703,13 @@ describe('API Monitoring Utils', () => {
 		it('should generate widget configuration for status code bar chart', () => {
 			// Arrange
 			const domainName = 'test-domain';
+			const filters = { items: [], op: 'AND' };
 
 			// Act
-			const result = getStatusCodeBarChartWidgetData(domainName, '');
+			const result = getStatusCodeBarChartWidgetData(
+				domainName,
+				filters as IBuilderQuery['filters'],
+			);
 
 			// Assert
 			expect(result).toBeDefined();
@@ -610,29 +723,47 @@ describe('API Monitoring Utils', () => {
 			const queryData = result.query.builder.queryData[0];
 
 			// Should have domain filter
-			expect(queryData.filter?.expression).toBe(
-				`${SPAN_ATTRIBUTES.SERVER_NAME} = '${domainName}'`,
+			const domainFilter = queryData.filters?.items?.find(
+				(item) => item.key && item.key.key === SPAN_ATTRIBUTES.SERVER_NAME,
 			);
+			expect(domainFilter).toBeDefined();
+			if (domainFilter) {
+				expect(domainFilter.value).toBe(domainName);
+			}
 		});
 
 		it('should include custom filters in the widget configuration', () => {
 			// Arrange
 			const domainName = 'test-domain';
-			const customFilterExpression = "custom.key = 'custom-value'";
+			const customFilter = {
+				id: 'custom-filter',
+				key: {
+					dataType: 'string',
+					key: 'custom.key',
+					type: '',
+				},
+				op: '=',
+				value: 'custom-value',
+			};
+			const filters = { items: [customFilter], op: 'AND' };
 
 			// Act
 			const result = getStatusCodeBarChartWidgetData(
 				domainName,
-				customFilterExpression,
+				filters as IBuilderQuery['filters'],
 			);
 
 			// Assert
 			const queryData = result.query.builder.queryData[0];
 
-			// Should include our custom filter after the domain filter
-			expect(queryData.filter?.expression).toBe(
-				`${SPAN_ATTRIBUTES.SERVER_NAME} = '${domainName}' AND (${customFilterExpression})`,
+			// Should include our custom filter
+			const includedFilter = queryData.filters?.items?.find(
+				(item) => item.id === 'custom-filter',
 			);
+			expect(includedFilter).toBeDefined();
+			if (includedFilter) {
+				expect(includedFilter.value).toBe('custom-value');
+			}
 		});
 	});
 
@@ -796,17 +927,4 @@ describe('API Monitoring Utils', () => {
 			expect(latencyColumn?.title).toBeDefined();
 		});
 	});
-
-	describe('getHttpUrlExpression', () => {
-		it('returns no clause when no endpoint is picked', () => {
-			expect(getHttpUrlExpression('')).toBe('');
-		});
-
-		it('quotes the endpoint and escapes apostrophes', () => {
-			expect(getHttpUrlExpression('/x')).toBe("http_url = '/x'");
-			expect(getHttpUrlExpression("/users/o'brien")).toBe(
-				"http_url = '/users/o\\'brien'",
-			);
-		});
-	});
 });

frontend/src/container/ApiMonitoring/__tests__/AllEndPoints.test.tsx

@@ -1,17 +1,11 @@
+import { cleanup, fireEvent, render, screen } from '@testing-library/react';
 import {
 	getAllEndpointsWidgetData,
-	getGroupByExpressionFromRowData,
+	getGroupByFiltersFromGroupByValues,
 } from 'container/ApiMonitoring/utils';
-
-import {
-	ALL_ENDPOINTS_EXPRESSION_KEY,
-	ENDPOINT_STATS_EXPRESSION_KEY,
-} from 'container/ApiMonitoring/filterParamKeys';
-import { getCurrentNuqsSearchParams, resetNuqsState } from 'tests/nuqs-helpers';
-import { cleanup, fireEvent, render, screen, waitFor } from 'tests/test-utils';
+import { useGetAggregateKeys } from 'hooks/queryBuilder/useGetAggregateKeys';
 
 import AllEndPoints from '../Explorer/Domains/DomainDetails/AllEndPoints';
-import { FilterProviders } from './FilterProviders';
 import {
 	SPAN_ATTRIBUTES,
 	VIEWS,
@@ -20,7 +14,7 @@ import {
 // Mock the dependencies
 jest.mock('container/ApiMonitoring/utils', () => ({
 	getAllEndpointsWidgetData: jest.fn(),
-	getGroupByExpressionFromRowData: jest.fn(),
+	getGroupByFiltersFromGroupByValues: jest.fn(),
 }));
 
 jest.mock('container/WidgetCard/Card', () => ({
@@ -40,47 +34,53 @@ jest.mock('container/WidgetCard/Card', () => ({
 	)),
 }));
 
-jest.mock('components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch', () => ({
-	__esModule: true,
-	default: jest.fn().mockImplementation(({ onRun }) => (
-		<div data-testid="query-builder-mock">
-			<button
-				type="button"
-				data-testid="filter-change-button"
-				onClick={(): void => onRun("test = 'test'")}
-			>
-				Change Filter
-			</button>
-		</div>
-	)),
+jest.mock(
+	'container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2',
+	() => ({
+		__esModule: true,
+		default: jest.fn().mockImplementation(({ onChange }) => (
+			<div data-testid="query-builder-mock">
+				<button
+					type="button"
+					data-testid="filter-change-button"
+					onClick={(): void =>
+						onChange({
+							items: [{ id: 'test', key: 'test', op: '=', value: 'test' }],
+							op: 'AND',
+						})
+					}
+				>
+					Change Filter
+				</button>
+			</div>
+		)),
+	}),
+);
+
+jest.mock('hooks/queryBuilder/useGetAggregateKeys', () => ({
+	useGetAggregateKeys: jest.fn(),
 }));
 
-jest.mock('container/QueryBuilder/filters/GroupByFilter/GroupByFilter', () => ({
-	GroupByFilter: jest.fn().mockImplementation(({ onChange }) => (
-		<div data-testid="select-mock">
-			<button
-				data-testid="select-change-button"
-				type="button"
-				onClick={(): void =>
-					onChange([
-						{
-							id: 'http.status_code--string--attribute',
-							key: 'http.status_code',
-							dataType: 'string',
-							type: 'attribute',
-						},
-					])
-				}
-			>
-				Change GroupBy
-			</button>
-		</div>
-	)),
-}));
+jest.mock('antd', () => {
+	const originalModule = jest.requireActual('antd');
+	return {
+		...originalModule,
+		Select: jest.fn().mockImplementation(({ onChange }) => (
+			<div data-testid="select-mock">
+				<button
+					data-testid="select-change-button"
+					type="button"
+					onClick={(): void => onChange(['http.status_code'])}
+				>
+					Change GroupBy
+				</button>
+			</div>
+		)),
+	};
+});
 
 // Mock useApiMonitoringParams hook
 jest.mock('container/ApiMonitoring/queryParams', () => ({
-	...jest.requireActual('container/ApiMonitoring/queryParams'),
 	useApiMonitoringParams: jest.fn().mockReturnValue([
 		{
 			showIP: true,
@@ -88,6 +88,8 @@ jest.mock('container/ApiMonitoring/queryParams', () => ({
 			selectedView: 'all_endpoints',
 			selectedEndPointName: '',
 			groupBy: [],
+			allEndpointsLocalFilters: undefined,
+			endPointDetailsLocalFilters: undefined,
 			modalTimeRange: undefined,
 			selectedInterval: undefined,
 		},
@@ -106,21 +108,29 @@ describe('AllEndPoints', () => {
 			startTime: 1609459200000,
 			endTime: 1609545600000,
 		},
-	};
-
-	const renderAllEndPoints = (): void => {
-		render(
-			<FilterProviders queryParamKey={ALL_ENDPOINTS_EXPRESSION_KEY}>
-				<AllEndPoints {...mockProps} />
-			</FilterProviders>,
-		);
+		initialFilters: { op: 'AND', items: [] },
+		setInitialFiltersEndPointStats: jest.fn(),
 	};
 
 	beforeEach(() => {
 		jest.clearAllMocks();
-		resetNuqsState();
 
 		// Setup mock implementations
+		(useGetAggregateKeys as jest.Mock).mockReturnValue({
+			data: {
+				payload: {
+					attributeKeys: [
+						{
+							key: 'http.status_code',
+							dataType: 'string',
+							type: '',
+						},
+					],
+				},
+			},
+			isLoading: false,
+		});
+
 		(getAllEndpointsWidgetData as jest.Mock).mockReturnValue({
 			id: 'test-widget',
 			title: 'Endpoint Overview',
@@ -129,9 +139,10 @@ describe('AllEndPoints', () => {
 			queryData: [],
 		});
 
-		(getGroupByExpressionFromRowData as jest.Mock).mockReturnValue(
-			"status = '200'",
-		);
+		(getGroupByFiltersFromGroupByValues as jest.Mock).mockReturnValue({
+			items: [{ id: 'group-filter', key: 'status', op: '=', value: '200' }],
+			op: 'AND',
+		});
 	});
 
 	// Add cleanup after each test
@@ -140,7 +151,7 @@ describe('AllEndPoints', () => {
 	});
 
 	it('renders component correctly', () => {
-		renderAllEndPoints();
+		render(<AllEndPoints {...mockProps} />);
 
 		// Verify basic component rendering
 		expect(screen.getByText('Group by')).toBeInTheDocument();
@@ -150,7 +161,7 @@ describe('AllEndPoints', () => {
 	});
 
 	it('handles filter changes', () => {
-		renderAllEndPoints();
+		render(<AllEndPoints {...mockProps} />);
 
 		// Trigger filter change
 		fireEvent.click(screen.getByTestId('filter-change-button'));
@@ -159,24 +170,25 @@ describe('AllEndPoints', () => {
 		expect(getAllEndpointsWidgetData).toHaveBeenCalledWith(
 			expect.anything(),
 			'test-domain',
-			"test = 'test'",
+			expect.objectContaining({
+				items: expect.arrayContaining([expect.objectContaining({ id: 'test' })]),
+				op: 'AND',
+			}),
 		);
 	});
 
 	it('handles group by changes', () => {
-		renderAllEndPoints();
+		render(<AllEndPoints {...mockProps} />);
 
 		// Trigger group by change
 		fireEvent.click(screen.getByTestId('select-change-button'));
 
-		// The picked keys are stored as given and written to the URL as bare names
-		expect(mockProps.setGroupBy).toHaveBeenCalledWith([
-			expect.objectContaining({ key: 'http.status_code', type: 'attribute' }),
-		]);
+		// Check if setGroupBy was called with updated group by value
+		expect(mockProps.setGroupBy).toHaveBeenCalled();
 	});
 
 	it('handles row click in grid card', async () => {
-		renderAllEndPoints();
+		render(<AllEndPoints {...mockProps} />);
 
 		// Trigger row click
 		fireEvent.click(screen.getByTestId('row-click-button'));
@@ -184,11 +196,7 @@ describe('AllEndPoints', () => {
 		// Check if proper functions were called
 		expect(mockProps.setSelectedEndPointName).toHaveBeenCalledWith('/api/test');
 		expect(mockProps.setSelectedView).toHaveBeenCalledWith(VIEWS.ENDPOINT_STATS);
-		expect(getGroupByExpressionFromRowData).toHaveBeenCalled();
-		await waitFor(() =>
-			expect(getCurrentNuqsSearchParams().get(ENDPOINT_STATS_EXPRESSION_KEY)).toBe(
-				"status = '200'",
-			),
-		);
+		expect(mockProps.setInitialFiltersEndPointStats).toHaveBeenCalled();
+		expect(getGroupByFiltersFromGroupByValues).toHaveBeenCalled();
 	});
 });

frontend/src/container/ApiMonitoring/__tests__/AllEndpointsWidgetV5Migration.test.tsx

@@ -14,12 +14,16 @@ import {
 	BaseAutocompleteData,
 	DataTypes,
 } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 import { SPAN_ATTRIBUTES } from '../Explorer/Domains/DomainDetails/constants';
 
 describe('AllEndpointsWidget - V5 Migration Validation', () => {
 	const mockDomainName = 'api.example.com';
-	const emptyFilters = '';
+	const emptyFilters: IBuilderQuery['filters'] = {
+		items: [],
+		op: 'AND',
+	};
 	const emptyGroupBy: BaseAutocompleteData[] = [];
 
 	describe('1. V5 Format Migration - All Four Queries', () => {

frontend/src/container/ApiMonitoring/__tests__/DependentServices.test.tsx

@@ -121,7 +121,8 @@ describe('DependentServices', () => {
 		);
 	});
 
-	it('keeps the table in place while loading', () => {
+	it('renders loading state correctly', () => {
+		// Arrange
 		const mockQuery: MockQueryResult = {
 			isLoading: true,
 			isRefetching: false,
@@ -130,15 +131,16 @@ describe('DependentServices', () => {
 			refetch: refetchFn,
 		};
 
-		render(
+		// Act
+		const { container } = render(
 			<DependentServices
 				dependentServicesQuery={mockQuery as any}
 				timeRange={mockTimeRange}
 			/>,
 		);
 
-		expect(screen.getByTestId('dependent-services-table')).toBeInTheDocument();
-		expect(screen.getByTestId('loading-state')).toHaveTextContent('Loading');
+		// Assert
+		expect(container.querySelector('.ant-skeleton')).toBeInTheDocument();
 	});
 
 	it('renders error state correctly', () => {
@@ -223,7 +225,8 @@ describe('DependentServices', () => {
 		expect(screen.getByTestId('page-size')).toHaveTextContent('5');
 	});
 
-	it('shows the rows under the spinner while refetching', () => {
+	it('handles refetching state correctly', () => {
+		// Arrange
 		const mockQuery: MockQueryResult = {
 			isLoading: false,
 			isRefetching: true,
@@ -232,16 +235,16 @@ describe('DependentServices', () => {
 			refetch: refetchFn,
 		};
 
-		render(
+		// Act
+		const { container } = render(
 			<DependentServices
 				dependentServicesQuery={mockQuery as any}
 				timeRange={mockTimeRange}
 			/>,
 		);
 
-		expect(screen.getByTestId('loading-state')).toHaveTextContent('Loading');
-		expect(screen.getByTestId('row-count')).toHaveTextContent('2');
-		expect(screen.getByTestId('table-row-0')).toHaveTextContent('auth-service');
+		// Assert
+		expect(container.querySelector('.ant-skeleton')).toBeInTheDocument();
 	});
 
 	it('handles row click correctly', () => {

frontend/src/container/ApiMonitoring/__tests__/DomainDetails.test.tsx

@@ -1,60 +0,0 @@
-import { useApiMonitoringParams } from 'container/ApiMonitoring/queryParams';
-import { render, screen } from 'tests/test-utils';
-
-import { VIEWS } from '../Explorer/Domains/DomainDetails/constants';
-import DomainDetails from '../Explorer/Domains/DomainDetails/DomainDetails';
-
-jest.mock('container/ApiMonitoring/queryParams', () => ({
-	...jest.requireActual('container/ApiMonitoring/queryParams'),
-	useApiMonitoringParams: jest.fn(),
-}));
-
-jest.mock('container/TopNav/DateTimeSelectionV2', () => ({
-	__esModule: true,
-	default: (): null => null,
-}));
-
-jest.mock('../Explorer/Domains/DomainDetails/components/DomainMetrics', () => ({
-	__esModule: true,
-	default: (): null => null,
-}));
-
-jest.mock('../Explorer/Domains/DomainDetails/EndPointDetails', () => {
-	const { useInitialExpression } = jest.requireActual(
-		'components/QueryBuilderV2',
-	);
-	return {
-		__esModule: true,
-		default: function MockEndPointDetails(): JSX.Element {
-			return (
-				<span data-testid="endpoint-stats-scope">{useInitialExpression()}</span>
-			);
-		},
-	};
-});
-
-describe('DomainDetails', () => {
-	it('scopes Endpoint Stats to the domain and the picked endpoint', () => {
-		jest
-			.mocked(useApiMonitoringParams)
-			.mockReturnValue([
-				{ selectedView: VIEWS.ENDPOINT_STATS, selectedEndPointName: '/v1/charges' },
-				jest.fn(),
-			]);
-
-		render(
-			<DomainDetails
-				domainData={{ domainName: 'api.example.com' }}
-				handleClose={jest.fn()}
-				selectedDomainIndex={0}
-				setSelectedDomainIndex={jest.fn()}
-				domainListLength={1}
-				domainListFilterExpression=""
-			/>,
-		);
-
-		expect(screen.getByTestId('endpoint-stats-scope')).toHaveTextContent(
-			"kind_string = 'Client' AND http_host = 'api.example.com' AND http_url = '/v1/charges'",
-		);
-	});
-});

frontend/src/container/ApiMonitoring/__tests__/DomainList.test.tsx

@@ -1,84 +0,0 @@
-import { safeNavigateMock } from '__tests__/safeNavigateMock';
-import { rest, server } from 'mocks-server/server';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-
-import DomainList from '../Explorer/Domains/DomainList';
-
-const FILTER = "http_host = 'api.example.com'";
-
-jest.mock('components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch', () => ({
-	__esModule: true,
-	default: jest
-		.fn()
-		.mockImplementation(
-			({
-				onChange,
-				onRun,
-			}: {
-				onChange: (query: string) => void;
-				onRun?: (query: string) => void;
-			}) => (
-				<>
-					<button
-						type="button"
-						data-testid="query-search-type"
-						onClick={(): void => onChange("http_host = 'api.example.com'")}
-					>
-						Type
-					</button>
-					<button
-						type="button"
-						data-testid="query-search-run"
-						onClick={(): void => onRun?.("http_host = 'api.example.com'")}
-					>
-						Run
-					</button>
-				</>
-			),
-		),
-}));
-
-jest.mock('container/Toolbar/Toolbar', () => ({
-	__esModule: true,
-	default: (): null => null,
-}));
-
-jest.mock('../Explorer/Domains/DomainDetails/DomainDetails', () => ({
-	__esModule: true,
-	default: (): null => null,
-}));
-
-// Under the test router it keeps rewriting the URL, which re-renders the page
-// without end.
-jest.mock('hooks/queryBuilder/useShareBuilderUrl', () => ({
-	useShareBuilderUrl: jest.fn(),
-}));
-
-describe('DomainList', () => {
-	it('runs the typed filter from the filter box', async () => {
-		let listRequests = 0;
-		server.use(
-			rest.post('*/third-party-apis/overview/list', (_req, res, ctx) => {
-				listRequests += 1;
-				return res(ctx.status(200), ctx.json({ data: { data: { results: [] } } }));
-			}),
-		);
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		render(<DomainList />, undefined, {
-			initialRoute: '/api-monitoring/explorer',
-		});
-		await waitFor(() => expect(listRequests).toBe(1));
-
-		await user.click(screen.getByTestId('query-search-type'));
-		await user.click(screen.getByTestId('query-search-run'));
-
-		await waitFor(() => expect(listRequests).toBe(2));
-		const [url] = safeNavigateMock.mock.calls[0];
-		const compositeQuery = new URLSearchParams(String(url).split('?')[1]).get(
-			'compositeQuery',
-		);
-		expect(decodeURIComponent(compositeQuery ?? '')).toContain(
-			`"expression":"${FILTER}"`,
-		);
-	});
-});

frontend/src/container/ApiMonitoring/__tests__/EndPointDetails.test.tsx

@@ -1,7 +1,5 @@
 import { useQueries } from 'react-query';
-import QuerySearch from 'components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch';
-import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import { ENDPOINT_STATS_EXPRESSION_KEY } from 'container/ApiMonitoring/filterParamKeys';
+import { fireEvent, render, screen } from '@testing-library/react';
 import {
 	END_POINT_DETAILS_QUERY_KEYS_ARRAY,
 	extractPortAndEndpoint,
@@ -13,13 +11,14 @@ import {
 	CustomTimeType,
 	Time,
 } from 'container/TopNav/DateTimeSelectionV2/types';
-import { getCurrentNuqsSearchParams, resetNuqsState } from 'tests/nuqs-helpers';
-import { fireEvent, render, screen, waitFor } from 'tests/test-utils';
+import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import {
+	TagFilter,
+	TagFilterItem,
+} from 'types/api/queryBuilder/queryBuilderData';
 
 import { SPAN_ATTRIBUTES } from '../Explorer/Domains/DomainDetails/constants';
-import EndPointPicker from '../Explorer/Domains/DomainDetails/components/EndPointPicker';
 import EndPointDetails from '../Explorer/Domains/DomainDetails/EndPointDetails';
-import { FilterProviders } from './FilterProviders';
 
 // Mock dependencies
 jest.mock('react-query', () => ({
@@ -27,32 +26,72 @@ jest.mock('react-query', () => ({
 	useQueries: jest.fn(),
 }));
 
+// Mock useApiMonitoringParams hook
+jest.mock('container/ApiMonitoring/queryParams', () => ({
+	useApiMonitoringParams: jest.fn().mockReturnValue([
+		{
+			showIP: true,
+			selectedDomain: '',
+			selectedView: 'all_endpoints',
+			selectedEndPointName: '',
+			groupBy: [],
+			allEndpointsLocalFilters: undefined,
+			endPointDetailsLocalFilters: undefined,
+			modalTimeRange: undefined,
+			selectedInterval: undefined,
+		},
+		jest.fn(),
+	]),
+}));
+
 jest.mock('container/ApiMonitoring/utils', () => ({
-	END_POINT_DETAILS_QUERY_KEYS_ARRAY: jest.requireActual(
-		'container/ApiMonitoring/utils',
-	).END_POINT_DETAILS_QUERY_KEYS_ARRAY,
+	END_POINT_DETAILS_QUERY_KEYS_ARRAY: [
+		'endPointMetricsData',
+		'endPointStatusCodeData',
+		'endPointDropDownData',
+		'endPointDependentServicesData',
+		'endPointStatusCodeBarChartsData',
+		'endPointStatusCodeLatencyBarChartsData',
+	],
 	extractPortAndEndpoint: jest.fn(),
-	getHttpUrlExpression: jest.requireActual('container/ApiMonitoring/utils')
-		.getHttpUrlExpression,
 	getEndPointDetailsQueryPayload: jest.fn(),
 	getLatencyOverTimeWidgetData: jest.fn(),
 	getRateOverTimeWidgetData: jest.fn(),
 }));
 
-jest.mock('components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch', () => ({
-	__esModule: true,
-	default: jest.fn().mockImplementation(({ onRun }) => (
-		<div data-testid="query-builder-search">
-			<button
-				type="button"
-				data-testid="filter-change-button"
-				onClick={(): void => onRun("test.key = 'test-value'")}
-			>
-				Change Filter
-			</button>
-		</div>
-	)),
-}));
+jest.mock(
+	'container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2',
+	() => ({
+		__esModule: true,
+		default: jest.fn().mockImplementation(({ onChange }) => (
+			<div data-testid="query-builder-search">
+				<button
+					type="button"
+					data-testid="filter-change-button"
+					onClick={(): void =>
+						onChange({
+							items: [
+								{
+									id: 'test-filter',
+									key: {
+										key: 'test.key',
+										dataType: DataTypes.String,
+										type: 'tag',
+									},
+									op: '=',
+									value: 'test-value',
+								},
+							],
+							op: 'AND',
+						})
+					}
+				>
+					Change Filter
+				</button>
+			</div>
+		)),
+	}),
+);
 
 // Mock all child components to simplify testing
 jest.mock(
@@ -68,15 +107,15 @@ jest.mock(
 );
 
 jest.mock(
-	'../Explorer/Domains/DomainDetails/components/EndPointPicker',
+	'../Explorer/Domains/DomainDetails/components/EndPointsDropDown',
 	() => ({
 		__esModule: true,
-		default: jest.fn().mockImplementation(({ onChange }) => (
+		default: jest.fn().mockImplementation(({ setSelectedEndPointName }) => (
 			<div data-testid="endpoints-dropdown">
 				<button
 					type="button"
 					data-testid="select-endpoint-button"
-					onClick={(): void => onChange('/api/new-endpoint')}
+					onClick={(): void => setSelectedEndPointName('/api/new-endpoint')}
 				>
 					Select Endpoint
 				</button>
@@ -133,23 +172,8 @@ jest.mock(
 	}),
 );
 
-function renderStats(ui: JSX.Element, linkFilter = ''): void {
-	render(
-		<FilterProviders
-			queryParamKey={ENDPOINT_STATS_EXPRESSION_KEY}
-			searchParams={
-				linkFilter
-					? `${ENDPOINT_STATS_EXPRESSION_KEY}=${encodeURIComponent(linkFilter)}`
-					: ''
-			}
-		>
-			{ui}
-		</FilterProviders>,
-	);
-}
-
 describe('EndPointDetails Component', () => {
-	const mockQueryResults = Array(5).fill({
+	const mockQueryResults = Array(6).fill({
 		data: { data: [] },
 		isLoading: false,
 		isError: false,
@@ -160,6 +184,7 @@ describe('EndPointDetails Component', () => {
 		domainName: 'test-domain',
 		endPointName: '/api/test',
 		setSelectedEndPointName: jest.fn(),
+		initialFilters: { items: [], op: 'AND' } as TagFilter,
 		timeRange: {
 			startTime: 1609459200000,
 			endTime: 1609545600000,
@@ -172,7 +197,6 @@ describe('EndPointDetails Component', () => {
 
 	beforeEach(() => {
 		jest.clearAllMocks();
-		resetNuqsState();
 
 		(extractPortAndEndpoint as jest.Mock).mockReturnValue({
 			port: '8080',
@@ -185,6 +209,7 @@ describe('EndPointDetails Component', () => {
 			{ id: 'query3', label: 'Query 3' },
 			{ id: 'query4', label: 'Query 4' },
 			{ id: 'query5', label: 'Query 5' },
+			{ id: 'query6', label: 'Query 6' },
 		]);
 
 		(getRateOverTimeWidgetData as jest.Mock).mockReturnValue({
@@ -201,7 +226,7 @@ describe('EndPointDetails Component', () => {
 	});
 
 	it('renders the component correctly', () => {
-		renderStats(<EndPointDetails {...mockProps} />);
+		render(<EndPointDetails {...mockProps} />);
 
 		// Check all major components are rendered
 		expect(screen.getByTestId('query-builder-search')).toBeInTheDocument();
@@ -221,29 +246,44 @@ describe('EndPointDetails Component', () => {
 	});
 
 	it('calls getEndPointDetailsQueryPayload with correct parameters', () => {
-		renderStats(<EndPointDetails {...mockProps} />);
+		render(<EndPointDetails {...mockProps} />);
 
 		expect(getEndPointDetailsQueryPayload).toHaveBeenCalledWith(
 			'test-domain',
 			mockProps.timeRange.startTime,
 			mockProps.timeRange.endTime,
-			`${SPAN_ATTRIBUTES.HTTP_URL} = '/api/test'`,
+			expect.objectContaining({
+				items: expect.arrayContaining([
+					expect.objectContaining({
+						key: expect.objectContaining({ key: SPAN_ATTRIBUTES.HTTP_URL }),
+						value: '/api/test',
+					}),
+				]),
+				op: 'AND',
+			}),
 		);
 	});
 
 	it('adds endpoint filter to initial filters', () => {
-		renderStats(<EndPointDetails {...mockProps} />);
+		render(<EndPointDetails {...mockProps} />);
 
 		expect(getEndPointDetailsQueryPayload).toHaveBeenCalledWith(
 			expect.anything(),
 			expect.anything(),
 			expect.anything(),
-			expect.stringContaining(`${SPAN_ATTRIBUTES.HTTP_URL} = '/api/test'`),
+			expect.objectContaining({
+				items: expect.arrayContaining([
+					expect.objectContaining({
+						key: expect.objectContaining({ key: SPAN_ATTRIBUTES.HTTP_URL }),
+						value: '/api/test',
+					}),
+				]),
+			}),
 		);
 	});
 
-	it('updates filters when the search expression is run', async () => {
-		renderStats(<EndPointDetails {...mockProps} />);
+	it('updates filters when QueryBuilderSearch changes', () => {
+		render(<EndPointDetails {...mockProps} />);
 
 		// Trigger filter change
 		fireEvent.click(screen.getByTestId('filter-change-button'));
@@ -254,37 +294,19 @@ describe('EndPointDetails Component', () => {
 			expect.anything(),
 			expect.anything(),
 			expect.anything(),
-			`${SPAN_ATTRIBUTES.HTTP_URL} = '/api/test' AND (test.key = 'test-value')`,
-		);
-		await waitFor(() =>
-			expect(getCurrentNuqsSearchParams().get(ENDPOINT_STATS_EXPRESSION_KEY)).toBe(
-				"test.key = 'test-value'",
-			),
-		);
-	});
-
-	it('keeps the endpoint out of the editor and the picker options', () => {
-		renderStats(<EndPointDetails {...mockProps} />, "service.name = 'checkout'");
-
-		expect(QuerySearch).toHaveBeenLastCalledWith(
 			expect.objectContaining({
-				queryData: expect.objectContaining({
-					filter: { expression: "service.name = 'checkout'" },
-				}),
+				items: expect.arrayContaining([
+					expect.objectContaining({
+						key: expect.objectContaining({ key: 'test.key' }),
+						value: 'test-value',
+					}),
+				]),
 			}),
-			expect.anything(),
-		);
-		expect(EndPointPicker).toHaveBeenLastCalledWith(
-			expect.objectContaining({
-				filterExpression: "service.name = 'checkout'",
-				value: '/api/test',
-			}),
-			expect.anything(),
 		);
 	});
 
 	it('handles endpoint dropdown selection', () => {
-		renderStats(<EndPointDetails {...mockProps} />);
+		render(<EndPointDetails {...mockProps} />);
 
 		// Trigger endpoint selection
 		fireEvent.click(screen.getByTestId('select-endpoint-button'));
@@ -296,50 +318,63 @@ describe('EndPointDetails Component', () => {
 	});
 
 	it('does not display dependent services when service filter is applied', () => {
-		renderStats(
-			<EndPointDetails {...mockProps} />,
-			"service.name = 'test-service'",
-		);
+		const propsWithServiceFilter = {
+			...mockProps,
+			initialFilters: {
+				items: [
+					{
+						id: 'service-filter',
+						key: {
+							key: 'service.name',
+							dataType: DataTypes.String,
+							type: 'tag',
+						},
+						op: '=',
+						value: 'test-service',
+					},
+				] as TagFilterItem[],
+				op: 'AND',
+			} as TagFilter,
+		};
+
+		render(<EndPointDetails {...propsWithServiceFilter} />);
 
 		// Dependent services should not be displayed
 		expect(screen.queryByTestId('dependent-services')).not.toBeInTheDocument();
 	});
 
 	it('passes the correct parameters to widget data generators', () => {
-		renderStats(<EndPointDetails {...mockProps} />);
+		render(<EndPointDetails {...mockProps} />);
 
 		expect(getRateOverTimeWidgetData).toHaveBeenCalledWith(
 			'test-domain',
 			'/api/test',
-			expect.stringContaining(`${SPAN_ATTRIBUTES.HTTP_URL} = '/api/test'`),
+			expect.objectContaining({
+				items: expect.arrayContaining([
+					expect.objectContaining({
+						key: expect.objectContaining({ key: SPAN_ATTRIBUTES.HTTP_URL }),
+						value: '/api/test',
+					}),
+				]),
+			}),
 		);
 
 		expect(getLatencyOverTimeWidgetData).toHaveBeenCalledWith(
 			'test-domain',
 			'/api/test',
-			expect.stringContaining(`${SPAN_ATTRIBUTES.HTTP_URL} = '/api/test'`),
-		);
-	});
-
-	it('keeps the previous dependent services while a new filter loads', () => {
-		renderStats(<EndPointDetails {...mockProps} />);
-
-		const queries = jest.mocked(useQueries).mock.calls[0][0];
-		expect(
-			queries.map(({ queryKey, keepPreviousData }) => [
-				(queryKey as unknown[])[0],
-				keepPreviousData,
-			]),
-		).toStrictEqual(
-			END_POINT_DETAILS_QUERY_KEYS_ARRAY.map((key) => [
-				key,
-				key === REACT_QUERY_KEY.GET_ENDPOINT_DEPENDENT_SERVICES_DATA,
-			]),
+			expect.objectContaining({
+				items: expect.arrayContaining([
+					expect.objectContaining({
+						key: expect.objectContaining({ key: SPAN_ATTRIBUTES.HTTP_URL }),
+						value: '/api/test',
+					}),
+				]),
+			}),
 		);
 	});
 
 	it('generates correct query parameters for useQueries', () => {
-		renderStats(<EndPointDetails {...mockProps} />);
+		render(<EndPointDetails {...mockProps} />);
 
 		// Check if useQueries was called with correct parameters
 		expect(useQueries).toHaveBeenCalledWith(

frontend/src/container/ApiMonitoring/__tests__/EndPointPicker.test.tsx

@@ -1,115 +0,0 @@
-import {
-	GetMetricQueryRange,
-	GetQueryResultsProps,
-} from 'lib/dashboard/getQueryResults';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';
-
-import EndPointPicker from '../Explorer/Domains/DomainDetails/components/EndPointPicker';
-import { SPAN_ATTRIBUTES } from '../Explorer/Domains/DomainDetails/constants';
-
-jest.mock('lib/dashboard/getQueryResults', () => ({
-	GetMetricQueryRange: jest.fn(),
-}));
-
-const mockGetMetricQueryRange = jest.mocked(GetMetricQueryRange);
-
-const rowsResponse = (urls: string[]): MetricQueryRangeSuccessResponse => ({
-	statusCode: 200,
-	message: 'success',
-	error: null,
-	payload: {
-		data: {
-			resultType: '',
-			newResult: { data: { result: [], resultType: '' } },
-			result: [
-				{
-					metric: {},
-					queryName: 'A',
-					values: [],
-					table: {
-						columns: [],
-						rows: urls.map((url) => ({
-							data: { [SPAN_ATTRIBUTES.HTTP_URL]: url, A: 1 },
-						})),
-					},
-				},
-			],
-		},
-	},
-});
-
-const baseProps = {
-	domainName: 'api.example.com',
-	timeRange: { startTime: 1000, endTime: 2000 },
-	filterExpression: "service.name = 'checkout'",
-	value: '',
-};
-
-describe('EndPointPicker', () => {
-	beforeEach(() => {
-		mockGetMetricQueryRange.mockResolvedValue(
-			rowsResponse(['/v1/charges', '/v1/refunds']),
-		);
-	});
-
-	it('loads options for the domain scoped by the user filter', async () => {
-		render(<EndPointPicker {...baseProps} onChange={jest.fn()} />);
-
-		await waitFor(() => expect(mockGetMetricQueryRange).toHaveBeenCalled());
-		const payload: GetQueryResultsProps =
-			mockGetMetricQueryRange.mock.calls[0][0];
-		expect(payload.query.builder.queryData[0].filter?.expression).toBe(
-			`http_host = 'api.example.com' AND kind_string = 'Client' AND ${SPAN_ATTRIBUTES.HTTP_URL} EXISTS AND (service.name = 'checkout')`,
-		);
-	});
-
-	it('reports the picked endpoint', async () => {
-		const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
-		const onChange = jest.fn() as jest.MockedFunction<
-			(endPointName: string) => void
-		>;
-		render(<EndPointPicker {...baseProps} onChange={onChange} />);
-
-		await waitFor(() => expect(mockGetMetricQueryRange).toHaveBeenCalled());
-		await user.click(screen.getByTestId('endpoint-picker'));
-		await user.click(await screen.findByText('/v1/refunds'));
-
-		expect(onChange).toHaveBeenCalledWith('/v1/refunds');
-	});
-
-	it('shows All endpoints when none is picked and clears through it', async () => {
-		const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
-		const onChange = jest.fn() as jest.MockedFunction<
-			(endPointName: string) => void
-		>;
-		const { rerender } = render(
-			<EndPointPicker {...baseProps} onChange={onChange} />,
-		);
-
-		expect(screen.getByTestId('endpoint-picker')).toHaveTextContent(
-			'All endpoints',
-		);
-
-		rerender(
-			<EndPointPicker {...baseProps} value="/v1/charges" onChange={onChange} />,
-		);
-		await waitFor(() => expect(mockGetMetricQueryRange).toHaveBeenCalled());
-		await user.click(screen.getByTestId('endpoint-picker'));
-		await user.click(
-			await screen.findByRole('option', { name: 'All endpoints' }),
-		);
-
-		expect(onChange).toHaveBeenCalledWith('');
-	});
-
-	it('shows the selected endpoint', async () => {
-		render(
-			<EndPointPicker {...baseProps} value="/v1/charges" onChange={jest.fn()} />,
-		);
-
-		await waitFor(() =>
-			expect(screen.getByText('/v1/charges')).toBeInTheDocument(),
-		);
-	});
-});

frontend/src/container/ApiMonitoring/__tests__/EndPointsDropDown.test.tsx

@@ -0,0 +1,210 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+import { getFormattedEndPointDropDownData } from 'container/ApiMonitoring/utils';
+
+import EndPointsDropDown from '../Explorer/Domains/DomainDetails/components/EndPointsDropDown';
+import { SPAN_ATTRIBUTES } from '../Explorer/Domains/DomainDetails/constants';
+
+// Mock the Select component from antd
+jest.mock('antd', () => {
+	const originalModule = jest.requireActual('antd');
+	return {
+		...originalModule,
+		Select: jest
+			.fn()
+			.mockImplementation(({ value, loading, onChange, options, onClear }) => (
+				<div data-testid="mock-select">
+					<div data-testid="select-value">{value}</div>
+					<div data-testid="select-loading">
+						{loading ? 'loading' : 'not-loading'}
+					</div>
+					<select
+						data-testid="select-element"
+						value={value || ''}
+						onChange={(e): void => onChange(e.target.value)}
+					>
+						<option value="">Select...</option>
+						{options?.map((option: { value: string; label: string; key: string }) => (
+							<option key={option.value} value={option.value}>
+								{option.label}
+							</option>
+						))}
+					</select>
+					<button data-testid="select-clear-button" type="button" onClick={onClear}>
+						Clear
+					</button>
+				</div>
+			)),
+	};
+});
+
+// Mock the utilities
+jest.mock('container/ApiMonitoring/utils', () => ({
+	getFormattedEndPointDropDownData: jest.fn(),
+}));
+
+describe('EndPointsDropDown Component', () => {
+	const mockEndPoints = [
+		{ key: '1', value: '/api/endpoint1', label: '/api/endpoint1' },
+		{ key: '2', value: '/api/endpoint2', label: '/api/endpoint2' },
+	];
+
+	const mockSetSelectedEndPointName = jest.fn();
+
+	// Create a mock that satisfies the UseQueryResult interface
+	const createMockQueryResult = (overrides: any = {}): any => ({
+		data: {
+			payload: {
+				data: {
+					result: [
+						{
+							table: {
+								rows: [],
+							},
+						},
+					],
+				},
+			},
+		},
+		dataUpdatedAt: 0,
+		error: null,
+		errorUpdatedAt: 0,
+		failureCount: 0,
+		isError: false,
+		isFetched: true,
+		isFetchedAfterMount: true,
+		isFetching: false,
+		isIdle: false,
+		isLoading: false,
+		isLoadingError: false,
+		isPlaceholderData: false,
+		isPreviousData: false,
+		isRefetchError: false,
+		isRefetching: false,
+		isStale: false,
+		isSuccess: true,
+		refetch: jest.fn(),
+		remove: jest.fn(),
+		status: 'success',
+		...overrides,
+	});
+
+	const defaultProps = {
+		selectedEndPointName: '',
+		setSelectedEndPointName: mockSetSelectedEndPointName,
+		endPointDropDownDataQuery: createMockQueryResult(),
+	};
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		(getFormattedEndPointDropDownData as jest.Mock).mockReturnValue(
+			mockEndPoints,
+		);
+	});
+
+	it('renders the component correctly', () => {
+		render(<EndPointsDropDown {...defaultProps} />);
+
+		expect(screen.getByTestId('mock-select')).toBeInTheDocument();
+		expect(screen.getByTestId('select-loading')).toHaveTextContent('not-loading');
+	});
+
+	it('shows loading state when data is loading', () => {
+		const loadingProps = {
+			...defaultProps,
+			endPointDropDownDataQuery: createMockQueryResult({
+				isLoading: true,
+			}),
+		};
+
+		render(<EndPointsDropDown {...loadingProps} />);
+
+		expect(screen.getByTestId('select-loading')).toHaveTextContent('loading');
+	});
+
+	it('shows loading state when data is fetching', () => {
+		const fetchingProps = {
+			...defaultProps,
+			endPointDropDownDataQuery: createMockQueryResult({
+				isFetching: true,
+			}),
+		};
+
+		render(<EndPointsDropDown {...fetchingProps} />);
+
+		expect(screen.getByTestId('select-loading')).toHaveTextContent('loading');
+	});
+
+	it('displays the selected endpoint', () => {
+		const selectedProps = {
+			...defaultProps,
+			selectedEndPointName: '/api/endpoint1',
+		};
+
+		render(<EndPointsDropDown {...selectedProps} />);
+
+		expect(screen.getByTestId('select-value')).toHaveTextContent(
+			'/api/endpoint1',
+		);
+	});
+
+	it('calls setSelectedEndPointName when an option is selected', () => {
+		render(<EndPointsDropDown {...defaultProps} />);
+
+		// Get the select element and change its value
+		const selectElement = screen.getByTestId('select-element');
+		fireEvent.change(selectElement, { target: { value: '/api/endpoint2' } });
+
+		expect(mockSetSelectedEndPointName).toHaveBeenCalledWith('/api/endpoint2');
+	});
+
+	it('calls setSelectedEndPointName with empty string when cleared', () => {
+		render(<EndPointsDropDown {...defaultProps} />);
+
+		// Click the clear button
+		const clearButton = screen.getByTestId('select-clear-button');
+		fireEvent.click(clearButton);
+
+		expect(mockSetSelectedEndPointName).toHaveBeenCalledWith('');
+	});
+
+	it('passes dropdown style prop correctly', () => {
+		const styleProps = {
+			...defaultProps,
+			dropdownStyle: { maxHeight: '200px' },
+		};
+
+		render(<EndPointsDropDown {...styleProps} />);
+
+		// We can't easily test style props in our mock, but at least ensure the component rendered
+		expect(screen.getByTestId('mock-select')).toBeInTheDocument();
+	});
+
+	it('formats data using the utility function', () => {
+		const mockRows = [
+			{ data: { [SPAN_ATTRIBUTES.HTTP_URL]: '/api/test', A: 10 } },
+		];
+
+		const dataProps = {
+			...defaultProps,
+			endPointDropDownDataQuery: createMockQueryResult({
+				data: {
+					payload: {
+						data: {
+							result: [
+								{
+									table: {
+										rows: mockRows,
+									},
+								},
+							],
+						},
+					},
+				},
+			}),
+		};
+
+		render(<EndPointsDropDown {...dataProps} />);
+
+		expect(getFormattedEndPointDropDownData).toHaveBeenCalledWith(mockRows);
+	});
+});

frontend/src/container/ApiMonitoring/__tests__/EndpointDropdownV5Migration.test.tsx

@@ -1,8 +1,8 @@
 /**
  * V5 Migration Tests for Endpoint Dropdown Query
  *
- * These tests validate the migration from V4 to V5 format for
- * getEndPointDropDownQueryPayload (endpoint picker options):
+ * These tests validate the migration from V4 to V5 format for the third payload
+ * in getEndPointDetailsQueryPayload (endpoint dropdown data):
  * - Filter format change: filters.items[] → filter.expression
  * - Domain handling: http_host = '${domainName}'
  * - Kind filter: kind_string = 'Client'
@@ -10,8 +10,9 @@
  * - Aggregation: count() expression
  * - GroupBy: http_url with type 'attribute'
  */
-import { getEndPointDropDownQueryPayload } from 'container/ApiMonitoring/utils';
+import { getEndPointDetailsQueryPayload } from 'container/ApiMonitoring/utils';
 import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 import { SPAN_ATTRIBUTES } from '../Explorer/Domains/DomainDetails/constants';
 
@@ -19,16 +20,22 @@ describe('EndpointDropdown - V5 Migration Validation', () => {
 	const mockDomainName = 'api.example.com';
 	const mockStartTime = 1000;
 	const mockEndTime = 2000;
-	const emptyFilters = '';
+	const emptyFilters: IBuilderQuery['filters'] = {
+		items: [],
+		op: 'AND',
+	};
 
 	describe('1. V5 Format Migration - Structure and Base Filters', () => {
 		it('migrates to V5 format with correct filter expression structure, aggregations, and groupBy', () => {
-			const dropdownQuery = getEndPointDropDownQueryPayload(
+			const payload = getEndPointDetailsQueryPayload(
 				mockDomainName,
 				mockStartTime,
 				mockEndTime,
 				emptyFilters,
 			);
+
+			// Third payload is the endpoint dropdown query (index 2)
+			const dropdownQuery = payload[2];
 			const queryA = dropdownQuery.query.builder.queryData[0];
 
 			// CRITICAL V5 MIGRATION: filter.expression (not filters.items)
@@ -70,21 +77,46 @@ describe('EndpointDropdown - V5 Migration Validation', () => {
 
 	describe('2. Custom Filters Integration', () => {
 		it('merges custom filters into filter expression with AND logic', () => {
-			const customFilters =
-				"service.name = 'user-service' AND deployment.environment = 'production'";
+			const customFilters: IBuilderQuery['filters'] = {
+				items: [
+					{
+						id: 'test-1',
+						key: {
+							key: 'service.name',
+							dataType: 'string' as any,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'user-service',
+					},
+					{
+						id: 'test-2',
+						key: {
+							key: 'deployment.environment',
+							dataType: 'string' as any,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'production',
+					},
+				],
+				op: 'AND',
+			};
 
-			const dropdownQuery = getEndPointDropDownQueryPayload(
+			const payload = getEndPointDetailsQueryPayload(
 				mockDomainName,
 				mockStartTime,
 				mockEndTime,
 				customFilters,
 			);
+
+			const dropdownQuery = payload[2];
 			const expression =
 				dropdownQuery.query.builder.queryData[0].filter?.expression;
 
 			// Exact filter expression with custom filters merged
 			expect(expression).toBe(
-				`${SPAN_ATTRIBUTES.SERVER_NAME} = 'api.example.com' AND kind_string = 'Client' AND ${SPAN_ATTRIBUTES.HTTP_URL} EXISTS AND (service.name = 'user-service' AND deployment.environment = 'production')`,
+				`${SPAN_ATTRIBUTES.SERVER_NAME} = 'api.example.com' AND kind_string = 'Client' AND ${SPAN_ATTRIBUTES.HTTP_URL} EXISTS service.name = 'user-service' AND deployment.environment = 'production'`,
 			);
 		});
 	});

frontend/src/container/ApiMonitoring/__tests__/FilterProviders.tsx

@@ -1,34 +0,0 @@
-import { ReactNode } from 'react';
-import { QuerySearchV2Provider } from 'components/QueryBuilderV2';
-import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
-import { onNuqsUrlUpdate } from 'tests/nuqs-helpers';
-
-/** Mounts a drawer tab's filter provider over an in-memory URL. */
-export function FilterProviders({
-	queryParamKey,
-	initialExpression,
-	searchParams = '',
-	children,
-}: {
-	queryParamKey: string;
-	initialExpression?: string;
-	searchParams?: string;
-	children: ReactNode;
-}): JSX.Element {
-	return (
-		<NuqsTestingAdapter
-			searchParams={searchParams}
-			onUrlUpdate={onNuqsUrlUpdate}
-			rateLimitFactor={0}
-			hasMemory
-		>
-			<QuerySearchV2Provider
-				queryParamKey={queryParamKey}
-				initialExpression={initialExpression}
-				persistOnUnmount
-			>
-				{children}
-			</QuerySearchV2Provider>
-		</NuqsTestingAdapter>
-	);
-}

frontend/src/container/ApiMonitoring/__tests__/MetricOverTimeV5Migration.test.tsx

@@ -2,11 +2,16 @@ import {
 	getLatencyOverTimeWidgetData,
 	getRateOverTimeWidgetData,
 } from 'container/ApiMonitoring/utils';
+import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 describe('MetricOverTime - V5 Migration Validation', () => {
 	const mockDomainName = 'api.example.com';
 	const mockEndpointName = '/api/users';
-	const emptyFilters = '';
+	const emptyFilters: IBuilderQuery['filters'] = {
+		items: [],
+		op: 'AND',
+	};
 
 	describe('1. Rate Over Time - V5 Payload Structure', () => {
 		it('generates V5 filter expression format (not V3 filters.items)', () => {
@@ -46,8 +51,31 @@ describe('MetricOverTime - V5 Migration Validation', () => {
 		});
 
 		it('merges custom filters into filter expression', () => {
-			const customFilters =
-				"service.name = 'user-service' AND deployment.environment = 'production'";
+			const customFilters: IBuilderQuery['filters'] = {
+				items: [
+					{
+						id: 'test-1',
+						key: {
+							key: 'service.name',
+							dataType: DataTypes.String,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'user-service',
+					},
+					{
+						id: 'test-2',
+						key: {
+							key: 'deployment.environment',
+							dataType: DataTypes.String,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'production',
+					},
+				],
+				op: 'AND',
+			};
 
 			const widget = getRateOverTimeWidgetData(
 				mockDomainName,
@@ -109,8 +137,21 @@ describe('MetricOverTime - V5 Migration Validation', () => {
 		});
 
 		it('merges custom filters into filter expression', () => {
-			const customFilters =
-				"service.name = 'user-service' AND deployment.environment = 'production'";
+			const customFilters: IBuilderQuery['filters'] = {
+				items: [
+					{
+						id: 'test-1',
+						key: {
+							key: 'service.name',
+							dataType: DataTypes.String,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'user-service',
+					},
+				],
+				op: 'AND',
+			};
 
 			const widget = getLatencyOverTimeWidgetData(
 				mockDomainName,
@@ -122,7 +163,7 @@ describe('MetricOverTime - V5 Migration Validation', () => {
 
 			// Verify domain filter is present
 			expect(queryData?.filter?.expression).toContain(
-				`http_host = '${mockDomainName}' AND (service.name = 'user-service'`,
+				`http_host = '${mockDomainName}' service.name = 'user-service'`,
 			);
 		});
 	});

frontend/src/container/ApiMonitoring/__tests__/StatusCodeBarCharts.test.tsx

@@ -5,6 +5,7 @@ import {
 	getStatusCodeBarChartWidgetData,
 } from 'container/ApiMonitoring/utils';
 import { SuccessResponse } from 'types/api';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 import ErrorState from '../Explorer/Domains/DomainDetails/components/ErrorState';
 import StatusCodeBarCharts from '../Explorer/Domains/DomainDetails/components/StatusCodeBarCharts';
@@ -155,6 +156,7 @@ jest.mock('antd', () => {
 
 describe('StatusCodeBarCharts', () => {
 	// Default props for tests
+	const mockFilters: IBuilderQuery['filters'] = { items: [], op: 'AND' };
 	const mockTimeRange = {
 		startTime: 1609459200000,
 		endTime: 1609545600000,
@@ -249,7 +251,7 @@ describe('StatusCodeBarCharts', () => {
 				endPointStatusCodeBarChartsDataQuery={mockStatusCodeQuery as any}
 				endPointStatusCodeLatencyBarChartsDataQuery={mockLatencyQuery as any}
 				domainName={mockDomainName}
-				filterExpression=""
+				filters={mockFilters}
 				timeRange={mockTimeRange}
 				onDragSelect={onDragSelectMock}
 			/>,
@@ -284,7 +286,7 @@ describe('StatusCodeBarCharts', () => {
 				endPointStatusCodeBarChartsDataQuery={mockStatusCodeQuery as any}
 				endPointStatusCodeLatencyBarChartsDataQuery={mockLatencyQuery as any}
 				domainName={mockDomainName}
-				filterExpression=""
+				filters={mockFilters}
 				timeRange={mockTimeRange}
 				onDragSelect={onDragSelectMock}
 			/>,
@@ -326,7 +328,7 @@ describe('StatusCodeBarCharts', () => {
 				endPointStatusCodeBarChartsDataQuery={mockStatusCodeQuery as any}
 				endPointStatusCodeLatencyBarChartsDataQuery={mockLatencyQuery as any}
 				domainName={mockDomainName}
-				filterExpression=""
+				filters={mockFilters}
 				timeRange={mockTimeRange}
 				onDragSelect={onDragSelectMock}
 			/>,
@@ -370,7 +372,7 @@ describe('StatusCodeBarCharts', () => {
 				endPointStatusCodeBarChartsDataQuery={mockStatusCodeQuery as any}
 				endPointStatusCodeLatencyBarChartsDataQuery={mockLatencyQuery as any}
 				domainName={mockDomainName}
-				filterExpression=""
+				filters={mockFilters}
 				timeRange={mockTimeRange}
 				onDragSelect={onDragSelectMock}
 			/>,
@@ -417,7 +419,7 @@ describe('StatusCodeBarCharts', () => {
 				endPointStatusCodeBarChartsDataQuery={mockStatusCodeQuery as any}
 				endPointStatusCodeLatencyBarChartsDataQuery={mockLatencyQuery as any}
 				domainName={mockDomainName}
-				filterExpression=""
+				filters={mockFilters}
 				timeRange={mockTimeRange}
 				onDragSelect={onDragSelectMock}
 			/>,
@@ -431,13 +433,26 @@ describe('StatusCodeBarCharts', () => {
 		// but we've confirmed the function is mocked and ready to be tested
 		expect(getStatusCodeBarChartWidgetData).toHaveBeenCalledWith(
 			mockDomainName,
-			'',
+			expect.objectContaining({
+				items: [],
+				op: 'AND',
+			}),
 		);
 	});
 
 	it('handles widget generation with current filters', () => {
 		// Arrange
-		const mockCustomFilterExpression = "test-key = 'test-value'";
+		const mockCustomFilters = {
+			items: [
+				{
+					id: 'custom-filter',
+					key: { key: 'test-key' },
+					op: '=',
+					value: 'test-value',
+				},
+			],
+			op: 'AND',
+		};
 
 		const mockData = {
 			payload: mockFormattedData,
@@ -465,7 +480,7 @@ describe('StatusCodeBarCharts', () => {
 				endPointStatusCodeBarChartsDataQuery={mockStatusCodeQuery as any}
 				endPointStatusCodeLatencyBarChartsDataQuery={mockLatencyQuery as any}
 				domainName={mockDomainName}
-				filterExpression={mockCustomFilterExpression}
+				filters={mockCustomFilters as IBuilderQuery['filters']}
 				timeRange={mockTimeRange}
 				onDragSelect={onDragSelectMock}
 			/>,
@@ -474,7 +489,12 @@ describe('StatusCodeBarCharts', () => {
 		// Assert widget creation was called with the correct parameters
 		expect(getStatusCodeBarChartWidgetData).toHaveBeenCalledWith(
 			mockDomainName,
-			mockCustomFilterExpression,
+			expect.objectContaining({
+				items: expect.arrayContaining([
+					expect.objectContaining({ id: 'custom-filter' }),
+				]),
+				op: 'AND',
+			}),
 		);
 	});
 });

frontend/src/container/ApiMonitoring/__tests__/StatusCodeBarChartsV5Migration.test.tsx

@@ -2,7 +2,7 @@
  * V5 Migration Tests for Status Code Bar Chart Queries
  *
  * These tests validate the migration to V5 format for the bar chart payloads
- * in getEndPointDetailsQueryPayload (4th and 5th payloads):
+ * in getEndPointDetailsQueryPayload (5th and 6th payloads):
  * - Number of Calls Chart (count aggregation)
  * - Latency Chart (p99 aggregation)
  *
@@ -15,12 +15,16 @@
  */
 import { TraceAggregation } from 'api/v5/v5';
 import { getEndPointDetailsQueryPayload } from 'container/ApiMonitoring/utils';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 describe('StatusCodeBarCharts - V5 Migration Validation', () => {
 	const mockDomainName = '0.0.0.0';
 	const mockStartTime = 1762573673000;
 	const mockEndTime = 1762832873000;
-	const emptyFilters = '';
+	const emptyFilters: IBuilderQuery['filters'] = {
+		items: [],
+		op: 'AND',
+	};
 
 	describe('1. Number of Calls Chart - V5 Payload Structure', () => {
 		it('generates correct V5 payload for count aggregation grouped by status code', () => {
@@ -31,8 +35,8 @@ describe('StatusCodeBarCharts - V5 Migration Validation', () => {
 				emptyFilters,
 			);
 
-			// 4th payload (index 3) is the number of calls bar chart
-			const callsChartQuery = payload[3];
+			// 5th payload (index 4) is the number of calls bar chart
+			const callsChartQuery = payload[4];
 			const queryA = callsChartQuery.query.builder.queryData[0];
 
 			// V5 format: filter.expression (not filters.items)
@@ -80,8 +84,8 @@ describe('StatusCodeBarCharts - V5 Migration Validation', () => {
 				emptyFilters,
 			);
 
-			// 5th payload (index 4) is the latency bar chart
-			const latencyChartQuery = payload[4];
+			// 6th payload (index 5) is the latency bar chart
+			const latencyChartQuery = payload[5];
 			const queryA = latencyChartQuery.query.builder.queryData[0];
 
 			// V5 format: filter.expression (not filters.items)
@@ -126,8 +130,31 @@ describe('StatusCodeBarCharts - V5 Migration Validation', () => {
 
 	describe('3. Custom Filters Integration', () => {
 		it('merges custom filters into filter expression for both charts', () => {
-			const customFilters =
-				"service.name = 'user-service' AND deployment.environment = 'production'";
+			const customFilters: IBuilderQuery['filters'] = {
+				items: [
+					{
+						id: 'test-1',
+						key: {
+							key: 'service.name',
+							dataType: 'string' as any,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'user-service',
+					},
+					{
+						id: 'test-2',
+						key: {
+							key: 'deployment.environment',
+							dataType: 'string' as any,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'production',
+					},
+				],
+				op: 'AND',
+			};
 
 			const payload = getEndPointDetailsQueryPayload(
 				mockDomainName,
@@ -136,8 +163,8 @@ describe('StatusCodeBarCharts - V5 Migration Validation', () => {
 				customFilters,
 			);
 
-			const callsChartQuery = payload[3];
-			const latencyChartQuery = payload[4];
+			const callsChartQuery = payload[4];
+			const latencyChartQuery = payload[5];
 
 			const callsExpression =
 				callsChartQuery.query.builder.queryData[0].filter?.expression;

frontend/src/container/ApiMonitoring/__tests__/StatusCodeTableV5Migration.test.tsx

@@ -13,12 +13,16 @@
  */
 import { TraceAggregation } from 'api/v5/v5';
 import { getEndPointDetailsQueryPayload } from 'container/ApiMonitoring/utils';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 describe('StatusCodeTable - V5 Migration Validation', () => {
 	const mockDomainName = 'api.example.com';
 	const mockStartTime = 1000;
 	const mockEndTime = 2000;
-	const emptyFilters = '';
+	const emptyFilters: IBuilderQuery['filters'] = {
+		items: [],
+		op: 'AND',
+	};
 
 	describe('1. V5 Format Migration with Base Filters', () => {
 		it('migrates to V5 format with correct filter expression structure and base filters', () => {
@@ -105,8 +109,31 @@ describe('StatusCodeTable - V5 Migration Validation', () => {
 
 	describe('3. Custom Filters Integration', () => {
 		it('merges custom filters into filter expression with AND logic', () => {
-			const customFilters =
-				"service.name = 'user-service' AND deployment.environment = 'production'";
+			const customFilters: IBuilderQuery['filters'] = {
+				items: [
+					{
+						id: 'test-1',
+						key: {
+							key: 'service.name',
+							dataType: 'string' as any,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'user-service',
+					},
+					{
+						id: 'test-2',
+						key: {
+							key: 'deployment.environment',
+							dataType: 'string' as any,
+							type: 'resource',
+						},
+						op: '=',
+						value: 'production',
+					},
+				],
+				op: 'AND',
+			};
 
 			const payload = getEndPointDetailsQueryPayload(
 				mockDomainName,

frontend/src/container/ApiMonitoring/__tests__/TopErrors.test.tsx

@@ -1,40 +1,31 @@
 import { BuilderQuery } from 'api/v5/v5';
 import { useNavigateToExplorer } from 'components/CeleryTask/useNavigateToExplorer';
 import { rest, server } from 'mocks-server/server';
-import {
-	fireEvent,
-	render,
-	screen,
-	userEvent,
-	waitFor,
-	within,
-} from 'tests/test-utils';
+import { fireEvent, render, screen, waitFor, within } from 'tests/test-utils';
 import { DataSource } from 'types/common/queryBuilder';
 
 import { SPAN_ATTRIBUTES } from '../Explorer/Domains/DomainDetails/constants';
 import TopErrors from '../Explorer/Domains/DomainDetails/TopErrors';
 import { getTopErrorsQueryPayload } from '../utils';
 
-interface QueryRangeRequestBody {
-	compositeQuery: { queries: { spec: { filter: { expression: string } } }[] };
-}
-
-// Mock the EndPointPicker component to avoid issues
+// Mock the EndPointsDropDown component to avoid issues
 jest.mock(
-	'../Explorer/Domains/DomainDetails/components/EndPointPicker',
+	'../Explorer/Domains/DomainDetails/components/EndPointsDropDown',
 	() => ({
 		__esModule: true,
-		default: jest.fn().mockImplementation(({ onChange }): JSX.Element => (
-			<div data-testid="endpoints-dropdown-mock">
-				<select
-					data-testid="endpoints-select"
-					onChange={(e): void => onChange(e.target.value)}
-				>
-					<option value="/api/test">/api/test</option>
-					<option value="/api/new-endpoint">/api/new-endpoint</option>
-				</select>
-			</div>
-		)),
+		default: jest
+			.fn()
+			.mockImplementation(({ setSelectedEndPointName }): JSX.Element => (
+				<div data-testid="endpoints-dropdown-mock">
+					<select
+						data-testid="endpoints-select"
+						onChange={(e): void => setSelectedEndPointName(e.target.value)}
+					>
+						<option value="/api/test">/api/test</option>
+						<option value="/api/new-endpoint">/api/new-endpoint</option>
+					</select>
+				</div>
+			)),
 	}),
 );
 
@@ -52,7 +43,10 @@ describe('TopErrors', () => {
 			startTime: 1000000000,
 			endTime: 1000010000,
 		},
-		initialFilterExpression: '',
+		initialFilters: {
+			items: [],
+			op: 'AND',
+		},
 	};
 
 	// Helper function to wait for table data to load
@@ -233,30 +227,22 @@ describe('TopErrors', () => {
 		});
 	});
 
-	it('scopes the query to the endpoint picked in the picker', async () => {
-		const user = userEvent.setup({ delay: null, pointerEventsCheck: 0 });
-		const expressions: string[] = [];
-		server.use(
-			rest.post(V5_QUERY_RANGE_API_PATH, async (req) => {
-				const body: QueryRangeRequestBody = await req.json();
-				expressions.push(body.compositeQuery.queries[0].spec.filter.expression);
-			}),
-		);
-
+	it('updates endpoint filter when dropdown value changes', async () => {
 		render(<TopErrors {...mockProps} />);
-		await waitFor(() => expect(expressions).toHaveLength(1));
-		expect(expressions[0]).not.toContain(`${SPAN_ATTRIBUTES.HTTP_URL} =`);
-
-		await user.selectOptions(
-			screen.getByTestId('endpoints-select'),
-			'/api/new-endpoint',
-		);
 
+		// Wait for initial load
 		await waitFor(() => {
-			expect(expressions[expressions.length - 1]).toContain(
-				`${SPAN_ATTRIBUTES.HTTP_URL} = '/api/new-endpoint'`,
-			);
+			expect(screen.getByRole('combobox')).toBeInTheDocument();
 		});
+
+		// Find the dropdown
+		const dropdown = screen.getByRole('combobox');
+
+		// Mock the change
+		fireEvent.change(dropdown, { target: { value: '/api/new-endpoint' } });
+
+		// Component should re-render with new filter
+		expect(dropdown).toBeInTheDocument();
 	});
 
 	it('handles status message toggle correctly', async () => {
@@ -320,7 +306,7 @@ describe('TopErrors', () => {
 			'test-domain',
 			mockProps.timeRange.startTime,
 			mockProps.timeRange.endTime,
-			'',
+			{ items: [], op: 'AND' },
 			false,
 		);
 

frontend/src/container/ApiMonitoring/__tests__/queryParams.test.tsx

@@ -2,7 +2,6 @@ import {
 	ApiMonitoringParams,
 	DEFAULT_PARAMS,
 	getApiMonitoringParams,
-	getLegacyFilterExpressions,
 	setApiMonitoringParams,
 } from 'container/ApiMonitoring/queryParams';
 import { mockNavigate } from 'tests/router-mocks';
@@ -53,50 +52,6 @@ describe('API Monitoring Query Params', () => {
 
 			expect(getApiMonitoringParams(search)).toStrictEqual(DEFAULT_PARAMS);
 		});
-
-		it('converts filter items saved by older links into an expression', () => {
-			const legacyParams = {
-				selectedDomain: 'test-domain',
-				allEndpointsLocalFilters: {
-					op: 'AND',
-					items: [
-						{
-							id: 'a',
-							key: { key: 'service.name', dataType: 'string', type: 'resource' },
-							op: '=',
-							value: 'frontend',
-						},
-					],
-				},
-				endPointDetailsLocalFilters: {
-					op: 'AND',
-					items: [
-						{
-							id: 'b',
-							key: { key: 'http.status_code', dataType: 'string', type: '' },
-							op: '=',
-							value: '500',
-						},
-					],
-				},
-			};
-			const urlParams = new URLSearchParams();
-			urlParams.set(
-				'apiMonitoringParams',
-				encodeURIComponent(JSON.stringify(legacyParams)),
-			);
-
-			const search = `?${urlParams.toString()}`;
-
-			expect(getLegacyFilterExpressions(search)).toStrictEqual({
-				allEndpoints: "service.name = 'frontend'",
-				endPointDetails: "http.status_code = '500'",
-			});
-			const result = getApiMonitoringParams(search);
-			expect(result.selectedDomain).toBe('test-domain');
-			expect(result).not.toHaveProperty('allEndpointsLocalFilters');
-			expect(result).not.toHaveProperty('endPointDetailsLocalFilters');
-		});
 	});
 
 	describe('setApiMonitoringParams', () => {

frontend/src/container/ApiMonitoring/__tests__/useApiMonitoringParams.test.tsx

@@ -1,65 +0,0 @@
-import { ALL_ENDPOINTS_EXPRESSION_KEY } from 'container/ApiMonitoring/filterParamKeys';
-import {
-	getApiMonitoringParams,
-	useApiMonitoringParams,
-} from 'container/ApiMonitoring/queryParams';
-import { mockAppLocation, mockNavigate } from 'tests/router-mocks';
-import { act, renderHook } from 'tests/test-utils';
-
-// The stub writes to the browser URL, which the hook reads back; the router's
-// own location (`useAppLocation`) stays at its first value.
-function renderParamsHook(): ReturnType<
-	typeof renderHook<ReturnType<typeof useApiMonitoringParams>, unknown>
-> {
-	mockNavigate().mockImplementation((to) => {
-		const url = typeof to === 'string' ? to : `/${to.search ?? ''}`;
-		window.history.pushState(null, '', url);
-	});
-	mockAppLocation();
-	return renderHook(() => useApiMonitoringParams());
-}
-
-describe('useApiMonitoringParams', () => {
-	beforeEach(() => {
-		window.history.replaceState(null, '', '/');
-	});
-
-	it('keeps every write made before the next render', () => {
-		const { result } = renderParamsHook();
-
-		act(() => {
-			const [, setParams] = result.current;
-			setParams({ selectedView: 'endpoint_stats' });
-			setParams({ selectedInterval: '15m' });
-		});
-
-		expect(getApiMonitoringParams(window.location.search)).toMatchObject({
-			selectedView: 'endpoint_stats',
-			selectedInterval: '15m',
-		});
-	});
-
-	it('keeps a drawer filter written outside the router', () => {
-		window.history.replaceState(
-			null,
-			'',
-			`/?${ALL_ENDPOINTS_EXPRESSION_KEY}=${encodeURIComponent(
-				"service.name = 'cart'",
-			)}`,
-		);
-		const { result } = renderParamsHook();
-
-		act(() => {
-			const [, setParams] = result.current;
-			setParams({ selectedView: 'endpoint_stats' });
-		});
-
-		const search = new URLSearchParams(window.location.search);
-		expect(search.get(ALL_ENDPOINTS_EXPRESSION_KEY)).toBe(
-			"service.name = 'cart'",
-		);
-		expect(getApiMonitoringParams(window.location.search).selectedView).toBe(
-			'endpoint_stats',
-		);
-	});
-});

frontend/src/container/ApiMonitoring/filterParamKeys.ts

@@ -1,5 +0,0 @@
-// The drawer filters live in their own URL params, owned by `QuerySearchV2Provider`.
-export const ALL_ENDPOINTS_EXPRESSION_KEY =
-	'apiMonitoringAllEndpointsExpression';
-export const ENDPOINT_STATS_EXPRESSION_KEY =
-	'apiMonitoringEndpointStatsExpression';

frontend/src/container/ApiMonitoring/queryParams.ts

@@ -1,10 +1,6 @@
 import { useCallback } from 'react';
-import { convertFiltersToExpression } from 'components/QueryBuilderV2/utils';
-import { navigate } from 'lib/router/navigation';
 import { useAppLocation } from 'lib/router/useAppLocation';
-import { omit } from 'lodash-es';
-import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
-import { getUnstableCurrentSearchParams } from 'utils/getUnstableCurrentSearchParams';
+import { navigate } from 'lib/router/navigation';
 
 // --- Types for all API Monitoring query params ---
 export interface ApiMonitoringParams {
@@ -13,6 +9,8 @@ export interface ApiMonitoringParams {
 	selectedView?: string;
 	selectedEndPointName?: string;
 	groupBy?: string[];
+	allEndpointsLocalFilters?: any;
+	endPointDetailsLocalFilters?: any;
 	modalTimeRange?: { startTime: number; endTime: number };
 	selectedInterval?: string;
 	// Add more params as needed
@@ -24,6 +22,8 @@ export const DEFAULT_PARAMS: ApiMonitoringParams = {
 	selectedView: 'all_endpoints',
 	selectedEndPointName: '',
 	groupBy: [],
+	allEndpointsLocalFilters: undefined,
+	endPointDetailsLocalFilters: undefined,
 	modalTimeRange: undefined,
 	selectedInterval: undefined,
 };
@@ -35,50 +35,15 @@ function encodeParams(params: ApiMonitoringParams): string {
 	return encodeURIComponent(JSON.stringify(params));
 }
 
-// Older shared links carry the filters as TagFilter items.
-type LegacyApiMonitoringParams = ApiMonitoringParams & {
-	allEndpointsLocalFilters?: TagFilter;
-	endPointDetailsLocalFilters?: TagFilter;
-};
-
-function parseParams(value: string | null): LegacyApiMonitoringParams | null {
+function decodeParams(value: string | null): ApiMonitoringParams {
 	if (!value) {
-		return null;
+		return DEFAULT_PARAMS;
 	}
 	try {
 		return JSON.parse(decodeURIComponent(value));
 	} catch {
-		return null;
-	}
-}
-
-// Drops the legacy filters, so the next write leaves them out of the URL.
-function decodeParams(value: string | null): ApiMonitoringParams {
-	const parsed = parseParams(value);
-	if (!parsed) {
 		return DEFAULT_PARAMS;
 	}
-	return omit(parsed, [
-		'allEndpointsLocalFilters',
-		'endPointDetailsLocalFilters',
-	]);
-}
-
-export interface LegacyFilterExpressions {
-	allEndpoints?: string;
-	endPointDetails?: string;
-}
-
-export function getLegacyFilterExpressions(
-	search: string,
-): LegacyFilterExpressions {
-	const parsed = parseParams(new URLSearchParams(search).get(PARAM_KEY));
-	const toExpression = (filters?: TagFilter): string | undefined =>
-		filters ? convertFiltersToExpression(filters).expression : undefined;
-	return {
-		allEndpoints: toExpression(parsed?.allEndpointsLocalFilters),
-		endPointDetails: toExpression(parsed?.endPointDetailsLocalFilters),
-	};
 }
 
 // --- Read query params from URL ---
@@ -109,18 +74,11 @@ export function useApiMonitoringParams(): [
 	const location = useAppLocation();
 	const params = getApiMonitoringParams(location.search);
 
-	// Read the browser's URL, not the router's: several writes can land before
-	// the next render, and the drawer filters are written by nuqs, which the
-	// router's location does not see.
 	const setParams = useCallback(
 		(newParams: Partial<ApiMonitoringParams>, replace = false) => {
-			setApiMonitoringParams(
-				newParams,
-				`?${getUnstableCurrentSearchParams().toString()}`,
-				replace,
-			);
+			setApiMonitoringParams(newParams, location.search, replace);
 		},
-		[],
+		[location.search],
 	);
 
 	return [params, setParams];

frontend/src/container/ApiMonitoring/utils.tsx

@@ -3,8 +3,7 @@ import { Color } from '@signozhq/design-tokens';
 import { TableColumnType as ColumnType, Tooltip } from 'antd';
 import { Progress } from '@signozhq/ui/progress';
 import { Badge } from '@signozhq/ui/badge';
-import { combineInitialAndUserExpression } from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
-import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
+import { convertFiltersToExpressionWithExistingQuery } from 'components/QueryBuilderV2/utils';
 import {
 	FiltersType,
 	IQuickFiltersConfig,
@@ -57,28 +56,30 @@ export const getDisplayValue = (value: unknown): string =>
 	isEmptyFilterValue(value) ? '-' : String(value);
 
 export const getDomainNameFilterExpression = (domainName: string): string =>
-	`${SPAN_ATTRIBUTES.SERVER_NAME} = ${formatValueForExpression(domainName)}`;
+	`http_host = '${domainName}'`;
 
-export const clientKindExpression = "kind_string = 'Client'";
+export const clientKindExpression = `kind_string = 'Client'`;
 
-export const getHttpUrlExpression = (endPointName: string): string =>
-	endPointName
-		? `${SPAN_ATTRIBUTES.HTTP_URL} = ${formatValueForExpression(endPointName, '=')}`
-		: '';
+/**
+ * Converts filters to expression
+ * @param filters Filters to convert
+ * @param baseExpression Base expression to combine with filters
+ * @returns Filter expression string
+ */
+export const convertFiltersWithUrlHandling = (
+	filters: IBuilderQuery['filters'],
+	baseExpression: string,
+): string => {
+	if (!filters) {
+		return baseExpression;
+	}
 
-// The domain (and endpoint) the drawer is locked to, built from the same
-// expressions as the requests' filters so the chip shows what runs.
-export const getDomainScopeExpression = (
-	domainName: string,
-	endPointName = '',
-): string =>
-	[
-		clientKindExpression,
-		getDomainNameFilterExpression(domainName),
-		getHttpUrlExpression(endPointName),
-	]
-		.filter(Boolean)
-		.join(' AND ');
+	const { filter } = convertFiltersToExpressionWithExistingQuery(
+		filters,
+		baseExpression,
+	);
+	return filter.expression;
+};
 
 export const ApiMonitoringQuickFiltersConfig: IQuickFiltersConfig[] = [
 	{
@@ -346,7 +347,7 @@ export const getDomainMetricsQueryPayload = (
 	domainName: string,
 	start: number,
 	end: number,
-	filterExpression: string,
+	filters: IBuilderQuery['filters'],
 ): GetQueryResultsProps[] => [
 	{
 		selectedTime: 'GLOBAL_TIME',
@@ -367,9 +368,9 @@ export const getDomainMetricsQueryPayload = (
 						spaceAggregation: 'sum',
 						functions: [],
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(domainName)} AND ${urlExpression}`,
-								filterExpression,
 							),
 						},
 						expression: 'A',
@@ -395,9 +396,9 @@ export const getDomainMetricsQueryPayload = (
 						spaceAggregation: 'sum',
 						functions: [],
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(domainName)}`,
-								filterExpression,
 							),
 						},
 						expression: 'B',
@@ -423,9 +424,9 @@ export const getDomainMetricsQueryPayload = (
 						spaceAggregation: 'sum',
 						functions: [],
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(domainName)} AND has_error = true`,
-								filterExpression,
 							),
 						},
 						expression: 'C',
@@ -451,9 +452,9 @@ export const getDomainMetricsQueryPayload = (
 						spaceAggregation: 'sum',
 						functions: [],
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(domainName)}`,
-								filterExpression,
 							),
 						},
 						expression: 'D',
@@ -823,7 +824,7 @@ export const getEndPointsQueryPayload = (
 
 function buildFilterExpression(
 	domainName: string,
-	filterExpression: string,
+	filters: IBuilderQuery['filters'],
 	showStatusCodeErrors: boolean,
 ): string {
 	const baseFilterParts = [
@@ -835,22 +836,21 @@ function buildFilterExpression(
 	if (showStatusCodeErrors) {
 		baseFilterParts.push('status_message EXISTS');
 	}
-	return combineInitialAndUserExpression(
-		baseFilterParts.join(' AND '),
-		filterExpression,
-	);
+	const filterExpression = baseFilterParts.join(' AND ');
+
+	return convertFiltersWithUrlHandling(filters, filterExpression);
 }
 
 export const getTopErrorsQueryPayload = (
 	domainName: string,
 	start: number,
 	end: number,
-	filterExpression: string,
+	filters: IBuilderQuery['filters'],
 	showStatusCodeErrors = true,
 ): QueryRangePayloadV5 => {
-	const combinedExpression = buildFilterExpression(
+	const filterExpression = buildFilterExpression(
 		domainName,
-		filterExpression,
+		filters,
 		showStatusCodeErrors,
 	);
 
@@ -869,7 +869,7 @@ export const getTopErrorsQueryPayload = (
 						stepInterval: 60,
 						disabled: false,
 						aggregations: [{ expression: 'count()' }],
-						filter: { expression: combinedExpression },
+						filter: { expression: filterExpression },
 						groupBy: [
 							{
 								name: SPAN_ATTRIBUTES.HTTP_URL,
@@ -1367,14 +1367,15 @@ export const createFiltersForSelectedRowData = (
 
 // First query payload for endpoint metrics
 // Second query payload for endpoint status code table
-// Third query payload for endpoint dependant services
-// Fourth query payload for endpoint response status count bar chart
-// Fifth query payload for endpoint response status code latency bar chart
+// Third query payload for endpoint dropdown selection
+// Fourth query payload for endpoint dependant services
+// Fifth query payload for endpoint response status count bar chart
+// Sixth query payload for endpoint response status code latency bar chart
 export const getEndPointDetailsQueryPayload = (
 	domainName: string,
 	start: number,
 	end: number,
-	filterExpression: string,
+	filters: IBuilderQuery['filters'],
 ): GetQueryResultsProps[] => [
 	{
 		selectedTime: 'GLOBAL_TIME',
@@ -1393,11 +1394,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: false,
 						expression: 'A',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression}`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -1423,11 +1424,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: false,
 						expression: 'B',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression}`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -1453,11 +1454,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: true,
 						expression: 'C',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression} AND has_error = true`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -1483,11 +1484,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: false,
 						expression: 'D',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression}`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -1513,11 +1514,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: true,
 						expression: 'E',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression}`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -1585,11 +1586,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: false,
 						expression: 'A',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression} AND response_status_code EXISTS`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -1621,11 +1622,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: false,
 						expression: 'B',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression} AND response_status_code EXISTS`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -1659,11 +1660,11 @@ export const getEndPointDetailsQueryPayload = (
 						spaceAggregation: 'sum',
 						functions: [],
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression} AND response_status_code EXISTS`,
-								filterExpression,
 							),
 						},
 						expression: 'C',
@@ -1712,6 +1713,77 @@ export const getEndPointDetailsQueryPayload = (
 		end,
 		step: 60,
 	},
+	{
+		selectedTime: 'GLOBAL_TIME',
+		graphType: PANEL_TYPES.TABLE,
+		query: {
+			builder: {
+				queryData: [
+					{
+						dataSource: DataSource.TRACES,
+						queryName: 'A',
+						aggregateOperator: 'count',
+						aggregations: [
+							{
+								expression: 'count()',
+							},
+						],
+						timeAggregation: 'count',
+						spaceAggregation: 'sum',
+						functions: [],
+						filter: {
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
+								`${getDomainNameFilterExpression(
+									domainName,
+								)} AND ${clientKindExpression} AND ${SPAN_ATTRIBUTES.HTTP_URL} EXISTS`,
+							),
+						},
+						expression: 'A',
+						disabled: false,
+						stepInterval: null,
+						having: [],
+						legend: '',
+						limit: null,
+						orderBy: [],
+						groupBy: [
+							{
+								key: SPAN_ATTRIBUTES.HTTP_URL,
+								dataType: DataTypes.String,
+								type: 'attribute',
+							},
+						],
+						reduceTo: ReduceOperators.AVG,
+					},
+				],
+				queryFormulas: [],
+				queryTraceOperator: [],
+			},
+			clickhouse_sql: [
+				{
+					disabled: false,
+					legend: '',
+					name: 'A',
+					query: '',
+				},
+			],
+			id: '315b15fa-ff0c-442f-89f8-2bf4fb1af2f2',
+			promql: [
+				{
+					disabled: false,
+					legend: '',
+					name: 'A',
+					query: '',
+				},
+			],
+			queryType: EQueryType.QUERY_BUILDER,
+		},
+		variables: {},
+		formatForWeb: true,
+		start,
+		end,
+		step: 60,
+	},
 	{
 		selectedTime: 'GLOBAL_TIME',
 		graphType: PANEL_TYPES.TABLE,
@@ -1729,11 +1801,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: false,
 						expression: 'A',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression}`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -1766,11 +1838,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: false,
 						expression: 'B',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression}`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -1803,11 +1875,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: false,
 						expression: 'C',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression}`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -1840,11 +1912,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: true,
 						expression: 'D',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression} AND has_error = true`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -1919,11 +1991,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: false,
 						expression: 'A',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression}`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -1990,11 +2062,11 @@ export const getEndPointDetailsQueryPayload = (
 						disabled: false,
 						expression: 'A',
 						filter: {
-							expression: combineInitialAndUserExpression(
+							expression: convertFiltersWithUrlHandling(
+								filters || { items: [], op: 'AND' },
 								`${getDomainNameFilterExpression(
 									domainName,
 								)} AND ${clientKindExpression}`,
-								filterExpression,
 							),
 						},
 						functions: [],
@@ -2046,82 +2118,100 @@ export const getEndPointDetailsQueryPayload = (
 	},
 ];
 
-export const getEndPointDropDownQueryPayload = (
+export const getEndPointZeroStateQueryPayload = (
 	domainName: string,
 	start: number,
 	end: number,
-	filterExpression: string,
-): GetQueryResultsProps => ({
-	selectedTime: 'GLOBAL_TIME',
-	graphType: PANEL_TYPES.TABLE,
-	query: {
-		builder: {
-			queryData: [
-				{
-					dataSource: DataSource.TRACES,
-					queryName: 'A',
-					aggregateOperator: 'count',
-					aggregations: [
-						{
-							expression: 'count()',
-						},
-					],
-					timeAggregation: 'count',
-					spaceAggregation: 'sum',
-					functions: [],
-					filter: {
-						expression: combineInitialAndUserExpression(
-							`${getDomainNameFilterExpression(
-								domainName,
-							)} AND ${clientKindExpression} AND ${SPAN_ATTRIBUTES.HTTP_URL} EXISTS`,
-							filterExpression,
-						),
-					},
-					expression: 'A',
-					disabled: false,
-					stepInterval: null,
-					having: [],
-					legend: '',
-					limit: null,
-					orderBy: [],
-					groupBy: [
-						{
-							key: SPAN_ATTRIBUTES.HTTP_URL,
+): GetQueryResultsProps[] => [
+	{
+		selectedTime: 'GLOBAL_TIME',
+		graphType: PANEL_TYPES.TABLE,
+		query: {
+			builder: {
+				queryData: [
+					{
+						dataSource: DataSource.TRACES,
+						queryName: 'A',
+						aggregateOperator: 'count',
+						aggregateAttribute: {
 							dataType: DataTypes.String,
-							type: 'attribute',
+							key: '',
+							type: '',
 						},
-					],
-					reduceTo: ReduceOperators.AVG,
+						timeAggregation: 'count',
+						spaceAggregation: 'sum',
+						functions: [],
+						filters: {
+							items: [
+								{
+									id: '3db61dd6',
+									key: {
+										key: SPAN_ATTRIBUTES.SERVER_NAME,
+										dataType: DataTypes.String,
+										type: '',
+									},
+									op: '=',
+									value: domainName,
+								},
+								{
+									id: '212678b9',
+									key: {
+										key: 'kind_string',
+										dataType: DataTypes.String,
+										type: '',
+									},
+									op: '=',
+									value: 'Client',
+								},
+							],
+							op: 'AND',
+						},
+						expression: 'A',
+						disabled: false,
+						stepInterval: 60,
+						having: [],
+						legend: '',
+						limit: null,
+						orderBy: [],
+						groupBy: [
+							{
+								key: SPAN_ATTRIBUTES.HTTP_URL,
+								dataType: DataTypes.String,
+								type: 'tag',
+							},
+						],
+						reduceTo: ReduceOperators.AVG,
+					},
+				],
+				queryFormulas: [],
+				queryTraceOperator: [],
+			},
+			clickhouse_sql: [
+				{
+					disabled: false,
+					legend: '',
+					name: 'A',
+					query: '',
 				},
 			],
-			queryFormulas: [],
-			queryTraceOperator: [],
+			id: '315b15fa-ff0c-442f-89f8-2bf4fb1af2f2',
+			promql: [
+				{
+					disabled: false,
+					legend: '',
+					name: 'A',
+					query: '',
+				},
+			],
+			queryType: EQueryType.QUERY_BUILDER,
 		},
-		clickhouse_sql: [
-			{
-				disabled: false,
-				legend: '',
-				name: 'A',
-				query: '',
-			},
-		],
-		id: '315b15fa-ff0c-442f-89f8-2bf4fb1af2f2',
-		promql: [
-			{
-				disabled: false,
-				legend: '',
-				name: 'A',
-				query: '',
-			},
-		],
-		queryType: EQueryType.QUERY_BUILDER,
+		variables: {},
+		formatForWeb: true,
+		start,
+		end,
+		step: 60,
 	},
-	variables: {},
-	formatForWeb: true,
-	start,
-	end,
-	step: 60,
-});
+];
 
 interface EndPointMetricsResponseRow {
 	data: {
@@ -2279,8 +2369,8 @@ export const statusCodeWidgetInfo = [
 
 interface EndPointDropDownResponseRow {
 	data: {
-		[SPAN_ATTRIBUTES.HTTP_URL]?: string;
-		A?: number;
+		[SPAN_ATTRIBUTES.HTTP_URL]: string;
+		A: number;
 	};
 }
 
@@ -2622,7 +2712,7 @@ export const groupStatusCodes = (
 
 export const getStatusCodeBarChartWidgetData = (
 	domainName: string,
-	filterExpression: string,
+	filters: IBuilderQuery['filters'],
 ): Widgets => ({
 	query: {
 		builder: {
@@ -2638,13 +2728,22 @@ export const getStatusCodeBarChartWidgetData = (
 					dataSource: DataSource.TRACES,
 					disabled: false,
 					expression: 'A',
-					filter: {
-						expression: combineInitialAndUserExpression(
-							getDomainNameFilterExpression(domainName),
-							filterExpression,
-						),
+					filters: {
+						items: [
+							{
+								id: 'c6724407',
+								key: {
+									dataType: DataTypes.String,
+									key: SPAN_ATTRIBUTES.SERVER_NAME,
+									type: '',
+								},
+								op: '=',
+								value: domainName,
+							},
+							...(filters?.items || []),
+						],
+						op: 'AND',
 					},
-					filters: { items: [], op: 'AND' },
 					functions: [],
 					groupBy: [],
 					having: [],
@@ -2725,15 +2824,18 @@ export const getFormattedEndPointStatusCodeChartData = (
 export const END_POINT_DETAILS_QUERY_KEYS_ARRAY = [
 	REACT_QUERY_KEY.GET_ENDPOINT_METRICS_DATA,
 	REACT_QUERY_KEY.GET_ENDPOINT_STATUS_CODE_DATA,
+	REACT_QUERY_KEY.GET_ENDPOINT_DROPDOWN_DATA,
 	REACT_QUERY_KEY.GET_ENDPOINT_DEPENDENT_SERVICES_DATA,
 	REACT_QUERY_KEY.GET_ENDPOINT_STATUS_CODE_BAR_CHARTS_DATA,
 	REACT_QUERY_KEY.GET_ENDPOINT_STATUS_CODE_LATENCY_BAR_CHARTS_DATA,
+	REACT_QUERY_KEY.GET_ENDPOINT_RATE_OVER_TIME_DATA,
+	REACT_QUERY_KEY.GET_ENDPOINT_LATENCY_OVER_TIME_DATA,
 ];
 
 export const getAllEndpointsWidgetData = (
 	groupBy: BaseAutocompleteData[],
 	domainName: string,
-	filterExpression: string,
+	filters: IBuilderQuery['filters'],
 	// eslint-disable-next-line sonarjs/cognitive-complexity
 ): Widgets => {
 	const isGroupedByAttribute = groupBy.length > 0;
@@ -2755,11 +2857,11 @@ export const getAllEndpointsWidgetData = (
 					disabled: false,
 					expression: 'A',
 					filter: {
-						expression: combineInitialAndUserExpression(
+						expression: convertFiltersWithUrlHandling(
+							filters,
 							`${getDomainNameFilterExpression(
 								domainName,
 							)} AND ${clientKindExpression} AND http_url EXISTS`,
-							filterExpression,
 						),
 					},
 					functions: [],
@@ -2787,11 +2889,11 @@ export const getAllEndpointsWidgetData = (
 					disabled: false,
 					expression: 'B',
 					filter: {
-						expression: combineInitialAndUserExpression(
+						expression: convertFiltersWithUrlHandling(
+							filters,
 							`${getDomainNameFilterExpression(
 								domainName,
 							)} AND ${clientKindExpression} AND http_url EXISTS`,
-							filterExpression,
 						),
 					},
 					functions: [],
@@ -2819,11 +2921,11 @@ export const getAllEndpointsWidgetData = (
 					disabled: false,
 					expression: 'C',
 					filter: {
-						expression: combineInitialAndUserExpression(
+						expression: convertFiltersWithUrlHandling(
+							filters,
 							`${getDomainNameFilterExpression(
 								domainName,
 							)} AND ${clientKindExpression} AND http_url EXISTS`,
-							filterExpression,
 						),
 					},
 					functions: [],
@@ -2851,11 +2953,11 @@ export const getAllEndpointsWidgetData = (
 					disabled: true,
 					expression: 'D',
 					filter: {
-						expression: combineInitialAndUserExpression(
+						expression: convertFiltersWithUrlHandling(
+							filters,
 							`${getDomainNameFilterExpression(
 								domainName,
 							)} AND ${clientKindExpression} AND has_error = true AND http_url EXISTS`,
-							filterExpression,
 						),
 					},
 					functions: [],
@@ -2973,26 +3075,38 @@ export const getAllEndpointsWidgetData = (
 	return widget;
 };
 
-const keysToRemove = [SPAN_ATTRIBUTES.HTTP_URL, 'key', 'A', 'B', 'C', 'F1'];
+const keysToRemove = [SPAN_ATTRIBUTES.HTTP_URL, 'A', 'B', 'C', 'F1'];
 
-// A group without a value for a key is the set of spans missing that attribute.
-export const getGroupByExpressionFromRowData = (
-	rowData: Record<string, string | number | boolean | null | undefined>,
-): string =>
-	Object.keys(rowData)
+export const getGroupByFiltersFromGroupByValues = (
+	rowData: any,
+	groupBy: BaseAutocompleteData[],
+): IBuilderQuery['filters'] => {
+	const items = Object.keys(rowData)
 		.filter((key) => !keysToRemove.includes(key))
 		.map((key) => {
-			const value = rowData[key];
-			return value === null || value === undefined
-				? `${key} NOT EXISTS`
-				: `${key} = ${formatValueForExpression(value)}`;
-		})
-		.join(' AND ');
+			const groupByAttribute = groupBy.find((gb) => gb.key === key);
+			return {
+				id: groupByAttribute?.id || v4(),
+				key: {
+					dataType: groupByAttribute?.dataType || DataTypes.String,
+					key: groupByAttribute?.key || key,
+					type: groupByAttribute?.type || '',
+				},
+				op: '=', // operator for every attribute -> discuss
+				value: rowData[key],
+			};
+		});
+
+	return {
+		items,
+		op: 'AND',
+	};
+};
 
 export const getRateOverTimeWidgetData = (
 	domainName: string,
 	endPointName: string,
-	filterExpression: string,
+	filters: IBuilderQuery['filters'],
 ): Widgets => {
 	let legend = domainName;
 	if (endPointName) {
@@ -3016,9 +3130,9 @@ export const getRateOverTimeWidgetData = (
 					disabled: false,
 					expression: 'A',
 					filter: {
-						expression: combineInitialAndUserExpression(
+						expression: convertFiltersWithUrlHandling(
+							filters || { items: [], op: 'AND' },
 							`http_host = '${domainName}'`,
-							filterExpression,
 						),
 					},
 					functions: [],
@@ -3042,7 +3156,7 @@ export const getRateOverTimeWidgetData = (
 export const getLatencyOverTimeWidgetData = (
 	domainName: string,
 	endPointName: string,
-	filterExpression: string,
+	filters: IBuilderQuery['filters'],
 ): Widgets => {
 	let legend = domainName;
 	if (endPointName) {
@@ -3066,9 +3180,9 @@ export const getLatencyOverTimeWidgetData = (
 					disabled: false,
 					expression: 'A',
 					filter: {
-						expression: combineInitialAndUserExpression(
+						expression: convertFiltersWithUrlHandling(
+							filters || { items: [], op: 'AND' },
 							`http_host = '${domainName}'`,
-							filterExpression,
 						),
 					},
 					functions: [],

frontend/src/container/Home/AlertRules/useHomeAlertRules.ts

@@ -1,10 +1,12 @@
 import { useMemo } from 'react';
 import { useListRulesV3 } from 'api/generated/services/rules';
 import {
+	type ListRulesV3200,
 	type ListRulesV3Params,
 	RuletypesAlertStateDTO,
 	type RuletypesListableRuleDTO,
 } from 'api/generated/services/sigNoz.schemas';
+import { GeneratedAPIInstance } from 'api/generatedAPIInstance';
 
 const HOME_ALERT_RULES_LIMIT = 5;
 
@@ -21,7 +23,18 @@ interface HomeAlertRules {
 
 export function useHomeAlertRules(): HomeAlertRules {
 	const firing = useListRulesV3(FIRING_RULES_PARAMS, {
-		query: { cacheTime: 0 },
+		query: {
+			cacheTime: 0,
+			// The backend binds repeated `states=` keys; axios' default sends `states[]=`.
+			queryFn: ({ signal }) =>
+				GeneratedAPIInstance<ListRulesV3200>({
+					url: '/api/v3/rules',
+					method: 'GET',
+					params: FIRING_RULES_PARAMS,
+					paramsSerializer: { indexes: null },
+					signal,
+				}),
+		},
 	});
 	const firingRules = firing.data?.data.rules;
 	const latest = useListRulesV3(

frontend/src/container/ListAlertRules/ListAlertRules.module.scss

@@ -35,11 +35,11 @@
 
 	--tanstack-table-header-cell-bg: var(--l2-background);
 	--tanstack-table-header-cell-color: var(--l2-foreground);
-	--tanstack-table-cell-bg: var(--l1-background);
+	--tanstack-table-cell-bg: var(--l2-background);
 	--tanstack-table-cell-color: var(--l2-foreground);
-	--tanstack-table-row-hover-bg: var(--l1-background-hover);
-	--tanstack-table-row-active-bg: var(--l1-background-active);
-	--tanstack-table-resize-handle-bg: transparent;
+	--tanstack-table-row-hover-bg: var(--l2-background-hover);
+	--tanstack-table-row-active-bg: var(--l2-background-active);
+	--tanstack-table-resize-handle-bg: var(--l2-background);
 	--tanstack-table-resize-handle-hover-bg: var(--l2-border);
 	--tanstack-table-row-height: 42px;
 
@@ -48,6 +48,16 @@
 	--tanstack-cell-padding-left-override: 16px;
 	--tanstack-cell-padding-right-override: 16px;
 
+	--tanstack-table-row-odd-bg: color-mix(
+		in srgb,
+		var(--l1-foreground) 2%,
+		transparent
+	);
+	--tanstack-table-row-even-bg: color-mix(
+		in srgb,
+		var(--l1-foreground) 1%,
+		transparent
+	);
 	--badge-cursor: pointer;
 }
 

frontend/src/container/ListAlertRules/__tests__/ListAlertRules.views.test.tsx

@@ -31,8 +31,6 @@ jest.mock('@floating-ui/dom', () => ({
 		Promise.resolve({ x: 0, y: 0, placement, strategy, middlewareData: {} }),
 }));
 
-jest.setTimeout(15_000);
-
 const VIEW_1_ORDER_BY = JSON.stringify({ columnName: 'name', order: 'asc' });
 const VIEW_1_QUERY = "severity = 'critical'";
 

frontend/src/container/ListAlertRules/index.tsx

@@ -240,6 +240,7 @@ function ListAlertRules(): JSX.Element {
 								showTotalCount: true,
 							}}
 							paginationClassname={styles.paginationContainer}
+							enableAlternatingRowColors
 							plainTextCellLineClamp={2}
 						/>
 					)}

frontend/src/container/ListAlertRules/table.config.tsx

@@ -107,7 +107,9 @@ export function getAlertRuleColumns(
 					return <TanStackTable.Text>-</TanStackTable.Text>;
 				}
 
-				return <LabelColumn labels={tagKeys} value={labels} color="secondary" />;
+				return (
+					<LabelColumn labels={tagKeys} value={labels} color="highlight-danger" />
+				);
 			},
 		},
 		{

frontend/src/container/ListAlertRules/useAlertRulesData.ts

@@ -3,11 +3,13 @@ import logEvent from 'api/common/logEvent';
 import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import { useListRulesV3 } from 'api/generated/services/rules';
 import type {
+	ListRulesV3200,
 	ListRulesV3Params,
 	RenderErrorResponseDTO,
 	RuletypesLabelPairDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import type { AxiosError } from 'axios';
+import { GeneratedAPIInstance } from 'api/generatedAPIInstance';
 import { isUndefined } from 'lodash-es';
 
 import type { AlertRule } from './types';
@@ -33,7 +35,18 @@ export function useAlertRulesData(
 	const hasLoggedEvent = useRef(false);
 
 	const rulesResponse = useListRulesV3(params, {
-		query: { keepPreviousData: true },
+		query: {
+			keepPreviousData: true,
+			// The backend binds repeated `states=` keys; axios' default sends `states[]=`.
+			queryFn: ({ signal }) =>
+				GeneratedAPIInstance<ListRulesV3200>({
+					url: '/api/v3/rules',
+					method: 'GET',
+					params,
+					paramsSerializer: { indexes: null },
+					signal,
+				}),
+		},
 	});
 
 	const rules = useMemo(

frontend/src/container/MetricsApplication/Tabs/util.ts

@@ -1,9 +1,7 @@
 import React, { Dispatch, SetStateAction, useMemo, useRef } from 'react';
-import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
 import { QueryParams } from 'constants/query';
 import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import ROUTES from 'constants/routes';
-import { ENDPOINT_STATS_EXPRESSION_KEY } from 'container/ApiMonitoring/filterParamKeys';
 import { routeConfig } from 'container/SideNav/config';
 import { getQueryString } from 'container/SideNav/helper';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
@@ -17,7 +15,11 @@ import {
 	BaseAutocompleteData,
 	DataTypes,
 } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { Query, TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
+import {
+	IBuilderQuery,
+	Query,
+	TagFilterItem,
+} from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
 import { Tags } from 'hooks/useResourceAttribute/types';
 import { isModifierKeyPressed } from 'utils/app';
@@ -124,7 +126,7 @@ const generateAPIMonitoringPath = (
 	domainName: string,
 	startTime: number,
 	endTime: number,
-	filterExpression: string,
+	filters: IBuilderQuery['filters'],
 ): string => {
 	const basePath = ROUTES.API_MONITORING;
 	return `${basePath}?${createQueryParams({
@@ -136,8 +138,8 @@ const generateAPIMonitoringPath = (
 				endTime,
 			},
 			selectedInterval: 'custom',
+			endPointDetailsLocalFilters: filters,
 		}),
-		[ENDPOINT_STATS_EXPRESSION_KEY]: filterExpression,
 	})}`;
 };
 export function onViewAPIMonitoringPopupClick({
@@ -151,15 +153,41 @@ export function onViewAPIMonitoringPopupClick({
 	return (e?: React.MouseEvent): void => {
 		const endTime = timestamp + (stepInterval || 60);
 		const startTime = timestamp - (stepInterval || 60);
-		const filterExpression = [
-			...(isError ? ["hasError IN ['true']"] : []),
-			`service.name = ${formatValueForExpression(servicename)}`,
-		].join(' AND ');
+		const filters = {
+			items: [
+				...(isError
+					? [
+							{
+								id: uuid().slice(0, 8),
+								key: {
+									key: 'hasError',
+									dataType: DataTypes.bool,
+									type: 'tag',
+									id: 'hasError--bool--tag--true',
+								},
+								op: 'in',
+								value: ['true'],
+							},
+						]
+					: []),
+				{
+					id: uuid().slice(0, 8),
+					key: {
+						key: 'service.name',
+						dataType: DataTypes.String,
+						type: 'resource',
+					},
+					op: '=',
+					value: servicename,
+				},
+			],
+			op: 'AND',
+		};
 		const newPath = generateAPIMonitoringPath(
 			domainName,
 			startTime,
 			endTime,
-			filterExpression,
+			filters,
 		);
 
 		safeNavigate(newPath, { newTab: !!e && isModifierKeyPressed(e) });

frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.ts

@@ -153,7 +153,6 @@ import opentelemetryUrl from '@/assets/Logos/opentelemetry.svg';
 import phpUrl from '@/assets/Logos/php.svg';
 import pinoUrl from '@/assets/Logos/pino.svg';
 import pipecatUrl from '@/assets/Logos/pipecat.svg';
-import pixeltableUrl from '@/assets/Logos/pixeltable.svg';
 import planetscaleUrl from '@/assets/Logos/planetscale.svg';
 import pm2Url from '@/assets/Logos/pm2.svg';
 import podmanUrl from '@/assets/Logos/podman.svg';
@@ -2580,7 +2579,7 @@ const onboardingConfigWithLinks = [
 								key: 'aws-ec2-metrics-one-click',
 								label: 'One Click AWS',
 								imgUrl: ec2Url,
-								link: '/integrations/aws?service=ec2',
+								link: '/integrations?integration=aws-integration&service=ec2',
 								internalRedirect: true,
 							},
 							{
@@ -2638,7 +2637,7 @@ const onboardingConfigWithLinks = [
 								key: 'aws-ecs-ec2-one-click',
 								label: 'One Click AWS',
 								imgUrl: ecsUrl,
-								link: '/integrations/aws?service=ecs',
+								link: '/integrations?integration=aws-integration&service=ecs',
 								internalRedirect: true,
 							},
 							{
@@ -2700,7 +2699,7 @@ const onboardingConfigWithLinks = [
 								key: 'aws-eks-ec2-one-click',
 								label: 'One Click AWS',
 								imgUrl: eksUrl,
-								link: '/integrations/aws?service=eks',
+								link: '/integrations?integration=aws-integration&service=eks',
 								internalRedirect: true,
 							},
 							{
@@ -2824,21 +2823,21 @@ const onboardingConfigWithLinks = [
 					key: 'aws-rds-one-click',
 					label: 'One Click AWS',
 					imgUrl: rdsUrl,
-					link: '/integrations/aws?service=rds',
+					link: '/integrations?integration=aws-integration&service=rds',
 					internalRedirect: true,
 				},
 				{
 					key: 'aws-rds-mysql-manual',
 					label: 'MySQL Manual',
 					imgUrl: rdsUrl,
-					link: '/integrations/builtin-aws_rds_mysql',
+					link: '/integrations?integration=builtin-aws_rds_mysql',
 					internalRedirect: true,
 				},
 				{
 					key: 'aws-rds-postgresql-manual',
 					label: 'PostgreSQL Manual',
 					imgUrl: rdsUrl,
-					link: '/integrations/builtin-aws_rds_postgresql',
+					link: '/integrations?integration=builtin-aws_rds_postgresql',
 					internalRedirect: true,
 				},
 			],
@@ -2897,7 +2896,7 @@ const onboardingConfigWithLinks = [
 								key: 'aws-lambda-logs-one-click',
 								label: 'One Click AWS',
 								imgUrl: lambdaUrl,
-								link: '/integrations/aws?service=lambda',
+								link: '/integrations?integration=aws-integration&service=lambda',
 								internalRedirect: true,
 							},
 							{
@@ -2955,7 +2954,7 @@ const onboardingConfigWithLinks = [
 								key: 'aws-lambda-metrics-one-click',
 								label: 'One Click AWS',
 								imgUrl: lambdaUrl,
-								link: '/integrations/aws?service=lambda',
+								link: '/integrations?integration=aws-integration&service=lambda',
 								internalRedirect: true,
 							},
 							{
@@ -4711,7 +4710,6 @@ const onboardingConfigWithLinks = [
 			'messaging',
 			'messaging queues',
 			'messaging-queues-celery',
-			'python celery',
 			'queues',
 			'task queue tracing',
 		],
@@ -4932,7 +4930,7 @@ const onboardingConfigWithLinks = [
 			'redis metrics',
 		],
 		imgUrl: redisUrl,
-		link: '/integrations/builtin-redis',
+		link: '/integrations?integration=builtin-redis',
 		internalRedirect: true,
 	},
 	{
@@ -4948,7 +4946,7 @@ const onboardingConfigWithLinks = [
 			'postgresql metrics',
 		],
 		imgUrl: postgresqlUrl,
-		link: '/integrations/builtin-postgres',
+		link: '/integrations?integration=builtin-postgres',
 		internalRedirect: true,
 	},
 	{
@@ -4964,7 +4962,7 @@ const onboardingConfigWithLinks = [
 			'proxy',
 		],
 		imgUrl: nginxUrl,
-		link: '/integrations/builtin-nginx',
+		link: '/integrations?integration=builtin-nginx',
 		internalRedirect: true,
 	},
 	{
@@ -4985,7 +4983,7 @@ const onboardingConfigWithLinks = [
 			'self',
 		],
 		imgUrl: mongoUrl,
-		link: '/integrations/builtin-mongo',
+		link: '/integrations?integration=builtin-mongo',
 		internalRedirect: true,
 	},
 	{
@@ -5003,7 +5001,7 @@ const onboardingConfigWithLinks = [
 			'olap database',
 		],
 		imgUrl: clickhouseUrl,
-		link: '/integrations/builtin-clickhouse',
+		link: '/integrations?integration=builtin-clickhouse',
 		internalRedirect: true,
 	},
 	{
@@ -5058,7 +5056,7 @@ const onboardingConfigWithLinks = [
 					key: 'aws-alb-one-click',
 					label: 'One Click AWS',
 					imgUrl: awsAlbUrl,
-					link: '/integrations/aws?service=alb',
+					link: '/integrations?integration=aws-integration&service=alb',
 					internalRedirect: true,
 				},
 				{
@@ -5099,7 +5097,7 @@ const onboardingConfigWithLinks = [
 					key: 'aws-api-gateway-one-click',
 					label: 'One Click AWS',
 					imgUrl: apiGatewayUrl,
-					link: '/integrations/aws?service=api-gateway',
+					link: '/integrations?integration=aws-integration&service=api-gateway',
 					internalRedirect: true,
 				},
 				{
@@ -5144,7 +5142,7 @@ const onboardingConfigWithLinks = [
 					key: 'aws-dynamodb-one-click',
 					label: 'One Click AWS',
 					imgUrl: dynamodbUrl,
-					link: '/integrations/aws?service=dynamodb',
+					link: '/integrations?integration=aws-integration&service=dynamodb',
 					internalRedirect: true,
 				},
 				{
@@ -5191,14 +5189,14 @@ const onboardingConfigWithLinks = [
 					key: 'aws-elasticache-one-click',
 					label: 'One Click AWS',
 					imgUrl: elasticacheUrl,
-					link: '/integrations/aws?service=elasticache',
+					link: '/integrations?integration=aws-integration&service=elasticache',
 					internalRedirect: true,
 				},
 				{
 					key: 'aws-elasticache-redis-manual',
 					label: 'Redis Manual',
 					imgUrl: elasticacheUrl,
-					link: '/integrations/builtin-aws_elasticache_redis',
+					link: '/integrations?integration=builtin-aws_elasticache_redis',
 					internalRedirect: true,
 				},
 			],
@@ -5237,7 +5235,7 @@ const onboardingConfigWithLinks = [
 					key: 'aws-msk-one-click',
 					label: 'One Click AWS',
 					imgUrl: amazonMskUrl,
-					link: '/integrations/aws?service=msk',
+					link: '/integrations?integration=aws-integration&service=msk',
 					internalRedirect: true,
 				},
 				{
@@ -5280,7 +5278,7 @@ const onboardingConfigWithLinks = [
 					key: 'aws-s3-one-click',
 					label: 'One Click AWS',
 					imgUrl: s3Url,
-					link: '/integrations/aws?service=s3sync',
+					link: '/integrations?integration=aws-integration&service=s3sync',
 					internalRedirect: true,
 				},
 				{
@@ -5322,7 +5320,7 @@ const onboardingConfigWithLinks = [
 					key: 'aws-sns-one-click',
 					label: 'One Click AWS',
 					imgUrl: snsUrl,
-					link: '/integrations/aws?service=sns',
+					link: '/integrations?integration=aws-integration&service=sns',
 					internalRedirect: true,
 				},
 				{
@@ -5364,7 +5362,7 @@ const onboardingConfigWithLinks = [
 					key: 'aws-sqs-one-click',
 					label: 'One Click AWS',
 					imgUrl: sqsUrl,
-					link: '/integrations/aws?service=sqs',
+					link: '/integrations?integration=aws-integration&service=sqs',
 					internalRedirect: true,
 				},
 				{
@@ -7251,14 +7249,12 @@ const onboardingConfigWithLinks = [
 			'cloud monitoring metrics',
 			'connect gcp account',
 			'gcp',
-			'gcp agent',
 			'gcp integration',
 			'gcp logs',
 			'gcp manual setup',
 			'gcp metrics',
 			'gcp monitoring',
 			'gcp observability',
-			'gcp one click',
 			'gcp service account',
 			'google cloud',
 			'google cloud integration',
@@ -7267,8 +7263,6 @@ const onboardingConfigWithLinks = [
 			'metrics',
 			'monitoring',
 			'observability',
-			'one click',
-			'one click gcp integration',
 			'opentelemetry collector gcp',
 			'pub/sub',
 		],
@@ -8161,50 +8155,29 @@ const onboardingConfigWithLinks = [
 		link: '/docs/instrumentation/javascript/opentelemetry-pm2/',
 	},
 	{
-		dataSource: 'pixeltable',
-		label: 'Pixeltable',
-		imgUrl: pixeltableUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
+		dataSource: 'gcp-one-click-integration',
+		label: 'GCP One-Click Integration',
+		imgUrl: gcpUrl,
+		tags: ['GCP', 'metrics', 'logs'],
+		module: 'integrations',
 		relatedSearchKeywords: [
-			'apm',
-			'llm',
-			'llm monitoring',
-			'multimodal ai',
-			'observability',
-			'opentelemetry pixeltable',
-			'pixeltable',
-			'pixeltable monitoring',
-			'pixeltable observability',
-			'pixeltable traces',
-			'traces',
-			'udf',
-		],
-		id: 'pixeltable',
-		link: '/docs/pixeltable-observability/',
-	},
-	{
-		dataSource: 'claude-cowork',
-		label: 'Claude Cowork',
-		imgUrl: claudeCodeUrl,
-		tags: ['LLM Monitoring', 'logs'],
-		module: 'logs',
-		relatedSearchKeywords: [
-			'claude',
-			'claude cowork',
-			'claude cowork monitoring',
-			'claude cowork observability',
-			'cowork',
-			'llm',
-			'llm monitoring',
+			'gcp',
+			'gcp agent',
+			'gcp integration',
+			'gcp logs',
+			'gcp metrics',
+			'gcp one click',
+			'google cloud',
+			'google cloud integration',
 			'logs',
+			'metrics',
 			'monitoring',
 			'observability',
-			'otel claude cowork',
-			'telemetry',
+			'one click',
+			'one click gcp integration',
 		],
-		id: 'claude-cowork',
-		link: '/docs/claude-cowork-monitoring/',
+		id: 'gcp-one-click-integration',
+		link: '/docs/integrations/gcp/one-click-gcp-integrations/',
 	},
 ];
 export default onboardingConfigWithLinks;

frontend/src/hooks/__tests__/useSafeNavigate.replace.test.tsx

@@ -1,32 +0,0 @@
-import { QueryParams } from 'constants/query';
-import ROUTES from 'constants/routes';
-import { back, getCurrentLocation } from 'lib/router/navigation';
-import { act, AllTheProviders, renderHook, waitFor } from 'tests/test-utils';
-
-// jest.config.ts maps `hooks/useSafeNavigate` to a mock; the `.ts` path loads the real hook.
-const { useSafeNavigate } = jest.requireActual<
-	typeof import('hooks/useSafeNavigate')
->('hooks/useSafeNavigate.ts');
-
-describe('useSafeNavigate', () => {
-	it('adds a history entry for replace: false even when the target adds params', async () => {
-		const initialSearch = `?${QueryParams.relativeTime}=15m`;
-		const { result } = renderHook(() => useSafeNavigate(), {
-			wrapper: ({ children }): JSX.Element => (
-				<AllTheProviders initialRoute={`${ROUTES.LOGS_EXPLORER}${initialSearch}`}>
-					{children}
-				</AllTheProviders>
-			),
-		});
-
-		act(() => {
-			result.current.safeNavigate(
-				`${ROUTES.LOGS_EXPLORER}?${QueryParams.startTime}=1000`,
-				{ replace: false },
-			);
-		});
-		act(() => back());
-
-		await waitFor(() => expect(getCurrentLocation().search).toBe(initialSearch));
-	});
-});

frontend/src/hooks/useSafeNavigate.ts

@@ -140,7 +140,7 @@ export const useSafeNavigate = (
 
 			const navigationOptions = {
 				...options,
-				replace: options?.replace ?? isDefaultParamsNavigation,
+				replace: isDefaultParamsNavigation || options?.replace,
 			};
 
 			if (typeof to === 'string') {

frontend/src/pages/AlertDetails/AlertDetails.styles.scss

@@ -41,8 +41,6 @@
 }
 
 .alert-details {
-	margin-top: 10px;
-
 	&__divider {
 		--divider-color: var(--l1-border);
 		--divider-margin: 16px 0;

frontend/src/pages/AlertList/AlertList.styles.scss

@@ -56,6 +56,7 @@
 	}
 
 	.alert-rules-container {
+		margin-top: 10px;
 		flex: 1;
 		min-height: 0;
 		display: flex;
@@ -132,6 +133,10 @@
 			display: flex;
 			flex-direction: column;
 			overflow: hidden;
+
+			> .alert-rules-container {
+				margin-top: 0;
+			}
 		}
 	}
 }

frontend/src/pages/ApiMonitoring/stories/ApiMonitoringPage.stories.mocks.tsx

@@ -12,7 +12,6 @@ import {
 } from 'api/generated/services/sigNoz.schemas';
 import ROUTES from 'constants/routes';
 import { VIEWS } from 'container/ApiMonitoring/Explorer/Domains/DomainDetails/constants';
-import { ENDPOINT_STATS_EXPRESSION_KEY } from 'container/ApiMonitoring/filterParamKeys';
 import { DEFAULT_PARAMS } from 'container/ApiMonitoring/queryParams';
 import type { Time } from 'container/TopNav/DateTimeSelectionV2/types';
 import { rest } from 'msw';
@@ -124,7 +123,17 @@ const timeRange = (): Partial<AppState> => {
 	};
 };
 
-const serviceFilterExpression = "service.name = 'checkout'";
+const serviceFilterItems = {
+	op: 'AND',
+	items: [
+		{
+			id: 'storybook-service-filter',
+			key: { key: 'service.name', dataType: 'string', type: 'resource' },
+			op: '=',
+			value: 'checkout',
+		},
+	],
+};
 
 interface RouteValues {
 	drawer: DrawerState;
@@ -151,14 +160,12 @@ const apiMonitoringRoute = ({
 		selectedView: VIEW_OF[drawer],
 		selectedEndPointName:
 			drawer === 'endpoint-stats' ? endpointUrl(domainName, 0) : '',
+		...(serviceFilter ? { endPointDetailsLocalFilters: serviceFilterItems } : {}),
 	};
-	const filterParam = serviceFilter
-		? `&${ENDPOINT_STATS_EXPRESSION_KEY}=${encodeURIComponent(serviceFilterExpression)}`
-		: '';
 
 	return `${ROUTES.API_MONITORING}?apiMonitoringParams=${encodeURIComponent(
 		JSON.stringify(params),
-	)}${filterParam}`;
+	)}`;
 };
 
 /** The parts of a query spec the handler tells the page's requests apart by. */

frontend/src/parser/FilterQuery.tokens

@@ -25,12 +25,13 @@ HAS=24
 HASANY=25
 HASALL=26
 SEARCH=27
-BOOL=28
-NUMBER=29
-QUOTED_TEXT=30
-KEY=31
-WS=32
-FREETEXT=33
+PATTERN_CALL=28
+BOOL=29
+NUMBER=30
+QUOTED_TEXT=31
+KEY=32
+WS=33
+FREETEXT=34
 '('=1
 ')'=2
 '['=3

frontend/src/parser/FilterQueryLexer.tokens

@@ -25,12 +25,13 @@ HAS=24
 HASANY=25
 HASALL=26
 SEARCH=27
-BOOL=28
-NUMBER=29
-QUOTED_TEXT=30
-KEY=31
-WS=32
-FREETEXT=33
+PATTERN_CALL=28
+BOOL=29
+NUMBER=30
+QUOTED_TEXT=31
+KEY=32
+WS=33
+FREETEXT=34
 '('=1
 ')'=2
 '['=3

frontend/src/parser/FilterQueryLexer.ts

@@ -39,12 +39,13 @@ export default class FilterQueryLexer extends Lexer {
 	public static readonly HASANY = 25;
 	public static readonly HASALL = 26;
 	public static readonly SEARCH = 27;
-	public static readonly BOOL = 28;
-	public static readonly NUMBER = 29;
-	public static readonly QUOTED_TEXT = 30;
-	public static readonly KEY = 31;
-	public static readonly WS = 32;
-	public static readonly FREETEXT = 33;
+	public static readonly PATTERN_CALL = 28;
+	public static readonly BOOL = 29;
+	public static readonly NUMBER = 30;
+	public static readonly QUOTED_TEXT = 31;
+	public static readonly KEY = 32;
+	public static readonly WS = 33;
+	public static readonly FREETEXT = 34;
 	public static readonly EOF = Token.EOF;
 
 	public static readonly channelNames: string[] = [ "DEFAULT_TOKEN_CHANNEL", "HIDDEN" ];
@@ -70,6 +71,7 @@ export default class FilterQueryLexer extends Lexer {
                                                              "HASTOKEN", 
                                                              "HAS", "HASANY", 
                                                              "HASALL", "SEARCH", 
+                                                             "PATTERN_CALL", 
                                                              "BOOL", "NUMBER", 
                                                              "QUOTED_TEXT", 
                                                              "KEY", "WS", 
@@ -80,8 +82,8 @@ export default class FilterQueryLexer extends Lexer {
 		"LPAREN", "RPAREN", "LBRACK", "RBRACK", "COMMA", "EQUALS", "NOT_EQUALS", 
 		"NEQ", "LT", "LE", "GT", "GE", "LIKE", "ILIKE", "BETWEEN", "EXISTS", "REGEXP", 
 		"CONTAINS", "IN", "NOT", "AND", "OR", "HASTOKEN", "HAS", "HASANY", "HASALL", 
-		"SEARCH", "BOOL", "SIGN", "NUMBER", "QUOTED_TEXT", "SEGMENT", "EMPTY_BRACKS", 
-		"OLD_JSON_BRACKS", "KEY", "WS", "DIGIT", "FREETEXT",
+		"SEARCH", "PATTERN_CALL", "BOOL", "SIGN", "NUMBER", "QUOTED_TEXT", "SEGMENT", 
+		"EMPTY_BRACKS", "OLD_JSON_BRACKS", "KEY", "WS", "DIGIT", "FREETEXT",
 	];
 
 
@@ -102,122 +104,127 @@ export default class FilterQueryLexer extends Lexer {
 
 	public get modeNames(): string[] { return FilterQueryLexer.modeNames; }
 
-	public static readonly _serializedATN: number[] = [4,0,33,329,6,-1,2,0,
+	public static readonly _serializedATN: number[] = [4,0,34,346,6,-1,2,0,
 	7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,
 	7,9,2,10,7,10,2,11,7,11,2,12,7,12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,
 	16,2,17,7,17,2,18,7,18,2,19,7,19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,
 	2,24,7,24,2,25,7,25,2,26,7,26,2,27,7,27,2,28,7,28,2,29,7,29,2,30,7,30,2,
-	31,7,31,2,32,7,32,2,33,7,33,2,34,7,34,2,35,7,35,2,36,7,36,2,37,7,37,1,0,
-	1,0,1,1,1,1,1,2,1,2,1,3,1,3,1,4,1,4,1,5,1,5,1,5,3,5,91,8,5,1,6,1,6,1,6,
-	1,7,1,7,1,7,1,8,1,8,1,9,1,9,1,9,1,10,1,10,1,11,1,11,1,11,1,12,1,12,1,12,
-	1,12,1,12,1,13,1,13,1,13,1,13,1,13,1,13,1,14,1,14,1,14,1,14,1,14,1,14,1,
-	14,1,14,1,15,1,15,1,15,1,15,1,15,1,15,3,15,134,8,15,1,16,1,16,1,16,1,16,
-	1,16,1,16,1,16,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,3,17,151,8,17,1,
-	18,1,18,1,18,1,19,1,19,1,19,1,19,1,20,1,20,1,20,1,20,1,21,1,21,1,21,1,22,
-	1,22,1,22,1,22,1,22,1,22,1,22,1,22,1,22,1,23,1,23,1,23,1,23,1,24,1,24,1,
-	24,1,24,1,24,1,24,1,24,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,26,1,26,1,26,
-	1,26,1,26,1,26,1,26,1,27,1,27,1,27,1,27,1,27,1,27,1,27,1,27,1,27,3,27,210,
-	8,27,1,28,1,28,1,29,3,29,215,8,29,1,29,4,29,218,8,29,11,29,12,29,219,1,
-	29,1,29,5,29,224,8,29,10,29,12,29,227,9,29,3,29,229,8,29,1,29,1,29,3,29,
-	233,8,29,1,29,4,29,236,8,29,11,29,12,29,237,3,29,240,8,29,1,29,3,29,243,
-	8,29,1,29,1,29,4,29,247,8,29,11,29,12,29,248,1,29,1,29,3,29,253,8,29,1,
-	29,4,29,256,8,29,11,29,12,29,257,3,29,260,8,29,3,29,262,8,29,1,30,1,30,
-	1,30,1,30,5,30,268,8,30,10,30,12,30,271,9,30,1,30,1,30,1,30,1,30,1,30,5,
-	30,278,8,30,10,30,12,30,281,9,30,1,30,3,30,284,8,30,1,31,1,31,5,31,288,
-	8,31,10,31,12,31,291,9,31,1,32,1,32,1,32,1,33,1,33,1,33,1,33,1,34,1,34,
-	1,34,1,34,1,34,1,34,1,34,4,34,307,8,34,11,34,12,34,308,5,34,311,8,34,10,
-	34,12,34,314,9,34,1,35,4,35,317,8,35,11,35,12,35,318,1,35,1,35,1,36,1,36,
-	1,37,4,37,326,8,37,11,37,12,37,327,0,0,38,1,1,3,2,5,3,7,4,9,5,11,6,13,7,
-	15,8,17,9,19,10,21,11,23,12,25,13,27,14,29,15,31,16,33,17,35,18,37,19,39,
-	20,41,21,43,22,45,23,47,24,49,25,51,26,53,27,55,28,57,0,59,29,61,30,63,
-	0,65,0,67,0,69,31,71,32,73,0,75,33,1,0,29,2,0,76,76,108,108,2,0,73,73,105,
-	105,2,0,75,75,107,107,2,0,69,69,101,101,2,0,66,66,98,98,2,0,84,84,116,116,
-	2,0,87,87,119,119,2,0,78,78,110,110,2,0,88,88,120,120,2,0,83,83,115,115,
-	2,0,82,82,114,114,2,0,71,71,103,103,2,0,80,80,112,112,2,0,67,67,99,99,2,
-	0,79,79,111,111,2,0,65,65,97,97,2,0,68,68,100,100,2,0,72,72,104,104,2,0,
-	89,89,121,121,2,0,85,85,117,117,2,0,70,70,102,102,2,0,43,43,45,45,2,0,34,
-	34,92,92,2,0,39,39,92,92,4,0,35,36,64,90,95,95,97,123,7,0,35,36,45,45,47,
-	58,64,90,95,95,97,123,125,125,3,0,9,10,13,13,32,32,1,0,48,57,8,0,9,10,13,
-	13,32,34,39,41,44,44,60,62,91,91,93,93,353,0,1,1,0,0,0,0,3,1,0,0,0,0,5,
-	1,0,0,0,0,7,1,0,0,0,0,9,1,0,0,0,0,11,1,0,0,0,0,13,1,0,0,0,0,15,1,0,0,0,
-	0,17,1,0,0,0,0,19,1,0,0,0,0,21,1,0,0,0,0,23,1,0,0,0,0,25,1,0,0,0,0,27,1,
-	0,0,0,0,29,1,0,0,0,0,31,1,0,0,0,0,33,1,0,0,0,0,35,1,0,0,0,0,37,1,0,0,0,
-	0,39,1,0,0,0,0,41,1,0,0,0,0,43,1,0,0,0,0,45,1,0,0,0,0,47,1,0,0,0,0,49,1,
-	0,0,0,0,51,1,0,0,0,0,53,1,0,0,0,0,55,1,0,0,0,0,59,1,0,0,0,0,61,1,0,0,0,
-	0,69,1,0,0,0,0,71,1,0,0,0,0,75,1,0,0,0,1,77,1,0,0,0,3,79,1,0,0,0,5,81,1,
-	0,0,0,7,83,1,0,0,0,9,85,1,0,0,0,11,90,1,0,0,0,13,92,1,0,0,0,15,95,1,0,0,
-	0,17,98,1,0,0,0,19,100,1,0,0,0,21,103,1,0,0,0,23,105,1,0,0,0,25,108,1,0,
-	0,0,27,113,1,0,0,0,29,119,1,0,0,0,31,127,1,0,0,0,33,135,1,0,0,0,35,142,
-	1,0,0,0,37,152,1,0,0,0,39,155,1,0,0,0,41,159,1,0,0,0,43,163,1,0,0,0,45,
-	166,1,0,0,0,47,175,1,0,0,0,49,179,1,0,0,0,51,186,1,0,0,0,53,193,1,0,0,0,
-	55,209,1,0,0,0,57,211,1,0,0,0,59,261,1,0,0,0,61,283,1,0,0,0,63,285,1,0,
-	0,0,65,292,1,0,0,0,67,295,1,0,0,0,69,299,1,0,0,0,71,316,1,0,0,0,73,322,
-	1,0,0,0,75,325,1,0,0,0,77,78,5,40,0,0,78,2,1,0,0,0,79,80,5,41,0,0,80,4,
-	1,0,0,0,81,82,5,91,0,0,82,6,1,0,0,0,83,84,5,93,0,0,84,8,1,0,0,0,85,86,5,
-	44,0,0,86,10,1,0,0,0,87,91,5,61,0,0,88,89,5,61,0,0,89,91,5,61,0,0,90,87,
-	1,0,0,0,90,88,1,0,0,0,91,12,1,0,0,0,92,93,5,33,0,0,93,94,5,61,0,0,94,14,
-	1,0,0,0,95,96,5,60,0,0,96,97,5,62,0,0,97,16,1,0,0,0,98,99,5,60,0,0,99,18,
-	1,0,0,0,100,101,5,60,0,0,101,102,5,61,0,0,102,20,1,0,0,0,103,104,5,62,0,
-	0,104,22,1,0,0,0,105,106,5,62,0,0,106,107,5,61,0,0,107,24,1,0,0,0,108,109,
-	7,0,0,0,109,110,7,1,0,0,110,111,7,2,0,0,111,112,7,3,0,0,112,26,1,0,0,0,
-	113,114,7,1,0,0,114,115,7,0,0,0,115,116,7,1,0,0,116,117,7,2,0,0,117,118,
-	7,3,0,0,118,28,1,0,0,0,119,120,7,4,0,0,120,121,7,3,0,0,121,122,7,5,0,0,
-	122,123,7,6,0,0,123,124,7,3,0,0,124,125,7,3,0,0,125,126,7,7,0,0,126,30,
-	1,0,0,0,127,128,7,3,0,0,128,129,7,8,0,0,129,130,7,1,0,0,130,131,7,9,0,0,
-	131,133,7,5,0,0,132,134,7,9,0,0,133,132,1,0,0,0,133,134,1,0,0,0,134,32,
-	1,0,0,0,135,136,7,10,0,0,136,137,7,3,0,0,137,138,7,11,0,0,138,139,7,3,0,
-	0,139,140,7,8,0,0,140,141,7,12,0,0,141,34,1,0,0,0,142,143,7,13,0,0,143,
-	144,7,14,0,0,144,145,7,7,0,0,145,146,7,5,0,0,146,147,7,15,0,0,147,148,7,
-	1,0,0,148,150,7,7,0,0,149,151,7,9,0,0,150,149,1,0,0,0,150,151,1,0,0,0,151,
-	36,1,0,0,0,152,153,7,1,0,0,153,154,7,7,0,0,154,38,1,0,0,0,155,156,7,7,0,
-	0,156,157,7,14,0,0,157,158,7,5,0,0,158,40,1,0,0,0,159,160,7,15,0,0,160,
-	161,7,7,0,0,161,162,7,16,0,0,162,42,1,0,0,0,163,164,7,14,0,0,164,165,7,
-	10,0,0,165,44,1,0,0,0,166,167,7,17,0,0,167,168,7,15,0,0,168,169,7,9,0,0,
-	169,170,7,5,0,0,170,171,7,14,0,0,171,172,7,2,0,0,172,173,7,3,0,0,173,174,
-	7,7,0,0,174,46,1,0,0,0,175,176,7,17,0,0,176,177,7,15,0,0,177,178,7,9,0,
-	0,178,48,1,0,0,0,179,180,7,17,0,0,180,181,7,15,0,0,181,182,7,9,0,0,182,
-	183,7,15,0,0,183,184,7,7,0,0,184,185,7,18,0,0,185,50,1,0,0,0,186,187,7,
-	17,0,0,187,188,7,15,0,0,188,189,7,9,0,0,189,190,7,15,0,0,190,191,7,0,0,
-	0,191,192,7,0,0,0,192,52,1,0,0,0,193,194,7,9,0,0,194,195,7,3,0,0,195,196,
-	7,15,0,0,196,197,7,10,0,0,197,198,7,13,0,0,198,199,7,17,0,0,199,54,1,0,
-	0,0,200,201,7,5,0,0,201,202,7,10,0,0,202,203,7,19,0,0,203,210,7,3,0,0,204,
-	205,7,20,0,0,205,206,7,15,0,0,206,207,7,0,0,0,207,208,7,9,0,0,208,210,7,
-	3,0,0,209,200,1,0,0,0,209,204,1,0,0,0,210,56,1,0,0,0,211,212,7,21,0,0,212,
-	58,1,0,0,0,213,215,3,57,28,0,214,213,1,0,0,0,214,215,1,0,0,0,215,217,1,
-	0,0,0,216,218,3,73,36,0,217,216,1,0,0,0,218,219,1,0,0,0,219,217,1,0,0,0,
-	219,220,1,0,0,0,220,228,1,0,0,0,221,225,5,46,0,0,222,224,3,73,36,0,223,
-	222,1,0,0,0,224,227,1,0,0,0,225,223,1,0,0,0,225,226,1,0,0,0,226,229,1,0,
-	0,0,227,225,1,0,0,0,228,221,1,0,0,0,228,229,1,0,0,0,229,239,1,0,0,0,230,
-	232,7,3,0,0,231,233,3,57,28,0,232,231,1,0,0,0,232,233,1,0,0,0,233,235,1,
-	0,0,0,234,236,3,73,36,0,235,234,1,0,0,0,236,237,1,0,0,0,237,235,1,0,0,0,
-	237,238,1,0,0,0,238,240,1,0,0,0,239,230,1,0,0,0,239,240,1,0,0,0,240,262,
-	1,0,0,0,241,243,3,57,28,0,242,241,1,0,0,0,242,243,1,0,0,0,243,244,1,0,0,
-	0,244,246,5,46,0,0,245,247,3,73,36,0,246,245,1,0,0,0,247,248,1,0,0,0,248,
-	246,1,0,0,0,248,249,1,0,0,0,249,259,1,0,0,0,250,252,7,3,0,0,251,253,3,57,
-	28,0,252,251,1,0,0,0,252,253,1,0,0,0,253,255,1,0,0,0,254,256,3,73,36,0,
-	255,254,1,0,0,0,256,257,1,0,0,0,257,255,1,0,0,0,257,258,1,0,0,0,258,260,
-	1,0,0,0,259,250,1,0,0,0,259,260,1,0,0,0,260,262,1,0,0,0,261,214,1,0,0,0,
-	261,242,1,0,0,0,262,60,1,0,0,0,263,269,5,34,0,0,264,268,8,22,0,0,265,266,
-	5,92,0,0,266,268,9,0,0,0,267,264,1,0,0,0,267,265,1,0,0,0,268,271,1,0,0,
-	0,269,267,1,0,0,0,269,270,1,0,0,0,270,272,1,0,0,0,271,269,1,0,0,0,272,284,
-	5,34,0,0,273,279,5,39,0,0,274,278,8,23,0,0,275,276,5,92,0,0,276,278,9,0,
-	0,0,277,274,1,0,0,0,277,275,1,0,0,0,278,281,1,0,0,0,279,277,1,0,0,0,279,
-	280,1,0,0,0,280,282,1,0,0,0,281,279,1,0,0,0,282,284,5,39,0,0,283,263,1,
-	0,0,0,283,273,1,0,0,0,284,62,1,0,0,0,285,289,7,24,0,0,286,288,7,25,0,0,
-	287,286,1,0,0,0,288,291,1,0,0,0,289,287,1,0,0,0,289,290,1,0,0,0,290,64,
-	1,0,0,0,291,289,1,0,0,0,292,293,5,91,0,0,293,294,5,93,0,0,294,66,1,0,0,
-	0,295,296,5,91,0,0,296,297,5,42,0,0,297,298,5,93,0,0,298,68,1,0,0,0,299,
-	312,3,63,31,0,300,301,5,46,0,0,301,311,3,63,31,0,302,311,3,65,32,0,303,
-	311,3,67,33,0,304,306,5,46,0,0,305,307,3,73,36,0,306,305,1,0,0,0,307,308,
-	1,0,0,0,308,306,1,0,0,0,308,309,1,0,0,0,309,311,1,0,0,0,310,300,1,0,0,0,
-	310,302,1,0,0,0,310,303,1,0,0,0,310,304,1,0,0,0,311,314,1,0,0,0,312,310,
-	1,0,0,0,312,313,1,0,0,0,313,70,1,0,0,0,314,312,1,0,0,0,315,317,7,26,0,0,
-	316,315,1,0,0,0,317,318,1,0,0,0,318,316,1,0,0,0,318,319,1,0,0,0,319,320,
-	1,0,0,0,320,321,6,35,0,0,321,72,1,0,0,0,322,323,7,27,0,0,323,74,1,0,0,0,
-	324,326,8,28,0,0,325,324,1,0,0,0,326,327,1,0,0,0,327,325,1,0,0,0,327,328,
-	1,0,0,0,328,76,1,0,0,0,29,0,90,133,150,209,214,219,225,228,232,237,239,
-	242,248,252,257,259,261,267,269,277,279,283,289,308,310,312,318,327,1,6,
-	0,0];
+	31,7,31,2,32,7,32,2,33,7,33,2,34,7,34,2,35,7,35,2,36,7,36,2,37,7,37,2,38,
+	7,38,1,0,1,0,1,1,1,1,1,2,1,2,1,3,1,3,1,4,1,4,1,5,1,5,1,5,3,5,93,8,5,1,6,
+	1,6,1,6,1,7,1,7,1,7,1,8,1,8,1,9,1,9,1,9,1,10,1,10,1,11,1,11,1,11,1,12,1,
+	12,1,12,1,12,1,12,1,13,1,13,1,13,1,13,1,13,1,13,1,14,1,14,1,14,1,14,1,14,
+	1,14,1,14,1,14,1,15,1,15,1,15,1,15,1,15,1,15,3,15,136,8,15,1,16,1,16,1,
+	16,1,16,1,16,1,16,1,16,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,3,17,153,
+	8,17,1,18,1,18,1,18,1,19,1,19,1,19,1,19,1,20,1,20,1,20,1,20,1,21,1,21,1,
+	21,1,22,1,22,1,22,1,22,1,22,1,22,1,22,1,22,1,22,1,23,1,23,1,23,1,23,1,24,
+	1,24,1,24,1,24,1,24,1,24,1,24,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,26,1,
+	26,1,26,1,26,1,26,1,26,1,26,1,27,1,27,1,27,1,27,1,27,1,27,1,27,1,27,5,27,
+	211,8,27,10,27,12,27,214,9,27,1,27,1,27,1,28,1,28,1,28,1,28,1,28,1,28,1,
+	28,1,28,1,28,3,28,227,8,28,1,29,1,29,1,30,3,30,232,8,30,1,30,4,30,235,8,
+	30,11,30,12,30,236,1,30,1,30,5,30,241,8,30,10,30,12,30,244,9,30,3,30,246,
+	8,30,1,30,1,30,3,30,250,8,30,1,30,4,30,253,8,30,11,30,12,30,254,3,30,257,
+	8,30,1,30,3,30,260,8,30,1,30,1,30,4,30,264,8,30,11,30,12,30,265,1,30,1,
+	30,3,30,270,8,30,1,30,4,30,273,8,30,11,30,12,30,274,3,30,277,8,30,3,30,
+	279,8,30,1,31,1,31,1,31,1,31,5,31,285,8,31,10,31,12,31,288,9,31,1,31,1,
+	31,1,31,1,31,1,31,5,31,295,8,31,10,31,12,31,298,9,31,1,31,3,31,301,8,31,
+	1,32,1,32,5,32,305,8,32,10,32,12,32,308,9,32,1,33,1,33,1,33,1,34,1,34,1,
+	34,1,34,1,35,1,35,1,35,1,35,1,35,1,35,1,35,4,35,324,8,35,11,35,12,35,325,
+	5,35,328,8,35,10,35,12,35,331,9,35,1,36,4,36,334,8,36,11,36,12,36,335,1,
+	36,1,36,1,37,1,37,1,38,4,38,343,8,38,11,38,12,38,344,0,0,39,1,1,3,2,5,3,
+	7,4,9,5,11,6,13,7,15,8,17,9,19,10,21,11,23,12,25,13,27,14,29,15,31,16,33,
+	17,35,18,37,19,39,20,41,21,43,22,45,23,47,24,49,25,51,26,53,27,55,28,57,
+	29,59,0,61,30,63,31,65,0,67,0,69,0,71,32,73,33,75,0,77,34,1,0,30,2,0,76,
+	76,108,108,2,0,73,73,105,105,2,0,75,75,107,107,2,0,69,69,101,101,2,0,66,
+	66,98,98,2,0,84,84,116,116,2,0,87,87,119,119,2,0,78,78,110,110,2,0,88,88,
+	120,120,2,0,83,83,115,115,2,0,82,82,114,114,2,0,71,71,103,103,2,0,80,80,
+	112,112,2,0,67,67,99,99,2,0,79,79,111,111,2,0,65,65,97,97,2,0,68,68,100,
+	100,2,0,72,72,104,104,2,0,89,89,121,121,2,0,9,9,32,32,2,0,85,85,117,117,
+	2,0,70,70,102,102,2,0,43,43,45,45,2,0,34,34,92,92,2,0,39,39,92,92,4,0,35,
+	36,64,90,95,95,97,123,7,0,35,36,45,45,47,58,64,90,95,95,97,123,125,125,
+	3,0,9,10,13,13,32,32,1,0,48,57,8,0,9,10,13,13,32,34,39,41,44,44,60,62,91,
+	91,93,93,371,0,1,1,0,0,0,0,3,1,0,0,0,0,5,1,0,0,0,0,7,1,0,0,0,0,9,1,0,0,
+	0,0,11,1,0,0,0,0,13,1,0,0,0,0,15,1,0,0,0,0,17,1,0,0,0,0,19,1,0,0,0,0,21,
+	1,0,0,0,0,23,1,0,0,0,0,25,1,0,0,0,0,27,1,0,0,0,0,29,1,0,0,0,0,31,1,0,0,
+	0,0,33,1,0,0,0,0,35,1,0,0,0,0,37,1,0,0,0,0,39,1,0,0,0,0,41,1,0,0,0,0,43,
+	1,0,0,0,0,45,1,0,0,0,0,47,1,0,0,0,0,49,1,0,0,0,0,51,1,0,0,0,0,53,1,0,0,
+	0,0,55,1,0,0,0,0,57,1,0,0,0,0,61,1,0,0,0,0,63,1,0,0,0,0,71,1,0,0,0,0,73,
+	1,0,0,0,0,77,1,0,0,0,1,79,1,0,0,0,3,81,1,0,0,0,5,83,1,0,0,0,7,85,1,0,0,
+	0,9,87,1,0,0,0,11,92,1,0,0,0,13,94,1,0,0,0,15,97,1,0,0,0,17,100,1,0,0,0,
+	19,102,1,0,0,0,21,105,1,0,0,0,23,107,1,0,0,0,25,110,1,0,0,0,27,115,1,0,
+	0,0,29,121,1,0,0,0,31,129,1,0,0,0,33,137,1,0,0,0,35,144,1,0,0,0,37,154,
+	1,0,0,0,39,157,1,0,0,0,41,161,1,0,0,0,43,165,1,0,0,0,45,168,1,0,0,0,47,
+	177,1,0,0,0,49,181,1,0,0,0,51,188,1,0,0,0,53,195,1,0,0,0,55,202,1,0,0,0,
+	57,226,1,0,0,0,59,228,1,0,0,0,61,278,1,0,0,0,63,300,1,0,0,0,65,302,1,0,
+	0,0,67,309,1,0,0,0,69,312,1,0,0,0,71,316,1,0,0,0,73,333,1,0,0,0,75,339,
+	1,0,0,0,77,342,1,0,0,0,79,80,5,40,0,0,80,2,1,0,0,0,81,82,5,41,0,0,82,4,
+	1,0,0,0,83,84,5,91,0,0,84,6,1,0,0,0,85,86,5,93,0,0,86,8,1,0,0,0,87,88,5,
+	44,0,0,88,10,1,0,0,0,89,93,5,61,0,0,90,91,5,61,0,0,91,93,5,61,0,0,92,89,
+	1,0,0,0,92,90,1,0,0,0,93,12,1,0,0,0,94,95,5,33,0,0,95,96,5,61,0,0,96,14,
+	1,0,0,0,97,98,5,60,0,0,98,99,5,62,0,0,99,16,1,0,0,0,100,101,5,60,0,0,101,
+	18,1,0,0,0,102,103,5,60,0,0,103,104,5,61,0,0,104,20,1,0,0,0,105,106,5,62,
+	0,0,106,22,1,0,0,0,107,108,5,62,0,0,108,109,5,61,0,0,109,24,1,0,0,0,110,
+	111,7,0,0,0,111,112,7,1,0,0,112,113,7,2,0,0,113,114,7,3,0,0,114,26,1,0,
+	0,0,115,116,7,1,0,0,116,117,7,0,0,0,117,118,7,1,0,0,118,119,7,2,0,0,119,
+	120,7,3,0,0,120,28,1,0,0,0,121,122,7,4,0,0,122,123,7,3,0,0,123,124,7,5,
+	0,0,124,125,7,6,0,0,125,126,7,3,0,0,126,127,7,3,0,0,127,128,7,7,0,0,128,
+	30,1,0,0,0,129,130,7,3,0,0,130,131,7,8,0,0,131,132,7,1,0,0,132,133,7,9,
+	0,0,133,135,7,5,0,0,134,136,7,9,0,0,135,134,1,0,0,0,135,136,1,0,0,0,136,
+	32,1,0,0,0,137,138,7,10,0,0,138,139,7,3,0,0,139,140,7,11,0,0,140,141,7,
+	3,0,0,141,142,7,8,0,0,142,143,7,12,0,0,143,34,1,0,0,0,144,145,7,13,0,0,
+	145,146,7,14,0,0,146,147,7,7,0,0,147,148,7,5,0,0,148,149,7,15,0,0,149,150,
+	7,1,0,0,150,152,7,7,0,0,151,153,7,9,0,0,152,151,1,0,0,0,152,153,1,0,0,0,
+	153,36,1,0,0,0,154,155,7,1,0,0,155,156,7,7,0,0,156,38,1,0,0,0,157,158,7,
+	7,0,0,158,159,7,14,0,0,159,160,7,5,0,0,160,40,1,0,0,0,161,162,7,15,0,0,
+	162,163,7,7,0,0,163,164,7,16,0,0,164,42,1,0,0,0,165,166,7,14,0,0,166,167,
+	7,10,0,0,167,44,1,0,0,0,168,169,7,17,0,0,169,170,7,15,0,0,170,171,7,9,0,
+	0,171,172,7,5,0,0,172,173,7,14,0,0,173,174,7,2,0,0,174,175,7,3,0,0,175,
+	176,7,7,0,0,176,46,1,0,0,0,177,178,7,17,0,0,178,179,7,15,0,0,179,180,7,
+	9,0,0,180,48,1,0,0,0,181,182,7,17,0,0,182,183,7,15,0,0,183,184,7,9,0,0,
+	184,185,7,15,0,0,185,186,7,7,0,0,186,187,7,18,0,0,187,50,1,0,0,0,188,189,
+	7,17,0,0,189,190,7,15,0,0,190,191,7,9,0,0,191,192,7,15,0,0,192,193,7,0,
+	0,0,193,194,7,0,0,0,194,52,1,0,0,0,195,196,7,9,0,0,196,197,7,3,0,0,197,
+	198,7,15,0,0,198,199,7,10,0,0,199,200,7,13,0,0,200,201,7,17,0,0,201,54,
+	1,0,0,0,202,203,7,12,0,0,203,204,7,15,0,0,204,205,7,5,0,0,205,206,7,5,0,
+	0,206,207,7,3,0,0,207,208,7,10,0,0,208,212,7,7,0,0,209,211,7,19,0,0,210,
+	209,1,0,0,0,211,214,1,0,0,0,212,210,1,0,0,0,212,213,1,0,0,0,213,215,1,0,
+	0,0,214,212,1,0,0,0,215,216,5,40,0,0,216,56,1,0,0,0,217,218,7,5,0,0,218,
+	219,7,10,0,0,219,220,7,20,0,0,220,227,7,3,0,0,221,222,7,21,0,0,222,223,
+	7,15,0,0,223,224,7,0,0,0,224,225,7,9,0,0,225,227,7,3,0,0,226,217,1,0,0,
+	0,226,221,1,0,0,0,227,58,1,0,0,0,228,229,7,22,0,0,229,60,1,0,0,0,230,232,
+	3,59,29,0,231,230,1,0,0,0,231,232,1,0,0,0,232,234,1,0,0,0,233,235,3,75,
+	37,0,234,233,1,0,0,0,235,236,1,0,0,0,236,234,1,0,0,0,236,237,1,0,0,0,237,
+	245,1,0,0,0,238,242,5,46,0,0,239,241,3,75,37,0,240,239,1,0,0,0,241,244,
+	1,0,0,0,242,240,1,0,0,0,242,243,1,0,0,0,243,246,1,0,0,0,244,242,1,0,0,0,
+	245,238,1,0,0,0,245,246,1,0,0,0,246,256,1,0,0,0,247,249,7,3,0,0,248,250,
+	3,59,29,0,249,248,1,0,0,0,249,250,1,0,0,0,250,252,1,0,0,0,251,253,3,75,
+	37,0,252,251,1,0,0,0,253,254,1,0,0,0,254,252,1,0,0,0,254,255,1,0,0,0,255,
+	257,1,0,0,0,256,247,1,0,0,0,256,257,1,0,0,0,257,279,1,0,0,0,258,260,3,59,
+	29,0,259,258,1,0,0,0,259,260,1,0,0,0,260,261,1,0,0,0,261,263,5,46,0,0,262,
+	264,3,75,37,0,263,262,1,0,0,0,264,265,1,0,0,0,265,263,1,0,0,0,265,266,1,
+	0,0,0,266,276,1,0,0,0,267,269,7,3,0,0,268,270,3,59,29,0,269,268,1,0,0,0,
+	269,270,1,0,0,0,270,272,1,0,0,0,271,273,3,75,37,0,272,271,1,0,0,0,273,274,
+	1,0,0,0,274,272,1,0,0,0,274,275,1,0,0,0,275,277,1,0,0,0,276,267,1,0,0,0,
+	276,277,1,0,0,0,277,279,1,0,0,0,278,231,1,0,0,0,278,259,1,0,0,0,279,62,
+	1,0,0,0,280,286,5,34,0,0,281,285,8,23,0,0,282,283,5,92,0,0,283,285,9,0,
+	0,0,284,281,1,0,0,0,284,282,1,0,0,0,285,288,1,0,0,0,286,284,1,0,0,0,286,
+	287,1,0,0,0,287,289,1,0,0,0,288,286,1,0,0,0,289,301,5,34,0,0,290,296,5,
+	39,0,0,291,295,8,24,0,0,292,293,5,92,0,0,293,295,9,0,0,0,294,291,1,0,0,
+	0,294,292,1,0,0,0,295,298,1,0,0,0,296,294,1,0,0,0,296,297,1,0,0,0,297,299,
+	1,0,0,0,298,296,1,0,0,0,299,301,5,39,0,0,300,280,1,0,0,0,300,290,1,0,0,
+	0,301,64,1,0,0,0,302,306,7,25,0,0,303,305,7,26,0,0,304,303,1,0,0,0,305,
+	308,1,0,0,0,306,304,1,0,0,0,306,307,1,0,0,0,307,66,1,0,0,0,308,306,1,0,
+	0,0,309,310,5,91,0,0,310,311,5,93,0,0,311,68,1,0,0,0,312,313,5,91,0,0,313,
+	314,5,42,0,0,314,315,5,93,0,0,315,70,1,0,0,0,316,329,3,65,32,0,317,318,
+	5,46,0,0,318,328,3,65,32,0,319,328,3,67,33,0,320,328,3,69,34,0,321,323,
+	5,46,0,0,322,324,3,75,37,0,323,322,1,0,0,0,324,325,1,0,0,0,325,323,1,0,
+	0,0,325,326,1,0,0,0,326,328,1,0,0,0,327,317,1,0,0,0,327,319,1,0,0,0,327,
+	320,1,0,0,0,327,321,1,0,0,0,328,331,1,0,0,0,329,327,1,0,0,0,329,330,1,0,
+	0,0,330,72,1,0,0,0,331,329,1,0,0,0,332,334,7,27,0,0,333,332,1,0,0,0,334,
+	335,1,0,0,0,335,333,1,0,0,0,335,336,1,0,0,0,336,337,1,0,0,0,337,338,6,36,
+	0,0,338,74,1,0,0,0,339,340,7,28,0,0,340,76,1,0,0,0,341,343,8,29,0,0,342,
+	341,1,0,0,0,343,344,1,0,0,0,344,342,1,0,0,0,344,345,1,0,0,0,345,78,1,0,
+	0,0,30,0,92,135,152,212,226,231,236,242,245,249,254,256,259,265,269,274,
+	276,278,284,286,294,296,300,306,325,327,329,335,344,1,6,0,0];
 
 	private static __ATN: ATN;
 	public static get _ATN(): ATN {

frontend/src/parser/FilterQueryListener.ts

@@ -16,6 +16,7 @@ import { ValueListContext } from "./FilterQueryParser.js";
 import { FullTextContext } from "./FilterQueryParser.js";
 import { FunctionCallContext } from "./FilterQueryParser.js";
 import { SearchCallContext } from "./FilterQueryParser.js";
+import { PatternCallContext } from "./FilterQueryParser.js";
 import { FunctionParamListContext } from "./FilterQueryParser.js";
 import { FunctionParamContext } from "./FilterQueryParser.js";
 import { ArrayContext } from "./FilterQueryParser.js";
@@ -158,6 +159,16 @@ export default class FilterQueryListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	exitSearchCall?: (ctx: SearchCallContext) => void;
+	/**
+	 * Enter a parse tree produced by `FilterQueryParser.patternCall`.
+	 * @param ctx the parse tree
+	 */
+	enterPatternCall?: (ctx: PatternCallContext) => void;
+	/**
+	 * Exit a parse tree produced by `FilterQueryParser.patternCall`.
+	 * @param ctx the parse tree
+	 */
+	exitPatternCall?: (ctx: PatternCallContext) => void;
 	/**
 	 * Enter a parse tree produced by `FilterQueryParser.functionParamList`.
 	 * @param ctx the parse tree

frontend/src/parser/FilterQueryVisitor.ts

@@ -16,6 +16,7 @@ import { ValueListContext } from "./FilterQueryParser.js";
 import { FullTextContext } from "./FilterQueryParser.js";
 import { FunctionCallContext } from "./FilterQueryParser.js";
 import { SearchCallContext } from "./FilterQueryParser.js";
+import { PatternCallContext } from "./FilterQueryParser.js";
 import { FunctionParamListContext } from "./FilterQueryParser.js";
 import { FunctionParamContext } from "./FilterQueryParser.js";
 import { ArrayContext } from "./FilterQueryParser.js";
@@ -109,6 +110,12 @@ export default class FilterQueryVisitor<Result> extends ParseTreeVisitor<Result>
 	 * @return the visitor result
 	 */
 	visitSearchCall?: (ctx: SearchCallContext) => Result;
+	/**
+	 * Visit a parse tree produced by `FilterQueryParser.patternCall`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitPatternCall?: (ctx: PatternCallContext) => Result;
 	/**
 	 * Visit a parse tree produced by `FilterQueryParser.functionParamList`.
 	 * @param ctx the parse tree

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/SigNoz/clickhouse-go-mock v0.14.0
 	github.com/SigNoz/govaluate v0.0.0-20240203125216-988004ccc7fd
 	github.com/SigNoz/signoz-otel-collector v0.144.6
-	github.com/SigNoz/signoz-semantic-conventions/gen/go v0.0.2
+	github.com/SigNoz/signoz-semantic-conventions/gen/go v0.0.1
 	github.com/antlr4-go/antlr/v4 v4.13.1
 	github.com/antonmedv/expr v1.15.3
 	github.com/cespare/xxhash/v2 v2.3.0

go.sum

@@ -102,8 +102,8 @@ github.com/SigNoz/govaluate v0.0.0-20240203125216-988004ccc7fd h1:Bk43AsDYe0fhkb
 github.com/SigNoz/govaluate v0.0.0-20240203125216-988004ccc7fd/go.mod h1:nxRcH/OEdM8QxzH37xkGzomr1O0JpYBRS6pwjsWW6Pc=
 github.com/SigNoz/signoz-otel-collector v0.144.6 h1:AgblCIDlLKGtssS4ywvyEByH9fbJ7hFqZvPvUVJKwp8=
 github.com/SigNoz/signoz-otel-collector v0.144.6/go.mod h1:YRQw6ETaq7fm8ts4Itgb6wC0bVhc0+nC6PFI0MaiH9k=
-github.com/SigNoz/signoz-semantic-conventions/gen/go v0.0.2 h1:b0YEbA8sjW73bcDl9PhYrftdZ2uScWMcIu6zKwh4/9I=
-github.com/SigNoz/signoz-semantic-conventions/gen/go v0.0.2/go.mod h1:RSsdmH4/6H+EHeNPyqJ59dGdpKS0hl2p3T5g1NbehOU=
+github.com/SigNoz/signoz-semantic-conventions/gen/go v0.0.1 h1:eKJ4vmSLYIfufgh+HaiJxXZts12Xz4jr81HMYYoQvMU=
+github.com/SigNoz/signoz-semantic-conventions/gen/go v0.0.1/go.mod h1:RSsdmH4/6H+EHeNPyqJ59dGdpKS0hl2p3T5g1NbehOU=
 github.com/Yiling-J/theine-go v0.6.2 h1:1GeoXeQ0O0AUkiwj2S9Jc0Mzx+hpqzmqsJ4kIC4M9AY=
 github.com/Yiling-J/theine-go v0.6.2/go.mod h1:08QpMa5JZ2pKN+UJCRrCasWYO1IKCdl54Xa836rpmDU=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=

grammar/FilterQuery.g4

@@ -38,6 +38,7 @@ primary
     | comparison
     | functionCall
     | searchCall
+    | patternCall
     | fullText
     | key
     | value
@@ -121,6 +122,16 @@ searchCall
     ;
 
 // Function parameters can be keys, single scalar values, or arrays
+/*
+ * Log pattern filter: pattern('User <*> logged in from <IP>'[, '...']) keeps the
+ * logs whose pattern is one of the given pattern texts. Handled in the visitor.
+ * PATTERN_CALL carries its opening parenthesis, so a bare `pattern` stays a key
+ * or a full-text word.
+ */
+patternCall
+    : PATTERN_CALL valueList RPAREN
+    ;
+
 functionParamList
     : functionParam ( COMMA functionParam )*
     ;
@@ -195,6 +206,7 @@ HAS         : [Hh][Aa][Ss] ;
 HASANY      : [Hh][Aa][Ss][Aa][Nn][Yy] ;
 HASALL      : [Hh][Aa][Ss][Aa][Ll][Ll] ;
 SEARCH      : [Ss][Ee][Aa][Rr][Cc][Hh] ;
+PATTERN_CALL : [Pp][Aa][Tt][Tt][Ee][Rr][Nn] [ \t]* '(' ;
 
 // Potential boolean constants
 BOOL

pkg/contextlinks/alert_link_visitor.go

@@ -176,6 +176,8 @@ func (r *WhereClauseRewriter) VisitPrimary(ctx *parser.PrimaryContext) any {
 		ctx.FunctionCall().Accept(r)
 	} else if ctx.SearchCall() != nil {
 		ctx.SearchCall().Accept(r)
+	} else if ctx.PatternCall() != nil {
+		ctx.PatternCall().Accept(r)
 	} else if ctx.FullText() != nil {
 		ctx.FullText().Accept(r)
 	} else if ctx.Key() != nil {
@@ -374,6 +376,13 @@ func (r *WhereClauseRewriter) VisitSearchCall(ctx *parser.SearchCallContext) any
 	return nil
 }
 
+// VisitPatternCall visits pattern() calls. It has no keys to rewrite, so it
+// is preserved verbatim.
+func (r *WhereClauseRewriter) VisitPatternCall(ctx *parser.PatternCallContext) any {
+	r.rewritten.WriteString(ctx.GetText())
+	return nil
+}
+
 // VisitFunctionCall visits function calls.
 func (r *WhereClauseRewriter) VisitFunctionCall(ctx *parser.FunctionCallContext) any {
 	// Write function name

pkg/parser/filterquery/grammar/FilterQuery.tokens

@@ -25,12 +25,13 @@ HAS=24
 HASANY=25
 HASALL=26
 SEARCH=27
-BOOL=28
-NUMBER=29
-QUOTED_TEXT=30
-KEY=31
-WS=32
-FREETEXT=33
+PATTERN_CALL=28
+BOOL=29
+NUMBER=30
+QUOTED_TEXT=31
+KEY=32
+WS=33
+FREETEXT=34
 '('=1
 ')'=2
 '['=3

pkg/parser/filterquery/grammar/FilterQueryLexer.tokens

@@ -25,12 +25,13 @@ HAS=24
 HASANY=25
 HASALL=26
 SEARCH=27
-BOOL=28
-NUMBER=29
-QUOTED_TEXT=30
-KEY=31
-WS=32
-FREETEXT=33
+PATTERN_CALL=28
+BOOL=29
+NUMBER=30
+QUOTED_TEXT=31
+KEY=32
+WS=33
+FREETEXT=34
 '('=1
 ')'=2
 '['=3

pkg/parser/filterquery/grammar/filterquery_base_listener.go

@@ -99,6 +99,12 @@ func (s *BaseFilterQueryListener) EnterSearchCall(ctx *SearchCallContext) {}
 // ExitSearchCall is called when production searchCall is exited.
 func (s *BaseFilterQueryListener) ExitSearchCall(ctx *SearchCallContext) {}
 
+// EnterPatternCall is called when production patternCall is entered.
+func (s *BaseFilterQueryListener) EnterPatternCall(ctx *PatternCallContext) {}
+
+// ExitPatternCall is called when production patternCall is exited.
+func (s *BaseFilterQueryListener) ExitPatternCall(ctx *PatternCallContext) {}
+
 // EnterFunctionParamList is called when production functionParamList is entered.
 func (s *BaseFilterQueryListener) EnterFunctionParamList(ctx *FunctionParamListContext) {}
 

pkg/parser/filterquery/grammar/filterquery_base_visitor.go

@@ -60,6 +60,10 @@ func (v *BaseFilterQueryVisitor) VisitSearchCall(ctx *SearchCallContext) interfa
 	return v.VisitChildren(ctx)
 }
 
+func (v *BaseFilterQueryVisitor) VisitPatternCall(ctx *PatternCallContext) interface{} {
+	return v.VisitChildren(ctx)
+}
+
 func (v *BaseFilterQueryVisitor) VisitFunctionParamList(ctx *FunctionParamListContext) interface{} {
 	return v.VisitChildren(ctx)
 }

pkg/parser/filterquery/grammar/filterquery_lexer.go

@@ -50,174 +50,184 @@ func filterquerylexerLexerInit() {
 		"", "LPAREN", "RPAREN", "LBRACK", "RBRACK", "COMMA", "EQUALS", "NOT_EQUALS",
 		"NEQ", "LT", "LE", "GT", "GE", "LIKE", "ILIKE", "BETWEEN", "EXISTS",
 		"REGEXP", "CONTAINS", "IN", "NOT", "AND", "OR", "HASTOKEN", "HAS", "HASANY",
-		"HASALL", "SEARCH", "BOOL", "NUMBER", "QUOTED_TEXT", "KEY", "WS", "FREETEXT",
+		"HASALL", "SEARCH", "PATTERN_CALL", "BOOL", "NUMBER", "QUOTED_TEXT",
+		"KEY", "WS", "FREETEXT",
 	}
 	staticData.RuleNames = []string{
 		"LPAREN", "RPAREN", "LBRACK", "RBRACK", "COMMA", "EQUALS", "NOT_EQUALS",
 		"NEQ", "LT", "LE", "GT", "GE", "LIKE", "ILIKE", "BETWEEN", "EXISTS",
 		"REGEXP", "CONTAINS", "IN", "NOT", "AND", "OR", "HASTOKEN", "HAS", "HASANY",
-		"HASALL", "SEARCH", "BOOL", "SIGN", "NUMBER", "QUOTED_TEXT", "SEGMENT",
-		"EMPTY_BRACKS", "OLD_JSON_BRACKS", "KEY", "WS", "DIGIT", "FREETEXT",
+		"HASALL", "SEARCH", "PATTERN_CALL", "BOOL", "SIGN", "NUMBER", "QUOTED_TEXT",
+		"SEGMENT", "EMPTY_BRACKS", "OLD_JSON_BRACKS", "KEY", "WS", "DIGIT",
+		"FREETEXT",
 	}
 	staticData.PredictionContextCache = antlr.NewPredictionContextCache()
 	staticData.serializedATN = []int32{
-		4, 0, 33, 329, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2,
+		4, 0, 34, 346, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2,
 		4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2,
 		10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15,
 		7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7,
 		20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25,
 		2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2,
 		31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36,
-		7, 36, 2, 37, 7, 37, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1,
-		4, 1, 4, 1, 5, 1, 5, 1, 5, 3, 5, 91, 8, 5, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7,
-		1, 7, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11,
-		1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1,
-		13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15,
-		1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 134, 8, 15, 1, 16, 1, 16, 1, 16, 1,
-		16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17,
-		1, 17, 3, 17, 151, 8, 17, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1,
-		19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22,
-		1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 1,
-		24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 25,
-		1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1,
-		27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 3, 27, 210,
-		8, 27, 1, 28, 1, 28, 1, 29, 3, 29, 215, 8, 29, 1, 29, 4, 29, 218, 8, 29,
-		11, 29, 12, 29, 219, 1, 29, 1, 29, 5, 29, 224, 8, 29, 10, 29, 12, 29, 227,
-		9, 29, 3, 29, 229, 8, 29, 1, 29, 1, 29, 3, 29, 233, 8, 29, 1, 29, 4, 29,
-		236, 8, 29, 11, 29, 12, 29, 237, 3, 29, 240, 8, 29, 1, 29, 3, 29, 243,
-		8, 29, 1, 29, 1, 29, 4, 29, 247, 8, 29, 11, 29, 12, 29, 248, 1, 29, 1,
-		29, 3, 29, 253, 8, 29, 1, 29, 4, 29, 256, 8, 29, 11, 29, 12, 29, 257, 3,
-		29, 260, 8, 29, 3, 29, 262, 8, 29, 1, 30, 1, 30, 1, 30, 1, 30, 5, 30, 268,
-		8, 30, 10, 30, 12, 30, 271, 9, 30, 1, 30, 1, 30, 1, 30, 1, 30, 1, 30, 5,
-		30, 278, 8, 30, 10, 30, 12, 30, 281, 9, 30, 1, 30, 3, 30, 284, 8, 30, 1,
-		31, 1, 31, 5, 31, 288, 8, 31, 10, 31, 12, 31, 291, 9, 31, 1, 32, 1, 32,
-		1, 32, 1, 33, 1, 33, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1,
-		34, 1, 34, 4, 34, 307, 8, 34, 11, 34, 12, 34, 308, 5, 34, 311, 8, 34, 10,
-		34, 12, 34, 314, 9, 34, 1, 35, 4, 35, 317, 8, 35, 11, 35, 12, 35, 318,
-		1, 35, 1, 35, 1, 36, 1, 36, 1, 37, 4, 37, 326, 8, 37, 11, 37, 12, 37, 327,
-		0, 0, 38, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19,
-		10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37,
-		19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55,
-		28, 57, 0, 59, 29, 61, 30, 63, 0, 65, 0, 67, 0, 69, 31, 71, 32, 73, 0,
-		75, 33, 1, 0, 29, 2, 0, 76, 76, 108, 108, 2, 0, 73, 73, 105, 105, 2, 0,
-		75, 75, 107, 107, 2, 0, 69, 69, 101, 101, 2, 0, 66, 66, 98, 98, 2, 0, 84,
-		84, 116, 116, 2, 0, 87, 87, 119, 119, 2, 0, 78, 78, 110, 110, 2, 0, 88,
-		88, 120, 120, 2, 0, 83, 83, 115, 115, 2, 0, 82, 82, 114, 114, 2, 0, 71,
-		71, 103, 103, 2, 0, 80, 80, 112, 112, 2, 0, 67, 67, 99, 99, 2, 0, 79, 79,
-		111, 111, 2, 0, 65, 65, 97, 97, 2, 0, 68, 68, 100, 100, 2, 0, 72, 72, 104,
-		104, 2, 0, 89, 89, 121, 121, 2, 0, 85, 85, 117, 117, 2, 0, 70, 70, 102,
-		102, 2, 0, 43, 43, 45, 45, 2, 0, 34, 34, 92, 92, 2, 0, 39, 39, 92, 92,
-		4, 0, 35, 36, 64, 90, 95, 95, 97, 123, 7, 0, 35, 36, 45, 45, 47, 58, 64,
-		90, 95, 95, 97, 123, 125, 125, 3, 0, 9, 10, 13, 13, 32, 32, 1, 0, 48, 57,
-		8, 0, 9, 10, 13, 13, 32, 34, 39, 41, 44, 44, 60, 62, 91, 91, 93, 93, 353,
-		0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0,
-		0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0,
-		0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0,
-		0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1,
-		0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39,
-		1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0,
-		47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0,
-		0, 55, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 69, 1, 0, 0,
-		0, 0, 71, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 1, 77, 1, 0, 0, 0, 3, 79, 1, 0,
-		0, 0, 5, 81, 1, 0, 0, 0, 7, 83, 1, 0, 0, 0, 9, 85, 1, 0, 0, 0, 11, 90,
-		1, 0, 0, 0, 13, 92, 1, 0, 0, 0, 15, 95, 1, 0, 0, 0, 17, 98, 1, 0, 0, 0,
-		19, 100, 1, 0, 0, 0, 21, 103, 1, 0, 0, 0, 23, 105, 1, 0, 0, 0, 25, 108,
-		1, 0, 0, 0, 27, 113, 1, 0, 0, 0, 29, 119, 1, 0, 0, 0, 31, 127, 1, 0, 0,
-		0, 33, 135, 1, 0, 0, 0, 35, 142, 1, 0, 0, 0, 37, 152, 1, 0, 0, 0, 39, 155,
-		1, 0, 0, 0, 41, 159, 1, 0, 0, 0, 43, 163, 1, 0, 0, 0, 45, 166, 1, 0, 0,
-		0, 47, 175, 1, 0, 0, 0, 49, 179, 1, 0, 0, 0, 51, 186, 1, 0, 0, 0, 53, 193,
-		1, 0, 0, 0, 55, 209, 1, 0, 0, 0, 57, 211, 1, 0, 0, 0, 59, 261, 1, 0, 0,
-		0, 61, 283, 1, 0, 0, 0, 63, 285, 1, 0, 0, 0, 65, 292, 1, 0, 0, 0, 67, 295,
-		1, 0, 0, 0, 69, 299, 1, 0, 0, 0, 71, 316, 1, 0, 0, 0, 73, 322, 1, 0, 0,
-		0, 75, 325, 1, 0, 0, 0, 77, 78, 5, 40, 0, 0, 78, 2, 1, 0, 0, 0, 79, 80,
-		5, 41, 0, 0, 80, 4, 1, 0, 0, 0, 81, 82, 5, 91, 0, 0, 82, 6, 1, 0, 0, 0,
-		83, 84, 5, 93, 0, 0, 84, 8, 1, 0, 0, 0, 85, 86, 5, 44, 0, 0, 86, 10, 1,
-		0, 0, 0, 87, 91, 5, 61, 0, 0, 88, 89, 5, 61, 0, 0, 89, 91, 5, 61, 0, 0,
-		90, 87, 1, 0, 0, 0, 90, 88, 1, 0, 0, 0, 91, 12, 1, 0, 0, 0, 92, 93, 5,
-		33, 0, 0, 93, 94, 5, 61, 0, 0, 94, 14, 1, 0, 0, 0, 95, 96, 5, 60, 0, 0,
-		96, 97, 5, 62, 0, 0, 97, 16, 1, 0, 0, 0, 98, 99, 5, 60, 0, 0, 99, 18, 1,
-		0, 0, 0, 100, 101, 5, 60, 0, 0, 101, 102, 5, 61, 0, 0, 102, 20, 1, 0, 0,
-		0, 103, 104, 5, 62, 0, 0, 104, 22, 1, 0, 0, 0, 105, 106, 5, 62, 0, 0, 106,
-		107, 5, 61, 0, 0, 107, 24, 1, 0, 0, 0, 108, 109, 7, 0, 0, 0, 109, 110,
-		7, 1, 0, 0, 110, 111, 7, 2, 0, 0, 111, 112, 7, 3, 0, 0, 112, 26, 1, 0,
-		0, 0, 113, 114, 7, 1, 0, 0, 114, 115, 7, 0, 0, 0, 115, 116, 7, 1, 0, 0,
-		116, 117, 7, 2, 0, 0, 117, 118, 7, 3, 0, 0, 118, 28, 1, 0, 0, 0, 119, 120,
-		7, 4, 0, 0, 120, 121, 7, 3, 0, 0, 121, 122, 7, 5, 0, 0, 122, 123, 7, 6,
-		0, 0, 123, 124, 7, 3, 0, 0, 124, 125, 7, 3, 0, 0, 125, 126, 7, 7, 0, 0,
-		126, 30, 1, 0, 0, 0, 127, 128, 7, 3, 0, 0, 128, 129, 7, 8, 0, 0, 129, 130,
-		7, 1, 0, 0, 130, 131, 7, 9, 0, 0, 131, 133, 7, 5, 0, 0, 132, 134, 7, 9,
-		0, 0, 133, 132, 1, 0, 0, 0, 133, 134, 1, 0, 0, 0, 134, 32, 1, 0, 0, 0,
-		135, 136, 7, 10, 0, 0, 136, 137, 7, 3, 0, 0, 137, 138, 7, 11, 0, 0, 138,
-		139, 7, 3, 0, 0, 139, 140, 7, 8, 0, 0, 140, 141, 7, 12, 0, 0, 141, 34,
-		1, 0, 0, 0, 142, 143, 7, 13, 0, 0, 143, 144, 7, 14, 0, 0, 144, 145, 7,
-		7, 0, 0, 145, 146, 7, 5, 0, 0, 146, 147, 7, 15, 0, 0, 147, 148, 7, 1, 0,
-		0, 148, 150, 7, 7, 0, 0, 149, 151, 7, 9, 0, 0, 150, 149, 1, 0, 0, 0, 150,
-		151, 1, 0, 0, 0, 151, 36, 1, 0, 0, 0, 152, 153, 7, 1, 0, 0, 153, 154, 7,
-		7, 0, 0, 154, 38, 1, 0, 0, 0, 155, 156, 7, 7, 0, 0, 156, 157, 7, 14, 0,
-		0, 157, 158, 7, 5, 0, 0, 158, 40, 1, 0, 0, 0, 159, 160, 7, 15, 0, 0, 160,
-		161, 7, 7, 0, 0, 161, 162, 7, 16, 0, 0, 162, 42, 1, 0, 0, 0, 163, 164,
-		7, 14, 0, 0, 164, 165, 7, 10, 0, 0, 165, 44, 1, 0, 0, 0, 166, 167, 7, 17,
-		0, 0, 167, 168, 7, 15, 0, 0, 168, 169, 7, 9, 0, 0, 169, 170, 7, 5, 0, 0,
-		170, 171, 7, 14, 0, 0, 171, 172, 7, 2, 0, 0, 172, 173, 7, 3, 0, 0, 173,
-		174, 7, 7, 0, 0, 174, 46, 1, 0, 0, 0, 175, 176, 7, 17, 0, 0, 176, 177,
-		7, 15, 0, 0, 177, 178, 7, 9, 0, 0, 178, 48, 1, 0, 0, 0, 179, 180, 7, 17,
-		0, 0, 180, 181, 7, 15, 0, 0, 181, 182, 7, 9, 0, 0, 182, 183, 7, 15, 0,
-		0, 183, 184, 7, 7, 0, 0, 184, 185, 7, 18, 0, 0, 185, 50, 1, 0, 0, 0, 186,
-		187, 7, 17, 0, 0, 187, 188, 7, 15, 0, 0, 188, 189, 7, 9, 0, 0, 189, 190,
-		7, 15, 0, 0, 190, 191, 7, 0, 0, 0, 191, 192, 7, 0, 0, 0, 192, 52, 1, 0,
-		0, 0, 193, 194, 7, 9, 0, 0, 194, 195, 7, 3, 0, 0, 195, 196, 7, 15, 0, 0,
-		196, 197, 7, 10, 0, 0, 197, 198, 7, 13, 0, 0, 198, 199, 7, 17, 0, 0, 199,
-		54, 1, 0, 0, 0, 200, 201, 7, 5, 0, 0, 201, 202, 7, 10, 0, 0, 202, 203,
-		7, 19, 0, 0, 203, 210, 7, 3, 0, 0, 204, 205, 7, 20, 0, 0, 205, 206, 7,
-		15, 0, 0, 206, 207, 7, 0, 0, 0, 207, 208, 7, 9, 0, 0, 208, 210, 7, 3, 0,
-		0, 209, 200, 1, 0, 0, 0, 209, 204, 1, 0, 0, 0, 210, 56, 1, 0, 0, 0, 211,
-		212, 7, 21, 0, 0, 212, 58, 1, 0, 0, 0, 213, 215, 3, 57, 28, 0, 214, 213,
-		1, 0, 0, 0, 214, 215, 1, 0, 0, 0, 215, 217, 1, 0, 0, 0, 216, 218, 3, 73,
-		36, 0, 217, 216, 1, 0, 0, 0, 218, 219, 1, 0, 0, 0, 219, 217, 1, 0, 0, 0,
-		219, 220, 1, 0, 0, 0, 220, 228, 1, 0, 0, 0, 221, 225, 5, 46, 0, 0, 222,
-		224, 3, 73, 36, 0, 223, 222, 1, 0, 0, 0, 224, 227, 1, 0, 0, 0, 225, 223,
-		1, 0, 0, 0, 225, 226, 1, 0, 0, 0, 226, 229, 1, 0, 0, 0, 227, 225, 1, 0,
-		0, 0, 228, 221, 1, 0, 0, 0, 228, 229, 1, 0, 0, 0, 229, 239, 1, 0, 0, 0,
-		230, 232, 7, 3, 0, 0, 231, 233, 3, 57, 28, 0, 232, 231, 1, 0, 0, 0, 232,
-		233, 1, 0, 0, 0, 233, 235, 1, 0, 0, 0, 234, 236, 3, 73, 36, 0, 235, 234,
-		1, 0, 0, 0, 236, 237, 1, 0, 0, 0, 237, 235, 1, 0, 0, 0, 237, 238, 1, 0,
-		0, 0, 238, 240, 1, 0, 0, 0, 239, 230, 1, 0, 0, 0, 239, 240, 1, 0, 0, 0,
-		240, 262, 1, 0, 0, 0, 241, 243, 3, 57, 28, 0, 242, 241, 1, 0, 0, 0, 242,
-		243, 1, 0, 0, 0, 243, 244, 1, 0, 0, 0, 244, 246, 5, 46, 0, 0, 245, 247,
-		3, 73, 36, 0, 246, 245, 1, 0, 0, 0, 247, 248, 1, 0, 0, 0, 248, 246, 1,
-		0, 0, 0, 248, 249, 1, 0, 0, 0, 249, 259, 1, 0, 0, 0, 250, 252, 7, 3, 0,
-		0, 251, 253, 3, 57, 28, 0, 252, 251, 1, 0, 0, 0, 252, 253, 1, 0, 0, 0,
-		253, 255, 1, 0, 0, 0, 254, 256, 3, 73, 36, 0, 255, 254, 1, 0, 0, 0, 256,
-		257, 1, 0, 0, 0, 257, 255, 1, 0, 0, 0, 257, 258, 1, 0, 0, 0, 258, 260,
-		1, 0, 0, 0, 259, 250, 1, 0, 0, 0, 259, 260, 1, 0, 0, 0, 260, 262, 1, 0,
-		0, 0, 261, 214, 1, 0, 0, 0, 261, 242, 1, 0, 0, 0, 262, 60, 1, 0, 0, 0,
-		263, 269, 5, 34, 0, 0, 264, 268, 8, 22, 0, 0, 265, 266, 5, 92, 0, 0, 266,
-		268, 9, 0, 0, 0, 267, 264, 1, 0, 0, 0, 267, 265, 1, 0, 0, 0, 268, 271,
-		1, 0, 0, 0, 269, 267, 1, 0, 0, 0, 269, 270, 1, 0, 0, 0, 270, 272, 1, 0,
-		0, 0, 271, 269, 1, 0, 0, 0, 272, 284, 5, 34, 0, 0, 273, 279, 5, 39, 0,
-		0, 274, 278, 8, 23, 0, 0, 275, 276, 5, 92, 0, 0, 276, 278, 9, 0, 0, 0,
-		277, 274, 1, 0, 0, 0, 277, 275, 1, 0, 0, 0, 278, 281, 1, 0, 0, 0, 279,
-		277, 1, 0, 0, 0, 279, 280, 1, 0, 0, 0, 280, 282, 1, 0, 0, 0, 281, 279,
-		1, 0, 0, 0, 282, 284, 5, 39, 0, 0, 283, 263, 1, 0, 0, 0, 283, 273, 1, 0,
-		0, 0, 284, 62, 1, 0, 0, 0, 285, 289, 7, 24, 0, 0, 286, 288, 7, 25, 0, 0,
-		287, 286, 1, 0, 0, 0, 288, 291, 1, 0, 0, 0, 289, 287, 1, 0, 0, 0, 289,
-		290, 1, 0, 0, 0, 290, 64, 1, 0, 0, 0, 291, 289, 1, 0, 0, 0, 292, 293, 5,
-		91, 0, 0, 293, 294, 5, 93, 0, 0, 294, 66, 1, 0, 0, 0, 295, 296, 5, 91,
-		0, 0, 296, 297, 5, 42, 0, 0, 297, 298, 5, 93, 0, 0, 298, 68, 1, 0, 0, 0,
-		299, 312, 3, 63, 31, 0, 300, 301, 5, 46, 0, 0, 301, 311, 3, 63, 31, 0,
-		302, 311, 3, 65, 32, 0, 303, 311, 3, 67, 33, 0, 304, 306, 5, 46, 0, 0,
-		305, 307, 3, 73, 36, 0, 306, 305, 1, 0, 0, 0, 307, 308, 1, 0, 0, 0, 308,
-		306, 1, 0, 0, 0, 308, 309, 1, 0, 0, 0, 309, 311, 1, 0, 0, 0, 310, 300,
-		1, 0, 0, 0, 310, 302, 1, 0, 0, 0, 310, 303, 1, 0, 0, 0, 310, 304, 1, 0,
-		0, 0, 311, 314, 1, 0, 0, 0, 312, 310, 1, 0, 0, 0, 312, 313, 1, 0, 0, 0,
-		313, 70, 1, 0, 0, 0, 314, 312, 1, 0, 0, 0, 315, 317, 7, 26, 0, 0, 316,
-		315, 1, 0, 0, 0, 317, 318, 1, 0, 0, 0, 318, 316, 1, 0, 0, 0, 318, 319,
-		1, 0, 0, 0, 319, 320, 1, 0, 0, 0, 320, 321, 6, 35, 0, 0, 321, 72, 1, 0,
-		0, 0, 322, 323, 7, 27, 0, 0, 323, 74, 1, 0, 0, 0, 324, 326, 8, 28, 0, 0,
-		325, 324, 1, 0, 0, 0, 326, 327, 1, 0, 0, 0, 327, 325, 1, 0, 0, 0, 327,
-		328, 1, 0, 0, 0, 328, 76, 1, 0, 0, 0, 29, 0, 90, 133, 150, 209, 214, 219,
-		225, 228, 232, 237, 239, 242, 248, 252, 257, 259, 261, 267, 269, 277, 279,
-		283, 289, 308, 310, 312, 318, 327, 1, 6, 0, 0,
+		7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2,
+		1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 3, 5, 93, 8, 5, 1, 6, 1, 6, 1,
+		6, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 11,
+		1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1,
+		13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14,
+		1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 136, 8, 15, 1, 16, 1,
+		16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17,
+		1, 17, 1, 17, 1, 17, 3, 17, 153, 8, 17, 1, 18, 1, 18, 1, 18, 1, 19, 1,
+		19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22,
+		1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1,
+		23, 1, 23, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25,
+		1, 25, 1, 25, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1,
+		26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 5, 27,
+		211, 8, 27, 10, 27, 12, 27, 214, 9, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1,
+		28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 3, 28, 227, 8, 28, 1, 29,
+		1, 29, 1, 30, 3, 30, 232, 8, 30, 1, 30, 4, 30, 235, 8, 30, 11, 30, 12,
+		30, 236, 1, 30, 1, 30, 5, 30, 241, 8, 30, 10, 30, 12, 30, 244, 9, 30, 3,
+		30, 246, 8, 30, 1, 30, 1, 30, 3, 30, 250, 8, 30, 1, 30, 4, 30, 253, 8,
+		30, 11, 30, 12, 30, 254, 3, 30, 257, 8, 30, 1, 30, 3, 30, 260, 8, 30, 1,
+		30, 1, 30, 4, 30, 264, 8, 30, 11, 30, 12, 30, 265, 1, 30, 1, 30, 3, 30,
+		270, 8, 30, 1, 30, 4, 30, 273, 8, 30, 11, 30, 12, 30, 274, 3, 30, 277,
+		8, 30, 3, 30, 279, 8, 30, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 285, 8, 31,
+		10, 31, 12, 31, 288, 9, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 295,
+		8, 31, 10, 31, 12, 31, 298, 9, 31, 1, 31, 3, 31, 301, 8, 31, 1, 32, 1,
+		32, 5, 32, 305, 8, 32, 10, 32, 12, 32, 308, 9, 32, 1, 33, 1, 33, 1, 33,
+		1, 34, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1,
+		35, 4, 35, 324, 8, 35, 11, 35, 12, 35, 325, 5, 35, 328, 8, 35, 10, 35,
+		12, 35, 331, 9, 35, 1, 36, 4, 36, 334, 8, 36, 11, 36, 12, 36, 335, 1, 36,
+		1, 36, 1, 37, 1, 37, 1, 38, 4, 38, 343, 8, 38, 11, 38, 12, 38, 344, 0,
+		0, 39, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10,
+		21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19,
+		39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28,
+		57, 29, 59, 0, 61, 30, 63, 31, 65, 0, 67, 0, 69, 0, 71, 32, 73, 33, 75,
+		0, 77, 34, 1, 0, 30, 2, 0, 76, 76, 108, 108, 2, 0, 73, 73, 105, 105, 2,
+		0, 75, 75, 107, 107, 2, 0, 69, 69, 101, 101, 2, 0, 66, 66, 98, 98, 2, 0,
+		84, 84, 116, 116, 2, 0, 87, 87, 119, 119, 2, 0, 78, 78, 110, 110, 2, 0,
+		88, 88, 120, 120, 2, 0, 83, 83, 115, 115, 2, 0, 82, 82, 114, 114, 2, 0,
+		71, 71, 103, 103, 2, 0, 80, 80, 112, 112, 2, 0, 67, 67, 99, 99, 2, 0, 79,
+		79, 111, 111, 2, 0, 65, 65, 97, 97, 2, 0, 68, 68, 100, 100, 2, 0, 72, 72,
+		104, 104, 2, 0, 89, 89, 121, 121, 2, 0, 9, 9, 32, 32, 2, 0, 85, 85, 117,
+		117, 2, 0, 70, 70, 102, 102, 2, 0, 43, 43, 45, 45, 2, 0, 34, 34, 92, 92,
+		2, 0, 39, 39, 92, 92, 4, 0, 35, 36, 64, 90, 95, 95, 97, 123, 7, 0, 35,
+		36, 45, 45, 47, 58, 64, 90, 95, 95, 97, 123, 125, 125, 3, 0, 9, 10, 13,
+		13, 32, 32, 1, 0, 48, 57, 8, 0, 9, 10, 13, 13, 32, 34, 39, 41, 44, 44,
+		60, 62, 91, 91, 93, 93, 371, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5,
+		1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13,
+		1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0,
+		21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0,
+		0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0,
+		0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0,
+		0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1,
+		0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 61,
+		1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0,
+		77, 1, 0, 0, 0, 1, 79, 1, 0, 0, 0, 3, 81, 1, 0, 0, 0, 5, 83, 1, 0, 0, 0,
+		7, 85, 1, 0, 0, 0, 9, 87, 1, 0, 0, 0, 11, 92, 1, 0, 0, 0, 13, 94, 1, 0,
+		0, 0, 15, 97, 1, 0, 0, 0, 17, 100, 1, 0, 0, 0, 19, 102, 1, 0, 0, 0, 21,
+		105, 1, 0, 0, 0, 23, 107, 1, 0, 0, 0, 25, 110, 1, 0, 0, 0, 27, 115, 1,
+		0, 0, 0, 29, 121, 1, 0, 0, 0, 31, 129, 1, 0, 0, 0, 33, 137, 1, 0, 0, 0,
+		35, 144, 1, 0, 0, 0, 37, 154, 1, 0, 0, 0, 39, 157, 1, 0, 0, 0, 41, 161,
+		1, 0, 0, 0, 43, 165, 1, 0, 0, 0, 45, 168, 1, 0, 0, 0, 47, 177, 1, 0, 0,
+		0, 49, 181, 1, 0, 0, 0, 51, 188, 1, 0, 0, 0, 53, 195, 1, 0, 0, 0, 55, 202,
+		1, 0, 0, 0, 57, 226, 1, 0, 0, 0, 59, 228, 1, 0, 0, 0, 61, 278, 1, 0, 0,
+		0, 63, 300, 1, 0, 0, 0, 65, 302, 1, 0, 0, 0, 67, 309, 1, 0, 0, 0, 69, 312,
+		1, 0, 0, 0, 71, 316, 1, 0, 0, 0, 73, 333, 1, 0, 0, 0, 75, 339, 1, 0, 0,
+		0, 77, 342, 1, 0, 0, 0, 79, 80, 5, 40, 0, 0, 80, 2, 1, 0, 0, 0, 81, 82,
+		5, 41, 0, 0, 82, 4, 1, 0, 0, 0, 83, 84, 5, 91, 0, 0, 84, 6, 1, 0, 0, 0,
+		85, 86, 5, 93, 0, 0, 86, 8, 1, 0, 0, 0, 87, 88, 5, 44, 0, 0, 88, 10, 1,
+		0, 0, 0, 89, 93, 5, 61, 0, 0, 90, 91, 5, 61, 0, 0, 91, 93, 5, 61, 0, 0,
+		92, 89, 1, 0, 0, 0, 92, 90, 1, 0, 0, 0, 93, 12, 1, 0, 0, 0, 94, 95, 5,
+		33, 0, 0, 95, 96, 5, 61, 0, 0, 96, 14, 1, 0, 0, 0, 97, 98, 5, 60, 0, 0,
+		98, 99, 5, 62, 0, 0, 99, 16, 1, 0, 0, 0, 100, 101, 5, 60, 0, 0, 101, 18,
+		1, 0, 0, 0, 102, 103, 5, 60, 0, 0, 103, 104, 5, 61, 0, 0, 104, 20, 1, 0,
+		0, 0, 105, 106, 5, 62, 0, 0, 106, 22, 1, 0, 0, 0, 107, 108, 5, 62, 0, 0,
+		108, 109, 5, 61, 0, 0, 109, 24, 1, 0, 0, 0, 110, 111, 7, 0, 0, 0, 111,
+		112, 7, 1, 0, 0, 112, 113, 7, 2, 0, 0, 113, 114, 7, 3, 0, 0, 114, 26, 1,
+		0, 0, 0, 115, 116, 7, 1, 0, 0, 116, 117, 7, 0, 0, 0, 117, 118, 7, 1, 0,
+		0, 118, 119, 7, 2, 0, 0, 119, 120, 7, 3, 0, 0, 120, 28, 1, 0, 0, 0, 121,
+		122, 7, 4, 0, 0, 122, 123, 7, 3, 0, 0, 123, 124, 7, 5, 0, 0, 124, 125,
+		7, 6, 0, 0, 125, 126, 7, 3, 0, 0, 126, 127, 7, 3, 0, 0, 127, 128, 7, 7,
+		0, 0, 128, 30, 1, 0, 0, 0, 129, 130, 7, 3, 0, 0, 130, 131, 7, 8, 0, 0,
+		131, 132, 7, 1, 0, 0, 132, 133, 7, 9, 0, 0, 133, 135, 7, 5, 0, 0, 134,
+		136, 7, 9, 0, 0, 135, 134, 1, 0, 0, 0, 135, 136, 1, 0, 0, 0, 136, 32, 1,
+		0, 0, 0, 137, 138, 7, 10, 0, 0, 138, 139, 7, 3, 0, 0, 139, 140, 7, 11,
+		0, 0, 140, 141, 7, 3, 0, 0, 141, 142, 7, 8, 0, 0, 142, 143, 7, 12, 0, 0,
+		143, 34, 1, 0, 0, 0, 144, 145, 7, 13, 0, 0, 145, 146, 7, 14, 0, 0, 146,
+		147, 7, 7, 0, 0, 147, 148, 7, 5, 0, 0, 148, 149, 7, 15, 0, 0, 149, 150,
+		7, 1, 0, 0, 150, 152, 7, 7, 0, 0, 151, 153, 7, 9, 0, 0, 152, 151, 1, 0,
+		0, 0, 152, 153, 1, 0, 0, 0, 153, 36, 1, 0, 0, 0, 154, 155, 7, 1, 0, 0,
+		155, 156, 7, 7, 0, 0, 156, 38, 1, 0, 0, 0, 157, 158, 7, 7, 0, 0, 158, 159,
+		7, 14, 0, 0, 159, 160, 7, 5, 0, 0, 160, 40, 1, 0, 0, 0, 161, 162, 7, 15,
+		0, 0, 162, 163, 7, 7, 0, 0, 163, 164, 7, 16, 0, 0, 164, 42, 1, 0, 0, 0,
+		165, 166, 7, 14, 0, 0, 166, 167, 7, 10, 0, 0, 167, 44, 1, 0, 0, 0, 168,
+		169, 7, 17, 0, 0, 169, 170, 7, 15, 0, 0, 170, 171, 7, 9, 0, 0, 171, 172,
+		7, 5, 0, 0, 172, 173, 7, 14, 0, 0, 173, 174, 7, 2, 0, 0, 174, 175, 7, 3,
+		0, 0, 175, 176, 7, 7, 0, 0, 176, 46, 1, 0, 0, 0, 177, 178, 7, 17, 0, 0,
+		178, 179, 7, 15, 0, 0, 179, 180, 7, 9, 0, 0, 180, 48, 1, 0, 0, 0, 181,
+		182, 7, 17, 0, 0, 182, 183, 7, 15, 0, 0, 183, 184, 7, 9, 0, 0, 184, 185,
+		7, 15, 0, 0, 185, 186, 7, 7, 0, 0, 186, 187, 7, 18, 0, 0, 187, 50, 1, 0,
+		0, 0, 188, 189, 7, 17, 0, 0, 189, 190, 7, 15, 0, 0, 190, 191, 7, 9, 0,
+		0, 191, 192, 7, 15, 0, 0, 192, 193, 7, 0, 0, 0, 193, 194, 7, 0, 0, 0, 194,
+		52, 1, 0, 0, 0, 195, 196, 7, 9, 0, 0, 196, 197, 7, 3, 0, 0, 197, 198, 7,
+		15, 0, 0, 198, 199, 7, 10, 0, 0, 199, 200, 7, 13, 0, 0, 200, 201, 7, 17,
+		0, 0, 201, 54, 1, 0, 0, 0, 202, 203, 7, 12, 0, 0, 203, 204, 7, 15, 0, 0,
+		204, 205, 7, 5, 0, 0, 205, 206, 7, 5, 0, 0, 206, 207, 7, 3, 0, 0, 207,
+		208, 7, 10, 0, 0, 208, 212, 7, 7, 0, 0, 209, 211, 7, 19, 0, 0, 210, 209,
+		1, 0, 0, 0, 211, 214, 1, 0, 0, 0, 212, 210, 1, 0, 0, 0, 212, 213, 1, 0,
+		0, 0, 213, 215, 1, 0, 0, 0, 214, 212, 1, 0, 0, 0, 215, 216, 5, 40, 0, 0,
+		216, 56, 1, 0, 0, 0, 217, 218, 7, 5, 0, 0, 218, 219, 7, 10, 0, 0, 219,
+		220, 7, 20, 0, 0, 220, 227, 7, 3, 0, 0, 221, 222, 7, 21, 0, 0, 222, 223,
+		7, 15, 0, 0, 223, 224, 7, 0, 0, 0, 224, 225, 7, 9, 0, 0, 225, 227, 7, 3,
+		0, 0, 226, 217, 1, 0, 0, 0, 226, 221, 1, 0, 0, 0, 227, 58, 1, 0, 0, 0,
+		228, 229, 7, 22, 0, 0, 229, 60, 1, 0, 0, 0, 230, 232, 3, 59, 29, 0, 231,
+		230, 1, 0, 0, 0, 231, 232, 1, 0, 0, 0, 232, 234, 1, 0, 0, 0, 233, 235,
+		3, 75, 37, 0, 234, 233, 1, 0, 0, 0, 235, 236, 1, 0, 0, 0, 236, 234, 1,
+		0, 0, 0, 236, 237, 1, 0, 0, 0, 237, 245, 1, 0, 0, 0, 238, 242, 5, 46, 0,
+		0, 239, 241, 3, 75, 37, 0, 240, 239, 1, 0, 0, 0, 241, 244, 1, 0, 0, 0,
+		242, 240, 1, 0, 0, 0, 242, 243, 1, 0, 0, 0, 243, 246, 1, 0, 0, 0, 244,
+		242, 1, 0, 0, 0, 245, 238, 1, 0, 0, 0, 245, 246, 1, 0, 0, 0, 246, 256,
+		1, 0, 0, 0, 247, 249, 7, 3, 0, 0, 248, 250, 3, 59, 29, 0, 249, 248, 1,
+		0, 0, 0, 249, 250, 1, 0, 0, 0, 250, 252, 1, 0, 0, 0, 251, 253, 3, 75, 37,
+		0, 252, 251, 1, 0, 0, 0, 253, 254, 1, 0, 0, 0, 254, 252, 1, 0, 0, 0, 254,
+		255, 1, 0, 0, 0, 255, 257, 1, 0, 0, 0, 256, 247, 1, 0, 0, 0, 256, 257,
+		1, 0, 0, 0, 257, 279, 1, 0, 0, 0, 258, 260, 3, 59, 29, 0, 259, 258, 1,
+		0, 0, 0, 259, 260, 1, 0, 0, 0, 260, 261, 1, 0, 0, 0, 261, 263, 5, 46, 0,
+		0, 262, 264, 3, 75, 37, 0, 263, 262, 1, 0, 0, 0, 264, 265, 1, 0, 0, 0,
+		265, 263, 1, 0, 0, 0, 265, 266, 1, 0, 0, 0, 266, 276, 1, 0, 0, 0, 267,
+		269, 7, 3, 0, 0, 268, 270, 3, 59, 29, 0, 269, 268, 1, 0, 0, 0, 269, 270,
+		1, 0, 0, 0, 270, 272, 1, 0, 0, 0, 271, 273, 3, 75, 37, 0, 272, 271, 1,
+		0, 0, 0, 273, 274, 1, 0, 0, 0, 274, 272, 1, 0, 0, 0, 274, 275, 1, 0, 0,
+		0, 275, 277, 1, 0, 0, 0, 276, 267, 1, 0, 0, 0, 276, 277, 1, 0, 0, 0, 277,
+		279, 1, 0, 0, 0, 278, 231, 1, 0, 0, 0, 278, 259, 1, 0, 0, 0, 279, 62, 1,
+		0, 0, 0, 280, 286, 5, 34, 0, 0, 281, 285, 8, 23, 0, 0, 282, 283, 5, 92,
+		0, 0, 283, 285, 9, 0, 0, 0, 284, 281, 1, 0, 0, 0, 284, 282, 1, 0, 0, 0,
+		285, 288, 1, 0, 0, 0, 286, 284, 1, 0, 0, 0, 286, 287, 1, 0, 0, 0, 287,
+		289, 1, 0, 0, 0, 288, 286, 1, 0, 0, 0, 289, 301, 5, 34, 0, 0, 290, 296,
+		5, 39, 0, 0, 291, 295, 8, 24, 0, 0, 292, 293, 5, 92, 0, 0, 293, 295, 9,
+		0, 0, 0, 294, 291, 1, 0, 0, 0, 294, 292, 1, 0, 0, 0, 295, 298, 1, 0, 0,
+		0, 296, 294, 1, 0, 0, 0, 296, 297, 1, 0, 0, 0, 297, 299, 1, 0, 0, 0, 298,
+		296, 1, 0, 0, 0, 299, 301, 5, 39, 0, 0, 300, 280, 1, 0, 0, 0, 300, 290,
+		1, 0, 0, 0, 301, 64, 1, 0, 0, 0, 302, 306, 7, 25, 0, 0, 303, 305, 7, 26,
+		0, 0, 304, 303, 1, 0, 0, 0, 305, 308, 1, 0, 0, 0, 306, 304, 1, 0, 0, 0,
+		306, 307, 1, 0, 0, 0, 307, 66, 1, 0, 0, 0, 308, 306, 1, 0, 0, 0, 309, 310,
+		5, 91, 0, 0, 310, 311, 5, 93, 0, 0, 311, 68, 1, 0, 0, 0, 312, 313, 5, 91,
+		0, 0, 313, 314, 5, 42, 0, 0, 314, 315, 5, 93, 0, 0, 315, 70, 1, 0, 0, 0,
+		316, 329, 3, 65, 32, 0, 317, 318, 5, 46, 0, 0, 318, 328, 3, 65, 32, 0,
+		319, 328, 3, 67, 33, 0, 320, 328, 3, 69, 34, 0, 321, 323, 5, 46, 0, 0,
+		322, 324, 3, 75, 37, 0, 323, 322, 1, 0, 0, 0, 324, 325, 1, 0, 0, 0, 325,
+		323, 1, 0, 0, 0, 325, 326, 1, 0, 0, 0, 326, 328, 1, 0, 0, 0, 327, 317,
+		1, 0, 0, 0, 327, 319, 1, 0, 0, 0, 327, 320, 1, 0, 0, 0, 327, 321, 1, 0,
+		0, 0, 328, 331, 1, 0, 0, 0, 329, 327, 1, 0, 0, 0, 329, 330, 1, 0, 0, 0,
+		330, 72, 1, 0, 0, 0, 331, 329, 1, 0, 0, 0, 332, 334, 7, 27, 0, 0, 333,
+		332, 1, 0, 0, 0, 334, 335, 1, 0, 0, 0, 335, 333, 1, 0, 0, 0, 335, 336,
+		1, 0, 0, 0, 336, 337, 1, 0, 0, 0, 337, 338, 6, 36, 0, 0, 338, 74, 1, 0,
+		0, 0, 339, 340, 7, 28, 0, 0, 340, 76, 1, 0, 0, 0, 341, 343, 8, 29, 0, 0,
+		342, 341, 1, 0, 0, 0, 343, 344, 1, 0, 0, 0, 344, 342, 1, 0, 0, 0, 344,
+		345, 1, 0, 0, 0, 345, 78, 1, 0, 0, 0, 30, 0, 92, 135, 152, 212, 226, 231,
+		236, 242, 245, 249, 254, 256, 259, 265, 269, 274, 276, 278, 284, 286, 294,
+		296, 300, 306, 325, 327, 329, 335, 344, 1, 6, 0, 0,
 	}
 	deserializer := antlr.NewATNDeserializer(nil)
 	staticData.atn = deserializer.Deserialize(staticData.serializedATN)
@@ -258,37 +268,38 @@ func NewFilterQueryLexer(input antlr.CharStream) *FilterQueryLexer {
 
 // FilterQueryLexer tokens.
 const (
-	FilterQueryLexerLPAREN      = 1
-	FilterQueryLexerRPAREN      = 2
-	FilterQueryLexerLBRACK      = 3
-	FilterQueryLexerRBRACK      = 4
-	FilterQueryLexerCOMMA       = 5
-	FilterQueryLexerEQUALS      = 6
-	FilterQueryLexerNOT_EQUALS  = 7
-	FilterQueryLexerNEQ         = 8
-	FilterQueryLexerLT          = 9
-	FilterQueryLexerLE          = 10
-	FilterQueryLexerGT          = 11
-	FilterQueryLexerGE          = 12
-	FilterQueryLexerLIKE        = 13
-	FilterQueryLexerILIKE       = 14
-	FilterQueryLexerBETWEEN     = 15
-	FilterQueryLexerEXISTS      = 16
-	FilterQueryLexerREGEXP      = 17
-	FilterQueryLexerCONTAINS    = 18
-	FilterQueryLexerIN          = 19
-	FilterQueryLexerNOT         = 20
-	FilterQueryLexerAND         = 21
-	FilterQueryLexerOR          = 22
-	FilterQueryLexerHASTOKEN    = 23
-	FilterQueryLexerHAS         = 24
-	FilterQueryLexerHASANY      = 25
-	FilterQueryLexerHASALL      = 26
-	FilterQueryLexerSEARCH      = 27
-	FilterQueryLexerBOOL        = 28
-	FilterQueryLexerNUMBER      = 29
-	FilterQueryLexerQUOTED_TEXT = 30
-	FilterQueryLexerKEY         = 31
-	FilterQueryLexerWS          = 32
-	FilterQueryLexerFREETEXT    = 33
+	FilterQueryLexerLPAREN       = 1
+	FilterQueryLexerRPAREN       = 2
+	FilterQueryLexerLBRACK       = 3
+	FilterQueryLexerRBRACK       = 4
+	FilterQueryLexerCOMMA        = 5
+	FilterQueryLexerEQUALS       = 6
+	FilterQueryLexerNOT_EQUALS   = 7
+	FilterQueryLexerNEQ          = 8
+	FilterQueryLexerLT           = 9
+	FilterQueryLexerLE           = 10
+	FilterQueryLexerGT           = 11
+	FilterQueryLexerGE           = 12
+	FilterQueryLexerLIKE         = 13
+	FilterQueryLexerILIKE        = 14
+	FilterQueryLexerBETWEEN      = 15
+	FilterQueryLexerEXISTS       = 16
+	FilterQueryLexerREGEXP       = 17
+	FilterQueryLexerCONTAINS     = 18
+	FilterQueryLexerIN           = 19
+	FilterQueryLexerNOT          = 20
+	FilterQueryLexerAND          = 21
+	FilterQueryLexerOR           = 22
+	FilterQueryLexerHASTOKEN     = 23
+	FilterQueryLexerHAS          = 24
+	FilterQueryLexerHASANY       = 25
+	FilterQueryLexerHASALL       = 26
+	FilterQueryLexerSEARCH       = 27
+	FilterQueryLexerPATTERN_CALL = 28
+	FilterQueryLexerBOOL         = 29
+	FilterQueryLexerNUMBER       = 30
+	FilterQueryLexerQUOTED_TEXT  = 31
+	FilterQueryLexerKEY          = 32
+	FilterQueryLexerWS           = 33
+	FilterQueryLexerFREETEXT     = 34
 )

pkg/parser/filterquery/grammar/filterquery_listener.go

@@ -47,6 +47,9 @@ type FilterQueryListener interface {
 	// EnterSearchCall is called when entering the searchCall production.
 	EnterSearchCall(c *SearchCallContext)
 
+	// EnterPatternCall is called when entering the patternCall production.
+	EnterPatternCall(c *PatternCallContext)
+
 	// EnterFunctionParamList is called when entering the functionParamList production.
 	EnterFunctionParamList(c *FunctionParamListContext)
 
@@ -101,6 +104,9 @@ type FilterQueryListener interface {
 	// ExitSearchCall is called when exiting the searchCall production.
 	ExitSearchCall(c *SearchCallContext)
 
+	// ExitPatternCall is called when exiting the patternCall production.
+	ExitPatternCall(c *PatternCallContext)
+
 	// ExitFunctionParamList is called when exiting the functionParamList production.
 	ExitFunctionParamList(c *FunctionParamListContext)
 

pkg/parser/filterquery/grammar/filterquery_visitor.go

@@ -47,6 +47,9 @@ type FilterQueryVisitor interface {
 	// Visit a parse tree produced by FilterQueryParser#searchCall.
 	VisitSearchCall(ctx *SearchCallContext) interface{}
 
+	// Visit a parse tree produced by FilterQueryParser#patternCall.
+	VisitPatternCall(ctx *PatternCallContext) interface{}
+
 	// Visit a parse tree produced by FilterQueryParser#functionParamList.
 	VisitFunctionParamList(ctx *FunctionParamListContext) interface{}
 

pkg/querier/builder_query.go

@@ -446,6 +446,8 @@ func emptyResultFor(kind qbtypes.RequestType, queryName string) *qbtypes.Result
 		value = &qbtypes.TimeSeriesData{QueryName: queryName}
 	case kind == qbtypes.RequestTypeScalar:
 		value = &qbtypes.ScalarData{QueryName: queryName}
+	case kind == qbtypes.RequestTypePattern:
+		value = &qbtypes.PatternsData{QueryName: queryName, SampleRate: 1, Patterns: []*qbtypes.Pattern{}}
 	default:
 		value = &qbtypes.RawData{QueryName: queryName}
 	}

pkg/querier/consume.go

@@ -43,15 +43,15 @@ func stripKeyAlias(name string) string {
 // unwrapVariant decodes a scan envelope: the chcol.Variant the driver scans a Dynamic column (a JSON
 // path such as body_v2.level) into, and the JSONValue a whole JSON column scans into. The attributes
 // bag decodes flat so its dotted keys merge with the legacy attribute maps and a key stored at both a
-// scalar and an object path stays two keys; the scope and resource decode flat too, keeping their
-// attributes dotted; every other JSON column decodes nested.
+// scalar and an object path stays two keys; the scope decodes flat too, keeping its attributes dotted;
+// every other JSON column decodes nested.
 func unwrapVariant(name string, val any) any {
 	switch v := val.(type) {
 	case chcol.Variant:
 		return v.Any()
 	case telemetrystoretypes.JSONValue:
 		switch name {
-		case "attributes", "scope", "resource":
+		case "attributes", "scope":
 			return v.Flatten()
 		}
 		return v.Nest()
@@ -98,6 +98,8 @@ func consume(rows driver.Rows, kind qbtypes.RequestType, queryWindow *qbtypes.Ti
 		payload, err = readAsHeatmap(rows, queryWindow, step, queryName)
 	case qbtypes.RequestTypeRaw, qbtypes.RequestTypeTrace, qbtypes.RequestTypeRawStream:
 		payload, err = readAsRaw(rows, queryName)
+	case qbtypes.RequestTypePattern:
+		payload, err = readAsPatterns(rows, queryName)
 		// TODO: add support for other request types
 	}
 
@@ -503,6 +505,90 @@ func readAsScalar(rows driver.Rows, queryName string) (*qbtypes.ScalarData, erro
 	}, nil
 }
 
+// readAsPatterns reads a patterns statement: one row per pattern, its columns
+// named by the qbtypes.PatternsColumn constants, and any other column a
+// group-by key. The sampled counts scale up by the sample rate.
+func readAsPatterns(rows driver.Rows, queryName string) (*qbtypes.PatternsData, error) {
+	colNames := rows.Columns()
+	colTypes := rows.ColumnTypes()
+	scan := make([]any, len(colTypes))
+	for i := range scan {
+		scan[i] = reflect.New(colTypes[i].ScanType()).Interface()
+	}
+
+	data := &qbtypes.PatternsData{QueryName: queryName, SampleRate: 1, Patterns: []*qbtypes.Pattern{}}
+	for rows.Next() {
+		if err := rows.Scan(scan...); err != nil {
+			return nil, err
+		}
+
+		pattern := &qbtypes.Pattern{Samples: []string{}, Severities: []string{}, Trend: []*qbtypes.PatternTrendPoint{}}
+		var sampledCount uint64
+		var trendTs, trendCounts []int64
+		for i, name := range colNames {
+			value := derefValue(scan[i])
+			switch name {
+			case qbtypes.PatternsColumnPattern:
+				pattern.Pattern, _ = value.(string)
+			case qbtypes.PatternsColumnID:
+				pattern.ID, _ = value.(string)
+			case qbtypes.PatternsColumnSampledCount:
+				sampledCount, _ = value.(uint64)
+			case qbtypes.PatternsColumnSampleRate:
+				if rate, ok := value.(uint64); ok && rate > 0 {
+					data.SampleRate = rate
+				}
+			case qbtypes.PatternsColumnTotal:
+				data.Total, _ = value.(uint64)
+			case qbtypes.PatternsColumnFirstSeen:
+				if ns, ok := value.(uint64); ok {
+					pattern.FirstSeen = int64(ns / 1_000_000)
+				}
+			case qbtypes.PatternsColumnLastSeen:
+				if ns, ok := value.(uint64); ok {
+					pattern.LastSeen = int64(ns / 1_000_000)
+				}
+			case qbtypes.PatternsColumnSamples:
+				if samples, ok := value.([]string); ok {
+					pattern.Samples = samples
+				}
+			case qbtypes.PatternsColumnSeverities:
+				if severities, ok := value.([]string); ok {
+					pattern.Severities = severities
+				}
+			case qbtypes.PatternsColumnTrendTs:
+				trendTs, _ = value.([]int64)
+			case qbtypes.PatternsColumnTrendCounts:
+				trendCounts, _ = value.([]int64)
+			default:
+				pattern.Labels = append(pattern.Labels, &qbtypes.Label{
+					Key:   telemetrytypes.TelemetryFieldKey{Name: stripKeyAlias(name)},
+					Value: value,
+				})
+			}
+		}
+
+		pattern.Count = sampledCount * data.SampleRate
+		for i := 0; i < len(trendTs) && i < len(trendCounts); i++ {
+			pattern.Trend = append(pattern.Trend, &qbtypes.PatternTrendPoint{
+				Timestamp: trendTs[i] / 1_000_000,
+				Count:     uint64(trendCounts[i]) * data.SampleRate,
+			})
+		}
+		data.Patterns = append(data.Patterns, pattern)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+
+	for _, pattern := range data.Patterns {
+		if data.Total > 0 {
+			pattern.Percent = 100 * float64(pattern.Count) / float64(data.Total)
+		}
+	}
+	return data, nil
+}
+
 func derefValue(v any) any {
 	if v == nil {
 		return nil

pkg/querier/consume_test.go

@@ -98,10 +98,6 @@ func TestUnwrapVariant(t *testing.T) {
 	scopeAttrs := chcol.NewJSON()
 	scopeAttrs.SetValueAtPath("lib.lang", "go")
 	scopeCol := jsonColumn(map[string]any{"name": "io.opentelemetry.http", "version": "1.2.0", "attributes": scopeAttrs})
-	resourceAttrs := chcol.NewJSON()
-	resourceAttrs.SetValueAtPath("service.name", "signoz")
-	resourceAttrs.SetValueAtPath("signoz.resource.kind", "role")
-	resourceCol := jsonColumn(map[string]any{"attributes": resourceAttrs})
 
 	testCases := []struct {
 		name   string
@@ -116,7 +112,6 @@ func TestUnwrapVariant(t *testing.T) {
 		{name: "AttributesColumnFlat", column: "attributes", input: jsonCol, want: map[string]any{"level": "error", "attrs.code": float64(500)}},
 		{name: "AttributesColumnDropsNullPaths", column: "attributes", input: nullCol, want: map[string]any{"level": "error"}},
 		{name: "ScopeColumnFlat", column: "scope", input: scopeCol, want: map[string]any{"name": "io.opentelemetry.http", "version": "1.2.0", "attributes": map[string]any{"lib.lang": "go"}}},
-		{name: "ResourceColumnFlat", column: "resource", input: resourceCol, want: map[string]any{"attributes": map[string]any{"service.name": "signoz", "signoz.resource.kind": "role"}}},
 	}
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {

pkg/querier/patterns_test.go

@@ -0,0 +1,84 @@
+package querier
+
+import (
+	"testing"
+
+	cmock "github.com/SigNoz/clickhouse-go-mock"
+	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestReadAsPatterns(t *testing.T) {
+	cols := []cmock.ColumnType{
+		{Name: qbtypes.PatternsColumnPattern, Type: "String"},
+		{Name: qbtypes.PatternsColumnID, Type: "String"},
+		{Name: "__GROUP_BY_KEY_0_service.name", Type: "String"},
+		{Name: qbtypes.PatternsColumnSampledCount, Type: "UInt64"},
+		{Name: qbtypes.PatternsColumnSampleRate, Type: "UInt64"},
+		{Name: qbtypes.PatternsColumnTotal, Type: "UInt64"},
+		{Name: qbtypes.PatternsColumnFirstSeen, Type: "UInt64"},
+		{Name: qbtypes.PatternsColumnLastSeen, Type: "UInt64"},
+		{Name: qbtypes.PatternsColumnSamples, Type: "Array(String)"},
+		{Name: qbtypes.PatternsColumnSeverities, Type: "Array(String)"},
+		{Name: qbtypes.PatternsColumnTrendTs, Type: "Array(Int64)"},
+		{Name: qbtypes.PatternsColumnTrendCounts, Type: "Array(Int64)"},
+	}
+	rows := cmock.NewRows(cols, [][]any{
+		{
+			"User <*> logged in from <IP>", "13956782398643507091", "api",
+			uint64(30), uint64(4), uint64(200),
+			uint64(1767225600000000007), uint64(1767231599000000995),
+			[]string{"User alice logged in from 10.0.0.1"}, []string{"INFO"},
+			[]int64{1767225600000000000, 1767225660000000000}, []int64{10, 20},
+		},
+		{
+			"<IP>", "1", "web",
+			uint64(20), uint64(4), uint64(200),
+			uint64(1767225600000000000), uint64(1767225600000000000),
+			[]string{}, []string{},
+			[]int64{}, []int64{},
+		},
+	})
+
+	data, err := readAsPatterns(rows, "A")
+	require.NoError(t, err)
+
+	assert.Equal(t, "A", data.QueryName)
+	assert.Equal(t, uint64(4), data.SampleRate)
+	assert.Equal(t, uint64(200), data.Total)
+	require.Len(t, data.Patterns, 2)
+
+	first := data.Patterns[0]
+	assert.Equal(t, "User <*> logged in from <IP>", first.Pattern)
+	assert.Equal(t, "13956782398643507091", first.ID)
+	assert.Equal(t, uint64(120), first.Count)
+	assert.InDelta(t, 60, first.Percent, 1e-9)
+	assert.Equal(t, int64(1767225600000), first.FirstSeen)
+	assert.Equal(t, int64(1767231599000), first.LastSeen)
+	assert.Equal(t, []string{"User alice logged in from 10.0.0.1"}, first.Samples)
+	assert.Equal(t, []string{"INFO"}, first.Severities)
+	require.Len(t, first.Labels, 1)
+	assert.Equal(t, "service.name", first.Labels[0].Key.Name)
+	assert.Equal(t, "api", first.Labels[0].Value)
+	assert.Equal(t, []*qbtypes.PatternTrendPoint{
+		{Timestamp: 1767225600000, Count: 40},
+		{Timestamp: 1767225660000, Count: 80},
+	}, first.Trend)
+
+	second := data.Patterns[1]
+	assert.Equal(t, uint64(80), second.Count)
+	assert.InDelta(t, 40, second.Percent, 1e-9)
+	assert.Empty(t, second.Trend)
+	assert.NotNil(t, second.Samples)
+}
+
+func TestReadAsPatterns_NoRows(t *testing.T) {
+	rows := cmock.NewRows([]cmock.ColumnType{{Name: qbtypes.PatternsColumnPattern, Type: "String"}}, nil)
+
+	data, err := readAsPatterns(rows, "A")
+	require.NoError(t, err)
+	assert.Equal(t, uint64(1), data.SampleRate)
+	assert.NotNil(t, data.Patterns)
+	assert.Empty(t, data.Patterns)
+}

pkg/querier/querier.go

@@ -681,6 +681,8 @@ func (q *querier) run(
 			return slices.ContainsFunc(val.Aggregations, func(aggregation *qbtypes.DistributionAggregation) bool {
 				return len(aggregation.Distributions) != 0
 			})
+		case *qbtypes.PatternsData:
+			return len(val.Patterns) != 0
 		}
 		return false
 	}
@@ -729,6 +731,8 @@ func (q *querier) run(
 				v.QueryName = name
 			case *qbtypes.DistributionData:
 				v.QueryName = name
+			case *qbtypes.PatternsData:
+				v.QueryName = name
 			}
 			queryResults[i] = result
 			return nil

pkg/querybuilder/filter_error_listener.go

@@ -32,7 +32,7 @@ var friendly = map[string]string{
 	"BETWEEN": "BETWEEN", "IN": "IN", "EXISTS": "EXISTS",
 	"REGEXP": "REGEXP", "CONTAINS": "CONTAINS",
 	"HAS": "has()", "HASANY": "hasAny()", "HASALL": "hasAll()",
-	"HASTOKEN": "hasToken()", "SEARCH": "search()",
+	"HASTOKEN": "hasToken()", "SEARCH": "search()", "PATTERN_CALL": "pattern()",
 
 	// literals / identifiers
 	"NUMBER":      "number",

pkg/querybuilder/never_true.go

@@ -194,6 +194,9 @@ func (d *LogicalContradictionDetector) VisitPrimary(ctx *grammar.PrimaryContext)
 	} else if ctx.SearchCall() != nil {
 		// search() spans all fields; it can never be a logical contradiction
 		return nil
+	} else if ctx.PatternCall() != nil {
+		// pattern() reads no key, so it can't contradict a comparison
+		return nil
 	} else if ctx.FullText() != nil {
 		// Handle full text search if needed
 		return nil

pkg/querybuilder/where_clause_visitor.go

@@ -204,6 +204,8 @@ func (v *filterExpressionVisitor) Visit(tree antlr.ParseTree) any {
 		return v.VisitFullText(t)
 	case *grammar.SearchCallContext:
 		return v.VisitSearchCall(t)
+	case *grammar.PatternCallContext:
+		return v.VisitPatternCall(t)
 	case *grammar.FunctionCallContext:
 		return v.VisitFunctionCall(t)
 	case *grammar.FunctionParamListContext:
@@ -320,6 +322,8 @@ func (v *filterExpressionVisitor) VisitPrimary(ctx *grammar.PrimaryContext) any
 		return v.Visit(ctx.FunctionCall())
 	} else if ctx.SearchCall() != nil {
 		return v.Visit(ctx.SearchCall())
+	} else if ctx.PatternCall() != nil {
+		return v.Visit(ctx.PatternCall())
 	} else if ctx.FullText() != nil {
 		return v.Visit(ctx.FullText())
 	}
@@ -841,6 +845,46 @@ func (v *filterExpressionVisitor) VisitSearchCall(ctx *grammar.SearchCallContext
 	return v.builder.Or(conds...)
 }
 
+// PatternFilterer is a storage that can keep the logs of given log patterns.
+type PatternFilterer interface {
+	PatternCondition(ctx context.Context, q qbtypes.QueryInfo, patterns []string, sb *sqlbuilder.SelectBuilder) (string, error)
+}
+
+// VisitPatternCall handles pattern('<pattern text>'[, ...]): the logs whose
+// pattern is one of the given pattern texts.
+func (v *filterExpressionVisitor) VisitPatternCall(ctx *grammar.PatternCallContext) any {
+	if v.storage.Traits().Split == qbtypes.FingerprintOfSplit {
+		// the main query evaluates it
+		return SkipConditionLiteral
+	}
+	filterer, ok := v.storage.(PatternFilterer)
+	if !ok {
+		v.errors = append(v.errors, "function `pattern` is supported only for logs")
+		return ErrorConditionLiteral
+	}
+	// the pattern of every log in the time range is computed
+	v.requiresCostGuard = true
+
+	var patterns []string
+	if valueList := ctx.ValueList(); valueList != nil {
+		for _, param := range valueList.AllValue() {
+			pattern, ok := searchParamText(param)
+			if !ok {
+				v.errors = append(v.errors, "function `pattern` expects pattern texts, e.g. pattern('User <*> logged in')")
+				return ErrorConditionLiteral
+			}
+			patterns = append(patterns, pattern)
+		}
+	}
+
+	condition, err := filterer.PatternCondition(v.context, v.query, patterns, v.builder)
+	if err != nil {
+		v.recordError(err)
+		return ErrorConditionLiteral
+	}
+	return condition
+}
+
 // searchParamText returns an argument's raw token text (quoted or bare) rather than its
 // visited value, so a bare word stays literal and search(1000000) isn't "1e+06".
 func searchParamText(val grammar.IValueContext) (string, bool) {

pkg/statementbuilder/auditstatementbuilder/statement_builder.go

@@ -251,11 +251,15 @@ func (b *auditQueryStatementBuilder) buildListQuery(
 		sb.SelectMore(audittelemetryschema.TraceFlagsColumn)
 		sb.SelectMore(audittelemetryschema.SeverityTextColumn)
 		sb.SelectMore(audittelemetryschema.SeverityNumberColumn)
+		sb.SelectMore(audittelemetryschema.ScopeNameColumn)
+		sb.SelectMore(audittelemetryschema.ScopeVersionColumn)
 		sb.SelectMore(audittelemetryschema.BodyColumn)
 		sb.SelectMore(audittelemetryschema.EventNameColumn)
-		sb.SelectMore(audittelemetryschema.AttributesColumn)
+		sb.SelectMore(audittelemetryschema.AttributesStringColumn)
+		sb.SelectMore(audittelemetryschema.AttributesNumberColumn)
+		sb.SelectMore(audittelemetryschema.AttributesBoolColumn)
 		sb.SelectMore(audittelemetryschema.ResourceColumn)
-		sb.SelectMore(audittelemetryschema.ScopeColumn)
+		sb.SelectMore(audittelemetryschema.ScopeStringColumn)
 	} else {
 		for index := range query.SelectFields {
 			if query.SelectFields[index].Name == audittelemetryschema.TimestampColumn || query.SelectFields[index].Name == audittelemetryschema.IDColumn {

pkg/statementbuilder/auditstatementbuilder/statement_builder_test.go

@@ -18,12 +18,13 @@ import (
 )
 
 func auditFieldKeyMap() map[string][]*telemetrytypes.TelemetryFieldKey {
-	key := func(name string, ctx telemetrytypes.FieldContext, dt telemetrytypes.FieldDataType) *telemetrytypes.TelemetryFieldKey {
+	key := func(name string, ctx telemetrytypes.FieldContext, dt telemetrytypes.FieldDataType, materialized bool) *telemetrytypes.TelemetryFieldKey {
 		return &telemetrytypes.TelemetryFieldKey{
 			Name:          name,
 			Signal:        telemetrytypes.SignalLogs,
 			FieldContext:  ctx,
 			FieldDataType: dt,
+			Materialized:  materialized,
 		}
 	}
 
@@ -33,26 +34,26 @@ func auditFieldKeyMap() map[string][]*telemetrytypes.TelemetryFieldKey {
 	i64 := telemetrytypes.FieldDataTypeInt64
 
 	return map[string][]*telemetrytypes.TelemetryFieldKey{
-		"service.name":                 {key("service.name", res, str)},
-		"signoz.audit.verb":            {key("signoz.audit.verb", attr, str)},
-		"signoz.audit.outcome":         {key("signoz.audit.outcome", attr, str)},
-		"signoz.principal.email":       {key("signoz.principal.email", attr, str)},
-		"signoz.principal.id":          {key("signoz.principal.id", attr, str)},
-		"signoz.principal.type":        {key("signoz.principal.type", attr, str)},
-		"signoz.resource.kind":         {key("signoz.resource.kind", res, str)},
-		"signoz.resource.id":           {key("signoz.resource.id", res, str)},
-		"signoz.audit.action_category": {key("signoz.audit.action_category", attr, str)},
-		"exception.type":               {key("exception.type", attr, str)},
-		"http.request.method":          {key("http.request.method", attr, str)},
-		"http.response.status_code":    {key("http.response.status_code", attr, i64)},
+		"service.name":                 {key("service.name", res, str, false)},
+		"signoz.audit.verb":            {key("signoz.audit.verb", attr, str, true)},
+		"signoz.audit.outcome":         {key("signoz.audit.outcome", attr, str, true)},
+		"signoz.principal.email":       {key("signoz.principal.email", attr, str, true)},
+		"signoz.principal.id":          {key("signoz.principal.id", attr, str, true)},
+		"signoz.principal.type":        {key("signoz.principal.type", attr, str, true)},
+		"signoz.resource.kind":         {key("signoz.resource.kind", res, str, false)},
+		"signoz.resource.id":           {key("signoz.resource.id", res, str, false)},
+		"signoz.audit.action_category": {key("signoz.audit.action_category", attr, str, false)},
+		"exception.type":               {key("exception.type", attr, str, false)},
+		"http.request.method":          {key("http.request.method", attr, str, false)},
+		"http.response.status_code":    {key("http.response.status_code", attr, i64, false)},
 	}
 }
 
-func newTestAuditStatementBuilder(t *testing.T, keysMap map[string][]*telemetrytypes.TelemetryFieldKey) *auditQueryStatementBuilder {
+func newTestAuditStatementBuilder(t *testing.T) *auditQueryStatementBuilder {
 	t.Helper()
 	fl := flaggertest.New(t)
 	mockMetadataStore := telemetrytypestest.NewMockMetadataStore()
-	mockMetadataStore.KeysMap = keysMap
+	mockMetadataStore.KeysMap = auditFieldKeyMap()
 
 	storage := audittelemetryschema.NewStorage()
 	aggExprRewriter := querybuilder.NewAggExprRewriter(instrumentationtest.New().ToProviderSettings(), nil, storage, fl, telemetrytypes.SignalLogs)
@@ -68,7 +69,7 @@ func newTestAuditStatementBuilder(t *testing.T, keysMap map[string][]*telemetryt
 }
 
 func TestStatementBuilder(t *testing.T) {
-	statementBuilder := newTestAuditStatementBuilder(t, auditFieldKeyMap())
+	statementBuilder := newTestAuditStatementBuilder(t)
 	ctx := context.Background()
 
 	testCases := []struct {
@@ -78,7 +79,7 @@ func TestStatementBuilder(t *testing.T) {
 		expected    qbtypes.Statement
 		expectedErr error
 	}{
-		// List: all actions by a specific user
+		// List: all actions by a specific user (materialized principal.id filter)
 		{
 			name:        "ListByPrincipalID",
 			requestType: qbtypes.RequestTypeRaw,
@@ -91,11 +92,11 @@ func TestStatementBuilder(t *testing.T) {
 				Limit: 100,
 			},
 			expected: qbtypes.Statement{
-				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body, event_name, attributes, resource, scope FROM signoz_audit.distributed_logs WHERE (attributes.`signoz.principal.id`::String = ? AND attributes.`signoz.principal.id` IS NOT NULL) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, scope_name, scope_version, body, event_name, attributes_string, attributes_number, attributes_bool, resource, scope_string FROM signoz_audit.distributed_logs WHERE (`attribute_string_signoz$$principal$$id` = ? AND `attribute_string_signoz$$principal$$id_exists` = true) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"019a-1234-abcd-5678", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 100},
 			},
 		},
-		// List: all failed actions
+		// List: all failed actions (materialized outcome filter)
 		{
 			name:        "ListByOutcomeFailure",
 			requestType: qbtypes.RequestTypeRaw,
@@ -108,11 +109,11 @@ func TestStatementBuilder(t *testing.T) {
 				Limit: 100,
 			},
 			expected: qbtypes.Statement{
-				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body, event_name, attributes, resource, scope FROM signoz_audit.distributed_logs WHERE (attributes.`signoz.audit.outcome`::String = ? AND attributes.`signoz.audit.outcome` IS NOT NULL) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, scope_name, scope_version, body, event_name, attributes_string, attributes_number, attributes_bool, resource, scope_string FROM signoz_audit.distributed_logs WHERE (`attribute_string_signoz$$audit$$outcome` = ? AND `attribute_string_signoz$$audit$$outcome_exists` = true) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"failure", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 100},
 			},
 		},
-		// List: change history of a specific dashboard (two resource keys AND)
+		// List: change history of a specific dashboard (two materialized column AND)
 		{
 			name:        "ListByResourceKindAndID",
 			requestType: qbtypes.RequestTypeRaw,
@@ -125,13 +126,13 @@ func TestStatementBuilder(t *testing.T) {
 				Limit: 100,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_audit.distributed_logs_resource WHERE ((simpleJSONExtractString(labels, 'signoz.resource.kind') = ? AND labels LIKE ? AND labels LIKE ?) AND (simpleJSONExtractString(labels, 'signoz.resource.id') = ? AND labels LIKE ? AND labels LIKE ?)) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint) SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body, event_name, attributes, resource, scope FROM signoz_audit.distributed_logs WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_audit.distributed_logs_resource WHERE ((simpleJSONExtractString(labels, 'signoz.resource.kind') = ? AND labels LIKE ? AND labels LIKE ?) AND (simpleJSONExtractString(labels, 'signoz.resource.id') = ? AND labels LIKE ? AND labels LIKE ?)) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint) SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, scope_name, scope_version, body, event_name, attributes_string, attributes_number, attributes_bool, resource, scope_string FROM signoz_audit.distributed_logs WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"dashboard", "%signoz.resource.kind%", "%signoz.resource.kind\":\"dashboard%", "019b-5678-efgh-9012", "%signoz.resource.id%", "%signoz.resource.id\":\"019b-5678-efgh-9012%", uint64(1747945619), uint64(1747983448), "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 100},
 			},
 		},
-		// List: all dashboard deletions (compliance — resource.kind + verb AND)
+		// List: all dashboard deletions (compliance — resource.kind + action AND)
 		{
-			name:        "ListByResourceKindAndVerb",
+			name:        "ListByResourceKindAndAction",
 			requestType: qbtypes.RequestTypeRaw,
 			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
 				Signal: telemetrytypes.SignalLogs,
@@ -142,11 +143,11 @@ func TestStatementBuilder(t *testing.T) {
 				Limit: 100,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_audit.distributed_logs_resource WHERE (simpleJSONExtractString(labels, 'signoz.resource.kind') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint) SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body, event_name, attributes, resource, scope FROM signoz_audit.distributed_logs WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND (attributes.`signoz.audit.verb`::String = ? AND attributes.`signoz.audit.verb` IS NOT NULL) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_audit.distributed_logs_resource WHERE (simpleJSONExtractString(labels, 'signoz.resource.kind') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint) SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, scope_name, scope_version, body, event_name, attributes_string, attributes_number, attributes_bool, resource, scope_string FROM signoz_audit.distributed_logs WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND (`attribute_string_signoz$$audit$$verb` = ? AND `attribute_string_signoz$$audit$$verb_exists` = true) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"dashboard", "%signoz.resource.kind%", "%signoz.resource.kind\":\"dashboard%", uint64(1747945619), uint64(1747983448), "delete", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 100},
 			},
 		},
-		// List: all actions by service accounts
+		// List: all actions by service accounts (materialized principal.type)
 		{
 			name:        "ListByPrincipalType",
 			requestType: qbtypes.RequestTypeRaw,
@@ -159,13 +160,13 @@ func TestStatementBuilder(t *testing.T) {
 				Limit: 100,
 			},
 			expected: qbtypes.Statement{
-				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body, event_name, attributes, resource, scope FROM signoz_audit.distributed_logs WHERE (attributes.`signoz.principal.type`::String = ? AND attributes.`signoz.principal.type` IS NOT NULL) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, scope_name, scope_version, body, event_name, attributes_string, attributes_number, attributes_bool, resource, scope_string FROM signoz_audit.distributed_logs WHERE (`attribute_string_signoz$$principal$$type` = ? AND `attribute_string_signoz$$principal$$type_exists` = true) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"service_account", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 100},
 			},
 		},
-		// Scalar: alert — count forbidden errors (outcome + verb AND)
+		// Scalar: alert — count forbidden errors (outcome + action AND)
 		{
-			name:        "ScalarCountByOutcomeAndVerb",
+			name:        "ScalarCountByOutcomeAndAction",
 			requestType: qbtypes.RequestTypeScalar,
 			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
 				Signal:       telemetrytypes.SignalLogs,
@@ -179,7 +180,7 @@ func TestStatementBuilder(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "SELECT count() AS __result_0 FROM signoz_audit.distributed_logs WHERE ((attributes.`signoz.audit.outcome`::String = ? AND attributes.`signoz.audit.outcome` IS NOT NULL) AND (attributes.`signoz.audit.verb`::String = ? AND attributes.`signoz.audit.verb` IS NOT NULL)) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? ORDER BY __result_0 DESC",
+				Query: "SELECT count() AS __result_0 FROM signoz_audit.distributed_logs WHERE ((`attribute_string_signoz$$audit$$outcome` = ? AND `attribute_string_signoz$$audit$$outcome_exists` = true) AND (`attribute_string_signoz$$audit$$verb` = ? AND `attribute_string_signoz$$audit$$verb_exists` = true)) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? ORDER BY __result_0 DESC",
 				Args:  []any{"failure", "update", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448)},
 			},
 		},
@@ -203,7 +204,7 @@ func TestStatementBuilder(t *testing.T) {
 				Limit: 5,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __limit_cte AS (SELECT toString(multiIf(attributes.`signoz.principal.email` IS NOT NULL, attributes.`signoz.principal.email`::String, NULL)) AS `signoz.principal.email`, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE (attributes.`signoz.audit.outcome`::String = ? AND attributes.`signoz.audit.outcome` IS NOT NULL) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY `signoz.principal.email` ORDER BY __result_0 DESC LIMIT ?) SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 60 SECOND) AS ts, toString(multiIf(attributes.`signoz.principal.email` IS NOT NULL, attributes.`signoz.principal.email`::String, NULL)) AS `signoz.principal.email`, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE (attributes.`signoz.audit.outcome`::String = ? AND attributes.`signoz.audit.outcome` IS NOT NULL) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? AND (`signoz.principal.email`) GLOBAL IN (SELECT `signoz.principal.email` FROM __limit_cte) GROUP BY ts, `signoz.principal.email`",
+				Query: "WITH __limit_cte AS (SELECT toString(multiIf(`attribute_string_signoz$$principal$$email_exists` = true, `attribute_string_signoz$$principal$$email`, NULL)) AS `signoz.principal.email`, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE (`attribute_string_signoz$$audit$$outcome` = ? AND `attribute_string_signoz$$audit$$outcome_exists` = true) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY `signoz.principal.email` ORDER BY __result_0 DESC LIMIT ?) SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 60 SECOND) AS ts, toString(multiIf(`attribute_string_signoz$$principal$$email_exists` = true, `attribute_string_signoz$$principal$$email`, NULL)) AS `signoz.principal.email`, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE (`attribute_string_signoz$$audit$$outcome` = ? AND `attribute_string_signoz$$audit$$outcome_exists` = true) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? AND (`signoz.principal.email`) GLOBAL IN (SELECT `signoz.principal.email` FROM __limit_cte) GROUP BY ts, `signoz.principal.email`",
 				Args:  []any{"failure", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 5, "failure", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448)},
 			},
 		},
@@ -224,210 +225,8 @@ func TestStatementBuilder(t *testing.T) {
 	}
 }
 
-// Audit has no keys tables yet, so every key outside the intrinsic fields
-// resolves through the storage fallback.
-func TestStatementBuilder_WithoutMetadata(t *testing.T) {
-	statementBuilder := newTestAuditStatementBuilder(t, map[string][]*telemetrytypes.TelemetryFieldKey{})
-	ctx := context.Background()
-
-	testCases := []struct {
-		name        string
-		requestType qbtypes.RequestType
-		query       qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]
-		expected    qbtypes.Statement
-	}{
-		{
-			name:        "ListByAttribute",
-			requestType: qbtypes.RequestTypeRaw,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal: telemetrytypes.SignalLogs,
-				Source: telemetrytypes.SourceAudit,
-				Filter: &qbtypes.Filter{Expression: "signoz.audit.outcome = 'failure'"},
-				Limit:  10,
-			},
-			expected: qbtypes.Statement{
-				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body, event_name, attributes, resource, scope FROM signoz_audit.distributed_logs WHERE (attributes.`signoz.audit.outcome`::String = ? AND attributes.`signoz.audit.outcome` IS NOT NULL) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
-				Args:  []any{"failure", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 10},
-			},
-		},
-		{
-			name:        "ListByResourceAttribute",
-			requestType: qbtypes.RequestTypeRaw,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal: telemetrytypes.SignalLogs,
-				Source: telemetrytypes.SourceAudit,
-				Filter: &qbtypes.Filter{Expression: "resource.signoz.resource.kind = 'dashboard'"},
-				Limit:  20,
-			},
-			expected: qbtypes.Statement{
-				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body, event_name, attributes, resource, scope FROM signoz_audit.distributed_logs WHERE (resource.attributes.`signoz.resource.kind`::String = ? AND resource.attributes.`signoz.resource.kind` IS NOT NULL) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
-				Args:  []any{"dashboard", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 20},
-			},
-		},
-		{
-			name:        "ListByScopeNameAndBody",
-			requestType: qbtypes.RequestTypeRaw,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal: telemetrytypes.SignalLogs,
-				Source: telemetrytypes.SourceAudit,
-				Filter: &qbtypes.Filter{Expression: "scope.name = 'signoz.audit' AND body CONTAINS 'deleted'"},
-				Limit:  30,
-			},
-			expected: qbtypes.Statement{
-				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body, event_name, attributes, resource, scope FROM signoz_audit.distributed_logs WHERE ((scope.name = ? AND scope.name <> '') AND LOWER(body.message) LIKE LOWER(?)) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
-				Args:  []any{"signoz.audit", "%deleted%", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 30},
-			},
-		},
-		{
-			name:        "ListByFullText",
-			requestType: qbtypes.RequestTypeRaw,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal: telemetrytypes.SignalLogs,
-				Source: telemetrytypes.SourceAudit,
-				Filter: &qbtypes.Filter{Expression: "'dashboard.deleted'"},
-				Limit:  40,
-			},
-			expected: qbtypes.Statement{
-				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body, event_name, attributes, resource, scope FROM signoz_audit.distributed_logs WHERE match(body.message, ?) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
-				Args:  []any{"dashboard.deleted", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 40},
-			},
-		},
-		{
-			name:        "ListByNumericAttribute",
-			requestType: qbtypes.RequestTypeRaw,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal: telemetrytypes.SignalLogs,
-				Source: telemetrytypes.SourceAudit,
-				Filter: &qbtypes.Filter{Expression: "http.response.status_code >= 400"},
-				Limit:  50,
-			},
-			expected: qbtypes.Statement{
-				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body, event_name, attributes, resource, scope FROM signoz_audit.distributed_logs WHERE toFloat64OrNull(attributes.`http.response.status_code`::String) >= ? AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
-				Args:  []any{float64(400), "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 50},
-			},
-		},
-		{
-			name:        "ListByAttributeExists_OrderByTimestamp",
-			requestType: qbtypes.RequestTypeRaw,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal: telemetrytypes.SignalLogs,
-				Source: telemetrytypes.SourceAudit,
-				Filter: &qbtypes.Filter{Expression: "exception.type EXISTS"},
-				Order: []qbtypes.OrderBy{
-					{Key: qbtypes.OrderByKey{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "timestamp"}}, Direction: qbtypes.OrderDirectionDesc},
-				},
-				Limit: 60,
-			},
-			expected: qbtypes.Statement{
-				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body, event_name, attributes, resource, scope FROM signoz_audit.distributed_logs WHERE attributes.`exception.type` IS NOT NULL AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? ORDER BY timestamp desc LIMIT ?",
-				Args:  []any{"1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 60},
-			},
-		},
-		{
-			name:        "ListSelectFields",
-			requestType: qbtypes.RequestTypeRaw,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal: telemetrytypes.SignalLogs,
-				Source: telemetrytypes.SourceAudit,
-				SelectFields: []telemetrytypes.TelemetryFieldKey{
-					{Name: "signoz.principal.email", FieldContext: telemetrytypes.FieldContextAttribute},
-					{Name: "service.name", FieldContext: telemetrytypes.FieldContextResource},
-					{Name: "body"},
-				},
-				Limit: 70,
-			},
-			expected: qbtypes.Statement{
-				Query: "SELECT timestamp, id, multiIf(attributes.`signoz.principal.email` IS NOT NULL, attributes.`signoz.principal.email`::String, NULL) AS `signoz.principal.email`, multiIf(resource.attributes.`service.name` IS NOT NULL, resource.attributes.`service.name`::String, NULL) AS `service.name`, body.message AS `body` FROM signoz_audit.distributed_logs WHERE timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
-				Args:  []any{"1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 70},
-			},
-		},
-		{
-			name:        "ScalarCountGroupedByAttribute",
-			requestType: qbtypes.RequestTypeScalar,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal:       telemetrytypes.SignalLogs,
-				Source:       telemetrytypes.SourceAudit,
-				Aggregations: []qbtypes.LogAggregation{{Expression: "count()"}},
-				GroupBy: []qbtypes.GroupByKey{
-					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "signoz.audit.verb"}},
-				},
-			},
-			expected: qbtypes.Statement{
-				Query: "SELECT toString(multiIf(attributes.`signoz.audit.verb` IS NOT NULL, attributes.`signoz.audit.verb`::String, NULL)) AS `signoz.audit.verb`, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY `signoz.audit.verb` ORDER BY __result_0 DESC",
-				Args:  []any{"1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448)},
-			},
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			q, err := statementBuilder.Build(ctx, valuer.UUID{}, 1747947419000, 1747983448000, testCase.requestType, testCase.query, nil)
-			require.NoError(t, err)
-			assert.Equal(t, testCase.expected.Query, q.Query)
-			assert.Equal(t, testCase.expected.Args, q.Args)
-		})
-	}
-}
-
-func TestStatementBuilder_KnownResourceFields(t *testing.T) {
-	keysMap := map[string][]*telemetrytypes.TelemetryFieldKey{}
-	for name, field := range audittelemetryschema.ResourceFields {
-		keysMap[name] = []*telemetrytypes.TelemetryFieldKey{&field}
-	}
-	statementBuilder := newTestAuditStatementBuilder(t, keysMap)
-	ctx := context.Background()
-
-	testCases := []struct {
-		name        string
-		requestType qbtypes.RequestType
-		query       qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]
-		expected    qbtypes.Statement
-	}{
-		{
-			name:        "ListByBareResourceKey",
-			requestType: qbtypes.RequestTypeRaw,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal: telemetrytypes.SignalLogs,
-				Source: telemetrytypes.SourceAudit,
-				Filter: &qbtypes.Filter{Expression: "signoz.resource.kind = 'role'"},
-				Limit:  10,
-			},
-			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_audit.distributed_logs_resource WHERE (simpleJSONExtractString(labels, 'signoz.resource.kind') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint) SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body, event_name, attributes, resource, scope FROM signoz_audit.distributed_logs WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
-				Args:  []any{"role", "%signoz.resource.kind%", "%signoz.resource.kind\":\"role%", uint64(1747945619), uint64(1747983448), "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 10},
-			},
-		},
-		{
-			name:        "ScalarCountGroupedByBareResourceKey",
-			requestType: qbtypes.RequestTypeScalar,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal:       telemetrytypes.SignalLogs,
-				Source:       telemetrytypes.SourceAudit,
-				Aggregations: []qbtypes.LogAggregation{{Expression: "count()"}},
-				GroupBy: []qbtypes.GroupByKey{
-					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "signoz.resource.kind"}},
-				},
-			},
-			expected: qbtypes.Statement{
-				Query: "SELECT toString(multiIf(resource.attributes.`signoz.resource.kind` IS NOT NULL, resource.attributes.`signoz.resource.kind`::String, NULL)) AS `signoz.resource.kind`, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY `signoz.resource.kind` ORDER BY __result_0 DESC",
-				Args:  []any{"1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448)},
-			},
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			q, err := statementBuilder.Build(ctx, valuer.UUID{}, 1747947419000, 1747983448000, testCase.requestType, testCase.query, nil)
-			require.NoError(t, err)
-			assert.Equal(t, testCase.expected.Query, q.Query)
-			assert.Equal(t, testCase.expected.Args, q.Args)
-			assert.Empty(t, q.Warnings)
-		})
-	}
-}
-
 func TestStatementBuilderHeatmap(t *testing.T) {
-	statementBuilder := newTestAuditStatementBuilder(t, auditFieldKeyMap())
+	statementBuilder := newTestAuditStatementBuilder(t)
 
 	testCases := []struct {
 		name        string
@@ -436,7 +235,7 @@ func TestStatementBuilderHeatmap(t *testing.T) {
 		expected    qbtypes.Statement
 	}{
 		{
-			name:        "AttributeField_LinearAxis_RequiresField",
+			name:        "AttributeField_GroupByMaterialized_LinearAxis_RequiresField",
 			requestType: qbtypes.RequestTypeHeatmap,
 			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
 				Signal:        telemetrytypes.SignalLogs,
@@ -448,7 +247,7 @@ func TestStatementBuilderHeatmap(t *testing.T) {
 				BucketOptions: &qbtypes.BucketOptions{Kind: qbtypes.BucketsKindLinear, Spec: qbtypes.LinearBucketsSpec{MaxValue: 500, NumBuckets: 5}},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_audit.distributed_logs_resource WHERE ((simpleJSONExtractString(labels, 'signoz.resource.kind') = ? AND labels LIKE ? AND labels LIKE ?)) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), ifNull(toFloat64OrNull(attributes.`http.response.status_code`::String), 0) AS __bucket_value SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 60 SECOND) AS ts, toString(multiIf(attributes.`signoz.audit.verb` IS NOT NULL, attributes.`signoz.audit.verb`::String, NULL)) AS `signoz.audit.verb`, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value > 500, toFloat64(500), (least(greatest(ceil(__bucket_value * 5 / 500), 1), 5) - 1) * 500 / 5) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value > 500, toFloat64('+Inf'), least(greatest(ceil(__bucket_value * 5 / 500), 1), 5) * 500 / 5) AS __bucket_max, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND toFloat64OrNull(attributes.`http.response.status_code`::String) IS NOT NULL AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY ts, `signoz.audit.verb`, __bucket_min, __bucket_max",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_audit.distributed_logs_resource WHERE ((simpleJSONExtractString(labels, 'signoz.resource.kind') = ? AND labels LIKE ? AND labels LIKE ?)) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), ifNull(multiIf(mapContains(attributes_number, 'http.response.status_code'), toFloat64(attributes_number['http.response.status_code']), NULL), 0) AS __bucket_value SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 60 SECOND) AS ts, toString(multiIf(`attribute_string_signoz$$audit$$verb_exists` = true, `attribute_string_signoz$$audit$$verb`, NULL)) AS `signoz.audit.verb`, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value > 500, toFloat64(500), (least(greatest(ceil(__bucket_value * 5 / 500), 1), 5) - 1) * 500 / 5) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value > 500, toFloat64('+Inf'), least(greatest(ceil(__bucket_value * 5 / 500), 1), 5) * 500 / 5) AS __bucket_max, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND mapContains(attributes_number, 'http.response.status_code') AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY ts, `signoz.audit.verb`, __bucket_min, __bucket_max",
 				Args:  []any{"dashboard", "%signoz.resource.kind%", "%signoz.resource.kind\":\"dashboard%", uint64(1747945619), uint64(1747983448), "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448)},
 			},
 		},
@@ -465,7 +264,7 @@ func TestStatementBuilderHeatmap(t *testing.T) {
 				BucketOptions: &qbtypes.BucketOptions{Kind: qbtypes.BucketsKindLinear, Spec: qbtypes.LinearBucketsSpec{MaxValue: 500, NumBuckets: 5}},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_audit.distributed_logs_resource WHERE ((simpleJSONExtractString(labels, 'signoz.resource.kind') = ? AND labels LIKE ? AND labels LIKE ?)) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), ifNull(toFloat64OrNull(attributes.`http.response.status_code`::String), 0) AS __bucket_value SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 60 SECOND) AS ts, toString(multiIf(attributes.`signoz.audit.verb` IS NOT NULL, attributes.`signoz.audit.verb`::String, NULL)) AS `signoz.audit.verb`, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value > 500, toFloat64(500), (least(greatest(ceil(__bucket_value * 5 / 500), 1), 5) - 1) * 500 / 5) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value > 500, toFloat64('+Inf'), least(greatest(ceil(__bucket_value * 5 / 500), 1), 5) * 500 / 5) AS __bucket_max, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND toFloat64OrNull(attributes.`http.response.status_code`::String) IS NOT NULL AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY ts, `signoz.audit.verb`, __bucket_min, __bucket_max",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_audit.distributed_logs_resource WHERE ((simpleJSONExtractString(labels, 'signoz.resource.kind') = ? AND labels LIKE ? AND labels LIKE ?)) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), ifNull(multiIf(mapContains(attributes_number, 'http.response.status_code'), toFloat64(attributes_number['http.response.status_code']), NULL), 0) AS __bucket_value SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 60 SECOND) AS ts, toString(multiIf(`attribute_string_signoz$$audit$$verb_exists` = true, `attribute_string_signoz$$audit$$verb`, NULL)) AS `signoz.audit.verb`, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value > 500, toFloat64(500), (least(greatest(ceil(__bucket_value * 5 / 500), 1), 5) - 1) * 500 / 5) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value > 500, toFloat64('+Inf'), least(greatest(ceil(__bucket_value * 5 / 500), 1), 5) * 500 / 5) AS __bucket_max, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND mapContains(attributes_number, 'http.response.status_code') AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY ts, `signoz.audit.verb`, __bucket_min, __bucket_max",
 				Args:  []any{"dashboard", "%signoz.resource.kind%", "%signoz.resource.kind\":\"dashboard%", uint64(1747945619), uint64(1747983448), "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448)},
 			},
 		},

pkg/statementbuilder/logsstatementbuilder/patterns.go

@@ -0,0 +1,184 @@
+package logsstatementbuilder
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"github.com/SigNoz/signoz/pkg/errors"
+	"github.com/SigNoz/signoz/pkg/querybuilder"
+	"github.com/SigNoz/signoz/pkg/telemetryschema/logstelemetryschema"
+	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
+	"github.com/SigNoz/signoz/pkg/valuer"
+	"github.com/huandu/go-sqlbuilder"
+)
+
+const (
+	// patternsSampleTarget is about how many logs a patterns query masks: it
+	// reads one in ceil(matching logs / patternsSampleTarget) of them.
+	patternsSampleTarget = 100000
+
+	// patternsDefaultLimit is how many patterns a query without a limit returns.
+	patternsDefaultLimit = 50
+
+	patternsSampleCTE = "__pattern_sample"
+)
+
+// patternsServiceKey is the key every patterns statement groups by first:
+// patterns are always counted per service.
+var patternsServiceKey = telemetrytypes.TelemetryFieldKey{
+	Name:          "service.name",
+	Signal:        telemetrytypes.SignalLogs,
+	FieldContext:  telemetrytypes.FieldContextResource,
+	FieldDataType: telemetrytypes.FieldDataTypeString,
+}
+
+// isServiceNameKey reports whether a group-by key names the service, which a
+// patterns statement already groups by.
+func isServiceNameKey(key telemetrytypes.TelemetryFieldKey) bool {
+	return key.Name == patternsServiceKey.Name &&
+		(key.FieldContext == telemetrytypes.FieldContextUnspecified || key.FieldContext == telemetrytypes.FieldContextResource)
+}
+
+// buildPatternsQuery counts the logs of the query by pattern, on a sample.
+// A CTE counts the matching logs and picks the sample rate, so that about
+// patternsSampleTarget logs are masked. The main query keeps one in that many
+// logs by a hash of their ID, the same logs on every run, and groups them by
+// pattern, by service and by the query's group by.
+func (b *logQueryStatementBuilder) buildPatternsQuery(
+	ctx context.Context,
+	orgID valuer.UUID,
+	sb *sqlbuilder.SelectBuilder,
+	query qbtypes.QueryBuilderQuery[qbtypes.LogAggregation],
+	start, end uint64,
+	keys map[string][]*telemetrytypes.TelemetryFieldKey,
+	variables map[string]qbtypes.VariableItem,
+) (*qbtypes.Statement, error) {
+	var (
+		cteFragments []string
+		cteArgs      [][]any
+		warnings     []string
+	)
+
+	frag, args, skipResourceFilter, err := b.maybeAttachResourceFilter(ctx, orgID, sb, query, start, end, variables)
+	if err != nil {
+		return nil, err
+	}
+	if frag != "" {
+		cteFragments = append(cteFragments, frag)
+		cteArgs = append(cteArgs, args)
+	}
+
+	// the sample rate, from the logs the filter keeps
+	countSB := sqlbuilder.NewSelectBuilder()
+	countSB.Select(
+		fmt.Sprintf("greatest(toUInt64(1), toUInt64(ceil(count() / %d))) AS rate", patternsSampleTarget),
+		"count() AS total",
+	)
+	countSB.From(fmt.Sprintf("%s.%s", logstelemetryschema.DBName, logstelemetryschema.LogsV2TableName))
+	if frag != "" {
+		countSB.Where("resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter)")
+	}
+	if _, err := b.addFilterCondition(ctx, orgID, countSB, start, end, query, keys, variables, skipResourceFilter); err != nil {
+		return nil, err
+	}
+	countSQL, countArgs := countSB.BuildWithFlavor(sqlbuilder.ClickHouse)
+	cteFragments = append(cteFragments, fmt.Sprintf("%s AS (%s)", patternsSampleCTE, countSQL))
+	cteArgs = append(cteArgs, countArgs)
+
+	info := querybuilder.NewQueryInfo(ctx, orgID, b.fl, telemetrytypes.SignalLogs, nil, start, end)
+	patternExpr := logstelemetryschema.PatternExpr()
+	stepNs := uint64(query.StepInterval.Seconds()) * querybuilder.NsToSeconds
+	if stepNs == 0 {
+		stepNs = querybuilder.RecommendedStepInterval(start, end) * querybuilder.NsToSeconds
+	}
+
+	sb.Select(
+		fmt.Sprintf("%s AS %s", patternExpr, qbtypes.PatternsColumnPattern),
+		fmt.Sprintf("%s AS %s", logstelemetryschema.PatternIDExpr(qbtypes.PatternsColumnPattern), qbtypes.PatternsColumnID),
+	)
+
+	// patterns are always counted per service, then per the query's own group by
+	groupBy := []telemetrytypes.TelemetryFieldKey{patternsServiceKey}
+	for _, gb := range query.GroupBy {
+		if !isServiceNameKey(gb.TelemetryFieldKey) {
+			groupBy = append(groupBy, gb.TelemetryFieldKey)
+		}
+	}
+	groupByAliases := make([]string, 0, len(groupBy))
+	for i := range groupBy {
+		expr, keyWarnings, err := querybuilder.ResolveColumn(ctx, info, b.storage, columnKey(&groupBy[i]), telemetrytypes.FieldDataTypeString, keys)
+		if err != nil {
+			return nil, err
+		}
+		warnings = append(warnings, keyWarnings...)
+		alias := groupByColumnAlias(i, groupBy[i].Name)
+		sb.SelectMore(sqlbuilder.Escape(fmt.Sprintf("toString(%s) AS %s", expr, alias)))
+		groupByAliases = append(groupByAliases, sqlbuilder.Escape(alias))
+	}
+
+	topStrings := func(expr string) string {
+		return fmt.Sprintf("arrayFilter(x -> x != '', arrayMap(x -> ifNull(toString(x), ''), topK(3)(%s)))", expr)
+	}
+
+	sb.SelectMore(
+		fmt.Sprintf("count() AS %s", qbtypes.PatternsColumnSampledCount),
+		fmt.Sprintf("(SELECT rate FROM %s) AS %s", patternsSampleCTE, qbtypes.PatternsColumnSampleRate),
+		fmt.Sprintf("(SELECT total FROM %s) AS %s", patternsSampleCTE, qbtypes.PatternsColumnTotal),
+		fmt.Sprintf("min(timestamp) AS %s", qbtypes.PatternsColumnFirstSeen),
+		fmt.Sprintf("max(timestamp) AS %s", qbtypes.PatternsColumnLastSeen),
+		fmt.Sprintf("groupArraySample(3, 1)(leftUTF8(%s, 2048)) AS %s", logstelemetryschema.PatternMessageExpr, qbtypes.PatternsColumnSamples),
+		fmt.Sprintf("%s AS %s", topStrings(logstelemetryschema.LogsV2SeverityTextColumn), qbtypes.PatternsColumnSeverities),
+		fmt.Sprintf("tupleElement(sumMap([toInt64(intDiv(timestamp, %d) * %d)], [toInt64(1)]) AS __trend, 1) AS %s", stepNs, stepNs, qbtypes.PatternsColumnTrendTs),
+		fmt.Sprintf("tupleElement(__trend, 2) AS %s", qbtypes.PatternsColumnTrendCounts),
+	)
+	sb.From(fmt.Sprintf("%s.%s", logstelemetryschema.DBName, logstelemetryschema.LogsV2TableName))
+
+	preparedWhereClause, err := b.addFilterCondition(ctx, orgID, sb, start, end, query, keys, variables, skipResourceFilter)
+	if err != nil {
+		return nil, err
+	}
+	sb.Where(fmt.Sprintf("cityHash64(%s) %% (SELECT rate FROM %s) = 0", logstelemetryschema.LogsV2IDColumn, patternsSampleCTE))
+
+	sb.GroupBy(append([]string{qbtypes.PatternsColumnPattern}, groupByAliases...)...)
+	sb.OrderBy(fmt.Sprintf("%s DESC", qbtypes.PatternsColumnSampledCount), fmt.Sprintf("%s ASC", qbtypes.PatternsColumnPattern))
+
+	limit := query.Limit
+	if limit <= 0 {
+		limit = patternsDefaultLimit
+	}
+	if limit > qbtypes.PatternsMaxLimit {
+		return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "pattern requests return at most %d patterns, got limit %d", qbtypes.PatternsMaxLimit, limit)
+	}
+	sb.Limit(limit)
+	if query.Offset > 0 {
+		sb.Offset(query.Offset)
+	}
+
+	mainSQL, mainArgs := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+
+	return &qbtypes.Statement{
+		Query:          querybuilder.CombineCTEs(cteFragments) + mainSQL,
+		Args:           querybuilder.PrependArgs(cteArgs, mainArgs),
+		Warnings:       append(preparedWhereClause.Warnings, warnings...),
+		WarningsDocURL: preparedWhereClause.WarningsDocURL,
+		CostGuard:      b.costGuardFor(ctx, orgID, preparedWhereClause.RequiresCostGuard),
+	}, nil
+}
+
+// patternsKeySelectors adds the keys a patterns statement reads besides the
+// query's own.
+func patternsKeySelectors(selectors []*telemetrytypes.FieldKeySelector) []*telemetrytypes.FieldKeySelector {
+	for _, selector := range selectors {
+		if strings.EqualFold(selector.Name, patternsServiceKey.Name) {
+			return selectors
+		}
+	}
+	return append(selectors, &telemetrytypes.FieldKeySelector{
+		Name:          patternsServiceKey.Name,
+		Signal:        telemetrytypes.SignalLogs,
+		FieldContext:  patternsServiceKey.FieldContext,
+		FieldDataType: patternsServiceKey.FieldDataType,
+	})
+}

pkg/statementbuilder/logsstatementbuilder/patterns_test.go

@@ -0,0 +1,84 @@
+package logsstatementbuilder
+
+import (
+	"context"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/SigNoz/signoz/pkg/flagger/flaggertest"
+	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
+	"github.com/SigNoz/signoz/pkg/querybuilder"
+	"github.com/SigNoz/signoz/pkg/statementbuilder"
+	"github.com/SigNoz/signoz/pkg/telemetryschema/logstelemetryschema"
+	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes/telemetrytypestest"
+	"github.com/SigNoz/signoz/pkg/valuer"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestStatementBuilderPatterns(t *testing.T) {
+	releaseTime := time.Date(2024, 1, 15, 10, 0, 0, 0, time.UTC)
+	fl := flaggertest.New(t)
+	metadataStore := telemetrytypestest.NewMockMetadataStore()
+	metadataStore.KeysMap = logstelemetryschema.BuildCompleteFieldKeyMap(releaseTime)
+	storage := logstelemetryschema.NewStorage()
+	statementBuilder := NewLogQueryStatementBuilder(
+		instrumentationtest.New().ToProviderSettings(),
+		metadataStore,
+		storage,
+		querybuilder.NewAggExprRewriter(instrumentationtest.New().ToProviderSettings(), nil, storage, fl, telemetrytypes.SignalLogs),
+		logstelemetryschema.DefaultFullTextColumn,
+		fl,
+		nil,
+		statementbuilder.Config{SkipResourceFingerprint: statementbuilder.SkipResourceFingerprint{Enabled: false, Threshold: 100000}},
+	)
+	start, end := uint64(1767225600000), uint64(1767232800000)
+	patternExpr := logstelemetryschema.PatternExpr()
+	serviceColumn := "toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, NULL)) AS `__GROUP_BY_KEY_0_service.name`"
+
+	t.Run("CountsOnASampleSizedByTheFilteredLogs", func(t *testing.T) {
+		stmt, err := statementBuilder.Build(context.Background(), valuer.UUID{}, start, end, qbtypes.RequestTypePattern, qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
+			Signal: telemetrytypes.SignalLogs,
+			Filter: &qbtypes.Filter{Expression: "severity_text = 'ERROR'"},
+		}, nil)
+		require.NoError(t, err)
+
+		filter := "WHERE severity_text = ? AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ?"
+		assert.True(t, strings.HasPrefix(stmt.Query, "WITH __pattern_sample AS (SELECT greatest(toUInt64(1), toUInt64(ceil(count() / 100000))) AS rate, count() AS total FROM signoz_logs.distributed_logs_v2 "+filter+") SELECT "+patternExpr+" AS __pattern, toString(cityHash64(__pattern)) AS __pattern_id, "+serviceColumn+", count() AS __sampled_count"), stmt.Query)
+		assert.True(t, strings.HasSuffix(stmt.Query, " FROM signoz_logs.distributed_logs_v2 "+filter+" AND cityHash64(id) % (SELECT rate FROM __pattern_sample) = 0 GROUP BY __pattern, `__GROUP_BY_KEY_0_service.name` ORDER BY __sampled_count DESC, __pattern ASC LIMIT ?"), stmt.Query)
+		assert.Contains(t, stmt.Query, "sumMap([toInt64(intDiv(timestamp, 20000000000) * 20000000000)], [toInt64(1)]) AS __trend")
+		// the filter's arguments, once for the sample CTE and once for the main query
+		filterArgs := []any{"ERROR", "1767225600000000000", uint64(1767223800), "1767232800000000000", uint64(1767232800)}
+		assert.Equal(t, append(append(append([]any{}, filterArgs...), filterArgs...), 50), stmt.Args)
+		assert.Nil(t, stmt.CostGuard)
+	})
+
+	t.Run("GroupBy_LimitAndPatternFilter", func(t *testing.T) {
+		stmt, err := statementBuilder.Build(context.Background(), valuer.UUID{}, start, end, qbtypes.RequestTypePattern, qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
+			Signal:  telemetrytypes.SignalLogs,
+			Filter:  &qbtypes.Filter{Expression: "NOT pattern('<IP>')"},
+			GroupBy: []qbtypes.GroupByKey{{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "severity_text"}}},
+			Limit:   10,
+		}, nil)
+		require.NoError(t, err)
+
+		// patterns are always counted per service first, then per the query's group by
+		assert.Contains(t, stmt.Query, serviceColumn+", toString(severity_text) AS `__GROUP_BY_KEY_1_severity_text`")
+		assert.True(t, strings.HasSuffix(stmt.Query, " GROUP BY __pattern, `__GROUP_BY_KEY_0_service.name`, `__GROUP_BY_KEY_1_severity_text` ORDER BY __sampled_count DESC, __pattern ASC LIMIT ?"), stmt.Query)
+		assert.Contains(t, stmt.Query, "WHERE NOT (match("+patternExpr+", ?))")
+		assert.Equal(t, 10, stmt.Args[len(stmt.Args)-1])
+		require.NotNil(t, stmt.CostGuard)
+	})
+
+	t.Run("LimitOverMax", func(t *testing.T) {
+		_, err := statementBuilder.Build(context.Background(), valuer.UUID{}, start, end, qbtypes.RequestTypePattern, qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
+			Signal: telemetrytypes.SignalLogs,
+			Limit:  qbtypes.PatternsMaxLimit + 1,
+		}, nil)
+		require.Error(t, err)
+		assert.Contains(t, err.Error(), "at most 1000 patterns")
+	})
+}