Merge branch 'main' into nv/exec-stats

.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

.github/workflows/build-community.yaml

@@ -63,7 +63,7 @@ jobs:
     secrets: inherit
     with:
       PRIMUS_REF: main
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
       GO_NAME: signoz-community
       GO_INPUT_ARTIFACT_CACHE_KEY: community-jsbuild-${{ github.sha }}
       GO_INPUT_ARTIFACT_PATH: frontend/build

.github/workflows/build-enterprise.yaml

@@ -89,7 +89,7 @@ jobs:
     secrets: inherit
     with:
       PRIMUS_REF: main
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
       GO_INPUT_ARTIFACT_CACHE_KEY: enterprise-jsbuild-${{ github.sha }}
       GO_INPUT_ARTIFACT_PATH: frontend/build
       GO_BUILD_CONTEXT: ./cmd/enterprise

.github/workflows/build-staging.yaml

@@ -95,7 +95,7 @@ jobs:
     secrets: inherit
     with:
       PRIMUS_REF: main
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
       GO_INPUT_ARTIFACT_CACHE_KEY: staging-jsbuild-${{ github.sha }}
       GO_INPUT_ARTIFACT_PATH: frontend/build
       GO_BUILD_CONTEXT: ./cmd/enterprise

.github/workflows/goci.yaml

@@ -22,7 +22,7 @@ jobs:
     with:
       PRIMUS_REF: main
       GO_TEST_CONTEXT: ./...
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
   fmt:
     if: |
       github.event_name == 'merge_group' ||
@@ -32,7 +32,7 @@ jobs:
     secrets: inherit
     with:
       PRIMUS_REF: main
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
   lint:
     if: |
       github.event_name == 'merge_group' ||
@@ -42,7 +42,7 @@ jobs:
     secrets: inherit
     with:
       PRIMUS_REF: main
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
   deps:
     if: |
       github.event_name == 'merge_group' ||
@@ -52,7 +52,7 @@ jobs:
     secrets: inherit
     with:
       PRIMUS_REF: main
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
   semconv-generated:
     if: |
       github.event_name == 'merge_group' ||
@@ -65,7 +65,7 @@ jobs:
       - name: go-install
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: check-semconv-generated-files
         run: make semconv-check
   build:
@@ -80,7 +80,7 @@ jobs:
       - name: go-install
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: qemu-install
         uses: docker/setup-qemu-action@v3
       - name: aarch64-install
@@ -116,7 +116,7 @@ jobs:
       - name: go-install
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: generate-openapi
         run: |
           go run cmd/enterprise/*.go generate openapi
@@ -133,7 +133,7 @@ jobs:
       - name: go-install
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: generate-authz
         run: |
           go run cmd/enterprise/*.go generate authz
@@ -150,7 +150,7 @@ jobs:
       - name: go-install
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: generate-web-settings
         run: |
           go run cmd/enterprise/*.go generate config web-settings
@@ -167,7 +167,7 @@ jobs:
       - name: go-install
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: generate-transaction-groups
         run: |
           go run cmd/enterprise/*.go generate config transaction-groups

.github/workflows/gor-signoz-community.yaml

@@ -66,7 +66,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: cross-compilation-tools
         if: matrix.os == 'ubuntu-latest'
         run: |
@@ -130,7 +130,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
 
       # copy the caches from build
       - name: get-sha

.github/workflows/gor-signoz.yaml

@@ -75,7 +75,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: cross-compilation-tools
         if: matrix.os == 'ubuntu-latest'
         run: |
@@ -138,7 +138,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
 
       # copy the caches from build
       - name: get-sha

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/components/QuickFilters/stories/QuickFilters.stories.mocks.tsx

@@ -98,15 +98,6 @@ export const noSavedFiltersHandler = rest.get(
 		),
 );
 
-export const noSavedTracesFiltersHandler = rest.get(
-	'http://localhost/api/v2/quick_filters/traces',
-	(_req, res, ctx) =>
-		res(
-			ctx.status(200),
-			ctx.json(quickFiltersResponse(QuickfiltertypesSourceDTO.traces, [])),
-		),
-);
-
 export const loadingFiltersHandlers = [
 	rest.get('http://localhost/api/v2/quick_filters/logs', (_req, res, ctx) =>
 		res(ctx.delay('infinite')),

frontend/src/components/QuickFilters/stories/QuickFilters.stories.tsx

@@ -1,7 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/react-vite';
 import type { ComponentProps, ComponentType } from 'react';
 import { expect, screen, userEvent, waitFor, within } from 'storybook/test';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 
 import { withCanvas } from '@/storybook/decorators/withCanvas';
 import type { GlobalMockArgs } from '@/storybook/globals';
@@ -17,9 +16,8 @@ import {
 	queryBuilder,
 	selectedServiceQueryBuilder,
 	noSavedFiltersHandler,
-	noSavedTracesFiltersHandler,
 } from './QuickFilters.stories.mocks';
-import { FiltersType, QuickFiltersSource } from '../types';
+import { QuickFiltersSource } from '../types';
 
 const meta = {
 	title: 'Components/Quick Filters',
@@ -112,29 +110,6 @@ export const SelectedExpandedCheckbox: Story = {
 	},
 };
 
-/** The duration min/max row, which a checkbox-only config never reaches. */
-export const DurationFilter: Story = {
-	args: {
-		quickFilterSource: QuickFiltersSource.TRACES_EXPLORER,
-		config: [
-			...checkboxConfig,
-			{
-				attributeKey: {
-					dataType: DataTypes.Float64,
-					key: 'duration_nano',
-					type: '',
-				},
-				defaultOpen: true,
-				title: 'Duration',
-				type: FiltersType.DURATION,
-			},
-		],
-	},
-	parameters: {
-		msw: { handlers: [noSavedTracesFiltersHandler, ...handlers] },
-	},
-};
-
 /**
  * Every tooltip the panel renders, held open: the reveal on each truncated
  * filter value. Nothing bounds those values, so the panel is answered with

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/InfraMonitoringK8sV2/Base/K8sBaseDetails.stories.tsx

@@ -16,42 +16,13 @@ import {
 } from './K8sBaseDetails.stories.mocks';
 import type { K8sBaseDetailsProps } from './types';
 import {
-	DrawerHistoryEntry,
 	getDrawerHistoryDepth,
-	useDrawerHistoryStore,
+	pushDrawerHistory,
+	resetDrawerHistory,
 } from './useDrawerHistoryStore';
 
 type DrawerArgs = PageStoryArgs<typeof drawerMocks> &
-	K8sBaseDetailsProps<unknown> & { earlierSteps?: number };
-
-const TRAIL: DrawerHistoryEntry[] = [
-	{
-		category: InfraMonitoringEntity.CLUSTERS,
-		label: 'mgmt',
-		queryKeyPrefix: 'cluster',
-	},
-	{
-		category: InfraMonitoringEntity.NAMESPACES,
-		label: 'generator',
-		queryKeyPrefix: 'namespace',
-	},
-	{
-		category: InfraMonitoringEntity.DEPLOYMENTS,
-		label: 'app-demo-loadgenerator',
-		queryKeyPrefix: 'deployment',
-	},
-	{
-		category: InfraMonitoringEntity.NODES,
-		label: NODE_NAME,
-		queryKeyPrefix: 'node',
-	},
-].map(({ category, label, queryKeyPrefix }) => ({
-	params: { selectedItem: label, category },
-	category,
-	label,
-	entity: { name: label },
-	queryKeyPrefix,
-}));
+	K8sBaseDetailsProps<unknown>;
 
 const route = `/infrastructure-monitoring/kubernetes?${INFRA_MONITORING_K8S_PARAMS_KEYS.CATEGORY}=pods&${INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM}=${POD_UID}`;
 
@@ -62,13 +33,19 @@ const meta = {
 	decorators: [
 		(Story, context): JSX.Element => {
 			// The back control appears only for a resource opened from another
-			const steps =
-				context.args.earlierSteps ?? (context.args.openedFromANode ? 1 : 0);
-			if (getDrawerHistoryDepth() !== steps) {
-				useDrawerHistoryStore.setState({
-					entries: TRAIL.slice(TRAIL.length - steps),
+			const depth = getDrawerHistoryDepth();
+			if (context.args.openedFromANode && depth === 0) {
+				pushDrawerHistory({
+					params: { selectedItem: NODE_NAME, category: InfraMonitoringEntity.NODES },
+					category: InfraMonitoringEntity.NODES,
+					label: NODE_NAME,
+					entity: { nodeName: NODE_NAME },
+					queryKeyPrefix: 'node',
 				});
 			}
+			if (!context.args.openedFromANode && depth > 0) {
+				resetDrawerHistory();
+			}
 
 			return <Story />;
 		},
@@ -83,19 +60,3 @@ type Story = StoryObj<DrawerArgs>;
 export const Default: Story = {
 	args: { ...podEntityConfig.details } as Partial<DrawerArgs> as DrawerArgs,
 };
-
-/** A pod drilled through a cluster, namespace, deployment and node, so the back control names the node. */
-export const DeepTrail: Story = {
-	args: {
-		...podEntityConfig.details,
-		earlierSteps: 4,
-	} as Partial<DrawerArgs> as DrawerArgs,
-};
-
-/** A pod opened from the list, so the header shows the close control in place of back. */
-export const OpenedFromTheList: Story = {
-	args: {
-		...podEntityConfig.details,
-		openedFromANode: false,
-	} as Partial<DrawerArgs> as DrawerArgs,
-};

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/AIAssistantPage/stories/AIAssistantPage.stories.tsx

@@ -139,35 +139,6 @@ export const AwaitingClarification: Story = {
 	args: { agent: 'awaiting-clarification', contents: BRIEF },
 };
 
-/** The severity select open, including the free-text option the form's Select renders. */
-export const ClarificationSelectOpen: Story = {
-	args: { agent: 'awaiting-clarification', contents: BRIEF },
-	play: async ({ canvasElement }): Promise<void> => {
-		const canvas = within(canvasElement);
-
-		// Open from the keyboard, and retry: the message list remounts its items
-		// while it measures the thread, which can close the popup again. The
-		// "Other" checkbox in the Notify field carries the same text, so assert
-		// on the popup's option role.
-		await waitFor(async () => {
-			const severityLabel = canvas.getByText('Severity');
-			const field = severityLabel.closest('div');
-
-			if (!field) {
-				throw new Error('Severity field is not in the clarification form');
-			}
-
-			within(field).getByRole('combobox').focus();
-			await userEvent.keyboard('{Enter}');
-			await screen.findByRole(
-				'option',
-				{ name: 'Other (type your own)' },
-				{ timeout: 1_000 },
-			);
-		}, untilLoaded);
-	},
-};
-
 /** Reopening the page on a thread that has not come back yet. */
 export const LoadingThread: Story = {
 	args: { dataState: 'loading' },
@@ -260,23 +231,6 @@ export const NegativeFeedback: Story = {
 	},
 };
 
-/** Renaming a thread: the title input the row swaps in. */
-export const ConversationRename: Story = {
-	play: async ({ canvasElement }): Promise<void> => {
-		await clickUntil(async () => {
-			const [actions] = await within(canvasElement).findAllByLabelText(
-				/conversation actions/i,
-				undefined,
-				untilLoaded,
-			);
-
-			return actions;
-		}, /^Rename$/);
-		await userEvent.click(screen.getByText('Rename'));
-		await within(canvasElement).findByDisplayValue(/checkout p99 regression/i);
-	},
-};
-
 /** What a conversation row offers: rename, a link to it, and archiving. */
 export const ConversationActions: Story = {
 	play: async ({ canvasElement }): Promise<void> => {

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/DashboardPage/PanelEditorPage/stories/PanelEditorPage.stories.tsx

@@ -63,20 +63,6 @@ const expandConfigSections: Story['play'] = async ({ canvasElement }) => {
  */
 export const Default: Story = {};
 
-/** The ClickHouse query tab, including its info callout. */
-export const ClickHouseQuery: Story = {
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			await within(canvasElement).findByText('ClickHouse Query', undefined, {
-				timeout: 15000,
-			}),
-		);
-		await screen.findByText(/ClickHouse query agent skill/i, undefined, {
-			timeout: 15000,
-		});
-	},
-};
-
 /** The create route, seeding an unsaved panel of the chosen kind. */
 export const NewPanel: Story = {
 	args: { panel: 'new' },
@@ -97,21 +83,6 @@ export const PieChartPanel: Story = {
 	args: { panel: 'traffic-share' },
 };
 
-/** A new area chart: the time series options with the area filled. */
-export const AreaChartPanel: Story = {
-	args: { panel: 'new', newPanelKind: 'area-chart' },
-};
-
-/** A new histogram, where the display options are its buckets. */
-export const HistogramPanel: Story = {
-	args: { panel: 'new', newPanelKind: 'histogram' },
-};
-
-/** A new text panel: a markdown body in place of the query builder. */
-export const TextPanel: Story = {
-	args: { panel: 'new', newPanelKind: 'text' },
-};
-
 /** A list panel, where the config pane is the column editor. */
 export const ListPanel: Story = {
 	args: { panel: 'recent-logs' },

frontend/src/pages/DashboardPage/PanelEditorPage/stories/sections/ChartOptions.stories.tsx

@@ -105,19 +105,6 @@ export const ChartAppearance: Story = {
 	},
 };
 
-/** Disconnect-values in threshold mode, with an invalid duration showing the inline error. */
-export const ChartAppearanceDisconnectThreshold: Story = {
-	play: async (context) => {
-		await ChartAppearance.play?.(context);
-		await pickSegment('panel-editor-v2-span-gaps', 'threshold');
-		const input = await screen.findByTestId('panel-editor-v2-span-gaps-value');
-
-		await userEvent.clear(input);
-		await userEvent.type(input, '5x');
-		await screen.findByText(/enter a valid duration/i);
-	},
-};
-
 /** Dashed lines under a gradient fill, with the points drawn. */
 export const ChartAppearanceDashedGradient: Story = {
 	play: async (context) => {

frontend/src/pages/DashboardPage/stories/DashboardPage.stories.tsx

@@ -191,22 +191,6 @@ export const TooltipsInViewPanelModal: Story = {
 	},
 };
 
-/** A list or table panel's search field, expanded and filled. */
-export const PanelSearchExpanded: Story = {
-	play: async ({ canvasElement }) => {
-		// Both the table and the log list render a search trigger; expand the first.
-		const [trigger] = await within(canvasElement).findAllByTestId(
-			'panel-header-search-trigger',
-			{},
-			{ timeout: 15000 },
-		);
-		await userEvent.click(trigger);
-		const input = await screen.findByTestId('panel-header-search-input');
-
-		await userEvent.type(input, 'error');
-	},
-};
-
 /**
  * The dashboard's own Actions menu, open: rename, clone, lock, full screen and
  * delete, the menu the toolbar's Actions button carries.
@@ -259,34 +243,6 @@ export const SectionActionsMenu: Story = {
 	},
 };
 
-/** Delete dashboard, the confirm dialog the Actions menu opens. */
-export const DeleteDashboardDialog: Story = {
-	play: async (context) => {
-		await ActionsMenu.play?.(context);
-		// The row stays inert until its authz checks resolve, so one click can
-		// land too early; keep clicking until the confirm dialog is up.
-		await waitFor(
-			async () => {
-				const item = screen.queryByTestId('dashboard-action-delete');
-				if (item) {
-					await userEvent.click(item);
-				}
-				screen.getByText('This action cannot be undone.');
-			},
-			{ timeout: 10000 },
-		);
-	},
-};
-
-/** Rename section, the title dialog a section menu opens. */
-export const RenameSectionDialog: Story = {
-	play: async (context) => {
-		await SectionActionsMenu.play?.(context);
-		await userEvent.click(await screen.findByText('Rename section'));
-		await screen.findByRole('dialog', { name: /rename section/i });
-	},
-};
-
 const openNewPanelPicker = async (
 	canvasElement: HTMLElement,
 ): Promise<void> => {

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(

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

@@ -97,20 +97,3 @@ export const NavSettingsMenu: Story = {
 		await screen.findByRole('menu');
 	},
 };
-
-/** Impersonation mode: the warning banner above the page content. */
-export const NoAuthBanner: Story = {
-	args: { banner: 'no-auth' },
-	play: async (): Promise<void> => {
-		await screen.findByTestId('no-auth-banner', undefined, { timeout: 10000 });
-	},
-};
-
-/** The command palette, opened with the same shortcut the shell listens for. */
-export const CommandPalette: Story = {
-	play: async (): Promise<void> => {
-		await userEvent.keyboard('{Meta>}k{/Meta}');
-		await screen.findByPlaceholderText('Search…', undefined, { timeout: 10000 });
-		await screen.findByText('Go to Home');
-	},
-};

frontend/src/pages/InfrastructureMonitoring/stories/Pods.stories.tsx

@@ -69,28 +69,6 @@ export const DetailsDrawerLogsTab: StoryObj<PodsArgs> = {
 	},
 };
 
-/** A log opened from the pod's logs tab, over the details drawer. */
-export const DetailsDrawerLogDetails: StoryObj<PodsArgs> = {
-	args: { drawer: true },
-	play: async () => {
-		const drawer = within(
-			await screen.findByRole('dialog', {}, { timeout: 10000 }),
-		);
-
-		await userEvent.click(
-			await drawer.findByText('Logs', {}, { timeout: 10000 }),
-		);
-		const [line] = await drawer.findAllByText(
-			/handled request in/,
-			{},
-			{ timeout: 10000 },
-		);
-
-		await userEvent.click(line);
-		await screen.findByTestId('log-detail-drawer', {}, { timeout: 10000 });
-	},
-};
-
 /** The copy button beside the pod name in the drawer, which toasts the copy. */
 export const PodNameCopiedToast: StoryObj<PodsArgs> = {
 	args: { drawer: true },

frontend/src/pages/IntegrationsDetailsPage/CloudIntegration/stories/CloudIntegration.stories.tsx

@@ -117,43 +117,6 @@ export const ConnectAccount: Story = {
 	},
 };
 
-/** Azure's connect dialog, which the AWS regions form does not open. */
-export const AzureConnectAccount: Story = {
-	args: { provider: 'azure', accounts: 0 },
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			await within(canvasElement).findByText(
-				/integrate now/i,
-				undefined,
-				untilLoaded,
-			),
-		);
-		await screen.findByRole('dialog', undefined, untilLoaded);
-	},
-};
-
-/** The GCP region combobox, opened from the connect drawer. */
-export const GcpRegionDropdown: Story = {
-	args: { provider: 'gcp', accounts: 0 },
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			await within(canvasElement).findByText(
-				/integrate now/i,
-				undefined,
-				untilLoaded,
-			),
-		);
-		await userEvent.click(
-			await screen.findByTestId(
-				'gcp-deployment-region-select',
-				undefined,
-				untilLoaded,
-			),
-		);
-		await screen.findByRole('listbox');
-	},
-};
-
 /** The regions an already-connected account collects from. */
 export const EditAccount: Story = {
 	play: async ({ canvasElement }): Promise<void> => {

frontend/src/pages/LLMObservability/AttributeMapping/stories/AttributeMapping.stories.mocks.tsx

@@ -14,7 +14,6 @@ import {
 	type GroupSave,
 	MAPPING_GROUP_MAX,
 	spanMapperGroupsResponse,
-	spanMappersResponse,
 	wideConditionGroupsResponse,
 } from './__story_mockdata__/attributeMapping';
 
@@ -29,15 +28,6 @@ export const wideConditionGroup = rest.get(
 		res(ctx.status(200), ctx.json(wideConditionGroupsResponse())),
 );
 
-export const groupMappers = rest.get(
-	'http://localhost/api/v1/span_mapper_groups/:groupId/span_mappers',
-	(req, res, ctx) =>
-		res(
-			ctx.status(200),
-			ctx.json(spanMappersResponse(String(req.params.groupId))),
-		),
-);
-
 export const attributeMappingMocks = defineStoryMocks({
 	controls: {
 		groups: countControl('Mapping groups', {

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

@@ -7,7 +7,6 @@ import type { PageStoryArgs } from '@/storybook/runtime/resolveStory';
 import LLMObservabilityPage from '../../index';
 import {
 	attributeMappingMocks,
-	groupMappers,
 	wideConditionGroup,
 } from './AttributeMapping.stories.mocks';
 
@@ -80,29 +79,6 @@ export const GroupFormDrawer: Story = {
 	},
 };
 
-/** The drawer that adds a mapping to the first group. */
-export const AddMappingDrawer: Story = {
-	parameters: { msw: { handlers: [groupMappers] } },
-	play: async ({ canvasElement }): Promise<void> => {
-		const canvas = within(canvasElement);
-		const [firstGroup] = await canvas.findAllByTestId(
-			/^group-expand-/,
-			{},
-			{ timeout: 15000 },
-		);
-
-		await userEvent.click(firstGroup);
-		await userEvent.click(
-			await canvas.findByRole(
-				'button',
-				{ name: /add mapping/i },
-				{ timeout: 15000 },
-			),
-		);
-		await screen.findByText('New custom mapping');
-	},
-};
-
 /**
  * A group toggled off and saved: the toast announcing the saved changes, raised
  * once the PATCH and the list refetch answer. Set Save changes to `error`,

frontend/src/pages/LLMObservability/AttributeMapping/stories/__story_mockdata__/attributeMapping.ts

@@ -5,15 +5,10 @@
 
 import type {
 	ListSpanMapperGroups200,
-	ListSpanMappers200,
 	SpantypesSpanMapperGroupConditionKeyDTO,
 	SpantypesSpanMapperGroupDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import {
-	SpantypesFieldContextDTO,
-	SpantypesSpanMapperOperationDTO,
-	SpantypesSpanMapperOriginDTO,
-} from 'api/generated/services/sigNoz.schemas';
+import { SpantypesSpanMapperOriginDTO } from 'api/generated/services/sigNoz.schemas';
 
 const ORG_ID = 'org-signoz';
 
@@ -77,38 +72,6 @@ export const spanMapperGroupsResponse = (
 	data: { items: GROUPS.slice(0, count).map(group) },
 });
 
-/** The mappings an expanded group lists, which the groups response does not carry. */
-export const spanMappersResponse = (groupId: string): ListSpanMappers200 => ({
-	status: 'success',
-	data: {
-		items: [
-			{
-				id: `${groupId}-mapper-1`,
-				groupId,
-				name: 'gen_ai.request.model',
-				enabled: true,
-				origin: SpantypesSpanMapperOriginDTO.user,
-				fieldContext: SpantypesFieldContextDTO.attribute,
-				config: {
-					sources: [
-						{
-							key: 'langchain.model',
-							context: SpantypesFieldContextDTO.attribute,
-							operation: SpantypesSpanMapperOperationDTO.copy,
-							priority: 0,
-							enabled: true,
-						},
-					],
-				},
-				createdAt: '2026-07-18T11:20:00Z',
-				createdBy: 'anna@signoz.io',
-				updatedAt: '2026-08-05T08:40:00Z',
-				updatedBy: 'anna@signoz.io',
-			},
-		],
-	},
-});
-
 const MANY_ATTRIBUTES = [
 	'langchain.model',
 	'langchain.prompt_tokens',

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

@@ -39,34 +39,6 @@ export const NothingPriced: Story = {
 	args: { rules: 0 },
 };
 
-/** Models seen in spans that no rule prices yet. */
-export const UnpricedModels: Story = {
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			await within(canvasElement).findByRole(
-				'tab',
-				{ name: /unpriced models/i },
-				{ timeout: 15000 },
-			),
-		);
-		await screen.findByRole('tab', { name: /unpriced models/i, selected: true });
-	},
-};
-
-/** Creating a rule: the blank drawer, with the provider select enabled. */
-export const ModelCostDrawerCreate: Story = {
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			await within(canvasElement).findByRole(
-				'button',
-				{ name: /add model cost/i },
-				{ timeout: 15000 },
-			),
-		);
-		await screen.findByTestId('drawer-provider-select');
-	},
-};
-
 /**
  * The first pricing rule's menu, open over the table: edit the rule or drop it.
  */

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

@@ -116,16 +116,6 @@ export const AddProcessor: Story = {
 	},
 };
 
-/** Severity Parser is the type whose mapping fields are CSV inputs. */
-export const AddSeverityParserProcessor: Story = {
-	play: async (context): Promise<void> => {
-		await AddProcessor.play?.(context);
-		await userEvent.click(await screen.findByText('Grok'));
-		await userEvent.click(await screen.findByTitle('Severity Parser'));
-		await screen.findByText('Parse Severity Value From');
-	},
-};
-
 /**
  * The logs a pipeline matches, over the interval the preview asks for, with the
  * simulation of its processors one click away.

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

@@ -106,21 +106,6 @@ export const RawFormat: Story = {
 	args: { format: 'raw' },
 };
 
-/** The format popover: the format list, the max-lines stepper, and the font-size control. */
-export const FormatMenuOpen: Story = {
-	args: { format: 'raw' },
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			await within(canvasElement).findByTestId(
-				'periscope-btn-format-options',
-				undefined,
-				untilLoaded,
-			),
-		);
-		await screen.findByTestId('max-lines-per-row', undefined, untilLoaded);
-	},
-};
-
 /** An explorer with no configured quick filters. */
 export const NoQuickFilters: Story = {
 	args: { quickFilters: 0 },

frontend/src/pages/MessagingQueues/MQDetailPage/stories/MQDetailPage.stories.tsx

@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/react-vite';
 import { MessagingQueuesViewTypeOptions } from 'pages/MessagingQueues/MessagingQueuesUtils';
-import { expect, screen, userEvent, waitFor, within } from 'storybook/test';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
 
 import { storyMocks } from '@/storybook/controls/defineStoryMocks';
 import type { PageStoryArgs } from '@/storybook/runtime/resolveStory';
@@ -98,21 +98,6 @@ export const DropRate: Story = {
 	args: { view: MessagingQueuesViewTypeOptions.DropRate },
 };
 
-/** The custom-interval input inside the evaluation-time dropdown. */
-export const DropRateIntervalOpen: Story = {
-	args: { view: MessagingQueuesViewTypeOptions.DropRate },
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			await within(canvasElement).findByText('10ms', undefined, untilLoaded),
-		);
-		await screen.findByPlaceholderText(
-			'Enter custom time (ms)',
-			undefined,
-			untilLoaded,
-		);
-	},
-};
-
 /** The broker, producer, consumer and JVM metrics kafka itself reports. */
 export const MetricView: Story = {
 	args: { view: MessagingQueuesViewTypeOptions.MetricPage },

frontend/src/pages/MetricsApplication/stories/MetricsApplication.stories.tsx

@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react-vite';
 import ROUTES from 'constants/routes';
 import { renderAtRoute } from '@/storybook/renderAtRoute';
-import { screen, userEvent, waitFor, within } from 'storybook/test';
+import { screen, userEvent, within } from 'storybook/test';
 
 import { storyMocks } from '@/storybook/controls/defineStoryMocks';
 import type { PageStoryArgs } from '@/storybook/runtime/resolveStory';
@@ -76,26 +76,3 @@ export const DownloadMenu: Story = {
 		await screen.findByRole('menu');
 	},
 };
-
-/** The apdex threshold popover, opened from the overview's settings control. */
-export const ApDexSettingsOpen: Story = {
-	play: async ({ canvasElement }): Promise<void> => {
-		const trigger = await waitFor(
-			() => {
-				const found = canvasElement.querySelector<HTMLElement>(
-					'.ap-dex-settings-popover-content button',
-				);
-
-				if (!found) {
-					throw new Error('Apdex settings control is not rendered');
-				}
-
-				return found;
-			},
-			{ timeout: 15000 },
-		);
-
-		await userEvent.click(trigger);
-		await screen.findByText(/apdex threshold/i);
-	},
-};

frontend/src/pages/ResetPassword/stories/ResetPassword.stories.tsx

@@ -1,5 +1,4 @@
 import type { Meta, StoryObj } from '@storybook/react-vite';
-import { screen, userEvent } from 'storybook/test';
 
 import { storyMocks } from '@/storybook/controls/defineStoryMocks';
 import type { PageStoryArgs } from '@/storybook/runtime/resolveStory';
@@ -36,20 +35,3 @@ export const ExpiredLink: Story = {
 	// The deliberate 410 is the state under test.
 	parameters: { allowConsoleErrors: true },
 };
-
-/** The mismatch callout, after the two password fields disagree and blur. */
-export const PasswordMismatch: Story = {
-	play: async ({ canvasElement }): Promise<void> => {
-		const password = await screen.findByTestId('password', undefined, {
-			timeout: 15000,
-		});
-		const confirm = await screen.findByPlaceholderText(
-			/confirm your new password/i,
-		);
-
-		await userEvent.type(password, 'password123');
-		await userEvent.type(confirm, 'password456');
-		await userEvent.click(canvasElement);
-		await screen.findByText(/passwords don't match/i);
-	},
-};

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

@@ -32,7 +32,6 @@ import {
 	timeSeriesPoints,
 } from '@/storybook/msw/__story_mockdata__/queryRange';
 
-import { traceFunnelsResponse } from '../../TracesModulePage/stories/__story_mockdata__/traces';
 import { SpanDetailVariant } from '../SpanDetailsPanel/constants';
 import {
 	focusSpanIndex,
@@ -222,11 +221,6 @@ export const traceDetailsMocks = defineStoryMocks({
 				}),
 			),
 
-			rest.get(
-				'http://localhost/api/v1/trace-funnels/list',
-				response.json(() => traceFunnelsResponse(3)),
-			),
-
 			rest.post(
 				'http://localhost/api/v1/span_percentile',
 				response.json(spanPercentilesResponse),

frontend/src/pages/TraceDetailsV3/stories/TraceDetailsV3.stories.tsx

@@ -248,72 +248,6 @@ export const SpanPercentileOpen: Story = {
 	},
 };
 
-/** Spans the backend never received, shown as the missing-spans callout. */
-export const MissingSpans: Story = {
-	args: { missingSpans: true },
-	play: async (): Promise<void> => {
-		await screen.findByText(
-			/this trace has missing spans/i,
-			undefined,
-			untilLoaded,
-		);
-	},
-};
-
-/** The analytics panel the header toggle opens. */
-export const AnalyticsOpen: Story = {
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			await within(canvasElement).findByRole(
-				'button',
-				{ name: 'Analytics' },
-				untilLoaded,
-			),
-		);
-		await screen.findByTestId('trace-analytics-panel', undefined, untilLoaded);
-	},
-};
-
-/** The download progress panel, held open by an export that never answers. */
-export const TraceDownload: Story = {
-	args: { exportState: 'loading' },
-	play: async ({ canvasElement }): Promise<void> => {
-		await startDownload(canvasElement);
-		await screen.findByTestId('trace-download-panel', undefined, untilLoaded);
-	},
-};
-
-const openAddSpanToFunnel = async (
-	canvasElement: HTMLElement,
-): Promise<void> => {
-	const [button] = await within(canvasElement).findAllByTestId(
-		'span-add-to-funnel-btn',
-		undefined,
-		untilLoaded,
-	);
-
-	await fireEvent.click(button);
-	await screen.findByText('Add span to funnel', undefined, untilLoaded);
-};
-
-/** The funnel picker a span row's add-to-funnel action opens. */
-export const AddSpanToFunnel: Story = {
-	play: async ({ canvasElement }): Promise<void> => {
-		await openAddSpanToFunnel(canvasElement);
-	},
-};
-
-/** The name field behind "Create new funnel" in that picker. */
-export const AddSpanToFunnelCreateStep: Story = {
-	play: async ({ canvasElement }): Promise<void> => {
-		await openAddSpanToFunnel(canvasElement);
-		await userEvent.click(
-			await screen.findByRole('button', { name: /create new funnel/i }),
-		);
-		await screen.findByTestId('create-funnel-name-input');
-	},
-};
-
 /** The span has no logs of its own but its trace does, so the Logs tab points to the trace's. */
 export const SpanPanelTraceOnlyLogs: Story = {
 	args: { traceOnlyLogs: true },

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

@@ -123,43 +123,6 @@ export const Funnels: Story = {
 	args: { tab: 'funnels' },
 };
 
-/** The name field for a funnel that does not exist yet. */
-export const CreateFunnel: Story = {
-	args: { tab: 'funnels' },
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			await within(canvasElement).findByRole(
-				'button',
-				{ name: /new funnel/i },
-				untilLoaded,
-			),
-		);
-		await screen.findByRole('dialog', { name: /create new funnel/i });
-	},
-};
-
-/** The rename field for a funnel already on the list. */
-export const RenameFunnel: Story = {
-	args: { tab: 'funnels' },
-	play: async ({ canvasElement }): Promise<void> => {
-		const action = await waitFor(() => {
-			const found = canvasElement.querySelector<HTMLElement>(
-				'.funnel-item__action-icon',
-			);
-
-			if (!found) {
-				throw new Error('Funnel row actions are not rendered');
-			}
-
-			return found;
-		}, untilLoaded);
-
-		await userEvent.click(action);
-		await userEvent.click(await screen.findByRole('button', { name: 'Rename' }));
-		await screen.findByRole('dialog', { name: /rename funnel/i });
-	},
-};
-
 /**
  * A fresh workspace: nothing ingested in the window and no quick filters
  * configured yet, so the table and the filter panel both show their empty

frontend/src/storybook/foundations/Feedback.stories.tsx

@@ -64,70 +64,6 @@ export const LongMultilineToast: Story = {
 	},
 };
 
-/** A request still in flight: the loading toast stays until the promise settles. */
-export const PromiseLoadingToast: Story = {
-	args: { state: 'promise-loading-toast' },
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			within(canvasElement).getByTestId('show-feedback-toast'),
-		);
-		await expect(
-			await screen.findByText('Enabling the alert rule'),
-		).toBeVisible();
-	},
-};
-
-/** A failed request: the rejected toast keeps a Dismiss action, stacked top-center. */
-export const PromiseErrorToast: Story = {
-	args: { state: 'promise-error-toast' },
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			within(canvasElement).getByTestId('show-feedback-toast'),
-		);
-		await expect(
-			await screen.findByText('Could not clone the panel'),
-		).toBeVisible();
-		await screen.findByRole('button', { name: 'Dismiss' });
-	},
-};
-
-/** A warning that stays up, matching invites that only partly succeed. */
-export const WarningToast: Story = {
-	args: { state: 'warning-toast' },
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			within(canvasElement).getByTestId('show-feedback-toast'),
-		);
-		await expect(await screen.findByText('Some invites failed')).toBeVisible();
-	},
-};
-
-/** An info toast pinned to the bottom-right stack, as export cancellation does. */
-export const InfoToast: Story = {
-	args: { state: 'info-toast' },
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			within(canvasElement).getByTestId('show-feedback-toast'),
-		);
-		await expect(await screen.findByText('Export cancelled')).toBeVisible();
-	},
-};
-
-/** An error toast with a description and a Dismiss action, bottom-right. */
-export const DangerWithDescription: Story = {
-	args: { state: 'danger-description-toast' },
-	play: async ({ canvasElement }): Promise<void> => {
-		await userEvent.click(
-			within(canvasElement).getByTestId('show-feedback-toast'),
-		);
-		await expect(
-			await screen.findByText('Failed to update account settings'),
-		).toBeVisible();
-		await screen.findByText(/does not have permission/i);
-		await screen.findByRole('button', { name: 'Dismiss' });
-	},
-};
-
 /** Mutation: the inline application alert preserves its action affordance. */
 export const InlineAlert: Story = {
 	args: { state: 'inline-alert' },

frontend/src/storybook/foundations/FeedbackFixture.tsx

@@ -10,11 +10,6 @@ export type FeedbackState =
 	| 'success-toast'
 	| 'actionable-error-toast'
 	| 'long-toast'
-	| 'promise-loading-toast'
-	| 'promise-error-toast'
-	| 'warning-toast'
-	| 'info-toast'
-	| 'danger-description-toast'
 	| 'inline-alert'
 	| 'confirmation'
 	| 'toast-over-confirmation';
@@ -26,10 +21,6 @@ interface FeedbackFixtureProps {
 const longMessage =
 	'We could not apply the retention policy because the selected storage tier is unavailable. Review the workspace settings, then try again.';
 
-const pendingSave = new Promise<void>(() => undefined);
-
-const dismissAction = { label: 'Dismiss', onClick: (): void => undefined };
-
 function FeedbackFixture({ state }: FeedbackFixtureProps): JSX.Element {
 	const [isConfirmationOpen, setIsConfirmationOpen] = useState(false);
 
@@ -46,62 +37,13 @@ function FeedbackFixture({ state }: FeedbackFixtureProps): JSX.Element {
 			return;
 		}
 
-		if (state === 'promise-loading-toast') {
-			toast.promise(pendingSave, {
-				loading: 'Enabling the alert rule',
-				success: 'Alert rule enabled',
-				error: 'Could not enable the alert rule',
-			});
-			return;
-		}
-
-		if (state === 'promise-error-toast') {
-			toast.promise(Promise.reject(new Error('failed')), {
-				loading: 'Cloning the panel',
-				success: 'Panel cloned',
-				error: { message: 'Could not clone the panel', action: dismissAction },
-				position: 'top-center',
-				duration: Infinity,
-			});
-			return;
-		}
-
-		if (state === 'warning-toast') {
-			toast.warning('Some invites failed', { duration: Infinity });
-			return;
-		}
-
-		if (state === 'info-toast') {
-			toast.info('Export cancelled', {
-				position: 'bottom-right',
-				duration: Infinity,
-			});
-			return;
-		}
-
-		if (state === 'danger-description-toast') {
-			toast.error('Failed to update account settings', {
-				description:
-					'The service account does not have permission to change this connection.',
-				action: dismissAction,
-				position: 'bottom-right',
-				duration: Infinity,
-			});
-			return;
-		}
-
 		toast.error(longMessage, { duration: Infinity });
 	};
 
 	const isToastStory =
 		state === 'success-toast' ||
 		state === 'actionable-error-toast' ||
-		state === 'long-toast' ||
-		state === 'promise-loading-toast' ||
-		state === 'promise-error-toast' ||
-		state === 'warning-toast' ||
-		state === 'info-toast' ||
-		state === 'danger-description-toast';
+		state === 'long-toast';
 	const confirmationTitle = 'Delete environment';
 
 	return (

pkg/alertmanager/alertmanagernotify/email/email_test.go

@@ -11,7 +11,6 @@ import (
 	"log/slog"
 	"net"
 	"net/http"
-	"net/textproto"
 	"net/url"
 	"os"
 	"strconv"
@@ -707,9 +706,7 @@ func TestEmailRejected(t *testing.T) {
 
 	// Send the alert to mock SMTP server.
 	retry, err := e.Notify(context.Background(), firingAlert)
-	var smtpErr *textproto.Error
-	require.ErrorAs(t, err, &smtpErr)
-	assert.Equal(t, 501, smtpErr.Code)
+	require.ErrorContains(t, err, "501 5.5.4 Rejected!")
 	assert.True(t, retry)
 	require.NoError(t, srv.Shutdown(ctx))
 

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/querier/bucket_cache.go

@@ -26,8 +26,9 @@ const bucketCacheCellSteps = 60
 type BucketCache interface {
 	// cached portion + list of gaps to fetch
 	GetMissRanges(ctx context.Context, orgID valuer.UUID, q qbtypes.Query, step qbtypes.Step) (cached *qbtypes.Result, missing []*qbtypes.TimeRange)
-	// store fresh buckets for future hits
-	Put(ctx context.Context, orgID valuer.UUID, q qbtypes.Query, step qbtypes.Step, fresh *qbtypes.Result)
+	// store fresh buckets for future hits; only the ranges in the map were
+	// queried for fresh, the rest of it came from the cache
+	Put(ctx context.Context, orgID valuer.UUID, q qbtypes.Query, step qbtypes.Step, fresh *qbtypes.Result, execStatsForQueriedTimeRanges map[qbtypes.TimeRange]qbtypes.ExecStats)
 }
 
 // bucketCache implements the BucketCache interface.
@@ -116,7 +117,7 @@ func (bc *bucketCache) GetMissRanges(
 	}
 
 	// Merge buckets into a single result
-	mergedResult := bc.mergeBuckets(ctx, relevantBuckets, cachedWarnings)
+	mergedResult := bc.mergeBuckets(ctx, relevantBuckets, cachedWarnings, startMs, endMs)
 
 	// Filter the merged result to only include values within the requested time range
 	mergedResult = bc.filterResultToTimeRange(mergedResult, q, startMs, endMs, stepMs)
@@ -125,7 +126,7 @@ func (bc *bucketCache) GetMissRanges(
 }
 
 // Put stores fresh query results in the cache.
-func (bc *bucketCache) Put(ctx context.Context, orgID valuer.UUID, q qbtypes.Query, step qbtypes.Step, fresh *qbtypes.Result) {
+func (bc *bucketCache) Put(ctx context.Context, orgID valuer.UUID, q qbtypes.Query, step qbtypes.Step, fresh *qbtypes.Result, execStatsForQueriedTimeRanges map[qbtypes.TimeRange]qbtypes.ExecStats) {
 	// Get query window
 	startMs, endMs := q.Window()
 
@@ -188,7 +189,7 @@ func (bc *bucketCache) Put(ctx context.Context, orgID valuer.UUID, q qbtypes.Que
 
 	// Convert trimmed result to buckets, one per grid cell it spans
 	cellWidthMs := bucketCacheCellSteps * stepMs
-	freshBuckets := bc.resultToBuckets(ctx, trimmedResult, cachableStartMs, cachableEndMs, cellWidthMs)
+	freshBuckets := bc.resultToBuckets(ctx, trimmedResult, cachableStartMs, cachableEndMs, cellWidthMs, execStatsForQueriedTimeRanges)
 
 	cellKeys := make([]string, len(freshBuckets))
 	cellEntries := make([]cachetypes.Cacheable, len(freshBuckets))
@@ -210,7 +211,7 @@ func (bc *bucketCache) Put(ctx context.Context, orgID valuer.UUID, q qbtypes.Que
 			cellEntry = cellEntries[i].(*qbtypes.CachedData)
 		}
 
-		cellBuckets, changed := bc.mergeFreshBucketIntoCell(ctx, cellEntry.Buckets, freshBucket)
+		cellBuckets, changed := bc.mergeFreshBucketIntoCell(ctx, cellEntry.Buckets, freshBucket, execStatsForQueriedTimeRanges)
 		if !changed {
 			continue
 		}
@@ -463,7 +464,7 @@ func (bc *bucketCache) filterRelevantBuckets(buckets []*qbtypes.CachedBucket, st
 }
 
 // mergeBuckets combines multiple cached buckets into a single result.
-func (bc *bucketCache) mergeBuckets(ctx context.Context, buckets []*qbtypes.CachedBucket, warnings []string) *qbtypes.Result {
+func (bc *bucketCache) mergeBuckets(ctx context.Context, buckets []*qbtypes.CachedBucket, warnings []string, startMs, endMs uint64) *qbtypes.Result {
 	if len(buckets) == 0 {
 		return &qbtypes.Result{}
 	}
@@ -471,12 +472,13 @@ func (bc *bucketCache) mergeBuckets(ctx context.Context, buckets []*qbtypes.Cach
 	// All buckets should have the same type
 	resultType := buckets[0].Type
 
-	// Aggregate stats
+	// A bucket can reach past the window; only the part inside it is served
 	var totalStats qbtypes.ExecStats
 	for _, bucket := range buckets {
-		totalStats.RowsScanned += bucket.Stats.RowsScanned
-		totalStats.BytesScanned += bucket.Stats.BytesScanned
-		totalStats.DurationMS += bucket.Stats.DurationMS
+		servedStats := bucket.ProrateStatsToWindow(startMs, endMs)
+		totalStats.RowsScanned += servedStats.RowsScanned
+		totalStats.BytesScanned += servedStats.BytesScanned
+		totalStats.DurationMS += servedStats.DurationMS
 	}
 
 	// Merge values based on type
@@ -673,7 +675,7 @@ func (bc *bucketCache) isEmptyResult(result *qbtypes.Result) (isEmpty bool, isFi
 }
 
 // resultToBuckets converts a query result into time-based buckets.
-func (bc *bucketCache) resultToBuckets(ctx context.Context, result *qbtypes.Result, startMs, endMs, cellWidthMs uint64) []*qbtypes.CachedBucket {
+func (bc *bucketCache) resultToBuckets(ctx context.Context, result *qbtypes.Result, startMs, endMs, cellWidthMs uint64, execStatsForQueriedTimeRanges map[qbtypes.TimeRange]qbtypes.ExecStats) []*qbtypes.CachedBucket {
 	// Check if result is empty
 	isEmpty, isFiltered := bc.isEmptyResult(result)
 
@@ -685,7 +687,7 @@ func (bc *bucketCache) resultToBuckets(ctx context.Context, result *qbtypes.Resu
 	}
 
 	// Empty filtered results still become buckets, so the range is not re-queried
-	perCellBuckets, err := result.SplitIntoCacheCellBuckets(startMs, endMs, cellWidthMs)
+	perCellBuckets, err := result.SplitIntoCacheCellBuckets(startMs, endMs, cellWidthMs, execStatsForQueriedTimeRanges)
 	if err != nil {
 		bc.logger.ErrorContext(ctx, "failed to convert result to buckets", errors.Attr(err))
 		return nil
@@ -697,7 +699,7 @@ func (bc *bucketCache) resultToBuckets(ctx context.Context, result *qbtypes.Resu
 // and reports whether the cell changed: a bucket already covering the fresh
 // one leaves it as is, buckets inside the fresh one are replaced, buckets
 // overlapping or edge to edge with it are unioned, and the rest are kept apart.
-func (bc *bucketCache) mergeFreshBucketIntoCell(ctx context.Context, cellBuckets []*qbtypes.CachedBucket, freshBucket *qbtypes.CachedBucket) ([]*qbtypes.CachedBucket, bool) {
+func (bc *bucketCache) mergeFreshBucketIntoCell(ctx context.Context, cellBuckets []*qbtypes.CachedBucket, freshBucket *qbtypes.CachedBucket, execStatsForQueriedTimeRanges map[qbtypes.TimeRange]qbtypes.ExecStats) ([]*qbtypes.CachedBucket, bool) {
 	keptBuckets := make([]*qbtypes.CachedBucket, 0, len(cellBuckets)+1)
 	touchingBuckets := []*qbtypes.CachedBucket{}
 	for _, cellBucket := range cellBuckets {
@@ -710,7 +712,7 @@ func (bc *bucketCache) mergeFreshBucketIntoCell(ctx context.Context, cellBuckets
 			keptBuckets = append(keptBuckets, cellBucket)
 		}
 	}
-	keptBuckets = append(keptBuckets, bc.unionBuckets(ctx, freshBucket, touchingBuckets))
+	keptBuckets = append(keptBuckets, bc.unionBuckets(ctx, freshBucket, touchingBuckets, execStatsForQueriedTimeRanges))
 
 	slices.SortFunc(keptBuckets, func(a, b *qbtypes.CachedBucket) int {
 		return cmp.Compare(a.StartMs, b.StartMs)
@@ -721,7 +723,16 @@ func (bc *bucketCache) mergeFreshBucketIntoCell(ctx context.Context, cellBuckets
 // unionBuckets widens the fresh bucket by the buckets it touches. Buckets
 // inside it are replaced outright, so only a genuine partial overlap decodes
 // anything.
-func (bc *bucketCache) unionBuckets(ctx context.Context, freshBucket *qbtypes.CachedBucket, touchingBuckets []*qbtypes.CachedBucket) *qbtypes.CachedBucket {
+func (bc *bucketCache) unionBuckets(ctx context.Context, freshBucket *qbtypes.CachedBucket, touchingBuckets []*qbtypes.CachedBucket, execStatsForQueriedTimeRanges map[qbtypes.TimeRange]qbtypes.ExecStats) *qbtypes.CachedBucket {
+	// Data queried again takes the new query's cost, which the fresh bucket
+	// carries; a touching bucket keeps its cost only for what was not queried again
+	for _, touchingBucket := range touchingBuckets {
+		keptStats := touchingBucket.ProrateStatsToUnqueried(execStatsForQueriedTimeRanges)
+		freshBucket.Stats.RowsScanned += keptStats.RowsScanned
+		freshBucket.Stats.BytesScanned += keptStats.BytesScanned
+		freshBucket.Stats.DurationMS += keptStats.DurationMS
+	}
+
 	bucketsToMerge := []*qbtypes.CachedBucket{freshBucket}
 	for _, touchingBucket := range touchingBuckets {
 		if !freshBucket.Contains(touchingBucket) {
@@ -742,14 +753,11 @@ func (bc *bucketCache) unionBuckets(ctx context.Context, freshBucket *qbtypes.Ca
 		EndMs:   freshBucket.EndMs,
 		Type:    freshBucket.Type,
 		Value:   value,
-		Stats:   qbtypes.ExecStats{StepIntervals: freshBucket.Stats.StepIntervals},
+		Stats:   freshBucket.Stats,
 	}
 	for _, mergedBucket := range bucketsToMerge {
 		unionBucket.StartMs = min(unionBucket.StartMs, mergedBucket.StartMs)
 		unionBucket.EndMs = max(unionBucket.EndMs, mergedBucket.EndMs)
-		unionBucket.Stats.RowsScanned += mergedBucket.Stats.RowsScanned
-		unionBucket.Stats.BytesScanned += mergedBucket.Stats.BytesScanned
-		unionBucket.Stats.DurationMS += mergedBucket.Stats.DurationMS
 	}
 	return unionBucket
 }

pkg/querier/bucket_cache_bench_test.go

@@ -30,7 +30,7 @@ func BenchmarkBucketCache_GetMissRanges(b *testing.B) {
 			endMs:       uint64((i + 1) * 10000),
 		}
 		result := createBenchmarkResult(query.startMs, query.endMs, 1000)
-		bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+		bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, map[qbtypes.TimeRange]qbtypes.ExecStats{{From: query.startMs, To: query.endMs}: result.Stats})
 	}
 
 	// Create test queries with varying cache hit patterns
@@ -121,7 +121,7 @@ func BenchmarkBucketCache_Put(b *testing.B) {
 
 			for i := 0; i < b.N; i++ {
 				for j := 0; j < tc.numQueries; j++ {
-					bc.Put(ctx, orgID, queries[j], qbtypes.Step{Duration: 1000 * time.Millisecond}, results[j])
+					bc.Put(ctx, orgID, queries[j], qbtypes.Step{Duration: 1000 * time.Millisecond}, results[j], map[qbtypes.TimeRange]qbtypes.ExecStats{{From: queries[j].startMs, To: queries[j].endMs}: results[j].Stats})
 				}
 			}
 		})
@@ -259,7 +259,7 @@ func BenchmarkBucketCache_ConcurrentOperations(b *testing.B) {
 			endMs:       uint64((i + 1) * 10000),
 		}
 		result := createBenchmarkResult(query.startMs, query.endMs, 1000)
-		bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+		bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, map[qbtypes.TimeRange]qbtypes.ExecStats{{From: query.startMs, To: query.endMs}: result.Stats})
 	}
 
 	b.ResetTimer()
@@ -284,7 +284,7 @@ func BenchmarkBucketCache_ConcurrentOperations(b *testing.B) {
 					endMs:       uint64((i + 1) * 10000),
 				}
 				result := createBenchmarkResult(query.startMs, query.endMs, 1000)
-				bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+				bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, map[qbtypes.TimeRange]qbtypes.ExecStats{{From: query.startMs, To: query.endMs}: result.Stats})
 			case 2: // Partial read
 				query := &mockQuery{
 					fingerprint: fmt.Sprintf("concurrent-query-%d", i%100),

pkg/querier/bucket_cache_step_test.go

@@ -59,7 +59,7 @@ func TestBucketCacheStepAlignment(t *testing.T) {
 	}
 
 	// Put result in cache
-	bc.Put(ctx, orgID, query, step, result)
+	bc.Put(ctx, orgID, query, step, result, nil)
 
 	// Get cached data
 	cached, missing := bc.GetMissRanges(ctx, orgID, query, step)
@@ -109,7 +109,7 @@ func TestBucketCacheNoStepInterval(t *testing.T) {
 	}
 
 	// Should cache the entire range when step is 0
-	bc.Put(ctx, orgID, query, step, result)
+	bc.Put(ctx, orgID, query, step, result, nil)
 
 	cached, missing := bc.GetMissRanges(ctx, orgID, query, step)
 	assert.NotNil(t, cached)

pkg/querier/bucket_cache_test.go

@@ -156,7 +156,7 @@ func TestBucketCache_Put_And_Get(t *testing.T) {
 	}
 
 	// Store in cache
-	bc.Put(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+	bc.Put(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, map[qbtypes.TimeRange]qbtypes.ExecStats{{From: query.startMs, To: query.endMs}: result.Stats})
 
 	// Wait a bit for cache to be written
 	time.Sleep(10 * time.Millisecond)
@@ -189,7 +189,7 @@ func TestBucketCache_PartialHit(t *testing.T) {
 		Type:  qbtypes.RequestTypeTimeSeries,
 		Value: createTestTimeSeries("A", 1000, 3000, 1000),
 	}
-	bc.Put(context.Background(), valuer.UUID{}, query1, qbtypes.Step{Duration: 1000 * time.Millisecond}, result1)
+	bc.Put(context.Background(), valuer.UUID{}, query1, qbtypes.Step{Duration: 1000 * time.Millisecond}, result1, nil)
 
 	// Wait for cache write
 	time.Sleep(10 * time.Millisecond)
@@ -225,7 +225,7 @@ func TestBucketCache_MultipleBuckets(t *testing.T) {
 	bc.Put(context.Background(), valuer.UUID{}, query1, qbtypes.Step{Duration: 100 * time.Millisecond}, &qbtypes.Result{
 		Type:  qbtypes.RequestTypeTimeSeries,
 		Value: createTestTimeSeries("A", 1000, 2000, 100),
-	})
+	}, nil)
 
 	query2 := &mockQuery{
 		fingerprint: "test-query",
@@ -235,7 +235,7 @@ func TestBucketCache_MultipleBuckets(t *testing.T) {
 	bc.Put(context.Background(), valuer.UUID{}, query2, qbtypes.Step{Duration: 100 * time.Millisecond}, &qbtypes.Result{
 		Type:  qbtypes.RequestTypeTimeSeries,
 		Value: createTestTimeSeries("A", 3000, 4000, 100),
-	})
+	}, nil)
 
 	// Wait for cache writes
 	time.Sleep(10 * time.Millisecond)
@@ -280,7 +280,7 @@ func TestBucketCache_FluxInterval(t *testing.T) {
 	}
 
 	// This should not be cached due to flux interval
-	bc.Put(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+	bc.Put(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, nil)
 
 	// Wait a bit
 	time.Sleep(10 * time.Millisecond)
@@ -358,7 +358,7 @@ func TestBucketCache_MergeTimeSeriesResults(t *testing.T) {
 				{Series: []*qbtypes.TimeSeries{series1}},
 			},
 		},
-	})
+	}, nil)
 
 	// Cache second part
 	query2 := &mockQuery{
@@ -374,7 +374,7 @@ func TestBucketCache_MergeTimeSeriesResults(t *testing.T) {
 				{Series: []*qbtypes.TimeSeries{series2}},
 			},
 		},
-	})
+	}, nil)
 
 	// Wait for cache writes
 	time.Sleep(10 * time.Millisecond)
@@ -441,7 +441,7 @@ func TestBucketCache_RawData(t *testing.T) {
 		Value: rawData,
 	}
 
-	bc.Put(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+	bc.Put(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, nil)
 	time.Sleep(10 * time.Millisecond)
 
 	cached, missing := bc.GetMissRanges(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 1000 * time.Millisecond})
@@ -481,7 +481,7 @@ func TestBucketCache_ScalarData(t *testing.T) {
 		Value: scalarData,
 	}
 
-	bc.Put(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+	bc.Put(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, nil)
 	time.Sleep(10 * time.Millisecond)
 
 	cached, missing := bc.GetMissRanges(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 1000 * time.Millisecond})
@@ -509,7 +509,7 @@ func TestBucketCache_EmptyFingerprint(t *testing.T) {
 		Value: createTestTimeSeries("A", 1000, 5000, 1000),
 	}
 
-	bc.Put(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+	bc.Put(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, nil)
 	time.Sleep(10 * time.Millisecond)
 
 	// Should still be able to retrieve
@@ -564,7 +564,7 @@ func TestBucketCache_ConcurrentAccess(t *testing.T) {
 				Type:  qbtypes.RequestTypeTimeSeries,
 				Value: createTestTimeSeries(fmt.Sprintf("Q%d", id), query.startMs, query.endMs, 100),
 			}
-			bc.Put(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 100 * time.Microsecond}, result)
+			bc.Put(context.Background(), valuer.UUID{}, query, qbtypes.Step{Duration: 100 * time.Microsecond}, result, nil)
 			done <- true
 		}(i)
 	}
@@ -624,7 +624,7 @@ func TestBucketCache_GetMissRanges_FluxInterval(t *testing.T) {
 		},
 	}
 
-	bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, cachedResult)
+	bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, cachedResult, nil)
 
 	// Get miss ranges
 	cached, missing := bc.GetMissRanges(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond})
@@ -686,7 +686,7 @@ func TestBucketCache_Put_FluxIntervalTrimming(t *testing.T) {
 	}
 
 	// Put the result
-	bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+	bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, map[qbtypes.TimeRange]qbtypes.ExecStats{{From: query.startMs, To: query.endMs}: result.Stats})
 
 	// Retrieve cached data
 	cached, missing := bc.GetMissRanges(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond})
@@ -756,7 +756,7 @@ func TestBucketCache_Put_EntireRangeInFluxInterval(t *testing.T) {
 	}
 
 	// Put the result - should not cache anything
-	bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+	bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, nil)
 
 	// Try to get cached data - should have no cached data
 	cached, missing := bc.GetMissRanges(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond})
@@ -862,7 +862,7 @@ func TestBucketCache_EmptyDataHandling(t *testing.T) {
 			}
 
 			// Put the result
-			bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, tt.result)
+			bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, tt.result, nil)
 
 			// Wait a bit for cache to be written
 			time.Sleep(10 * time.Millisecond)
@@ -927,7 +927,7 @@ func TestBucketCache_PartialValues(t *testing.T) {
 	}
 
 	// Put the result
-	bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+	bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, map[qbtypes.TimeRange]qbtypes.ExecStats{{From: query.startMs, To: query.endMs}: result.Stats})
 
 	// Wait for cache to be written
 	time.Sleep(10 * time.Millisecond)
@@ -997,7 +997,7 @@ func TestBucketCache_AllPartialValues(t *testing.T) {
 	}
 
 	// Put the result
-	bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+	bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, nil)
 
 	// Wait for cache to be written
 	time.Sleep(10 * time.Millisecond)
@@ -1058,7 +1058,7 @@ func TestBucketCache_FilteredCachedResults(t *testing.T) {
 	}
 
 	// Cache the wide range
-	bc.Put(ctx, orgID, query1, qbtypes.Step{Duration: 1000 * time.Millisecond}, result1)
+	bc.Put(ctx, orgID, query1, qbtypes.Step{Duration: 1000 * time.Millisecond}, result1, nil)
 	time.Sleep(10 * time.Millisecond)
 
 	// Now query for a smaller range (2000-3500ms)
@@ -1125,7 +1125,7 @@ func TestBucketCache_PromQLKeepsTheValueAtTheWindowEnd(t *testing.T) {
 				}},
 			}},
 		},
-	})
+	}, nil)
 	time.Sleep(10 * time.Millisecond)
 
 	cached, missing := bc.GetMissRanges(ctx, orgID, query, step)
@@ -1291,7 +1291,7 @@ func TestBucketCache_PartialValueDetection(t *testing.T) {
 		}
 
 		// Put the result
-		bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+		bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, nil)
 		time.Sleep(10 * time.Millisecond)
 
 		// Get cached data
@@ -1345,7 +1345,7 @@ func TestBucketCache_PartialValueDetection(t *testing.T) {
 		}
 
 		// Put the result
-		bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+		bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, nil)
 		time.Sleep(10 * time.Millisecond)
 
 		// Get cached data
@@ -1397,7 +1397,7 @@ func TestBucketCache_PartialValueDetection(t *testing.T) {
 		}
 
 		// Put the result
-		bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+		bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, nil)
 		time.Sleep(10 * time.Millisecond)
 
 		// Get cached data
@@ -1454,7 +1454,7 @@ func TestBucketCache_NoCache(t *testing.T) {
 	}
 
 	// Put the result in cache
-	bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result)
+	bc.Put(ctx, orgID, query, qbtypes.Step{Duration: 1000 * time.Millisecond}, result, nil)
 	time.Sleep(10 * time.Millisecond)
 
 	// Verify data is cached
@@ -1475,11 +1475,12 @@ func TestBucketCachePutSlicesAtCellBoundaries(t *testing.T) {
 
 	// a 1s step gives 60s cells, so 30s to 150s spans three of them
 	query := &mockQuery{fingerprint: "sliced-query", startMs: 30000, endMs: 150000}
-	bc.Put(ctx, orgID, query, step, &qbtypes.Result{
+	result := &qbtypes.Result{
 		Type:  qbtypes.RequestTypeTimeSeries,
 		Value: createTestTimeSeries("A", 30000, 150000, 1000),
 		Stats: qbtypes.ExecStats{RowsScanned: 120, BytesScanned: 1200, DurationMS: 12},
-	})
+	}
+	bc.Put(ctx, orgID, query, step, result, map[qbtypes.TimeRange]qbtypes.ExecStats{{From: 30000, To: 150000}: result.Stats})
 
 	type bucketShape struct {
 		cell, startMs, endMs, rowsScanned uint64
@@ -1539,7 +1540,7 @@ func TestBucketCachePutAbsorbsWritesWithinACell(t *testing.T) {
 			name:                  "OverlappingWrites_BecomeOne",
 			firstWindow:           qbtypes.TimeRange{From: 1000, To: 4000},
 			secondWindow:          qbtypes.TimeRange{From: 3000, To: 6000},
-			expectedBuckets:       []bucketShape{{1000, 6000, 6}},
+			expectedBuckets:       []bucketShape{{1000, 6000, 5}},
 			expectedMissingRanges: []*qbtypes.TimeRange{},
 			expectedValueCount:    5,
 		},
@@ -1570,12 +1571,13 @@ func TestBucketCachePutAbsorbsWritesWithinACell(t *testing.T) {
 
 			for _, window := range []qbtypes.TimeRange{testCase.firstWindow, testCase.secondWindow} {
 				query := &mockQuery{fingerprint: "absorb-query", startMs: window.From, endMs: window.To}
-				bc.Put(ctx, orgID, query, step, &qbtypes.Result{
+				result := &qbtypes.Result{
 					Type:  qbtypes.RequestTypeTimeSeries,
 					Value: createTestTimeSeries("A", window.From, window.To, 1000),
-					// one row per second, so a bucket's stats read as the seconds it was scanned for
+					// one row per second, so a bucket's stats read as the seconds of data it holds
 					Stats: qbtypes.ExecStats{RowsScanned: (window.To - window.From) / 1000},
-				})
+				}
+				bc.Put(ctx, orgID, query, step, result, map[qbtypes.TimeRange]qbtypes.ExecStats{window: result.Stats})
 			}
 
 			query := &mockQuery{
@@ -1609,7 +1611,7 @@ func TestBucketCachePutLeavesAnUnchangedCellAlone(t *testing.T) {
 		Type:     qbtypes.RequestTypeTimeSeries,
 		Value:    createTestTimeSeries("A", 1000, 10000, 1000),
 		Warnings: []string{"from the wide write"},
-	})
+	}, nil)
 
 	// a write already covered by the cell's bucket must not rewrite the entry,
 	// which shows as its warnings never arriving
@@ -1618,7 +1620,7 @@ func TestBucketCachePutLeavesAnUnchangedCellAlone(t *testing.T) {
 		Type:     qbtypes.RequestTypeTimeSeries,
 		Value:    createTestTimeSeries("A", 3000, 5000, 1000),
 		Warnings: []string{"from the inside write"},
-	})
+	}, nil)
 
 	var cellEntry qbtypes.CachedData
 	require.NoError(t, bc.cache.Get(ctx, orgID, bc.generateCacheKey(wide, 0), &cellEntry))

pkg/querier/builder_query.go

@@ -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()}

pkg/querier/postprocess.go

@@ -425,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,
@@ -666,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)
 
@@ -722,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 {
@@ -831,7 +823,7 @@ func (q *querier) executeWithCache(ctx context.Context, orgID valuer.UUID, query
 				return nil, err
 			}
 			// Store in cache for future use
-			q.bucketCache.Put(ctx, orgID, query, step, result)
+			q.bucketCache.Put(ctx, orgID, query, step, result, map[qbtypes.TimeRange]qbtypes.ExecStats{{From: startMs, To: endMs}: result.Stats})
 			return result, nil
 		}
 	}
@@ -887,16 +879,19 @@ func (q *querier) executeWithCache(ctx context.Context, orgID valuer.UUID, query
 			if err != nil {
 				return nil, err
 			}
-			q.bucketCache.Put(ctx, orgID, query, step, result)
+			startMs, endMs := query.Window()
+			q.bucketCache.Put(ctx, orgID, query, step, result, map[qbtypes.TimeRange]qbtypes.ExecStats{{From: startMs, To: endMs}: result.Stats})
 			return result, nil
 		}
 	}
 
 	// Calculate total stats and filter out nil results
 	validResults := make([]*qbtypes.Result, 0, len(freshResults))
-	for _, result := range freshResults {
+	execStatsForQueriedTimeRanges := make(map[qbtypes.TimeRange]qbtypes.ExecStats, len(freshResults))
+	for i, result := range freshResults {
 		if result != nil {
 			validResults = append(validResults, result)
+			execStatsForQueriedTimeRanges[*missingRanges[i]] = result.Stats
 			totalStats.RowsScanned += result.Stats.RowsScanned
 			totalStats.BytesScanned += result.Stats.BytesScanned
 			totalStats.DurationMS += result.Stats.DurationMS
@@ -911,7 +906,7 @@ func (q *querier) executeWithCache(ctx context.Context, orgID valuer.UUID, query
 	mergedResult.Stats.DurationMS += totalStats.DurationMS
 
 	// Store merged result in cache
-	q.bucketCache.Put(ctx, orgID, query, step, mergedResult)
+	q.bucketCache.Put(ctx, orgID, query, step, mergedResult, execStatsForQueriedTimeRanges)
 
 	return mergedResult, nil
 }
@@ -930,25 +925,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{

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/types/querybuildertypes/querybuildertypesv5/cached.go

@@ -43,6 +43,23 @@ func (c *CachedBucket) Touches(other *CachedBucket) bool {
 	return c.StartMs <= other.EndMs && other.StartMs <= c.EndMs
 }
 
+// ProrateStatsToWindow returns the share of the stats for the part of the
+// bucket inside [startMs, endMs).
+func (c *CachedBucket) ProrateStatsToWindow(startMs, endMs uint64) ExecStats {
+	return c.Stats.prorate(overlapMs(c.StartMs, c.EndMs, startMs, endMs), c.EndMs-c.StartMs)
+}
+
+// ProrateStatsToUnqueried returns the share of the stats for the part of the
+// bucket no queried range covers.
+func (c *CachedBucket) ProrateStatsToUnqueried(execStatsForQueriedTimeRanges map[TimeRange]ExecStats) ExecStats {
+	widthMs := c.EndMs - c.StartMs
+	queriedMs := uint64(0)
+	for queried := range execStatsForQueriedTimeRanges {
+		queriedMs += overlapMs(c.StartMs, c.EndMs, queried.From, queried.To)
+	}
+	return c.Stats.prorate(widthMs-min(queriedMs, widthMs), widthMs)
+}
+
 // CachedData represents the full cached data for a query.
 type CachedData struct {
 	Buckets  []*CachedBucket `json:"buckets"`
@@ -88,7 +105,7 @@ func (c *CachedData) Cost() int64 {
 	return size
 }
 
-func (r *Result) SplitIntoCacheCellBuckets(startMs, endMs, cellWidthMs uint64) ([]*CachedBucket, error) {
+func (r *Result) SplitIntoCacheCellBuckets(startMs, endMs, cellWidthMs uint64, execStatsForQueriedTimeRanges map[TimeRange]ExecStats) ([]*CachedBucket, error) {
 	tsData, ok := r.Value.(*TimeSeriesData)
 	if !ok || tsData == nil {
 		return nil, errors.NewInternalf(errors.CodeInternal, "result of type %s cannot be bucketed", r.Type.StringValue())
@@ -111,18 +128,39 @@ func (r *Result) SplitIntoCacheCellBuckets(startMs, endMs, cellWidthMs uint64) (
 		if err != nil {
 			return nil, err
 		}
+		// A slice costs what was queried inside it; the rest of the result came
+		// out of the cache and is costed there already
+		sliceStats := ExecStats{StepIntervals: maps.Clone(r.Stats.StepIntervals)}
+		for queried, stats := range execStatsForQueriedTimeRanges {
+			queriedMs := overlapMs(from, to, queried.From, queried.To)
+			if queriedMs == 0 {
+				continue
+			}
+			share := stats.prorate(queriedMs, queried.To-queried.From)
+			sliceStats.RowsScanned += share.RowsScanned
+			sliceStats.BytesScanned += share.BytesScanned
+			sliceStats.DurationMS += share.DurationMS
+		}
 		cellBuckets = append(cellBuckets, &CachedBucket{
 			StartMs: from,
 			EndMs:   to,
 			Type:    r.Type,
 			Value:   value,
-			Stats:   r.Stats.prorate(to-from, endMs-startMs),
+			Stats:   sliceStats,
 		})
 		from = to
 	}
 	return cellBuckets, nil
 }
 
+// overlapMs is the length of [aFromMs, aToMs) ∩ [bFromMs, bToMs).
+func overlapMs(aFromMs, aToMs, bFromMs, bToMs uint64) uint64 {
+	if fromMs, toMs := max(aFromMs, bFromMs), min(aToMs, bToMs); fromMs < toMs {
+		return toMs - fromMs
+	}
+	return 0
+}
+
 // prorate returns the share of the stats that partMs out of wholeMs of the
 // scanned window accounts for.
 func (e ExecStats) prorate(partMs, wholeMs uint64) ExecStats {

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/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/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

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}
 
 

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/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/queriermetrics/17_cache.py

@@ -442,3 +442,55 @@ def test_builder_refreshing_a_sliding_time_range(
     assert uncached.status_code == HTTPStatus.OK, uncached.text
 
     assert_results_equal(from_cache.json(), uncached.json(), "A", "the twentieth refresh")
+
+
+def test_builder_refreshing_does_not_inflate_rows_scanned(
+    signoz: types.SigNoz,
+    create_user_admin: None,  # pylint: disable=unused-argument
+    get_token: Callable[[str, str], str],
+    insert_metrics: Callable[[list[Metrics]], None],
+) -> None:
+    metric_name = f"cache_rows_scanned_{uuid4().hex[:8]}"
+
+    # 90 minutes back so even the last refresh closes clear of the flux
+    # interval, which holds recent data out of the cache
+    start_time = datetime.fromtimestamp(int((datetime.now(tz=UTC) - timedelta(minutes=90)).timestamp()) // 60 * 60, tz=UTC)
+    start_time_ms = int(start_time.timestamp() * 1000)
+
+    query = [build_builder_query("A", metric_name, "max", "max")]
+
+    insert_metrics(
+        [
+            Metrics(
+                metric_name=metric_name,
+                labels={"service": "api"},
+                timestamp=start_time + timedelta(minutes=minute),
+                value=minute,
+                type_="Gauge",
+                is_monotonic=False,
+            )
+            for minute in range(70)
+        ]
+    )
+
+    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+
+    # a dashboard left open on a thirty minute range, re-running a minute later
+    # each time. rowsScanned is a cost indicator, so a refresh served mostly out
+    # of the cache cannot claim more than every read made so far: the first
+    # full read and then one new minute per refresh, measured with the cache off
+    uncached_rows_scanned_so_far = 0
+    for refresh in range(10):
+        refresh_start_ms = start_time_ms + refresh * MINUTE_MS
+        refresh_end_ms = refresh_start_ms + 30 * MINUTE_MS
+
+        uncached_start_ms = refresh_start_ms if refresh == 0 else refresh_end_ms - MINUTE_MS
+        uncached_response = make_query_request(signoz, token, uncached_start_ms, refresh_end_ms, query, no_cache=True)
+        assert uncached_response.status_code == HTTPStatus.OK, f"refresh {refresh}: uncached read failed: {uncached_response.text}"
+        uncached_rows_scanned_so_far += uncached_response.json()["data"]["meta"]["rowsScanned"]
+        assert uncached_rows_scanned_so_far > 0, f"refresh {refresh}: uncached read reported no rows scanned"
+
+        cached_response = make_query_request(signoz, token, refresh_start_ms, refresh_end_ms, query, no_cache=False)
+        assert cached_response.status_code == HTTPStatus.OK, f"refresh {refresh}: cached read failed: {cached_response.text}"
+        cached_rows_scanned = cached_response.json()["data"]["meta"]["rowsScanned"]
+        assert cached_rows_scanned <= uncached_rows_scanned_so_far, f"refresh {refresh}: cached read reported {cached_rows_scanned} rows scanned, more than the {uncached_rows_scanned_so_far} rows all uncached reads scanned so far"