feat(bottom-strip): add the layout shell behind a feature flag

Mounts a 24px strip at the bottom of the app under the same gate as the side
nav, behind the SAVED_VIEW_ENABLED localStorage flag shared with saved views.
Shows the build version on the left for now; the per-page left slot and the
right side actions come in later tickets.

To give the strip a stable box, `.app-content` becomes a column flex and
`LayoutContent` takes the height left over instead of `height: 100%`. Fixed
bottom elements read `--bottom-strip-height`, which only exists while the strip
is mounted, so with the flag off every offset falls back to where it is today.

Hides nothing. Each later ticket hides the piece it replaces.

docs/contributing/go/handler.md

@@ -179,7 +179,6 @@ The `handler.New` function ties the HTTP handler to OpenAPI metadata via `OpenAP
 - **SuccessStatusCode**: The HTTP status for successful responses (for example, `http.StatusOK`, `http.StatusCreated`, `http.StatusNoContent`).
 - **ErrorStatusCodes**: Additional error status codes beyond the standard ones automatically added by `handler.New`.
 - **SecuritySchemes**: Auth mechanisms and scopes required by the operation.
-- **Stability**: Maturity marker (`handler.StabilityDevelopment`, `handler.StabilityAlpha`, `handler.StabilityBeta`, `handler.StabilityStable`, the OpenTelemetry Collector levels) emitted as the `x-signoz-stability` extension on every operation. Unset is emitted as `alpha`.
 
 The generic handler:
 

ee/sqlstore/postgressqlstore/formatter.go

@@ -23,15 +23,6 @@ func (f *formatter) JSONExtractString(column, path string) []byte {
 	return append(f.TextToJsonColumn(column), ops...)
 }
 
-func (f *formatter) JSONExtractMapValue(column, mapField, key string) []byte {
-	sql := f.TextToJsonColumn(column)
-	sql = append(sql, "->"...)
-	sql = schema.Append(f.bunf, sql, mapField)
-	sql = append(sql, "->>"...)
-	sql = schema.Append(f.bunf, sql, key)
-	return sql
-}
-
 func (f *formatter) JSONType(column, path string) []byte {
 	var sql []byte
 	sql = append(sql, "jsonb_typeof("...)

ee/sqlstore/postgressqlstore/formatter_test.go

@@ -55,67 +55,6 @@ func TestJSONExtractString(t *testing.T) {
 	}
 }
 
-func TestJSONExtractMapValue(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		mapField string
-		key      string
-		expected string
-	}{
-		{
-			name:     "PlainKey",
-			column:   "data",
-			mapField: "labels",
-			key:      "team",
-			expected: `"data"::jsonb->'labels'->>'team'`,
-		},
-		{
-			name:     "DottedKey_OneMapEntry",
-			column:   "data",
-			mapField: "labels",
-			key:      "k8s.cluster",
-			expected: `"data"::jsonb->'labels'->>'k8s.cluster'`,
-		},
-		{
-			name:     "SingleQuoteInKey_Doubled",
-			column:   "data",
-			mapField: "labels",
-			key:      "o'brien",
-			expected: `"data"::jsonb->'labels'->>'o''brien'`,
-		},
-		{
-			name:     "BackslashInKey_Literal",
-			column:   "data",
-			mapField: "labels",
-			key:      `a\b`,
-			expected: `"data"::jsonb->'labels'->>'a\b'`,
-		},
-		{
-			name:     "DoubleQuoteInKey_Literal",
-			column:   "data",
-			mapField: "labels",
-			key:      `a"b`,
-			expected: `"data"::jsonb->'labels'->>'a"b'`,
-		},
-		{
-			name:     "QualifiedColumn",
-			column:   "rule.data",
-			mapField: "labels",
-			key:      "severity",
-			expected: `"rule"."data"::jsonb->'labels'->>'severity'`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.JSONExtractMapValue(tt.column, tt.mapField, tt.key))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
 func TestJSONType(t *testing.T) {
 	tests := []struct {
 		name     string

frontend/src/api/generated/services/rules/index.ts

@@ -41,8 +41,6 @@ import type {
 	GetRuleHistoryTopContributorsParams,
 	GetRuleHistoryTopContributorsPathParameters,
 	ListRules200,
-	ListRulesV3200,
-	ListRulesV3Params,
 	PatchRuleByID200,
 	PatchRuleByIDPathParameters,
 	RenderErrorResponseDTO,
@@ -75,8 +73,7 @@ const withQueryKey = <T extends object, K>(
 };
 
 /**
- * This endpoint lists all alert rules with their current evaluation state. Deprecated: use ListRulesV3, which supports filtering, sorting and pagination.
- * @deprecated
+ * This endpoint lists all alert rules with their current evaluation state
  * @summary List alert rules
  */
 export const listRules = (signal?: AbortSignal) => {
@@ -118,7 +115,6 @@ export type ListRulesQueryResult = NonNullable<
 export type ListRulesQueryError = ErrorType<RenderErrorResponseDTO>;
 
 /**
- * @deprecated
  * @summary List alert rules
  */
 
@@ -138,7 +134,6 @@ export function useListRules<
 }
 
 /**
- * @deprecated
  * @summary List alert rules
  */
 export const invalidateListRules = async (
@@ -1393,97 +1388,3 @@ export const useTestRule = <
 > => {
 	return useMutation(getTestRuleMutationOptions(options));
 };
-/**
- * Returns a page of alert rules with their current evaluation state, trimmed to the fields the list page renders. Supports a filter DSL (`query`), a repeated `states` filter applied after the state overlay, sort (`updated_at`/`created_at`/`name`/`state`/`severity`), order (`asc`/`desc`), and offset-based pagination (`limit`/`offset`). In the filter DSL, a non-reserved key is matched as a rule label directly (`team = infra`); a key that collides with a reserved keyword matches either interpretation (negative operators exclude both), and `labels.<key>` targets only the label. The response also carries the org's label pairs and the reserved filter keys for building filter suggestions.
- * @summary List alert rules (v3)
- */
-export const listRulesV3 = (
-	params?: ListRulesV3Params,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<ListRulesV3200>({
-		url: `/api/v3/rules`,
-		method: 'GET',
-		params,
-		signal,
-	});
-};
-
-export const getListRulesV3QueryKey = (params?: ListRulesV3Params) => {
-	return [`/api/v3/rules`, ...(params ? [params] : [])] as const;
-};
-
-export const getListRulesV3QueryOptions = <
-	TData = Awaited<ReturnType<typeof listRulesV3>>,
-	TError = ErrorType<RenderErrorResponseDTO>,
->(
-	params?: ListRulesV3Params,
-	options?: {
-		query?: UseQueryOptions<
-			Awaited<ReturnType<typeof listRulesV3>>,
-			TError,
-			TData
-		>;
-	},
-) => {
-	const { query: queryOptions } = options ?? {};
-
-	const queryKey = queryOptions?.queryKey ?? getListRulesV3QueryKey(params);
-
-	const queryFn: QueryFunction<Awaited<ReturnType<typeof listRulesV3>>> = ({
-		signal,
-	}) => listRulesV3(params, signal);
-
-	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
-		Awaited<ReturnType<typeof listRulesV3>>,
-		TError,
-		TData
-	> & { queryKey: QueryKey };
-};
-
-export type ListRulesV3QueryResult = NonNullable<
-	Awaited<ReturnType<typeof listRulesV3>>
->;
-export type ListRulesV3QueryError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary List alert rules (v3)
- */
-
-export function useListRulesV3<
-	TData = Awaited<ReturnType<typeof listRulesV3>>,
-	TError = ErrorType<RenderErrorResponseDTO>,
->(
-	params?: ListRulesV3Params,
-	options?: {
-		query?: UseQueryOptions<
-			Awaited<ReturnType<typeof listRulesV3>>,
-			TError,
-			TData
-		>;
-	},
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
-	const queryOptions = getListRulesV3QueryOptions(params, options);
-
-	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-		queryKey: QueryKey;
-	};
-
-	return withQueryKey(query, queryOptions.queryKey);
-}
-
-/**
- * @summary List alert rules (v3)
- */
-export const invalidateListRulesV3 = async (
-	queryClient: QueryClient,
-	params?: ListRulesV3Params,
-	options?: InvalidateOptions,
-): Promise<QueryClient> => {
-	await queryClient.invalidateQueries(
-		{ queryKey: getListRulesV3QueryKey(params) },
-		options,
-	);
-
-	return queryClient;
-};

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

@@ -10188,99 +10188,6 @@ export interface RuletypesGettableTestRuleDTO {
 	message?: string;
 }
 
-export interface RuletypesLabelPairDTO {
-	/**
-	 * @type string
-	 */
-	key: string;
-	/**
-	 * @type string
-	 */
-	value: string;
-}
-
-export enum RuletypesListOrderDTO {
-	asc = 'asc',
-	desc = 'desc',
-}
-export enum RuletypesListSortDTO {
-	updated_at = 'updated_at',
-	created_at = 'created_at',
-	name = 'name',
-	state = 'state',
-	severity = 'severity',
-}
-export type RuletypesListableRuleDTOLabels = { [key: string]: string };
-
-export enum RuletypesRuleTypeDTO {
-	threshold_rule = 'threshold_rule',
-	promql_rule = 'promql_rule',
-	anomaly_rule = 'anomaly_rule',
-}
-export interface RuletypesListableRuleDTO {
-	/**
-	 * @type string
-	 */
-	alert: string;
-	alertType: RuletypesAlertTypeDTO;
-	/**
-	 * @type string
-	 * @format date-time
-	 */
-	createdAt?: string;
-	/**
-	 * @type string
-	 */
-	createdBy?: string;
-	/**
-	 * @type string
-	 */
-	description?: string;
-	/**
-	 * @type boolean
-	 */
-	disabled?: boolean;
-	/**
-	 * @type string
-	 */
-	id: string;
-	/**
-	 * @type object
-	 */
-	labels?: RuletypesListableRuleDTOLabels;
-	ruleType: RuletypesRuleTypeDTO;
-	state: RuletypesAlertStateDTO;
-	/**
-	 * @type string
-	 * @format date-time
-	 */
-	updatedAt?: string;
-	/**
-	 * @type string
-	 */
-	updatedBy?: string;
-}
-
-export interface RuletypesListableRulesDTO {
-	/**
-	 * @type array
-	 */
-	labels: RuletypesLabelPairDTO[];
-	/**
-	 * @type array
-	 */
-	reservedKeywords: string[];
-	/**
-	 * @type array
-	 */
-	rules: RuletypesListableRuleDTO[];
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	total: number;
-}
-
 export interface RuletypesRenotifyDTO {
 	/**
 	 * @type array,null
@@ -10377,6 +10284,11 @@ export interface RuletypesRuleConditionDTO {
 	thresholds?: RuletypesRuleThresholdDataDTO;
 }
 
+export enum RuletypesRuleTypeDTO {
+	threshold_rule = 'threshold_rule',
+	promql_rule = 'promql_rule',
+	anomaly_rule = 'anomaly_rule',
+}
 export interface RuletypesPostableRuleDTO {
 	/**
 	 * @type string
@@ -14277,45 +14189,6 @@ export type GetMetricDashboardsV2200 = {
 	status: string;
 };
 
-export type ListRulesV3Params = {
-	/**
-	 * @type string
-	 * @description undefined
-	 */
-	query?: string;
-	/**
-	 * @type array
-	 * @description undefined
-	 */
-	states?: string[];
-	/**
-	 * @description undefined
-	 */
-	sort?: RuletypesListSortDTO;
-	/**
-	 * @description undefined
-	 */
-	order?: RuletypesListOrderDTO;
-	/**
-	 * @type integer
-	 * @description undefined
-	 */
-	limit?: number;
-	/**
-	 * @type integer
-	 * @description undefined
-	 */
-	offset?: number;
-};
-
-export type ListRulesV3200 = {
-	data: RuletypesListableRulesDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
 export type GetFlamegraphPathParameters = {
 	traceID: string;
 };

frontend/src/constants/localStorage.ts

@@ -47,4 +47,5 @@ export enum LOCALSTORAGE {
 	DASHBOARDS_LIST_VIEWS = 'DASHBOARDS_LIST_VIEWS',
 	DASHBOARD_V2_PANEL_COLUMN_WIDTHS = 'DASHBOARD_V2_PANEL_COLUMN_WIDTHS',
 	LLM_ATTRIBUTE_MAPPING_TEST_SPAN = 'LLM_ATTRIBUTE_MAPPING_TEST_SPAN',
+	SAVED_VIEW_ENABLED = 'SAVED_VIEW_ENABLED',
 }

frontend/src/container/AppLayout/AppLayout.styles.scss

@@ -53,6 +53,10 @@
 		z-index: 0;
 		background: var(--l1-background);
 
+		// Column so the bottom strip sits under the scrolling content, not inside it.
+		display: flex;
+		flex-direction: column;
+
 		&.full-screen-content {
 			width: 100%;
 		}
@@ -70,7 +74,9 @@
 
 .chat-support-gateway {
 	position: fixed;
-	bottom: 20px;
+	// Lifted above the bottom strip. Don't extend this pattern — new fixed-bottom
+	// UI belongs in the bounded layout, not in another offset here.
+	bottom: calc(20px + var(--bottom-strip-height, 0px));
 	right: 20px;
 	z-index: 1000;
 

frontend/src/container/AppLayout/index.tsx

@@ -43,6 +43,7 @@ import { USER_PREFERENCES } from 'constants/userPreferences';
 import AIAssistantModal from 'container/AIAssistant/AIAssistantModal';
 import AIAssistantPanel from 'container/AIAssistant/AIAssistantPanel';
 import { useAIAssistantStore } from 'container/AIAssistant/store/useAIAssistantStore';
+import BottomStrip from 'container/BottomStrip';
 import SideNav from 'container/SideNav';
 import TopNav from 'container/TopNav';
 import dayjs from 'dayjs';
@@ -51,6 +52,7 @@ import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
 import { useIsAIAssistantEnabled } from 'hooks/useIsAIAssistantEnabled';
 import { useNotifications } from 'hooks/useNotifications';
+import { useSavedViewEnabled } from 'hooks/useSavedViewEnabled';
 import useTabVisibility from 'hooks/useTabFocus';
 import history from 'lib/history';
 import { isNull } from 'lodash-es';
@@ -402,6 +404,7 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 	}, [pathname]);
 
 	const isToDisplayLayout = isLoggedIn;
+	const isSavedViewEnabled = useSavedViewEnabled();
 
 	const routeKey = useMemo(() => getRouteKey(pathname), [pathname]);
 	const pageTitle = t(routeKey);
@@ -868,6 +871,10 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 								</OverlayScrollbar>
 							</LayoutContent>
 						</Sentry.ErrorBoundary>
+
+						{isSavedViewEnabled && isToDisplayLayout && !renderFullScreen && (
+							<BottomStrip />
+						)}
 					</div>
 
 					{isLoggedIn && isAIAssistantEnabled && (

frontend/src/container/AppLayout/styles.ts

@@ -12,8 +12,12 @@ export const Layout = styled(LayoutComponent)`
 	}
 `;
 
+// Takes the height left in `.app-content` after the bottom strip.
+// `min-height: 0` is not needed right now, overlayscrollbars already sets
+// `overflow: auto` here. Kept so this does not break if that goes away.
 export const LayoutContent = styled(LayoutComponent.Content)`
-	height: 100%;
+	flex: 1;
+	min-height: 0;
 	&::-webkit-scrollbar {
 		width: 0.1rem;
 	}

frontend/src/container/BottomStrip/BottomStrip.module.scss

@@ -0,0 +1,40 @@
+.strip {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 12px;
+
+	flex-shrink: 0;
+	height: var(--bottom-strip-height);
+	padding: 0 12px;
+
+	background: var(--l2-background);
+	border-top: 1px solid var(--l2-border);
+
+	// font styles
+	font-family: var(--font-family-sf-mono, monospace);
+	font-size: 13px;
+	font-weight: var(--font-weight-normal);
+	line-height: var(--line-height-none);
+
+	// Above page content, below the body-portalled overlays that are meant to
+	// cover the strip.
+	position: relative;
+	z-index: 1;
+}
+
+.left,
+.right {
+	display: flex;
+	align-items: center;
+	gap: 12px;
+	min-width: 0;
+}
+
+// Temporary placeholder for the left slot. Replaced later.
+.version {
+	color: var(--l2-foreground);
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}

frontend/src/container/BottomStrip/__tests__/BottomStrip.test.tsx

@@ -0,0 +1,49 @@
+import { render } from 'tests/test-utils';
+
+import BottomStrip, {
+	BOTTOM_STRIP_HEIGHT,
+	BOTTOM_STRIP_HEIGHT_VAR,
+	BOTTOM_STRIP_ON_CLASS,
+} from '..';
+
+describe('BottomStrip', () => {
+	it('publishes the body class and height property while mounted', () => {
+		const { unmount } = render(<BottomStrip />);
+
+		expect(document.body.classList.contains(BOTTOM_STRIP_ON_CLASS)).toBe(true);
+		expect(document.body.style.getPropertyValue(BOTTOM_STRIP_HEIGHT_VAR)).toBe(
+			`${BOTTOM_STRIP_HEIGHT}px`,
+		);
+
+		unmount();
+
+		expect(document.body.classList.contains(BOTTOM_STRIP_ON_CLASS)).toBe(false);
+		expect(document.body.style.getPropertyValue(BOTTOM_STRIP_HEIGHT_VAR)).toBe(
+			'',
+		);
+	});
+
+	// The string is whatever the Go build injected, so it is rendered untouched —
+	// same as SideNav. Release tags carry the "v", local builds do not.
+	it.each([['v0.134.67'], ['main-64f1c2a']])(
+		'renders the build version %p exactly as given',
+		(version) => {
+			const { getByTestId } = render(<BottomStrip />, undefined, {
+				appContextOverrides: {
+					versionData: { version, ee: 'Y', setupCompleted: true },
+				},
+			});
+
+			expect(getByTestId('bottom-strip-version')).toHaveTextContent(version);
+		},
+	);
+
+	it('renders the strip without a version when none is available', () => {
+		const { getByTestId, queryByTestId } = render(<BottomStrip />, undefined, {
+			appContextOverrides: { versionData: null },
+		});
+
+		expect(getByTestId('bottom-strip')).toBeInTheDocument();
+		expect(queryByTestId('bottom-strip-version')).not.toBeInTheDocument();
+	});
+});

frontend/src/container/BottomStrip/index.tsx

@@ -0,0 +1,42 @@
+import { useLayoutEffect } from 'react';
+import { useAppContext } from 'providers/App/App';
+
+import styles from './BottomStrip.module.scss';
+
+export const BOTTOM_STRIP_HEIGHT = 24;
+
+export const BOTTOM_STRIP_ON_CLASS = 'bottom-strip-on';
+export const BOTTOM_STRIP_HEIGHT_VAR = '--bottom-strip-height';
+
+function BottomStrip(): JSX.Element {
+	const { versionData } = useAppContext();
+	const version = versionData?.version?.trim();
+
+	useLayoutEffect(() => {
+		document.body.classList.add(BOTTOM_STRIP_ON_CLASS);
+		document.body.style.setProperty(
+			BOTTOM_STRIP_HEIGHT_VAR,
+			`${BOTTOM_STRIP_HEIGHT}px`,
+		);
+
+		return (): void => {
+			document.body.classList.remove(BOTTOM_STRIP_ON_CLASS);
+			document.body.style.removeProperty(BOTTOM_STRIP_HEIGHT_VAR);
+		};
+	}, []);
+
+	return (
+		<div className={styles.strip} data-testid="bottom-strip">
+			<div className={styles.left}>
+				{version && (
+					<span className={styles.version} data-testid="bottom-strip-version">
+						{version}
+					</span>
+				)}
+			</div>
+			<div className={styles.right} />
+		</div>
+	);
+}
+
+export default BottomStrip;

frontend/src/container/CreateAlertV2/Footer/styles.scss

@@ -1,6 +1,8 @@
 .create-alert-v2-footer {
 	position: fixed;
-	bottom: 0;
+	// Lifted above the bottom strip. Don't extend this pattern — new fixed-bottom
+	// UI belongs in the bounded layout, not in another offset here.
+	bottom: var(--bottom-strip-height, 0px);
 	left: 63px;
 	right: 0;
 	background-color: var(--l1-background);

frontend/src/container/ExplorerActions/AddToDashboardButton.tsx

@@ -1,118 +0,0 @@
-import { useState } from 'react';
-import { Grid2X2 } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
-import logEvent from 'api/common/logEvent';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import ExportPanelContainer from 'container/ExportPanel/ExportPanelContainer';
-import { ExportDashboard } from 'hooks/dashboard/useExportDashboards';
-import { useGetExportToDashboardLink } from 'hooks/dashboard/useGetExportToDashboardLink';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { useSafeNavigate } from 'hooks/useSafeNavigate';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource } from 'types/common/queryBuilder';
-import { v4 } from 'uuid';
-
-import {
-	EXPLORER_ACTION_EVENTS,
-	getExportPanelType,
-	getQueryName,
-} from './utils';
-
-function AddToDashboardButton({
-	queries,
-	sourcepage,
-	panelType,
-}: {
-	queries: Query[] | null;
-	sourcepage: DataSource;
-	panelType?: PANEL_TYPES;
-}): JSX.Element {
-	const [queryToExport, setQueryToExport] = useState<Query | null>(null);
-	const { panelType: contextPanelType } = useQueryBuilder();
-	const { safeNavigate } = useSafeNavigate();
-	const getExportToDashboardLink = useGetExportToDashboardLink();
-	const disabled = !queries?.length;
-	const oneChartPerQuery = (queries?.length ?? 0) > 1;
-
-	const open = (query: Query): void => {
-		void logEvent(EXPLORER_ACTION_EVENTS.addToDashboard, {
-			sourcepage,
-			panelType: contextPanelType,
-			oneChartPerQuery,
-		});
-		setQueryToExport(query);
-	};
-
-	const handleExport = (
-		dashboard: ExportDashboard | null,
-		isNewDashboard?: boolean,
-	): void => {
-		if (!dashboard || !queryToExport) {
-			return;
-		}
-		const exportPanelType = panelType ?? getExportPanelType(contextPanelType);
-
-		void logEvent(EXPLORER_ACTION_EVENTS.exported, {
-			sourcepage,
-			panelType: exportPanelType,
-			oneChartPerQuery,
-			isNewDashboard,
-			dashboardName: dashboard.title,
-		});
-
-		const link = getExportToDashboardLink({
-			query: queryToExport,
-			panelType: exportPanelType,
-			dashboardId: dashboard.id,
-			widgetId: v4(),
-		});
-		if (link) {
-			safeNavigate(link);
-		}
-	};
-
-	const button = (
-		<Button
-			variant="ghost"
-			color="secondary"
-			size="icon"
-			disabled={disabled}
-			onClick={queries?.length === 1 ? (): void => open(queries[0]) : undefined}
-			aria-label="Add to dashboard"
-			data-testid="explorer-add-to-dashboard"
-		>
-			<Grid2X2 size={16} />
-		</Button>
-	);
-
-	return (
-		<>
-			{oneChartPerQuery && queries ? (
-				<DropdownMenuSimple
-					menu={{
-						items: queries.map((query) => ({
-							key: query.id,
-							label: getQueryName(query),
-							onClick: (): void => open(query),
-						})),
-					}}
-					align="end"
-				>
-					{button}
-				</DropdownMenuSimple>
-			) : (
-				<TooltipSimple title="Add to dashboard">{button}</TooltipSimple>
-			)}
-			<ExportPanelContainer
-				open={queryToExport !== null}
-				onClose={(): void => setQueryToExport(null)}
-				query={queryToExport}
-				onExport={handleExport}
-			/>
-		</>
-	);
-}
-
-export default AddToDashboardButton;

frontend/src/container/ExplorerActions/CreateAlertButton.tsx

@@ -1,72 +0,0 @@
-import { useHistory } from 'react-router-dom';
-import { ConciergeBell } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
-import logEvent from 'api/common/logEvent';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource } from 'types/common/queryBuilder';
-
-import {
-	EXPLORER_ACTION_EVENTS,
-	getCreateAlertLink,
-	getQueryName,
-} from './utils';
-
-function CreateAlertButton({
-	queries,
-	sourcepage,
-}: {
-	queries: Query[] | null;
-	sourcepage: DataSource;
-}): JSX.Element {
-	const history = useHistory();
-	const { panelType } = useQueryBuilder();
-	const disabled = !queries?.length;
-
-	const createAlert = (query: Query): void => {
-		void logEvent(EXPLORER_ACTION_EVENTS.createAlert, {
-			sourcepage,
-			panelType,
-			oneChartPerQuery: (queries?.length ?? 0) > 1,
-		});
-		history.push(getCreateAlertLink({ query, panelType }));
-	};
-
-	const button = (
-		<Button
-			variant="ghost"
-			color="secondary"
-			size="md"
-			disabled={disabled}
-			onClick={
-				queries?.length === 1 ? (): void => createAlert(queries[0]) : undefined
-			}
-			data-testid="explorer-create-alert"
-		>
-			<ConciergeBell size={16} />
-			Create an alert
-		</Button>
-	);
-
-	if (!queries || queries.length <= 1) {
-		return button;
-	}
-
-	return (
-		<DropdownMenuSimple
-			menu={{
-				items: queries.map((query) => ({
-					key: query.id,
-					label: getQueryName(query),
-					onClick: (): void => createAlert(query),
-				})),
-			}}
-			align="end"
-		>
-			{button}
-		</DropdownMenuSimple>
-	);
-}
-
-export default CreateAlertButton;

frontend/src/container/ExplorerActions/__tests__/AddToDashboardButton.test.tsx

@@ -1,384 +0,0 @@
-import logEvent from 'api/common/logEvent';
-import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
-import {
-	getExportQueryData as getLogsExportQuery,
-	getQueryByPanelType as getLogsQueryByPanelType,
-} from 'container/LogsExplorerViews/explorerUtils';
-import { OptionsQuery } from 'container/OptionsMenu/types';
-import {
-	getExportQueryData as getTracesExportQuery,
-	getQueryByPanelType as getTracesQueryByPanelType,
-} from 'container/TracesExplorer/explorerUtils';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { useSafeNavigate } from 'hooks/useSafeNavigate';
-import { buildExportPanelLink } from 'pages/DashboardPage/DashboardContainer/PanelEditor/newPanelRoute';
-import { render, screen, userEvent } from 'tests/test-utils';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource, StringOperators } from 'types/common/queryBuilder';
-
-import AddToDashboardButton from '../AddToDashboardButton';
-import { EXPLORER_ACTION_EVENTS, getExportPanelType } from '../utils';
-
-const DASHBOARD = { id: 'dash-1', title: 'Dash 1' };
-
-jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
-	useQueryBuilder: jest.fn(),
-}));
-jest.mock('hooks/useSafeNavigate', () => ({
-	useSafeNavigate: jest.fn(),
-}));
-jest.mock('uuid', () => ({ v4: (): string => 'widget-1' }));
-jest.mock('api/common/logEvent', () => ({
-	__esModule: true,
-	default: jest.fn(() => Promise.resolve()),
-}));
-// The picker is the dialog's business; here it just hands a dashboard back.
-jest.mock('container/ExportPanel/ExportPanelContainer', () => ({
-	__esModule: true,
-	default: ({
-		open,
-		query,
-		onExport,
-	}: {
-		open: boolean;
-		query: Query | null;
-		onExport: (dashboard: { id: string; title: string }) => void;
-	}): JSX.Element | null =>
-		open ? (
-			<button
-				type="button"
-				data-testid="export-stub"
-				data-query={JSON.stringify(query)}
-				onClick={(): void => onExport({ id: 'dash-1', title: 'Dash 1' })}
-			>
-				export
-			</button>
-		) : null,
-}));
-// The menu is the design system's; here each item is a plain button.
-jest.mock('@signozhq/ui/dropdown-menu', () => ({
-	DropdownMenuSimple: ({
-		menu,
-		children,
-	}: {
-		menu: { items: { key: string; label: string; onClick: () => void }[] };
-		children: React.ReactNode;
-	}): JSX.Element => (
-		<div>
-			{children}
-			{menu.items.map((item) => (
-				<button
-					type="button"
-					key={item.key}
-					data-testid={`menu-${item.label}`}
-					onClick={item.onClick}
-				>
-					{item.label}
-				</button>
-			))}
-		</div>
-	),
-}));
-
-const mockSafeNavigate = jest.fn();
-const mockedUseQueryBuilder = jest.mocked(useQueryBuilder);
-const mockedUseSafeNavigate = jest.mocked(useSafeNavigate);
-const mockedLogEvent = jest.mocked(logEvent);
-
-const FILTER = "service.name = 'frontend'";
-const COLUMNS = [{ name: 'service.name' }, { name: 'name' }];
-const options = { selectColumns: COLUMNS } as unknown as OptionsQuery;
-
-function stagedQuery(dataSource: DataSource, queryName = 'A'): Query {
-	const base = initialQueriesMap[dataSource];
-	return {
-		...base,
-		id: `query-${queryName}`,
-		builder: {
-			...base.builder,
-			queryData: [
-				{
-					...base.builder.queryData[0],
-					queryName,
-					aggregateOperator: StringOperators.COUNT,
-					filter: { expression: FILTER },
-					orderBy: [{ columnName: 'timestamp', order: 'asc' }],
-					groupBy: [{ key: 'service.name', dataType: 'string', type: 'resource' }],
-				},
-			],
-		},
-	} as Query;
-}
-
-function setPanelType(panelType: PANEL_TYPES): void {
-	mockedUseQueryBuilder.mockReturnValue({ panelType } as ReturnType<
-		typeof useQueryBuilder
-	>);
-}
-
-async function exportTo(
-	queries: Query[] | null,
-	sourcepage: DataSource,
-	panelType: PANEL_TYPES,
-	panelTypeProp?: PANEL_TYPES,
-): Promise<void> {
-	setPanelType(panelType);
-	render(
-		<AddToDashboardButton
-			queries={queries}
-			sourcepage={sourcepage}
-			panelType={panelTypeProp}
-		/>,
-	);
-	const user = userEvent.setup();
-	await user.click(screen.getByTestId('explorer-add-to-dashboard'));
-	await user.click(screen.getByTestId('export-stub'));
-}
-
-function expectedLink(query: Query, panelType: PANEL_TYPES): string | null {
-	return buildExportPanelLink({
-		query,
-		panelType,
-		dashboardId: DASHBOARD.id,
-	});
-}
-
-describe('AddToDashboardButton', () => {
-	beforeEach(() => {
-		mockSafeNavigate.mockReset();
-		mockedLogEvent.mockClear();
-		mockedUseSafeNavigate.mockReturnValue({ safeNavigate: mockSafeNavigate });
-	});
-
-	it.each([null, []])(
-		'is disabled with %p and the picker stays closed',
-		async (queries) => {
-			setPanelType(PANEL_TYPES.LIST);
-			render(
-				<AddToDashboardButton queries={queries} sourcepage={DataSource.LOGS} />,
-			);
-
-			expect(screen.getByTestId('explorer-add-to-dashboard')).toBeDisabled();
-			expect(screen.queryByTestId('export-stub')).not.toBeInTheDocument();
-		},
-	);
-
-	it('hands the picker the same query it will export', async () => {
-		const query = stagedQuery(DataSource.LOGS);
-		setPanelType(PANEL_TYPES.TIME_SERIES);
-		render(
-			<AddToDashboardButton queries={[query]} sourcepage={DataSource.LOGS} />,
-		);
-
-		await userEvent
-			.setup()
-			.click(screen.getByTestId('explorer-add-to-dashboard'));
-
-		expect(screen.getByTestId('export-stub')).toHaveAttribute(
-			'data-query',
-			JSON.stringify(query),
-		);
-	});
-
-	it('logs open and success with the source page', async () => {
-		const query = stagedQuery(DataSource.TRACES);
-
-		await exportTo([query], DataSource.TRACES, PANEL_TYPES.TABLE);
-
-		expect(mockedLogEvent).toHaveBeenCalledWith(
-			EXPLORER_ACTION_EVENTS.addToDashboard,
-			{
-				sourcepage: DataSource.TRACES,
-				panelType: PANEL_TYPES.TABLE,
-				oneChartPerQuery: false,
-			},
-		);
-		expect(mockedLogEvent).toHaveBeenCalledWith(EXPLORER_ACTION_EVENTS.exported, {
-			sourcepage: DataSource.TRACES,
-			panelType: PANEL_TYPES.TABLE,
-			oneChartPerQuery: false,
-			isNewDashboard: undefined,
-			dashboardName: DASHBOARD.title,
-		});
-	});
-
-	it('a panel type from the page wins over the fold of the context one', async () => {
-		const query = stagedQuery(DataSource.METRICS);
-
-		// context says list, the page says time series
-		await exportTo(
-			[query],
-			DataSource.METRICS,
-			PANEL_TYPES.LIST,
-			PANEL_TYPES.TIME_SERIES,
-		);
-
-		expect(mockSafeNavigate).toHaveBeenCalledWith(
-			expectedLink(query, PANEL_TYPES.TIME_SERIES),
-		);
-	});
-
-	describe('logs, the query the page hands over per view', () => {
-		const staged = stagedQuery(DataSource.LOGS);
-
-		it('list: the list request shaping with timestamp desc, panel type list', async () => {
-			const listRequest = getLogsQueryByPanelType(staged, PANEL_TYPES.LIST, {
-				page: 1,
-				pageSize: 100,
-				filters: { items: [], op: 'AND' },
-				filter: { expression: FILTER },
-			});
-			const exportQuery = getLogsExportQuery(
-				listRequest,
-				PANEL_TYPES.LIST,
-			) as Query;
-
-			await exportTo([exportQuery], DataSource.LOGS, PANEL_TYPES.LIST);
-
-			expect(exportQuery.builder.queryData[0].orderBy).toStrictEqual([
-				{ columnName: 'timestamp', order: 'desc' },
-			]);
-			expect(mockSafeNavigate).toHaveBeenCalledWith(
-				expectedLink(exportQuery, PANEL_TYPES.LIST),
-			);
-		});
-
-		it.each([PANEL_TYPES.TIME_SERIES, PANEL_TYPES.TABLE])(
-			'%s: staged query untouched, same panel type',
-			async (panelType) => {
-				const exportQuery = getLogsExportQuery(staged, panelType) as Query;
-
-				await exportTo([exportQuery], DataSource.LOGS, panelType);
-
-				expect(exportQuery).toBe(staged);
-				expect(mockSafeNavigate).toHaveBeenCalledWith(
-					expectedLink(staged, panelType),
-				);
-			},
-		);
-	});
-
-	describe('traces, the query the page hands over per view', () => {
-		const staged = stagedQuery(DataSource.TRACES);
-
-		it('list: list shaping plus the selected columns, panel type list', async () => {
-			const exportQuery = getTracesExportQuery(
-				getTracesQueryByPanelType(staged, PANEL_TYPES.LIST),
-				getExportPanelType(PANEL_TYPES.LIST),
-				options,
-			);
-
-			await exportTo([exportQuery], DataSource.TRACES, PANEL_TYPES.LIST);
-
-			const [queryData] = exportQuery.builder.queryData;
-			expect(queryData.selectColumns).toStrictEqual(COLUMNS);
-			expect(queryData.groupBy).toStrictEqual([]);
-			expect(mockSafeNavigate).toHaveBeenCalledWith(
-				expectedLink(exportQuery, PANEL_TYPES.LIST),
-			);
-		});
-
-		it('trace: list shaping, no columns, panel type folds to time series', async () => {
-			const exportQuery = getTracesExportQuery(
-				getTracesQueryByPanelType(staged, PANEL_TYPES.TRACE),
-				getExportPanelType(PANEL_TYPES.TRACE),
-				options,
-			);
-
-			await exportTo([exportQuery], DataSource.TRACES, PANEL_TYPES.TRACE);
-
-			expect(exportQuery.builder.queryData[0].selectColumns).toBeUndefined();
-			expect(mockSafeNavigate).toHaveBeenCalledWith(
-				expectedLink(exportQuery, PANEL_TYPES.TIME_SERIES),
-			);
-		});
-
-		// Same as the alert: the list / trace order lives in ListView state and the
-		// page shapes the export without it, so the panel query has no order by.
-		it.each([PANEL_TYPES.LIST, PANEL_TYPES.TRACE])(
-			'%s: order by is not carried into the panel query',
-			async (panelType) => {
-				expect(staged.builder.queryData[0].orderBy).toHaveLength(1);
-				const exportQuery = getTracesExportQuery(
-					getTracesQueryByPanelType(staged, panelType),
-					getExportPanelType(panelType),
-					options,
-				);
-
-				await exportTo([exportQuery], DataSource.TRACES, panelType);
-
-				expect(exportQuery.builder.queryData[0].orderBy).toStrictEqual([]);
-				expect(mockSafeNavigate).toHaveBeenCalledWith(
-					expectedLink(exportQuery, getExportPanelType(panelType)),
-				);
-			},
-		);
-
-		it.each([PANEL_TYPES.TIME_SERIES, PANEL_TYPES.TABLE])(
-			'%s: staged query untouched, same panel type',
-			async (panelType) => {
-				const exportQuery = getTracesExportQuery(
-					getTracesQueryByPanelType(staged, panelType),
-					getExportPanelType(panelType),
-					options,
-				);
-
-				await exportTo([exportQuery], DataSource.TRACES, panelType);
-
-				expect(exportQuery).toBe(staged);
-				expect(mockSafeNavigate).toHaveBeenCalledWith(
-					expectedLink(staged, panelType),
-				);
-			},
-		);
-	});
-
-	describe('metrics, one chart per query', () => {
-		const queryA = stagedQuery(DataSource.METRICS, 'A');
-		const queryB = stagedQuery(DataSource.METRICS, 'B');
-
-		it('two or more queries render a picker; the chosen one goes to the picker and the link', async () => {
-			setPanelType(PANEL_TYPES.TIME_SERIES);
-			render(
-				<AddToDashboardButton
-					queries={[queryA, queryB]}
-					sourcepage={DataSource.METRICS}
-					panelType={PANEL_TYPES.TIME_SERIES}
-				/>,
-			);
-			const user = userEvent.setup();
-
-			await user.click(screen.getByTestId('menu-Query B'));
-			expect(screen.getByTestId('export-stub')).toHaveAttribute(
-				'data-query',
-				JSON.stringify(queryB),
-			);
-			await user.click(screen.getByTestId('export-stub'));
-
-			expect(mockSafeNavigate).toHaveBeenCalledWith(
-				expectedLink(queryB, PANEL_TYPES.TIME_SERIES),
-			);
-			expect(mockedLogEvent).toHaveBeenCalledWith(
-				EXPLORER_ACTION_EVENTS.addToDashboard,
-				expect.objectContaining({
-					sourcepage: DataSource.METRICS,
-					oneChartPerQuery: true,
-				}),
-			);
-		});
-
-		it('a single query is a plain button, no picker', async () => {
-			await exportTo(
-				[queryA],
-				DataSource.METRICS,
-				PANEL_TYPES.TIME_SERIES,
-				PANEL_TYPES.TIME_SERIES,
-			);
-
-			expect(screen.queryByTestId('menu-Query A')).not.toBeInTheDocument();
-			expect(mockSafeNavigate).toHaveBeenCalledWith(
-				expectedLink(queryA, PANEL_TYPES.TIME_SERIES),
-			);
-		});
-	});
-});

frontend/src/container/ExplorerActions/__tests__/CreateAlertButton.test.tsx

@@ -1,281 +0,0 @@
-import { useHistory } from 'react-router-dom';
-import logEvent from 'api/common/logEvent';
-import { QueryParams } from 'constants/query';
-import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
-import ROUTES from 'constants/routes';
-import {
-	getExportQueryData as getLogsExportQuery,
-	getQueryByPanelType as getLogsQueryByPanelType,
-} from 'container/LogsExplorerViews/explorerUtils';
-import { getQueryByPanelType as getTracesQueryByPanelType } from 'container/TracesExplorer/explorerUtils';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { render, screen, userEvent } from 'tests/test-utils';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource, StringOperators } from 'types/common/queryBuilder';
-
-import CreateAlertButton from '../CreateAlertButton';
-import { EXPLORER_ACTION_EVENTS } from '../utils';
-
-jest.mock('react-router-dom', () => ({
-	...jest.requireActual('react-router-dom'),
-	useHistory: jest.fn(),
-}));
-jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
-	useQueryBuilder: jest.fn(),
-}));
-jest.mock('api/common/logEvent', () => ({
-	__esModule: true,
-	default: jest.fn(() => Promise.resolve()),
-}));
-// The menu is the design system's; here each item is a plain button.
-jest.mock('@signozhq/ui/dropdown-menu', () => ({
-	DropdownMenuSimple: ({
-		menu,
-		children,
-	}: {
-		menu: { items: { key: string; label: string; onClick: () => void }[] };
-		children: React.ReactNode;
-	}): JSX.Element => (
-		<div>
-			{children}
-			{menu.items.map((item) => (
-				<button
-					type="button"
-					key={item.key}
-					data-testid={`menu-${item.label}`}
-					onClick={item.onClick}
-				>
-					{item.label}
-				</button>
-			))}
-		</div>
-	),
-}));
-
-const mockPush = jest.fn();
-const mockedUseHistory = jest.mocked(useHistory);
-const mockedUseQueryBuilder = jest.mocked(useQueryBuilder);
-const mockedLogEvent = jest.mocked(logEvent);
-
-const FILTER = "service.name = 'frontend'";
-const ORDER_BY = [{ columnName: 'timestamp', order: 'asc' }];
-
-function stagedQuery(
-	dataSource: DataSource,
-	aggregateOperator: StringOperators,
-	queryName = 'A',
-): Query {
-	const base = initialQueriesMap[dataSource];
-	return {
-		...base,
-		id: `query-${queryName}`,
-		builder: {
-			...base.builder,
-			queryData: [
-				{
-					...base.builder.queryData[0],
-					queryName,
-					aggregateOperator,
-					filter: { expression: FILTER },
-					orderBy: ORDER_BY,
-					groupBy: [{ key: 'service.name', dataType: 'string', type: 'resource' }],
-				},
-			],
-		},
-	} as Query;
-}
-
-function pushedQuery(): Query {
-	expect(mockPush).toHaveBeenCalledTimes(1);
-	const [path, search] = (mockPush.mock.calls[0][0] as string).split('?');
-	expect(path).toBe(ROUTES.ALERTS_NEW);
-	const raw = new URLSearchParams(search).get(QueryParams.compositeQuery);
-	return JSON.parse(raw as string);
-}
-
-function setPanelType(panelType: PANEL_TYPES): void {
-	mockedUseQueryBuilder.mockReturnValue({ panelType } as ReturnType<
-		typeof useQueryBuilder
-	>);
-}
-
-async function clickCreateAlert(
-	queries: Query[] | null,
-	sourcepage: DataSource,
-	panelType: PANEL_TYPES,
-): Promise<void> {
-	setPanelType(panelType);
-	render(<CreateAlertButton queries={queries} sourcepage={sourcepage} />);
-	await userEvent.setup().click(screen.getByTestId('explorer-create-alert'));
-}
-
-describe('CreateAlertButton', () => {
-	beforeEach(() => {
-		mockPush.mockReset();
-		mockedLogEvent.mockClear();
-		mockedUseHistory.mockReturnValue({ push: mockPush } as unknown as ReturnType<
-			typeof useHistory
-		>);
-	});
-
-	it.each([null, []])(
-		'is disabled and does nothing with %p',
-		async (queries) => {
-			await clickCreateAlert(queries, DataSource.LOGS, PANEL_TYPES.LIST);
-
-			expect(screen.getByTestId('explorer-create-alert')).toBeDisabled();
-			expect(mockPush).not.toHaveBeenCalled();
-		},
-	);
-
-	it('logs one event with the source page', async () => {
-		const query = stagedQuery(DataSource.TRACES, StringOperators.COUNT);
-
-		await clickCreateAlert([query], DataSource.TRACES, PANEL_TYPES.TIME_SERIES);
-
-		expect(mockedLogEvent).toHaveBeenCalledWith(
-			EXPLORER_ACTION_EVENTS.createAlert,
-			{
-				sourcepage: DataSource.TRACES,
-				panelType: PANEL_TYPES.TIME_SERIES,
-				oneChartPerQuery: false,
-			},
-		);
-	});
-
-	describe('logs, the query the page hands over per view', () => {
-		const staged = stagedQuery(DataSource.LOGS, StringOperators.NOOP);
-
-		it('list: count aggregation, no order by, filter and pagination as the page sent them', async () => {
-			const listRequest = getLogsQueryByPanelType(staged, PANEL_TYPES.LIST, {
-				page: 1,
-				pageSize: 100,
-				filters: { items: [], op: 'AND' },
-				filter: { expression: FILTER },
-			});
-			const exportQuery = getLogsExportQuery(
-				listRequest,
-				PANEL_TYPES.LIST,
-			) as Query;
-
-			await clickCreateAlert([exportQuery], DataSource.LOGS, PANEL_TYPES.LIST);
-
-			const [queryData] = pushedQuery().builder.queryData;
-			expect(queryData.aggregateOperator).toBe(StringOperators.COUNT);
-			expect(queryData.orderBy).toStrictEqual([]);
-			expect(queryData.groupBy).toStrictEqual([]);
-			expect(queryData.filter).toStrictEqual({ expression: FILTER });
-			expect(queryData.pageSize).toBe(100);
-		});
-
-		it('time series: staged query as is, order by and group by kept', async () => {
-			const tsStaged = stagedQuery(DataSource.LOGS, StringOperators.COUNT);
-			const exportQuery = getLogsExportQuery(
-				tsStaged,
-				PANEL_TYPES.TIME_SERIES,
-			) as Query;
-
-			await clickCreateAlert(
-				[exportQuery],
-				DataSource.LOGS,
-				PANEL_TYPES.TIME_SERIES,
-			);
-
-			const [queryData] = pushedQuery().builder.queryData;
-			expect(queryData).toStrictEqual(tsStaged.builder.queryData[0]);
-		});
-
-		it('table: staged query as is', async () => {
-			const tableStaged = stagedQuery(DataSource.LOGS, StringOperators.COUNT);
-			const exportQuery = getLogsExportQuery(
-				tableStaged,
-				PANEL_TYPES.TABLE,
-			) as Query;
-
-			await clickCreateAlert([exportQuery], DataSource.LOGS, PANEL_TYPES.TABLE);
-
-			expect(pushedQuery().builder).toStrictEqual(tableStaged.builder);
-		});
-	});
-
-	describe('traces, the query the page hands over per view', () => {
-		const staged = stagedQuery(DataSource.TRACES, StringOperators.NOOP);
-
-		it.each([PANEL_TYPES.LIST, PANEL_TYPES.TRACE])(
-			'%s: count aggregation, group by cleared by the list shaping, filter kept',
-			async (panelType) => {
-				const exportQuery = getTracesQueryByPanelType(staged, panelType);
-
-				await clickCreateAlert([exportQuery], DataSource.TRACES, panelType);
-
-				const [queryData] = pushedQuery().builder.queryData;
-				expect(queryData.aggregateOperator).toBe(StringOperators.COUNT);
-				expect(queryData.groupBy).toStrictEqual([]);
-				expect(queryData.filter).toStrictEqual({ expression: FILTER });
-			},
-		);
-
-		// The list / trace views keep their order in ListView state, and the page
-		// shapes the export without it, so the alert never sees an order by.
-		it.each([PANEL_TYPES.LIST, PANEL_TYPES.TRACE])(
-			'%s: order by is not carried, even when the staged query has one',
-			async (panelType) => {
-				expect(staged.builder.queryData[0].orderBy).toStrictEqual(ORDER_BY);
-				const exportQuery = getTracesQueryByPanelType(staged, panelType);
-
-				await clickCreateAlert([exportQuery], DataSource.TRACES, panelType);
-
-				expect(pushedQuery().builder.queryData[0].orderBy).toStrictEqual([]);
-			},
-		);
-
-		it.each([PANEL_TYPES.TIME_SERIES, PANEL_TYPES.TABLE])(
-			'%s: staged query as is',
-			async (panelType) => {
-				const aggStaged = stagedQuery(DataSource.TRACES, StringOperators.COUNT);
-				const exportQuery = getTracesQueryByPanelType(aggStaged, panelType);
-
-				await clickCreateAlert([exportQuery], DataSource.TRACES, panelType);
-
-				expect(pushedQuery().builder).toStrictEqual(aggStaged.builder);
-			},
-		);
-	});
-
-	describe('metrics, one chart per query', () => {
-		const queryA = stagedQuery(DataSource.METRICS, StringOperators.COUNT, 'A');
-		const queryB = stagedQuery(DataSource.METRICS, StringOperators.COUNT, 'B');
-
-		it('two or more queries render a picker and the chosen one is exported', async () => {
-			setPanelType(PANEL_TYPES.TIME_SERIES);
-			render(
-				<CreateAlertButton
-					queries={[queryA, queryB]}
-					sourcepage={DataSource.METRICS}
-				/>,
-			);
-
-			await userEvent.setup().click(screen.getByTestId('menu-Query B'));
-
-			expect(pushedQuery().builder.queryData[0].queryName).toBe('B');
-			expect(mockedLogEvent).toHaveBeenCalledWith(
-				EXPLORER_ACTION_EVENTS.createAlert,
-				expect.objectContaining({
-					sourcepage: DataSource.METRICS,
-					oneChartPerQuery: true,
-				}),
-			);
-		});
-
-		it('a single query is a plain button, no picker', async () => {
-			await clickCreateAlert(
-				[queryA],
-				DataSource.METRICS,
-				PANEL_TYPES.TIME_SERIES,
-			);
-
-			expect(screen.queryByTestId('menu-Query A')).not.toBeInTheDocument();
-			expect(pushedQuery().builder).toStrictEqual(queryA.builder);
-		});
-	});
-});

frontend/src/container/ExplorerActions/__tests__/utils.test.ts

@@ -1,190 +0,0 @@
-import { QueryParams } from 'constants/query';
-import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
-import ROUTES from 'constants/routes';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { StringOperators } from 'types/common/queryBuilder';
-
-import {
-	getCreateAlertLink,
-	getExportPanelType,
-	getExportQueries,
-	getQueryName,
-} from '../utils';
-
-function withFirstQuery(
-	base: Query,
-	overrides: Partial<Query['builder']['queryData'][number]>,
-): Query {
-	return {
-		...base,
-		builder: {
-			...base.builder,
-			queryData: [{ ...base.builder.queryData[0], ...overrides }],
-		},
-	};
-}
-
-function decodeQuery(link: string): Query {
-	const search = link.split('?')[1];
-	const raw = new URLSearchParams(search).get(QueryParams.compositeQuery);
-	return JSON.parse(raw as string);
-}
-
-describe('getExportPanelType', () => {
-	it.each([PANEL_TYPES.TIME_SERIES, PANEL_TYPES.TABLE, PANEL_TYPES.LIST])(
-		'keeps %s',
-		(panelType) => {
-			expect(getExportPanelType(panelType)).toBe(panelType);
-		},
-	);
-
-	it.each([PANEL_TYPES.BAR, PANEL_TYPES.PIE, PANEL_TYPES.TRACE, null])(
-		'folds %s to time series',
-		(panelType) => {
-			expect(getExportPanelType(panelType)).toBe(PANEL_TYPES.TIME_SERIES);
-		},
-	);
-});
-
-describe('getExportQueries', () => {
-	const query = initialQueriesMap.metrics;
-	const split = [initialQueriesMap.metrics, initialQueriesMap.logs];
-
-	it('is null without a query, whatever the split says', () => {
-		expect(getExportQueries(null)).toBeNull();
-		expect(getExportQueries(null, split)).toBeNull();
-	});
-
-	it('wraps the one query when there is no split', () => {
-		expect(getExportQueries(query)).toStrictEqual([query]);
-		expect(getExportQueries(query, undefined)).toStrictEqual([query]);
-	});
-
-	it('ignores a split of one and returns the query itself', () => {
-		expect(getExportQueries(query, [split[0]])).toStrictEqual([query]);
-	});
-
-	it('returns the split when it has two or more queries', () => {
-		expect(getExportQueries(query, split)).toBe(split);
-	});
-});
-
-describe('getQueryName', () => {
-	it('names a builder query by its query name', () => {
-		expect(getQueryName(initialQueriesMap.metrics)).toBe('Query A');
-	});
-
-	it('names a formula split by the formula name', () => {
-		const withFormula = {
-			...initialQueriesMap.metrics,
-			builder: {
-				...initialQueriesMap.metrics.builder,
-				queryFormulas: [{ queryName: 'F1', expression: 'A / B' }],
-			},
-		} as Query;
-
-		expect(getQueryName(withFormula)).toBe('Formula F1');
-	});
-});
-
-describe('getCreateAlertLink', () => {
-	const orderBy = [{ columnName: 'timestamp', order: 'desc' }];
-
-	it('points at the new alert route with the query in the url', () => {
-		const query = initialQueriesMap.traces;
-		const link = getCreateAlertLink({
-			query,
-			panelType: PANEL_TYPES.TIME_SERIES,
-		});
-
-		expect(link.startsWith(`${ROUTES.ALERTS_NEW}?`)).toBe(true);
-		expect(decodeQuery(link)).toStrictEqual(query);
-	});
-
-	it('logs list: noop becomes count and order by is dropped', () => {
-		const query = withFirstQuery(initialQueriesMap.logs, {
-			aggregateOperator: StringOperators.NOOP,
-			orderBy,
-		});
-
-		const [queryData] = decodeQuery(
-			getCreateAlertLink({
-				query,
-				panelType: PANEL_TYPES.LIST,
-			}),
-		).builder.queryData;
-
-		expect(queryData.aggregateOperator).toBe(StringOperators.COUNT);
-		expect(queryData.orderBy).toStrictEqual([]);
-	});
-
-	it('logs time series keeps order by', () => {
-		const query = withFirstQuery(initialQueriesMap.logs, {
-			aggregateOperator: StringOperators.COUNT,
-			orderBy,
-		});
-
-		const [queryData] = decodeQuery(
-			getCreateAlertLink({
-				query,
-				panelType: PANEL_TYPES.TIME_SERIES,
-			}),
-		).builder.queryData;
-
-		expect(queryData.orderBy).toStrictEqual(orderBy);
-	});
-
-	it.each([PANEL_TYPES.LIST, PANEL_TYPES.TRACE])(
-		'%s drops order by whatever the source',
-		(panelType) => {
-			const query = withFirstQuery(initialQueriesMap.traces, {
-				aggregateOperator: StringOperators.NOOP,
-				orderBy,
-			});
-
-			const [queryData] = decodeQuery(getCreateAlertLink({ query, panelType }))
-				.builder.queryData;
-
-			expect(queryData.aggregateOperator).toBe(StringOperators.COUNT);
-			expect(queryData.orderBy).toStrictEqual([]);
-		},
-	);
-
-	it('converts a noop on any query, not only the first', () => {
-		const first = initialQueriesMap.logs.builder.queryData[0];
-		const query: Query = {
-			...initialQueriesMap.logs,
-			builder: {
-				...initialQueriesMap.logs.builder,
-				queryData: [
-					{ ...first, aggregateOperator: StringOperators.COUNT },
-					{ ...first, queryName: 'B', aggregateOperator: StringOperators.NOOP },
-				],
-			},
-		};
-
-		const operators = decodeQuery(
-			getCreateAlertLink({ query, panelType: PANEL_TYPES.TIME_SERIES }),
-		).builder.queryData.map((item) => item.aggregateOperator);
-
-		expect(operators).toStrictEqual([
-			StringOperators.COUNT,
-			StringOperators.COUNT,
-		]);
-	});
-
-	it('does not mutate the query it is given', () => {
-		const query = withFirstQuery(initialQueriesMap.logs, {
-			aggregateOperator: StringOperators.NOOP,
-			orderBy,
-		});
-		const snapshot = JSON.stringify(query);
-
-		getCreateAlertLink({
-			query,
-			panelType: PANEL_TYPES.LIST,
-		});
-
-		expect(JSON.stringify(query)).toBe(snapshot);
-	});
-});

frontend/src/container/ExplorerActions/utils.ts

@@ -1,66 +0,0 @@
-import { AVAILABLE_EXPORT_PANEL_TYPES } from 'constants/panelTypes';
-import { QueryParams } from 'constants/query';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import ROUTES from 'constants/routes';
-import { cloneDeep } from 'lodash-es';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { StringOperators } from 'types/common/queryBuilder';
-
-export const EXPLORER_ACTION_EVENTS = {
-	createAlert: 'Explorer: Create alert clicked',
-	addToDashboard: 'Explorer: Add to dashboard clicked',
-	exported: 'Explorer: Add to dashboard successful',
-} as const;
-
-export function getExportQueries(
-	query: Query | null,
-	splitQueries?: Query[],
-): Query[] | null {
-	if (!query) {
-		return null;
-	}
-	if (splitQueries && splitQueries.length > 1) {
-		return splitQueries;
-	}
-	return [query];
-}
-
-export function getExportPanelType(panelType: PANEL_TYPES | null): PANEL_TYPES {
-	return panelType && AVAILABLE_EXPORT_PANEL_TYPES.includes(panelType)
-		? panelType
-		: PANEL_TYPES.TIME_SERIES;
-}
-
-export function getQueryName(query: Query): string {
-	if (query.builder.queryFormulas.length > 0) {
-		return `Formula ${query.builder.queryFormulas[0].queryName}`;
-	}
-	return `Query ${query.builder.queryData[0].queryName}`;
-}
-
-// Alerts need an aggregation, and list style views carry an order the alert
-// cannot use.
-export function getCreateAlertLink({
-	query,
-	panelType,
-}: {
-	query: Query;
-	panelType: PANEL_TYPES | null;
-}): string {
-	const isListStyle =
-		panelType === PANEL_TYPES.LIST || panelType === PANEL_TYPES.TRACE;
-
-	const alertQuery = cloneDeep(query);
-	alertQuery.builder.queryData = alertQuery.builder.queryData.map((item) => ({
-		...item,
-		aggregateOperator:
-			item.aggregateOperator === StringOperators.NOOP
-				? StringOperators.COUNT
-				: item.aggregateOperator,
-		orderBy: isListStyle ? [] : item.orderBy,
-	}));
-
-	return `${ROUTES.ALERTS_NEW}?${QueryParams.compositeQuery}=${encodeURIComponent(
-		JSON.stringify(alertQuery),
-	)}`;
-}

frontend/src/container/ExplorerOptions/ExplorerOptions.styles.scss

@@ -1,6 +1,8 @@
 .explorer-options-container {
 	position: fixed;
-	bottom: 0px;
+	// Lifted above the bottom strip. Don't extend this pattern — new fixed-bottom
+	// UI belongs in the bounded layout, not in another offset here.
+	bottom: var(--bottom-strip-height, 0px);
 	left: calc(50% + 240px);
 	transform: translate(calc(-50% - 120px), 0);
 	transition: left 0.2s linear;

frontend/src/container/ExplorerOptions/ExplorerOptionsHideArea.styles.scss

@@ -1,6 +1,8 @@
 .explorer-option-droppable-container {
 	position: fixed;
-	bottom: 0;
+	// Lifted above the bottom strip. Don't extend this pattern — new fixed-bottom
+	// UI belongs in the bounded layout, not in another offset here.
+	bottom: var(--bottom-strip-height, 0px);
 	width: -webkit-fill-available;
 	height: 24px;
 	display: flex;

frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsx

@@ -7,12 +7,9 @@ import LogsFormatOptionsMenu from 'components/LogsFormatOptionsMenu/LogsFormatOp
 import ListViewOrderBy from 'components/OrderBy/ListViewOrderBy';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import { PANEL_TYPES } from 'constants/queryBuilder';
-import AddToDashboardButton from 'container/ExplorerActions/AddToDashboardButton';
-import CreateAlertButton from 'container/ExplorerActions/CreateAlertButton';
 import { useOptionsMenu } from 'container/OptionsMenu';
 import { LOGS_REQUIRED_COLUMNS } from 'container/OptionsMenu/constants';
 import { ArrowUp10, Minus } from '@signozhq/icons';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource, StringOperators } from 'types/common/queryBuilder';
 
 function LogsActionsContainer({
@@ -22,7 +19,6 @@ function LogsActionsContainer({
 	handleToggleFrequencyChart,
 	orderBy,
 	setOrderBy,
-	exportQueries,
 }: {
 	listQuery: any;
 	selectedPanelType: PANEL_TYPES;
@@ -30,7 +26,6 @@ function LogsActionsContainer({
 	handleToggleFrequencyChart: () => void;
 	orderBy: string;
 	setOrderBy: (value: string) => void;
-	exportQueries: Query[] | null;
 }): JSX.Element {
 	const { options, config } = useOptionsMenu({
 		storageKey: LOCALSTORAGE.LOGS_LIST_OPTIONS,
@@ -78,11 +73,6 @@ function LogsActionsContainer({
 				</div>
 
 				<div className="tab-options-right">
-					<CreateAlertButton queries={exportQueries} sourcepage={DataSource.LOGS} />
-					<AddToDashboardButton
-						queries={exportQueries}
-						sourcepage={DataSource.LOGS}
-					/>
 					{selectedPanelType === PANEL_TYPES.LIST && (
 						<>
 							<div className="order-by-container">

frontend/src/container/LogsExplorerViews/index.tsx

@@ -37,7 +37,6 @@ import {
 	getListQuery,
 	getQueryByPanelType,
 } from 'container/LogsExplorerViews/explorerUtils';
-import { getExportQueries } from 'container/ExplorerActions/utils';
 import TimeSeriesView from 'container/TimeSeriesView/TimeSeriesView';
 import { ExportDashboard } from 'hooks/dashboard/useExportDashboards';
 import { useGetExportToDashboardLink } from 'hooks/dashboard/useGetExportToDashboardLink';
@@ -425,7 +424,6 @@ function LogsExplorerViewsContainer({
 						handleToggleFrequencyChart={handleToggleFrequencyChart}
 						orderBy={orderBy}
 						setOrderBy={setOrderBy}
-						exportQueries={getExportQueries(exportDefaultQuery)}
 					/>
 				)}
 

frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx

@@ -10,9 +10,6 @@ import WarningPopover from 'components/WarningPopover/WarningPopover';
 import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
 import { usePageActions } from 'container/AIAssistant/pageActions/usePageActions';
-import AddToDashboardButton from 'container/ExplorerActions/AddToDashboardButton';
-import CreateAlertButton from 'container/ExplorerActions/CreateAlertButton';
-import { getExportQueries } from 'container/ExplorerActions/utils';
 import ExplorerOptionWrapper from 'container/ExplorerOptions/ExplorerOptionWrapper';
 import RightToolbarActions from 'container/QueryBuilder/components/ToolbarActions/RightToolbarActions';
 import DateTimeSelector from 'container/TopNav/DateTimeSelectionV2';
@@ -305,15 +302,6 @@ function Explorer(): JSX.Element {
 		[stagedQuery, metricNames, units],
 	);
 
-	const exportQueries = useMemo(
-		() =>
-			getExportQueries(
-				stagedQuery ? exportDefaultQuery : null,
-				showOneChartPerQuery ? splitedQueries : undefined,
-			),
-		[stagedQuery, exportDefaultQuery, showOneChartPerQuery, splitedQueries],
-	);
-
 	const [selectedMetricName, setSelectedMetricName] = useState<string | null>(
 		null,
 	);
@@ -377,15 +365,6 @@ function Explorer(): JSX.Element {
 					<div className="explore-header-right-actions">
 						{!isEmpty(warning) && <WarningPopover warningData={warning} />}
 						<DateTimeSelector showAutoRefresh />
-						<CreateAlertButton
-							queries={exportQueries}
-							sourcepage={DataSource.METRICS}
-						/>
-						<AddToDashboardButton
-							queries={exportQueries}
-							sourcepage={DataSource.METRICS}
-							panelType={PANEL_TYPES.TIME_SERIES}
-						/>
 						<RightToolbarActions
 							onStageRunQuery={(): void => handleRunQuery()}
 							isLoadingQueries={isLoadingQueries}

frontend/src/container/MetricsExplorer/Explorer/__tests__/Explorer.test.tsx

@@ -4,7 +4,6 @@ import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router-dom';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import { render, screen } from '@testing-library/react';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
 import {
 	MetrictypesTemporalityDTO,
 	MetrictypesTypeDTO,
@@ -147,11 +146,9 @@ function renderExplorer(): void {
 		<QueryClientProvider client={queryClient}>
 			<MemoryRouter>
 				<Provider store={store}>
-					<TooltipProvider>
-						<ErrorModalProvider>
-							<Explorer />
-						</ErrorModalProvider>
-					</TooltipProvider>
+					<ErrorModalProvider>
+						<Explorer />
+					</ErrorModalProvider>
 				</Provider>
 			</MemoryRouter>
 		</QueryClientProvider>,

frontend/src/container/MetricsExplorer/Summary/Summary.styles.scss

@@ -181,7 +181,9 @@
 
 		.ant-pagination {
 			position: fixed;
-			bottom: 0;
+			// Lifted above the bottom strip. Don't extend this pattern — new
+			// fixed-bottom UI belongs in the bounded layout, not in another offset here.
+			bottom: var(--bottom-strip-height, 0px);
 			width: calc(100% - 54px);
 			background: var(--l1-background);
 			padding: 16px;

frontend/src/hooks/useSavedViewEnabled.ts

@@ -0,0 +1,11 @@
+import getLocalStorageKey from 'api/browser/localstorage/get';
+import { LOCALSTORAGE } from 'constants/localStorage';
+import { useState } from 'react';
+
+export function useSavedViewEnabled(): boolean {
+	const [isEnabled] = useState(
+		() => getLocalStorageKey(LOCALSTORAGE.SAVED_VIEW_ENABLED) === 'true',
+	);
+
+	return isEnabled;
+}

frontend/src/pages/AllErrors/stories/AllErrors.stories.tsx

@@ -98,30 +98,17 @@ export const QuickFiltersSettings: Story = {
 	play: openQuickFiltersSettings,
 };
 
-const dirtyQuickFiltersSettings = async (): Promise<void> => {
-	await openQuickFiltersSettings();
-
-	// One Remove per added filter; the first row's is the one clicked.
-	const [removeFilter] = await screen.findAllByRole('button', {
-		name: 'Remove',
-	});
-
-	await userEvent.click(removeFilter);
-	await screen.findByRole('button', { name: 'Save changes' });
-};
-
 /** Settings with an unsaved filter removal and the fixed action footer. */
 export const QuickFiltersSettingsDirty: Story = {
-	play: dirtyQuickFiltersSettings,
-};
+	play: async (): Promise<void> => {
+		await openQuickFiltersSettings();
 
-/**
- * The same panel with a banner above the shell. The banner takes 48px off the
- * layout, so this is the case where the footer used to be pushed off screen:
- * the panel is sized from the filters pane rather than the viewport, which
- * keeps Save changes reachable.
- */
-export const QuickFiltersSettingsWithBanner: Story = {
-	args: { banner: 'trial-expiry' },
-	play: dirtyQuickFiltersSettings,
+		// One Remove per added filter; the first row's is the one clicked.
+		const [removeFilter] = await screen.findAllByRole('button', {
+			name: 'Remove',
+		});
+
+		await userEvent.click(removeFilter);
+		await screen.findByRole('button', { name: 'Save changes' });
+	},
 };

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

@@ -8,7 +8,6 @@ import {
 	QuickfiltertypesSourceDTO,
 	TelemetrytypesFieldContextDTO,
 	TelemetrytypesFieldDataTypeDTO,
-	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import ROUTES from 'constants/routes';
 import { VIEWS } from 'container/ApiMonitoring/Explorer/Domains/DomainDetails/constants';
@@ -25,10 +24,7 @@ import {
 	toggleControl,
 } from '@/storybook/controls/controls';
 import { defineStoryMocks } from '@/storybook/controls/defineStoryMocks';
-import {
-	fieldKeysResponse,
-	fieldValuesResponse,
-} from '@/storybook/msw/__story_mockdata__/fields';
+import { fieldValuesResponse } from '@/storybook/msw/__story_mockdata__/fields';
 import { quickFiltersResponse } from '@/storybook/msw/__story_mockdata__/quickFilters';
 
 import {
@@ -321,21 +317,6 @@ export const apiMonitoringMocks = defineStoryMocks({
 			})),
 		),
 
-		rest.get(
-			'http://localhost/api/v1/fields/keys',
-			response.json((req) =>
-				fieldKeysResponse(
-					groupByAttributeKeys(req.url.searchParams.get('searchText') ?? '').map(
-						({ key }) => key,
-					),
-					{
-						signal: TelemetrytypesSignalDTO.traces,
-						fieldContext: TelemetrytypesFieldContextDTO.attribute,
-					},
-				),
-			),
-		),
-
 		rest.get(
 			'http://localhost/api/v1/fields/values',
 			response.json((req) =>

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

@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react-vite';
-import { expect, screen, userEvent, waitFor, within } from 'storybook/test';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
 
 import { storyMocks } from '@/storybook/controls/defineStoryMocks';
 import type { PageStoryArgs } from '@/storybook/runtime/resolveStory';
@@ -59,35 +59,6 @@ export const PortDomain: Story = {
 /** The page fetches before it renders a filter, which outlasts the 1s default. */
 const untilLoaded = { timeout: 15_000 };
 
-const openQuickFiltersSettings = async (): Promise<void> => {
-	// The settings control renders disabled while its permission check is in
-	// flight and is swapped for the enabled one once the check answers, so it is
-	// looked up again on every attempt; a click on the disabled one is dropped in
-	// silence.
-	const control = await waitFor(() => {
-		const settings = screen.getByTestId('settings-icon-container');
-
-		expect(settings).toBeEnabled();
-
-		return settings;
-	}, untilLoaded);
-
-	await userEvent.click(control);
-	await screen.findByText('Edit quick filters', undefined, untilLoaded);
-};
-
-const dirtyQuickFiltersSettings = async (): Promise<void> => {
-	await openQuickFiltersSettings();
-
-	// One Remove per added filter; the first row's is the one clicked.
-	const [removeFilter] = await screen.findAllByRole('button', {
-		name: 'Remove',
-	});
-
-	await userEvent.click(removeFilter);
-	await screen.findByRole('button', { name: 'Save changes' });
-};
-
 /**
  * The quick-filter panel has no test id of its own, and it only mounts once the
  * workspace's filters have answered.
@@ -172,24 +143,3 @@ export const NoExternalCalls: Story = {
 export const Loading: Story = {
 	args: { dataState: 'loading' },
 };
-
-/** The editable quick-filter settings panel. */
-export const QuickFiltersSettings: Story = {
-	play: openQuickFiltersSettings,
-};
-
-/** Settings with an unsaved filter removal and the fixed action footer. */
-export const QuickFiltersSettingsDirty: Story = {
-	play: dirtyQuickFiltersSettings,
-};
-
-/**
- * The same panel with a banner above the shell. The banner takes 48px off the
- * layout, so this is the case where the footer used to be pushed off screen:
- * the panel is sized from the filters pane rather than the viewport, which
- * keeps Save changes reachable.
- */
-export const QuickFiltersSettingsWithBanner: Story = {
-	args: { banner: 'trial-expiry' },
-	play: dirtyQuickFiltersSettings,
-};

frontend/src/pages/DashboardPage/DashboardContainer/components/LockedIndicator/LockedIndicator.module.scss

@@ -2,7 +2,9 @@
 	display: flex;
 	flex-direction: column;
 	position: fixed;
-	bottom: 0;
+	// Lifted above the bottom strip. Don't extend this pattern — new fixed-bottom
+	// UI belongs in the bounded layout, not in another offset here.
+	bottom: var(--bottom-strip-height, 0px);
 	left: 0;
 	width: 100%;
 	z-index: 100;

frontend/src/pages/LLMObservability/Explorer/stories/Explorer.stories.tsx

@@ -146,39 +146,11 @@ export const Failed: Story = {
 	parameters: { allowConsoleErrors: true },
 };
 
-const dirtyQuickFiltersSettings = async (): Promise<void> => {
-	await openQuickFiltersSettings();
-
-	// One Remove per added filter; the first row's is the one clicked.
-	const [removeFilter] = await screen.findAllByRole('button', {
-		name: 'Remove',
-	});
-
-	await userEvent.click(removeFilter);
-	await screen.findByRole('button', { name: 'Save changes' });
-};
-
 /** The editable quick-filter settings panel. */
 export const QuickFiltersSettings: Story = {
 	play: openQuickFiltersSettings,
 };
 
-/** Settings with an unsaved filter removal and the fixed action footer. */
-export const QuickFiltersSettingsDirty: Story = {
-	play: dirtyQuickFiltersSettings,
-};
-
-/**
- * The same panel with a banner above the shell. The banner takes 48px off the
- * layout, so this is the case where the footer used to be pushed off screen:
- * the panel is sized from the filters pane rather than the viewport, which
- * keeps Save changes reachable.
- */
-export const QuickFiltersSettingsWithBanner: Story = {
-	args: { banner: 'trial-expiry' },
-	play: dirtyQuickFiltersSettings,
-};
-
 /** A quick-filter value selected against the LLM span query. */
 export const QuickFilterSelected: Story = {
 	play: async ({ canvasElement }): Promise<void> => {

frontend/src/pages/LogsModulePage/stories/LogsModulePage.stories.tsx

@@ -166,31 +166,18 @@ export const QuickFiltersSettings: Story = {
 	play: openQuickFiltersSettings,
 };
 
-const dirtyQuickFiltersSettings = async (): Promise<void> => {
-	await openQuickFiltersSettings();
-	// One Remove per added filter; the first row's is the one clicked.
-	const [removeFilter] = await screen.findAllByRole('button', {
-		name: 'Remove',
-	});
-
-	await userEvent.click(removeFilter);
-	await screen.findByRole('button', { name: 'Save changes' });
-};
-
 /** Settings with an unsaved filter removal and the fixed action footer. */
 export const QuickFiltersSettingsDirty: Story = {
-	play: dirtyQuickFiltersSettings,
-};
+	play: async (): Promise<void> => {
+		await openQuickFiltersSettings();
+		// One Remove per added filter; the first row's is the one clicked.
+		const [removeFilter] = await screen.findAllByRole('button', {
+			name: 'Remove',
+		});
 
-/**
- * The same panel with a banner above the shell. The banner takes 48px off the
- * layout, so this is the case where the footer used to be pushed off screen:
- * the panel is sized from the filters pane rather than the viewport, which
- * keeps Save changes reachable.
- */
-export const QuickFiltersSettingsWithBanner: Story = {
-	args: { banner: 'trial-expiry' },
-	play: dirtyQuickFiltersSettings,
+		await userEvent.click(removeFilter);
+		await screen.findByRole('button', { name: 'Save changes' });
+	},
 };
 
 /**

frontend/src/pages/MeterExplorer/stories/MeterExplorer.stories.tsx

@@ -1,5 +1,4 @@
 import type { Meta, StoryObj } from '@storybook/react-vite';
-import { expect, screen, userEvent, waitFor } from 'storybook/test';
 
 import { storyMocks } from '@/storybook/controls/defineStoryMocks';
 import type { PageStoryArgs } from '@/storybook/runtime/resolveStory';
@@ -19,7 +18,6 @@ const pageStory = storyMocks(meterMocks, { layout: 'app' });
  */
 const meta = {
 	title: 'Pages/Metering/Cost Meter',
-	tags: ['play'],
 	component: MeterExplorerPage,
 	...pageStory,
 	parameters: { ...pageStory.parameters },
@@ -29,38 +27,6 @@ export default meta;
 
 type Story = StoryObj<MeterArgs>;
 
-/** The page fetches before it renders its filters, which outlasts the 1s default. */
-const untilLoaded = { timeout: 15_000 };
-
-const openQuickFiltersSettings = async (): Promise<void> => {
-	// The settings control renders disabled while its permission check is in
-	// flight and is swapped for the enabled one once the check answers, so it is
-	// looked up again on every attempt; a click on the disabled one is dropped in
-	// silence.
-	const control = await waitFor(() => {
-		const settings = screen.getByTestId('settings-icon-container');
-
-		expect(settings).toBeEnabled();
-
-		return settings;
-	}, untilLoaded);
-
-	await userEvent.click(control);
-	await screen.findByText('Edit quick filters', undefined, untilLoaded);
-};
-
-const dirtyQuickFiltersSettings = async (): Promise<void> => {
-	await openQuickFiltersSettings();
-
-	// One Remove per added filter; the first row's is the one clicked.
-	const [removeFilter] = await screen.findAllByRole('button', {
-		name: 'Remove',
-	});
-
-	await userEvent.click(removeFilter);
-	await screen.findByRole('button', { name: 'Save changes' });
-};
-
 /**
  * The Meter tab over the last day: what the workspace ingested in total, then
  * the hourly count and size of log records, of spans, and the metric datapoints
@@ -122,26 +88,3 @@ export const ExplorerWithoutQuickFilters: Story = {
 export const ViewsEmpty: Story = {
 	args: { tab: 'views', savedViews: 0 },
 };
-
-/** The editable quick-filter settings panel, which lives on the Explorer tab. */
-export const QuickFiltersSettings: Story = {
-	args: { tab: 'explorer' },
-	play: openQuickFiltersSettings,
-};
-
-/** Settings with an unsaved filter removal and the fixed action footer. */
-export const QuickFiltersSettingsDirty: Story = {
-	args: { tab: 'explorer' },
-	play: dirtyQuickFiltersSettings,
-};
-
-/**
- * The same panel with a banner above the shell. The banner takes 48px off the
- * layout, so this is the case where the footer used to be pushed off screen:
- * the panel is sized from the filters pane rather than the viewport, which
- * keeps Save changes reachable.
- */
-export const QuickFiltersSettingsWithBanner: Story = {
-	args: { tab: 'explorer', banner: 'trial-expiry' },
-	play: dirtyQuickFiltersSettings,
-};

frontend/src/pages/TracesExplorer/index.tsx

@@ -13,12 +13,6 @@ import { LOCALSTORAGE } from 'constants/localStorage';
 import { AVAILABLE_EXPORT_PANEL_TYPES } from 'constants/panelTypes';
 import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import { usePageActions } from 'container/AIAssistant/pageActions/usePageActions';
-import AddToDashboardButton from 'container/ExplorerActions/AddToDashboardButton';
-import CreateAlertButton from 'container/ExplorerActions/CreateAlertButton';
-import {
-	getExportPanelType,
-	getExportQueries,
-} from 'container/ExplorerActions/utils';
 import ExplorerOptionWrapper from 'container/ExplorerOptions/ExplorerOptionWrapper';
 import { useOptionsMenu } from 'container/OptionsMenu';
 import LeftToolbarActions from 'container/QueryBuilder/components/ToolbarActions/LeftToolbarActions';
@@ -200,16 +194,6 @@ function TracesExplorer(): JSX.Element {
 		[stagedQuery, panelType],
 	);
 
-	const exportDashboardQuery = useMemo(
-		() =>
-			getExportQueryData(
-				exportDefaultQuery,
-				getExportPanelType(panelType),
-				options,
-			),
-		[exportDefaultQuery, panelType, options],
-	);
-
 	const handleExport = useCallback(
 		(dashboard: ExportDashboard | null, isNewDashboard?: boolean): void => {
 			if (!dashboard || !panelType) {
@@ -305,24 +289,14 @@ function TracesExplorer(): JSX.Element {
 								!isEmpty(warning) ? <WarningPopover warningData={warning} /> : <div />
 							}
 							rightActions={
-								<>
-									<CreateAlertButton
-										queries={getExportQueries(stagedQuery ? exportDefaultQuery : null)}
-										sourcepage={DataSource.TRACES}
-									/>
-									<AddToDashboardButton
-										queries={getExportQueries(stagedQuery ? exportDashboardQuery : null)}
-										sourcepage={DataSource.TRACES}
-									/>
-									<RightToolbarActions
-										onStageRunQuery={(): void => {
-											setIsCancelled(false);
-											handleRunQuery();
-										}}
-										isLoadingQueries={isLoadingQueries}
-										handleCancelQuery={handleCancelQuery}
-									/>
-								</>
+								<RightToolbarActions
+									onStageRunQuery={(): void => {
+										setIsCancelled(false);
+										handleRunQuery();
+									}}
+									isLoadingQueries={isLoadingQueries}
+									handleCancelQuery={handleCancelQuery}
+								/>
 							}
 						/>
 					</div>

frontend/src/pages/TracesModulePage/stories/TracesModulePage.stories.tsx

@@ -116,29 +116,16 @@ export const QuickFiltersSettings: Story = {
 	play: openQuickFiltersSettings,
 };
 
-const dirtyQuickFiltersSettings = async (): Promise<void> => {
-	await openQuickFiltersSettings();
-	// One Remove per added filter; the first row's is the one clicked.
-	const [removeFilter] = await screen.findAllByRole('button', {
-		name: 'Remove',
-	});
-
-	await userEvent.click(removeFilter);
-	await screen.findByRole('button', { name: 'Save changes' });
-};
-
 /** Settings with an unsaved filter removal and the fixed action footer. */
 export const QuickFiltersSettingsDirty: Story = {
-	play: dirtyQuickFiltersSettings,
-};
+	play: async (): Promise<void> => {
+		await openQuickFiltersSettings();
+		// One Remove per added filter; the first row's is the one clicked.
+		const [removeFilter] = await screen.findAllByRole('button', {
+			name: 'Remove',
+		});
 
-/**
- * The same panel with a banner above the shell. The banner takes 48px off the
- * layout, so this is the case where the footer used to be pushed off screen:
- * the panel is sized from the filters pane rather than the viewport, which
- * keeps Save changes reachable.
- */
-export const QuickFiltersSettingsWithBanner: Story = {
-	args: { banner: 'trial-expiry' },
-	play: dirtyQuickFiltersSettings,
+		await userEvent.click(removeFilter);
+		await screen.findByRole('button', { name: 'Save changes' });
+	},
 };

pkg/apiserver/signozapiserver/alertmanager.go

@@ -145,7 +145,6 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusCreated,
 			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusConflict},
 			Deprecated:          false,
-			Stability:           handler.StabilityDevelopment,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbCreate)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
@@ -174,7 +173,6 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusOK,
 			ErrorStatusCodes:    []int{http.StatusBadRequest},
 			Deprecated:          false,
-			Stability:           handler.StabilityDevelopment,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbList)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
@@ -201,7 +199,6 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusOK,
 			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
 			Deprecated:          false,
-			Stability:           handler.StabilityDevelopment,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbRead)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
@@ -229,7 +226,6 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusOK,
 			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
 			Deprecated:          false,
-			Stability:           handler.StabilityDevelopment,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbUpdate)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
@@ -257,7 +253,6 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusNoContent,
 			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
 			Deprecated:          false,
-			Stability:           handler.StabilityDevelopment,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbDelete)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
@@ -286,7 +281,6 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusOK,
 			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
 			Deprecated:          false,
-			Stability:           handler.StabilityDevelopment,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbUpdate)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{
@@ -314,7 +308,6 @@ func (provider *provider) addAlertmanagerRoutes(router *mux.Router) error {
 			SuccessStatusCode:   http.StatusNoContent,
 			ErrorStatusCodes:    []int{http.StatusBadRequest},
 			Deprecated:          false,
-			Stability:           handler.StabilityDevelopment,
 			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceNotificationChannel.Scope(coretypes.VerbCreate)}),
 		},
 		handler.WithResourceDefs(handler.BasicResourceDef{

pkg/apiserver/signozapiserver/ruler.go

@@ -15,26 +15,10 @@ func (provider *provider) addRulerRoutes(router *mux.Router) error {
 		ID:                  "ListRules",
 		Tags:                []string{"rules"},
 		Summary:             "List alert rules",
-		Description:         "This endpoint lists all alert rules with their current evaluation state. Deprecated: use ListRulesV3, which supports filtering, sorting and pagination.",
+		Description:         "This endpoint lists all alert rules with their current evaluation state",
 		Response:            make([]*ruletypes.Rule, 0),
 		ResponseContentType: "application/json",
 		SuccessStatusCode:   http.StatusOK,
-		Deprecated:          true,
-		SecuritySchemes:     newSecuritySchemes(types.RoleViewer),
-	})).Methods(http.MethodGet).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v3/rules", handler.New(provider.authzMiddleware.ViewAccess(provider.rulerHandler.ListRulesV3), handler.OpenAPIDef{
-		ID:                  "ListRulesV3",
-		Tags:                []string{"rules"},
-		Summary:             "List alert rules (v3)",
-		Description:         "Returns a page of alert rules with their current evaluation state, trimmed to the fields the list page renders. Supports a filter DSL (`query`), a repeated `states` filter applied after the state overlay, sort (`updated_at`/`created_at`/`name`/`state`/`severity`), order (`asc`/`desc`), and offset-based pagination (`limit`/`offset`). In the filter DSL, a non-reserved key is matched as a rule label directly (`team = infra`); a key that collides with a reserved keyword matches either interpretation (negative operators exclude both), and `labels.<key>` targets only the label. The response also carries the org's label pairs and the reserved filter keys for building filter suggestions.",
-		RequestQuery:        new(ruletypes.ListRulesParams),
-		Response:            new(ruletypes.ListableRules),
-		ResponseContentType: "application/json",
-		SuccessStatusCode:   http.StatusOK,
-		ErrorStatusCodes:    []int{http.StatusBadRequest},
 		SecuritySchemes:     newSecuritySchemes(types.RoleViewer),
 	})).Methods(http.MethodGet).GetError(); err != nil {
 		return err

pkg/http/handler/handler_test.go

@@ -1,75 +0,0 @@
-package handler
-
-import (
-	"net/http"
-	"testing"
-
-	"github.com/gorilla/mux"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/swaggest/openapi-go"
-	"github.com/swaggest/openapi-go/openapi3"
-)
-
-type bespokeOpenAPIHandler struct{}
-
-func (bespokeOpenAPIHandler) ServeHTTP(http.ResponseWriter, *http.Request) {}
-
-func (bespokeOpenAPIHandler) ServeOpenAPI(opCtx openapi.OperationContext) {
-	opCtx.SetID("Bespoke")
-	opCtx.AddRespStructure(nil, openapi.WithHTTPStatus(http.StatusOK))
-}
-
-func (bespokeOpenAPIHandler) ResourceDefs() []ResourceDef { return nil }
-
-func TestAttachStabilities(t *testing.T) {
-	router := mux.NewRouter()
-	router.Handle("/development", New(func(http.ResponseWriter, *http.Request) {}, OpenAPIDef{ID: "Development", SuccessStatusCode: http.StatusOK, Stability: StabilityDevelopment})).Methods(http.MethodGet)
-	router.Handle("/beta/{id}", New(func(http.ResponseWriter, *http.Request) {}, OpenAPIDef{ID: "Beta", SuccessStatusCode: http.StatusOK, Stability: StabilityBeta})).Methods(http.MethodPut)
-	router.Handle("/unset", New(func(http.ResponseWriter, *http.Request) {}, OpenAPIDef{ID: "Unset", SuccessStatusCode: http.StatusOK})).Methods(http.MethodGet)
-	router.Handle("/bespoke", bespokeOpenAPIHandler{}).Methods(http.MethodGet)
-
-	reflector := openapi3.NewReflector()
-	collector := NewOpenAPICollector(reflector)
-	require.NoError(t, router.Walk(collector.Walker))
-	collector.AttachStabilities(reflector.Spec)
-
-	testCases := []struct {
-		subtestName            string
-		path                   string
-		method                 string
-		expectedExtensionValue any
-	}{
-		{
-			subtestName:            "development handler",
-			path:                   "/development",
-			method:                 "get",
-			expectedExtensionValue: "development",
-		},
-		{
-			subtestName:            "beta handler with path parameter",
-			path:                   "/beta/{id}",
-			method:                 "put",
-			expectedExtensionValue: "beta",
-		},
-		{
-			subtestName:            "unset handler defaults to alpha",
-			path:                   "/unset",
-			method:                 "get",
-			expectedExtensionValue: "alpha",
-		},
-		{
-			subtestName:            "handler built outside New defaults to alpha",
-			path:                   "/bespoke",
-			method:                 "get",
-			expectedExtensionValue: "alpha",
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.subtestName, func(t *testing.T) {
-			operation := reflector.Spec.Paths.MapOfPathItemValues[testCase.path].MapOfOperationValues[testCase.method]
-			assert.Equal(t, testCase.expectedExtensionValue, operation.MapOfAnything["x-signoz-stability"])
-		})
-	}
-}

pkg/http/handler/openapi.go

@@ -1,37 +1,14 @@
 package handler
 
 import (
-	"net/http"
 	"reflect"
 
-	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/gorilla/mux"
 	"github.com/swaggest/jsonschema-go"
 	openapigo "github.com/swaggest/openapi-go"
-	"github.com/swaggest/openapi-go/openapi3"
 	"github.com/swaggest/rest/openapi"
 )
 
-const signozStabilityKey string = "x-signoz-stability"
-
-var (
-	StabilityDevelopment = Stability{valuer.NewString("development")}
-	StabilityAlpha       = Stability{valuer.NewString("alpha")}
-	StabilityBeta        = Stability{valuer.NewString("beta")}
-	StabilityStable      = Stability{valuer.NewString("stable")}
-)
-
-// Stability is emitted as the x-signoz-stability extension on every operation; unset means alpha.
-type Stability struct{ valuer.String }
-
-func (stability Stability) StringValue() string {
-	if stability.IsZero() {
-		return StabilityAlpha.String.StringValue()
-	}
-
-	return stability.String.StringValue()
-}
-
 // OpenAPIExample is a named example for an OpenAPI operation.
 type OpenAPIExample struct {
 	Name        string
@@ -55,7 +32,6 @@ type OpenAPIDef struct {
 	SuccessStatusCode   int
 	ErrorStatusCodes    []int
 	Deprecated          bool
-	Stability           Stability
 	SecuritySchemes     []OpenAPISecurityScheme
 }
 
@@ -66,16 +42,14 @@ type OpenAPISecurityScheme struct {
 
 // OpenAPICollector is a collector for OpenAPI operations.
 type OpenAPICollector struct {
-	collector   *openapi.Collector
-	stabilities map[operationKey]Stability
+	collector *openapi.Collector
 }
 
 func NewOpenAPICollector(reflector openapigo.Reflector) *OpenAPICollector {
 	c := openapi.NewCollector(reflector)
 
 	return &OpenAPICollector{
-		collector:   c,
-		stabilities: make(map[operationKey]Stability),
+		collector: c,
 	}
 }
 
@@ -103,9 +77,6 @@ func (c *OpenAPICollector) Walker(route *mux.Route, _ *mux.Router, _ []*mux.Rout
 			if err := c.collector.CollectOperation(method, path, c.collect(method, path, handler.ServeOpenAPI)); err != nil {
 				return err
 			}
-			if err := c.recordStability(method, path, httpHandler); err != nil {
-				return err
-			}
 		}
 		return nil
 	}
@@ -113,17 +84,6 @@ func (c *OpenAPICollector) Walker(route *mux.Route, _ *mux.Router, _ []*mux.Rout
 	return nil
 }
 
-// AttachStabilities stamps every operation in spec, so handlers built outside New
-// carry the unset stability rather than none.
-func (c *OpenAPICollector) AttachStabilities(spec *openapi3.Spec) {
-	for path, pathItem := range spec.Paths.MapOfPathItemValues {
-		for method, operation := range pathItem.MapOfOperationValues {
-			operation.WithMapOfAnythingItem(signozStabilityKey, c.stabilities[operationKey{method: method, path: path}].StringValue())
-			pathItem.MapOfOperationValues[method] = operation
-		}
-	}
-}
-
 func (c *OpenAPICollector) collect(method string, path string, serveOpenAPIFunc ServeOpenAPIFunc) func(oc openapigo.OperationContext) error {
 	return func(oc openapigo.OperationContext) error {
 		// Serve the OpenAPI documentation for the handler
@@ -157,23 +117,3 @@ func (c *OpenAPICollector) collect(method string, path string, serveOpenAPIFunc
 		return nil
 	}
 }
-
-func (c *OpenAPICollector) recordStability(method string, path string, httpHandler http.Handler) error {
-	generic, ok := httpHandler.(*handler)
-	if !ok {
-		return nil
-	}
-
-	cleanMethod, cleanPath, _, err := openapigo.SanitizeMethodPath(method, path)
-	if err != nil {
-		return err
-	}
-
-	c.stabilities[operationKey{method: cleanMethod, path: cleanPath}] = generic.openAPIDef.Stability
-	return nil
-}
-
-type operationKey struct {
-	method string
-	path   string
-}

pkg/query-service/rules/filterquery.go

@@ -1,20 +0,0 @@
-package rules
-
-import (
-	"strings"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/parser/filterquery/sqlcompiler"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/types/ruletypes"
-)
-
-// Compile wraps compiler errors in the rules list filter error code.
-func CompileListFilter(query string, formatter sqlstore.SQLFormatter) (*sqlcompiler.Compiled, error) {
-	compiled, errs := sqlcompiler.Compile(query, formatter, ruleFieldResolver{})
-	if len(errs) > 0 {
-		return nil, errors.NewInvalidInputf(ruletypes.ErrCodeRuleListFilterInvalid,
-			"invalid filter query: %s", strings.Join(errs, "; "))
-	}
-	return compiled, nil
-}

pkg/query-service/rules/filterquery_resolver.go

@@ -1,196 +0,0 @@
-package rules
-
-import (
-	"fmt"
-	"slices"
-	"strings"
-
-	grammar "github.com/SigNoz/signoz/pkg/parser/filterquery/grammar"
-	"github.com/SigNoz/signoz/pkg/parser/filterquery/sqlcompiler"
-	qbtypesv5 "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	"github.com/SigNoz/signoz/pkg/types/ruletypes"
-)
-
-const (
-	ruleDataColumn  = "rule.data"
-	ruleLabelsField = "labels"
-	nameJSONPath    = "$.alert"
-	descriptionPath = "$.description"
-	labelsJSONPath  = "$.labels"
-	alertTypePath   = "$.alertType"
-	ruleTypePath    = "$.ruleType"
-)
-
-// ruleFieldResolver maps rule list DSL keys; a non-reserved key is a case-sensitive label lookup.
-type ruleFieldResolver struct{}
-
-func (r ruleFieldResolver) ResolveComparison(v *sqlcompiler.Visitor, rawKey string, operation qbtypesv5.FilterOperator, ctx *grammar.ComparisonContext) string {
-	key := strings.ToLower(rawKey)
-
-	// labels.<key> is the explicit way to target only the label on a reserved-key collision.
-	if strings.HasPrefix(key, ruletypes.DSLLabelsKeyPrefix) {
-		labelKey := rawKey[len(ruletypes.DSLLabelsKeyPrefix):]
-		if labelKey == "" {
-			v.AddError("labels filter is missing a key, use labels.<key>")
-			return ""
-		}
-		if _, allowed := ruletypes.LabelsKeyOps[operation]; !allowed {
-			v.AddError("operator %s is not allowed on a labels.<key> filter", sqlcompiler.OperationName(operation))
-			return ""
-		}
-		return r.labelComparison(v, ctx, operation, labelKey)
-	}
-
-	allowedOperations, isReserved := ruletypes.ReservedOps[ruletypes.DSLKey(key)]
-	_, labelAllowed := ruletypes.LabelsKeyOps[operation]
-
-	if !isReserved {
-		if !labelAllowed {
-			v.AddError("operator %s is not allowed on the label filter %q", sqlcompiler.OperationName(operation), rawKey)
-			return ""
-		}
-		return r.labelComparison(v, ctx, operation, rawKey)
-	}
-
-	_, reservedAllowed := allowedOperations[operation]
-	// reserved severity is itself the severity-label lookup; an identical spelling would duplicate the predicate
-	if ruletypes.DSLKey(key) == ruletypes.DSLKeySeverity && rawKey == string(ruletypes.DSLKeySeverity) {
-		labelAllowed = false
-	}
-
-	switch {
-	case reservedAllowed && labelAllowed:
-		reservedPredicate := r.resolveReservedKey(v, ctx, operation, ruletypes.DSLKey(key))
-		labelPredicate := r.labelComparison(v, ctx, operation, rawKey)
-		if reservedPredicate == "" || labelPredicate == "" {
-			return ""
-		}
-		// the key matches both the reserved field and a same-named label; a negative term must exclude both
-		if operation.IsNegativeOperator() {
-			return v.Sb.And(reservedPredicate, labelPredicate)
-		}
-		return v.Sb.Or(reservedPredicate, labelPredicate)
-	case reservedAllowed:
-		return r.resolveReservedKey(v, ctx, operation, ruletypes.DSLKey(key))
-	case labelAllowed:
-		return r.labelComparison(v, ctx, operation, rawKey)
-	default:
-		v.AddError("operator %s is not allowed for key %q", sqlcompiler.OperationName(operation), key)
-		return ""
-	}
-}
-
-func (r ruleFieldResolver) resolveReservedKey(v *sqlcompiler.Visitor, ctx *grammar.ComparisonContext, operation qbtypesv5.FilterOperator, key ruletypes.DSLKey) string {
-	switch key {
-	case ruletypes.DSLKeyName:
-		columnExpression := string(v.Formatter.JSONExtractString(ruleDataColumn, nameJSONPath))
-		return v.BuildStringOperation(v.Sb, ctx, operation, columnExpression, string(key))
-	case ruletypes.DSLKeySeverity:
-		// severity is an alias for labels.severity, sharing its missing-label semantics.
-		return r.labelComparison(v, ctx, operation, "severity")
-	case ruletypes.DSLKeyCreatedBy:
-		return v.BuildStringOperation(v.Sb, ctx, operation, "rule.created_by", string(key))
-	case ruletypes.DSLKeyUpdatedBy:
-		return v.BuildStringOperation(v.Sb, ctx, operation, "rule.updated_by", string(key))
-	case ruletypes.DSLKeyCreatedAt:
-		return v.BuildTimestampComparison(ctx, operation, "rule.created_at")
-	case ruletypes.DSLKeyUpdatedAt:
-		return v.BuildTimestampComparison(ctx, operation, "rule.updated_at")
-	case ruletypes.DSLKeyAlertType:
-		return r.enumComparison(v, ctx, operation, key, alertTypePath, alertTypeValues)
-	case ruletypes.DSLKeyRuleType:
-		return r.enumComparison(v, ctx, operation, key, ruleTypePath, ruleTypeValues)
-	}
-	v.AddError("no handler for reserved key %q", key)
-	return ""
-}
-
-// A missing label evaluates as the empty string for every value operator; EXISTS/NOT EXISTS test the raw extraction.
-func (ruleFieldResolver) labelComparison(v *sqlcompiler.Visitor, ctx *grammar.ComparisonContext, operation qbtypesv5.FilterOperator, labelKey string) string {
-	columnExpression := string(v.Formatter.JSONExtractMapValue(ruleDataColumn, ruleLabelsField, labelKey))
-
-	switch operation {
-	case qbtypesv5.FilterOperatorExists:
-		return fmt.Sprintf("%s IS NOT NULL", columnExpression)
-	case qbtypesv5.FilterOperatorNotExists:
-		return fmt.Sprintf("%s IS NULL", columnExpression)
-	}
-
-	keyForError := ruletypes.DSLLabelsKeyPrefix + labelKey
-	columnExpression = fmt.Sprintf("COALESCE(%s, '')", columnExpression)
-	return v.BuildStringOperation(v.Sb, ctx, operation, columnExpression, keyForError)
-}
-
-func (ruleFieldResolver) enumComparison(v *sqlcompiler.Visitor, ctx *grammar.ComparisonContext, operation qbtypesv5.FilterOperator, key ruletypes.DSLKey, jsonPath string, allowedValues []string) string {
-	columnExpression := string(v.Formatter.JSONExtractString(ruleDataColumn, jsonPath))
-
-	var values []string
-	switch operation {
-	case qbtypesv5.FilterOperatorEqual, qbtypesv5.FilterOperatorNotEqual:
-		value, ok := v.ExtractSingleStringValue(ctx, string(key))
-		if !ok {
-			return ""
-		}
-		values = []string{value}
-	case qbtypesv5.FilterOperatorIn, qbtypesv5.FilterOperatorNotIn:
-		list, ok := v.ExtractStringValueList(ctx, string(key))
-		if !ok {
-			return ""
-		}
-		values = list
-	default:
-		v.AddError("operator %s on %q is not implemented", sqlcompiler.OperationName(operation), key)
-		return ""
-	}
-
-	for _, value := range values {
-		if !slices.Contains(allowedValues, value) {
-			v.AddError("invalid value %q for %q, expected one of: %s", value, key, strings.Join(allowedValues, ", "))
-			return ""
-		}
-	}
-
-	arguments := make([]any, len(values))
-	for i, s := range values {
-		arguments[i] = s
-	}
-	switch operation {
-	case qbtypesv5.FilterOperatorEqual:
-		return v.Sb.Equal(columnExpression, arguments[0])
-	case qbtypesv5.FilterOperatorNotEqual:
-		return v.Sb.NotEqual(columnExpression, arguments[0])
-	case qbtypesv5.FilterOperatorNotIn:
-		return v.Sb.NotIn(columnExpression, arguments...)
-	default:
-		return v.Sb.In(columnExpression, arguments...)
-	}
-}
-
-// ResolveFreeText searches name, description and the raw labels JSON (which also matches label keys).
-func (ruleFieldResolver) ResolveFreeText(v *sqlcompiler.Visitor, value string) string {
-	nameColumn := string(v.Formatter.JSONExtractString(ruleDataColumn, nameJSONPath))
-	descriptionColumn := string(v.Formatter.JSONExtractString(ruleDataColumn, descriptionPath))
-	labelsColumn := string(v.Formatter.JSONExtractString(ruleDataColumn, labelsJSONPath))
-
-	return v.Sb.Or(
-		v.BuildFreeTextContains(v.Sb, nameColumn, value),
-		v.BuildFreeTextContains(v.Sb, descriptionColumn, value),
-		v.BuildFreeTextContains(v.Sb, labelsColumn, value),
-	)
-}
-
-var alertTypeValues = func() []string {
-	values := make([]string, 0, 4)
-	for _, value := range (ruletypes.AlertType("")).Enum() {
-		values = append(values, string(value.(ruletypes.AlertType)))
-	}
-	return values
-}()
-
-var ruleTypeValues = func() []string {
-	values := make([]string, 0, 3)
-	for _, value := range (ruletypes.RuleType{}).Enum() {
-		values = append(values, value.(ruletypes.RuleType).StringValue())
-	}
-	return values
-}()

pkg/query-service/rules/filterquery_test.go

@@ -1,488 +0,0 @@
-package rules
-
-import (
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/sqlstore/sqlstoretest"
-	"github.com/SigNoz/signoz/pkg/types/ruletypes"
-)
-
-type compileCase struct {
-	subtestName              string
-	dslQueryToCompile        string
-	emptyQueryExpected       bool
-	expectedSQL              string
-	expectedArgs             []any
-	expectedErrShouldContain string
-}
-
-func runCompileCases(t *testing.T, cases []compileCase) {
-	t.Helper()
-	for _, c := range cases {
-		t.Run(c.subtestName, func(t *testing.T) {
-			out, err := CompileListFilter(c.dslQueryToCompile, formatter(t))
-
-			if c.expectedErrShouldContain != "" {
-				require.Error(t, err)
-				assert.Contains(t, strings.ToLower(err.Error()), strings.ToLower(c.expectedErrShouldContain))
-				return
-			}
-
-			require.NoError(t, err)
-			if c.emptyQueryExpected {
-				assert.True(t, out.IsEmpty())
-				return
-			}
-			require.NotNil(t, out)
-
-			if c.expectedSQL != "" {
-				assert.Equal(t, normalizeSQL(c.expectedSQL), normalizeSQL(out.SQL))
-			}
-			if c.expectedArgs != nil {
-				require.Len(t, out.Args, len(c.expectedArgs))
-				for i, want := range c.expectedArgs {
-					// Equal instants can differ in *Location, so compare via .Equal() instead of DeepEqual.
-					if wantT, ok := want.(time.Time); ok {
-						gotT, ok := out.Args[i].(time.Time)
-						require.True(t, ok, "arg[%d]: want time.Time, got %T", i, out.Args[i])
-						assert.True(t, wantT.Equal(gotT), "arg[%d]: want %s, got %s", i, wantT, gotT)
-						continue
-					}
-					assert.Equal(t, want, out.Args[i], "arg[%d]", i)
-				}
-			}
-		})
-	}
-}
-
-func TestCompileEmpty(t *testing.T) {
-	runCompileCases(t, []compileCase{
-		{subtestName: "EmptyQuery_Nil", dslQueryToCompile: "", emptyQueryExpected: true},
-		{subtestName: "WhitespaceQuery_Nil", dslQueryToCompile: "   ", emptyQueryExpected: true},
-	})
-}
-
-func TestCompileName(t *testing.T) {
-	runCompileCases(t, []compileCase{
-		{
-			subtestName:       "NameEquals_MatchesReservedOrLabel",
-			dslQueryToCompile: "name = 'payment latency'",
-			expectedSQL:       `(json_extract("rule"."data", '$.alert') = ? OR COALESCE(json_extract("rule"."data", '$.labels."name"'), '') = ?)`,
-			expectedArgs:      []any{"payment latency", "payment latency"},
-		},
-		{
-			subtestName:       "NameContains_EscapesWildcardsBothSides",
-			dslQueryToCompile: "name CONTAINS '50%'",
-			expectedSQL:       `(json_extract("rule"."data", '$.alert') LIKE ? ESCAPE '\' OR COALESCE(json_extract("rule"."data", '$.labels."name"'), '') LIKE ? ESCAPE '\')`,
-			expectedArgs:      []any{`%50\%%`, `%50\%%`},
-		},
-		{
-			subtestName:       "NameILike",
-			dslQueryToCompile: "name ILIKE 'Prod%'",
-			expectedSQL:       `(lower(json_extract("rule"."data", '$.alert')) LIKE LOWER(?) ESCAPE '\' OR lower(COALESCE(json_extract("rule"."data", '$.labels."name"'), '')) LIKE LOWER(?) ESCAPE '\')`,
-			expectedArgs:      []any{"Prod%", "Prod%"},
-		},
-		{
-			subtestName:       "NameInList",
-			dslQueryToCompile: "name IN ['a', 'b']",
-			expectedSQL:       `(json_extract("rule"."data", '$.alert') IN (?, ?) OR COALESCE(json_extract("rule"."data", '$.labels."name"'), '') IN (?, ?))`,
-			expectedArgs:      []any{"a", "b", "a", "b"},
-		},
-		{
-			subtestName:       "NameNotEquals_ExcludesBoth",
-			dslQueryToCompile: "name != 'x'",
-			expectedSQL:       `(json_extract("rule"."data", '$.alert') <> ? AND COALESCE(json_extract("rule"."data", '$.labels."name"'), '') <> ?)`,
-			expectedArgs:      []any{"x", "x"},
-		},
-		{
-			subtestName:       "NameExists_LabelOnly",
-			dslQueryToCompile: "name EXISTS",
-			expectedSQL:       `json_extract("rule"."data", '$.labels."name"') IS NOT NULL`,
-		},
-		{
-			subtestName:              "RangeOperatorOnName_Rejected",
-			dslQueryToCompile:        "name > 'x'",
-			expectedErrShouldContain: `operator > is not allowed for key "name"`,
-		},
-		{
-			subtestName:              "RegexpOnName_Rejected",
-			dslQueryToCompile:        "name REGEXP 'x.*'",
-			expectedErrShouldContain: `operator REGEXP is not allowed for key "name"`,
-		},
-	})
-}
-
-func TestCompileSeverityAndLabels(t *testing.T) {
-	runCompileCases(t, []compileCase{
-		{
-			subtestName:       "SeverityEquals_TargetsLabelsMap",
-			dslQueryToCompile: "severity = 'critical'",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."severity"'), '') = ?`,
-			expectedArgs:      []any{"critical"},
-		},
-		{
-			subtestName:       "SeverityNotEquals_MissingLabelAsEmptyString",
-			dslQueryToCompile: "severity != 'critical'",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."severity"'), '') <> ?`,
-			expectedArgs:      []any{"critical"},
-		},
-		{
-			subtestName:       "SeverityNotEqualsEmpty_ExcludesRulesWithoutSeverity",
-			dslQueryToCompile: "severity != ''",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."severity"'), '') <> ?`,
-			expectedArgs:      []any{""},
-		},
-		{
-			subtestName:       "SeverityExists_ThroughAlias",
-			dslQueryToCompile: "severity EXISTS",
-			expectedSQL:       `json_extract("rule"."data", '$.labels."severity"') IS NOT NULL`,
-		},
-		{
-			subtestName:       "SeverityNotExists_ThroughAlias",
-			dslQueryToCompile: "severity NOT EXISTS",
-			expectedSQL:       `json_extract("rule"."data", '$.labels."severity"') IS NULL`,
-		},
-		{
-			subtestName:       "LabelEquals",
-			dslQueryToCompile: "labels.team = 'infra'",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."team"'), '') = ?`,
-			expectedArgs:      []any{"infra"},
-		},
-		{
-			subtestName:       "DottedLabelKey_OneMapEntry",
-			dslQueryToCompile: "labels.k8s.cluster = 'prod-1'",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."k8s.cluster"'), '') = ?`,
-			expectedArgs:      []any{"prod-1"},
-		},
-		{
-			subtestName:       "LabelKey_CaseSensitive",
-			dslQueryToCompile: "labels.Team = 'infra'",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."Team"'), '') = ?`,
-			expectedArgs:      []any{"infra"},
-		},
-		{
-			subtestName:       "LabelExists",
-			dslQueryToCompile: "labels.team EXISTS",
-			expectedSQL:       `json_extract("rule"."data", '$.labels."team"') IS NOT NULL`,
-		},
-		{
-			subtestName:       "LabelNotExists",
-			dslQueryToCompile: "labels.team NOT EXISTS",
-			expectedSQL:       `json_extract("rule"."data", '$.labels."team"') IS NULL`,
-		},
-		{
-			subtestName:       "LabelNotContains_IncludesLabelLessRules",
-			dslQueryToCompile: "labels.team NOT CONTAINS 'infra'",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."team"'), '') NOT LIKE ? ESCAPE '\'`,
-			expectedArgs:      []any{"%infra%"},
-		},
-		{
-			subtestName:       "LabelNotIn_IncludesLabelLessRules",
-			dslQueryToCompile: "labels.team NOT IN ['a', 'b']",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."team"'), '') NOT IN (?, ?)`,
-			expectedArgs:      []any{"a", "b"},
-		},
-	})
-}
-
-func TestCompileEnums(t *testing.T) {
-	runCompileCases(t, []compileCase{
-		{
-			subtestName:       "AlertTypeEquals_MatchesEnumOrLabel",
-			dslQueryToCompile: "alert_type = 'LOGS_BASED_ALERT'",
-			expectedSQL:       `(json_extract("rule"."data", '$.alertType') = ? OR COALESCE(json_extract("rule"."data", '$.labels."alert_type"'), '') = ?)`,
-			expectedArgs:      []any{"LOGS_BASED_ALERT", "LOGS_BASED_ALERT"},
-		},
-		{
-			subtestName:       "RuleTypeInList",
-			dslQueryToCompile: "rule_type IN ['threshold_rule', 'promql_rule']",
-			expectedSQL:       `(json_extract("rule"."data", '$.ruleType') IN (?, ?) OR COALESCE(json_extract("rule"."data", '$.labels."rule_type"'), '') IN (?, ?))`,
-			expectedArgs:      []any{"threshold_rule", "promql_rule", "threshold_rule", "promql_rule"},
-		},
-		{
-			subtestName:              "InvalidAlertTypeValue_Rejected",
-			dslQueryToCompile:        "alert_type = 'bogus'",
-			expectedErrShouldContain: `invalid value "bogus" for "alert_type"`,
-		},
-		{
-			subtestName:       "ContainsOnRuleType_LabelOnly",
-			dslQueryToCompile: "rule_type CONTAINS 'thresh'",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."rule_type"'), '') LIKE ? ESCAPE '\'`,
-			expectedArgs:      []any{"%thresh%"},
-		},
-	})
-}
-
-func TestCompileAuditColumns(t *testing.T) {
-	createdAt, err := time.Parse(time.RFC3339, "2026-01-02T15:04:05Z")
-	require.NoError(t, err)
-	updatedFrom, err := time.Parse(time.RFC3339, "2026-02-01T00:00:00Z")
-	require.NoError(t, err)
-	updatedTo, err := time.Parse(time.RFC3339, "2026-03-01T00:00:00Z")
-	require.NoError(t, err)
-
-	runCompileCases(t, []compileCase{
-		{
-			subtestName:       "CreatedByEquals_MatchesColumnOrLabel",
-			dslQueryToCompile: "created_by = 'nikhil@signoz.io'",
-			expectedSQL:       `(rule.created_by = ? OR COALESCE(json_extract("rule"."data", '$.labels."created_by"'), '') = ?)`,
-			expectedArgs:      []any{"nikhil@signoz.io", "nikhil@signoz.io"},
-		},
-		{
-			subtestName:       "CreatedAtRange",
-			dslQueryToCompile: "created_at >= '2026-01-02T15:04:05Z'",
-			expectedSQL:       `rule.created_at >= ?`,
-			expectedArgs:      []any{createdAt},
-		},
-		{
-			subtestName:       "UpdatedAtBetween",
-			dslQueryToCompile: "updated_at BETWEEN '2026-02-01T00:00:00Z' AND '2026-03-01T00:00:00Z'",
-			expectedSQL:       `rule.updated_at BETWEEN ? AND ?`,
-			expectedArgs:      []any{updatedFrom, updatedTo},
-		},
-		{
-			subtestName:              "NonTimestampOnCreatedAt_Rejected",
-			dslQueryToCompile:        "created_at >= 'yesterday'",
-			expectedErrShouldContain: "invalid RFC3339 timestamp",
-		},
-	})
-}
-
-func TestCompileFreeText(t *testing.T) {
-	runCompileCases(t, []compileCase{
-		{
-			subtestName:       "BareWord_SearchesNameDescriptionLabels",
-			dslQueryToCompile: "payment",
-			expectedSQL: `(lower(COALESCE(json_extract("rule"."data", '$.alert'), '')) LIKE LOWER(?) ESCAPE '\' ` +
-				`OR lower(COALESCE(json_extract("rule"."data", '$.description'), '')) LIKE LOWER(?) ESCAPE '\' ` +
-				`OR lower(COALESCE(json_extract("rule"."data", '$.labels'), '')) LIKE LOWER(?) ESCAPE '\')`,
-			expectedArgs: []any{"%payment%", "%payment%", "%payment%"},
-		},
-	})
-}
-
-func TestCompileComposition(t *testing.T) {
-	runCompileCases(t, []compileCase{
-		{
-			subtestName:       "AndOfLabelAndColumn",
-			dslQueryToCompile: "labels.team = 'infra' AND created_by = 'x'",
-			expectedSQL: `(COALESCE(json_extract("rule"."data", '$.labels."team"'), '') = ? ` +
-				`AND (rule.created_by = ? OR COALESCE(json_extract("rule"."data", '$.labels."created_by"'), '') = ?))`,
-			expectedArgs: []any{"infra", "x", "x"},
-		},
-		{
-			subtestName:       "Not_WrapsInnerPredicate",
-			dslQueryToCompile: "NOT (name = 'x')",
-			expectedSQL:       `NOT ((json_extract("rule"."data", '$.alert') = ? OR COALESCE(json_extract("rule"."data", '$.labels."name"'), '') = ?))`,
-			expectedArgs:      []any{"x", "x"},
-		},
-		{
-			subtestName:       "OrOfNameAndSeverity",
-			dslQueryToCompile: "name CONTAINS 'pay' OR severity = 'critical'",
-			expectedSQL: `((json_extract("rule"."data", '$.alert') LIKE ? ESCAPE '\' OR COALESCE(json_extract("rule"."data", '$.labels."name"'), '') LIKE ? ESCAPE '\') ` +
-				`OR COALESCE(json_extract("rule"."data", '$.labels."severity"'), '') = ?)`,
-			expectedArgs: []any{"%pay%", "%pay%", "critical"},
-		},
-	})
-}
-
-func TestCompileComplexExamples(t *testing.T) {
-	runCompileCases(t, []compileCase{
-		{
-			subtestName: "NameContains_LabelEquals_SeverityIn_CreatedByNotEquals",
-			dslQueryToCompile: `name CONTAINS 'latency' AND labels.team = 'payments' ` +
-				`AND severity IN ['critical', 'error'] AND created_by != 'ops@signoz.io'`,
-			expectedSQL: `((json_extract("rule"."data", '$.alert') LIKE ? ESCAPE '\' OR COALESCE(json_extract("rule"."data", '$.labels."name"'), '') LIKE ? ESCAPE '\') ` +
-				`AND COALESCE(json_extract("rule"."data", '$.labels."team"'), '') = ? ` +
-				`AND COALESCE(json_extract("rule"."data", '$.labels."severity"'), '') IN (?, ?) ` +
-				`AND (rule.created_by <> ? AND COALESCE(json_extract("rule"."data", '$.labels."created_by"'), '') <> ?))`,
-			expectedArgs: []any{"%latency%", "%latency%", "payments", "critical", "error", "ops@signoz.io", "ops@signoz.io"},
-		},
-		{
-			subtestName: "NestedOrAnd_WithParens",
-			dslQueryToCompile: `(labels.env IN ['prod', 'staging'] OR name LIKE '%prod%') ` +
-				`AND (severity = 'critical' OR labels.team EXISTS)`,
-			expectedSQL: `((COALESCE(json_extract("rule"."data", '$.labels."env"'), '') IN (?, ?) ` +
-				`OR (json_extract("rule"."data", '$.alert') LIKE ? ESCAPE '\' OR COALESCE(json_extract("rule"."data", '$.labels."name"'), '') LIKE ? ESCAPE '\')) ` +
-				`AND (COALESCE(json_extract("rule"."data", '$.labels."severity"'), '') = ? ` +
-				`OR json_extract("rule"."data", '$.labels."team"') IS NOT NULL))`,
-			expectedArgs: []any{"prod", "staging", "%prod%", "%prod%", "critical"},
-		},
-		{
-			subtestName:       "NotOverGroup_AndedWithEnum",
-			dslQueryToCompile: `NOT (labels.team = 'infra' OR name CONTAINS 'cpu') AND alert_type = 'METRIC_BASED_ALERT'`,
-			expectedSQL: `(NOT ((COALESCE(json_extract("rule"."data", '$.labels."team"'), '') = ? ` +
-				`OR (json_extract("rule"."data", '$.alert') LIKE ? ESCAPE '\' OR COALESCE(json_extract("rule"."data", '$.labels."name"'), '') LIKE ? ESCAPE '\'))) ` +
-				`AND (json_extract("rule"."data", '$.alertType') = ? OR COALESCE(json_extract("rule"."data", '$.labels."alert_type"'), '') = ?))`,
-			expectedArgs: []any{"infra", "%cpu%", "%cpu%", "METRIC_BASED_ALERT", "METRIC_BASED_ALERT"},
-		},
-		{
-			subtestName: "FreeText_ThreeLevelNesting_Timestamp",
-			dslQueryToCompile: `prod AND (name ILIKE '%pay%' ` +
-				`OR (labels.team != 'infra' AND updated_at > '2026-01-02T15:04:05Z'))`,
-			expectedSQL: `((lower(COALESCE(json_extract("rule"."data", '$.alert'), '')) LIKE LOWER(?) ESCAPE '\' ` +
-				`OR lower(COALESCE(json_extract("rule"."data", '$.description'), '')) LIKE LOWER(?) ESCAPE '\' ` +
-				`OR lower(COALESCE(json_extract("rule"."data", '$.labels'), '')) LIKE LOWER(?) ESCAPE '\') ` +
-				`AND ((lower(json_extract("rule"."data", '$.alert')) LIKE LOWER(?) ESCAPE '\' ` +
-				`OR lower(COALESCE(json_extract("rule"."data", '$.labels."name"'), '')) LIKE LOWER(?) ESCAPE '\') ` +
-				`OR (COALESCE(json_extract("rule"."data", '$.labels."team"'), '') <> ? AND rule.updated_at > ?)))`,
-			expectedArgs: []any{"%prod%", "%prod%", "%prod%", "%pay%", "%pay%", "infra",
-				time.Date(2026, 1, 2, 15, 4, 5, 0, time.UTC)},
-		},
-	})
-}
-
-func TestCompileBareLabelKeys(t *testing.T) {
-	runCompileCases(t, []compileCase{
-		{
-			subtestName:       "BareKey_LabelMatch",
-			dslQueryToCompile: "team = 'infra'",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."team"'), '') = ?`,
-			expectedArgs:      []any{"infra"},
-		},
-		{
-			subtestName:       "BareKey_CaseSensitive",
-			dslQueryToCompile: "Team CONTAINS 'inf'",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."Team"'), '') LIKE ? ESCAPE '\'`,
-			expectedArgs:      []any{"%inf%"},
-		},
-		{
-			subtestName:       "BareKeyExists",
-			dslQueryToCompile: "env EXISTS",
-			expectedSQL:       `json_extract("rule"."data", '$.labels."env"') IS NOT NULL`,
-		},
-		{
-			subtestName:       "State_LabelLookupNotRuleState",
-			dslQueryToCompile: "state = 'firing'",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."state"'), '') = ?`,
-			expectedArgs:      []any{"firing"},
-		},
-	})
-}
-
-func TestCompileReservedLabelCollisions(t *testing.T) {
-	runCompileCases(t, []compileCase{
-		{
-			subtestName:       "UppercaseReservedKey_MatchesReservedOrExactCaseLabel",
-			dslQueryToCompile: "NAME = 'x'",
-			expectedSQL:       `(json_extract("rule"."data", '$.alert') = ? OR COALESCE(json_extract("rule"."data", '$.labels."NAME"'), '') = ?)`,
-			expectedArgs:      []any{"x", "x"},
-		},
-		{
-			subtestName:       "SeverityExactSpelling_SinglePredicate",
-			dslQueryToCompile: "severity = 'critical'",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."severity"'), '') = ?`,
-			expectedArgs:      []any{"critical"},
-		},
-		{
-			subtestName:       "SeverityDifferentCase_MatchesBothLabelSpellings",
-			dslQueryToCompile: "Severity = 'critical'",
-			expectedSQL: `(COALESCE(json_extract("rule"."data", '$.labels."severity"'), '') = ? ` +
-				`OR COALESCE(json_extract("rule"."data", '$.labels."Severity"'), '') = ?)`,
-			expectedArgs: []any{"critical", "critical"},
-		},
-		{
-			subtestName:       "RangeOperator_ReservedOnly",
-			dslQueryToCompile: "created_at >= '2026-01-02T15:04:05Z'",
-			expectedSQL:       `rule.created_at >= ?`,
-			expectedArgs:      []any{time.Date(2026, 1, 2, 15, 4, 5, 0, time.UTC)},
-		},
-		{
-			subtestName:       "LabelsPrefix_LabelOnlyOnCollision",
-			dslQueryToCompile: "labels.name = 'x'",
-			expectedSQL:       `COALESCE(json_extract("rule"."data", '$.labels."name"'), '') = ?`,
-			expectedArgs:      []any{"x"},
-		},
-		{
-			subtestName:       "NotIn_ExcludesBoth",
-			dslQueryToCompile: "created_by NOT IN ['a', 'b']",
-			expectedSQL: `(rule.created_by NOT IN (?, ?) ` +
-				`AND COALESCE(json_extract("rule"."data", '$.labels."created_by"'), '') NOT IN (?, ?))`,
-			expectedArgs: []any{"a", "b", "a", "b"},
-		},
-	})
-}
-
-func TestCompileErrors(t *testing.T) {
-	runCompileCases(t, []compileCase{
-		{
-			subtestName:              "RangeOperatorOnBareLabelKey_Rejected",
-			dslQueryToCompile:        "team > 'infra'",
-			expectedErrShouldContain: `operator > is not allowed on the label filter "team"`,
-		},
-		{
-			subtestName:              "SyntaxError_SurfacesPosition",
-			dslQueryToCompile:        "created_by ==== (((",
-			expectedErrShouldContain: "syntax error",
-		},
-		{
-			subtestName:              "LikeDanglingEscape_Rejected",
-			dslQueryToCompile:        `name LIKE 'prod\\'`,
-			expectedErrShouldContain: "must not end with an unescaped backslash",
-		},
-		{
-			subtestName:              "ILikeDanglingEscape_Rejected",
-			dslQueryToCompile:        `name ILIKE '%\\'`,
-			expectedErrShouldContain: "must not end with an unescaped backslash",
-		},
-		{
-			subtestName:              "LabelLikeDanglingEscape_Rejected",
-			dslQueryToCompile:        `labels.team NOT LIKE 'infra\\'`,
-			expectedErrShouldContain: "must not end with an unescaped backslash",
-		},
-	})
-}
-
-func TestCompileTrailingLiteralBackslash(t *testing.T) {
-	runCompileCases(t, []compileCase{
-		{
-			subtestName:       "EscapedTrailingBackslash_Compiles",
-			dslQueryToCompile: `name LIKE '%\\\\'`,
-			expectedSQL:       `(json_extract("rule"."data", '$.alert') LIKE ? ESCAPE '\' OR COALESCE(json_extract("rule"."data", '$.labels."name"'), '') LIKE ? ESCAPE '\')`,
-			expectedArgs:      []any{`%\\`, `%\\`},
-		},
-	})
-}
-
-// Guards that every ruletypes.ReservedOps key has a case in resolveReservedKey.
-func TestCompileReservedKeysAllHandled(t *testing.T) {
-	sampleQueries := map[ruletypes.DSLKey]string{
-		ruletypes.DSLKeyName:      "name = 'x'",
-		ruletypes.DSLKeySeverity:  "severity = 'critical'",
-		ruletypes.DSLKeyCreatedBy: "created_by = 'x'",
-		ruletypes.DSLKeyUpdatedBy: "updated_by = 'x'",
-		ruletypes.DSLKeyCreatedAt: "created_at >= '2026-01-02T15:04:05Z'",
-		ruletypes.DSLKeyUpdatedAt: "updated_at >= '2026-01-02T15:04:05Z'",
-		ruletypes.DSLKeyAlertType: "alert_type = 'METRIC_BASED_ALERT'",
-		ruletypes.DSLKeyRuleType:  "rule_type = 'threshold_rule'",
-	}
-
-	for key := range ruletypes.ReservedOps {
-		query, ok := sampleQueries[key]
-		require.True(t, ok, "no sample query for reserved key %q, add one", key)
-
-		out, err := CompileListFilter(query, formatter(t))
-		require.NoError(t, err, "reserved key %q failed to compile", key)
-		assert.False(t, out.IsEmpty(), "reserved key %q compiled to empty SQL", key)
-	}
-}
-
-func formatter(t *testing.T) sqlstore.SQLFormatter {
-	t.Helper()
-	p := sqlstoretest.New(sqlstore.Config{Provider: "sqlite"}, sqlmock.QueryMatcherEqual)
-	return p.Formatter()
-}
-
-func normalizeSQL(s string) string {
-	s = strings.Join(strings.Fields(s), " ")
-	s = strings.ReplaceAll(s, "( ", "(")
-	s = strings.ReplaceAll(s, " )", ")")
-	return s
-}

pkg/query-service/rules/manager.go

@@ -851,8 +851,6 @@ func (m *Manager) ListRuleStates(ctx context.Context) (*ruletypes.GettableRules,
 	// initiate response object
 	resp := make([]*ruletypes.GettableRule, 0)
 
-	stateByRuleID := m.snapshotRuleStates()
-
 	for _, s := range storedRules {
 
 		ruleResponse := ruletypes.GettableRule{}
@@ -865,11 +863,11 @@ func (m *Manager) ListRuleStates(ctx context.Context) (*ruletypes.GettableRules,
 		ruleResponse.Id = s.ID.StringValue()
 
 		// fetch state of rule from memory
-		if state, ok := stateByRuleID[ruleResponse.Id]; !ok {
+		if rm, ok := m.rules[ruleResponse.Id]; !ok {
 			ruleResponse.State = ruletypes.StateDisabled
 			ruleResponse.Disabled = true
 		} else {
-			ruleResponse.State = state
+			ruleResponse.State = rm.State()
 		}
 		ruleResponse.CreatedAt = s.CreatedAt
 		ruleResponse.CreatedBy = &s.CreatedBy
@@ -881,71 +879,6 @@ func (m *Manager) ListRuleStates(ctx context.Context) (*ruletypes.GettableRules,
 	return &ruletypes.GettableRules{Rules: resp}, nil
 }
 
-// ListRules' total counts what is pageable after corrupt-row drops and the states filter.
-func (m *Manager) ListRules(ctx context.Context, params *ruletypes.ListRulesParams) (*ruletypes.ListableRules, error) {
-	// validated here too, not just in the handler: non-API callers reach the manager directly
-	if err := params.Validate(); err != nil {
-		return nil, err
-	}
-
-	claims, err := authtypes.ClaimsFromContext(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	states, err := params.GetAlertStates()
-	if err != nil {
-		return nil, err
-	}
-	stateFilter := make(map[ruletypes.AlertState]struct{}, len(states))
-	for _, state := range states {
-		stateFilter[state] = struct{}{}
-	}
-
-	compiled, err := CompileListFilter(params.Query, m.sqlstore.Formatter())
-	if err != nil {
-		return nil, err
-	}
-
-	storedRules, err := m.ruleStore.GetStoredRulesMatching(ctx, claims.OrgID, compiled.SQL, compiled.Args)
-	if err != nil {
-		return nil, err
-	}
-
-	stateByRuleID := m.snapshotRuleStates()
-
-	listableRules, errByRuleID := ruletypes.NewListableRulesFromStorableRules(storedRules, stateByRuleID, stateFilter)
-	for ruleID, err := range errByRuleID {
-		m.logger.ErrorContext(ctx, "failed to unmarshal rule from db", slog.String("rule.id", ruleID), errors.Attr(err))
-	}
-
-	total := int64(len(listableRules))
-	ruletypes.SortListableRules(listableRules, params.Sort, params.Order)
-
-	start := min(params.Offset, len(listableRules))
-	end := min(start+params.Limit, len(listableRules))
-	currentPageRules := listableRules[start:end]
-
-	rawLabels, err := m.ruleStore.GetStoredRuleLabels(ctx, claims.OrgID)
-	if err != nil {
-		return nil, err
-	}
-	labelPairs := ruletypes.NewLabelPairsFromRawJSON(rawLabels, ruletypes.MaxListLabelPairs)
-
-	return ruletypes.NewListableRules(currentPageRules, total, labelPairs), nil
-}
-
-func (m *Manager) snapshotRuleStates() map[string]ruletypes.AlertState {
-	m.mtx.RLock()
-	defer m.mtx.RUnlock()
-
-	states := make(map[string]ruletypes.AlertState, len(m.rules))
-	for id, rule := range m.rules {
-		states[id] = rule.State()
-	}
-	return states
-}
-
 func (m *Manager) GetRule(ctx context.Context, id valuer.UUID) (*ruletypes.GettableRule, error) {
 	claims, err := authtypes.ClaimsFromContext(ctx)
 	if err != nil {

pkg/query-service/rules/manager_test.go

@@ -20,7 +20,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/telemetrystore/telemetrystoretest"
 	"github.com/SigNoz/signoz/pkg/types/alertmanagertypes"
 	"github.com/SigNoz/signoz/pkg/types/metrictypes"
-	"github.com/SigNoz/signoz/pkg/types/ruletypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -29,17 +28,6 @@ import (
 	cmock "github.com/SigNoz/clickhouse-go-mock"
 )
 
-func TestManager_ListRules_ValidatesParams(t *testing.T) {
-	m, err := NewManager(&ManagerOptions{})
-	require.NoError(t, err)
-
-	_, err = m.ListRules(context.Background(), &ruletypes.ListRulesParams{Limit: -1})
-	require.ErrorContains(t, err, "invalid limit")
-
-	_, err = m.ListRules(context.Background(), &ruletypes.ListRulesParams{States: []string{"bogus"}})
-	require.ErrorContains(t, err, `invalid state "bogus"`)
-}
-
 func TestManager_TestNotification_SendUnmatched_ThresholdRule(t *testing.T) {
 	target := 10.0
 	recovery := 5.0

pkg/querybuilder/exists_expr.go

@@ -94,10 +94,10 @@ func ExistsExpression(columns []*schema.Column, key *telemetrytypes.TelemetryFie
 
 		switch valueType := column.Type.(schema.MapColumnType).ValueType; valueType.GetType() {
 		case schema.ColumnTypeEnumString, schema.ColumnTypeEnumBool, schema.ColumnTypeEnumFloat64:
-			if key.Materialized {
-				return telemetrytypes.FieldKeyToMaterializedExistsCondition(key, exists), nil
-			}
 			leftOperand := fmt.Sprintf("mapContains(%s, %s)", column.Name, clickhousesql.StringLiteral(key.Name))
+			if key.Materialized {
+				leftOperand = telemetrytypes.FieldKeyToMaterializedColumnNameForExists(key)
+			}
 			if exists {
 				return leftOperand, nil
 			}

pkg/ruler/handler.go

@@ -4,7 +4,6 @@ import "net/http"
 
 type Handler interface {
 	ListRules(http.ResponseWriter, *http.Request)
-	ListRulesV3(http.ResponseWriter, *http.Request)
 	GetRuleByID(http.ResponseWriter, *http.Request)
 	CreateRule(http.ResponseWriter, *http.Request)
 	UpdateRuleByID(http.ResponseWriter, *http.Request)

pkg/ruler/ruler.go

@@ -17,9 +17,6 @@ type Ruler interface {
 	// ListRuleStates returns all rules with their current evaluation state.
 	ListRuleStates(ctx context.Context) (*ruletypes.GettableRules, error)
 
-	// ListRules returns a filtered, sorted page of rules with state, plus label pairs and reserved filter keys.
-	ListRules(ctx context.Context, params *ruletypes.ListRulesParams) (*ruletypes.ListableRules, error)
-
 	// GetRule returns a single rule by ID.
 	GetRule(ctx context.Context, id valuer.UUID) (*ruletypes.GettableRule, error)
 

pkg/ruler/rulestore/rulestoretest/rule.go

@@ -64,16 +64,6 @@ func (m *MockSQLRuleStore) GetStoredRules(ctx context.Context, orgID string) ([]
 	return m.ruleStore.GetStoredRules(ctx, orgID)
 }
 
-// GetStoredRulesMatching implements ruletypes.RuleStore - delegates to underlying ruleStore to trigger SQL.
-func (m *MockSQLRuleStore) GetStoredRulesMatching(ctx context.Context, orgID string, filterSQL string, filterArgs []any) ([]*ruletypes.StorableRule, error) {
-	return m.ruleStore.GetStoredRulesMatching(ctx, orgID, filterSQL, filterArgs)
-}
-
-// GetStoredRuleLabels implements ruletypes.RuleStore - delegates to underlying ruleStore to trigger SQL.
-func (m *MockSQLRuleStore) GetStoredRuleLabels(ctx context.Context, orgID string) ([]string, error) {
-	return m.ruleStore.GetStoredRuleLabels(ctx, orgID)
-}
-
 // GetStoredRulesByMetricName implements ruletypes.RuleStore - delegates to underlying ruleStore.
 func (m *MockSQLRuleStore) GetStoredRulesByMetricName(ctx context.Context, orgID string, metricName string) ([]ruletypes.RuleAlert, error) {
 	return m.ruleStore.GetStoredRulesByMetricName(ctx, orgID, metricName)

pkg/ruler/rulestore/sqlrulestore/rule.go

@@ -3,7 +3,6 @@ package sqlrulestore
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"log/slog"
 	"slices"
 
@@ -90,41 +89,6 @@ func (r *rule) DeleteRule(ctx context.Context, orgID valuer.UUID, id valuer.UUID
 	return nil
 }
 
-func (r *rule) GetStoredRulesMatching(ctx context.Context, orgID string, filterSQL string, filterArgs []any) ([]*ruletypes.StorableRule, error) {
-	rules := make([]*ruletypes.StorableRule, 0)
-	q := r.sqlstore.
-		BunDB().
-		NewSelect().
-		Model(&rules).
-		Where("org_id = ?", orgID)
-	if filterSQL != "" {
-		q = q.Where(filterSQL, filterArgs...)
-	}
-	if err := q.Scan(ctx); err != nil {
-		return nil, err
-	}
-
-	return rules, nil
-}
-
-func (r *rule) GetStoredRuleLabels(ctx context.Context, orgID string) ([]string, error) {
-	labelsExpression := string(r.sqlstore.Formatter().JSONExtractString("rule.data", "$.labels"))
-
-	labels := make([]string, 0)
-	err := r.sqlstore.
-		BunDB().
-		NewSelect().
-		Model((*ruletypes.StorableRule)(nil)).
-		ColumnExpr(fmt.Sprintf("COALESCE(%s, '')", labelsExpression)).
-		Where("org_id = ?", orgID).
-		Scan(ctx, &labels)
-	if err != nil {
-		return nil, err
-	}
-
-	return labels, nil
-}
-
 func (r *rule) GetStoredRules(ctx context.Context, orgID string) ([]*ruletypes.StorableRule, error) {
 	rules := make([]*ruletypes.StorableRule, 0)
 	err := r.sqlstore.

pkg/ruler/signozruler/handler.go

@@ -43,29 +43,6 @@ func (handler *handler) ListRules(rw http.ResponseWriter, req *http.Request) {
 	render.Success(rw, http.StatusOK, view)
 }
 
-func (handler *handler) ListRulesV3(rw http.ResponseWriter, req *http.Request) {
-	ctx, cancel := context.WithTimeout(req.Context(), 30*time.Second)
-	defer cancel()
-
-	params := new(ruletypes.ListRulesParams)
-	if err := binding.Query.BindQuery(req.URL.Query(), params); err != nil {
-		render.Error(rw, err)
-		return
-	}
-	if err := params.Validate(); err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	listableRules, err := handler.ruler.ListRules(ctx, params)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	render.Success(rw, http.StatusOK, listableRules)
-}
-
 func (handler *handler) GetRuleByID(rw http.ResponseWriter, req *http.Request) {
 	ctx, cancel := context.WithTimeout(req.Context(), 30*time.Second)
 	defer cancel()

pkg/ruler/signozruler/provider.go

@@ -116,10 +116,6 @@ func (provider *provider) ListRuleStates(ctx context.Context) (*ruletypes.Gettab
 	return provider.manager.ListRuleStates(ctx)
 }
 
-func (provider *provider) ListRules(ctx context.Context, params *ruletypes.ListRulesParams) (*ruletypes.ListableRules, error) {
-	return provider.manager.ListRules(ctx, params)
-}
-
 func (provider *provider) GetRule(ctx context.Context, id valuer.UUID) (*ruletypes.GettableRule, error) {
 	return provider.manager.GetRule(ctx, id)
 }

pkg/signoz/openapi.go

@@ -174,7 +174,6 @@ func (openapi *OpenAPI) CreateAndWrite(path string) error {
 	}
 
 	attachDiscriminators(openapi.reflector.Spec)
-	openapi.collector.AttachStabilities(openapi.reflector.Spec)
 
 	// The library's MarshalYAML does a JSON round-trip that converts all numbers
 	// to float64, causing large integers (e.g. epoch millisecond timestamps) to

pkg/sqlstore/sqlitesqlstore/formatter.go

@@ -1,7 +1,6 @@
 package sqlitesqlstore
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/SigNoz/signoz/pkg/sqlstore"
@@ -26,12 +25,6 @@ func (f *formatter) JSONExtractString(column, path string) []byte {
 	return sql
 }
 
-func (f *formatter) JSONExtractMapValue(column, mapField, key string) []byte {
-	// Quote the key as one path segment; a double quote in it is inexpressible in sqlite JSON paths.
-	escapedKey := strings.NewReplacer(`\`, `\\`).Replace(key)
-	return f.JSONExtractString(column, fmt.Sprintf(`$.%s."%s"`, mapField, escapedKey))
-}
-
 func (f *formatter) JSONType(column, path string) []byte {
 	var sql []byte
 	sql = append(sql, "json_type("...)

pkg/sqlstore/sqlitesqlstore/formatter_test.go

@@ -55,60 +55,6 @@ func TestJSONExtractString(t *testing.T) {
 	}
 }
 
-func TestJSONExtractMapValue(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		mapField string
-		key      string
-		expected string
-	}{
-		{
-			name:     "PlainKey",
-			column:   "data",
-			mapField: "labels",
-			key:      "team",
-			expected: `json_extract("data", '$.labels."team"')`,
-		},
-		{
-			name:     "DottedKey_OneMapEntry",
-			column:   "data",
-			mapField: "labels",
-			key:      "k8s.cluster",
-			expected: `json_extract("data", '$.labels."k8s.cluster"')`,
-		},
-		{
-			name:     "BackslashInKey_Escaped",
-			column:   "data",
-			mapField: "labels",
-			key:      `a\b`,
-			expected: `json_extract("data", '$.labels."a\\b"')`,
-		},
-		{
-			name:     "SingleQuoteInKey_Doubled",
-			column:   "data",
-			mapField: "labels",
-			key:      "o'brien",
-			expected: `json_extract("data", '$.labels."o''brien"')`,
-		},
-		{
-			name:     "QualifiedColumn",
-			column:   "rule.data",
-			mapField: "labels",
-			key:      "severity",
-			expected: `json_extract("rule"."data", '$.labels."severity"')`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(sqlitedialect.New())
-			got := string(f.JSONExtractMapValue(tt.column, tt.mapField, tt.key))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
 func TestJSONType(t *testing.T) {
 	tests := []struct {
 		name     string

pkg/sqlstore/sqlstore.go

@@ -114,9 +114,6 @@ type SQLFormatter interface {
 	// JSONKeys return extracted key from json as well as alias to be used for select and where clause
 	JSONKeys(column, path, alias string) ([]byte, []byte)
 
-	// JSONExtractMapValue extracts one key's value from a JSON object field; dots in the key are not path nesting.
-	JSONExtractMapValue(column, mapField, key string) []byte
-
 	// TextToJsonColumn converts a text column to JSON type
 	TextToJsonColumn(column string) []byte
 

pkg/sqlstore/sqlstoretest/formatter.go

@@ -1,7 +1,6 @@
 package sqlstoretest
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/SigNoz/signoz/pkg/sqlstore"
@@ -26,11 +25,6 @@ func (f *formatter) JSONExtractString(column, path string) []byte {
 	return sql
 }
 
-func (f *formatter) JSONExtractMapValue(column, mapField, key string) []byte {
-	escapedKey := strings.NewReplacer(`\`, `\\`).Replace(key)
-	return f.JSONExtractString(column, fmt.Sprintf(`$.%s."%s"`, mapField, escapedKey))
-}
-
 func (f *formatter) JSONType(column, path string) []byte {
 	var sql []byte
 	sql = append(sql, "json_type("...)

pkg/sqlstore/sqlstoretest/formatter_test.go

@@ -1,62 +0,0 @@
-package sqlstoretest
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/uptrace/bun/dialect/sqlitedialect"
-)
-
-func TestJSONExtractMapValue(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		mapField string
-		key      string
-		expected string
-	}{
-		{
-			name:     "PlainKey",
-			column:   "data",
-			mapField: "labels",
-			key:      "team",
-			expected: `json_extract("data", '$.labels."team"')`,
-		},
-		{
-			name:     "DottedKey_OneMapEntry",
-			column:   "data",
-			mapField: "labels",
-			key:      "k8s.cluster",
-			expected: `json_extract("data", '$.labels."k8s.cluster"')`,
-		},
-		{
-			name:     "BackslashInKey_Escaped",
-			column:   "data",
-			mapField: "labels",
-			key:      `a\b`,
-			expected: `json_extract("data", '$.labels."a\\b"')`,
-		},
-		{
-			name:     "SingleQuoteInKey_Doubled",
-			column:   "data",
-			mapField: "labels",
-			key:      "o'brien",
-			expected: `json_extract("data", '$.labels."o''brien"')`,
-		},
-		{
-			name:     "QualifiedColumn",
-			column:   "rule.data",
-			mapField: "labels",
-			key:      "severity",
-			expected: `json_extract("rule"."data", '$.labels."severity"')`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(sqlitedialect.New())
-			got := string(f.JSONExtractMapValue(tt.column, tt.mapField, tt.key))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}

pkg/statementbuilder/aistatementbuilder/statement_builder_test.go

@@ -237,13 +237,13 @@ func TestBuild_FullSQL_TraceList_MaterializedColumns(t *testing.T) {
 	assertSQLEqual(t, `
 WITH matched AS (
     SELECT trace_id,
-        maxIf(timestamp, (attribute_string_gen_ai$$request$$model_exists = true OR mapContains(attributes_string, 'gen_ai.tool.name') OR mapContains(attributes_string, 'gen_ai.agent.name'))) AS last_activity_time
+        maxIf(timestamp, (attribute_string_gen_ai$$request$$model_exists OR mapContains(attributes_string, 'gen_ai.tool.name') OR mapContains(attributes_string, 'gen_ai.agent.name'))) AS last_activity_time
     FROM signoz_traces.distributed_signoz_index_v3
     WHERE timestamp >= '1747947419000000000'
       AND timestamp < '1747983448000000000'
       AND ts_bucket_start >= 1747945619
       AND ts_bucket_start <= 1747983448
-      AND ((attribute_string_gen_ai$$request$$model_exists = true OR mapContains(attributes_string, 'gen_ai.tool.name') OR mapContains(attributes_string, 'gen_ai.agent.name')))
+      AND ((attribute_string_gen_ai$$request$$model_exists OR mapContains(attributes_string, 'gen_ai.tool.name') OR mapContains(attributes_string, 'gen_ai.agent.name')))
     GROUP BY trace_id
     ORDER BY last_activity_time DESC, trace_id DESC
     LIMIT 20
@@ -268,16 +268,16 @@ SELECT trace_id,
     count() AS span_count,
     anyIf(name, parent_span_id = '') AS root_span_name,
     any(multiIf(resource.service.name IS NOT NULL, resource.service.name::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS service.name,
-    countIf(attribute_string_gen_ai$$request$$model_exists = true) AS llm_call_count,
+    countIf(attribute_string_gen_ai$$request$$model_exists) AS llm_call_count,
     countIf(mapContains(attributes_string, 'gen_ai.tool.name')) AS tool_call_count,
     uniqIf(multiIf(mapContains(attributes_string, 'gen_ai.tool.name'), attributes_string['gen_ai.tool.name'], NULL), mapContains(attributes_string, 'gen_ai.tool.name')) AS distinct_tool_count,
-    sum(multiIf(attribute_number_gen_ai$$usage$$input_tokens_exists = true, toFloat64(attribute_number_gen_ai$$usage$$input_tokens), NULL)) AS input_tokens,
+    sum(multiIf(attribute_number_gen_ai$$usage$$input_tokens_exists, toFloat64(attribute_number_gen_ai$$usage$$input_tokens), NULL)) AS input_tokens,
     sum(multiIf(mapContains(attributes_number, 'gen_ai.usage.output_tokens'), toFloat64(attributes_number['gen_ai.usage.output_tokens']), NULL)) AS output_tokens,
-    coalesce(sum(multiIf(attribute_number_gen_ai$$usage$$input_tokens_exists = true, toFloat64(attribute_number_gen_ai$$usage$$input_tokens), NULL)), 0) + coalesce(sum(multiIf(mapContains(attributes_number, 'gen_ai.usage.output_tokens'), toFloat64(attributes_number['gen_ai.usage.output_tokens']), NULL)), 0) AS total_tokens,
+    coalesce(sum(multiIf(attribute_number_gen_ai$$usage$$input_tokens_exists, toFloat64(attribute_number_gen_ai$$usage$$input_tokens), NULL)), 0) + coalesce(sum(multiIf(mapContains(attributes_number, 'gen_ai.usage.output_tokens'), toFloat64(attributes_number['gen_ai.usage.output_tokens']), NULL)), 0) AS total_tokens,
     sum(multiIf(mapContains(attributes_number, 'signoz.gen_ai.usage.tokens.cost'), toFloat64(attributes_number['signoz.gen_ai.usage.tokens.cost']), NULL)) AS estimated_total_cost,
-    maxIf(duration_nano, attribute_string_gen_ai$$request$$model_exists = true) AS max_llm_duration_nano,
+    maxIf(duration_nano, attribute_string_gen_ai$$request$$model_exists) AS max_llm_duration_nano,
     countIf(has_error = true) AS error_count,
-    maxIf(timestamp, (attribute_string_gen_ai$$request$$model_exists = true OR mapContains(attributes_string, 'gen_ai.tool.name') OR mapContains(attributes_string, 'gen_ai.agent.name'))) AS last_activity_time,
+    maxIf(timestamp, (attribute_string_gen_ai$$request$$model_exists OR mapContains(attributes_string, 'gen_ai.tool.name') OR mapContains(attributes_string, 'gen_ai.agent.name'))) AS last_activity_time,
     argMinIf(multiIf(mapContains(attributes_string, 'gen_ai.input.messages'), attributes_string['gen_ai.input.messages'], NULL), timestamp, mapContains(attributes_string, 'gen_ai.input.messages')) AS input,
     argMaxIf(multiIf(mapContains(attributes_string, 'gen_ai.output.messages'), attributes_string['gen_ai.output.messages'], NULL), timestamp, mapContains(attributes_string, 'gen_ai.output.messages')) AS output
 FROM signoz_traces.distributed_signoz_index_v3

pkg/statementbuilder/auditstatementbuilder/statement_builder_test.go

@@ -92,7 +92,7 @@ func TestStatementBuilder(t *testing.T) {
 				Limit: 100,
 			},
 			expected: qbtypes.Statement{
-				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$$principal$$id` = ? AND `attribute_string_signoz$$audit$$principal$$id_exists` = true) 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$$principal$$id` = ? AND `attribute_string_signoz$$audit$$principal$$id_exists`) 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},
 			},
 		},
@@ -109,7 +109,7 @@ func TestStatementBuilder(t *testing.T) {
 				Limit: 100,
 			},
 			expected: qbtypes.Statement{
-				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 ?",
+				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`) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"failure", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 100},
 			},
 		},
@@ -143,7 +143,7 @@ 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.audit.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$$action` = ? AND `attribute_string_signoz$$audit$$action_exists` = true) 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.audit.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$$action` = ? AND `attribute_string_signoz$$audit$$action_exists`) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"dashboard", "%signoz.audit.resource.kind%", "%signoz.audit.resource.kind\":\"dashboard%", uint64(1747945619), uint64(1747983448), "delete", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 100},
 			},
 		},
@@ -160,7 +160,7 @@ func TestStatementBuilder(t *testing.T) {
 				Limit: 100,
 			},
 			expected: qbtypes.Statement{
-				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$$principal$$type` = ? AND `attribute_string_signoz$$audit$$principal$$type_exists` = true) 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$$principal$$type` = ? AND `attribute_string_signoz$$audit$$principal$$type_exists`) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"service_account", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 100},
 			},
 		},
@@ -180,7 +180,7 @@ func TestStatementBuilder(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				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$$action` = ? AND `attribute_string_signoz$$audit$$action_exists` = true)) 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`) AND (`attribute_string_signoz$$audit$$action` = ? AND `attribute_string_signoz$$audit$$action_exists`)) 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)},
 			},
 		},
@@ -204,7 +204,7 @@ func TestStatementBuilder(t *testing.T) {
 				Limit: 5,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __limit_cte AS (SELECT toString(multiIf(`attribute_string_signoz$$audit$$principal$$email_exists` = true, `attribute_string_signoz$$audit$$principal$$email`, NULL)) AS `signoz.audit.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.audit.principal.email` ORDER BY __result_0 DESC LIMIT ?) SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 60 SECOND) AS ts, toString(multiIf(`attribute_string_signoz$$audit$$principal$$email_exists` = true, `attribute_string_signoz$$audit$$principal$$email`, NULL)) AS `signoz.audit.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.audit.principal.email`) GLOBAL IN (SELECT `signoz.audit.principal.email` FROM __limit_cte) GROUP BY ts, `signoz.audit.principal.email`",
+				Query: "WITH __limit_cte AS (SELECT toString(multiIf(`attribute_string_signoz$$audit$$principal$$email_exists`, `attribute_string_signoz$$audit$$principal$$email`, NULL)) AS `signoz.audit.principal.email`, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE (`attribute_string_signoz$$audit$$outcome` = ? AND `attribute_string_signoz$$audit$$outcome_exists`) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY `signoz.audit.principal.email` ORDER BY __result_0 DESC LIMIT ?) SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 60 SECOND) AS ts, toString(multiIf(`attribute_string_signoz$$audit$$principal$$email_exists`, `attribute_string_signoz$$audit$$principal$$email`, NULL)) AS `signoz.audit.principal.email`, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE (`attribute_string_signoz$$audit$$outcome` = ? AND `attribute_string_signoz$$audit$$outcome_exists`) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? AND (`signoz.audit.principal.email`) GLOBAL IN (SELECT `signoz.audit.principal.email` FROM __limit_cte) GROUP BY ts, `signoz.audit.principal.email`",
 				Args:  []any{"failure", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 5, "failure", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448)},
 			},
 		},

pkg/statementbuilder/logsstatementbuilder/stmt_builder_test.go

@@ -180,7 +180,7 @@ func TestStatementBuilderTimeSeries(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_logs.distributed_logs_v2_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), __limit_cte AS (SELECT toString(multiIf(`attribute_string_materialized$$key$$name_exists` = true, `attribute_string_materialized$$key$$name`, NULL)) AS `__GROUP_BY_KEY_0_materialized.key.name`, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY `__GROUP_BY_KEY_0_materialized.key.name` ORDER BY __result_0 DESC LIMIT ?) SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 30 SECOND) AS ts, toString(multiIf(`attribute_string_materialized$$key$$name_exists` = true, `attribute_string_materialized$$key$$name`, NULL)) AS `__GROUP_BY_KEY_0_materialized.key.name`, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? AND (`__GROUP_BY_KEY_0_materialized.key.name`) GLOBAL IN (SELECT `__GROUP_BY_KEY_0_materialized.key.name` FROM __limit_cte) GROUP BY ts, `__GROUP_BY_KEY_0_materialized.key.name`",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_logs.distributed_logs_v2_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), __limit_cte AS (SELECT toString(multiIf(`attribute_string_materialized$$key$$name_exists`, `attribute_string_materialized$$key$$name`, NULL)) AS `__GROUP_BY_KEY_0_materialized.key.name`, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY `__GROUP_BY_KEY_0_materialized.key.name` ORDER BY __result_0 DESC LIMIT ?) SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 30 SECOND) AS ts, toString(multiIf(`attribute_string_materialized$$key$$name_exists`, `attribute_string_materialized$$key$$name`, NULL)) AS `__GROUP_BY_KEY_0_materialized.key.name`, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? AND (`__GROUP_BY_KEY_0_materialized.key.name`) GLOBAL IN (SELECT `__GROUP_BY_KEY_0_materialized.key.name` FROM __limit_cte) GROUP BY ts, `__GROUP_BY_KEY_0_materialized.key.name`",
 				Args:  []any{"cartservice", "%service.name%", "%service.name\":\"cartservice%", uint64(1705397400), uint64(1705485600), "1705399200000000000", uint64(1705397400), "1705485600000000000", uint64(1705485600), 10, "1705399200000000000", uint64(1705397400), "1705485600000000000", uint64(1705485600)},
 			},
 		},
@@ -203,7 +203,7 @@ func TestStatementBuilderTimeSeries(t *testing.T) {
 				Limit: 10,
 			},
 			expected: qbtypes.Statement{
-				Query: "SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 30 SECOND) AS ts, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE ((match(`attribute_string_materialized$$key$$name`, ?) AND `attribute_string_materialized$$key$$name_exists` = true) OR (`attribute_string_materialized$$key$$name` = ? AND `attribute_string_materialized$$key$$name_exists` = true)) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY ts",
+				Query: "SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 30 SECOND) AS ts, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE ((match(`attribute_string_materialized$$key$$name`, ?) AND `attribute_string_materialized$$key$$name_exists`) OR (`attribute_string_materialized$$key$$name` = ? AND `attribute_string_materialized$$key$$name_exists`)) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY ts",
 				Args:  []any{"redis.*", "memcached", "1705399200000000000", uint64(1705397400), "1705485600000000000", uint64(1705485600)},
 			},
 			expectedErr: nil,
@@ -300,7 +300,7 @@ func TestStatementBuilderListQuery(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_logs.distributed_logs_v2_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? 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, attributes_string, attributes_number, attributes_bool, resources_string, scope_string FROM signoz_logs.distributed_logs_v2 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? ORDER BY multiIf(`attribute_string_materialized$$key$$name_exists` = true, `attribute_string_materialized$$key$$name`, NULL) desc LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_logs.distributed_logs_v2_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? 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, attributes_string, attributes_number, attributes_bool, resources_string, scope_string FROM signoz_logs.distributed_logs_v2 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? ORDER BY multiIf(`attribute_string_materialized$$key$$name_exists`, `attribute_string_materialized$$key$$name`, NULL) desc LIMIT ?",
 				Args:  []any{"cartservice", "%service.name%", "%service.name\":\"cartservice%", uint64(1747945619), uint64(1747983448), "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -328,7 +328,7 @@ func TestStatementBuilderListQuery(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, scope_name, scope_version, body, attributes_string, attributes_number, attributes_bool, resources_string, scope_string FROM signoz_logs.distributed_logs_v2 WHERE ((match(`attribute_string_materialized$$key$$name`, ?) AND `attribute_string_materialized$$key$$name_exists` = true) OR (`attribute_string_materialized$$key$$name` = ? AND `attribute_string_materialized$$key$$name_exists` = true)) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? ORDER BY multiIf(`attribute_string_materialized$$key$$name_exists` = true, `attribute_string_materialized$$key$$name`, NULL) desc LIMIT ?",
+				Query: "SELECT timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, scope_name, scope_version, body, attributes_string, attributes_number, attributes_bool, resources_string, scope_string FROM signoz_logs.distributed_logs_v2 WHERE ((match(`attribute_string_materialized$$key$$name`, ?) AND `attribute_string_materialized$$key$$name_exists`) OR (`attribute_string_materialized$$key$$name` = ? AND `attribute_string_materialized$$key$$name_exists`)) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? ORDER BY multiIf(`attribute_string_materialized$$key$$name_exists`, `attribute_string_materialized$$key$$name`, NULL) desc LIMIT ?",
 				Args:  []any{"redis.*", "memcached", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -442,7 +442,7 @@ func TestStatementBuilderListQueryResourceTests(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_logs.distributed_logs_v2_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? 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, attributes_string, attributes_number, attributes_bool, resources_string, scope_string FROM signoz_logs.distributed_logs_v2 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND match(LOWER(body), LOWER(?)) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? ORDER BY multiIf(`attribute_string_materialized$$key$$name_exists` = true, `attribute_string_materialized$$key$$name`, NULL) desc LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_logs.distributed_logs_v2_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? 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, attributes_string, attributes_number, attributes_bool, resources_string, scope_string FROM signoz_logs.distributed_logs_v2 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND match(LOWER(body), LOWER(?)) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? ORDER BY multiIf(`attribute_string_materialized$$key$$name_exists`, `attribute_string_materialized$$key$$name`, NULL) desc LIMIT ?",
 				Args:  []any{"cartservice", "%service.name%", "%service.name\":\"cartservice%", uint64(1747945619), uint64(1747983448), "hello", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -666,7 +666,7 @@ func TestStatementBuilderListQueryServiceCollision(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_logs.distributed_logs_v2_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? 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, attributes_string, attributes_number, attributes_bool, resources_string, scope_string FROM signoz_logs.distributed_logs_v2 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND LOWER(body) LIKE LOWER(?) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? ORDER BY multiIf(`attribute_string_materialized$$key$$name_exists` = true, `attribute_string_materialized$$key$$name`, NULL) desc LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_logs.distributed_logs_v2_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? 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, attributes_string, attributes_number, attributes_bool, resources_string, scope_string FROM signoz_logs.distributed_logs_v2 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND LOWER(body) LIKE LOWER(?) AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? ORDER BY multiIf(`attribute_string_materialized$$key$$name_exists`, `attribute_string_materialized$$key$$name`, NULL) desc LIMIT ?",
 				Args:  []any{"cartservice", "%service.name%", "%service.name\":\"cartservice%", uint64(1747945619), uint64(1747983448), "%error%", "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448), 10},
 			},
 			expectedErr: nil,

pkg/statementbuilder/tracesstatementbuilder/stmt_builder_test.go

@@ -129,7 +129,7 @@ func TestStatementBuilder(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __limit_cte AS (SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `__GROUP_BY_KEY_0_service.name`, count() AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE ((match(`attribute_string_materialized$$key$$name`, ?) AND `attribute_string_materialized$$key$$name_exists` = true) OR multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) = ?) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? GROUP BY `__GROUP_BY_KEY_0_service.name` ORDER BY __result_0 DESC LIMIT ?) SELECT toStartOfInterval(timestamp, INTERVAL 30 SECOND) AS ts, toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `__GROUP_BY_KEY_0_service.name`, count() AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE ((match(`attribute_string_materialized$$key$$name`, ?) AND `attribute_string_materialized$$key$$name_exists` = true) OR multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) = ?) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND (`__GROUP_BY_KEY_0_service.name`) GLOBAL IN (SELECT `__GROUP_BY_KEY_0_service.name` FROM __limit_cte) GROUP BY ts, `__GROUP_BY_KEY_0_service.name`",
+				Query: "WITH __limit_cte AS (SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `__GROUP_BY_KEY_0_service.name`, count() AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE ((match(`attribute_string_materialized$$key$$name`, ?) AND `attribute_string_materialized$$key$$name_exists`) OR multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) = ?) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? GROUP BY `__GROUP_BY_KEY_0_service.name` ORDER BY __result_0 DESC LIMIT ?) SELECT toStartOfInterval(timestamp, INTERVAL 30 SECOND) AS ts, toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `__GROUP_BY_KEY_0_service.name`, count() AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE ((match(`attribute_string_materialized$$key$$name`, ?) AND `attribute_string_materialized$$key$$name_exists`) OR multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) = ?) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND (`__GROUP_BY_KEY_0_service.name`) GLOBAL IN (SELECT `__GROUP_BY_KEY_0_service.name` FROM __limit_cte) GROUP BY ts, `__GROUP_BY_KEY_0_service.name`",
 				Args:  []any{"redis-manual", "redis-manual", "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10, "redis-manual", "redis-manual", "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448)},
 			},
 			expectedErr: nil,
@@ -268,7 +268,7 @@ func TestStatementBuilder(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), __limit_cte AS (SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `__GROUP_BY_KEY_0_service.name`, sum(multiIf(`attribute_number_cart$$items_count_exists` = true, toFloat64(`attribute_number_cart$$items_count`), NULL)) AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? GROUP BY `__GROUP_BY_KEY_0_service.name` ORDER BY __result_0 DESC LIMIT ?) SELECT toStartOfInterval(timestamp, INTERVAL 30 SECOND) AS ts, toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `__GROUP_BY_KEY_0_service.name`, sum(multiIf(`attribute_number_cart$$items_count_exists` = true, toFloat64(`attribute_number_cart$$items_count`), NULL)) AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND (`__GROUP_BY_KEY_0_service.name`) GLOBAL IN (SELECT `__GROUP_BY_KEY_0_service.name` FROM __limit_cte) GROUP BY ts, `__GROUP_BY_KEY_0_service.name`",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), __limit_cte AS (SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `__GROUP_BY_KEY_0_service.name`, sum(multiIf(`attribute_number_cart$$items_count_exists`, toFloat64(`attribute_number_cart$$items_count`), NULL)) AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? GROUP BY `__GROUP_BY_KEY_0_service.name` ORDER BY __result_0 DESC LIMIT ?) SELECT toStartOfInterval(timestamp, INTERVAL 30 SECOND) AS ts, toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `__GROUP_BY_KEY_0_service.name`, sum(multiIf(`attribute_number_cart$$items_count_exists`, toFloat64(`attribute_number_cart$$items_count`), NULL)) AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND (`__GROUP_BY_KEY_0_service.name`) GLOBAL IN (SELECT `__GROUP_BY_KEY_0_service.name` FROM __limit_cte) GROUP BY ts, `__GROUP_BY_KEY_0_service.name`",
 				Args:  []any{"redis-manual", "%service.name%", "%service.name\":\"redis-manual%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10, "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448)},
 			},
 			expectedErr: nil,
@@ -307,7 +307,7 @@ func TestStatementBuilder(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), __limit_cte AS (SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `__GROUP_BY_KEY_0_service.name`, sum(multiIf(`attribute_number_cart$$items_count_exists` = true, toFloat64(`attribute_number_cart$$items_count`), NULL)) AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? GROUP BY `__GROUP_BY_KEY_0_service.name` ORDER BY `__GROUP_BY_KEY_0_service.name` desc LIMIT ?) SELECT toStartOfInterval(timestamp, INTERVAL 30 SECOND) AS ts, toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `__GROUP_BY_KEY_0_service.name`, sum(multiIf(`attribute_number_cart$$items_count_exists` = true, toFloat64(`attribute_number_cart$$items_count`), NULL)) AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND (`__GROUP_BY_KEY_0_service.name`) GLOBAL IN (SELECT `__GROUP_BY_KEY_0_service.name` FROM __limit_cte) GROUP BY ts, `__GROUP_BY_KEY_0_service.name` ORDER BY `__GROUP_BY_KEY_0_service.name` desc, ts desc",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), __limit_cte AS (SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `__GROUP_BY_KEY_0_service.name`, sum(multiIf(`attribute_number_cart$$items_count_exists`, toFloat64(`attribute_number_cart$$items_count`), NULL)) AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? GROUP BY `__GROUP_BY_KEY_0_service.name` ORDER BY `__GROUP_BY_KEY_0_service.name` desc LIMIT ?) SELECT toStartOfInterval(timestamp, INTERVAL 30 SECOND) AS ts, toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `__GROUP_BY_KEY_0_service.name`, sum(multiIf(`attribute_number_cart$$items_count_exists`, toFloat64(`attribute_number_cart$$items_count`), NULL)) AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND (`__GROUP_BY_KEY_0_service.name`) GLOBAL IN (SELECT `__GROUP_BY_KEY_0_service.name` FROM __limit_cte) GROUP BY ts, `__GROUP_BY_KEY_0_service.name` ORDER BY `__GROUP_BY_KEY_0_service.name` desc, ts desc",
 				Args:  []any{"redis-manual", "%service.name%", "%service.name\":\"redis-manual%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10, "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448)},
 			},
 			expectedErr: nil,
@@ -552,7 +552,7 @@ func TestStatementBuilderListQuery(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint) SELECT timestamp AS `__SELECT_KEY_0_timestamp`, trace_id AS `__SELECT_KEY_1_trace_id`, span_id AS `__SELECT_KEY_2_span_id`, name AS `__SELECT_KEY_3_name`, multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) AS `__SELECT_KEY_4_service.name`, duration_nano AS `__SELECT_KEY_5_duration_nano`, multiIf(`attribute_number_cart$$items_count_exists` = true, `attribute_number_cart$$items_count`, NULL) AS `__SELECT_KEY_6_cart.items_count` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint) SELECT timestamp AS `__SELECT_KEY_0_timestamp`, trace_id AS `__SELECT_KEY_1_trace_id`, span_id AS `__SELECT_KEY_2_span_id`, name AS `__SELECT_KEY_3_name`, multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) AS `__SELECT_KEY_4_service.name`, duration_nano AS `__SELECT_KEY_5_duration_nano`, multiIf(`attribute_number_cart$$items_count_exists`, `attribute_number_cart$$items_count`, NULL) AS `__SELECT_KEY_6_cart.items_count` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"redis-manual", "%service.name%", "%service.name\":\"redis-manual%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -669,7 +669,7 @@ func TestStatementBuilderListQuery(t *testing.T) {
 				Limit: 10,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint) SELECT timestamp AS `__SELECT_KEY_0_timestamp`, trace_id AS `__SELECT_KEY_1_trace_id`, span_id AS `__SELECT_KEY_2_span_id`, name AS `__SELECT_KEY_3_name`, resource_string_service$$name AS `__SELECT_KEY_4_serviceName`, duration_nano AS `__SELECT_KEY_5_durationNano`, http_method AS `__SELECT_KEY_6_httpMethod`, multiIf(`attribute_string_mixed$$materialization$$key_exists` = true, `attribute_string_mixed$$materialization$$key`, multiIf(resource.`mixed.materialization.key` IS NOT NULL, resource.`mixed.materialization.key`::String, mapContains(resources_string, 'mixed.materialization.key'), resources_string['mixed.materialization.key'], NULL) IS NOT NULL, multiIf(resource.`mixed.materialization.key` IS NOT NULL, resource.`mixed.materialization.key`::String, mapContains(resources_string, 'mixed.materialization.key'), resources_string['mixed.materialization.key'], NULL), NULL) AS `__SELECT_KEY_7_mixed.materialization.key` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint) SELECT timestamp AS `__SELECT_KEY_0_timestamp`, trace_id AS `__SELECT_KEY_1_trace_id`, span_id AS `__SELECT_KEY_2_span_id`, name AS `__SELECT_KEY_3_name`, resource_string_service$$name AS `__SELECT_KEY_4_serviceName`, duration_nano AS `__SELECT_KEY_5_durationNano`, http_method AS `__SELECT_KEY_6_httpMethod`, multiIf(`attribute_string_mixed$$materialization$$key_exists`, `attribute_string_mixed$$materialization$$key`, multiIf(resource.`mixed.materialization.key` IS NOT NULL, resource.`mixed.materialization.key`::String, mapContains(resources_string, 'mixed.materialization.key'), resources_string['mixed.materialization.key'], NULL) IS NOT NULL, multiIf(resource.`mixed.materialization.key` IS NOT NULL, resource.`mixed.materialization.key`::String, mapContains(resources_string, 'mixed.materialization.key'), resources_string['mixed.materialization.key'], NULL), NULL) AS `__SELECT_KEY_7_mixed.materialization.key` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"redis-manual", "%service.name%", "%service.name\":\"redis-manual%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -714,7 +714,7 @@ func TestStatementBuilderListQuery(t *testing.T) {
 				Limit: 10,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint) SELECT timestamp AS `__SELECT_KEY_0_timestamp`, trace_id AS `__SELECT_KEY_1_trace_id`, span_id AS `__SELECT_KEY_2_span_id`, name AS `__SELECT_KEY_3_name`, resource_string_service$$name AS `__SELECT_KEY_4_serviceName`, duration_nano AS `__SELECT_KEY_5_durationNano`, http_method AS `__SELECT_KEY_6_httpMethod`, multiIf(`attribute_string_mixed$$materialization$$key_exists` = true, `attribute_string_mixed$$materialization$$key`, NULL) AS `__SELECT_KEY_7_mixed.materialization.key` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
+				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint) SELECT timestamp AS `__SELECT_KEY_0_timestamp`, trace_id AS `__SELECT_KEY_1_trace_id`, span_id AS `__SELECT_KEY_2_span_id`, name AS `__SELECT_KEY_3_name`, resource_string_service$$name AS `__SELECT_KEY_4_serviceName`, duration_nano AS `__SELECT_KEY_5_durationNano`, http_method AS `__SELECT_KEY_6_httpMethod`, multiIf(`attribute_string_mixed$$materialization$$key_exists`, `attribute_string_mixed$$materialization$$key`, NULL) AS `__SELECT_KEY_7_mixed.materialization.key` FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? LIMIT ?",
 				Args:  []any{"redis-manual", "%service.name%", "%service.name\":\"redis-manual%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -1178,7 +1178,7 @@ func TestStatementBuilderTraceQuery(t *testing.T) {
 				Limit: 10,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __toe AS (SELECT trace_id FROM signoz_traces.distributed_signoz_index_v3 WHERE (`attribute_string_materialized$$key$$name` = ? AND `attribute_string_materialized$$key$$name_exists` = true) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), __toe_duration_sorted AS (SELECT trace_id, duration_nano, resource_string_service$$name as `service.name`, name FROM signoz_traces.distributed_signoz_index_v3 WHERE parent_span_id = '' AND trace_id GLOBAL IN __toe AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? ORDER BY duration_nano DESC LIMIT 1 BY trace_id) SELECT __toe_duration_sorted.`service.name` AS `service.name`, __toe_duration_sorted.name AS `name`, count() AS span_count, __toe_duration_sorted.duration_nano AS `duration_nano`, __toe_duration_sorted.trace_id AS `trace_id` FROM __toe INNER JOIN __toe_duration_sorted ON __toe.trace_id = __toe_duration_sorted.trace_id GROUP BY trace_id, duration_nano, name, `service.name` ORDER BY duration_nano DESC LIMIT 1 BY trace_id LIMIT ? SETTINGS distributed_product_mode='allow', max_memory_usage=10000000000",
+				Query: "WITH __toe AS (SELECT trace_id FROM signoz_traces.distributed_signoz_index_v3 WHERE (`attribute_string_materialized$$key$$name` = ? AND `attribute_string_materialized$$key$$name_exists`) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), __toe_duration_sorted AS (SELECT trace_id, duration_nano, resource_string_service$$name as `service.name`, name FROM signoz_traces.distributed_signoz_index_v3 WHERE parent_span_id = '' AND trace_id GLOBAL IN __toe AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? ORDER BY duration_nano DESC LIMIT 1 BY trace_id) SELECT __toe_duration_sorted.`service.name` AS `service.name`, __toe_duration_sorted.name AS `name`, count() AS span_count, __toe_duration_sorted.duration_nano AS `duration_nano`, __toe_duration_sorted.trace_id AS `trace_id` FROM __toe INNER JOIN __toe_duration_sorted ON __toe.trace_id = __toe_duration_sorted.trace_id GROUP BY trace_id, duration_nano, name, `service.name` ORDER BY duration_nano DESC LIMIT 1 BY trace_id LIMIT ? SETTINGS distributed_product_mode='allow', max_memory_usage=10000000000",
 				Args:  []any{"redis-manual", "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -1194,7 +1194,7 @@ func TestStatementBuilderTraceQuery(t *testing.T) {
 				Limit: 10,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __toe AS (SELECT trace_id FROM signoz_traces.distributed_signoz_index_v3 WHERE ((match(`attribute_string_materialized$$key$$name`, ?) AND `attribute_string_materialized$$key$$name_exists` = true) OR multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) = ?) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), __toe_duration_sorted AS (SELECT trace_id, duration_nano, resource_string_service$$name as `service.name`, name FROM signoz_traces.distributed_signoz_index_v3 WHERE parent_span_id = '' AND trace_id GLOBAL IN __toe AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? ORDER BY duration_nano DESC LIMIT 1 BY trace_id) SELECT __toe_duration_sorted.`service.name` AS `service.name`, __toe_duration_sorted.name AS `name`, count() AS span_count, __toe_duration_sorted.duration_nano AS `duration_nano`, __toe_duration_sorted.trace_id AS `trace_id` FROM __toe INNER JOIN __toe_duration_sorted ON __toe.trace_id = __toe_duration_sorted.trace_id GROUP BY trace_id, duration_nano, name, `service.name` ORDER BY duration_nano DESC LIMIT 1 BY trace_id LIMIT ? SETTINGS distributed_product_mode='allow', max_memory_usage=10000000000",
+				Query: "WITH __toe AS (SELECT trace_id FROM signoz_traces.distributed_signoz_index_v3 WHERE ((match(`attribute_string_materialized$$key$$name`, ?) AND `attribute_string_materialized$$key$$name_exists`) OR multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) = ?) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), __toe_duration_sorted AS (SELECT trace_id, duration_nano, resource_string_service$$name as `service.name`, name FROM signoz_traces.distributed_signoz_index_v3 WHERE parent_span_id = '' AND trace_id GLOBAL IN __toe AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? ORDER BY duration_nano DESC LIMIT 1 BY trace_id) SELECT __toe_duration_sorted.`service.name` AS `service.name`, __toe_duration_sorted.name AS `name`, count() AS span_count, __toe_duration_sorted.duration_nano AS `duration_nano`, __toe_duration_sorted.trace_id AS `trace_id` FROM __toe INNER JOIN __toe_duration_sorted ON __toe.trace_id = __toe_duration_sorted.trace_id GROUP BY trace_id, duration_nano, name, `service.name` ORDER BY duration_nano DESC LIMIT 1 BY trace_id LIMIT ? SETTINGS distributed_product_mode='allow', max_memory_usage=10000000000",
 				Args:  []any{"redis-manual", "redis-manual", "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,
@@ -1240,7 +1240,7 @@ func TestStatementBuilderTraceQuery(t *testing.T) {
 				Limit: 10,
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __toe AS (SELECT trace_id FROM signoz_traces.distributed_signoz_index_v3 WHERE (((name, resource_string_service$$name) GLOBAL IN (SELECT DISTINCT name, serviceName from signoz_traces.distributed_top_level_operations WHERE time >= toDateTime(1747947419))) AND parent_span_id != '' OR (`attribute_string_materialized$$key$$name` = ? AND `attribute_string_materialized$$key$$name_exists` = true)) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), __toe_duration_sorted AS (SELECT trace_id, duration_nano, resource_string_service$$name as `service.name`, name FROM signoz_traces.distributed_signoz_index_v3 WHERE parent_span_id = '' AND trace_id GLOBAL IN __toe AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? ORDER BY duration_nano DESC LIMIT 1 BY trace_id) SELECT __toe_duration_sorted.`service.name` AS `service.name`, __toe_duration_sorted.name AS `name`, count() AS span_count, __toe_duration_sorted.duration_nano AS `duration_nano`, __toe_duration_sorted.trace_id AS `trace_id` FROM __toe INNER JOIN __toe_duration_sorted ON __toe.trace_id = __toe_duration_sorted.trace_id GROUP BY trace_id, duration_nano, name, `service.name` ORDER BY duration_nano DESC LIMIT 1 BY trace_id LIMIT ? SETTINGS distributed_product_mode='allow', max_memory_usage=10000000000",
+				Query: "WITH __toe AS (SELECT trace_id FROM signoz_traces.distributed_signoz_index_v3 WHERE (((name, resource_string_service$$name) GLOBAL IN (SELECT DISTINCT name, serviceName from signoz_traces.distributed_top_level_operations WHERE time >= toDateTime(1747947419))) AND parent_span_id != '' OR (`attribute_string_materialized$$key$$name` = ? AND `attribute_string_materialized$$key$$name_exists`)) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), __toe_duration_sorted AS (SELECT trace_id, duration_nano, resource_string_service$$name as `service.name`, name FROM signoz_traces.distributed_signoz_index_v3 WHERE parent_span_id = '' AND trace_id GLOBAL IN __toe AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? ORDER BY duration_nano DESC LIMIT 1 BY trace_id) SELECT __toe_duration_sorted.`service.name` AS `service.name`, __toe_duration_sorted.name AS `name`, count() AS span_count, __toe_duration_sorted.duration_nano AS `duration_nano`, __toe_duration_sorted.trace_id AS `trace_id` FROM __toe INNER JOIN __toe_duration_sorted ON __toe.trace_id = __toe_duration_sorted.trace_id GROUP BY trace_id, duration_nano, name, `service.name` ORDER BY duration_nano DESC LIMIT 1 BY trace_id LIMIT ? SETTINGS distributed_product_mode='allow', max_memory_usage=10000000000",
 				Args:  []any{"redis-manual", "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 10},
 			},
 			expectedErr: nil,

pkg/telemetryschema/logstelemetryschema/compile_test.go

@@ -461,7 +461,7 @@ func TestConditionFor(t *testing.T) {
 			evolutions:    mockEvolution,
 			operator:      qbtypes.FilterOperatorRegexp,
 			value:         "frontend-.*",
-			expectedSQL:   "WHERE (match(`resource_string_service$$name`, ?) AND `resource_string_service$$name_exists` = true)",
+			expectedSQL:   "WHERE (match(`resource_string_service$$name`, ?) AND `resource_string_service$$name_exists`)",
 			expectedArgs:  []any{"frontend-.*"},
 			expectedError: nil,
 		},

pkg/telemetryschema/logstelemetryschema/filter_expr_logs_test.go

@@ -1596,7 +1596,7 @@ func TestFilterExprLogs(t *testing.T) {
 			category:              "Materialized key",
 			query:                 "materialized.key.name=\"test\"",
 			shouldPass:            true,
-			expectedQuery:         "WHERE (`attribute_string_materialized$$key$$name` = ? AND `attribute_string_materialized$$key$$name_exists` = true)",
+			expectedQuery:         "WHERE (`attribute_string_materialized$$key$$name` = ? AND `attribute_string_materialized$$key$$name_exists`)",
 			expectedArgs:          []any{"test"},
 			expectedErrorContains: "",
 		},

pkg/telemetryschema/logstelemetryschema/storage.go

@@ -182,7 +182,7 @@ func (m *storage) read(_ context.Context, q qbtypes.QueryInfo, key *telemetrytyp
 				// a key could have been materialized, if so return the materialized column name
 				if key.Materialized {
 					exprs = append(exprs, telemetrytypes.FieldKeyToMaterializedColumnName(key))
-					existExpr = append(existExpr, telemetrytypes.FieldKeyToMaterializedExistsCondition(key, true))
+					existExpr = append(existExpr, telemetrytypes.FieldKeyToMaterializedColumnNameForExists(key))
 				} else {
 					exprs = append(exprs, fmt.Sprintf("%s[%s]", columnName, clickhousesql.StringLiteral(key.Name)))
 					existExpr = append(existExpr, fmt.Sprintf("mapContains(%s, %s)", columnName, clickhousesql.StringLiteral(key.Name)))

pkg/telemetryschema/logstelemetryschema/storage_test.go

@@ -580,7 +580,7 @@ func TestFieldForWithMaterialized(t *testing.T) {
 			name:           "Multi evolution - both columns (JSON + materialized)",
 			start:          time.Date(2024, 2, 1, 0, 0, 0, 0, time.UTC),
 			end:            time.Date(2024, 4, 2, 0, 0, 0, 0, time.UTC),
-			expectedResult: "multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, `resource_string_service$$name_exists` = true, `resource_string_service$$name`, NULL)",
+			expectedResult: "multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, `resource_string_service$$name_exists`, `resource_string_service$$name`, NULL)",
 		},
 	}
 

pkg/telemetryschema/tracestelemetryschema/storage.go

@@ -306,7 +306,7 @@ func (m *storage) resolveColumnExprs(
 				// a key could have been materialized, if so return the materialized column name
 				if key.Materialized {
 					exprs = append(exprs, telemetrytypes.FieldKeyToMaterializedColumnName(key))
-					existExprs = append(existExprs, telemetrytypes.FieldKeyToMaterializedExistsCondition(key, true))
+					existExprs = append(existExprs, telemetrytypes.FieldKeyToMaterializedColumnNameForExists(key))
 				} else {
 					exprs = append(exprs, fmt.Sprintf("%s[%s]", columnName, clickhousesql.StringLiteral(key.Name)))
 					existExprs = append(existExprs, fmt.Sprintf("mapContains(%s, %s)", columnName, clickhousesql.StringLiteral(key.Name)))

pkg/telemetryschema/tracestelemetryschema/storage_test.go

@@ -80,7 +80,7 @@ func TestGetFieldKeyName(t *testing.T) {
 				Materialized:  true,
 				Evolutions:    mockEvolution,
 			},
-			expectedResult: "multiIf(resource.`deployment.environment` IS NOT NULL, resource.`deployment.environment`::String, `resource_string_deployment$$environment_exists` = true, `resource_string_deployment$$environment`, NULL)",
+			expectedResult: "multiIf(resource.`deployment.environment` IS NOT NULL, resource.`deployment.environment`::String, `resource_string_deployment$$environment_exists`, `resource_string_deployment$$environment`, NULL)",
 			expectedError:  nil,
 		},
 		{
@@ -228,7 +228,7 @@ func TestFieldForResourceWithEvolution(t *testing.T) {
 			},
 			tsStart:        uint64(time.Date(2024, 6, 1, 0, 0, 0, 0, time.UTC).UnixNano()),
 			tsEnd:          uint64(time.Date(2025, 6, 1, 0, 0, 0, 0, time.UTC).UnixNano()),
-			expectedResult: "multiIf(resource.`deployment.environment` IS NOT NULL, resource.`deployment.environment`::String, `resource_string_deployment$$environment_exists` = true, `resource_string_deployment$$environment`, NULL)",
+			expectedResult: "multiIf(resource.`deployment.environment` IS NOT NULL, resource.`deployment.environment`::String, `resource_string_deployment$$environment_exists`, `resource_string_deployment$$environment`, NULL)",
 		},
 	}
 

pkg/types/ruletypes/alert_state.go

@@ -38,18 +38,3 @@ var alertStateSeverity = map[AlertState]int{
 func (a AlertState) Severity() int {
 	return alertStateSeverity[a]
 }
-
-// Display priority for list sorting, worst first from a user's view; deliberately
-// NOT Severity(), which ranks disabled/nodata above firing for overall-state computation.
-var alertStateDisplayRank = map[AlertState]int{
-	StateFiring:     5,
-	StateNoData:     4,
-	StatePending:    3,
-	StateRecovering: 2,
-	StateInactive:   1,
-	StateDisabled:   0,
-}
-
-func (a AlertState) DisplayRank() int {
-	return alertStateDisplayRank[a]
-}

pkg/types/ruletypes/alert_state_test.go

@@ -1,21 +0,0 @@
-package ruletypes
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-// Both rankings must stay exhaustive: a new AlertState needs an entry in each.
-func TestAlertStateRankingsAreExhaustive(t *testing.T) {
-	states := AlertState{}.Enum()
-
-	assert.Len(t, alertStateSeverity, len(states))
-	assert.Len(t, alertStateDisplayRank, len(states))
-
-	for _, s := range states {
-		state := s.(AlertState)
-		assert.Contains(t, alertStateSeverity, state, "missing severity for state %q", state)
-		assert.Contains(t, alertStateDisplayRank, state, "missing display rank for state %q", state)
-	}
-}

pkg/types/ruletypes/list.go

@@ -1,129 +0,0 @@
-package ruletypes
-
-import (
-	"slices"
-	"unicode/utf8"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-const (
-	DefaultListLimit = 20
-	MaxListLimit     = 200
-	MaxListQueryLen  = 1024
-)
-
-var ErrCodeRuleListInvalid = errors.MustNewCode("rule_list_invalid")
-
-type ListSort struct{ valuer.String }
-
-var (
-	ListSortUpdatedAt = ListSort{valuer.NewString("updated_at")}
-	ListSortCreatedAt = ListSort{valuer.NewString("created_at")}
-	ListSortName      = ListSort{valuer.NewString("name")}
-	ListSortState     = ListSort{valuer.NewString("state")}
-	ListSortSeverity  = ListSort{valuer.NewString("severity")}
-)
-
-func (ListSort) Enum() []any {
-	return []any{ListSortUpdatedAt, ListSortCreatedAt, ListSortName, ListSortState, ListSortSeverity}
-}
-
-func (s ListSort) IsValid() bool {
-	return slices.ContainsFunc(s.Enum(), func(v any) bool { return v == s })
-}
-
-type ListOrder struct{ valuer.String }
-
-var (
-	ListOrderAsc  = ListOrder{valuer.NewString("asc")}
-	ListOrderDesc = ListOrder{valuer.NewString("desc")}
-)
-
-func (ListOrder) Enum() []any {
-	return []any{ListOrderAsc, ListOrderDesc}
-}
-
-func (o ListOrder) IsValid() bool {
-	return slices.ContainsFunc(o.Enum(), func(v any) bool { return v == o })
-}
-
-type ListRulesParams struct {
-	Query string `query:"query"`
-	// gin cannot bind a slice of valuer enums; AlertStates converts these.
-	States []string  `query:"states"`
-	Sort   ListSort  `query:"sort"`
-	Order  ListOrder `query:"order"`
-	Limit  int       `query:"limit"`
-	Offset int       `query:"offset"`
-}
-
-// Validate normalizes in place; an over-max limit is clamped, not rejected.
-func (p *ListRulesParams) Validate() error {
-	if n := utf8.RuneCountInString(p.Query); n > MaxListQueryLen {
-		return errors.NewInvalidInputf(ErrCodeRuleListInvalid,
-			"query cannot be longer than %d characters, got %d", MaxListQueryLen, n)
-	}
-
-	if p.Sort.IsZero() {
-		p.Sort = ListSortUpdatedAt
-	} else if !p.Sort.IsValid() {
-		return errors.NewInvalidInputf(ErrCodeRuleListInvalid,
-			"invalid sort %q, expected one of: `updated_at`, `created_at`, `name`, `state`, `severity`", p.Sort)
-	}
-
-	if p.Order.IsZero() {
-		p.Order = ListOrderDesc
-	} else if !p.Order.IsValid() {
-		return errors.NewInvalidInputf(ErrCodeRuleListInvalid,
-			"invalid order %q, expected `asc` or `desc`", p.Order)
-	}
-
-	if p.Limit == 0 {
-		p.Limit = DefaultListLimit
-	} else if p.Limit < 0 {
-		return errors.NewInvalidInputf(ErrCodeRuleListInvalid,
-			"invalid limit %d, must be a positive integer", p.Limit)
-	} else if p.Limit > MaxListLimit {
-		p.Limit = MaxListLimit
-	}
-
-	if p.Offset < 0 {
-		return errors.NewInvalidInputf(ErrCodeRuleListInvalid,
-			"invalid offset %d, must be a non-negative integer", p.Offset)
-	}
-
-	if _, err := p.GetAlertStates(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// GetAlertStates parses States; empty means no state filtering.
-func (p *ListRulesParams) GetAlertStates() ([]AlertState, error) {
-	if len(p.States) == 0 {
-		return nil, nil
-	}
-
-	states := make([]AlertState, 0, len(p.States))
-	for _, raw := range p.States {
-		state, err := parseAlertState(raw)
-		if err != nil {
-			return nil, err
-		}
-		states = append(states, state)
-	}
-
-	return states, nil
-}
-
-func parseAlertState(raw string) (AlertState, error) {
-	state := AlertState{valuer.NewString(raw)}
-	if !slices.Contains(state.Enum(), any(state)) {
-		return AlertState{}, errors.NewInvalidInputf(ErrCodeRuleListInvalid,
-			"invalid state %q, expected one of: `firing`, `pending`, `recovering`, `inactive`, `nodata`, `disabled`", raw)
-	}
-	return state, nil
-}

pkg/types/ruletypes/list_filter.go

@@ -1,100 +0,0 @@
-package ruletypes
-
-import (
-	"slices"
-	"strings"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	qbtypesv5 "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-)
-
-var ErrCodeRuleListFilterInvalid = errors.MustNewCode("rule_list_filter_invalid")
-
-// DSLKey is a reserved (column-level) key in the rule list filter DSL.
-type DSLKey string
-
-const (
-	DSLKeyName      DSLKey = "name"
-	DSLKeySeverity  DSLKey = "severity"
-	DSLKeyCreatedBy DSLKey = "created_by"
-	DSLKeyUpdatedBy DSLKey = "updated_by"
-	DSLKeyCreatedAt DSLKey = "created_at"
-	DSLKeyUpdatedAt DSLKey = "updated_at"
-	DSLKeyAlertType DSLKey = "alert_type"
-	DSLKeyRuleType  DSLKey = "rule_type"
-
-	// Label keys under this prefix are matched exactly (case-sensitive).
-	DSLLabelsKeyPrefix = "labels."
-
-	// Advertised in reservedKeywords; not itself a filterable key.
-	DSLKeyLabelsPlaceholder DSLKey = "labels.<key>"
-)
-
-func ReservedFilterKeys() []DSLKey {
-	keys := make([]DSLKey, 0, len(ReservedOps)+1)
-	for key := range ReservedOps {
-		keys = append(keys, key)
-	}
-	keys = append(keys, DSLKeyLabelsPlaceholder)
-	slices.SortFunc(keys, func(a, b DSLKey) int {
-		return strings.Compare(string(a), string(b))
-	})
-	return keys
-}
-
-// ReservedOps lists the operators each reserved DSL key accepts; `labels.<key>` terms use LabelsKeyOps.
-var ReservedOps = map[DSLKey]map[qbtypesv5.FilterOperator]struct{}{
-	DSLKeyName: stringSearchOps(),
-	// severity aliases labels.severity, so it takes the labels operator set.
-	DSLKeySeverity:  LabelsKeyOps,
-	DSLKeyCreatedBy: stringSearchOps(),
-	DSLKeyUpdatedBy: stringSearchOps(),
-	DSLKeyCreatedAt: numericRangeOps(),
-	DSLKeyUpdatedAt: numericRangeOps(),
-	DSLKeyAlertType: enumOps(),
-	DSLKeyRuleType:  enumOps(),
-}
-
-// LabelsKeyOps operators target the label's value; EXISTS/NOT EXISTS test its presence.
-var LabelsKeyOps = opsSet(
-	qbtypesv5.FilterOperatorEqual, qbtypesv5.FilterOperatorNotEqual,
-	qbtypesv5.FilterOperatorLike, qbtypesv5.FilterOperatorNotLike,
-	qbtypesv5.FilterOperatorILike, qbtypesv5.FilterOperatorNotILike,
-	qbtypesv5.FilterOperatorContains, qbtypesv5.FilterOperatorNotContains,
-	qbtypesv5.FilterOperatorIn, qbtypesv5.FilterOperatorNotIn,
-	qbtypesv5.FilterOperatorExists, qbtypesv5.FilterOperatorNotExists,
-)
-
-func stringSearchOps() map[qbtypesv5.FilterOperator]struct{} {
-	return opsSet(
-		qbtypesv5.FilterOperatorEqual, qbtypesv5.FilterOperatorNotEqual,
-		qbtypesv5.FilterOperatorLike, qbtypesv5.FilterOperatorNotLike,
-		qbtypesv5.FilterOperatorILike, qbtypesv5.FilterOperatorNotILike,
-		qbtypesv5.FilterOperatorContains, qbtypesv5.FilterOperatorNotContains,
-		qbtypesv5.FilterOperatorIn, qbtypesv5.FilterOperatorNotIn,
-	)
-}
-
-func numericRangeOps() map[qbtypesv5.FilterOperator]struct{} {
-	return opsSet(
-		qbtypesv5.FilterOperatorEqual, qbtypesv5.FilterOperatorNotEqual,
-		qbtypesv5.FilterOperatorLessThan, qbtypesv5.FilterOperatorLessThanOrEq,
-		qbtypesv5.FilterOperatorGreaterThan, qbtypesv5.FilterOperatorGreaterThanOrEq,
-		qbtypesv5.FilterOperatorBetween, qbtypesv5.FilterOperatorNotBetween,
-	)
-}
-
-func enumOps() map[qbtypesv5.FilterOperator]struct{} {
-	return opsSet(
-		qbtypesv5.FilterOperatorEqual, qbtypesv5.FilterOperatorNotEqual,
-		qbtypesv5.FilterOperatorIn, qbtypesv5.FilterOperatorNotIn,
-	)
-}
-
-func opsSet(ops ...qbtypesv5.FilterOperator) map[qbtypesv5.FilterOperator]struct{} {
-	m := make(map[qbtypesv5.FilterOperator]struct{}, len(ops))
-	for _, op := range ops {
-		m[op] = struct{}{}
-	}
-	return m
-}

pkg/types/ruletypes/list_filter_test.go

@@ -1,34 +0,0 @@
-package ruletypes
-
-import (
-	"testing"
-
-	qbtypesv5 "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestReservedFilterKeys(t *testing.T) {
-	assert.Equal(t, []DSLKey{
-		DSLKeyAlertType,
-		DSLKeyCreatedAt,
-		DSLKeyCreatedBy,
-		DSLKeyLabelsPlaceholder,
-		DSLKeyName,
-		DSLKeyRuleType,
-		DSLKeySeverity,
-		DSLKeyUpdatedAt,
-		DSLKeyUpdatedBy,
-	}, ReservedFilterKeys())
-}
-
-func TestFilterOpsExcludeRegexp(t *testing.T) {
-	for key, ops := range ReservedOps {
-		assert.NotEmpty(t, ops, "key %q has no operators", key)
-		assert.NotContains(t, ops, qbtypesv5.FilterOperatorRegexp, "key %q allows REGEXP", key)
-		assert.NotContains(t, ops, qbtypesv5.FilterOperatorNotRegexp, "key %q allows NOT REGEXP", key)
-	}
-	assert.NotContains(t, LabelsKeyOps, qbtypesv5.FilterOperatorRegexp)
-	assert.NotContains(t, LabelsKeyOps, qbtypesv5.FilterOperatorNotRegexp)
-	assert.Contains(t, LabelsKeyOps, qbtypesv5.FilterOperatorExists)
-	assert.Contains(t, LabelsKeyOps, qbtypesv5.FilterOperatorNotExists)
-}

pkg/types/ruletypes/list_test.go

@@ -1,126 +0,0 @@
-package ruletypes
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestListRulesParamsValidate(t *testing.T) {
-	testCases := []struct {
-		name      string
-		params    ListRulesParams
-		wantErr   string
-		wantSort  ListSort
-		wantOrder ListOrder
-		wantLimit int
-	}{
-		{
-			name:      "EmptyParams_Defaults",
-			params:    ListRulesParams{},
-			wantSort:  ListSortUpdatedAt,
-			wantOrder: ListOrderDesc,
-			wantLimit: DefaultListLimit,
-		},
-		{
-			name:      "ExplicitValues_Kept",
-			params:    ListRulesParams{Sort: ListSortSeverity, Order: ListOrderAsc, Limit: 50, Offset: 100},
-			wantSort:  ListSortSeverity,
-			wantOrder: ListOrderAsc,
-			wantLimit: 50,
-		},
-		{
-			name:      "OverMaxLimit_Clamped",
-			params:    ListRulesParams{Limit: MaxListLimit + 1},
-			wantSort:  ListSortUpdatedAt,
-			wantOrder: ListOrderDesc,
-			wantLimit: MaxListLimit,
-		},
-		{
-			name:    "InvalidState_Rejected",
-			params:  ListRulesParams{States: []string{"bogus"}},
-			wantErr: `invalid state "bogus"`,
-		},
-		{
-			name:    "InvalidSort_Rejected",
-			params:  ListRulesParams{Sort: ListSort{valuer.NewString("bogus")}},
-			wantErr: "invalid sort",
-		},
-		{
-			name:    "InvalidOrder_Rejected",
-			params:  ListRulesParams{Order: ListOrder{valuer.NewString("bogus")}},
-			wantErr: "invalid order",
-		},
-		{
-			name:    "NegativeLimit_Rejected",
-			params:  ListRulesParams{Limit: -1},
-			wantErr: "invalid limit",
-		},
-		{
-			name:    "NegativeOffset_Rejected",
-			params:  ListRulesParams{Offset: -1},
-			wantErr: "invalid offset",
-		},
-		{
-			name:    "OverLongQuery_Rejected",
-			params:  ListRulesParams{Query: strings.Repeat("a", MaxListQueryLen+1)},
-			wantErr: "query cannot be longer",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := tc.params.Validate()
-			if tc.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tc.wantErr)
-				return
-			}
-			require.NoError(t, err)
-			assert.Equal(t, tc.wantSort, tc.params.Sort)
-			assert.Equal(t, tc.wantOrder, tc.params.Order)
-			assert.Equal(t, tc.wantLimit, tc.params.Limit)
-		})
-	}
-}
-
-func TestListRulesParamsAlertStates(t *testing.T) {
-	testCases := []struct {
-		name       string
-		states     []string
-		wantErr    string
-		wantStates []AlertState
-	}{
-		{
-			name:       "ValidStates_ParsedToTypedValues",
-			states:     []string{"firing", "pending"},
-			wantStates: []AlertState{StateFiring, StatePending},
-		},
-		{
-			name:   "AbsentStates_NoFiltering",
-			states: nil,
-		},
-		{
-			name:    "InvalidState_Rejected",
-			states:  []string{"bogus"},
-			wantErr: `invalid state "bogus"`,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			params := ListRulesParams{States: tc.states}
-			states, err := params.GetAlertStates()
-			if tc.wantErr != "" {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), tc.wantErr)
-				return
-			}
-			require.NoError(t, err)
-			assert.Equal(t, tc.wantStates, states)
-		})
-	}
-}

pkg/types/ruletypes/listable_rule.go

@@ -1,190 +0,0 @@
-package ruletypes
-
-import (
-	"cmp"
-	"encoding/json"
-	"slices"
-	"strings"
-
-	"github.com/SigNoz/signoz/pkg/types"
-)
-
-const MaxListLabelPairs = 1000
-
-// ListableRule is the slim per-row shape of the list endpoint; the full rule stays behind get-by-id.
-type ListableRule struct {
-	Id          string            `json:"id" required:"true"`
-	State       AlertState        `json:"state" required:"true"`
-	AlertName   string            `json:"alert" required:"true"`
-	Description string            `json:"description,omitempty"`
-	AlertType   AlertType         `json:"alertType" required:"true"`
-	RuleType    RuleType          `json:"ruleType" required:"true"`
-	Disabled    bool              `json:"disabled"`
-	Labels      map[string]string `json:"labels,omitempty"`
-	types.TimeAuditable
-	types.UserAuditable
-}
-
-// storedRuleData is the subset of the persisted rule data blob the list page needs.
-type storedRuleData struct {
-	AlertName   string            `json:"alert"`
-	Description string            `json:"description"`
-	AlertType   AlertType         `json:"alertType"`
-	RuleType    RuleType          `json:"ruleType"`
-	Disabled    bool              `json:"disabled"`
-	Labels      map[string]string `json:"labels"`
-}
-
-// ToListableRule leaves State zero; the caller overlays evaluation state.
-func (rule *StorableRule) ToListableRule() (*ListableRule, error) {
-	data := storedRuleData{}
-	if err := json.Unmarshal([]byte(rule.Data), &data); err != nil {
-		return nil, err
-	}
-
-	return &ListableRule{
-		Id:            rule.ID.StringValue(),
-		AlertName:     data.AlertName,
-		Description:   data.Description,
-		AlertType:     data.AlertType,
-		RuleType:      data.RuleType,
-		Disabled:      data.Disabled,
-		Labels:        data.Labels,
-		TimeAuditable: rule.TimeAuditable,
-		UserAuditable: rule.UserAuditable,
-	}, nil
-}
-
-// NewListableRulesFromStorableRules converts rows, overlays evaluation state (absent means
-// disabled) and applies the state filter; corrupt rows come back keyed by rule id for the
-// caller to log.
-func NewListableRulesFromStorableRules(storedRules []*StorableRule, stateByRuleID map[string]AlertState, stateFilter map[AlertState]struct{}) ([]*ListableRule, map[string]error) {
-	listableRules := make([]*ListableRule, 0, len(storedRules))
-	errByRuleID := make(map[string]error)
-
-	for _, rule := range storedRules {
-		listable, err := rule.ToListableRule()
-		if err != nil {
-			errByRuleID[rule.ID.StringValue()] = err
-			continue
-		}
-
-		if state, ok := stateByRuleID[listable.Id]; ok {
-			listable.State = state
-		} else {
-			listable.State = StateDisabled
-			listable.Disabled = true
-		}
-		if len(stateFilter) > 0 {
-			if _, ok := stateFilter[listable.State]; !ok {
-				continue
-			}
-		}
-
-		listableRules = append(listableRules, listable)
-	}
-
-	return listableRules, errByRuleID
-}
-
-// LabelPair is one distinct label key/value observed on the org's rules.
-type LabelPair struct {
-	Key   string `json:"key" required:"true"`
-	Value string `json:"value" required:"true"`
-}
-
-type ListableRules struct {
-	Rules            []*ListableRule `json:"rules" required:"true" nullable:"false"`
-	Total            int64           `json:"total" required:"true"`
-	Labels           []LabelPair     `json:"labels" required:"true" nullable:"false"`
-	ReservedKeywords []DSLKey        `json:"reservedKeywords" required:"true" nullable:"false"`
-}
-
-func NewListableRules(rules []*ListableRule, total int64, labels []LabelPair) *ListableRules {
-	return &ListableRules{
-		Rules:            rules,
-		Total:            total,
-		Labels:           labels,
-		ReservedKeywords: ReservedFilterKeys(),
-	}
-}
-
-var severityDisplayRank = map[string]int{
-	"critical": 4,
-	"error":    3,
-	"warning":  2,
-	"info":     1,
-}
-
-// Ties break on name then id ascending (order applies to the primary key only) so pages stay stable.
-func SortListableRules(rules []*ListableRule, sortBy ListSort, order ListOrder) {
-	direction := 1
-	if order == ListOrderDesc {
-		direction = -1
-	}
-	slices.SortStableFunc(rules, func(a, b *ListableRule) int {
-		if c := direction * compareListableRules(a, b, sortBy); c != 0 {
-			return c
-		}
-		if c := strings.Compare(strings.ToLower(a.AlertName), strings.ToLower(b.AlertName)); c != 0 {
-			return c
-		}
-		return strings.Compare(a.Id, b.Id)
-	})
-}
-
-func compareListableRules(a, b *ListableRule, sortBy ListSort) int {
-	switch sortBy {
-	case ListSortName:
-		return strings.Compare(strings.ToLower(a.AlertName), strings.ToLower(b.AlertName))
-	case ListSortCreatedAt:
-		return a.CreatedAt.Compare(b.CreatedAt)
-	case ListSortState:
-		return cmp.Compare(a.State.DisplayRank(), b.State.DisplayRank())
-	case ListSortSeverity:
-		severityA := a.Labels["severity"]
-		severityB := b.Labels["severity"]
-		rankA := severityDisplayRank[strings.ToLower(severityA)]
-		rankB := severityDisplayRank[strings.ToLower(severityB)]
-		if rankA != rankB {
-			return cmp.Compare(rankA, rankB)
-		}
-		if rankA == 0 {
-			return strings.Compare(strings.ToLower(severityA), strings.ToLower(severityB))
-		}
-		return 0
-	}
-	return a.UpdatedAt.Compare(b.UpdatedAt)
-}
-
-// NewLabelPairsFromRawJSON skips blank or malformed entries and caps the result at limit.
-func NewLabelPairsFromRawJSON(raws []string, limit int) []LabelPair {
-	set := make(map[LabelPair]struct{})
-	for _, raw := range raws {
-		if raw == "" || raw == "null" {
-			continue
-		}
-		labels := make(map[string]string)
-		if err := json.Unmarshal([]byte(raw), &labels); err != nil {
-			continue
-		}
-		for key, value := range labels {
-			set[LabelPair{Key: key, Value: value}] = struct{}{}
-		}
-	}
-
-	pairs := make([]LabelPair, 0, len(set))
-	for pair := range set {
-		pairs = append(pairs, pair)
-	}
-	slices.SortFunc(pairs, func(a, b LabelPair) int {
-		if c := strings.Compare(a.Key, b.Key); c != 0 {
-			return c
-		}
-		return strings.Compare(a.Value, b.Value)
-	})
-	if len(pairs) > limit {
-		pairs = pairs[:limit]
-	}
-	return pairs
-}

pkg/types/ruletypes/listable_rule_test.go

@@ -1,261 +0,0 @@
-package ruletypes
-
-import (
-	"testing"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func listableRule(name string, state AlertState, severity string, updatedAt time.Time) *ListableRule {
-	rule := &ListableRule{
-		AlertName: name,
-		State:     state,
-		TimeAuditable: types.TimeAuditable{
-			UpdatedAt: updatedAt,
-		},
-	}
-	if severity != "" {
-		rule.Labels = map[string]string{"severity": severity}
-	}
-	return rule
-}
-
-func names(rules []*ListableRule) []string {
-	out := make([]string, 0, len(rules))
-	for _, rule := range rules {
-		out = append(out, rule.AlertName)
-	}
-	return out
-}
-
-func TestToListableRule(t *testing.T) {
-	created := time.Date(2026, 8, 1, 0, 0, 0, 0, time.UTC)
-	updated := time.Date(2026, 9, 1, 0, 0, 0, 0, time.UTC)
-
-	storable := &StorableRule{
-		Identifiable:  types.Identifiable{ID: valuer.GenerateUUID()},
-		TimeAuditable: types.TimeAuditable{CreatedAt: created, UpdatedAt: updated},
-		UserAuditable: types.UserAuditable{CreatedBy: "creator@signoz.io", UpdatedBy: "updater@signoz.io"},
-		Data:          `{"alert":"High CPU","description":"cpu is hot","alertType":"METRIC_BASED_ALERT","ruleType":"threshold_rule","disabled":true,"labels":{"severity":"critical"}}`,
-	}
-
-	listable, err := storable.ToListableRule()
-	require.NoError(t, err)
-
-	assert.Equal(t, storable.ID.StringValue(), listable.Id)
-	assert.Equal(t, "High CPU", listable.AlertName)
-	assert.Equal(t, "cpu is hot", listable.Description)
-	assert.Equal(t, AlertTypeMetric, listable.AlertType)
-	assert.Equal(t, RuleTypeThreshold, listable.RuleType)
-	assert.True(t, listable.Disabled)
-	assert.Equal(t, map[string]string{"severity": "critical"}, listable.Labels)
-	assert.Equal(t, created, listable.CreatedAt)
-	assert.Equal(t, "creator@signoz.io", listable.CreatedBy)
-	assert.Equal(t, updated, listable.UpdatedAt)
-	assert.Equal(t, "updater@signoz.io", listable.UpdatedBy)
-	assert.True(t, listable.State.IsZero())
-
-	_, err = (&StorableRule{Data: "not json"}).ToListableRule()
-	assert.Error(t, err)
-}
-
-func TestNewListableRulesFromStorableRules(t *testing.T) {
-	enabledID := valuer.GenerateUUID()
-	pausedID := valuer.GenerateUUID()
-	corruptID := valuer.GenerateUUID()
-
-	storedRules := []*StorableRule{
-		{
-			Identifiable: types.Identifiable{ID: enabledID},
-			Data:         `{"alert":"cpu high","alertType":"METRIC_BASED_ALERT","ruleType":"threshold_rule"}`,
-		},
-		{
-			Identifiable: types.Identifiable{ID: pausedID},
-			Data:         `{"alert":"mem high","alertType":"METRIC_BASED_ALERT","ruleType":"threshold_rule","disabled":true}`,
-		},
-		{
-			Identifiable: types.Identifiable{ID: corruptID},
-			Data:         "not json",
-		},
-	}
-	stateByRuleID := map[string]AlertState{enabledID.StringValue(): StateFiring}
-
-	testCases := []struct {
-		name        string
-		stateFilter map[AlertState]struct{}
-		wantNames   []string
-		wantStates  map[string]AlertState
-	}{
-		{
-			name:       "NoFilter_KeepsAllParseableRows",
-			wantNames:  []string{"cpu high", "mem high"},
-			wantStates: map[string]AlertState{"cpu high": StateFiring, "mem high": StateDisabled},
-		},
-		{
-			name:        "FiringFilter_KeepsOverlaidState",
-			stateFilter: map[AlertState]struct{}{StateFiring: {}},
-			wantNames:   []string{"cpu high"},
-			wantStates:  map[string]AlertState{"cpu high": StateFiring},
-		},
-		{
-			name:        "DisabledFilter_KeepsAbsentFromSnapshot",
-			stateFilter: map[AlertState]struct{}{StateDisabled: {}},
-			wantNames:   []string{"mem high"},
-			wantStates:  map[string]AlertState{"mem high": StateDisabled},
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			listableRules, errByRuleID := NewListableRulesFromStorableRules(storedRules, stateByRuleID, testCase.stateFilter)
-
-			require.Len(t, errByRuleID, 1)
-			assert.Error(t, errByRuleID[corruptID.StringValue()])
-
-			assert.Equal(t, testCase.wantNames, names(listableRules))
-			for _, rule := range listableRules {
-				assert.Equal(t, testCase.wantStates[rule.AlertName], rule.State)
-			}
-		})
-	}
-
-	disabledRow, _ := NewListableRulesFromStorableRules(storedRules[1:2], stateByRuleID, nil)
-	require.Len(t, disabledRow, 1)
-	assert.True(t, disabledRow[0].Disabled)
-}
-
-func TestSortListableRules(t *testing.T) {
-	base := time.Date(2026, 9, 1, 0, 0, 0, 0, time.UTC)
-
-	testCases := []struct {
-		name      string
-		rules     []*ListableRule
-		sortBy    ListSort
-		order     ListOrder
-		wantNames []string
-	}{
-		{
-			name: "StateDesc_DisplayPriority_FiringFirst",
-			rules: []*ListableRule{
-				listableRule("disabled", StateDisabled, "", base),
-				listableRule("nodata", StateNoData, "", base),
-				listableRule("firing", StateFiring, "", base),
-				listableRule("inactive", StateInactive, "", base),
-				listableRule("pending", StatePending, "", base),
-				listableRule("recovering", StateRecovering, "", base),
-			},
-			sortBy:    ListSortState,
-			order:     ListOrderDesc,
-			wantNames: []string{"firing", "nodata", "pending", "recovering", "inactive", "disabled"},
-		},
-		{
-			name: "SeverityDesc_KnownRanksThenCustomLexical",
-			rules: []*ListableRule{
-				listableRule("warn", StateInactive, "warning", base),
-				listableRule("custom-b", StateInactive, "bbb", base),
-				listableRule("crit", StateInactive, "critical", base),
-				listableRule("custom-a", StateInactive, "aaa", base),
-				listableRule("none", StateInactive, "", base),
-			},
-			sortBy: ListSortSeverity,
-			order:  ListOrderDesc,
-			// desc flips the lexical compare between custom values too
-			wantNames: []string{"crit", "warn", "custom-b", "custom-a", "none"},
-		},
-		{
-			name: "NameAsc_CaseInsensitive",
-			rules: []*ListableRule{
-				listableRule("banana", StateInactive, "", base),
-				listableRule("Apple", StateInactive, "", base),
-				listableRule("cherry", StateInactive, "", base),
-			},
-			sortBy:    ListSortName,
-			order:     ListOrderAsc,
-			wantNames: []string{"Apple", "banana", "cherry"},
-		},
-		{
-			name: "UpdatedAtDesc_NewestFirst",
-			rules: []*ListableRule{
-				listableRule("old", StateInactive, "", base),
-				listableRule("new", StateInactive, "", base.Add(time.Hour)),
-			},
-			sortBy:    ListSortUpdatedAt,
-			order:     ListOrderDesc,
-			wantNames: []string{"new", "old"},
-		},
-		{
-			name: "StateDescTies_BreakOnNameAsc",
-			rules: []*ListableRule{
-				listableRule("banana", StateFiring, "", base),
-				listableRule("zebra", StateDisabled, "", base),
-				listableRule("Apple", StateFiring, "", base),
-				listableRule("cherry", StateFiring, "", base),
-			},
-			sortBy:    ListSortState,
-			order:     ListOrderDesc,
-			wantNames: []string{"Apple", "banana", "cherry", "zebra"},
-		},
-		{
-			name: "StateAsc_FlipsBuckets_TiebreakNameAsc",
-			rules: []*ListableRule{
-				listableRule("banana", StateFiring, "", base),
-				listableRule("zebra", StateDisabled, "", base),
-				listableRule("Apple", StateFiring, "", base),
-				listableRule("cherry", StateFiring, "", base),
-			},
-			sortBy:    ListSortState,
-			order:     ListOrderAsc,
-			wantNames: []string{"zebra", "Apple", "banana", "cherry"},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			SortListableRules(tc.rules, tc.sortBy, tc.order)
-			assert.Equal(t, tc.wantNames, names(tc.rules))
-		})
-	}
-}
-
-func TestSortListableRulesIdTiebreak(t *testing.T) {
-	base := time.Date(2026, 9, 1, 0, 0, 0, 0, time.UTC)
-
-	for _, order := range []ListOrder{ListOrderAsc, ListOrderDesc} {
-		t.Run(order.StringValue(), func(t *testing.T) {
-			older := listableRule("dup", StateFiring, "", base)
-			older.Id = "01aaa"
-			newer := listableRule("dup", StateFiring, "", base)
-			newer.Id = "01bbb"
-
-			rules := []*ListableRule{newer, older}
-			SortListableRules(rules, ListSortState, order)
-			assert.Equal(t, []string{"01aaa", "01bbb"}, []string{rules[0].Id, rules[1].Id})
-		})
-	}
-}
-
-func TestNewLabelPairsFromRawJSON(t *testing.T) {
-	pairs := NewLabelPairsFromRawJSON([]string{
-		`{"team":"infra","severity":"critical"}`,
-		`{"team":"infra"}`,
-		`{"team":"payments"}`,
-		"",
-		"null",
-		"not-json",
-	}, MaxListLabelPairs)
-
-	assert.Equal(t, []LabelPair{
-		{Key: "severity", Value: "critical"},
-		{Key: "team", Value: "infra"},
-		{Key: "team", Value: "payments"},
-	}, pairs)
-}
-
-func TestNewLabelPairsFromRawJSONCap(t *testing.T) {
-	pairs := NewLabelPairsFromRawJSON([]string{`{"a":"1","b":"2","c":"3"}`}, 2)
-	assert.Len(t, pairs, 2)
-}

pkg/types/ruletypes/rule.go

@@ -11,8 +11,7 @@ import (
 )
 
 type StorableRule struct {
-	// The alias must stay rule: the list filter compiler emits rule.<col> refs.
-	bun.BaseModel `bun:"table:rule,alias:rule"`
+	bun.BaseModel `bun:"table:rule"`
 	types.Identifiable
 	types.TimeAuditable
 	types.UserAuditable
@@ -59,10 +58,6 @@ type RuleStore interface {
 	EditRule(context.Context, *StorableRule, func(context.Context) error) error
 	DeleteRule(context.Context, valuer.UUID, valuer.UUID, func(context.Context) error) error
 	GetStoredRules(context.Context, string) ([]*StorableRule, error)
-	// GetStoredRulesMatching returns the org's rules matching a compiled filter clause; an empty clause matches all.
-	GetStoredRulesMatching(context.Context, string, string, []any) ([]*StorableRule, error)
-	// GetStoredRuleLabels returns each rule's labels as raw JSON text, empty string when absent.
-	GetStoredRuleLabels(context.Context, string) ([]string, error)
 	GetStoredRule(context.Context, valuer.UUID, valuer.UUID) (*StorableRule, error)
 	GetStoredRulesByMetricName(context.Context, string, string) ([]RuleAlert, error)
 }

pkg/types/telemetrytypes/field.go

@@ -218,12 +218,6 @@ func FieldKeyToMaterializedColumnNameForExists(key *TelemetryFieldKey) string {
 	))
 }
 
-// FieldKeyToMaterializedExistsCondition compares the exists column explicitly: a bare bool
-// column defeats skip-index pruning across OR.
-func FieldKeyToMaterializedExistsCondition(key *TelemetryFieldKey, exists bool) string {
-	return fmt.Sprintf("%s = %t", FieldKeyToMaterializedColumnNameForExists(key), exists)
-}
-
 type TelemetryFieldValues struct {
 	StringValues  []string  `json:"stringValues,omitempty"`
 	BoolValues    []bool    `json:"boolValues,omitempty"`

tests/fixtures/alerts.py

@@ -88,40 +88,6 @@ def create_alert_rule_with_channel(
     return _create_alert_rule_with_channel
 
 
-def delete_all_rules(signoz: types.SigNoz, token: str) -> None:
-    response = requests.get(
-        signoz.self.host_configs["8080"].get("/api/v2/rules"),
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-    assert response.status_code == HTTPStatus.OK
-    for rule in response.json()["data"]:
-        delete_response = requests.delete(
-            signoz.self.host_configs["8080"].get(f"/api/v1/rules/{rule['id']}"),
-            headers={"Authorization": f"Bearer {token}"},
-            timeout=5,
-        )
-        assert delete_response.status_code == HTTPStatus.OK, f"failed to delete rule {rule['id']}: {delete_response.text}"
-
-
-@pytest.fixture(name="seed_alert_rules", scope="function")
-def seed_alert_rules(
-    signoz: types.SigNoz,
-    get_token: Callable[[str, str], str],
-    create_notification_channel: Callable[[dict], str],
-    create_alert_rule: Callable[[dict], str],
-) -> Callable[[dict, list[dict]], None]:
-    admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    def _seed_alert_rules(channel_config: dict, rules: list[dict]) -> None:
-        delete_all_rules(signoz, admin_token)
-        create_notification_channel(channel_config)
-        for rule in rules:
-            create_alert_rule(rule)
-
-    return _seed_alert_rules
-
-
 def labels_to_map(labels: list[dict]) -> dict[str, str]:
     """Converts the label list shape of the v2 rule history APIs to a plain map."""
     return {label["key"]["name"]: label["value"] for label in labels or []}

tests/integration/tests/alerts/06_list_rules_v3.py

@@ -1,596 +0,0 @@
-from collections.abc import Callable
-from http import HTTPStatus
-
-import requests
-
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.types import Operation, SigNoz
-
-BASE_URL = "/api/v3/rules"
-
-SEED_CHANNEL = {"name": "list-rules-v3-channel", "email_configs": [{"to": "list-rules-v3@integration.test"}]}
-
-EVALUATION = {"kind": "rolling", "spec": {"evalWindow": "5m0s", "frequency": "1m"}}
-
-NOTIFICATION_SETTINGS = {
-    "groupBy": [],
-    "usePolicy": False,
-    "renotify": {"enabled": False, "interval": "30m", "alertStates": []},
-}
-
-METRIC_CONDITION = {
-    "thresholds": {
-        "kind": "basic",
-        "spec": [{"name": "critical", "target": 90, "matchType": "at_least_once", "op": "above", "channels": ["list-rules-v3-channel"]}],
-    },
-    "compositeQuery": {
-        "queryType": "builder",
-        "panelType": "graph",
-        "queries": [
-            {
-                "type": "builder_query",
-                "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "aggregations": [{"metricName": "list_rules_v3_cpu", "timeAggregation": "avg", "spaceAggregation": "max"}],
-                },
-            }
-        ],
-    },
-    "selectedQueryName": "A",
-}
-
-LOGS_CONDITION = {
-    "thresholds": {
-        "kind": "basic",
-        "spec": [{"name": "critical", "target": 100, "matchType": "at_least_once", "op": "above", "channels": ["list-rules-v3-channel"]}],
-    },
-    "compositeQuery": {
-        "queryType": "builder",
-        "panelType": "graph",
-        "queries": [
-            {
-                "type": "builder_query",
-                "spec": {
-                    "name": "A",
-                    "signal": "logs",
-                    "aggregations": [{"expression": "count()"}],
-                    "filter": {"expression": ""},
-                },
-            }
-        ],
-    },
-    "selectedQueryName": "A",
-}
-
-PROMQL_CONDITION = {
-    "thresholds": {
-        "kind": "basic",
-        "spec": [{"name": "critical", "target": 1, "matchType": "at_least_once", "op": "below", "channels": ["list-rules-v3-channel"]}],
-    },
-    "compositeQuery": {
-        "queryType": "promql",
-        "panelType": "graph",
-        "queries": [{"type": "promql", "spec": {"name": "A", "query": '{"list_rules_v3_up"}'}}],
-    },
-    "selectedQueryName": "A",
-}
-
-SEED_RULES = [
-    {
-        "alert": "payment latency high",
-        "description": "p99 latency guard",
-        "alertType": "METRIC_BASED_ALERT",
-        "ruleType": "threshold_rule",
-        "condition": METRIC_CONDITION,
-        "labels": {"severity": "critical", "team": "payments", "k8s.cluster": "prod-1"},
-        "annotations": {"summary": "s", "description": "d"},
-        "evaluation": EVALUATION,
-        "notificationSettings": NOTIFICATION_SETTINGS,
-        "version": "v5",
-        "schemaVersion": "v2alpha1",
-    },
-    {
-        "alert": "payment gateway errors",
-        "description": "error rate watch",
-        "alertType": "LOGS_BASED_ALERT",
-        "ruleType": "threshold_rule",
-        "condition": LOGS_CONDITION,
-        "labels": {"severity": "warning", "team": "payments"},
-        "annotations": {"summary": "s", "description": "d"},
-        "evaluation": EVALUATION,
-        "notificationSettings": NOTIFICATION_SETTINGS,
-        "version": "v5",
-        "schemaVersion": "v2alpha1",
-    },
-    {
-        "alert": "checkout conversion drop",
-        "description": "funnel watcher",
-        "alertType": "METRIC_BASED_ALERT",
-        "ruleType": "threshold_rule",
-        "condition": METRIC_CONDITION,
-        "labels": {"severity": "important", "team": "checkout"},
-        "annotations": {"summary": "s", "description": "d"},
-        "disabled": True,
-        "evaluation": EVALUATION,
-        "notificationSettings": NOTIFICATION_SETTINGS,
-        "version": "v5",
-        "schemaVersion": "v2alpha1",
-    },
-    {
-        "alert": "infra cpu saturation",
-        "description": "node headroom",
-        "alertType": "METRIC_BASED_ALERT",
-        "ruleType": "threshold_rule",
-        "condition": METRIC_CONDITION,
-        "labels": {"team": "infra"},
-        "annotations": {"summary": "s", "description": "d"},
-        "evaluation": EVALUATION,
-        "notificationSettings": NOTIFICATION_SETTINGS,
-        "version": "v5",
-        "schemaVersion": "v2alpha1",
-    },
-    {
-        "alert": "prom uptime probe",
-        "description": "blackbox liveness",
-        "alertType": "METRIC_BASED_ALERT",
-        "ruleType": "promql_rule",
-        "condition": PROMQL_CONDITION,
-        "labels": {},
-        "annotations": {"summary": "s", "description": "d"},
-        "evaluation": EVALUATION,
-        "notificationSettings": NOTIFICATION_SETTINGS,
-        "version": "v5",
-        "schemaVersion": "v2alpha1",
-    },
-]
-
-# Labels deliberately collide with reserved DSL keys (name, state) for the collision tests.
-COLLIDER_RULE = {
-    "alert": "ops shadow rule",
-    "description": "collision fixture",
-    "alertType": "METRIC_BASED_ALERT",
-    "ruleType": "threshold_rule",
-    "condition": METRIC_CONDITION,
-    "labels": {"name": "runbook", "state": "managed", "team": "ops"},
-    "annotations": {"summary": "s", "description": "d"},
-    "evaluation": EVALUATION,
-    "notificationSettings": NOTIFICATION_SETTINGS,
-    "version": "v5",
-    "schemaVersion": "v2alpha1",
-}
-
-RESERVED_KEYWORDS = [
-    "alert_type",
-    "created_at",
-    "created_by",
-    "labels.<key>",
-    "name",
-    "rule_type",
-    "severity",
-    "updated_at",
-    "updated_by",
-]
-
-
-def test_envelope_and_slim_rows(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    seed_alert_rules: Callable[[dict, list[dict]], None],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    seed_alert_rules(SEED_CHANNEL, SEED_RULES)
-
-    response = requests.get(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.OK
-    data = response.json()["data"]
-
-    assert data["total"] == 5
-    assert len(data["rules"]) == 5
-    assert data["reservedKeywords"] == RESERVED_KEYWORDS
-
-    label_pairs = [(pair["key"], pair["value"]) for pair in data["labels"]]
-    assert label_pairs == sorted(label_pairs), "label pairs must be sorted by key then value"
-    for expected_pair in [
-        ("k8s.cluster", "prod-1"),
-        ("severity", "critical"),
-        ("severity", "important"),
-        ("severity", "warning"),
-        ("team", "checkout"),
-        ("team", "infra"),
-        ("team", "payments"),
-    ]:
-        assert expected_pair in label_pairs, f"missing label pair {expected_pair}"
-
-    by_name = {rule["alert"]: rule for rule in data["rules"]}
-    assert set(by_name) == {r["alert"] for r in SEED_RULES}
-
-    for rule in data["rules"]:
-        for forbidden_field in ("condition", "annotations", "notificationSettings", "evaluation", "source", "version", "schemaVersion"):
-            assert forbidden_field not in rule, f"slim row leaked {forbidden_field}"
-        for required_field in ("id", "state", "alert", "alertType", "ruleType", "createdAt", "updatedAt"):
-            assert required_field in rule, f"slim row missing {required_field}"
-        assert rule["createdBy"] == USER_ADMIN_EMAIL
-        assert rule["updatedBy"] == USER_ADMIN_EMAIL
-
-    assert by_name["checkout conversion drop"]["state"] == "disabled"
-    assert by_name["checkout conversion drop"]["disabled"] is True
-    assert by_name["payment latency high"]["state"] == "inactive"
-    assert by_name["payment latency high"]["description"] == "p99 latency guard"
-    assert by_name["payment latency high"]["labels"] == {"severity": "critical", "team": "payments", "k8s.cluster": "prod-1"}
-    assert by_name["payment gateway errors"]["alertType"] == "LOGS_BASED_ALERT"
-    assert by_name["prom uptime probe"]["ruleType"] == "promql_rule"
-
-
-def test_query_filters(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    seed_alert_rules: Callable[[dict, list[dict]], None],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    seed_alert_rules(SEED_CHANNEL, SEED_RULES)
-
-    cases = [
-        ("name = 'payment latency high'", {"payment latency high"}),
-        ("name CONTAINS 'payment'", {"payment latency high", "payment gateway errors"}),
-        # free text goes through LOWER() on both dialects, so a case mismatch must still match
-        ("PAYMENT", {"payment latency high", "payment gateway errors"}),
-        # free text also matches the description field
-        ("blackbox", {"prom uptime probe"}),
-        (f"created_by = '{USER_ADMIN_EMAIL}'", {r["alert"] for r in SEED_RULES}),
-        ("created_at >= '2020-01-01T00:00:00Z'", {r["alert"] for r in SEED_RULES}),
-        ("created_at < '2020-01-01T00:00:00Z'", set()),
-        ("alert_type = 'LOGS_BASED_ALERT'", {"payment gateway errors"}),
-        ("rule_type = 'promql_rule'", {"prom uptime probe"}),
-        ("rule_type IN ['threshold_rule']", {"payment latency high", "payment gateway errors", "checkout conversion drop", "infra cpu saturation"}),
-        ("labels.team = 'payments'", {"payment latency high", "payment gateway errors"}),
-        ("labels.k8s.cluster = 'prod-1'", {"payment latency high"}),
-        ("labels.team EXISTS", {"payment latency high", "payment gateway errors", "checkout conversion drop", "infra cpu saturation"}),
-        ("labels.team NOT EXISTS", {"prom uptime probe"}),
-        ("NOT (labels.team EXISTS)", {"prom uptime probe"}),
-        (
-            "(labels.team = 'payments' OR labels.team = 'infra') AND name NOT CONTAINS 'gateway'",
-            {"payment latency high", "infra cpu saturation"},
-        ),
-    ]
-
-    for query, expected_names in cases:
-        response = requests.get(
-            signoz.self.host_configs["8080"].get(BASE_URL),
-            params={"query": query},
-            headers={"Authorization": f"Bearer {token}"},
-            timeout=5,
-        )
-        assert response.status_code == HTTPStatus.OK, f"query {query!r}: {response.text}"
-        data = response.json()["data"]
-        assert {rule["alert"] for rule in data["rules"]} == expected_names, f"query {query!r}"
-        assert data["total"] == len(expected_names), f"query {query!r}: total mismatch"
-
-
-def test_bare_and_collision_keys(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    seed_alert_rules: Callable[[dict, list[dict]], None],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    seed_alert_rules(SEED_CHANNEL, SEED_RULES + [COLLIDER_RULE])
-
-    cases = [
-        # a bare non-reserved key is a label lookup, no labels. prefix needed
-        ("team = 'infra'", {"infra cpu saturation"}),
-        ("team = 'payments'", {"payment latency high", "payment gateway errors"}),
-        ("team EXISTS", {"payment latency high", "payment gateway errors", "checkout conversion drop", "infra cpu saturation", "ops shadow rule"}),
-        # bare label keys stay case-sensitive
-        ("Team = 'infra'", set()),
-        # state is not reserved, so it reads the rule's state label, not the evaluation state
-        ("state = 'managed'", {"ops shadow rule"}),
-        # a reserved key matches the reserved field or a same-named label
-        ("name = 'payment latency high'", {"payment latency high"}),
-        ("name CONTAINS 'runbook'", {"ops shadow rule"}),
-        # a negative operator must exclude both interpretations
-        ("name != 'runbook'", {r["alert"] for r in SEED_RULES}),
-        # the labels. prefix targets only the label on a collision
-        ("labels.name = 'runbook'", {"ops shadow rule"}),
-    ]
-
-    for query, expected_names in cases:
-        response = requests.get(
-            signoz.self.host_configs["8080"].get(BASE_URL),
-            params={"query": query},
-            headers={"Authorization": f"Bearer {token}"},
-            timeout=5,
-        )
-        assert response.status_code == HTTPStatus.OK, f"query {query!r}: {response.text}"
-        data = response.json()["data"]
-        assert {rule["alert"] for rule in data["rules"]} == expected_names, f"query {query!r}"
-        assert data["total"] == len(expected_names), f"query {query!r}: total mismatch"
-
-
-def test_label_missing_semantics(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    seed_alert_rules: Callable[[dict, list[dict]], None],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    seed_alert_rules(SEED_CHANNEL, SEED_RULES)
-
-    # A missing label uniformly evaluates as the empty string for value
-    # operators; presence is expressed with EXISTS / NOT EXISTS.
-    cases = [
-        ("severity = ''", {"infra cpu saturation", "prom uptime probe"}),
-        ("severity != ''", {"payment latency high", "payment gateway errors", "checkout conversion drop"}),
-        ("severity != 'critical'", {"payment gateway errors", "checkout conversion drop", "infra cpu saturation", "prom uptime probe"}),
-        ("severity EXISTS", {"payment latency high", "payment gateway errors", "checkout conversion drop"}),
-        ("severity NOT EXISTS", {"infra cpu saturation", "prom uptime probe"}),
-        ("severity = 'critical'", {"payment latency high"}),
-        ("severity IN ['critical', 'warning']", {"payment latency high", "payment gateway errors"}),
-        ("labels.team != 'payments'", {"checkout conversion drop", "infra cpu saturation", "prom uptime probe"}),
-        ("labels.team NOT IN ['payments']", {"checkout conversion drop", "infra cpu saturation", "prom uptime probe"}),
-        ("labels.team NOT CONTAINS 'pay'", {"checkout conversion drop", "infra cpu saturation", "prom uptime probe"}),
-    ]
-
-    for query, expected_names in cases:
-        response = requests.get(
-            signoz.self.host_configs["8080"].get(BASE_URL),
-            params={"query": query},
-            headers={"Authorization": f"Bearer {token}"},
-            timeout=5,
-        )
-        assert response.status_code == HTTPStatus.OK, f"query {query!r}: {response.text}"
-        data = response.json()["data"]
-        assert {rule["alert"] for rule in data["rules"]} == expected_names, f"query {query!r}"
-        assert data["total"] == len(expected_names), f"query {query!r}: total mismatch"
-
-
-def test_states_param(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    seed_alert_rules: Callable[[dict, list[dict]], None],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    seed_alert_rules(SEED_CHANNEL, SEED_RULES)
-
-    # No telemetry is seeded, so enabled rules sit at inactive and the one
-    # disabled rule reads disabled, deterministic without waiting on evals.
-    cases = [
-        ({"states": ["disabled"]}, {"checkout conversion drop"}),
-        ({"states": ["inactive"]}, {"payment latency high", "payment gateway errors", "infra cpu saturation", "prom uptime probe"}),
-        ({"states": ["inactive", "disabled"]}, {r["alert"] for r in SEED_RULES}),
-        ({"states": ["firing"]}, set()),
-        ({"states": ["disabled"], "query": "labels.team = 'checkout'"}, {"checkout conversion drop"}),
-        ({"states": ["disabled"], "query": "labels.team = 'payments'"}, set()),
-    ]
-
-    for params, expected_names in cases:
-        response = requests.get(
-            signoz.self.host_configs["8080"].get(BASE_URL),
-            params=params,
-            headers={"Authorization": f"Bearer {token}"},
-            timeout=5,
-        )
-        assert response.status_code == HTTPStatus.OK, f"params {params!r}: {response.text}"
-        data = response.json()["data"]
-        assert {rule["alert"] for rule in data["rules"]} == expected_names, f"params {params!r}"
-        assert data["total"] == len(expected_names), f"params {params!r}: total mismatch"
-
-
-def test_sorting(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    seed_alert_rules: Callable[[dict, list[dict]], None],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    seed_alert_rules(SEED_CHANNEL, SEED_RULES)
-
-    response = requests.get(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        params={"sort": "name", "order": "asc"},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-    assert response.status_code == HTTPStatus.OK
-    assert [rule["alert"] for rule in response.json()["data"]["rules"]] == [
-        "checkout conversion drop",
-        "infra cpu saturation",
-        "payment gateway errors",
-        "payment latency high",
-        "prom uptime probe",
-    ]
-
-    # state display priority: inactive (rank 1) outranks disabled (rank 0);
-    # the four inactive rules tie on state and must break on name asc
-    response = requests.get(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        params={"sort": "state", "order": "desc"},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-    assert response.status_code == HTTPStatus.OK
-    assert [rule["alert"] for rule in response.json()["data"]["rules"]] == [
-        "infra cpu saturation",
-        "payment gateway errors",
-        "payment latency high",
-        "prom uptime probe",
-        "checkout conversion drop",
-    ]
-
-    # asc flips the state buckets but the name tiebreak stays ascending
-    response = requests.get(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        params={"sort": "state", "order": "asc"},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-    assert response.status_code == HTTPStatus.OK
-    assert [rule["alert"] for rule in response.json()["data"]["rules"]] == [
-        "checkout conversion drop",
-        "infra cpu saturation",
-        "payment gateway errors",
-        "payment latency high",
-        "prom uptime probe",
-    ]
-
-    # severity: known ranks first (critical > warning), then custom values
-    # lexically, then rules without severity tie and break on name asc
-    response = requests.get(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        params={"sort": "severity", "order": "desc"},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-    assert response.status_code == HTTPStatus.OK
-    assert [rule["alert"] for rule in response.json()["data"]["rules"]] == [
-        "payment latency high",
-        "payment gateway errors",
-        "checkout conversion drop",
-        "infra cpu saturation",
-        "prom uptime probe",
-    ]
-
-    for order in ("asc", "desc"):
-        response = requests.get(
-            signoz.self.host_configs["8080"].get(BASE_URL),
-            params={"sort": "created_at", "order": order},
-            headers={"Authorization": f"Bearer {token}"},
-            timeout=5,
-        )
-        assert response.status_code == HTTPStatus.OK
-        created_ats = [rule["createdAt"] for rule in response.json()["data"]["rules"]]
-        assert created_ats == sorted(created_ats, reverse=order == "desc"), f"created_at {order} not monotonic"
-
-
-def test_pagination(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    seed_alert_rules: Callable[[dict, list[dict]], None],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    seed_alert_rules(SEED_CHANNEL, SEED_RULES)
-
-    pages = []
-    for offset in (0, 2, 4):
-        response = requests.get(
-            signoz.self.host_configs["8080"].get(BASE_URL),
-            params={"sort": "name", "order": "asc", "limit": 2, "offset": offset},
-            headers={"Authorization": f"Bearer {token}"},
-            timeout=5,
-        )
-        assert response.status_code == HTTPStatus.OK
-        data = response.json()["data"]
-        assert data["total"] == 5, f"offset {offset}: total must stay the full filtered count"
-        pages.append([rule["alert"] for rule in data["rules"]])
-
-    assert [len(page) for page in pages] == [2, 2, 1]
-    flattened = [name for page in pages for name in page]
-    assert len(flattened) == len(set(flattened)), "pages must be disjoint"
-    assert set(flattened) == {r["alert"] for r in SEED_RULES}
-
-    # state sort is almost all ties (four inactive rules); the name/id tiebreak
-    # must keep the pages disjoint and in the same order on every request
-    tie_pages = []
-    for offset in (0, 2, 4):
-        response = requests.get(
-            signoz.self.host_configs["8080"].get(BASE_URL),
-            params={"sort": "state", "order": "desc", "limit": 2, "offset": offset},
-            headers={"Authorization": f"Bearer {token}"},
-            timeout=5,
-        )
-        assert response.status_code == HTTPStatus.OK
-        tie_pages.append([rule["alert"] for rule in response.json()["data"]["rules"]])
-
-    assert [name for page in tie_pages for name in page] == [
-        "infra cpu saturation",
-        "payment gateway errors",
-        "payment latency high",
-        "prom uptime probe",
-        "checkout conversion drop",
-    ], "tied rows must not shuffle between page requests"
-
-    # a past-the-end offset returns an empty page but keeps the real total
-    response = requests.get(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        params={"limit": 2, "offset": 50},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-    assert response.status_code == HTTPStatus.OK
-    data = response.json()["data"]
-    assert data["rules"] == []
-    assert data["total"] == 5
-
-    # an over-max limit is clamped, not rejected
-    response = requests.get(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        params={"limit": 6000},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-    assert response.status_code == HTTPStatus.OK
-    assert response.json()["data"]["total"] == 5
-
-
-def test_error_contract(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    cases = [
-        ({"query": "created_by ==== ((("}, "rule_list_filter_invalid", "invalid filter query:"),
-        ({"query": "team > 'infra'"}, "rule_list_filter_invalid", 'operator > is not allowed on the label filter "team"'),
-        ({"query": "alert_type = 'bogus'"}, "rule_list_filter_invalid", "METRIC_BASED_ALERT"),
-        ({"query": "name REGEXP 'x.*'"}, "rule_list_filter_invalid", "operator REGEXP is not allowed"),
-        ({"query": "created_at >= 'yesterday'"}, "rule_list_filter_invalid", "invalid RFC3339 timestamp"),
-        ({"query": "name LIKE 'prod\\\\'"}, "rule_list_filter_invalid", "must not end with an unescaped backslash"),
-        ({"states": ["bogus"]}, "rule_list_invalid", 'invalid state "bogus"'),
-        ({"sort": "bogus"}, "rule_list_invalid", "invalid sort"),
-        ({"order": "bogus"}, "rule_list_invalid", "invalid order"),
-        ({"limit": -1}, "rule_list_invalid", "invalid limit"),
-        ({"offset": -1}, "rule_list_invalid", "invalid offset"),
-    ]
-
-    for params, expected_code, expected_message_part in cases:
-        response = requests.get(
-            signoz.self.host_configs["8080"].get(BASE_URL),
-            params=params,
-            headers={"Authorization": f"Bearer {token}"},
-            timeout=5,
-        )
-        assert response.status_code == HTTPStatus.BAD_REQUEST, f"params {params!r}: {response.text}"
-        error = response.json()["error"]
-        assert error["code"] == expected_code, f"params {params!r}"
-        assert expected_message_part in error["message"], f"params {params!r}: {error['message']}"
-
-
-def test_v2_list_still_serves_bare_array(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    seed_alert_rules: Callable[[dict, list[dict]], None],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    seed_alert_rules(SEED_CHANNEL, SEED_RULES)
-
-    response = requests.get(
-        signoz.self.host_configs["8080"].get("/api/v2/rules"),
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.OK
-    data = response.json()["data"]
-    assert isinstance(data, list), "deprecated v2 must keep returning a bare array"
-    assert {rule["alert"] for rule in data} == {r["alert"] for r in SEED_RULES}