chore: trigger review

Zero-filled points are written during encoding instead of stored, and time
series responses stream to the client. A 200k-group sparse result peaks at
18MB instead of 3.4GB.

.github/CODEOWNERS

@@ -209,10 +209,6 @@ go.mod @therealpandey
 /frontend/src/types/api/alerts/ @SigNoz/pulse-frontend
 /frontend/src/providers/Alert.tsx @SigNoz/pulse-frontend
 /frontend/src/constants/alerts.ts @SigNoz/pulse-frontend
-/frontend/src/container/PlannedDowntime/ @SigNoz/pulse-frontend
-/frontend/src/hooks/alerts/ @SigNoz/pulse-frontend
-/frontend/src/container/Home/AlertRules/ @SigNoz/pulse-frontend
-/frontend/src/container/Home/__tests__/AlertRules.test.tsx @SigNoz/pulse-frontend
 
 ## Notification Channels
 /frontend/src/pages/ChannelsEdit/ @SigNoz/pulse-frontend
@@ -221,11 +217,6 @@ go.mod @therealpandey
 /frontend/src/container/FormAlertChannels/ @SigNoz/pulse-frontend
 /frontend/src/hooks/notificationChannels/ @SigNoz/pulse-frontend
 
-## List filter + views (dashboards and alerts lists)
-/frontend/src/components/ListFilter/ @SigNoz/pulse-frontend
-/frontend/src/components/ListViews/ @SigNoz/pulse-frontend
-/frontend/src/hooks/listViews/ @SigNoz/pulse-frontend
-
 ## OpenAPI Schema - Generated
 /frontend/src/api/generated/services/ @therealpandey @vikrantgupta25 @srikanthccv
 /docs/api/openapi.yml @therealpandey @vikrantgupta25 @srikanthccv

docs/api/openapi.yml

@@ -10231,10 +10231,8 @@ components:
         having:
           allOf:
           - $ref: '#/components/schemas/Querybuildertypesv5Having'
-          description: A filter on the formula values, referencing the formula by
-            its name or as __result, for example F1 > 0. A time series keeps only
-            the points that match and drops a series with none left; a scalar result
-            keeps only the rows that match.
+          description: Accepted but currently ignored; the computed values are returned
+            unfiltered.
         legend:
           description: The display name template for each series; {{field}} placeholders
             are replaced by label values.
@@ -32731,305 +32729,6 @@ paths:
                   requestType: time_series
                   schemaVersion: v1
                   start: 1640995200000
-              function_anomaly_request_rate:
-                description: 'anomaly is the one function with named arguments. seasonality
-                  says which past periods predict the current value: hourly, daily
-                  or weekly, daily when absent. z_score_threshold is how many standard
-                  deviations from the prediction count as an anomaly. It has no default:
-                  a request without it gets bounds of zero width, so send it. 3 is
-                  the value the UI sends. The response carries, next to the values,
-                  a predicted series, an upper and a lower bound series and an anomaly
-                  score series. The scoring runs in the enterprise build; the community
-                  build returns the series unchanged.'
-                summary: 'anomaly: request rate scored against its daily pattern'
-                value:
-                  compositeQuery:
-                    queries:
-                    - spec:
-                        aggregations:
-                        - metricName: http.server.duration.count
-                          spaceAggregation: sum
-                          timeAggregation: rate
-                        functions:
-                        - args:
-                          - name: seasonality
-                            value: daily
-                          - name: z_score_threshold
-                            value: 3
-                          name: anomaly
-                        groupBy:
-                        - fieldContext: resource
-                          name: service.name
-                        name: A
-                        signal: metrics
-                        stepInterval: 300s
-                      type: builder_query
-                  end: 1640998800000
-                  requestType: time_series
-                  schemaVersion: v1
-                  start: 1640995200000
-              function_cumulativesum_errors_so_far:
-                description: cumulativeSum replaces each point with the sum of every
-                  point up to and including it, so a per-step count becomes a running
-                  total whose first point is the first count. It takes no arguments.
-                  The total resets with the window, so a longer time range gives a
-                  larger final value; it is a view of the window, not a counter.
-                summary: 'cumulativeSum: 5xx responses since the start of the window'
-                value:
-                  compositeQuery:
-                    queries:
-                    - spec:
-                        aggregations:
-                        - alias: server_errors
-                          expression: count()
-                        filter:
-                          expression: http.response.status_code >= 500
-                        functions:
-                        - name: cumulativeSum
-                        groupBy:
-                        - fieldContext: resource
-                          name: service.name
-                        name: A
-                        signal: traces
-                        stepInterval: 60s
-                      type: builder_query
-                  end: 1640998800000
-                  requestType: time_series
-                  schemaVersion: v1
-                  start: 1640995200000
-              function_cutoffmin_hide_idle_hosts:
-                description: The four threshold functions take one number. cutOffMin
-                  and cutOffMax remove the points below or above the threshold, so
-                  an idle host disappears from the chart instead of drawing a line
-                  along the bottom. clampMin and clampMax keep the points and replace
-                  the value with the threshold, which caps spikes without hiding them.
-                  system.cpu.utilization is a ratio, so 0.05 is 5%.
-                summary: 'cutOffMin: drop hosts below 5% CPU from the chart'
-                value:
-                  compositeQuery:
-                    queries:
-                    - spec:
-                        aggregations:
-                        - metricName: system.cpu.utilization
-                          spaceAggregation: avg
-                          timeAggregation: avg
-                        functions:
-                        - args:
-                          - value: 0.05
-                          name: cutOffMin
-                        groupBy:
-                        - fieldContext: resource
-                          name: host.name
-                        name: A
-                        signal: metrics
-                        stepInterval: 60s
-                      type: builder_query
-                  end: 1640998800000
-                  requestType: time_series
-                  schemaVersion: v1
-                  start: 1640995200000
-              function_ewma_smoothed_latency:
-                description: 'ewma3, ewma5 and ewma7 replace each point with an exponentially
-                  weighted average of the point and the points before it. The number
-                  in the name is the window the default weight is derived from: alpha
-                  = 2 / (n + 1), so 0.5, 0.333 and 0.25. One optional argument overrides
-                  alpha; a value close to 1 follows the raw series, a value close
-                  to 0 smooths harder. 0.3 here smooths a little more than ewma5''s
-                  default.'
-                summary: 'ewma5: smoothed p95 latency'
-                value:
-                  compositeQuery:
-                    queries:
-                    - spec:
-                        aggregations:
-                        - metricName: http.server.duration.bucket
-                          spaceAggregation: p95
-                        functions:
-                        - args:
-                          - value: 0.3
-                          name: ewma5
-                        groupBy:
-                        - fieldContext: resource
-                          name: service.name
-                        name: A
-                        signal: metrics
-                        stepInterval: 60s
-                      type: builder_query
-                  end: 1640998800000
-                  requestType: time_series
-                  schemaVersion: v1
-                  start: 1640995200000
-              function_fillzero_sparse_errors:
-                description: A count over sparse events returns a point only for steps
-                  that had a match, so a chart of failed spans has gaps where nothing
-                  failed. fillZero adds a zero at every missing step. With no arguments
-                  the server fills the request window at the query's step, which is
-                  the common case. The three optional arguments are start, end and
-                  step in milliseconds, for callers that want to fill a different
-                  grid.
-                summary: 'fillZero: a zero at every step with no failed spans'
-                value:
-                  compositeQuery:
-                    queries:
-                    - spec:
-                        aggregations:
-                        - alias: failed_spans
-                          expression: count()
-                        filter:
-                          expression: has_error = true
-                        functions:
-                        - name: fillZero
-                        groupBy:
-                        - fieldContext: resource
-                          name: service.name
-                        name: A
-                        signal: traces
-                        stepInterval: 60s
-                      type: builder_query
-                  end: 1640998800000
-                  requestType: time_series
-                  schemaVersion: v1
-                  start: 1640995200000
-              function_log10_network_bytes:
-                description: log2 and log10 replace each value with its logarithm,
-                  so a loopback device moving kilobytes and an uplink moving gigabytes
-                  fit on one chart. They take no arguments. Zero and negative values
-                  have no logarithm and are not drawn. absolute, also without arguments,
-                  is the usual companion for a signed series before a logarithm.
-                summary: 'log10: network throughput across devices that differ by
-                  orders of magnitude'
-                value:
-                  compositeQuery:
-                    queries:
-                    - spec:
-                        aggregations:
-                        - metricName: system.network.io
-                          spaceAggregation: sum
-                          timeAggregation: rate
-                        filter:
-                          expression: direction = 'transmit'
-                        functions:
-                        - name: log10
-                        groupBy:
-                        - fieldContext: attribute
-                          name: device
-                        name: A
-                        signal: metrics
-                        stepInterval: 60s
-                      type: builder_query
-                  end: 1640998800000
-                  requestType: time_series
-                  schemaVersion: v1
-                  start: 1640995200000
-              function_median_despiked_request_rate:
-                description: median3, median5 and median7 replace each point with
-                  the median of the surrounding 3, 5 or 7 points. A spike that lasts
-                  one step vanishes, a shift that lasts longer than half the window
-                  stays. The first and last half window, 2 points each for median5,
-                  have no full window and keep their values, so the newest spike stays
-                  visible; a series shorter than the window is returned unchanged.
-                  They take no arguments. Use them when the raw series is noisy and
-                  the chart is for a trend, not for catching the spike.
-                summary: 'median5: request rate without one-step spikes'
-                value:
-                  compositeQuery:
-                    queries:
-                    - spec:
-                        aggregations:
-                        - metricName: http.server.duration.count
-                          spaceAggregation: sum
-                          timeAggregation: rate
-                        functions:
-                        - name: median5
-                        groupBy:
-                        - fieldContext: resource
-                          name: service.name
-                        name: A
-                        signal: metrics
-                        stepInterval: 60s
-                      type: builder_query
-                  end: 1640998800000
-                  requestType: time_series
-                  schemaVersion: v1
-                  start: 1640995200000
-              function_runningdiff_disk_growth:
-                description: 'runningDiff turns a gauge into the change between consecutive
-                  points, so a filesystem usage gauge becomes bytes written per step.
-                  It takes no arguments and drops the first point of the window, since
-                  that point has nothing to difference against; the server reads one
-                  step before the window to keep the first interval. Functions apply
-                  in order: clampMin with 0 runs on the differences and replaces the
-                  negative value a cleanup or a volume reset produces with zero.'
-                summary: 'runningDiff then clampMin: bytes written to disk per step'
-                value:
-                  compositeQuery:
-                    queries:
-                    - spec:
-                        aggregations:
-                        - metricName: system.filesystem.usage
-                          spaceAggregation: sum
-                          timeAggregation: latest
-                        filter:
-                          expression: state = 'used'
-                        functions:
-                        - name: runningDiff
-                        - args:
-                          - value: 0
-                          name: clampMin
-                        groupBy:
-                        - fieldContext: resource
-                          name: host.name
-                        name: A
-                        signal: metrics
-                        stepInterval: 60s
-                      type: builder_query
-                  end: 1640998800000
-                  requestType: time_series
-                  schemaVersion: v1
-                  start: 1640995200000
-              function_timeshift_week_over_week:
-                description: timeShift moves every point of its query forward by the
-                  argument, in seconds, so a series read from the past lands on the
-                  current timestamps. B here reads the hour exactly seven days (604800
-                  s) before the requested window and comes back on this week's timestamps,
-                  so it overlays A on a chart and the formula can subtract it point
-                  by point. The argument is positive; it says how far back to read.
-                summary: 'timeShift: this week''s error logs next to last week''s'
-                value:
-                  compositeQuery:
-                    queries:
-                    - spec:
-                        aggregations:
-                        - alias: errors
-                          expression: count()
-                        filter:
-                          expression: severity_text = 'ERROR'
-                        name: A
-                        signal: logs
-                        stepInterval: 60s
-                      type: builder_query
-                    - spec:
-                        aggregations:
-                        - alias: errors
-                          expression: count()
-                        filter:
-                          expression: severity_text = 'ERROR'
-                        functions:
-                        - args:
-                          - value: 604800
-                          name: timeShift
-                        name: B
-                        signal: logs
-                        stepInterval: 60s
-                      type: builder_query
-                    - spec:
-                        expression: A - B
-                        name: F1
-                      type: builder_formula
-                  end: 1640998800000
-                  requestType: time_series
-                  schemaVersion: v1
-                  start: 1640995200000
               logs_raw:
                 summary: 'Raw: fetch raw log records'
                 value:

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

@@ -7079,7 +7079,7 @@ export interface Querybuildertypesv5QueryBuilderFormulaDTO {
 	 */
 	functions?: Querybuildertypesv5FunctionDTO[] | null;
 	/**
-	 * @description A filter on the formula values, referencing the formula by its name or as __result, for example F1 > 0. A time series keeps only the points that match and drops a series with none left; a scalar result keeps only the rows that match.
+	 * @description Accepted but currently ignored; the computed values are returned unfiltered.
 	 */
 	having?: Querybuildertypesv5HavingDTO;
 	/**

frontend/src/container/AIAssistant/components/ChatInput/ChatInput.tsx

@@ -21,15 +21,14 @@ import {
 	useListDashboardsForUserV2,
 } from 'api/generated/services/dashboard';
 import {
-	getListRulesV3QueryKey,
-	useListRulesV3,
+	getListRulesQueryKey,
+	useListRules,
 } from 'api/generated/services/rules';
 import type {
 	DashboardtypesListedDashboardForUserV2DTO,
 	ListDashboardsForUserV2200,
 	ListDashboardsForUserV2Params,
-	ListRulesV3200,
-	ListRulesV3Params,
+	ListRules200,
 } from 'api/generated/services/sigNoz.schemas';
 import logEvent from 'api/common/logEvent';
 import { useQueryService } from 'hooks/useQueryService';
@@ -180,9 +179,6 @@ const VOICE_UNAVAILABLE_KEY = 'ai-assistant-voice-unavailable';
  */
 const DASHBOARD_LIST_PARAMS: ListDashboardsForUserV2Params = { limit: 1000 };
 
-/** Same as dashboards. 200 is the most the rules list returns per call. */
-const ALERT_RULE_LIST_PARAMS: ListRulesV3Params = { limit: 200 };
-
 function dashboardTitle(
 	dashboard: DashboardtypesListedDashboardForUserV2DTO,
 ): string {
@@ -759,7 +755,7 @@ export default function ChatInput({
 		data: alertsResponse,
 		isLoading: isAlertsLoading,
 		isError: isAlertsError,
-	} = useListRulesV3(ALERT_RULE_LIST_PARAMS, {
+	} = useListRules({
 		query: {
 			enabled: isContextPickerOpen && activeContextCategory === 'Alerts',
 			staleTime: Infinity,
@@ -808,10 +804,10 @@ export default function ChatInput({
 				}
 			}
 			if (ctx.type === 'alert' && ctx.resourceId) {
-				const cached = queryClient.getQueryData<ListRulesV3200>(
-					getListRulesV3QueryKey(ALERT_RULE_LIST_PARAMS),
+				const cached = queryClient.getQueryData<ListRules200>(
+					getListRulesQueryKey(),
 				);
-				const rule = cached?.data.rules.find((r) => r.id === ctx.resourceId);
+				const rule = cached?.data?.find((r) => r.id === ctx.resourceId);
 				if (rule?.alert) {
 					return rule.alert;
 				}
@@ -839,8 +835,8 @@ export default function ChatInput({
 					value: dashboardTitle(dashboard),
 				})) ?? [],
 			Alerts:
-				alertsResponse?.data.rules
-					.filter((alertRule) => Boolean(alertRule.alert))
+				alertsResponse?.data
+					?.filter((alertRule) => Boolean(alertRule.alert))
 					.map((alertRule) => ({
 						id: alertRule.id,
 						value: alertRule.alert,
@@ -1063,7 +1059,6 @@ export default function ChatInput({
 												color="secondary"
 												size="sm"
 												id={`ai-context-tab-${category}`}
-												testId={`ai-context-tab-${category}`}
 												// Single stable panel id shared by every tab: only the
 												// active category's tabpanel is rendered, so per-category
 												// `aria-controls` ids would point at nonexistent nodes

frontend/src/container/AIAssistant/components/ChatInput/__tests__/ChatInput.alertsPicker.test.tsx

@@ -1,70 +0,0 @@
-import {
-	alertRulesFixture,
-	listRulesV3Response,
-} from 'mocks-server/__mockdata__/alert_rules';
-import { rest, server } from 'mocks-server/server';
-import { render, screen, userEvent } from 'tests/test-utils';
-
-jest.mock('api/generated/services/dashboard', () => ({
-	useListDashboardsForUserV2: (): unknown => ({
-		data: undefined,
-		isLoading: false,
-		isError: false,
-	}),
-	getListDashboardsForUserV2QueryKey: (): string[] => ['dashboards'],
-}));
-
-jest.mock('hooks/useQueryService', () => ({
-	useQueryService: (): unknown => ({
-		data: [],
-		isLoading: false,
-		isFetching: false,
-		isError: false,
-	}),
-}));
-
-jest.mock('../../../hooks/useSpeechRecognition', () => ({
-	useSpeechRecognition: (): unknown => ({
-		isListening: false,
-		isSupported: false,
-		permission: 'prompt',
-		start: jest.fn(),
-		discard: jest.fn(),
-	}),
-}));
-
-jest.mock('../../../hooks/useAIAssistantAnalyticsContext', () => ({
-	useAIAssistantAnalyticsContext: (): unknown => ({
-		threadId: undefined,
-		page: '/',
-		mode: 'sidepane',
-	}),
-}));
-
-// eslint-disable-next-line import/first
-import ChatInput from '../ChatInput';
-
-describe('ChatInput — alerts context picker', () => {
-	it('lists the rules from one v3 rules request', async () => {
-		const [first, second] = alertRulesFixture;
-		const requests: string[] = [];
-		server.use(
-			rest.get('http://localhost/api/v3/rules', (req, res, ctx) => {
-				requests.push(req.url.search);
-				return res(
-					ctx.status(200),
-					ctx.json(listRulesV3Response([first, second], req.url.searchParams)),
-				);
-			}),
-		);
-
-		render(<ChatInput onSend={jest.fn()} />);
-
-		await userEvent.click(screen.getByRole('button', { name: /add context/i }));
-		await userEvent.click(await screen.findByTestId('ai-context-tab-Alerts'));
-
-		await expect(screen.findByText(first.alert)).resolves.toBeInTheDocument();
-		expect(screen.getByText(second.alert)).toBeInTheDocument();
-		expect(requests).toStrictEqual(['?limit=200']);
-	});
-});

frontend/src/container/AIAssistant/components/ChatInput/__tests__/ChatInput.prefill.test.tsx

@@ -12,12 +12,8 @@ jest.mock('api/generated/services/dashboard', () => ({
 }));
 
 jest.mock('api/generated/services/rules', () => ({
-	useListRulesV3: (): unknown => ({
-		data: undefined,
-		isLoading: false,
-		isError: false,
-	}),
-	getListRulesV3QueryKey: (): string[] => ['rules'],
+	useListRules: (): unknown => ({ data: [], isLoading: false, isError: false }),
+	getListRulesQueryKey: (): string[] => ['rules'],
 }));
 
 jest.mock('hooks/useQueryService', () => ({

frontend/src/container/CreateAlertV2/Footer/Footer.tsx

@@ -18,7 +18,7 @@ import { buildCreateAlertRulePayload, validateCreateAlertState } from './utils';
 import './styles.scss';
 import {
 	invalidateGetRuleByID,
-	invalidateListRulesV3,
+	invalidateListRules,
 } from 'api/generated/services/rules';
 import { useQueryClient } from 'react-query';
 
@@ -137,7 +137,7 @@ function Footer(): JSX.Element {
 				{
 					onSuccess: () => {
 						void invalidateGetRuleByID(queryClient, { id: ruleId });
-						void invalidateListRulesV3(queryClient);
+						void invalidateListRules(queryClient);
 
 						toast.success('Alert rule updated successfully');
 						safeNavigate('/alerts');

frontend/src/container/Home/AlertRules/AlertRules.tsx

@@ -1,22 +1,24 @@
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { Button, Skeleton } from 'antd';
 import { Badge } from '@signozhq/ui/badge';
 import logEvent from 'api/common/logEvent';
-import type { RuletypesListableRuleDTO } from 'api/generated/services/sigNoz.schemas';
+import { useListRules } from 'api/generated/services/rules';
+import type { RuletypesRuleDTO } from 'api/generated/services/sigNoz.schemas';
 import { QueryParams } from 'constants/query';
 import ROUTES from 'constants/routes';
 import { AppLink } from 'lib/router/AppLink';
 import { navigate } from 'lib/router/navigation';
 import { useAppLocation } from 'lib/router/useAppLocation';
+import { mapQueryDataFromApi } from 'lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi';
 import { ArrowRight, ArrowUpRight, Plus } from '@signozhq/icons';
 import Card from 'periscope/components/Card/Card';
 import { useAppContext } from 'providers/App/App';
+import { toCompositeMetricQuery } from 'types/api/alerts/convert';
 import { USER_ROLES } from 'types/roles';
 
 import beaconUrl from '@/assets/Icons/beacon.svg';
 
 import { getItemIcon } from '../constants';
-import { useHomeAlertRules } from './useHomeAlertRules';
 
 export default function AlertRules({
 	onUpdateChecklistDoneItem,
@@ -26,19 +28,49 @@ export default function AlertRules({
 	loadingUserPreferences: boolean;
 }): JSX.Element {
 	const { user } = useAppContext();
+	const [rulesExist, setRulesExist] = useState(false);
+
+	const [sortedAlertRules, setSortedAlertRules] = useState<RuletypesRuleDTO[]>(
+		[],
+	);
 
 	const location = useAppLocation();
 	const params = new URLSearchParams(location.search);
 
 	// Fetch Alerts
-	const { rules: alertRules, isError, isLoading } = useHomeAlertRules();
-	const rulesExist = alertRules.length > 0;
+	const {
+		data: alerts,
+		isError,
+		isLoading,
+	} = useListRules({
+		query: { cacheTime: 0 },
+	});
 
 	useEffect(() => {
-		if (rulesExist && !loadingUserPreferences) {
+		const rules = alerts?.data ?? [];
+		setRulesExist(rules.length > 0);
+
+		const sortedRules = [...rules].sort((a, b) => {
+			// First, prioritize firing alerts
+			if (a.state === 'firing' && b.state !== 'firing') {
+				return -1;
+			}
+			if (a.state !== 'firing' && b.state === 'firing') {
+				return 1;
+			}
+
+			// Then sort by updatedAt timestamp
+			return (
+				new Date(b.updatedAt ?? 0).getTime() - new Date(a.updatedAt ?? 0).getTime()
+			);
+		});
+
+		if (sortedRules.length > 0 && !loadingUserPreferences) {
 			onUpdateChecklistDoneItem('SETUP_ALERTS');
 		}
-	}, [rulesExist, onUpdateChecklistDoneItem, loadingUserPreferences]);
+
+		setSortedAlertRules(sortedRules.slice(0, 5));
+	}, [alerts, onUpdateChecklistDoneItem, loadingUserPreferences]);
 
 	const emptyStateCard = (): JSX.Element => (
 		<div className="empty-state-container">
@@ -63,7 +95,7 @@ export default function AlertRules({
 								className="periscope-btn secondary"
 								icon={<Plus size={16} />}
 								onClick={(): void => {
-									void logEvent('Homepage: Create alert rule clicked', {});
+									logEvent('Homepage: Create alert rule clicked', {});
 								}}
 							>
 								Create Alert Rule
@@ -74,7 +106,7 @@ export default function AlertRules({
 							type="link"
 							className="learn-more-link"
 							onClick={(): void => {
-								void logEvent('Homepage: Learn more clicked', {
+								logEvent('Homepage: Learn more clicked', {
 									source: 'Alert Rules',
 								});
 
@@ -93,13 +125,26 @@ export default function AlertRules({
 		</div>
 	);
 
-	const onEditHandler = (record: RuletypesListableRuleDTO) => (): void => {
-		void logEvent('Homepage: Alert clicked', {
+	const onEditHandler = (record: RuletypesRuleDTO) => (): void => {
+		logEvent('Homepage: Alert clicked', {
 			ruleId: record.id,
 			ruleName: record.alert,
 			ruleState: record.state,
 		});
 
+		const compositeQuery = mapQueryDataFromApi(
+			toCompositeMetricQuery(record.condition.compositeQuery),
+		);
+		params.set(
+			QueryParams.compositeQuery,
+			encodeURIComponent(JSON.stringify(compositeQuery)),
+		);
+
+		const panelType = record.condition.compositeQuery.panelType;
+		if (panelType) {
+			params.set(QueryParams.panelTypes, panelType);
+		}
+
 		params.set(QueryParams.ruleId, record.id);
 
 		navigate(`${ROUTES.ALERT_OVERVIEW}?${params.toString()}`);
@@ -108,12 +153,11 @@ export default function AlertRules({
 	const renderAlertRules = (): JSX.Element => (
 		<div className="alert-rules-container home-data-item-container">
 			<div className="alert-rules-list">
-				{alertRules.map((rule) => (
+				{sortedAlertRules.map((rule) => (
 					<div
 						role="button"
 						tabIndex={0}
 						className="alert-rule-item home-data-item"
-						data-testid={`home-alert-rule-${rule.id}`}
 						key={rule.id}
 						onClick={onEditHandler(rule)}
 						onKeyDown={(e): void => {
@@ -195,7 +239,7 @@ export default function AlertRules({
 								type="link"
 								className="periscope-btn link learn-more-link"
 								onClick={(): void => {
-									void logEvent('Homepage: All alert rules clicked', {});
+									logEvent('Homepage: All alert rules clicked', {});
 								}}
 							>
 								All Alert Rules <ArrowRight size={12} />

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

@@ -1,64 +0,0 @@
-import { useMemo } from 'react';
-import { useListRulesV3 } from 'api/generated/services/rules';
-import {
-	type ListRulesV3200,
-	type ListRulesV3Params,
-	RuletypesAlertStateDTO,
-	type RuletypesListableRuleDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { GeneratedAPIInstance } from 'api/generatedAPIInstance';
-
-const HOME_ALERT_RULES_LIMIT = 5;
-
-const FIRING_RULES_PARAMS: ListRulesV3Params = {
-	states: [RuletypesAlertStateDTO.firing],
-	limit: HOME_ALERT_RULES_LIMIT,
-};
-
-interface HomeAlertRules {
-	rules: RuletypesListableRuleDTO[];
-	isLoading: boolean;
-	isError: boolean;
-}
-
-export function useHomeAlertRules(): HomeAlertRules {
-	const firing = useListRulesV3(FIRING_RULES_PARAMS, {
-		query: {
-			cacheTime: 0,
-			// The backend binds repeated `states=` keys; axios' default sends `states[]=`.
-			queryFn: ({ signal }) =>
-				GeneratedAPIInstance<ListRulesV3200>({
-					url: '/api/v3/rules',
-					method: 'GET',
-					params: FIRING_RULES_PARAMS,
-					paramsSerializer: { indexes: null },
-					signal,
-				}),
-		},
-	});
-	const firingRules = firing.data?.data.rules;
-	const latest = useListRulesV3(
-		{ limit: HOME_ALERT_RULES_LIMIT },
-		{
-			query: {
-				cacheTime: 0,
-				enabled:
-					firingRules !== undefined && firingRules.length < HOME_ALERT_RULES_LIMIT,
-			},
-		},
-	);
-
-	const rules = useMemo(() => {
-		const firingIds = new Set(firingRules?.map(({ id }) => id));
-		const others = (latest.data?.data.rules ?? []).filter(
-			({ id }) => !firingIds.has(id),
-		);
-		return [...(firingRules ?? []), ...others].slice(0, HOME_ALERT_RULES_LIMIT);
-	}, [firingRules, latest.data]);
-
-	return {
-		rules,
-		isLoading: firing.isLoading || latest.isLoading,
-		isError: firing.isError || latest.isError,
-	};
-}

frontend/src/container/Home/__tests__/AlertRules.test.tsx

@@ -1,119 +0,0 @@
-import {
-	RuletypesAlertStateDTO,
-	type RuletypesRuleDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { QueryParams } from 'constants/query';
-import ROUTES from 'constants/routes';
-import { navigate } from 'lib/router/navigation';
-import {
-	alertRulesFixture,
-	listRulesV3Response,
-} from 'mocks-server/__mockdata__/alert_rules';
-import { rest, server } from 'mocks-server/server';
-import { render, screen, userEvent } from 'tests/test-utils';
-
-import AlertRules from '../AlertRules/AlertRules';
-
-jest.mock('lib/router/navigation', () => ({
-	...jest.requireActual('lib/router/navigation'),
-	navigate: jest.fn(),
-}));
-
-const rule = (id: string, state: RuletypesAlertStateDTO): RuletypesRuleDTO => ({
-	...alertRulesFixture[0],
-	id,
-	alert: `${id} rule`,
-	state,
-});
-
-const burning = rule('burning', RuletypesAlertStateDTO.firing);
-const quiet = rule('quiet', RuletypesAlertStateDTO.inactive);
-const waiting = rule('waiting', RuletypesAlertStateDTO.pending);
-
-const serveRules = (
-	rules: RuletypesRuleDTO[],
-	rulesForLatest = rules,
-): string[] => {
-	const requestedStates: string[] = [];
-	server.use(
-		rest.get('http://localhost/api/v3/rules', (req, res, ctx) => {
-			const states = req.url.searchParams.getAll('states').join();
-			requestedStates.push(states);
-			return res(
-				ctx.status(200),
-				ctx.json(
-					listRulesV3Response(
-						states === 'firing' ? rules : rulesForLatest,
-						req.url.searchParams,
-					),
-				),
-			);
-		}),
-	);
-	return requestedStates;
-};
-
-const renderAlertRules = (): void => {
-	render(
-		<AlertRules
-			onUpdateChecklistDoneItem={jest.fn()}
-			loadingUserPreferences={false}
-		/>,
-	);
-};
-
-const renderedRuleIds = (): (string | undefined)[] =>
-	screen.getAllByTestId(/^home-alert-rule-/).map((row) => row.dataset.testid);
-
-describe('Home alert rules', () => {
-	it('lists firing rules first, then the latest others, and opens the clicked rule', async () => {
-		const requestedStates = serveRules([quiet, burning, waiting]);
-		renderAlertRules();
-
-		await expect(
-			screen.findByTestId('home-alert-rule-waiting'),
-		).resolves.toBeInTheDocument();
-		expect(renderedRuleIds()).toStrictEqual([
-			'home-alert-rule-burning',
-			'home-alert-rule-quiet',
-			'home-alert-rule-waiting',
-		]);
-		expect(requestedStates).toStrictEqual(['firing', '']);
-
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		await user.click(screen.getByTestId('home-alert-rule-burning'));
-		expect(navigate).toHaveBeenCalledWith(
-			`${ROUTES.ALERT_OVERVIEW}?${QueryParams.ruleId}=burning`,
-		);
-	});
-
-	it('skips the latest rules request when 5 rules are firing', async () => {
-		const firing = Array.from({ length: 5 }, (_, index) =>
-			rule(`firing-${index}`, RuletypesAlertStateDTO.firing),
-		);
-		const requestedStates = serveRules([quiet, ...firing]);
-		renderAlertRules();
-
-		await expect(
-			screen.findByTestId('home-alert-rule-firing-4'),
-		).resolves.toBeInTheDocument();
-		expect(renderedRuleIds()).toStrictEqual(
-			firing.map(({ id }) => `home-alert-rule-${id}`),
-		);
-		expect(requestedStates).toStrictEqual(['firing']);
-	});
-
-	it('shows a rule once when it stops firing between the two requests', async () => {
-		const settled = { ...burning, state: RuletypesAlertStateDTO.inactive };
-		serveRules([burning], [settled, quiet]);
-		renderAlertRules();
-
-		await expect(
-			screen.findByTestId('home-alert-rule-quiet'),
-		).resolves.toBeInTheDocument();
-		expect(renderedRuleIds()).toStrictEqual([
-			'home-alert-rule-burning',
-			'home-alert-rule-quiet',
-		]);
-	});
-});

frontend/src/container/PlannedDowntime/PlannedDowntime.tsx

@@ -16,11 +16,11 @@ import {
 	useDeleteDowntimeScheduleByID,
 	useListDowntimeSchedules,
 } from 'api/generated/services/downtimeschedules';
+import { useListRules } from 'api/generated/services/rules';
 import type { AlertmanagertypesPlannedMaintenanceDTO } from 'api/generated/services/sigNoz.schemas';
 import { ColumnSelector } from 'components/TanStackTableView';
 import TextToolTip from 'components/TextToolTip';
 import dayjs from 'dayjs';
-import { useListAllRules } from 'hooks/alerts/useListAllRules';
 import useDebouncedFn from 'hooks/useDebouncedFunction';
 import { useNotifications } from 'hooks/useNotifications';
 import useUrlQuery from 'hooks/useUrlQuery';
@@ -55,7 +55,9 @@ export function PlannedDowntime(): JSX.Element {
 		isError,
 		isLoading,
 		isFetching: isFetchingAlerts,
-	} = useListAllRules({ cacheTime: 0 });
+	} = useListRules({
+		query: { cacheTime: 0 },
+	});
 	const [isOpen, setIsOpen] = React.useState(false);
 	const [form] = Form.useForm();
 	const { user } = useAppContext();
@@ -71,7 +73,7 @@ export function PlannedDowntime(): JSX.Element {
 	const downtimeSchedules = useListDowntimeSchedules();
 	const alertOptions = React.useMemo(
 		() =>
-			alertsData?.map((i) => ({
+			alertsData?.data?.map((i) => ({
 				label: i.alert,
 				value: i.id,
 			})),
@@ -179,7 +181,7 @@ export function PlannedDowntime(): JSX.Element {
 	};
 
 	const refetchAllSchedules = (): void => {
-		void downtimeSchedules.refetch();
+		downtimeSchedules.refetch();
 	};
 
 	const {

frontend/src/container/PlannedDowntime/__test__/PlannedDowntime.test.tsx

@@ -4,7 +4,6 @@ import { fireEvent, screen } from '@testing-library/react';
 import type {
 	ListDowntimeSchedules200,
 	RenderErrorResponseDTO,
-	RuletypesListableRuleDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import {
 	AlertmanagertypesRepeatOnDTO,
@@ -127,19 +126,19 @@ jest.mock('api/generated/services/downtimeschedules', () => ({
 }));
 
 let mockRulesState: {
-	data?: Pick<RuletypesListableRuleDTO, 'id' | 'alert'>[];
+	data?: { data: Array<{ id: number | string; alert: string }> };
 	isError: boolean;
 	isLoading: boolean;
 	isFetching: boolean;
 } = {
-	data: [],
+	data: { data: [] },
 	isError: false,
 	isLoading: false,
 	isFetching: false,
 };
 
-jest.mock('hooks/alerts/useListAllRules', () => ({
-	useListAllRules: (): typeof mockRulesState => mockRulesState,
+jest.mock('api/generated/services/rules', () => ({
+	useListRules: (): typeof mockRulesState => mockRulesState,
 }));
 
 describe('PlannedDowntime Component', () => {
@@ -152,7 +151,7 @@ describe('PlannedDowntime Component', () => {
 		});
 		mockDowntimeQueryResult.data = MOCK_DOWNTIME_RESPONSE;
 		mockRulesState = {
-			data: [],
+			data: { data: [] },
 			isError: false,
 			isLoading: false,
 			isFetching: false,
@@ -363,7 +362,7 @@ describe('PlannedDowntime Component', () => {
 
 	it('shows "Unknown rule" when scoped rule IDs cannot be resolved (Bug 56)', async () => {
 		mockRulesState = {
-			data: [],
+			data: { data: [] },
 			isError: false,
 			isLoading: false,
 			isFetching: false,
@@ -388,7 +387,14 @@ describe('PlannedDowntime Component', () => {
 
 	it('shows resolved alert rule name when scoped rule ID exists', async () => {
 		mockRulesState = {
-			data: [{ id: 'rule-42', alert: 'Disk Space High' }],
+			data: {
+				data: [
+					{
+						id: 'rule-42',
+						alert: 'Disk Space High',
+					} as any,
+				],
+			},
 			isError: false,
 			isLoading: false,
 			isFetching: false,

frontend/src/hooks/alerts/__tests__/useListAllRules.test.tsx

@@ -1,40 +0,0 @@
-import {
-	alertRulesFixture,
-	listRulesV3Response,
-} from 'mocks-server/__mockdata__/alert_rules';
-import { rest, server } from 'mocks-server/server';
-import { AllTheProviders, renderHook, waitFor } from 'tests/test-utils';
-
-import { useListAllRules } from '../useListAllRules';
-
-const TOTAL = 250;
-
-const rules = Array.from({ length: TOTAL }, (_, index) => ({
-	...alertRulesFixture[0],
-	id: `rule-${index}`,
-	alert: `Rule ${index}`,
-}));
-
-describe('useListAllRules', () => {
-	it('fetches every page past the 200-rule cap', async () => {
-		const offsets: string[] = [];
-		server.use(
-			rest.get('http://localhost/api/v3/rules', (req, res, ctx) => {
-				offsets.push(req.url.searchParams.get('offset') ?? '');
-				return res(
-					ctx.status(200),
-					ctx.json(listRulesV3Response(rules, req.url.searchParams)),
-				);
-			}),
-		);
-
-		const { result } = renderHook(() => useListAllRules(), {
-			wrapper: AllTheProviders,
-		});
-
-		await waitFor(() => expect(result.current.isSuccess).toBe(true));
-		expect(result.current.data).toHaveLength(TOTAL);
-		expect(result.current.data?.[TOTAL - 1]?.id).toBe(`rule-${TOTAL - 1}`);
-		expect(offsets.sort()).toStrictEqual(['0', '200']);
-	});
-});

frontend/src/hooks/alerts/useListAllRules.ts

@@ -1,40 +0,0 @@
-import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
-import {
-	getListRulesV3QueryKey,
-	listRulesV3,
-} from 'api/generated/services/rules';
-import type { RuletypesListableRuleDTO } from 'api/generated/services/sigNoz.schemas';
-import { range } from 'lodash-es';
-
-// The list API clamps any larger limit to 200.
-const PAGE_SIZE = 200;
-
-export const LIST_ALL_RULES_QUERY_KEY = [...getListRulesV3QueryKey(), 'all'];
-
-function fetchPage(offset: number): ReturnType<typeof listRulesV3> {
-	return listRulesV3({ limit: PAGE_SIZE, offset });
-}
-
-// TODO(AshwinBhatkal): temporary. Replace with server-side search plus a lookup of saved rules by ID once
-// /api/v3/rules can filter by IDs: https://github.com/SigNoz/pulse-pod/issues/715
-async function fetchAllRules(): Promise<RuletypesListableRuleDTO[]> {
-	const first = await fetchPage(0);
-	const rest = await Promise.all(
-		range(PAGE_SIZE, first.data.total, PAGE_SIZE).map(fetchPage),
-	);
-
-	return [...first.data.rules, ...rest.flatMap((page) => page.data.rules)];
-}
-
-export function useListAllRules(
-	options?: Omit<
-		UseQueryOptions<RuletypesListableRuleDTO[], Error>,
-		'queryKey' | 'queryFn'
-	>,
-): UseQueryResult<RuletypesListableRuleDTO[], Error> {
-	return useQuery<RuletypesListableRuleDTO[], Error>({
-		queryKey: LIST_ALL_RULES_QUERY_KEY,
-		queryFn: fetchAllRules,
-		...options,
-	});
-}

frontend/src/pages/AlertDetails/hooks.tsx

@@ -10,7 +10,7 @@ import {
 	getGetRuleByIDQueryKey,
 	getGetRuleHistoryTimelineQueryOptions,
 	invalidateGetRuleByID,
-	invalidateListRulesV3,
+	invalidateListRules,
 	updateRuleByID,
 	useGetRuleByID,
 	useGetRuleHistoryOverallStatus,
@@ -443,7 +443,7 @@ export const useAlertRuleClone = ({
 					message: `Success`,
 				});
 
-				await invalidateListRulesV3(queryClient);
+				await invalidateListRules(queryClient);
 
 				params.set(QueryParams.ruleId, response.data.id);
 				navigate(`${ROUTES.ALERT_OVERVIEW}?${params.toString()}`);
@@ -494,7 +494,7 @@ export const useAlertRuleUpdate = ({
 						data: { ...existingRule.data, alert: intermediateName },
 					});
 				}
-				void invalidateListRulesV3(queryClient);
+				void invalidateListRules(queryClient);
 				notifications.success({ message: 'Alert renamed successfully' });
 			},
 			onError: (error) => {

frontend/src/pages/AlertList/PlannedDowntime/stories/PlannedDowntime.stories.mocks.tsx

@@ -17,8 +17,10 @@ import {
 	FIRST_DOWNTIME_NAME,
 } from './__story_mockdata__/plannedDowntime';
 
-import { alertRulesPage } from '../../AlertRules/stories/__story_mockdata__/ruleViews';
-import { RULE_MAX } from '../../stories/__story_mockdata__/alerts';
+import {
+	alertRulesResponse,
+	RULE_MAX,
+} from '../../stories/__story_mockdata__/alerts';
 import { AlertListSubTabs, AlertListTabs } from '../../types';
 
 const LIST = 'Planned downtime · list';
@@ -84,20 +86,18 @@ export const plannedDowntimeMocks = defineStoryMocks({
 				res(ctx.status(200), ctx.json({ status: 'success', data: null })),
 		),
 
-		rest.get('http://localhost/api/v3/rules', (req, res, ctx) => {
-			if (values.rulesState === 'error') {
-				return res(ctx.status(500), ctx.json({ status: 'error' }));
-			}
-			return res(
-				ctx.json(
-					alertRulesPage(
-						values.silencedRules,
-						{ severity: 'mixed', state: 'mixed' },
-						req.url.searchParams,
+		rest.get('http://localhost/api/v2/rules', (_req, res, ctx) =>
+			values.rulesState === 'error'
+				? res(ctx.status(500), ctx.json({ status: 'error' }))
+				: res(
+						ctx.json(
+							alertRulesResponse(values.silencedRules, {
+								severity: 'mixed',
+								state: 'mixed',
+							}),
+						),
 					),
-				),
-			);
-		}),
+		),
 	],
 	config: () => ({
 		route: `/alerts?tab=${AlertListTabs.CONFIGURATION}&subTab=${AlertListSubTabs.PLANNED_DOWNTIME}`,

frontend/src/pages/HomePage/stories/HomePage.stories.mocks.tsx

@@ -3,7 +3,6 @@
  * Do not hand-edit: regenerate instead.
  */
 
-import { listRulesV3Response } from 'mocks-server/__mockdata__/alert_rules';
 import { rest } from 'msw';
 
 import {
@@ -157,13 +156,11 @@ export const homeMocks = defineStoryMocks({
 		),
 
 		rest.get(
-			'http://localhost/api/v3/rules',
-			response.json((req) =>
-				listRulesV3Response(
-					buildAlertRules(values.alertRules),
-					req.url.searchParams,
-				),
-			),
+			'http://localhost/api/v2/rules',
+			response.json(() => ({
+				status: 'success',
+				data: buildAlertRules(values.alertRules),
+			})),
 		),
 
 		rest.get(

go.mod

@@ -20,6 +20,7 @@ require (
 	github.com/evanphx/json-patch/v5 v5.9.11
 	github.com/gin-gonic/gin v1.11.0
 	github.com/go-co-op/gocron v1.30.1
+	github.com/go-json-experiment/json v0.0.0-20260213210345-44df1a37e875
 	github.com/go-openapi/runtime v0.29.2
 	github.com/go-openapi/strfmt v0.26.1
 	github.com/go-playground/validator/v10 v10.27.0

go.sum

@@ -328,6 +328,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
 github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
+github.com/go-json-experiment/json v0.0.0-20260213210345-44df1a37e875 h1:XGPtjxqp0FS8jj1Z7QGcSOSgyq1fUPjNyJXvi3KfI4A=
+github.com/go-json-experiment/json v0.0.0-20260213210345-44df1a37e875/go.mod h1:uNVvRXArCGbZ508SxYYTC5v1JWoz2voff5pm25jU1Ok=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=

pkg/apiserver/signozapiserver/querier.go

@@ -30,7 +30,7 @@ func (provider *provider) addQuerierRoutes(router *mux.Router) error {
 		Description:        "Execute a composite query over a time range. Supports builder queries (traces, logs, metrics), formulas, trace operators, PromQL, and ClickHouse SQL.",
 		Request:            new(qbtypes.QueryRangeRequest),
 		RequestContentType: "application/json",
-		RequestExamples: append([]handler.OpenAPIExample{
+		RequestExamples: []handler.OpenAPIExample{
 			{
 				Name:    "traces_time_series",
 				Summary: "Time series: count spans grouped by service",
@@ -598,7 +598,7 @@ func (provider *provider) addQuerierRoutes(router *mux.Router) error {
 					},
 				},
 			},
-		}, queryRangeFunctionExamples()...),
+		},
 		Response:            new(qbtypes.QueryRangeResponse),
 		ResponseContentType: "application/json",
 		SuccessStatusCode:   http.StatusOK,

pkg/apiserver/signozapiserver/querier_examples.go

@@ -1,202 +0,0 @@
-package signozapiserver
-
-import "github.com/SigNoz/signoz/pkg/http/handler"
-
-// timeSeriesExample wraps builder query specs in a one hour time series
-// request, the shape every function example shares.
-func timeSeriesExample(name, summary, description string, queries ...map[string]any) handler.OpenAPIExample {
-	list := make([]any, 0, len(queries))
-	for _, query := range queries {
-		list = append(list, query)
-	}
-	return handler.OpenAPIExample{
-		Name:        name,
-		Summary:     summary,
-		Description: description,
-		Value: map[string]any{
-			"schemaVersion":  "v1",
-			"start":          1640995200000,
-			"end":            1640998800000,
-			"requestType":    "time_series",
-			"compositeQuery": map[string]any{"queries": list},
-		},
-	}
-}
-
-func builderQueryEnvelope(spec map[string]any) map[string]any {
-	return map[string]any{"type": "builder_query", "spec": spec}
-}
-
-// function builds a function entry with positional arguments; anomaly is the
-// one function that takes named arguments and is written out in full.
-func function(name string, args ...any) map[string]any {
-	list := make([]any, 0, len(args))
-	for _, arg := range args {
-		list = append(list, map[string]any{"value": arg})
-	}
-	entry := map[string]any{"name": name}
-	if len(list) > 0 {
-		entry["args"] = list
-	}
-	return entry
-}
-
-// queryRangeFunctionExamples shows every function a builder query can carry,
-// what its arguments mean and the values they take. Functions run in the
-// order listed, after the aggregation and before formulas.
-func queryRangeFunctionExamples() []handler.OpenAPIExample {
-	return []handler.OpenAPIExample{
-		timeSeriesExample(
-			"function_timeshift_week_over_week",
-			"timeShift: this week's error logs next to last week's",
-			"timeShift moves every point of its query forward by the argument, in seconds, so a series read from the past lands on the current timestamps. B here reads the hour exactly seven days (604800 s) before the requested window and comes back on this week's timestamps, so it overlays A on a chart and the formula can subtract it point by point. The argument is positive; it says how far back to read.",
-			builderQueryEnvelope(map[string]any{
-				"name":         "A",
-				"signal":       "logs",
-				"aggregations": []any{map[string]any{"expression": "count()", "alias": "errors"}},
-				"stepInterval": "60s",
-				"filter":       map[string]any{"expression": "severity_text = 'ERROR'"},
-			}),
-			builderQueryEnvelope(map[string]any{
-				"name":         "B",
-				"signal":       "logs",
-				"aggregations": []any{map[string]any{"expression": "count()", "alias": "errors"}},
-				"stepInterval": "60s",
-				"filter":       map[string]any{"expression": "severity_text = 'ERROR'"},
-				"functions":    []any{function("timeShift", 604800)},
-			}),
-			map[string]any{
-				"type": "builder_formula",
-				"spec": map[string]any{"name": "F1", "expression": "A - B"},
-			},
-		),
-		timeSeriesExample(
-			"function_fillzero_sparse_errors",
-			"fillZero: a zero at every step with no failed spans",
-			"A count over sparse events returns a point only for steps that had a match, so a chart of failed spans has gaps where nothing failed. fillZero adds a zero at every missing step. With no arguments the server fills the request window at the query's step, which is the common case. The three optional arguments are start, end and step in milliseconds, for callers that want to fill a different grid.",
-			builderQueryEnvelope(map[string]any{
-				"name":         "A",
-				"signal":       "traces",
-				"aggregations": []any{map[string]any{"expression": "count()", "alias": "failed_spans"}},
-				"stepInterval": "60s",
-				"filter":       map[string]any{"expression": "has_error = true"},
-				"groupBy":      []any{map[string]any{"name": "service.name", "fieldContext": "resource"}},
-				"functions":    []any{function("fillZero")},
-			}),
-		),
-		timeSeriesExample(
-			"function_cutoffmin_hide_idle_hosts",
-			"cutOffMin: drop hosts below 5% CPU from the chart",
-			"The four threshold functions take one number. cutOffMin and cutOffMax remove the points below or above the threshold, so an idle host disappears from the chart instead of drawing a line along the bottom. clampMin and clampMax keep the points and replace the value with the threshold, which caps spikes without hiding them. system.cpu.utilization is a ratio, so 0.05 is 5%.",
-			builderQueryEnvelope(map[string]any{
-				"name":   "A",
-				"signal": "metrics",
-				"aggregations": []any{
-					map[string]any{"metricName": "system.cpu.utilization", "timeAggregation": "avg", "spaceAggregation": "avg"},
-				},
-				"stepInterval": "60s",
-				"groupBy":      []any{map[string]any{"name": "host.name", "fieldContext": "resource"}},
-				"functions":    []any{function("cutOffMin", 0.05)},
-			}),
-		),
-		timeSeriesExample(
-			"function_runningdiff_disk_growth",
-			"runningDiff then clampMin: bytes written to disk per step",
-			"runningDiff turns a gauge into the change between consecutive points, so a filesystem usage gauge becomes bytes written per step. It takes no arguments and drops the first point of the window, since that point has nothing to difference against; the server reads one step before the window to keep the first interval. Functions apply in order: clampMin with 0 runs on the differences and replaces the negative value a cleanup or a volume reset produces with zero.",
-			builderQueryEnvelope(map[string]any{
-				"name":   "A",
-				"signal": "metrics",
-				"aggregations": []any{
-					map[string]any{"metricName": "system.filesystem.usage", "timeAggregation": "latest", "spaceAggregation": "sum"},
-				},
-				"stepInterval": "60s",
-				"filter":       map[string]any{"expression": "state = 'used'"},
-				"groupBy":      []any{map[string]any{"name": "host.name", "fieldContext": "resource"}},
-				"functions":    []any{function("runningDiff"), function("clampMin", 0)},
-			}),
-		),
-		timeSeriesExample(
-			"function_ewma_smoothed_latency",
-			"ewma5: smoothed p95 latency",
-			"ewma3, ewma5 and ewma7 replace each point with an exponentially weighted average of the point and the points before it. The number in the name is the window the default weight is derived from: alpha = 2 / (n + 1), so 0.5, 0.333 and 0.25. One optional argument overrides alpha; a value close to 1 follows the raw series, a value close to 0 smooths harder. 0.3 here smooths a little more than ewma5's default.",
-			builderQueryEnvelope(map[string]any{
-				"name":   "A",
-				"signal": "metrics",
-				"aggregations": []any{
-					map[string]any{"metricName": "http.server.duration.bucket", "spaceAggregation": "p95"},
-				},
-				"stepInterval": "60s",
-				"groupBy":      []any{map[string]any{"name": "service.name", "fieldContext": "resource"}},
-				"functions":    []any{function("ewma5", 0.3)},
-			}),
-		),
-		timeSeriesExample(
-			"function_median_despiked_request_rate",
-			"median5: request rate without one-step spikes",
-			"median3, median5 and median7 replace each point with the median of the surrounding 3, 5 or 7 points. A spike that lasts one step vanishes, a shift that lasts longer than half the window stays. The first and last half window, 2 points each for median5, have no full window and keep their values, so the newest spike stays visible; a series shorter than the window is returned unchanged. They take no arguments. Use them when the raw series is noisy and the chart is for a trend, not for catching the spike.",
-			builderQueryEnvelope(map[string]any{
-				"name":   "A",
-				"signal": "metrics",
-				"aggregations": []any{
-					map[string]any{"metricName": "http.server.duration.count", "timeAggregation": "rate", "spaceAggregation": "sum"},
-				},
-				"stepInterval": "60s",
-				"groupBy":      []any{map[string]any{"name": "service.name", "fieldContext": "resource"}},
-				"functions":    []any{function("median5")},
-			}),
-		),
-		timeSeriesExample(
-			"function_cumulativesum_errors_so_far",
-			"cumulativeSum: 5xx responses since the start of the window",
-			"cumulativeSum replaces each point with the sum of every point up to and including it, so a per-step count becomes a running total whose first point is the first count. It takes no arguments. The total resets with the window, so a longer time range gives a larger final value; it is a view of the window, not a counter.",
-			builderQueryEnvelope(map[string]any{
-				"name":         "A",
-				"signal":       "traces",
-				"aggregations": []any{map[string]any{"expression": "count()", "alias": "server_errors"}},
-				"stepInterval": "60s",
-				"filter":       map[string]any{"expression": "http.response.status_code >= 500"},
-				"groupBy":      []any{map[string]any{"name": "service.name", "fieldContext": "resource"}},
-				"functions":    []any{function("cumulativeSum")},
-			}),
-		),
-		timeSeriesExample(
-			"function_log10_network_bytes",
-			"log10: network throughput across devices that differ by orders of magnitude",
-			"log2 and log10 replace each value with its logarithm, so a loopback device moving kilobytes and an uplink moving gigabytes fit on one chart. They take no arguments. Zero and negative values have no logarithm and are not drawn. absolute, also without arguments, is the usual companion for a signed series before a logarithm.",
-			builderQueryEnvelope(map[string]any{
-				"name":   "A",
-				"signal": "metrics",
-				"aggregations": []any{
-					map[string]any{"metricName": "system.network.io", "timeAggregation": "rate", "spaceAggregation": "sum"},
-				},
-				"stepInterval": "60s",
-				"filter":       map[string]any{"expression": "direction = 'transmit'"},
-				"groupBy":      []any{map[string]any{"name": "device", "fieldContext": "attribute"}},
-				"functions":    []any{function("log10")},
-			}),
-		),
-		timeSeriesExample(
-			"function_anomaly_request_rate",
-			"anomaly: request rate scored against its daily pattern",
-			"anomaly is the one function with named arguments. seasonality says which past periods predict the current value: hourly, daily or weekly, daily when absent. z_score_threshold is how many standard deviations from the prediction count as an anomaly. It has no default: a request without it gets bounds of zero width, so send it. 3 is the value the UI sends. The response carries, next to the values, a predicted series, an upper and a lower bound series and an anomaly score series. The scoring runs in the enterprise build; the community build returns the series unchanged.",
-			builderQueryEnvelope(map[string]any{
-				"name":   "A",
-				"signal": "metrics",
-				"aggregations": []any{
-					map[string]any{"metricName": "http.server.duration.count", "timeAggregation": "rate", "spaceAggregation": "sum"},
-				},
-				"stepInterval": "300s",
-				"groupBy":      []any{map[string]any{"name": "service.name", "fieldContext": "resource"}},
-				"functions": []any{
-					map[string]any{
-						"name": "anomaly",
-						"args": []any{
-							map[string]any{"name": "seasonality", "value": "daily"},
-							map[string]any{"name": "z_score_threshold", "value": 3},
-						},
-					},
-				},
-			}),
-		),
-	}
-}

pkg/apiserver/signozapiserver/querier_examples_test.go

@@ -1,23 +0,0 @@
-package signozapiserver
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-)
-
-func TestQueryRangeFunctionExamplesAreValidRequests(t *testing.T) {
-	for _, example := range queryRangeFunctionExamples() {
-		t.Run(example.Name, func(t *testing.T) {
-			raw, err := json.Marshal(example.Value)
-			require.NoError(t, err)
-			var req qbtypes.QueryRangeRequest
-			require.NoError(t, json.Unmarshal(raw, &req))
-			assert.NoError(t, req.Validate())
-		})
-	}
-}

pkg/errors/suggestions.go

@@ -9,13 +9,12 @@ import (
 // NewValidReferences / NewSuggestionsOnLevenshteinDistance to phrase the
 // "valid <noun> are ..." list consistently across the codebase.
 const (
-	NounFields       = "fields"
-	NounKeys         = "keys"
-	NounServices     = "services"
-	NounQueryTypes   = "query types"
-	NounRequestTypes = "request types"
-	NounSignals      = "signals"
-	NounReferences   = "references"
+	NounFields     = "fields"
+	NounKeys       = "keys"
+	NounServices   = "services"
+	NounQueryTypes = "query types"
+	NounSignals    = "signals"
+	NounReferences = "references"
 )
 
 const (

pkg/http/render/render.go

@@ -5,9 +5,12 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/SigNoz/signoz/pkg/errors"
+	jsonv2 "github.com/go-json-experiment/json"
+	jsonv1 "github.com/go-json-experiment/json/v1"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/tidwall/gjson"
+
+	"github.com/SigNoz/signoz/pkg/errors"
 )
 
 const (
@@ -29,6 +32,11 @@ type ErrorResponse struct {
 }
 
 func Success(rw http.ResponseWriter, httpCode int, data interface{}) {
+	if _, ok := data.(jsonv2.MarshalerTo); ok {
+		successStream(rw, httpCode, data)
+		return
+	}
+
 	body, err := json.Marshal(&SuccessResponse{Status: StatusSuccess.s, Data: data})
 	if err != nil {
 		Error(rw, err)
@@ -134,3 +142,32 @@ func Error(rw http.ResponseWriter, cause error) {
 	rw.WriteHeader(httpCode)
 	_, _ = rw.Write(body)
 }
+
+// successStream writes the body as it is encoded. It can still render an error if encoding fails
+// before the first write; after that the status is sent and a failure leaves the body truncated.
+func successStream(rw http.ResponseWriter, httpCode int, data any) {
+	if httpCode == 0 {
+		httpCode = http.StatusOK
+	}
+
+	writer := &successStreamWriter{rw: rw, httpCode: httpCode}
+	if err := jsonv2.MarshalWrite(writer, &SuccessResponse{Status: StatusSuccess.s, Data: data}, jsonv1.DefaultOptionsV1()); err != nil && !writer.started {
+		Error(rw, err)
+	}
+}
+
+// successStreamWriter sends the headers on the first write.
+type successStreamWriter struct {
+	rw       http.ResponseWriter
+	httpCode int
+	started  bool
+}
+
+func (writer *successStreamWriter) Write(p []byte) (int, error) {
+	if !writer.started {
+		writer.started = true
+		writer.rw.Header().Set("Content-Type", "application/json")
+		writer.rw.WriteHeader(writer.httpCode)
+	}
+	return writer.rw.Write(p)
+}

pkg/http/render/render_test.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/SigNoz/signoz/pkg/errors"
+	"github.com/go-json-experiment/json/jsontext"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -210,3 +211,26 @@ func TestErrorRetryAfterHeader(t *testing.T) {
 		})
 	}
 }
+
+type streamedData []int
+
+func (data streamedData) MarshalJSONTo(enc *jsontext.Encoder) error {
+	if err := enc.WriteToken(jsontext.BeginArray); err != nil {
+		return err
+	}
+	for _, v := range data {
+		if err := enc.WriteToken(jsontext.Int(int64(v))); err != nil {
+			return err
+		}
+	}
+	return enc.WriteToken(jsontext.EndArray)
+}
+
+func TestSuccess_Stream(t *testing.T) {
+	recorder := httptest.NewRecorder()
+	Success(recorder, http.StatusAccepted, streamedData{1, 2, 3})
+
+	assert.Equal(t, http.StatusAccepted, recorder.Code)
+	assert.Equal(t, "application/json", recorder.Header().Get("Content-Type"))
+	assert.Equal(t, `{"status":"success","data":[1,2,3]}`, recorder.Body.String())
+}

pkg/querier/bucket_cache.go

@@ -915,15 +915,13 @@ func (bc *bucketCache) filterResultToTimeRange(result *qbtypes.Result, q qbtypes
 // as empty rows that the same request never has when it bypasses the cache.
 //
 // PromQL and ClickHouse queries name their own buckets, and a histogram's are
-// its `le` labels, so only a gauge, sum or summary axis and an event axis are cut.
+// its `le` labels, so only a gauge, sum or summary axis is cut.
 func (bc *bucketCache) trimHeatmapAxisToTheWindow(q qbtypes.Query, tsData *qbtypes.TimeSeriesData) {
-	switch query := q.(type) {
-	case *builderQuery[qbtypes.MetricAggregation]:
-		if query.spec.Aggregations[0].Type == metrictypes.HistogramType {
-			return
-		}
-	case *builderQuery[qbtypes.LogAggregation], *builderQuery[qbtypes.TraceAggregation]:
-	default:
+	metricQuery, isMetricQuery := q.(*builderQuery[qbtypes.MetricAggregation])
+	if !isMetricQuery {
+		return
+	}
+	if metricQuery.spec.Aggregations[0].Type == metrictypes.HistogramType {
 		return
 	}
 

pkg/querier/builder_query.go

@@ -77,7 +77,7 @@ func newBuilderQuery[T any](
 func (q *builderQuery[T]) Fingerprint() string {
 
 	if (q.spec.Signal == telemetrytypes.SignalTraces ||
-		q.spec.Signal == telemetrytypes.SignalLogs) && !q.kind.IsBuiltFromTimeSeries() {
+		q.spec.Signal == telemetrytypes.SignalLogs) && q.kind != qbtypes.RequestTypeTimeSeries {
 		// No caching for non-timeseries queries
 		return ""
 	}
@@ -88,13 +88,6 @@ func (q *builderQuery[T]) Fingerprint() string {
 		return ""
 	}
 
-	// A limit ranks the groups over the statement window, so the pieces of a
-	// window rank differently from the window. Such a query is never served
-	// from the cache.
-	if (q.spec.Signal == telemetrytypes.SignalLogs || q.spec.Signal == telemetrytypes.SignalTraces) && len(q.spec.GroupBy) > 0 && q.spec.Limit > 0 {
-		return ""
-	}
-
 	// Create a deterministic fingerprint for builder queries
 	// This needs to include all fields that affect the query results
 	parts := []string{q.queryType.StringValue()}
@@ -150,12 +143,6 @@ func (q *builderQuery[T]) Fingerprint() string {
 		parts = append(parts, fmt.Sprintf("aggs=[%s]", strings.Join(aggParts, ",")))
 	}
 
-	// A metrics heatmap carries its axis on the aggregation, which the loop above
-	// already fingerprinted. Logs and traces carry it on the spec.
-	if q.kind.CountsIntoBuckets() && q.spec.Signal != telemetrytypes.SignalMetrics {
-		parts = append(parts, "buckets="+fingerprintHeatmapBucketing(q.spec.BucketOptions.ToHeatmapBucketing()))
-	}
-
 	// Add filter if present
 	if q.spec.Filter != nil && q.spec.Filter.Expression != "" {
 		parts = append(parts, fmt.Sprintf("filter=%s", q.spec.Filter.Expression))

pkg/querier/postprocess.go

@@ -146,8 +146,6 @@ func (q *querier) postProcessResults(ctx context.Context, orgID valuer.UUID, res
 			if err != nil {
 				return nil, err
 			}
-			funcs := []qbtypes.Function{{Name: qbtypes.FunctionNameFillZero}}
-			funcs = q.prepareFillZeroArgsWithStep(funcs, req, stepInterval)
 			// empty time series if it doesn't exist
 			tsData, ok := typedResults[name].Value.(*qbtypes.TimeSeriesData)
 			if !ok {
@@ -170,7 +168,9 @@ func (q *querier) postProcessResults(ctx context.Context, orgID valuer.UUID, res
 				}
 			}
 
-			typedResults[name] = q.applyFunctions(typedResults[name], funcs)
+			startMs := querybuilder.ToNanoSecs(req.Start) / 1_000_000
+			endMs := querybuilder.ToNanoSecs(req.End) / 1_000_000
+			tsData.SetZeroFill(int64(startMs), int64(endMs), stepInterval)
 		}
 	}
 
@@ -191,14 +191,6 @@ func postProcessBuilderQuery[T any](
 	req *qbtypes.QueryRangeRequest,
 ) *qbtypes.Result {
 
-	// A disabled query feeds a formula as a time series, so only an enabled one
-	// came back bucketed.
-	if req.RequestType.CountsIntoBuckets() && !query.Disabled {
-		if tsData, ok := result.Value.(*qbtypes.TimeSeriesData); ok {
-			resolveHeatmapBucketAxis(tsData, query.BucketOptions.ToHeatmapBucketing())
-		}
-	}
-
 	// the statement's top-N already skipped offset groups by their whole-window value; only reorder here
 	result = q.applySeriesLimit(result, query.Limit, 0, query.Order)
 
@@ -433,12 +425,6 @@ func (q *querier) processTimeSeriesFormula(
 		return nil
 	}
 
-	formulaSeries, err = applyFormulaHaving(formula, formulaSeries)
-	if err != nil {
-		q.logger.ErrorContext(ctx, "failed to apply formula having", errors.Attr(err), slog.String("formula", formula.Name))
-		return nil
-	}
-
 	// Create result for formula
 	formulaResult := &qbtypes.TimeSeriesData{
 		QueryName: formula.Name,
@@ -674,12 +660,6 @@ func (q *querier) processScalarFormula(
 		return nil
 	}
 
-	formulaSeries, err = applyFormulaHaving(formula, formulaSeries)
-	if err != nil {
-		q.logger.ErrorContext(ctx, "failed to apply formula having", errors.Attr(err), slog.String("formula", formula.Name))
-		return nil
-	}
-
 	// Apply ordering (and limit) before converting to scalar format.
 	formulaSeries = qbtypes.ApplySeriesLimit(formulaSeries, formula.Order, formula.Limit, formula.Offset)
 
@@ -730,35 +710,6 @@ func (q *querier) processScalarFormula(
 	}
 }
 
-// applyFormulaHaving keeps the values the formula having accepts, as SQL HAVING
-// keeps rows for a builder query, so a series with no values left is removed. It
-// runs before functions, order, limit, and offset, as HAVING runs before them in SQL.
-func applyFormulaHaving(formula qbtypes.QueryBuilderFormula, series []*qbtypes.TimeSeries) ([]*qbtypes.TimeSeries, error) {
-	if formula.Having == nil || strings.TrimSpace(formula.Having.Expression) == "" {
-		return series, nil
-	}
-
-	keep, err := querybuilder.CompileFormulaHaving(formula.Name, formula.Having.Expression)
-	if err != nil {
-		return nil, err
-	}
-
-	kept := series[:0]
-	for _, s := range series {
-		values := s.Values[:0]
-		for _, value := range s.Values {
-			if keep(value.Value) {
-				values = append(values, value)
-			}
-		}
-		if len(values) > 0 {
-			s.Values = values
-			kept = append(kept, s)
-		}
-	}
-	return kept, nil
-}
-
 // filterDisabledQueries removes results for disabled queries.
 func (q *querier) filterDisabledQueries(results map[string]*qbtypes.Result, req *qbtypes.QueryRangeRequest) map[string]*qbtypes.Result {
 	filtered := make(map[string]*qbtypes.Result)

pkg/querier/querier.go

@@ -212,14 +212,6 @@ func (q *querier) buildQueries(
 		}
 
 		switch query.Type {
-		case qbtypes.QueryTypeFormula:
-			// the querier evaluates a formula after its queries run, so a bad
-			// having must fail here, before they run
-			if formula, ok := query.Spec.(qbtypes.QueryBuilderFormula); ok && formula.Having != nil && strings.TrimSpace(formula.Having.Expression) != "" {
-				if _, err := querybuilder.CompileFormulaHaving(formula.Name, formula.Having.Expression); err != nil {
-					return nil, nil, err
-				}
-			}
 		case qbtypes.QueryTypePromQL:
 			promQuery, ok := query.Spec.(qbtypes.PromQuery)
 			if !ok {
@@ -257,30 +249,27 @@ func (q *querier) buildQueries(
 			if !ok {
 				return nil, nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid AI builder query spec %T", query.Spec)
 			}
-			requestType := requestTypeForQuery(req.RequestType, spec.Disabled)
 			spec.ShiftBy = extractShiftFromBuilderQuery(spec)
-			timeRange := adjustTimeRangeForShift(spec, qbtypes.TimeRange{From: req.Start, To: req.End}, requestType)
-			bq := newBuilderQuery(q.logger, q.telemetryStore, orgID, q.aiTraceStmtBuilder, query.Type, spec, timeRange, requestType, tmplVars, builderConfig{})
+			timeRange := adjustTimeRangeForShift(spec, qbtypes.TimeRange{From: req.Start, To: req.End}, req.RequestType)
+			bq := newBuilderQuery(q.logger, q.telemetryStore, orgID, q.aiTraceStmtBuilder, query.Type, spec, timeRange, req.RequestType, tmplVars, builderConfig{})
 			queries[spec.Name] = bq
 			steps[spec.Name] = spec.StepInterval
 		case qbtypes.QueryTypeBuilder:
 			switch spec := query.Spec.(type) {
 			case qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation]:
-				requestType := requestTypeForQuery(req.RequestType, spec.Disabled)
 				spec.ShiftBy = extractShiftFromBuilderQuery(spec)
-				timeRange := adjustTimeRangeForShift(spec, qbtypes.TimeRange{From: req.Start, To: req.End}, requestType)
-				bq := newBuilderQuery(q.logger, q.telemetryStore, orgID, q.traceStmtBuilder, query.Type, spec, timeRange, requestType, tmplVars, builderConfig{})
+				timeRange := adjustTimeRangeForShift(spec, qbtypes.TimeRange{From: req.Start, To: req.End}, req.RequestType)
+				bq := newBuilderQuery(q.logger, q.telemetryStore, orgID, q.traceStmtBuilder, query.Type, spec, timeRange, req.RequestType, tmplVars, builderConfig{})
 				queries[spec.Name] = bq
 				steps[spec.Name] = spec.StepInterval
 			case qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]:
-				requestType := requestTypeForQuery(req.RequestType, spec.Disabled)
 				spec.ShiftBy = extractShiftFromBuilderQuery(spec)
-				timeRange := adjustTimeRangeForShift(spec, qbtypes.TimeRange{From: req.Start, To: req.End}, requestType)
+				timeRange := adjustTimeRangeForShift(spec, qbtypes.TimeRange{From: req.Start, To: req.End}, req.RequestType)
 				stmtBuilder := q.logStmtBuilder
 				if spec.Source == telemetrytypes.SourceAudit {
 					stmtBuilder = q.auditStmtBuilder
 				}
-				bq := newBuilderQuery(q.logger, q.telemetryStore, orgID, stmtBuilder, query.Type, spec, timeRange, requestType, tmplVars, q.builderConfig)
+				bq := newBuilderQuery(q.logger, q.telemetryStore, orgID, stmtBuilder, query.Type, spec, timeRange, req.RequestType, tmplVars, q.builderConfig)
 				queries[spec.Name] = bq
 				steps[spec.Name] = spec.StepInterval
 			case qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]:
@@ -291,7 +280,13 @@ func (q *querier) buildQueries(
 				if missingMetricQuerySet[spec.Name] {
 					continue
 				}
-				requestType := requestTypeForQuery(req.RequestType, spec.Disabled)
+				requestType := req.RequestType
+				if requestType.CountsIntoBuckets() && spec.Disabled {
+					// A disabled query in a heatmap request feeds a formula, and the
+					// formula converts time series into heatmap data, so its inputs
+					// run as time series queries.
+					requestType = qbtypes.RequestTypeTimeSeries
+				}
 				spec.ShiftBy = extractShiftFromBuilderQuery(spec)
 				timeRange := adjustTimeRangeForShift(spec, qbtypes.TimeRange{From: req.Start, To: req.End}, requestType)
 				var bq *builderQuery[qbtypes.MetricAggregation]
@@ -927,25 +922,32 @@ func (q *querier) createRangedQuery(_ valuer.UUID, originalQuery qbtypes.Query,
 		copy(argsCopy, qt.args)
 		return newchSQLQuery(q.logger, q.telemetryStore, queryCopy, argsCopy, timeRange, qt.kind, qt.vars)
 
-	// A builder query's window was moved into the shifted clock when it was
-	// built, so a range taken from that window must not be shifted again.
 	case *builderQuery[qbtypes.TraceAggregation]:
+		specCopy := qt.spec.Copy()
+		specCopy.ShiftBy = extractShiftFromBuilderQuery(specCopy)
+		adjustedTimeRange := adjustTimeRangeForShift(specCopy, timeRange, qt.kind)
 		// reuse the original query's statement builder and type so an AI query
 		// keeps its AI builder and cache key
-		return newBuilderQuery(q.logger, q.telemetryStore, qt.orgID, qt.stmtBuilder, qt.queryType, qt.spec.Copy(), timeRange, qt.kind, qt.variables, qt.builderConfig)
+		return newBuilderQuery(q.logger, q.telemetryStore, qt.orgID, qt.stmtBuilder, qt.queryType, specCopy, adjustedTimeRange, qt.kind, qt.variables, qt.builderConfig)
 
 	case *builderQuery[qbtypes.LogAggregation]:
+		specCopy := qt.spec.Copy()
+		specCopy.ShiftBy = extractShiftFromBuilderQuery(specCopy)
+		adjustedTimeRange := adjustTimeRangeForShift(specCopy, timeRange, qt.kind)
 		shiftStmtBuilder := q.logStmtBuilder
 		if qt.spec.Source == telemetrytypes.SourceAudit {
 			shiftStmtBuilder = q.auditStmtBuilder
 		}
-		return newBuilderQuery(q.logger, q.telemetryStore, qt.orgID, shiftStmtBuilder, qt.queryType, qt.spec.Copy(), timeRange, qt.kind, qt.variables, q.builderConfig)
+		return newBuilderQuery(q.logger, q.telemetryStore, qt.orgID, shiftStmtBuilder, qt.queryType, specCopy, adjustedTimeRange, qt.kind, qt.variables, q.builderConfig)
 
 	case *builderQuery[qbtypes.MetricAggregation]:
+		specCopy := qt.spec.Copy()
+		specCopy.ShiftBy = extractShiftFromBuilderQuery(specCopy)
+		adjustedTimeRange := adjustTimeRangeForShift(specCopy, timeRange, qt.kind)
 		if qt.spec.Source == telemetrytypes.SourceMeter {
-			return newBuilderQuery(q.logger, q.telemetryStore, qt.orgID, q.meterStmtBuilder, qt.queryType, qt.spec.Copy(), timeRange, qt.kind, qt.variables, builderConfig{})
+			return newBuilderQuery(q.logger, q.telemetryStore, qt.orgID, q.meterStmtBuilder, qt.queryType, specCopy, adjustedTimeRange, qt.kind, qt.variables, builderConfig{})
 		}
-		return newBuilderQuery(q.logger, q.telemetryStore, qt.orgID, q.metricStmtBuilder, qt.queryType, qt.spec.Copy(), timeRange, qt.kind, qt.variables, builderConfig{})
+		return newBuilderQuery(q.logger, q.telemetryStore, qt.orgID, q.metricStmtBuilder, qt.queryType, specCopy, adjustedTimeRange, qt.kind, qt.variables, builderConfig{})
 	case *traceOperatorQuery:
 		specCopy := qt.spec.Copy()
 		return &traceOperatorQuery{
@@ -1193,17 +1195,6 @@ func clampStep(qe *qbtypes.QueryEnvelope, recommended, min uint64, warnings *[]s
 	}
 }
 
-// requestTypeForQuery downgrades a disabled query in a heatmap request to a
-// time series one. A disabled query feeds a formula rather than the chart, and
-// the formula is what turns time series into cells, so its inputs state no
-// bucket axis of their own.
-func requestTypeForQuery(requestType qbtypes.RequestType, disabled bool) qbtypes.RequestType {
-	if requestType.CountsIntoBuckets() && disabled {
-		return qbtypes.RequestTypeTimeSeries
-	}
-	return requestType
-}
-
 // extractShiftFromBuilderQuery extracts the shift value from timeShift function if present.
 func extractShiftFromBuilderQuery[T any](spec qbtypes.QueryBuilderQuery[T]) int64 {
 	for _, fn := range spec.Functions {

pkg/querybuilder/formula_having.go

@@ -1,166 +0,0 @@
-package querybuilder
-
-import (
-	"math"
-	"slices"
-	"strconv"
-
-	grammar "github.com/SigNoz/signoz/pkg/parser/havingexpression/grammar"
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-)
-
-// CompileFormulaHaving turns the having expression of a formula into a filter on
-// its values. The querier computes a formula in Go after ClickHouse returns, so the
-// having cannot run as SQL; it gets the same validation and messages as a
-// builder-query having, with the formula name and __result as the only references.
-func CompileFormulaHaving(formulaName, expression string) (func(value float64) bool, error) {
-	rewriter := &HavingExpressionRewriter{columnMap: map[string]string{
-		formulaName:               qbtypes.DefaultOrderByKey,
-		qbtypes.DefaultOrderByKey: qbtypes.DefaultOrderByKey,
-	}}
-	_, tree, err := rewriter.parseAndValidate(expression)
-	if err != nil {
-		return nil, err
-	}
-
-	return compileOrExpression(tree.Expression().OrExpression()), nil
-}
-
-func compileOrExpression(ctx grammar.IOrExpressionContext) func(float64) bool {
-	andExpressions := ctx.AllAndExpression()
-	conditions := make([]func(float64) bool, len(andExpressions))
-	for i, andExpression := range andExpressions {
-		conditions[i] = compileAndExpression(andExpression)
-	}
-
-	return func(value float64) bool {
-		for _, condition := range conditions {
-			if condition(value) {
-				return true
-			}
-		}
-		return false
-	}
-}
-
-func compileAndExpression(ctx grammar.IAndExpressionContext) func(float64) bool {
-	primaries := ctx.AllPrimary()
-	conditions := make([]func(float64) bool, len(primaries))
-	for i, primary := range primaries {
-		conditions[i] = compilePrimary(primary)
-	}
-
-	return func(value float64) bool {
-		for _, condition := range conditions {
-			if !condition(value) {
-				return false
-			}
-		}
-		return true
-	}
-}
-
-func compilePrimary(ctx grammar.IPrimaryContext) func(float64) bool {
-	var condition func(float64) bool
-	if ctx.OrExpression() != nil {
-		condition = compileOrExpression(ctx.OrExpression())
-	} else {
-		condition = compileComparison(ctx.Comparison())
-	}
-
-	if ctx.NOT() == nil {
-		return condition
-	}
-	return func(value float64) bool { return !condition(value) }
-}
-
-func compileComparison(ctx grammar.IComparisonContext) func(float64) bool {
-	left := compileOperand(ctx.Operand(0))
-
-	if ctx.IN() != nil {
-		signedNumbers := ctx.InList().AllSignedNumber()
-		list := make([]float64, len(signedNumbers))
-		for i, signedNumber := range signedNumbers {
-			list[i] = parseHavingNumber(signedNumber.GetText())
-		}
-		notIn := ctx.NOT() != nil
-		return func(value float64) bool { return slices.Contains(list, left(value)) != notIn }
-	}
-
-	right := compileOperand(ctx.Operand(1))
-	compOp := ctx.CompOp()
-	switch {
-	case compOp.EQUALS() != nil:
-		return func(value float64) bool { return left(value) == right(value) }
-	case compOp.NOT_EQUALS() != nil, compOp.NEQ() != nil:
-		return func(value float64) bool { return left(value) != right(value) }
-	case compOp.LT() != nil:
-		return func(value float64) bool { return left(value) < right(value) }
-	case compOp.LE() != nil:
-		return func(value float64) bool { return left(value) <= right(value) }
-	case compOp.GT() != nil:
-		return func(value float64) bool { return left(value) > right(value) }
-	default:
-		return func(value float64) bool { return left(value) >= right(value) }
-	}
-}
-
-func compileOperand(ctx grammar.IOperandContext) func(float64) float64 {
-	if ctx.Operand() == nil {
-		return compileTerm(ctx.Term())
-	}
-
-	left := compileOperand(ctx.Operand())
-	right := compileTerm(ctx.Term())
-	if ctx.MINUS() != nil {
-		return func(value float64) float64 { return left(value) - right(value) }
-	}
-	return func(value float64) float64 { return left(value) + right(value) }
-}
-
-func compileTerm(ctx grammar.ITermContext) func(float64) float64 {
-	if ctx.Term() == nil {
-		return compileFactor(ctx.Factor())
-	}
-
-	left := compileTerm(ctx.Term())
-	right := compileFactor(ctx.Factor())
-	switch {
-	case ctx.SLASH() != nil:
-		return func(value float64) float64 { return left(value) / right(value) }
-	case ctx.PERCENT() != nil:
-		return func(value float64) float64 { return math.Mod(left(value), right(value)) }
-	default:
-		return func(value float64) float64 { return left(value) * right(value) }
-	}
-}
-
-func compileFactor(ctx grammar.IFactorContext) func(float64) float64 {
-	if ctx.Factor() != nil {
-		inner := compileFactor(ctx.Factor())
-		if ctx.MINUS() != nil {
-			return func(value float64) float64 { return -inner(value) }
-		}
-		return inner
-	}
-
-	if ctx.Operand() != nil {
-		return compileOperand(ctx.Operand())
-	}
-
-	if number := ctx.Atom().NUMBER(); number != nil {
-		constant := parseHavingNumber(number.GetText())
-		return func(float64) float64 { return constant }
-	}
-
-	// validation rejects function calls, strings, and unknown names, so the atom
-	// names the formula value
-	return func(value float64) float64 { return value }
-}
-
-// ParseFloat reads every form the lexer admits as a number; a literal outside the
-// float64 range becomes the nearest value ParseFloat returns.
-func parseHavingNumber(text string) float64 {
-	number, _ := strconv.ParseFloat(text, 64)
-	return number
-}

pkg/querybuilder/formula_having_test.go

@@ -1,86 +0,0 @@
-package querybuilder
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-)
-
-func TestCompileFormulaHaving_Matches(t *testing.T) {
-	values := []float64{-2, 0, 1, 2.5, 3, 10}
-
-	testCases := []struct {
-		name       string
-		expression string
-		want       []float64
-	}{
-		{name: "Name_GreaterThan", expression: "F1 > 2", want: []float64{2.5, 3, 10}},
-		{name: "Result_LessOrEqual", expression: "__result <= 1", want: []float64{-2, 0, 1}},
-		{name: "DoubleEquals", expression: "F1 == 3", want: []float64{3}},
-		{name: "AngleNotEquals", expression: "F1 <> 0", want: []float64{-2, 1, 2.5, 3, 10}},
-		{name: "In_Parentheses", expression: "F1 IN (0, 3, -2)", want: []float64{-2, 0, 3}},
-		{name: "NotIn_Brackets", expression: "F1 NOT IN [0, 3, -2]", want: []float64{1, 2.5, 10}},
-		{name: "AndBindsTighterThanOr", expression: "F1 > 0 AND F1 < 3 OR F1 = -2", want: []float64{-2, 1, 2.5}},
-		{name: "ImplicitAnd", expression: "F1 > 0 F1 < 3", want: []float64{1, 2.5}},
-		{name: "LowercaseKeywords", expression: "F1 > 2 and not F1 = 10", want: []float64{2.5, 3}},
-		{name: "NotParenthesized", expression: "NOT (F1 >= 1 AND F1 <= 3)", want: []float64{-2, 0, 10}},
-		{name: "Arithmetic", expression: "F1 * 2 - 1 > 4", want: []float64{3, 10}},
-		{name: "Arithmetic_Parentheses", expression: "(F1 + 2) / 2 >= 2", want: []float64{2.5, 3, 10}},
-		{name: "Modulo", expression: "F1 % 2 = 1", want: []float64{1, 3}},
-		{name: "UnaryMinus", expression: "-F1 > 1", want: []float64{-2}},
-		{name: "Number_Exponent", expression: "F1 >= 1e1", want: []float64{10}},
-		{name: "Number_LeadingDot", expression: "F1 < .5", want: []float64{-2, 0}},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			keep, err := CompileFormulaHaving("F1", testCase.expression)
-			require.NoError(t, err)
-			require.NotNil(t, keep)
-
-			got := []float64{}
-			for _, value := range values {
-				if keep(value) {
-					got = append(got, value)
-				}
-			}
-			assert.Equal(t, testCase.want, got)
-		})
-	}
-}
-
-func TestCompileFormulaHaving_Invalid(t *testing.T) {
-	testCases := []struct {
-		name           string
-		expression     string
-		wantErrMsg     string
-		wantAdditional []string
-	}{
-		{
-			name:           "QueryName_NotAReference",
-			expression:     "A > 0",
-			wantErrMsg:     "Invalid references in `Having` expression: [A]",
-			wantAdditional: []string{"Valid references are: [F1, __result]"},
-		},
-		{
-			name:           "Aggregation_NotAReference",
-			expression:     "count() > 0",
-			wantErrMsg:     "Invalid references in `Having` expression: [count]",
-			wantAdditional: []string{"Valid references are: [F1, __result]"},
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			keep, err := CompileFormulaHaving("F1", testCase.expression)
-			require.Error(t, err)
-			assert.Nil(t, keep)
-			assert.True(t, errors.Ast(err, errors.TypeInvalidInput))
-			assert.ErrorContains(t, err, testCase.wantErrMsg)
-			assert.Equal(t, testCase.wantAdditional, additionalMessages(err))
-		})
-	}
-}

pkg/querybuilder/having_expression_validator.go

@@ -237,13 +237,7 @@ func (v *havingExpressionRewriteVisitor) visitIdentifier(ctx grammar.IIdentifier
 	return name
 }
 
-func (r *HavingExpressionRewriter) rewriteAndValidate(expression string) (string, error) {
-	rewritten, _, err := r.parseAndValidate(expression)
-	return rewritten, err
-}
-
-// parseAndValidate is the single-pass implementation used by all RewriteFor* methods.
-// It also returns the parse tree, which CompileFormulaHaving evaluates in Go.
+// rewriteAndValidate is the single-pass implementation used by all RewriteFor* methods.
 //
 // Validation layers:
 //  1. The visitor runs on the parse tree, rewriting and collecting invalid references.
@@ -254,7 +248,7 @@ func (r *HavingExpressionRewriter) rewriteAndValidate(expression string) (string
 //  2. String literals in comparison-operand position → descriptive error
 //     ("aggregator results are numeric").
 //  3. ANTLR syntax errors → error with messages referencing the original token names.
-func (r *HavingExpressionRewriter) parseAndValidate(expression string) (string, grammar.IQueryContext, error) {
+func (r *HavingExpressionRewriter) rewriteAndValidate(expression string) (string, error) {
 	original := strings.TrimSpace(expression)
 
 	// Parse the expression once.
@@ -287,7 +281,7 @@ func (r *HavingExpressionRewriter) parseAndValidate(expression string) (string,
 	// This is checked before invalid references so that "contains string literals" takes
 	// priority when a bare string literal is also an unresolvable operand.
 	if v.hasStringLiteral {
-		return "", nil, errors.NewInvalidInputf(
+		return "", errors.NewInvalidInputf(
 			errors.CodeInvalidInput,
 			"`Having` expression contains string literals",
 		).WithAdditional("Aggregator results are numeric")
@@ -323,7 +317,7 @@ func (r *HavingExpressionRewriter) parseAndValidate(expression string) (string,
 		).WithAdditional(
 			"Valid references are: [" + strings.Join(validKeys, ", ") + "]",
 		).WithSuggestions(suggestions...)
-		return "", nil, havingErr
+		return "", havingErr
 	}
 
 	// Layer 3 – ANTLR syntax errors. We parse the original expression, so error messages
@@ -349,12 +343,12 @@ func (r *HavingExpressionRewriter) parseAndValidate(expression string) (string,
 				return havingSuggestion(allSyntaxErrors[0], original)
 			})
 
-			return "", nil, havingErr.WithSuggestiveAdditional(msgs[0], suggestions...)
+			return "", havingErr.WithSuggestiveAdditional(msgs[0], suggestions...)
 		}
-		return "", nil, havingErr.WithAdditional(msgs...)
+		return "", havingErr.WithAdditional(msgs...)
 	}
 
-	return result, tree, nil
+	return result, nil
 }
 
 // havingSuggestion returns a corrected expression string to show as a suggestion when

pkg/querybuilder/heatmap.go

@@ -1,136 +0,0 @@
-package querybuilder
-
-import (
-	"context"
-	"fmt"
-	"math"
-	"strconv"
-
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-	"github.com/huandu/go-sqlbuilder"
-)
-
-// heatmapBucketValueAlias names the value a heatmap's bounds are cut from. The
-// bounds read it several times, so it is declared once as a WITH expression
-// alias rather than repeated.
-const heatmapBucketValueAlias = "__bucket_value"
-
-// RenderHeatmapBucketExprs renders the bucket (min, max] that valueExpr falls
-// in. Only the bucket under everything the axis covers is open below, and only
-// the one over it is open above.
-//
-// valueExpr is repeated several times in each expression, so it has to be free
-// of placeholders — HeatmapBucketColumns passes an alias for that reason.
-func RenderHeatmapBucketExprs(bucketing qbtypes.HeatmapBucketing, valueExpr string) (minExpr, maxExpr string) {
-	if bucketing.Kind == qbtypes.BucketsKindLinear {
-		return renderLinearBucketExprs(bucketing, valueExpr)
-	}
-	return renderLogBucketExprs(valueExpr)
-}
-
-func renderLinearBucketExprs(bucketing qbtypes.HeatmapBucketing, valueExpr string) (string, string) {
-	maxValue := FormatHeatmapFloat(bucketing.MaxValue)
-	numBuckets := strconv.Itoa(bucketing.NumBuckets)
-	index := fmt.Sprintf("least(greatest(ceil(%s * %s / %s), 1), %s)", valueExpr, numBuckets, maxValue, numBuckets)
-
-	minExpr := fmt.Sprintf(
-		"multiIf(%s <= 0, toFloat64('-Inf'), %s > %s, toFloat64(%s), (%s - 1) * %s / %s)",
-		valueExpr, valueExpr, maxValue, maxValue, index, maxValue, numBuckets,
-	)
-	maxExpr := fmt.Sprintf(
-		"multiIf(%s <= 0, toFloat64(0), %s > %s, toFloat64('+Inf'), %s * %s / %s)",
-		valueExpr, valueExpr, maxValue, index, maxValue, numBuckets,
-	)
-	return minExpr, maxExpr
-}
-
-// ClickHouse buckets at MaxLogScale whatever HeatmapBucketing.LogScale asks for;
-// postprocessing folds the axis down afterwards.
-func renderLogBucketExprs(valueExpr string) (string, string) {
-	bucketsPerDoubling := FormatHeatmapFloat(math.Exp2(qbtypes.MaxLogScale))
-	lowest := FormatHeatmapFloat(qbtypes.MinLogUpperBound)
-	highest := FormatHeatmapFloat(qbtypes.MaxLogUpperBound)
-
-	minExpr := fmt.Sprintf(
-		"multiIf(%s <= 0, toFloat64('-Inf'), %s <= %s, toFloat64(0), %s > %s, toFloat64(%s), pow(2, (ceil(log2(%s) * %s) - 1) / %s))",
-		valueExpr, valueExpr, lowest, valueExpr, highest, highest, valueExpr, bucketsPerDoubling, bucketsPerDoubling,
-	)
-	maxExpr := fmt.Sprintf(
-		"multiIf(%s <= 0, toFloat64(0), %s <= %s, %s, %s > %s, toFloat64('+Inf'), pow(2, ceil(log2(%s) * %s) / %s))",
-		valueExpr, valueExpr, lowest, lowest, valueExpr, highest, valueExpr, bucketsPerDoubling, bucketsPerDoubling,
-	)
-	return minExpr, maxExpr
-}
-
-// FormatHeatmapFloat renders a float64 as the shortest literal that reads back
-// as the same value, so an upper bound computed from it is identical on every
-// row.
-func FormatHeatmapFloat(v float64) string {
-	return strconv.FormatFloat(v, 'g', -1, 64)
-}
-
-// HeatmapFieldMayBeAbsent reports whether some row can lack key. A key that
-// resolves to a table column every row carries, such as a span's duration,
-// cannot, as the column is read first, and an EXISTS on it would drop its
-// zeros instead.
-func HeatmapFieldMayBeAbsent(
-	ctx context.Context,
-	info qbtypes.QueryInfo,
-	storage qbtypes.Storage,
-	key *telemetrytypes.TelemetryFieldKey,
-	keys map[string][]*telemetrytypes.TelemetryFieldKey,
-) (bool, error) {
-	resolved, err := Resolve(ctx, info, storage, key, qbtypes.FilterOperatorUnknown, nil, keys)
-	if err != nil {
-		return false, err
-	}
-	for _, field := range resolved.Fields {
-		read, err := LogicalRead(ctx, info, storage, field)
-		if err != nil {
-			return false, err
-		}
-		if read.WhenAbsent == qbtypes.AlwaysPresent {
-			return false, nil
-		}
-	}
-	return true, nil
-}
-
-// HeatmapBucketColumns adds the bucket a row's value falls in to sb's select
-// list, as the (min, max] pair a heatmap statement reports. key is the field
-// the axis is cut from, already adjusted for context and data type.
-//
-// The bounds read the value through an expression alias rather than repeating
-// it, so the returned fragment has to be declared alongside the caller's CTEs.
-// It carries no arguments of its own.
-//
-// A row without a numeric value counts as 0.
-func HeatmapBucketColumns(
-	ctx context.Context,
-	info qbtypes.QueryInfo,
-	storage qbtypes.Storage,
-	sb *sqlbuilder.SelectBuilder,
-	key *telemetrytypes.TelemetryFieldKey,
-	bucketOptions *qbtypes.BucketOptions,
-	keys map[string][]*telemetrytypes.TelemetryFieldKey,
-) (valueFragment string, groupByAliases []string, warnings []string, err error) {
-	// Resolved directly rather than through ResolveColumn: a key nothing carries
-	// puts every row at 0, and the warning is the only thing that says why.
-	resolved, err := Resolve(ctx, info, storage, key, qbtypes.FilterOperatorUnknown, nil, keys)
-	if err != nil {
-		return "", nil, nil, err
-	}
-	valueExpr, err := Column(ctx, info, storage, resolved, telemetrytypes.FieldDataTypeFloat64)
-	if err != nil {
-		return "", nil, nil, err
-	}
-
-	bucketMin, bucketMax := RenderHeatmapBucketExprs(bucketOptions.ToHeatmapBucketing(), heatmapBucketValueAlias)
-
-	sb.SelectMore(sqlbuilder.Escape(fmt.Sprintf("%s AS %s", bucketMin, qbtypes.HeatmapBucketMinColumn)))
-	sb.SelectMore(sqlbuilder.Escape(fmt.Sprintf("%s AS %s", bucketMax, qbtypes.HeatmapBucketMaxColumn)))
-
-	valueFragment = fmt.Sprintf("ifNull(%s, 0) AS %s", valueExpr, heatmapBucketValueAlias)
-	return valueFragment, []string{qbtypes.HeatmapBucketMinColumn, qbtypes.HeatmapBucketMaxColumn}, resolved.Warnings, nil
-}

pkg/statementbuilder/auditstatementbuilder/statement_builder.go

@@ -110,8 +110,6 @@ func (b *auditQueryStatementBuilder) Build(
 		stmt, err = b.buildListQuery(ctx, orgID, q, query, start, end, keys, variables)
 	case qbtypes.RequestTypeTimeSeries:
 		stmt, err = b.buildTimeSeriesQuery(ctx, orgID, q, query, start, end, keys, variables)
-	case qbtypes.RequestTypeHeatmap, qbtypes.RequestTypeDistribution:
-		stmt, err = b.buildHeatmapTimeSeriesQuery(ctx, orgID, q, query, start, end, keys, variables)
 	case qbtypes.RequestTypeScalar:
 		stmt, err = b.buildScalarQuery(ctx, orgID, q, query, start, end, keys, false, variables)
 	default:
@@ -324,48 +322,6 @@ func (b *auditQueryStatementBuilder) buildTimeSeriesQuery(
 	start, end uint64,
 	keys map[string][]*telemetrytypes.TelemetryFieldKey,
 	variables map[string]qbtypes.VariableItem,
-) (*qbtypes.Statement, error) {
-	return b.buildTimeSeriesOrHeatmapQuery(ctx, orgID, sb, query, start, end, keys, variables, nil)
-}
-
-// buildHeatmapTimeSeriesQuery counts rows per (time bucket, group, value
-// bucket) of the field its aggregation names.
-func (b *auditQueryStatementBuilder) buildHeatmapTimeSeriesQuery(
-	ctx context.Context,
-	orgID valuer.UUID,
-	sb *sqlbuilder.SelectBuilder,
-	query qbtypes.QueryBuilderQuery[qbtypes.LogAggregation],
-	start, end uint64,
-	keys map[string][]*telemetrytypes.TelemetryFieldKey,
-	variables map[string]qbtypes.VariableItem,
-) (*qbtypes.Statement, error) {
-	heatmapField, countQuery, err := qbtypes.HeatmapCountQuery(query)
-	if err != nil {
-		return nil, err
-	}
-	info := querybuilder.NewQueryInfo(ctx, orgID, b.fl, telemetrytypes.SignalLogs, nil, start, end)
-	mayBeAbsent, err := querybuilder.HeatmapFieldMayBeAbsent(ctx, info, b.storage, heatmapField, keys)
-	if err != nil {
-		return nil, err
-	}
-	if mayBeAbsent {
-		countQuery = qbtypes.RequireHeatmapField(countQuery, *heatmapField)
-	}
-	return b.buildTimeSeriesOrHeatmapQuery(ctx, orgID, sb, countQuery, start, end, keys, variables, heatmapField)
-}
-
-// buildTimeSeriesOrHeatmapQuery builds one row per (time bucket, group). A
-// non-nil heatmapField makes it a heatmap instead: the bucket a row's
-// heatmapField falls in joins the group keys, so a row is one cell.
-func (b *auditQueryStatementBuilder) buildTimeSeriesOrHeatmapQuery(
-	ctx context.Context,
-	orgID valuer.UUID,
-	sb *sqlbuilder.SelectBuilder,
-	query qbtypes.QueryBuilderQuery[qbtypes.LogAggregation],
-	start, end uint64,
-	keys map[string][]*telemetrytypes.TelemetryFieldKey,
-	variables map[string]qbtypes.VariableItem,
-	heatmapField *telemetrytypes.TelemetryFieldKey,
 ) (*qbtypes.Statement, error) {
 	var (
 		cteFragments   []string
@@ -401,17 +357,6 @@ func (b *auditQueryStatementBuilder) buildTimeSeriesOrHeatmapQuery(
 		fieldNames = append(fieldNames, sqlbuilder.Escape(clickhousesql.Identifier(gb.Name)))
 	}
 
-	var bucketAliases []string
-	if heatmapField != nil {
-		valueFragment, aliases, warnings, err := querybuilder.HeatmapBucketColumns(ctx, info, b.storage, sb, heatmapField, query.BucketOptions, keys)
-		if err != nil {
-			return nil, err
-		}
-		cteFragments = append(cteFragments, valueFragment)
-		bucketAliases = aliases
-		columnWarnings = append(columnWarnings, warnings...)
-	}
-
 	allAggChArgs := make([]any, 0)
 	for i, agg := range query.Aggregations {
 		rewritten, chArgs, aggWarnings, err := b.aggExprRewriter.Rewrite(ctx, orgID, start, end, agg.Expression, uint64(query.StepInterval.Seconds()), keys)
@@ -448,7 +393,6 @@ func (b *auditQueryStatementBuilder) buildTimeSeriesOrHeatmapQuery(
 
 		sb.GroupBy("ts")
 		sb.GroupBy(querybuilder.GroupByKeys(query.GroupBy)...)
-		sb.GroupBy(bucketAliases...)
 		if query.Having != nil && query.Having.Expression != "" {
 			rewriter := querybuilder.NewHavingExpressionRewriter()
 			rewrittenExpr, err := rewriter.RewriteForLogs(query.Having.Expression, query.Aggregations)
@@ -476,7 +420,6 @@ func (b *auditQueryStatementBuilder) buildTimeSeriesOrHeatmapQuery(
 	} else {
 		sb.GroupBy("ts")
 		sb.GroupBy(querybuilder.GroupByKeys(query.GroupBy)...)
-		sb.GroupBy(bucketAliases...)
 		if query.Having != nil && query.Having.Expression != "" {
 			rewriter := querybuilder.NewHavingExpressionRewriter()
 			rewrittenExpr, err := rewriter.RewriteForLogs(query.Having.Expression, query.Aggregations)

pkg/statementbuilder/auditstatementbuilder/statement_builder_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes/telemetrytypestest"
 	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -225,59 +224,3 @@ func TestStatementBuilder(t *testing.T) {
 		})
 	}
 }
-
-func TestStatementBuilderHeatmap(t *testing.T) {
-	statementBuilder := newTestAuditStatementBuilder(t)
-
-	testCases := []struct {
-		name        string
-		requestType qbtypes.RequestType
-		query       qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]
-		expected    qbtypes.Statement
-	}{
-		{
-			name:        "AttributeField_GroupByMaterialized_LinearAxis_RequiresField",
-			requestType: qbtypes.RequestTypeHeatmap,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal:        telemetrytypes.SignalLogs,
-				Source:        telemetrytypes.SourceAudit,
-				StepInterval:  qbtypes.Step{Duration: 60 * time.Second},
-				Aggregations:  []qbtypes.LogAggregation{{Expression: "http.response.status_code"}},
-				Filter:        &qbtypes.Filter{Expression: "signoz.audit.resource.kind = 'dashboard'"},
-				GroupBy:       []qbtypes.GroupByKey{{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "signoz.audit.action"}}},
-				BucketOptions: &qbtypes.BucketOptions{Kind: qbtypes.BucketsKindLinear, Spec: qbtypes.LinearBucketsSpec{MaxValue: 500, NumBuckets: 5}},
-			},
-			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_audit.distributed_logs_resource WHERE ((simpleJSONExtractString(labels, 'signoz.audit.resource.kind') = ? AND labels LIKE ? AND labels LIKE ?)) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), ifNull(multiIf(mapContains(attributes_number, 'http.response.status_code'), toFloat64(attributes_number['http.response.status_code']), NULL), 0) AS __bucket_value SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 60 SECOND) AS ts, toString(multiIf(`attribute_string_signoz$$audit$$action_exists` = true, `attribute_string_signoz$$audit$$action`, NULL)) AS `signoz.audit.action`, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value > 500, toFloat64(500), (least(greatest(ceil(__bucket_value * 5 / 500), 1), 5) - 1) * 500 / 5) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value > 500, toFloat64('+Inf'), least(greatest(ceil(__bucket_value * 5 / 500), 1), 5) * 500 / 5) AS __bucket_max, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND mapContains(attributes_number, 'http.response.status_code') AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY ts, `signoz.audit.action`, __bucket_min, __bucket_max",
-				Args:  []any{"dashboard", "%signoz.audit.resource.kind%", "%signoz.audit.resource.kind\":\"dashboard%", uint64(1747945619), uint64(1747983448), "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448)},
-			},
-		},
-		{
-			name:        "Distribution_AttributeField_SameStatementAsHeatmap",
-			requestType: qbtypes.RequestTypeDistribution,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal:        telemetrytypes.SignalLogs,
-				Source:        telemetrytypes.SourceAudit,
-				StepInterval:  qbtypes.Step{Duration: 60 * time.Second},
-				Aggregations:  []qbtypes.LogAggregation{{Expression: "http.response.status_code"}},
-				Filter:        &qbtypes.Filter{Expression: "signoz.audit.resource.kind = 'dashboard'"},
-				GroupBy:       []qbtypes.GroupByKey{{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "signoz.audit.action"}}},
-				BucketOptions: &qbtypes.BucketOptions{Kind: qbtypes.BucketsKindLinear, Spec: qbtypes.LinearBucketsSpec{MaxValue: 500, NumBuckets: 5}},
-			},
-			expected: qbtypes.Statement{
-				Query: "WITH __resource_filter AS (SELECT fingerprint FROM signoz_audit.distributed_logs_resource WHERE ((simpleJSONExtractString(labels, 'signoz.audit.resource.kind') = ? AND labels LIKE ? AND labels LIKE ?)) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), ifNull(multiIf(mapContains(attributes_number, 'http.response.status_code'), toFloat64(attributes_number['http.response.status_code']), NULL), 0) AS __bucket_value SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 60 SECOND) AS ts, toString(multiIf(`attribute_string_signoz$$audit$$action_exists` = true, `attribute_string_signoz$$audit$$action`, NULL)) AS `signoz.audit.action`, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value > 500, toFloat64(500), (least(greatest(ceil(__bucket_value * 5 / 500), 1), 5) - 1) * 500 / 5) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value > 500, toFloat64('+Inf'), least(greatest(ceil(__bucket_value * 5 / 500), 1), 5) * 500 / 5) AS __bucket_max, count() AS __result_0 FROM signoz_audit.distributed_logs WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND mapContains(attributes_number, 'http.response.status_code') AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY ts, `signoz.audit.action`, __bucket_min, __bucket_max",
-				Args:  []any{"dashboard", "%signoz.audit.resource.kind%", "%signoz.audit.resource.kind\":\"dashboard%", uint64(1747945619), uint64(1747983448), "1747947419000000000", uint64(1747945619), "1747983448000000000", uint64(1747983448)},
-			},
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			statement, err := statementBuilder.Build(context.Background(), valuer.UUID{}, 1747947419000, 1747983448000, testCase.requestType, testCase.query, nil)
-			require.NoError(t, err)
-			assert.Equal(t, testCase.expected.Query, statement.Query)
-			assert.Equal(t, testCase.expected.Args, statement.Args)
-			assert.Equal(t, testCase.expected.Warnings, statement.Warnings)
-		})
-	}
-}

pkg/statementbuilder/logsstatementbuilder/statement_builder.go

@@ -142,8 +142,6 @@ func (b *logQueryStatementBuilder) Build(
 		stmt, err = b.buildListQuery(ctx, orgID, q, query, start, end, keys, variables)
 	case qbtypes.RequestTypeTimeSeries:
 		stmt, err = b.buildTimeSeriesQuery(ctx, orgID, q, query, start, end, keys, variables)
-	case qbtypes.RequestTypeHeatmap, qbtypes.RequestTypeDistribution:
-		stmt, err = b.buildHeatmapTimeSeriesQuery(ctx, orgID, q, query, start, end, keys, variables)
 	case qbtypes.RequestTypeScalar:
 		stmt, err = b.buildScalarQuery(ctx, orgID, q, query, start, end, keys, false, variables)
 	default:
@@ -444,48 +442,6 @@ func (b *logQueryStatementBuilder) buildTimeSeriesQuery(
 	keys map[string][]*telemetrytypes.TelemetryFieldKey,
 	variables map[string]qbtypes.VariableItem,
 ) (*qbtypes.Statement, error) {
-	return b.buildTimeSeriesOrHeatmapQuery(ctx, orgID, sb, query, start, end, keys, variables, nil)
-}
-
-// buildHeatmapTimeSeriesQuery counts rows per (time bucket, group, value
-// bucket) of the field its aggregation names.
-func (b *logQueryStatementBuilder) buildHeatmapTimeSeriesQuery(
-	ctx context.Context,
-	orgID valuer.UUID,
-	sb *sqlbuilder.SelectBuilder,
-	query qbtypes.QueryBuilderQuery[qbtypes.LogAggregation],
-	start, end uint64,
-	keys map[string][]*telemetrytypes.TelemetryFieldKey,
-	variables map[string]qbtypes.VariableItem,
-) (*qbtypes.Statement, error) {
-	heatmapField, countQuery, err := qbtypes.HeatmapCountQuery(query)
-	if err != nil {
-		return nil, err
-	}
-	info := querybuilder.NewQueryInfo(ctx, orgID, b.fl, telemetrytypes.SignalLogs, nil, start, end)
-	mayBeAbsent, err := querybuilder.HeatmapFieldMayBeAbsent(ctx, info, b.storage, columnKey(heatmapField), keys)
-	if err != nil {
-		return nil, err
-	}
-	if mayBeAbsent {
-		countQuery = qbtypes.RequireHeatmapField(countQuery, *heatmapField)
-	}
-	return b.buildTimeSeriesOrHeatmapQuery(ctx, orgID, sb, countQuery, start, end, keys, variables, heatmapField)
-}
-
-// buildTimeSeriesOrHeatmapQuery builds one row per (time bucket, group). A
-// non-nil heatmapField makes it a heatmap instead: the bucket a row's
-// heatmapField falls in joins the group keys, so a row is one cell.
-func (b *logQueryStatementBuilder) buildTimeSeriesOrHeatmapQuery(
-	ctx context.Context,
-	orgID valuer.UUID,
-	sb *sqlbuilder.SelectBuilder,
-	query qbtypes.QueryBuilderQuery[qbtypes.LogAggregation],
-	start, end uint64,
-	keys map[string][]*telemetrytypes.TelemetryFieldKey,
-	variables map[string]qbtypes.VariableItem,
-	heatmapField *telemetrytypes.TelemetryFieldKey,
-) (*qbtypes.Statement, error) {
 
 	var (
 		cteFragments   []string
@@ -525,19 +481,6 @@ func (b *logQueryStatementBuilder) buildTimeSeriesOrHeatmapQuery(
 		fieldNames = append(fieldNames, sqlbuilder.Escape(fieldAlias))
 	}
 
-	var bucketAliases []string
-	if heatmapField != nil {
-		valueFragment, aliases, warnings, err := querybuilder.HeatmapBucketColumns(
-			ctx, info, b.storage, sb, columnKey(heatmapField), query.BucketOptions, keys,
-		)
-		if err != nil {
-			return nil, err
-		}
-		cteFragments = append(cteFragments, valueFragment)
-		bucketAliases = aliases
-		columnWarnings = append(columnWarnings, warnings...)
-	}
-
 	// Aggregations
 	allAggChArgs := make([]any, 0)
 	for i, agg := range query.Aggregations {
@@ -584,7 +527,6 @@ func (b *logQueryStatementBuilder) buildTimeSeriesOrHeatmapQuery(
 		// Group by all dimensions
 		sb.GroupBy("ts")
 		sb.GroupBy(fieldNames...)
-		sb.GroupBy(bucketAliases...)
 		if query.Having != nil && query.Having.Expression != "" {
 			// Rewrite having expression to use SQL column names
 			rewriter := querybuilder.NewHavingExpressionRewriter()
@@ -619,7 +561,6 @@ func (b *logQueryStatementBuilder) buildTimeSeriesOrHeatmapQuery(
 	} else {
 		sb.GroupBy("ts")
 		sb.GroupBy(fieldNames...)
-		sb.GroupBy(bucketAliases...)
 		if query.Having != nil && query.Having.Expression != "" {
 			rewriter := querybuilder.NewHavingExpressionRewriter()
 			rewrittenExpr, err := rewriter.RewriteForLogs(query.Having.Expression, query.Aggregations)

pkg/statementbuilder/logsstatementbuilder/stmt_builder_test.go

@@ -19,7 +19,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes/telemetrytypestest"
 	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -1272,119 +1271,3 @@ func newSkipResourceFingerprintLogsBuilder(
 		statementbuilder.Config{SkipResourceFingerprint: statementbuilder.SkipResourceFingerprint{Enabled: skipEnable, Threshold: threshold}},
 	)
 }
-
-func TestStatementBuilderHeatmap(t *testing.T) {
-	releaseTime := time.Date(2024, 1, 15, 10, 0, 0, 0, time.UTC)
-	startTs := uint64(releaseTime.UnixNano()) + uint64(24*time.Hour.Nanoseconds())
-	endTs := uint64(releaseTime.UnixNano()) + uint64(48*time.Hour.Nanoseconds())
-
-	testCases := []struct {
-		name        string
-		requestType qbtypes.RequestType
-		query       qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]
-		expected    qbtypes.Statement
-	}{
-		{
-			name:        "AttributeField_LogAxis_RequiresField",
-			requestType: qbtypes.RequestTypeHeatmap,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal:       telemetrytypes.SignalLogs,
-				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
-				Aggregations: []qbtypes.LogAggregation{{Expression: "duration"}},
-				Filter:       &qbtypes.Filter{Expression: "service.name = 'cartservice'"},
-			},
-			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), ifNull(multiIf(mapContains(attributes_number, 'duration'), toFloat64(attributes_number['duration']), NULL), 0) AS __bucket_value SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 30 SECOND) AS ts, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value <= 2.3283064365386963e-10, toFloat64(0), __bucket_value > 1.8446744073709552e+19, toFloat64(1.8446744073709552e+19), pow(2, (ceil(log2(__bucket_value) * 16) - 1) / 16)) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value <= 2.3283064365386963e-10, 2.3283064365386963e-10, __bucket_value > 1.8446744073709552e+19, toFloat64('+Inf'), pow(2, ceil(log2(__bucket_value) * 16) / 16)) AS __bucket_max, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND mapContains(attributes_number, 'duration') AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY ts, __bucket_min, __bucket_max",
-				Args:  []any{"cartservice", "%service.name%", "%service.name\":\"cartservice%", uint64(1705397400), uint64(1705485600), "1705399200000000000", uint64(1705397400), "1705485600000000000", uint64(1705485600)},
-			},
-		},
-		{
-			name:        "AttributeField_GroupByWithLimit_LinearAxis_RequiresFieldInLimit",
-			requestType: qbtypes.RequestTypeHeatmap,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal:        telemetrytypes.SignalLogs,
-				StepInterval:  qbtypes.Step{Duration: 60 * time.Second},
-				Aggregations:  []qbtypes.LogAggregation{{Expression: "http.status_code"}},
-				GroupBy:       []qbtypes.GroupByKey{{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service.name"}}},
-				Limit:         5,
-				BucketOptions: &qbtypes.BucketOptions{Kind: qbtypes.BucketsKindLinear, Spec: qbtypes.LinearBucketsSpec{MaxValue: 600, NumBuckets: 6}},
-			},
-			expected: qbtypes.Statement{
-				Query: "WITH ifNull(multiIf(mapContains(attributes_number, 'http.status_code'), toFloat64(attributes_number['http.status_code']), NULL), 0) AS __bucket_value, __limit_cte AS (SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, NULL)) AS `__GROUP_BY_KEY_0_service.name`, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE mapContains(attributes_number, 'http.status_code') AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY `__GROUP_BY_KEY_0_service.name` ORDER BY __result_0 DESC LIMIT ?) SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 60 SECOND) AS ts, toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, NULL)) AS `__GROUP_BY_KEY_0_service.name`, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value > 600, toFloat64(600), (least(greatest(ceil(__bucket_value * 6 / 600), 1), 6) - 1) * 600 / 6) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value > 600, toFloat64('+Inf'), least(greatest(ceil(__bucket_value * 6 / 600), 1), 6) * 600 / 6) AS __bucket_max, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE mapContains(attributes_number, 'http.status_code') AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? 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`, __bucket_min, __bucket_max",
-				Args:  []any{"1705399200000000000", uint64(1705397400), "1705485600000000000", uint64(1705485600), 5, "1705399200000000000", uint64(1705397400), "1705485600000000000", uint64(1705485600)},
-			},
-		},
-		{
-			name:        "QualifiedField_OrderedByAggregation_OrdersByCount",
-			requestType: qbtypes.RequestTypeHeatmap,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal:       telemetrytypes.SignalLogs,
-				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
-				Aggregations: []qbtypes.LogAggregation{{Expression: "attribute.amount"}},
-				GroupBy:      []qbtypes.GroupByKey{{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service.name"}}},
-				Limit:        3,
-				Order: []qbtypes.OrderBy{{
-					Key:       qbtypes.OrderByKey{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "amount", FieldContext: telemetrytypes.FieldContextAttribute}},
-					Direction: qbtypes.OrderDirectionAsc,
-				}},
-			},
-			expected: qbtypes.Statement{
-				Query: "WITH ifNull(multiIf(mapContains(attributes_number, 'amount'), toFloat64(attributes_number['amount']), NULL), 0) AS __bucket_value, __limit_cte AS (SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, NULL)) AS `__GROUP_BY_KEY_0_service.name`, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE mapContains(attributes_number, 'amount') AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY `__GROUP_BY_KEY_0_service.name` ORDER BY __result_0 asc LIMIT ?) SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 30 SECOND) AS ts, toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, NULL)) AS `__GROUP_BY_KEY_0_service.name`, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value <= 2.3283064365386963e-10, toFloat64(0), __bucket_value > 1.8446744073709552e+19, toFloat64(1.8446744073709552e+19), pow(2, (ceil(log2(__bucket_value) * 16) - 1) / 16)) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value <= 2.3283064365386963e-10, 2.3283064365386963e-10, __bucket_value > 1.8446744073709552e+19, toFloat64('+Inf'), pow(2, ceil(log2(__bucket_value) * 16) / 16)) AS __bucket_max, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE mapContains(attributes_number, 'amount') AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? 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`, __bucket_min, __bucket_max ORDER BY ts desc",
-				Args:  []any{"1705399200000000000", uint64(1705397400), "1705485600000000000", uint64(1705485600), 3, "1705399200000000000", uint64(1705397400), "1705485600000000000", uint64(1705485600)},
-			},
-		},
-		{
-			name:        "IntrinsicColumn_NoExists",
-			requestType: qbtypes.RequestTypeHeatmap,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal:       telemetrytypes.SignalLogs,
-				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
-				Aggregations: []qbtypes.LogAggregation{{Expression: "log.severity_number"}},
-			},
-			expected: qbtypes.Statement{
-				Query: "WITH ifNull(toFloat64(severity_number), 0) AS __bucket_value SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 30 SECOND) AS ts, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value <= 2.3283064365386963e-10, toFloat64(0), __bucket_value > 1.8446744073709552e+19, toFloat64(1.8446744073709552e+19), pow(2, (ceil(log2(__bucket_value) * 16) - 1) / 16)) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value <= 2.3283064365386963e-10, 2.3283064365386963e-10, __bucket_value > 1.8446744073709552e+19, toFloat64('+Inf'), pow(2, ceil(log2(__bucket_value) * 16) / 16)) AS __bucket_max, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY ts, __bucket_min, __bucket_max",
-				Args:  []any{"1705399200000000000", uint64(1705397400), "1705485600000000000", uint64(1705485600)},
-			},
-		},
-		{
-			name:        "Distribution_AttributeField_SameStatementAsHeatmap",
-			requestType: qbtypes.RequestTypeDistribution,
-			query: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal:       telemetrytypes.SignalLogs,
-				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
-				Aggregations: []qbtypes.LogAggregation{{Expression: "duration"}},
-				Filter:       &qbtypes.Filter{Expression: "service.name = 'cartservice'"},
-			},
-			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), ifNull(multiIf(mapContains(attributes_number, 'duration'), toFloat64(attributes_number['duration']), NULL), 0) AS __bucket_value SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 30 SECOND) AS ts, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value <= 2.3283064365386963e-10, toFloat64(0), __bucket_value > 1.8446744073709552e+19, toFloat64(1.8446744073709552e+19), pow(2, (ceil(log2(__bucket_value) * 16) - 1) / 16)) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value <= 2.3283064365386963e-10, 2.3283064365386963e-10, __bucket_value > 1.8446744073709552e+19, toFloat64('+Inf'), pow(2, ceil(log2(__bucket_value) * 16) / 16)) AS __bucket_max, count() AS __result_0 FROM signoz_logs.distributed_logs_v2 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter) AND mapContains(attributes_number, 'duration') AND timestamp >= ? AND ts_bucket_start >= ? AND timestamp < ? AND ts_bucket_start <= ? GROUP BY ts, __bucket_min, __bucket_max",
-				Args:  []any{"cartservice", "%service.name%", "%service.name\":\"cartservice%", uint64(1705397400), uint64(1705485600), "1705399200000000000", uint64(1705397400), "1705485600000000000", uint64(1705485600)},
-			},
-		},
-	}
-
-	fl := flaggertest.New(t)
-	mockMetadataStore := telemetrytypestest.NewMockMetadataStore()
-	mockMetadataStore.KeysMap = logstelemetryschema.BuildCompleteFieldKeyMap(releaseTime)
-	storage := logstelemetryschema.NewStorage()
-	aggExprRewriter := querybuilder.NewAggExprRewriter(instrumentationtest.New().ToProviderSettings(), nil, storage, fl, telemetrytypes.SignalLogs)
-	statementBuilder := NewLogQueryStatementBuilder(
-		instrumentationtest.New().ToProviderSettings(),
-		mockMetadataStore,
-		storage,
-		aggExprRewriter,
-		logstelemetryschema.DefaultFullTextColumn,
-		fl,
-		nil,
-		statementbuilder.Config{SkipResourceFingerprint: statementbuilder.SkipResourceFingerprint{Enabled: false, Threshold: 100000}},
-	)
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			statement, err := statementBuilder.Build(context.Background(), valuer.UUID{}, startTs, endTs, testCase.requestType, testCase.query, nil)
-			require.NoError(t, err)
-			assert.Equal(t, testCase.expected.Query, statement.Query)
-			assert.Equal(t, testCase.expected.Args, statement.Args)
-			assert.Equal(t, testCase.expected.Warnings, statement.Warnings)
-		})
-	}
-}

pkg/statementbuilder/metricsstatementbuilder/statement_builder.go

@@ -4,11 +4,14 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"math"
 	"slices"
+	"strconv"
 	"strings"
 	"time"
 
 	"github.com/SigNoz/signoz/pkg/clickhousesql"
+	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/flagger"
 	"github.com/SigNoz/signoz/pkg/querybuilder"
@@ -914,10 +917,6 @@ const (
 
 	heatmapValueAlias = "__result_0"
 	heatmapWindow     = "__heatmap_window"
-
-	// The column __spatial_aggregation_cte carries the sample in, which is what
-	// the bucket axis is cut from.
-	heatmapValueColumn = "value"
 )
 
 func isHistogramBucket(k qbtypes.GroupByKey) bool { return k.Name == histogramBucketKey }
@@ -983,7 +982,10 @@ func buildValueHeatmapFinalSelect(
 	args []any,
 	query qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation],
 ) (*qbtypes.Statement, error) {
-	bucketMin, bucketMax := querybuilder.RenderHeatmapBucketExprs(*query.Aggregations[0].HeatmapBucketing, heatmapValueColumn)
+	bucketMin, bucketMax, err := renderHeatmapBucketExprs(*query.Aggregations[0].HeatmapBucketing)
+	if err != nil {
+		return nil, err
+	}
 
 	groupAliases := GroupByAliases(query.GroupBy)
 
@@ -1001,6 +1003,61 @@ func buildValueHeatmapFinalSelect(
 	return &qbtypes.Statement{Query: combined + q, Args: append(args, a...)}, nil
 }
 
+// renderHeatmapBucketExprs renders the bucket (min, max] that `value` falls in.
+// Only the bucket under everything the axis covers is open below, and only the
+// one over it is open above.
+func renderHeatmapBucketExprs(bucketing qbtypes.HeatmapBucketing) (minExpr, maxExpr string, err error) {
+	switch bucketing.Kind {
+	case qbtypes.BucketsKindLinear:
+		return renderLinearBucketExprs(bucketing)
+	case qbtypes.BucketsKindLog:
+		return renderLogBucketExprs()
+	default:
+		return "", "", errors.NewInvalidInputf(errors.CodeInvalidInput,
+			"unsupported bucketsScaling %q for heatmap requests", bucketing.Kind.StringValue())
+	}
+}
+
+func renderLinearBucketExprs(bucketing qbtypes.HeatmapBucketing) (string, string, error) {
+	maxValue := formatFloat(bucketing.MaxValue)
+	numBuckets := strconv.Itoa(bucketing.NumBuckets)
+	index := fmt.Sprintf("least(greatest(ceil(value * %s / %s), 1), %s)", numBuckets, maxValue, numBuckets)
+
+	minExpr := fmt.Sprintf(
+		"multiIf(value <= 0, toFloat64('-Inf'), value > %s, toFloat64(%s), (%s - 1) * %s / %s)",
+		maxValue, maxValue, index, maxValue, numBuckets,
+	)
+	maxExpr := fmt.Sprintf(
+		"multiIf(value <= 0, toFloat64(0), value > %s, toFloat64('+Inf'), %s * %s / %s)",
+		maxValue, index, maxValue, numBuckets,
+	)
+	return minExpr, maxExpr, nil
+}
+
+// ClickHouse buckets at MaxLogScale whatever HeatmapBucketing.LogScale asks for;
+// postprocessing folds the axis down afterwards.
+func renderLogBucketExprs() (string, string, error) {
+	bucketsPerDoubling := formatFloat(math.Exp2(qbtypes.MaxLogScale))
+	lowest := formatFloat(qbtypes.MinLogUpperBound)
+	highest := formatFloat(qbtypes.MaxLogUpperBound)
+
+	minExpr := fmt.Sprintf(
+		"multiIf(value <= 0, toFloat64('-Inf'), value <= %s, toFloat64(0), value > %s, toFloat64(%s), pow(2, (ceil(log2(value) * %s) - 1) / %s))",
+		lowest, highest, highest, bucketsPerDoubling, bucketsPerDoubling,
+	)
+	maxExpr := fmt.Sprintf(
+		"multiIf(value <= 0, toFloat64(0), value <= %s, %s, value > %s, toFloat64('+Inf'), pow(2, ceil(log2(value) * %s) / %s))",
+		lowest, lowest, highest, bucketsPerDoubling, bucketsPerDoubling,
+	)
+	return minExpr, maxExpr, nil
+}
+
+// formatFloat renders a float64 as the shortest literal that reads back as the
+// same value, so an upper bound computed from it is identical on every row.
+func formatFloat(v float64) string {
+	return strconv.FormatFloat(v, 'g', -1, 64)
+}
+
 func GroupByColumnAlias(i int, name string) string {
 	if name == histogramBucketKey {
 		return clickhousesql.Identifier(histogramBucketKey)

pkg/statementbuilder/tracesstatementbuilder/statement_builder.go

@@ -178,8 +178,6 @@ func (b *traceQueryStatementBuilder) Build(
 		return b.buildListQuery(ctx, orgID, q, query, start, end, keys, variables, isSelectFieldsEmpty)
 	case qbtypes.RequestTypeTimeSeries:
 		return b.buildTimeSeriesQuery(ctx, orgID, q, query, start, end, keys, variables)
-	case qbtypes.RequestTypeHeatmap, qbtypes.RequestTypeDistribution:
-		return b.buildHeatmapTimeSeriesQuery(ctx, orgID, q, query, start, end, keys, variables)
 	case qbtypes.RequestTypeScalar:
 		return b.buildScalarQuery(ctx, orgID, q, query, start, end, keys, variables, false, false)
 	case qbtypes.RequestTypeTrace:
@@ -572,48 +570,6 @@ func (b *traceQueryStatementBuilder) buildTimeSeriesQuery(
 	keys map[string][]*telemetrytypes.TelemetryFieldKey,
 	variables map[string]qbtypes.VariableItem,
 ) (*qbtypes.Statement, error) {
-	return b.buildTimeSeriesOrHeatmapQuery(ctx, orgID, sb, query, start, end, keys, variables, nil)
-}
-
-// buildHeatmapTimeSeriesQuery counts rows per (time bucket, group, value
-// bucket) of the field its aggregation names.
-func (b *traceQueryStatementBuilder) buildHeatmapTimeSeriesQuery(
-	ctx context.Context,
-	orgID valuer.UUID,
-	sb *sqlbuilder.SelectBuilder,
-	query qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation],
-	start, end uint64,
-	keys map[string][]*telemetrytypes.TelemetryFieldKey,
-	variables map[string]qbtypes.VariableItem,
-) (*qbtypes.Statement, error) {
-	heatmapField, countQuery, err := qbtypes.HeatmapCountQuery(query)
-	if err != nil {
-		return nil, err
-	}
-	info := querybuilder.NewQueryInfo(ctx, orgID, b.fl, telemetrytypes.SignalTraces, nil, start, end)
-	mayBeAbsent, err := querybuilder.HeatmapFieldMayBeAbsent(ctx, info, b.storage, heatmapField, keys)
-	if err != nil {
-		return nil, err
-	}
-	if mayBeAbsent {
-		countQuery = qbtypes.RequireHeatmapField(countQuery, *heatmapField)
-	}
-	return b.buildTimeSeriesOrHeatmapQuery(ctx, orgID, sb, countQuery, start, end, keys, variables, heatmapField)
-}
-
-// buildTimeSeriesOrHeatmapQuery builds one row per (time bucket, group). A
-// non-nil heatmapField makes it a heatmap instead: the bucket a row's
-// heatmapField falls in joins the group keys, so a row is one cell.
-func (b *traceQueryStatementBuilder) buildTimeSeriesOrHeatmapQuery(
-	ctx context.Context,
-	orgID valuer.UUID,
-	sb *sqlbuilder.SelectBuilder,
-	query qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation],
-	start, end uint64,
-	keys map[string][]*telemetrytypes.TelemetryFieldKey,
-	variables map[string]qbtypes.VariableItem,
-	heatmapField *telemetrytypes.TelemetryFieldKey,
-) (*qbtypes.Statement, error) {
 
 	var (
 		cteFragments   []string
@@ -654,19 +610,6 @@ func (b *traceQueryStatementBuilder) buildTimeSeriesOrHeatmapQuery(
 		fieldNames = append(fieldNames, sqlbuilder.Escape(fieldAlias))
 	}
 
-	var bucketAliases []string
-	if heatmapField != nil {
-		valueFragment, aliases, warnings, err := querybuilder.HeatmapBucketColumns(
-			ctx, info, b.storage, sb, heatmapField, query.BucketOptions, keys,
-		)
-		if err != nil {
-			return nil, err
-		}
-		cteFragments = append(cteFragments, valueFragment)
-		bucketAliases = aliases
-		columnWarnings = append(columnWarnings, warnings...)
-	}
-
 	// Aggregations
 	allAggChArgs := make([]any, 0)
 	for i, agg := range query.Aggregations {
@@ -710,7 +653,6 @@ func (b *traceQueryStatementBuilder) buildTimeSeriesOrHeatmapQuery(
 		// Group by all dimensions
 		sb.GroupBy("ts")
 		sb.GroupBy(fieldNames...)
-		sb.GroupBy(bucketAliases...)
 		if query.Having != nil && query.Having.Expression != "" {
 			rewriter := querybuilder.NewHavingExpressionRewriter()
 			rewrittenExpr, err := rewriter.RewriteForTraces(query.Having.Expression, query.Aggregations)
@@ -744,7 +686,6 @@ func (b *traceQueryStatementBuilder) buildTimeSeriesOrHeatmapQuery(
 	} else {
 		sb.GroupBy("ts")
 		sb.GroupBy(fieldNames...)
-		sb.GroupBy(bucketAliases...)
 		if query.Having != nil && query.Having.Expression != "" {
 			rewriter := querybuilder.NewHavingExpressionRewriter()
 			rewrittenExpr, err := rewriter.RewriteForTraces(query.Having.Expression, query.Aggregations)

pkg/statementbuilder/tracesstatementbuilder/stmt_builder_test.go

@@ -2113,103 +2113,3 @@ func TestStatementBuilderSemconvSingleSpelling(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, "WITH __resource_filter AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'deployment.environment') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint) SELECT toString(multiIf(resource.`deployment.environment` IS NOT NULL, resource.`deployment.environment`::String, mapContains(resources_string, 'deployment.environment'), resources_string['deployment.environment'], NULL)) AS `__GROUP_BY_KEY_0_deployment.environment.name`, count() 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_deployment.environment.name` ORDER BY __result_0 DESC", q.Query)
 }
-
-func TestStatementBuilderHeatmap(t *testing.T) {
-	testCases := []struct {
-		name        string
-		requestType qbtypes.RequestType
-		query       qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation]
-		expected    qbtypes.Statement
-	}{
-		{
-			name:        "DurationNano_CollidingAttribute_NoExists",
-			requestType: qbtypes.RequestTypeHeatmap,
-			query: qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation]{
-				Signal:       telemetrytypes.SignalTraces,
-				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
-				Aggregations: []qbtypes.TraceAggregation{{Expression: "duration_nano"}},
-				Filter:       &qbtypes.Filter{Expression: "service.name = 'redis-manual'"},
-			},
-			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), ifNull(toFloat64(duration_nano), 0) AS __bucket_value SELECT toStartOfInterval(timestamp, INTERVAL 30 SECOND) AS ts, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value <= 2.3283064365386963e-10, toFloat64(0), __bucket_value > 1.8446744073709552e+19, toFloat64(1.8446744073709552e+19), pow(2, (ceil(log2(__bucket_value) * 16) - 1) / 16)) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value <= 2.3283064365386963e-10, 2.3283064365386963e-10, __bucket_value > 1.8446744073709552e+19, toFloat64('+Inf'), pow(2, ceil(log2(__bucket_value) * 16) / 16)) AS __bucket_max, count() 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 ts, __bucket_min, __bucket_max",
-				Args:  []any{"redis-manual", "%service.name%", "%service.name\":\"redis-manual%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448)},
-			},
-		},
-		{
-			name:        "AttributeField_GroupByWithLimit_LinearAxis_RequiresFieldInLimit",
-			requestType: qbtypes.RequestTypeHeatmap,
-			query: qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation]{
-				Signal:        telemetrytypes.SignalTraces,
-				StepInterval:  qbtypes.Step{Duration: 60 * time.Second},
-				Aggregations:  []qbtypes.TraceAggregation{{Expression: "cart.items_count"}},
-				GroupBy:       []qbtypes.GroupByKey{{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service.name"}}},
-				Limit:         5,
-				BucketOptions: &qbtypes.BucketOptions{Kind: qbtypes.BucketsKindLinear, Spec: qbtypes.LinearBucketsSpec{MaxValue: 50, NumBuckets: 5}},
-			},
-			expected: qbtypes.Statement{
-				Query: "WITH ifNull(multiIf(`attribute_number_cart$$items_count_exists` = true, toFloat64(`attribute_number_cart$$items_count`), NULL), 0) AS __bucket_value, __limit_cte AS (SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, NULL)) AS `__GROUP_BY_KEY_0_service.name`, count() AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE `attribute_number_cart$$items_count_exists` = true 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 60 SECOND) AS ts, toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, NULL)) AS `__GROUP_BY_KEY_0_service.name`, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value > 50, toFloat64(50), (least(greatest(ceil(__bucket_value * 5 / 50), 1), 5) - 1) * 50 / 5) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value > 50, toFloat64('+Inf'), least(greatest(ceil(__bucket_value * 5 / 50), 1), 5) * 50 / 5) AS __bucket_max, count() AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE `attribute_number_cart$$items_count_exists` = true 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`, __bucket_min, __bucket_max",
-				Args:  []any{"1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 5, "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448)},
-			},
-		},
-		{
-			name:        "QualifiedField_OrderedByAggregation_OrdersByCount",
-			requestType: qbtypes.RequestTypeHeatmap,
-			query: qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation]{
-				Signal:       telemetrytypes.SignalTraces,
-				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
-				Aggregations: []qbtypes.TraceAggregation{{Expression: "attribute.metric.max_count"}},
-				GroupBy:      []qbtypes.GroupByKey{{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service.name"}}},
-				Limit:        3,
-				Order: []qbtypes.OrderBy{{
-					Key:       qbtypes.OrderByKey{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "metric.max_count", FieldContext: telemetrytypes.FieldContextAttribute}},
-					Direction: qbtypes.OrderDirectionDesc,
-				}},
-			},
-			expected: qbtypes.Statement{
-				Query: "WITH ifNull(multiIf(mapContains(attributes_number, 'metric.max_count'), toFloat64(attributes_number['metric.max_count']), NULL), 0) AS __bucket_value, __limit_cte AS (SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, NULL)) AS `__GROUP_BY_KEY_0_service.name`, count() AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE mapContains(attributes_number, 'metric.max_count') 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, NULL)) AS `__GROUP_BY_KEY_0_service.name`, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value <= 2.3283064365386963e-10, toFloat64(0), __bucket_value > 1.8446744073709552e+19, toFloat64(1.8446744073709552e+19), pow(2, (ceil(log2(__bucket_value) * 16) - 1) / 16)) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value <= 2.3283064365386963e-10, 2.3283064365386963e-10, __bucket_value > 1.8446744073709552e+19, toFloat64('+Inf'), pow(2, ceil(log2(__bucket_value) * 16) / 16)) AS __bucket_max, count() AS __result_0 FROM signoz_traces.distributed_signoz_index_v3 WHERE mapContains(attributes_number, 'metric.max_count') 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`, __bucket_min, __bucket_max ORDER BY ts desc",
-				Args:  []any{"1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), 3, "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448)},
-			},
-		},
-		{
-			name:        "Distribution_DurationNano_SameStatementAsHeatmap",
-			requestType: qbtypes.RequestTypeDistribution,
-			query: qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation]{
-				Signal:       telemetrytypes.SignalTraces,
-				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
-				Aggregations: []qbtypes.TraceAggregation{{Expression: "duration_nano"}},
-				Filter:       &qbtypes.Filter{Expression: "service.name = 'redis-manual'"},
-			},
-			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), ifNull(toFloat64(duration_nano), 0) AS __bucket_value SELECT toStartOfInterval(timestamp, INTERVAL 30 SECOND) AS ts, multiIf(__bucket_value <= 0, toFloat64('-Inf'), __bucket_value <= 2.3283064365386963e-10, toFloat64(0), __bucket_value > 1.8446744073709552e+19, toFloat64(1.8446744073709552e+19), pow(2, (ceil(log2(__bucket_value) * 16) - 1) / 16)) AS __bucket_min, multiIf(__bucket_value <= 0, toFloat64(0), __bucket_value <= 2.3283064365386963e-10, 2.3283064365386963e-10, __bucket_value > 1.8446744073709552e+19, toFloat64('+Inf'), pow(2, ceil(log2(__bucket_value) * 16) / 16)) AS __bucket_max, count() 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 ts, __bucket_min, __bucket_max",
-				Args:  []any{"redis-manual", "%service.name%", "%service.name\":\"redis-manual%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448)},
-			},
-		},
-	}
-
-	releaseTime := time.Date(2025, 5, 22, 0, 0, 0, 0, time.UTC)
-	fl := flaggertest.New(t)
-	storage := tracestelemetryschema.NewStorage(nil)
-	mockMetadataStore := telemetrytypestest.NewMockMetadataStore()
-	mockMetadataStore.KeysMap = tracestelemetryschema.BuildCompleteFieldKeyMap(releaseTime)
-	aggExprRewriter := querybuilder.NewAggExprRewriter(instrumentationtest.New().ToProviderSettings(), nil, storage, fl, telemetrytypes.SignalTraces)
-	statementBuilder := NewTraceQueryStatementBuilder(
-		instrumentationtest.New().ToProviderSettings(),
-		mockMetadataStore,
-		storage,
-		aggExprRewriter,
-		nil,
-		fl,
-		false,
-		100000,
-	)
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			statement, err := statementBuilder.Build(context.Background(), valuer.UUID{}, 1747947419000, 1747983448000, testCase.requestType, testCase.query, nil)
-			require.NoError(t, err)
-			assert.Equal(t, testCase.expected.Query, statement.Query)
-			assert.Equal(t, testCase.expected.Args, statement.Args)
-			assert.Equal(t, testCase.expected.Warnings, statement.Warnings)
-		})
-	}
-}

pkg/types/querybuildertypes/querybuildertypesv5/formula.go

@@ -28,7 +28,7 @@ type QueryBuilderFormula struct {
 
 	Offset int `json:"offset,omitempty" description:"The number of ordered series or rows to skip before the page starts. Requires limit."`
 
-	Having *Having `json:"having,omitempty" description:"A filter on the formula values, referencing the formula by its name or as __result, for example F1 > 0. A time series keeps only the points that match and drops a series with none left; a scalar result keeps only the rows that match."`
+	Having *Having `json:"having,omitempty" description:"Accepted but currently ignored; the computed values are returned unfiltered."`
 
 	Functions []Function `json:"functions,omitzero" description:"Post-processing functions applied in order to each result series."`
 
@@ -118,10 +118,6 @@ func (f QueryBuilderFormula) Validate() error {
 		)
 	}
 
-	if f.Limit < 0 {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "limit must be non-negative, got %d", f.Limit)
-	}
-
 	// Validate functions if present
 	for i, fn := range f.Functions {
 		if err := fn.Validate(); err != nil {

pkg/types/querybuildertypes/querybuildertypesv5/heatmap.go

@@ -3,11 +3,9 @@ package querybuildertypesv5
 import (
 	"math"
 	"slices"
-	"strings"
 
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/types/metrictypes"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )
 
 const (
@@ -18,9 +16,6 @@ const (
 	HeatmapBucketMinColumn = "__bucket_min"
 	HeatmapBucketMaxColumn = "__bucket_max"
 
-	// A logs or traces heatmap counts events, so its field renders as count().
-	heatmapCountExpression = "count()"
-
 	DefaultNumBuckets = 60
 
 	// MaxLogScale is the resolution ClickHouse buckets every log heatmap at:
@@ -86,68 +81,6 @@ func (b *BucketOptions) ToHeatmapBucketing() HeatmapBucketing {
 	return resolved
 }
 
-// HeatmapAggregationField returns the field a logs or traces heatmap buckets,
-// written as the bare field. ok is false for any other aggregation.
-func HeatmapAggregationField(expression string) (telemetrytypes.TelemetryFieldKey, bool) {
-	keyText := strings.TrimSpace(expression)
-	if keyText == "" || strings.ContainsAny(keyText, "() \t\n") {
-		return telemetrytypes.TelemetryFieldKey{}, false
-	}
-	return telemetrytypes.GetFieldKeyFromKeyText(keyText), true
-}
-
-// HeatmapCountQuery splits a logs or traces heatmap query into the field its
-// aggregation buckets and a copy of query that counts events in its place,
-// which is what every cell holds.
-func HeatmapCountQuery[T LogAggregation | TraceAggregation](query QueryBuilderQuery[T]) (*telemetrytypes.TelemetryFieldKey, QueryBuilderQuery[T], error) {
-	if len(query.Aggregations) != 1 {
-		return nil, query, errors.NewInvalidInputf(errors.CodeInvalidInput,
-			"a heatmap renders one bucket axis, but the query has %d aggregations", len(query.Aggregations))
-	}
-
-	query.Aggregations = slices.Clone(query.Aggregations)
-	var expression *string
-	switch aggregation := any(&query.Aggregations[0]).(type) {
-	case *LogAggregation:
-		expression = &aggregation.Expression
-	case *TraceAggregation:
-		expression = &aggregation.Expression
-	}
-
-	field, ok := HeatmapAggregationField(*expression)
-	if !ok {
-		return nil, query, errors.NewInvalidInputf(errors.CodeInvalidInput,
-			"a logs or traces heatmap counts events by the field named as its aggregation, got %q", *expression)
-	}
-
-	// An order on the aggregation names it by its expression, which decoding
-	// splits into a context, a name and a data type, and which metadata may
-	// complete, as it does any field.
-	query.Order = slices.Clone(query.Order)
-	for i := range query.Order {
-		key := query.Order[i].Key.TelemetryFieldKey
-		sameField := key.Name == field.Name &&
-			(field.FieldContext == telemetrytypes.FieldContextUnspecified || key.FieldContext == field.FieldContext) &&
-			(field.FieldDataType == telemetrytypes.FieldDataTypeUnspecified || key.FieldDataType == field.FieldDataType)
-		if key.Name == *expression || sameField {
-			query.Order[i].Key = OrderByKey{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: heatmapCountExpression}}
-		}
-	}
-	*expression = heatmapCountExpression
-
-	return &field, query, nil
-}
-
-// RequireHeatmapField keeps only the rows of query that carry field.
-func RequireHeatmapField[T LogAggregation | TraceAggregation](query QueryBuilderQuery[T], field telemetrytypes.TelemetryFieldKey) QueryBuilderQuery[T] {
-	exists := telemetrytypes.TelemetryFieldKeyToText(&field) + " EXISTS"
-	if query.Filter != nil && strings.TrimSpace(query.Filter.Expression) != "" {
-		exists = "(" + query.Filter.Expression + ") AND " + exists
-	}
-	query.Filter = &Filter{Expression: exists}
-	return query
-}
-
 // This cannot be called in validateBucketCounting cuz metric type is resolved in querier.go.
 func (a *MetricAggregation) VerifyAndApplyBucketOptions(bucketOptions *BucketOptions) error {
 	switch a.Type {

pkg/types/querybuildertypes/querybuildertypesv5/request_type.go

@@ -23,8 +23,7 @@ func (r *RequestType) UnmarshalJSON(data []byte) error {
 		*r = v
 		return nil
 	default:
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "unknown request type %q", s).
-			WithSuggestions(errors.NewValidReferences(errors.NounRequestTypes, RequestType{}.Enum()...))
+		return errors.NewInvalidInputf(errors.CodeInvalidInput, "unknown request type %q; allowed values: %s", s, "`scalar`, `time_series`, `raw`, `raw_stream`, `trace`, `distribution`, `heatmap`")
 	}
 }
 

pkg/types/querybuildertypes/querybuildertypesv5/resp.go

@@ -136,6 +136,9 @@ func (q *QueryRangeResponse) PrepareJSONSchema(schema *jsonschema.Schema) error
 type TimeSeriesData struct {
 	QueryName    string               `json:"queryName" description:"The name of the query that produced this result."`
 	Aggregations []*AggregationBucket `json:"aggregations" description:"One bucket per aggregation of the query. The order is not guaranteed; match buckets to aggregations by index."`
+
+	// zeroFill is applied only when encoding; in-memory series stay sparse.
+	zeroFill *zeroFill
 }
 
 // FilterToTimeRange copies the aggregation and series structure keeping only
@@ -562,17 +565,6 @@ func sanitizeValue(v any) any {
 	}
 }
 
-func (q QueryRangeResponse) MarshalJSON() ([]byte, error) {
-	type Alias QueryRangeResponse
-	return json.Marshal(&struct {
-		*Alias
-		Data any `json:"data"`
-	}{
-		Alias: (*Alias)(&q),
-		Data:  sanitizeValue(q.Data),
-	})
-}
-
 func (s ScalarData) MarshalJSON() ([]byte, error) {
 	type Alias ScalarData
 	sanitizedData := make([][]any, len(s.Data))
@@ -615,36 +607,6 @@ func (r RawRow) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (t TimeSeriesValue) MarshalJSON() ([]byte, error) {
-	type Alias TimeSeriesValue
-
-	var sanitizedValues any
-	if t.Values != nil {
-		sanitizedValues = sanitizeValue(t.Values)
-		// If original was empty slice, ensure we return empty slice not nil
-		if len(t.Values) == 0 {
-			sanitizedValues = []any{}
-		}
-	}
-
-	// a heatmap point's counts are spread across Values, so there is no one
-	// number Value could carry
-	var sanitizedValue any
-	if t.Values == nil {
-		sanitizedValue = sanitizeValue(t.Value)
-	}
-
-	return json.Marshal(&struct {
-		*Alias
-		Value  any `json:"value,omitempty"`
-		Values any `json:"values,omitempty"`
-	}{
-		Alias:  (*Alias)(&t),
-		Value:  sanitizedValue,
-		Values: sanitizedValues,
-	})
-}
-
 func (r RawData) MarshalJSON() ([]byte, error) {
 	type Alias RawData
 	return json.Marshal((*Alias)(&r))

pkg/types/querybuildertypes/querybuildertypesv5/resp_json.go

@@ -0,0 +1,233 @@
+package querybuildertypesv5
+
+import (
+	"math"
+
+	jsonv2 "github.com/go-json-experiment/json"
+	"github.com/go-json-experiment/json/jsontext"
+	jsonv1 "github.com/go-json-experiment/json/v1"
+)
+
+// SetZeroFill makes every series render one point per step over [startMs, endMs], writing 0 for
+// a step without a value, instead of storing those points. Points off the step grid are dropped.
+func (t *TimeSeriesData) SetZeroFill(startMs, endMs, stepMs int64) {
+	if stepMs <= 0 {
+		return
+	}
+	t.zeroFill = &zeroFill{start: startMs, end: endMs, step: stepMs}
+}
+
+func (q QueryRangeResponse) MarshalJSON() ([]byte, error) {
+	return jsonv2.Marshal(q, jsonv1.DefaultOptionsV1())
+}
+
+// MarshalJSONTo lets a time series response stream to the writer instead of being held in
+// memory whole.
+func (q QueryRangeResponse) MarshalJSONTo(enc *jsontext.Encoder) error {
+	type alias QueryRangeResponse
+	return jsonv2.MarshalEncode(enc, (*alias)(&q))
+}
+
+func (t TimeSeriesData) MarshalJSON() ([]byte, error) {
+	return jsonv2.Marshal(t, jsonv1.DefaultOptionsV1())
+}
+
+func (t TimeSeriesData) MarshalJSONTo(enc *jsontext.Encoder) error {
+	writer := tokenWriter{enc: enc}
+	writer.token(jsontext.BeginObject)
+	writer.token(jsontext.String("queryName"))
+	writer.token(jsontext.String(t.QueryName))
+	writer.token(jsontext.String("aggregations"))
+	if t.Aggregations == nil {
+		writer.token(jsontext.Null)
+	} else {
+		writer.token(jsontext.BeginArray)
+		for _, bucket := range t.Aggregations {
+			if writer.err != nil {
+				return writer.err
+			}
+			writer.aggregationBucket(bucket, t.zeroFill)
+		}
+		writer.token(jsontext.EndArray)
+	}
+	writer.token(jsontext.EndObject)
+	return writer.err
+}
+
+func (t TimeSeriesValue) MarshalJSON() ([]byte, error) {
+	return jsonv2.Marshal(t, jsonv1.DefaultOptionsV1())
+}
+
+func (t TimeSeriesValue) MarshalJSONTo(enc *jsontext.Encoder) error {
+	writer := tokenWriter{enc: enc}
+	writer.token(jsontext.BeginObject)
+	writer.token(jsontext.String("timestamp"))
+	writer.token(jsontext.Int(t.Timestamp))
+	if t.Partial {
+		writer.token(jsontext.String("partial"))
+		writer.token(jsontext.True)
+	}
+	// a heatmap point's counts are spread across Values, so there is no one
+	// number Value could carry
+	if t.Values == nil {
+		writer.token(jsontext.String("value"))
+		writer.token(sanitizedFloatToken(t.Value))
+	} else {
+		writer.token(jsontext.String("values"))
+		writer.token(jsontext.BeginArray)
+		for _, v := range t.Values {
+			writer.token(sanitizedFloatToken(v))
+		}
+		writer.token(jsontext.EndArray)
+	}
+	writer.token(jsontext.EndObject)
+	return writer.err
+}
+
+type zeroFill struct {
+	start int64
+	end   int64
+	step  int64
+}
+
+// tokenWriter keeps the first error so a sequence of writes needs a single check.
+type tokenWriter struct {
+	enc *jsontext.Encoder
+	err error
+}
+
+func (writer *tokenWriter) token(t jsontext.Token) {
+	if writer.err == nil {
+		writer.err = writer.enc.WriteToken(t)
+	}
+}
+
+func (writer *tokenWriter) value(v any) {
+	if writer.err == nil {
+		writer.err = jsonv2.MarshalEncode(writer.enc, v)
+	}
+}
+
+func (writer *tokenWriter) aggregationBucket(a *AggregationBucket, fill *zeroFill) {
+	if a == nil {
+		writer.token(jsontext.Null)
+		return
+	}
+
+	writer.token(jsontext.BeginObject)
+	writer.token(jsontext.String("index"))
+	writer.token(jsontext.Int(int64(a.Index)))
+	writer.token(jsontext.String("alias"))
+	writer.token(jsontext.String(a.Alias))
+	writer.token(jsontext.String("meta"))
+	writer.value(a.Meta)
+	writer.token(jsontext.String("series"))
+	writer.seriesList(a.Series, fill)
+	writer.optionalSeriesList("predictedSeries", a.PredictedSeries)
+	writer.optionalSeriesList("upperBoundSeries", a.UpperBoundSeries)
+	writer.optionalSeriesList("lowerBoundSeries", a.LowerBoundSeries)
+	writer.optionalSeriesList("anomalyScores", a.AnomalyScores)
+	writer.token(jsontext.EndObject)
+}
+
+func (writer *tokenWriter) optionalSeriesList(name string, series []*TimeSeries) {
+	if len(series) == 0 {
+		return
+	}
+	writer.token(jsontext.String(name))
+	writer.seriesList(series, nil)
+}
+
+func (writer *tokenWriter) seriesList(series []*TimeSeries, fill *zeroFill) {
+	if series == nil {
+		writer.token(jsontext.Null)
+		return
+	}
+
+	writer.token(jsontext.BeginArray)
+	for _, s := range series {
+		if writer.err != nil {
+			return
+		}
+		writer.series(s, fill)
+	}
+	writer.token(jsontext.EndArray)
+}
+
+func (writer *tokenWriter) series(s *TimeSeries, fill *zeroFill) {
+	if writer.err != nil {
+		return
+	}
+	if s == nil {
+		writer.token(jsontext.Null)
+		return
+	}
+
+	writer.token(jsontext.BeginObject)
+	if len(s.Labels) > 0 {
+		writer.token(jsontext.String("labels"))
+		writer.value(s.Labels)
+	}
+	writer.token(jsontext.String("values"))
+	switch {
+	case fill != nil:
+		writer.zeroFilledValues(s.Values, fill)
+	case s.Values == nil:
+		writer.token(jsontext.Null)
+	default:
+		writer.token(jsontext.BeginArray)
+		for _, v := range s.Values {
+			if writer.err != nil {
+				return
+			}
+			writer.point(v)
+		}
+		writer.token(jsontext.EndArray)
+	}
+	writer.token(jsontext.EndObject)
+}
+
+func (writer *tokenWriter) zeroFilledValues(values []*TimeSeriesValue, fill *zeroFill) {
+	byTimestamp := make(map[int64]*TimeSeriesValue, len(values))
+	for _, v := range values {
+		byTimestamp[v.Timestamp] = v
+	}
+
+	writer.token(jsontext.BeginArray)
+	for ts := fill.start - fill.start%fill.step; ts <= fill.end && writer.err == nil; ts += fill.step {
+		if v, ok := byTimestamp[ts]; ok {
+			writer.point(v)
+			continue
+		}
+		writer.token(jsontext.BeginObject)
+		writer.token(jsontext.String("timestamp"))
+		writer.token(jsontext.Int(ts))
+		writer.token(jsontext.String("value"))
+		writer.token(jsontext.Int(0))
+		writer.token(jsontext.EndObject)
+	}
+	writer.token(jsontext.EndArray)
+}
+
+func (writer *tokenWriter) point(v *TimeSeriesValue) {
+	if v == nil {
+		writer.token(jsontext.Null)
+		return
+	}
+	if writer.err == nil {
+		writer.err = v.MarshalJSONTo(writer.enc)
+	}
+}
+
+// sanitizedFloatToken encodes f the way sanitizeValue renders it.
+func sanitizedFloatToken(f float64) jsontext.Token {
+	switch {
+	case math.IsNaN(f):
+		return jsontext.String("NaN")
+	case math.IsInf(f, 1):
+		return jsontext.String("Inf")
+	case math.IsInf(f, -1):
+		return jsontext.String("-Inf")
+	}
+	return jsontext.Float(roundToNonZeroDecimals(f, 3))
+}

pkg/types/querybuildertypes/querybuildertypesv5/resp_json_test.go

@@ -0,0 +1,168 @@
+package querybuildertypesv5
+
+import (
+	"encoding/json"
+	"testing"
+
+	jsonv2 "github.com/go-json-experiment/json"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestTimeSeriesData_ZeroFill(t *testing.T) {
+	testCases := []struct {
+		name     string
+		values   []*TimeSeriesValue
+		start    int64
+		end      int64
+		step     int64
+		expected string
+	}{
+		{
+			name:     "Gaps",
+			values:   []*TimeSeriesValue{{Timestamp: 1000, Value: 1}, {Timestamp: 4000, Value: 4}},
+			start:    1000,
+			end:      4000,
+			step:     1000,
+			expected: `[{"timestamp":1000,"value":1},{"timestamp":2000,"value":0},{"timestamp":3000,"value":0},{"timestamp":4000,"value":4}]`,
+		},
+		{
+			name:     "Empty",
+			values:   []*TimeSeriesValue{},
+			start:    1000,
+			end:      3000,
+			step:     1000,
+			expected: `[{"timestamp":1000,"value":0},{"timestamp":2000,"value":0},{"timestamp":3000,"value":0}]`,
+		},
+		{
+			name:     "Nil",
+			values:   nil,
+			start:    1000,
+			end:      2000,
+			step:     1000,
+			expected: `[{"timestamp":1000,"value":0},{"timestamp":2000,"value":0}]`,
+		},
+		{
+			name:     "UnalignedBounds",
+			values:   []*TimeSeriesValue{{Timestamp: 60000, Value: 1}, {Timestamp: 240000, Value: 4}},
+			start:    50000,
+			end:      250000,
+			step:     60000,
+			expected: `[{"timestamp":0,"value":0},{"timestamp":60000,"value":1},{"timestamp":120000,"value":0},{"timestamp":180000,"value":0},{"timestamp":240000,"value":4}]`,
+		},
+		{
+			name:     "OffGridAndOutOfRangeDropped",
+			values:   []*TimeSeriesValue{{Timestamp: 500, Value: 5}, {Timestamp: 1500, Value: 15}, {Timestamp: 2000, Value: 2}, {Timestamp: 3000, Value: 3}},
+			start:    1000,
+			end:      2000,
+			step:     1000,
+			expected: `[{"timestamp":1000,"value":0},{"timestamp":2000,"value":2}]`,
+		},
+		{
+			name:     "DuplicateTimestampKeepsLast",
+			values:   []*TimeSeriesValue{{Timestamp: 1000, Value: 1}, {Timestamp: 1000, Value: 9}},
+			start:    1000,
+			end:      1000,
+			step:     1000,
+			expected: `[{"timestamp":1000,"value":9}]`,
+		},
+		{
+			name:     "PointFieldsKept",
+			values:   []*TimeSeriesValue{{Timestamp: 2000, Value: 2.12345, Partial: true}},
+			start:    1000,
+			end:      2000,
+			step:     1000,
+			expected: `[{"timestamp":1000,"value":0},{"timestamp":2000,"partial":true,"value":2.123}]`,
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			series := &TimeSeries{Values: testCase.values}
+			data := &TimeSeriesData{
+				QueryName: "A",
+				Aggregations: []*AggregationBucket{{
+					Series:          []*TimeSeries{series},
+					PredictedSeries: []*TimeSeries{{Values: []*TimeSeriesValue{{Timestamp: 3000, Value: 3}}}},
+				}},
+			}
+			data.SetZeroFill(testCase.start, testCase.end, testCase.step)
+
+			expected := `{"queryName":"A","aggregations":[{"index":0,"alias":"","meta":{},"series":[{"values":` + testCase.expected + `}],"predictedSeries":[{"values":[{"timestamp":3000,"value":3}]}]}]}`
+
+			marshalled, err := json.Marshal(data)
+			require.NoError(t, err)
+			assert.JSONEq(t, expected, string(marshalled))
+
+			response := QueryRangeResponse{Type: RequestTypeTimeSeries, Data: QueryData{Results: []any{data}}}
+			viaMarshalJSON, err := json.Marshal(response)
+			require.NoError(t, err)
+			viaMarshalJSONTo, err := jsonv2.Marshal(response)
+			require.NoError(t, err)
+			assert.Equal(t, string(viaMarshalJSON), string(viaMarshalJSONTo))
+
+			var decoded struct {
+				Data struct {
+					Results []json.RawMessage `json:"results"`
+				} `json:"data"`
+			}
+			require.NoError(t, json.Unmarshal(viaMarshalJSONTo, &decoded))
+			require.Len(t, decoded.Data.Results, 1)
+			assert.JSONEq(t, expected, string(decoded.Data.Results[0]))
+
+			assert.Equal(t, testCase.values, series.Values)
+		})
+	}
+}
+
+func TestTimeSeriesData_ZeroFillMatchesFuncFillZero(t *testing.T) {
+	values := []*TimeSeriesValue{{Timestamp: 500, Value: 5}, {Timestamp: 60000, Value: 1}, {Timestamp: 90000, Value: 9}, {Timestamp: 240000, Value: 4, Partial: true}}
+
+	filled := &TimeSeriesData{QueryName: "A", Aggregations: []*AggregationBucket{{Series: []*TimeSeries{funcFillZero(&TimeSeries{Values: values}, 50000, 250000, 60000)}}}}
+	deferred := &TimeSeriesData{QueryName: "A", Aggregations: []*AggregationBucket{{Series: []*TimeSeries{{Values: values}}}}}
+	deferred.SetZeroFill(50000, 250000, 60000)
+
+	expected, err := json.Marshal(filled)
+	require.NoError(t, err)
+	actual, err := json.Marshal(deferred)
+	require.NoError(t, err)
+	assert.Equal(t, string(expected), string(actual))
+}
+
+// failingWriter accepts its first write and fails every one after it.
+type failingWriter struct {
+	writes int
+}
+
+func (writer *failingWriter) Write(p []byte) (int, error) {
+	writer.writes++
+	if writer.writes == 1 {
+		return len(p), nil
+	}
+	return 0, assert.AnError
+}
+
+func TestQueryRangeResponse_MarshalStopsOnWriteError(t *testing.T) {
+	values := make([]*TimeSeriesValue, 16)
+	for i := range values {
+		values[i] = &TimeSeriesValue{Timestamp: int64(i) * 1000, Value: 1}
+	}
+	series := make([]*TimeSeries, 10000)
+	for i := range series {
+		series[i] = &TimeSeries{Values: values}
+	}
+	data := &TimeSeriesData{QueryName: "A", Aggregations: []*AggregationBucket{{Series: series}}}
+	data.SetZeroFill(0, 1000*1000, 1000)
+
+	response := QueryRangeResponse{Type: RequestTypeTimeSeries, Data: QueryData{Results: []any{data}}}
+
+	writer := &failingWriter{}
+	err := jsonv2.MarshalWrite(writer, response)
+	assert.ErrorIs(t, err, assert.AnError)
+	assert.Equal(t, 2, writer.writes)
+
+	allocs := testing.AllocsPerRun(1, func() {
+		_ = jsonv2.MarshalWrite(&failingWriter{}, response)
+	})
+	assert.Less(t, allocs, float64(len(series)))
+}

pkg/types/querybuildertypes/querybuildertypesv5/validation.go

@@ -499,18 +499,6 @@ func (q *QueryBuilderQuery[T]) validateOrderBy(cfg validationConfig) error {
 		return q.validateOrderByForAggregation()
 	}
 
-	// a raw order key resolves like a select field, so only an empty one is
-	// invalid before resolution
-	for i, order := range q.Order {
-		if order.Key.Name == "" {
-			orderID := fmt.Sprintf("order by clause #%d", i+1)
-			if q.Name != "" {
-				orderID = fmt.Sprintf("order by clause #%d in query '%s'", i+1, q.Name)
-			}
-			return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid empty key name for %s", orderID)
-		}
-	}
-
 	return nil
 }
 
@@ -598,10 +586,19 @@ func (r *QueryRangeRequest) Validate(opts ...ValidationOption) error {
 		return err
 	}
 
-	if err := r.validateRequestType(); err != nil {
-		return err
+	// Validate request type
+	switch r.RequestType {
+	case RequestTypeRaw, RequestTypeRawStream, RequestTypeTrace, RequestTypeTimeSeries, RequestTypeScalar, RequestTypeHeatmap, RequestTypeDistribution:
+		opts = append(opts, GetValidationOptions(r.RequestType)...)
+	default:
+		return errors.NewInvalidInputf(
+			errors.CodeInvalidInput,
+			"invalid request type: %s",
+			r.RequestType,
+		).WithAdditional(
+			"Valid request types are: raw, timeseries, scalar, heatmap, distribution",
+		)
 	}
-	opts = append(opts, GetValidationOptions(r.RequestType)...)
 
 	if err := r.validateBucketCounting(); err != nil {
 		return err
@@ -642,10 +639,14 @@ func (r *QueryRangeRequest) ValidateRequestScope() ([]ValidationOption, error) {
 		return nil, err
 	}
 
-	if err := r.validateRequestType(); err != nil {
-		return nil, err
+	var opts []ValidationOption
+	switch r.RequestType {
+	case RequestTypeRaw, RequestTypeRawStream, RequestTypeTrace, RequestTypeTimeSeries, RequestTypeScalar, RequestTypeHeatmap, RequestTypeDistribution:
+		opts = GetValidationOptions(r.RequestType)
+	default:
+		return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid request type: %s", r.RequestType).
+			WithAdditional("Valid request types are: raw, timeseries, scalar, heatmap, distribution")
 	}
-	opts := GetValidationOptions(r.RequestType)
 
 	if err := r.validateBucketCounting(); err != nil {
 		return nil, err
@@ -702,20 +703,6 @@ func (e QueryEnvelope) Validate(opts ...ValidationOption) error {
 	return validateQueryEnvelope(e, opts...)
 }
 
-// Enum is the one list of request types a query can use, so the spec and the
-// suggestions agree with what is accepted.
-func (r *QueryRangeRequest) validateRequestType() error {
-	if slices.Contains(RequestType{}.Enum(), any(r.RequestType)) {
-		return nil
-	}
-	if r.RequestType == RequestTypeUnknown {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "requestType is required").
-			WithSuggestions(errors.NewValidReferences(errors.NounRequestTypes, RequestType{}.Enum()...))
-	}
-	return errors.NewInvalidInputf(errors.CodeInvalidInput, "request type %q is not supported", r.RequestType.StringValue()).
-		WithSuggestions(errors.NewValidReferences(errors.NounRequestTypes, RequestType{}.Enum()...))
-}
-
 func (r *QueryRangeRequest) validateTimeRange() error {
 	if r.RequestType == RequestTypeRawStream {
 		return nil
@@ -934,26 +921,15 @@ func (r *QueryRangeRequest) validateBucketCounting() error {
 				continue
 			}
 			enabled++
-		// An AI query decodes to the traces spec, so it lands here too.
-		case QueryBuilderQuery[LogAggregation]:
-			if err := validateEventHeatmapQuery(r.RequestType, spec.Functions, spec.Having, aggregationExpressions(spec.Aggregations), spec.Disabled); err != nil {
-				return err
-			}
-			if spec.Disabled {
-				continue
-			}
-			enabled++
-		case QueryBuilderQuery[TraceAggregation]:
-			if err := validateEventHeatmapQuery(r.RequestType, spec.Functions, spec.Having, aggregationExpressions(spec.Aggregations), spec.Disabled); err != nil {
-				return err
-			}
-			if spec.Disabled {
-				continue
-			}
-			enabled++
+		// An AI query decodes to the traces spec, so it lands here too. Admitting
+		// either signal means capping Aggregations at one: each carries its own
+		// Meta.Buckets, and a heatmap renders against a single bucket axis.
+		case QueryBuilderQuery[LogAggregation], QueryBuilderQuery[TraceAggregation]:
+			return errors.New(errors.TypeUnsupported, errors.CodeUnsupported,
+				"heatmaps are not supported for the logs and traces signals yet")
 		default:
 			return errors.NewInvalidInputf(errors.CodeInvalidInput,
-				"%s requests support one builder query, one formula over them, one clickhouse query, or one promql query, got %q", r.RequestType.StringValue(), envelope.Type.StringValue())
+				"%s requests support one metrics builder query, one formula over them, one clickhouse query, or one promql query, got %q", r.RequestType.StringValue(), envelope.Type.StringValue())
 		}
 	}
 
@@ -1057,48 +1033,6 @@ func validateBucketCountingQuery(requestType RequestType, functions []Function,
 	return nil
 }
 
-// validateEventHeatmapQuery holds a logs or traces query to what a per-event
-// heatmap can draw. A disabled query feeds a formula rather than the chart, so
-// it aggregates as a time series.
-func validateEventHeatmapQuery(requestType RequestType, functions []Function, having *Having, expressions []string, disabled bool) error {
-	if err := validateBucketCountingQuery(requestType, functions, having); err != nil {
-		return err
-	}
-
-	if disabled {
-		return nil
-	}
-
-	// Every aggregation carries its own Meta.Buckets, and a heatmap renders
-	// against a single bucket axis.
-	if len(expressions) != 1 {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput,
-			"a heatmap renders one bucket axis, but the query has %d aggregations", len(expressions)).
-			WithAdditional("Keep the one aggregation whose distribution you want to plot")
-	}
-
-	if _, ok := HeatmapAggregationField(expressions[0]); !ok {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput,
-			"a logs or traces heatmap counts events by the field named as its aggregation, got %q", expressions[0]).
-			WithAdditional("Use an aggregation such as duration_nano")
-	}
-
-	return nil
-}
-
-func aggregationExpressions[T LogAggregation | TraceAggregation](aggregations []T) []string {
-	expressions := make([]string, len(aggregations))
-	for i, aggregation := range aggregations {
-		switch a := any(aggregation).(type) {
-		case LogAggregation:
-			expressions[i] = a.Expression
-		case TraceAggregation:
-			expressions[i] = a.Expression
-		}
-	}
-	return expressions
-}
-
 func GetValidationOptions(requestType RequestType) []ValidationOption {
 	switch requestType {
 	case RequestTypeTimeSeries, RequestTypeHeatmap, RequestTypeDistribution:

pkg/types/querybuildertypes/querybuildertypesv5/validation_test.go

@@ -1,15 +1,9 @@
 package querybuildertypesv5
 
 import (
-	"encoding/json"
-	"fmt"
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/types/metrictypes"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
@@ -527,28 +521,6 @@ func TestQueryRangeRequest_ValidateCompositeQuery(t *testing.T) {
 			wantErr: true,
 			errMsg:  "expression cannot be blank",
 		},
-		{
-			name: "Formula_NegativeLimit_Rejected",
-			request: QueryRangeRequest{
-				Start:       1640995200000,
-				End:         1640998800000,
-				RequestType: RequestTypeTimeSeries,
-				CompositeQuery: CompositeQuery{
-					Queries: []QueryEnvelope{
-						{
-							Type: QueryTypeFormula,
-							Spec: QueryBuilderFormula{
-								Name:       "F1",
-								Expression: "A * 2",
-								Limit:      -5,
-							},
-						},
-					},
-				},
-			},
-			wantErr: true,
-			errMsg:  "invalid formula 'F1': limit must be non-negative, got -5",
-		},
 		{
 			name: "promql with empty query should return error",
 			request: QueryRangeRequest{
@@ -724,31 +696,6 @@ func TestQueryRangeRequest_ValidateCompositeQuery(t *testing.T) {
 			wantErr: true,
 			errMsg:  "raw request type is not supported for metric queries",
 		},
-		{
-			name: "Raw_EmptyOrderKey_Rejected",
-			request: QueryRangeRequest{
-				Start:       1640995200000,
-				End:         1640998800000,
-				RequestType: RequestTypeRaw,
-				CompositeQuery: CompositeQuery{
-					Queries: []QueryEnvelope{
-						{
-							Type: QueryTypeBuilder,
-							Spec: QueryBuilderQuery[LogAggregation]{
-								Name:   "B",
-								Signal: telemetrytypes.SignalLogs,
-								Order: []OrderBy{
-									{Key: OrderByKey{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "timestamp"}}, Direction: OrderDirectionDesc},
-									{Key: OrderByKey{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: ""}}, Direction: OrderDirectionAsc},
-								},
-							},
-						},
-					},
-				},
-			},
-			wantErr: true,
-			errMsg:  "invalid query 'B': invalid empty key name for order by clause #2 in query 'B'",
-		},
 		{
 			name: "timeseries request with group by timestamp should return error",
 			request: QueryRangeRequest{
@@ -1460,44 +1407,6 @@ func TestRequestType_IsAggregation(t *testing.T) {
 	}
 }
 
-func TestQueryRangeRequest_ValidateRequestType(t *testing.T) {
-	validRequestTypes := []string{"valid request types are `scalar`, `time_series`, `raw`, `raw_stream`, `trace`, `heatmap`, `distribution`"}
-
-	testCases := []struct {
-		name        string
-		requestType string
-		message     string
-	}{
-		{
-			name:        "Missing_Required",
-			requestType: "",
-			message:     "requestType is required",
-		},
-		{
-			name:        "Timeseries_Unknown",
-			requestType: `"requestType": "timeseries",`,
-			message:     `unknown request type "timeseries"`,
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			body := fmt.Sprintf(`{"schemaVersion": "v1", "start": 1640995200000, "end": 1640998800000, %s "compositeQuery": {"queries": [{"type": "builder_query", "spec": {"name": "A", "signal": "logs"}}]}}`, testCase.requestType)
-
-			var request QueryRangeRequest
-			err := json.Unmarshal([]byte(body), &request)
-			if err == nil {
-				err = request.Validate()
-			}
-			require.Error(t, err)
-
-			got := errors.AsJSON(err)
-			assert.Equal(t, testCase.message, got.Message)
-			assert.Equal(t, validRequestTypes, got.Suggestions)
-		})
-	}
-}
-
 func TestNonAggregationFieldsSkipped(t *testing.T) {
 	// Fields that only apply to aggregation queries (groupBy, having, aggregations)
 	// should be silently skipped for non-aggregation request types.

tests/fixtures/querier.py

@@ -363,7 +363,6 @@ def build_formula_query(
     order: list[dict] | None = None,
     limit: int | None = None,
     offset: int | None = None,
-    having_expression: str | None = None,
 ) -> dict:
     spec: dict[str, Any] = {
         "name": name,
@@ -380,8 +379,6 @@ def build_formula_query(
         spec["limit"] = limit
     if offset is not None:
         spec["offset"] = offset
-    if having_expression:
-        spec["having"] = {"expression": having_expression}
     return {"type": "builder_formula", "spec": spec}
 
 
@@ -730,44 +727,6 @@ def build_scalar_query(
     return {"type": "builder_query", "spec": spec}
 
 
-def build_heatmap_query(
-    name: str,
-    signal: str,
-    expression: str,
-    *,
-    source: str | None = None,
-    group_by: list[dict] | None = None,
-    order: list[dict] | None = None,
-    filter_expression: str | None = None,
-    bucket_options: dict | None = None,
-    step_interval: int = DEFAULT_STEP_INTERVAL,
-) -> dict:
-    """Omitting bucket_options leaves the server's default log axis."""
-    spec: dict[str, Any] = {
-        "name": name,
-        "signal": signal,
-        "stepInterval": step_interval,
-        "aggregations": [{"expression": expression}],
-    }
-
-    if source:
-        spec["source"] = source
-
-    if group_by:
-        spec["groupBy"] = group_by
-
-    if order:
-        spec["order"] = order
-
-    if filter_expression:
-        spec["filter"] = {"expression": filter_expression}
-
-    if bucket_options is not None:
-        spec["bucketOptions"] = bucket_options
-
-    return {"type": "builder_query", "spec": spec}
-
-
 def build_traces_scalar_query(
     aggregations: list[dict],
     *,

tests/integration/tests/auditquerier/02_heatmap.py

@@ -1,83 +0,0 @@
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-from http import HTTPStatus
-
-import pytest
-
-from fixtures import types
-from fixtures.audit import AuditLog
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.querier import (
-    RequestType,
-    assert_distribution_sums_heatmap,
-    build_group_by_field,
-    build_heatmap_query,
-    build_linear_bucket_options,
-    get_all_series,
-    get_buckets,
-    index_series_by_label,
-    make_query_request,
-)
-
-
-def test_audit_heatmap(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_audit_logs: Callable[[list[AuditLog]], None],
-) -> None:
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    changed_by_action = {"update": [3, 8], "delete": [25]}
-    insert_audit_logs(
-        [
-            AuditLog(
-                timestamp=now - timedelta(seconds=index + 1),
-                resources={"service.name": "signoz", "signoz.audit.resource.kind": "dashboard"},
-                attributes={"signoz.audit.action": action, "signoz.audit.fields_changed": fields_changed},
-                event_name=f"dashboard.{action}",
-            )
-            for action, values in changed_by_action.items()
-            for index, fields_changed in enumerate(values)
-        ]
-        # an event without the field is not counted
-        + [
-            AuditLog(
-                timestamp=now - timedelta(seconds=5),
-                resources={"service.name": "signoz", "signoz.audit.resource.kind": "dashboard"},
-                attributes={"signoz.audit.action": "update"},
-                event_name="dashboard.update",
-            )
-        ]
-    )
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    start_ms = int((now - timedelta(minutes=5)).timestamp() * 1000)
-    end_ms = int((now + timedelta(seconds=5)).timestamp() * 1000)
-    queries = [
-        build_heatmap_query(
-            "A",
-            "logs",
-            "signoz.audit.fields_changed",
-            source="audit",
-            group_by=[build_group_by_field("signoz.audit.action", "string", "attribute")],
-            filter_expression="signoz.audit.resource.kind = 'dashboard'",
-            bucket_options=build_linear_bucket_options(20, 4),
-        )
-    ]
-    response = make_query_request(signoz, token, start_ms, end_ms, queries, request_type=RequestType.HEATMAP)
-    assert response.status_code == HTTPStatus.OK, response.text
-    assert_distribution_sums_heatmap(signoz, token, start_ms, end_ms, queries, response)
-
-    data = response.json()
-    # 20 split into 4 gives (0, 5], (5, 10], (10, 15], (15, 20]; the axis stops
-    # at the highest bucket reached, and 25 is past 20 so it counts in the
-    # trailing overflow
-    buckets = get_buckets(data, "A")
-    assert buckets == pytest.approx([0.0, 5.0, 10.0])
-
-    series_by_action = index_series_by_label(get_all_series(data, "A"), "signoz.audit.action")
-    totals_by_action = {action: [sum(column["values"][slot] for column in series["values"]) for slot in range(len(buckets) + 1)] for action, series in series_by_action.items()}
-    assert totals_by_action == {
-        "update": [0, 1, 1, 0],
-        "delete": [0, 0, 0, 1],
-    }

tests/integration/tests/queriercommon/10_cache_time_shift.py

@@ -1,86 +0,0 @@
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-from http import HTTPStatus
-from uuid import uuid4
-
-from fixtures import types
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.logs import Logs
-from fixtures.querier import (
-    build_aggregation,
-    build_function,
-    build_group_by_field,
-    build_scalar_query,
-    get_all_series,
-    index_series_by_label,
-    make_query_request,
-)
-
-MINUTE = timedelta(minutes=1)
-
-
-def test_time_shift_partial_hit_matches_no_cache(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-) -> None:
-    """
-    The hour before the shifted one holds different counts, so a gap read
-    one shift too far back returns wrong points instead of nothing.
-    """
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    # the cache outlives the run, so a fixed filter would serve the previous
-    # run's points back to this one
-    run = uuid4().hex[:8]
-    insert_logs(
-        [
-            Logs(
-                timestamp=now - 120 * MINUTE + minute * MINUTE + timedelta(seconds=1 + i),
-                resources={"service.name": service},
-                attributes={"run": run},
-                body=f"{service} {minute} {i}",
-            )
-            for minute in range(60)
-            for service, count in (("svc-a", 4), ("svc-b", 2))
-            for i in range(count)
-        ]
-        + [
-            Logs(
-                timestamp=now - 180 * MINUTE + minute * MINUTE + timedelta(seconds=1 + i),
-                resources={"service.name": service},
-                attributes={"run": run},
-                body=f"{service} earlier {minute} {i}",
-            )
-            for minute in range(60)
-            for service, count in (("svc-a", 9), ("svc-b", 7))
-            for i in range(count)
-        ]
-    )
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    query = build_scalar_query(
-        name="A",
-        signal="logs",
-        aggregations=[build_aggregation("count()")],
-        group_by=[build_group_by_field("service.name", "string", "resource")],
-        filter_expression=f"run = '{run}'",
-        step_interval=60,
-        functions=[build_function("timeShift", 3600)],
-    )
-    start_ms = int((now - 60 * MINUTE).timestamp() * 1000)
-    first_end_ms = int((now - 30 * MINUTE).timestamp() * 1000)
-    second_end_ms = int((now - 10 * MINUTE).timestamp() * 1000)
-
-    warm = make_query_request(signoz, token, start_ms, first_end_ms, [query], no_cache=False)
-    assert warm.status_code == HTTPStatus.OK, warm.text
-    cached = make_query_request(signoz, token, start_ms, second_end_ms, [query], no_cache=False)
-    assert cached.status_code == HTTPStatus.OK, cached.text
-    fresh = make_query_request(signoz, token, start_ms, second_end_ms, [query], no_cache=True)
-    assert fresh.status_code == HTTPStatus.OK, fresh.text
-
-    fresh_points = {service: {point["timestamp"]: point["value"] for point in series["values"]} for service, series in index_series_by_label(get_all_series(fresh.json(), "A"), "service.name").items()}
-    assert set(fresh_points) == {"svc-a", "svc-b"}, fresh_points
-    assert {service: len(points) for service, points in fresh_points.items()} == {"svc-a": 50, "svc-b": 50}
-
-    cached_points = {service: {point["timestamp"]: point["value"] for point in series["values"]} for service, series in index_series_by_label(get_all_series(cached.json(), "A"), "service.name").items()}
-    assert cached_points == fresh_points

tests/integration/tests/queriercommon/12_cache_limited_group_by.py

@@ -1,135 +0,0 @@
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-from http import HTTPStatus
-from uuid import uuid4
-
-from fixtures import types
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.logs import Logs
-from fixtures.querier import (
-    build_aggregation,
-    build_group_by_field,
-    build_order_by,
-    build_scalar_query,
-    get_all_series,
-    index_series_by_label,
-    make_query_request,
-)
-
-MINUTE = timedelta(minutes=1)
-
-
-def test_limited_group_by_partial_hit_matches_no_cache(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-) -> None:
-    """
-    The two halves have different winners, so a limit applied per cached
-    piece returns the union of both instead of the window's top two.
-    """
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    # the cache outlives the run, so a fixed filter would serve the previous
-    # run's points back to this one
-    run = uuid4().hex[:8]
-    head_start = now - 60 * MINUTE
-    insert_logs(
-        [
-            Logs(
-                timestamp=head_start + minute * MINUTE + timedelta(seconds=1 + i),
-                resources={"service.name": service},
-                attributes={"run": run},
-                body=f"{service} {minute} {i}",
-            )
-            for minute in range(40)
-            for service, count in (("svc-a", 10 if minute < 20 else 1), ("svc-b", 8 if minute < 20 else 1), ("svc-c", 1 if minute < 20 else 10), ("svc-d", 1 if minute < 20 else 8))
-            for i in range(count)
-        ]
-    )
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    query = build_scalar_query(
-        name="A",
-        signal="logs",
-        aggregations=[build_aggregation("count()")],
-        group_by=[build_group_by_field("service.name", "string", "resource")],
-        order=[build_order_by("count()", "desc")],
-        limit=2,
-        filter_expression=f"run = '{run}'",
-        step_interval=60,
-    )
-    head_start_ms = int(head_start.timestamp() * 1000)
-    head_end_ms = int((head_start + 20 * MINUTE).timestamp() * 1000)
-    tail_end_ms = int((head_start + 40 * MINUTE).timestamp() * 1000)
-
-    warm = make_query_request(signoz, token, head_start_ms, head_end_ms, [query], no_cache=False)
-    assert warm.status_code == HTTPStatus.OK, warm.text
-    cached = make_query_request(signoz, token, head_start_ms, tail_end_ms, [query], no_cache=False)
-    assert cached.status_code == HTTPStatus.OK, cached.text
-    fresh = make_query_request(signoz, token, head_start_ms, tail_end_ms, [query], no_cache=True)
-    assert fresh.status_code == HTTPStatus.OK, fresh.text
-
-    fresh_points = {service: {point["timestamp"]: point["value"] for point in series["values"]} for service, series in index_series_by_label(get_all_series(fresh.json(), "A"), "service.name").items()}
-    assert set(fresh_points) == {"svc-a", "svc-c"}, fresh_points
-    assert {service: len(points) for service, points in fresh_points.items()} == {"svc-a": 40, "svc-c": 40}
-
-    cached_points = {service: {point["timestamp"]: point["value"] for point in series["values"]} for service, series in index_series_by_label(get_all_series(cached.json(), "A"), "service.name").items()}
-    assert cached_points == fresh_points
-
-
-def test_limited_group_by_shrunk_window_matches_no_cache(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-) -> None:
-    """
-    svc-a wins the full window and svc-b wins its second half, so a cache
-    that keeps the window's winner serves the wrong series for the half.
-    """
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    # the cache outlives the run, so a fixed filter would serve the previous
-    # run's points back to this one
-    run = uuid4().hex[:8]
-    start = now - 40 * MINUTE
-    insert_logs(
-        [
-            Logs(
-                timestamp=start + minute * MINUTE + timedelta(seconds=1 + i),
-                resources={"service.name": service},
-                attributes={"run": run},
-                body=f"{service} {minute} {i}",
-            )
-            for minute in range(10)
-            for service, count in (("svc-a", 20 if minute < 5 else 1), ("svc-b", 1 if minute < 5 else 10))
-            for i in range(count)
-        ]
-    )
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    query = build_scalar_query(
-        name="A",
-        signal="logs",
-        aggregations=[build_aggregation("count()")],
-        group_by=[build_group_by_field("service.name", "string", "resource")],
-        order=[build_order_by("count()", "desc")],
-        limit=1,
-        filter_expression=f"run = '{run}'",
-        step_interval=60,
-    )
-    start_ms = int(start.timestamp() * 1000)
-    middle_ms = int((start + 5 * MINUTE).timestamp() * 1000)
-    end_ms = int((start + 10 * MINUTE).timestamp() * 1000)
-
-    warm = make_query_request(signoz, token, start_ms, end_ms, [query], no_cache=False)
-    assert warm.status_code == HTTPStatus.OK, warm.text
-    cached = make_query_request(signoz, token, middle_ms, end_ms, [query], no_cache=False)
-    assert cached.status_code == HTTPStatus.OK, cached.text
-    fresh = make_query_request(signoz, token, middle_ms, end_ms, [query], no_cache=True)
-    assert fresh.status_code == HTTPStatus.OK, fresh.text
-
-    fresh_points = {service: {point["timestamp"]: point["value"] for point in series["values"]} for service, series in index_series_by_label(get_all_series(fresh.json(), "A"), "service.name").items()}
-    assert set(fresh_points) == {"svc-b"}, fresh_points
-    assert sorted(fresh_points["svc-b"].values()) == [10] * 5, fresh_points
-
-    cached_points = {service: {point["timestamp"]: point["value"] for point in series["values"]} for service, series in index_series_by_label(get_all_series(cached.json(), "A"), "service.name").items()}
-    assert cached_points == fresh_points

tests/integration/tests/querierlogs/04_formula.py

@@ -2,8 +2,6 @@ from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from http import HTTPStatus
 
-import pytest
-
 from fixtures import types
 from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
 from fixtures.logs import Logs
@@ -14,9 +12,6 @@ from fixtures.querier import (
     build_order_by,
     build_scalar_query,
     find_named_result,
-    get_all_series,
-    get_error_message,
-    index_series_by_label,
     make_query_request,
 )
 
@@ -196,138 +191,3 @@ def test_logs_formula_orderby_and_limit(
     assert len(f3_services) == 3, f"F3: expected 3 rows after limit, got {len(f3_services)}"
     assert f3_values == f4_values[:3], f"F3 values {f3_values} do not match F4[:3] values {f4_values[:3]}"
     assert set(f3_services) == set(f4_services[:3]), f"F3 services {f3_services} do not match F4[:3] services {f4_services[:3]}"
-
-
-# Logs per service at 5, 4, 3, 2, and 1 minutes before now. Totals: a 15, b 17, c 5, d 15.
-FORMULA_HAVING_COUNTS = {
-    "service-a": [1, 4, 2, 5, 3],
-    "service-b": [6, 1, 1, 2, 7],
-    "service-c": [1, 1, 1, 1, 1],
-    "service-d": [3, 3, 3, 3, 3],
-}
-
-
-@pytest.mark.parametrize(
-    "query_having,formula_having,expected_services",
-    [
-        pytest.param("count() > 4 AND count() < 16", "F1 > 4 AND F1 < 16", {"service-a", "service-b"}, id="and_range"),
-        pytest.param("count() IN (1, 5, 17) OR count() > 15", "__result IN (1, 5, 17) OR __result > 15", {"service-a", "service-b", "service-c"}, id="in_or"),
-        pytest.param("NOT (count() * 2 - 1 > 9)", "NOT (F1 * 2 - 1 > 9)", {"service-a", "service-b", "service-c", "service-d"}, id="not_arithmetic"),
-    ],
-)
-def test_logs_formula_having_time_series_matches_query_having(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-    query_having: str,
-    formula_having: str,
-    expected_services: set[str],
-) -> None:
-    """
-    The querier computes formulas in Go, so a formula having runs in Go. For the
-    formula `A`, it must keep the same points that SQL HAVING keeps on query A.
-    """
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    insert_logs([Logs(timestamp=now - timedelta(minutes=5 - minute), resources={"service.name": service}, body=f"{service} log {minute}-{i}") for service, counts in FORMULA_HAVING_COUNTS.items() for minute, count in enumerate(counts) for i in range(count)])
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    group_by = [build_group_by_field("service.name", "string", "resource")]
-    response = make_query_request(
-        signoz,
-        token,
-        start_ms=int((now - timedelta(minutes=15)).timestamp() * 1000),
-        end_ms=int(now.timestamp() * 1000),
-        request_type="time_series",
-        queries=[
-            build_scalar_query(name="A", signal="logs", aggregations=[build_aggregation("count()")], group_by=group_by, disabled=True),
-            build_scalar_query(name="B", signal="logs", aggregations=[build_aggregation("count()")], group_by=group_by, having_expression=query_having),
-            build_formula_query("F1", "A", having_expression=formula_having),
-        ],
-    )
-    assert response.status_code == HTTPStatus.OK, response.text
-
-    query_series = index_series_by_label(get_all_series(response.json(), "B"), "service.name")
-    formula_series = index_series_by_label(get_all_series(response.json(), "F1"), "service.name")
-    assert set(formula_series) == expected_services
-    assert set(query_series) == expected_services
-    for service in expected_services:
-        query_points = sorted((value["timestamp"], value["value"]) for value in query_series[service]["values"])
-        formula_points = sorted((value["timestamp"], value["value"]) for value in formula_series[service]["values"])
-        assert formula_points == query_points, service
-
-
-@pytest.mark.parametrize(
-    "query_having,formula_having,expected_services",
-    [
-        pytest.param("count() > 4 AND count() < 16", "F1 > 4 AND F1 < 16", {"service-a", "service-c", "service-d"}, id="and_range"),
-        pytest.param("count() IN (1, 5, 17) OR count() > 15", "__result IN (1, 5, 17) OR __result > 15", {"service-b", "service-c"}, id="in_or"),
-        pytest.param("NOT (count() * 2 - 1 > 9)", "NOT (F1 * 2 - 1 > 9)", {"service-c"}, id="not_arithmetic"),
-    ],
-)
-def test_logs_formula_having_scalar_matches_query_having(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-    query_having: str,
-    formula_having: str,
-    expected_services: set[str],
-) -> None:
-    """
-    For the formula `A` in a scalar request, the formula having must keep the
-    same rows that SQL HAVING keeps on query A.
-    """
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    insert_logs([Logs(timestamp=now - timedelta(minutes=5 - minute), resources={"service.name": service}, body=f"{service} log {minute}-{i}") for service, counts in FORMULA_HAVING_COUNTS.items() for minute, count in enumerate(counts) for i in range(count)])
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    group_by = [build_group_by_field("service.name", "string", "resource")]
-    response = make_query_request(
-        signoz,
-        token,
-        start_ms=int((now - timedelta(minutes=15)).timestamp() * 1000),
-        end_ms=int(now.timestamp() * 1000),
-        request_type="scalar",
-        queries=[
-            build_scalar_query(name="A", signal="logs", aggregations=[build_aggregation("count()")], group_by=group_by, disabled=True),
-            build_scalar_query(name="B", signal="logs", aggregations=[build_aggregation("count()")], group_by=group_by, having_expression=query_having),
-            build_formula_query("F1", "A", having_expression=formula_having),
-        ],
-    )
-    assert response.status_code == HTTPStatus.OK, response.text
-
-    results = response.json()["data"]["data"]["results"]
-    values_by_query = {}
-    for name in ("B", "F1"):
-        result = find_named_result(results, name)
-        assert result is not None, name
-        service_column = next(i for i, column in enumerate(result["columns"]) if column["name"] == "service.name")
-        value_column = next(i for i, column in enumerate(result["columns"]) if column["columnType"] == "aggregation")
-        values_by_query[name] = {row[service_column]: row[value_column] for row in result["data"]}
-    assert set(values_by_query["F1"]) == expected_services
-    assert values_by_query["F1"] == values_by_query["B"]
-
-
-def test_logs_formula_having_invalid_reference(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-) -> None:
-    """A formula having can reference only the formula value, so `count()` is a bad request."""
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    response = make_query_request(
-        signoz,
-        token,
-        start_ms=int((now - timedelta(minutes=15)).timestamp() * 1000),
-        end_ms=int(now.timestamp() * 1000),
-        request_type="time_series",
-        queries=[
-            build_scalar_query(name="A", signal="logs", aggregations=[build_aggregation("count()")], disabled=True),
-            build_formula_query("F1", "A", having_expression="count() > 0"),
-        ],
-    )
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert get_error_message(response.json()) == "Invalid references in `Having` expression: [count]"

tests/integration/tests/querierlogs/17_heatmap.py

@@ -1,207 +0,0 @@
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-from http import HTTPStatus
-
-import pytest
-
-from fixtures import types
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.logs import Logs
-from fixtures.querier import (
-    RequestType,
-    assert_distribution_sums_heatmap,
-    build_aggregation,
-    build_group_by_field,
-    build_heatmap_query,
-    build_linear_bucket_options,
-    build_log_bucket_options,
-    build_order_by,
-    build_scalar_query,
-    get_all_series,
-    get_buckets,
-    get_error_message,
-    get_heatmap_columns,
-    index_series_by_label,
-    make_query_request,
-)
-
-
-def test_linear_heatmap_grouped(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-) -> None:
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    bytes_by_service = {"heatmap-svc-a": [50, 250], "heatmap-svc-b": [950, 5000]}
-    insert_logs(
-        [
-            Logs(
-                timestamp=now - timedelta(seconds=index + 1),
-                resources={"service.name": service},
-                attributes={"response_bytes": response_bytes},
-                body=f"{service} served {response_bytes} bytes",
-            )
-            for service, values in bytes_by_service.items()
-            for index, response_bytes in enumerate(values)
-        ]
-        # a log without the field is not counted
-        + [
-            Logs(
-                timestamp=now - timedelta(seconds=index + 1),
-                resources={"service.name": "heatmap-svc-a"},
-                body="no response size",
-            )
-            for index in range(2)
-        ]
-    )
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    start_ms = int((now - timedelta(minutes=5)).timestamp() * 1000)
-    end_ms = int((now + timedelta(seconds=5)).timestamp() * 1000)
-    queries = [
-        build_heatmap_query(
-            "A",
-            "logs",
-            "response_bytes",
-            group_by=[build_group_by_field("service.name", "string", "resource")],
-            filter_expression="service.name IN ('heatmap-svc-a', 'heatmap-svc-b')",
-            bucket_options=build_linear_bucket_options(1000, 10),
-        )
-    ]
-    response = make_query_request(signoz, token, start_ms, end_ms, queries, request_type=RequestType.HEATMAP)
-    assert response.status_code == HTTPStatus.OK, response.text
-    assert_distribution_sums_heatmap(signoz, token, start_ms, end_ms, queries, response)
-
-    data = response.json()
-    # 1000 split into 10 gives (0, 100], (100, 200], ... (900, 1000], and 5000
-    # is past 1000 so it counts in the trailing overflow
-    buckets = get_buckets(data, "A")
-    assert buckets == pytest.approx([0.0, 100.0, 200.0, 300.0, 400.0, 500.0, 600.0, 700.0, 800.0, 900.0, 1000.0])
-
-    series_by_service = index_series_by_label(get_all_series(data, "A"), "service.name")
-    assert set(series_by_service) == set(bytes_by_service)
-
-    totals_by_service = {service: [sum(column["values"][slot] for column in series["values"]) for slot in range(len(buckets) + 1)] for service, series in series_by_service.items()}
-    assert totals_by_service == {
-        "heatmap-svc-a": [0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0],
-        "heatmap-svc-b": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1],
-    }
-
-
-def test_log_heatmap(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-) -> None:
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    insert_logs(
-        [
-            Logs(
-                timestamp=now - timedelta(seconds=index + 1),
-                resources={"service.name": "heatmap-log-axis"},
-                attributes={"queue_depth": queue_depth},
-                body=f"queue depth {queue_depth}",
-            )
-            for index, queue_depth in enumerate([100, 300, 600])
-        ]
-    )
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    start_ms = int((now - timedelta(minutes=5)).timestamp() * 1000)
-    end_ms = int((now + timedelta(seconds=5)).timestamp() * 1000)
-    queries = [
-        build_heatmap_query(
-            "A",
-            "logs",
-            "attribute.queue_depth",
-            order=[build_order_by("attribute.queue_depth")],
-            filter_expression="service.name = 'heatmap-log-axis'",
-            bucket_options=build_log_bucket_options(0),
-        )
-    ]
-    response = make_query_request(signoz, token, start_ms, end_ms, queries, request_type=RequestType.HEATMAP)
-    assert response.status_code == HTTPStatus.OK, response.text
-    assert_distribution_sums_heatmap(signoz, token, start_ms, end_ms, queries, response)
-
-    data = response.json()
-    # a doubling per bucket, with one rung under the lowest bucket reached so
-    # its lower bound is on the axis; (128, 256] holds nothing but stays
-    buckets = get_buckets(data, "A")
-    assert buckets == pytest.approx([64.0, 128.0, 256.0, 512.0, 1024.0])
-    assert [sum(column["values"][slot] for column in get_heatmap_columns(data, "A")) for slot in range(len(buckets) + 1)] == [0, 1, 0, 1, 1, 0]
-
-
-def test_default_axis(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-) -> None:
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    insert_logs(
-        [
-            Logs(
-                timestamp=now - timedelta(seconds=index + 1),
-                resources={"service.name": "heatmap-default-axis"},
-                attributes={"batch_size": 1000},
-                body="batch of 1000",
-            )
-            for index in range(2)
-        ]
-    )
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    start_ms = int((now - timedelta(minutes=5)).timestamp() * 1000)
-    end_ms = int((now + timedelta(seconds=5)).timestamp() * 1000)
-    queries = [build_heatmap_query("A", "logs", "batch_size", filter_expression="service.name = 'heatmap-default-axis'")]
-    response = make_query_request(signoz, token, start_ms, end_ms, queries, request_type=RequestType.HEATMAP)
-    assert response.status_code == HTTPStatus.OK, response.text
-    assert_distribution_sums_heatmap(signoz, token, start_ms, end_ms, queries, response)
-
-    data = response.json()
-    # no bucketOptions is the finest log axis, 16 buckets per doubling: 1000
-    # sits in (2^(159/16), 2^10]
-    buckets = get_buckets(data, "A")
-    totals = [sum(column["values"][slot] for column in get_heatmap_columns(data, "A")) for slot in range(len(buckets) + 1)]
-    holding = [slot for slot, total in enumerate(totals) if total]
-    assert holding == [len(buckets) - 1]
-    assert totals[holding[0]] == 2
-    assert buckets[-2:] == pytest.approx([2 ** (159 / 16), 1024.0])
-
-
-@pytest.mark.parametrize(
-    "aggregations, expected_message",
-    [
-        pytest.param(
-            [build_aggregation("count()")],
-            'a logs or traces heatmap counts events by the field named as its aggregation, got "count()"',
-            id="count_aggregation",
-        ),
-        pytest.param(
-            [build_aggregation("response_bytes"), build_aggregation("queue_depth")],
-            "a heatmap renders one bucket axis, but the query has 2 aggregations",
-            id="two_aggregations",
-        ),
-    ],
-)
-def test_heatmap_rejections(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    aggregations: list[dict],
-    expected_message: str,
-) -> None:
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    response = make_query_request(
-        signoz,
-        token,
-        int((now - timedelta(minutes=5)).timestamp() * 1000),
-        int(now.timestamp() * 1000),
-        [build_scalar_query("A", "logs", aggregations)],
-        request_type=RequestType.HEATMAP,
-    )
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert expected_message in get_error_message(response.json())

tests/integration/tests/queriermetrics/16_heatmap_rejections.py

@@ -128,15 +128,6 @@ request_types = pytest.mark.parametrize(
             "having is not supported for {request_type} requests",
             id="having_on_the_query",
         ),
-        pytest.param(
-            [
-                build_builder_query("A", METRIC_NAME, "max", "max", disabled=True),
-                build_formula_query("F1", "A", having_expression="F1 > 1"),
-            ],
-            {},
-            "having is not supported for {request_type} requests",
-            id="having_on_the_formula",
-        ),
         pytest.param(
             [build_builder_query("A", METRIC_NAME, "max", "max", bucket_options={"kind": "quadratic", "spec": {}})],
             {},

tests/integration/tests/queriertraces/16_heatmap.py

@@ -1,113 +0,0 @@
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-from http import HTTPStatus
-
-import pytest
-
-from fixtures import types
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.querier import (
-    RequestType,
-    assert_distribution_sums_heatmap,
-    build_heatmap_query,
-    build_linear_bucket_options,
-    build_log_bucket_options,
-    get_buckets,
-    get_heatmap_columns,
-    make_query_request,
-)
-from fixtures.traces import TraceIdGenerator, Traces, TracesKind
-
-
-def test_duration_heatmap(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_traces: Callable[[list[Traces]], None],
-) -> None:
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    durations = [timedelta(0)] + [timedelta(milliseconds=5)] * 6 + [timedelta(seconds=1)] * 3 + [timedelta(seconds=30)]
-    insert_traces(
-        [
-            Traces(
-                timestamp=now - timedelta(minutes=2, seconds=index),
-                duration=duration,
-                trace_id=TraceIdGenerator.trace_id(),
-                span_id=TraceIdGenerator.span_id(),
-                name="GET /cart",
-                kind=TracesKind.SPAN_KIND_SERVER,
-                resources={"service.name": "heatmap-cart"},
-            )
-            for index, duration in enumerate(durations)
-        ]
-    )
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    start_ms = int((now - timedelta(minutes=5)).timestamp() * 1000)
-    end_ms = int(now.timestamp() * 1000)
-    queries = [build_heatmap_query("A", "traces", "duration_nano", filter_expression="service.name = 'heatmap-cart'", bucket_options=build_log_bucket_options(0))]
-    response = make_query_request(signoz, token, start_ms, end_ms, queries, request_type=RequestType.HEATMAP)
-    assert response.status_code == HTTPStatus.OK, response.text
-    assert_distribution_sums_heatmap(signoz, token, start_ms, end_ms, queries, response)
-
-    data = response.json()
-    # a doubling per bucket in nanoseconds: 5ms is in (2^22, 2^23], 1s in
-    # (2^29, 2^30] and 30s in (2^34, 2^35], and 2^22 is the rung under 5ms; a
-    # 0ns span is counted at 0
-    buckets = get_buckets(data, "A")
-    assert buckets == pytest.approx([0.0] + [float(2**power) for power in range(22, 36)])
-
-    totals = [sum(column["values"][slot] for column in get_heatmap_columns(data, "A")) for slot in range(len(buckets) + 1)]
-    assert {buckets[slot]: total for slot, total in enumerate(totals) if total} == {0.0: 1, 2.0**23: 6, 2.0**30: 3, 2.0**35: 1}
-    assert sum(totals) == len(durations)
-
-
-def test_span_attribute_heatmap(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_traces: Callable[[list[Traces]], None],
-) -> None:
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    rows_returned = [5, 5, 5, 45, 45, 250]
-    insert_traces(
-        [
-            Traces(
-                timestamp=now - timedelta(minutes=2, seconds=index),
-                trace_id=TraceIdGenerator.trace_id(),
-                span_id=TraceIdGenerator.span_id(),
-                name="SELECT orders",
-                kind=TracesKind.SPAN_KIND_CLIENT,
-                resources={"service.name": "heatmap-orders-db"},
-                attributes={"db.rows_returned": rows},
-            )
-            for index, rows in enumerate(rows_returned)
-        ]
-        # a span without the attribute is not counted
-        + [
-            Traces(
-                timestamp=now - timedelta(minutes=2, seconds=index),
-                trace_id=TraceIdGenerator.trace_id(),
-                span_id=TraceIdGenerator.span_id(),
-                name="BEGIN",
-                kind=TracesKind.SPAN_KIND_CLIENT,
-                resources={"service.name": "heatmap-orders-db"},
-            )
-            for index in range(2)
-        ]
-    )
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    start_ms = int((now - timedelta(minutes=5)).timestamp() * 1000)
-    end_ms = int(now.timestamp() * 1000)
-    queries = [build_heatmap_query("A", "traces", "db.rows_returned", filter_expression="service.name = 'heatmap-orders-db'", bucket_options=build_linear_bucket_options(100, 10))]
-    response = make_query_request(signoz, token, start_ms, end_ms, queries, request_type=RequestType.HEATMAP)
-    assert response.status_code == HTTPStatus.OK, response.text
-    assert_distribution_sums_heatmap(signoz, token, start_ms, end_ms, queries, response)
-
-    data = response.json()
-    # 100 split into 10 gives (0, 10], (10, 20], ... (90, 100]: 5 is in the
-    # first, 45 in (40, 50], and 250 is past 100 so it counts in the overflow
-    buckets = get_buckets(data, "A")
-    assert buckets == pytest.approx([0.0, 10.0, 20.0, 30.0, 40.0, 50.0])
-    assert [sum(column["values"][slot] for column in get_heatmap_columns(data, "A")) for slot in range(len(buckets) + 1)] == [0, 3, 0, 0, 0, 2, 1]