feat(promql): transpile allowlisted query shapes to ClickHouse grid statements

An allowlist compiler (classify/rewrite) evaluates proven PromQL shapes
entirely inside ClickHouse on the timeSeries*ToGrid aggregate functions
(CH >= 25.6): one row per output series comes back instead of every raw
sample. Everything not provably equivalent falls back to the engine over
the native querier; transpilable subtrees under non-transpilable nodes run
hybrid (materialized as synthetic series, engine on top). TryExecuteRange
slots into the serve/shadow paths, which until now ran engine-only.

Window-sliver filtering folded in: when the window is narrower than the
step, a lattice predicate admits only the samples any grid point can see -
measured 74s/28GiB -> 16s/4.3GiB on a 36k-series 1w rate, and a
2.67B-sample 1w case that died at 150GiB completes in 19s/17GiB. Over
slivered rows the last-style gates lift and disjoint over_time forms drop
the divisibility gate.

The classification golden freezes the routing decision (full/hybrid/
fallback + reason) for every conformance-corpus expression: silently
falling back costs the pushdown, silently transpiling an unproven shape
risks wrong numbers - both now surface in review as a golden diff.

The dual-leg conformance suite already earned its keep on its first
transpiled run:

- It caught the classifier reading a duration expression's offset
  (x offset step()) as zero - offset expressions parse WITHOUT the
  experimental-parser flag, so they reach production. Such selectors are
  now refused and the engine evaluates them exactly.
- It caught name-drop assembly treating temporally-disjoint same-labelset
  twins as separate series (-{job="api"} spanning http_requests and
  http_errors 400'd; hybrid -metric_a or -metric_b returned duplicate {}
  series). Both paths now merge by labelset slot-wise, raising the
  engine's duplicate error only on a same-timestamp conflict - the
  engine's actual rule.
- The 12 remaining divergences are one class, recorded with causes in
  known_divergences_v2.json (the swap scorecard): the engine sums with
  Kahan compensation and an overflow-free incremental mean, ClickHouse's
  sum/avg/arraySum are naive - visible only at 1e100-class cancellation
  and near-max-float overflow.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

.github/workflows/integrationci.yaml

@@ -39,8 +39,6 @@ jobs:
       matrix:
         suite:
           - alerts
-          - alertmanager
-          - alertmanagerrotation
           - basepath
           - callbackauthn
           - cloudintegrations

docs/contributing/prometheus.md

@@ -2,8 +2,8 @@
 
 This document is the subsystem context for `pkg/prometheus/clickhouseprometheusv2`,
 the second-generation ClickHouse-backed Prometheus provider. It explains why the
-package exists, the correctness constraints that shaped it, and how each fetch
-reduction is proven not to change results. Any change to the provider must keep
+package exists, the correctness constraints that shaped it, and how each
+construct is proven not to change results. Any change to the provider must keep
 these invariants; if a change would violate one, it must be flagged and
 discussed.
 
@@ -17,107 +17,337 @@ window is fetched, serialized, and handed to the engine. The cost is a function
 of ingested data, not of the question asked — which is how a dashboard of PromQL
 panels can take an instance down.
 
-In v2 the stock promql engine evaluates over a native `storage.Querier`: no
-translation layer, per-selector fetch windows, and fetch reductions that are
-provably invisible to the engine.
+In v2, every query runs in one of two ways, decided per query:
 
-**The core constraint: every reduction either preserves engine semantics exactly
-or is not performed.** A PromQL result that differs from upstream Prometheus is
-a lost user. The conformance suite
+- **Transpiled**: the query is evaluated entirely inside ClickHouse and only
+  final (or near-final) per-group grid arrays come back, built on the
+  `timeSeries*ToGrid` aggregate functions (the supported ClickHouse floor is
+  >= 25.6, so they are assumed available).
+- **Engine**: the stock promql engine evaluates over this package's native
+  `storage.Querier`. This is the path for everything not transpilable.
+
+**The core constraint: a PromQL result that differs from upstream Prometheus is
+a lost user, so anything that cannot reproduce engine semantics exactly falls
+back rather than approximate.** The conformance suite
 (`tests/integration/tests/promqlconformance/`) replays Prometheus' own test
-corpus against both providers and is the arbiter.
+corpus against both providers and is the arbiter; the classification golden
+(`testdata/classification_golden.json`) freezes which of the two ways each
+corpus expression takes. The rest of this document is the PromQL -> SQL story,
+because that mapping is where correctness is won or lost.
 
 ---
 
+## The evaluation model the SQL must reproduce
+
+A PromQL range query is an instant query evaluated at every grid point
+t_i = start + i*step, i = 0..(end-start)/step. At each t_i:
+
+  - an instant selector resolves to the latest sample in the left-open
+    lookback window (t_i - lookback, t_i], and to nothing when that latest
+    sample is a stale marker — even if older real samples sit inside the
+    window;
+  - a range selector [r] collects every sample in (t_i - r, t_i], stale
+    markers excluded;
+  - offset d shifts both windows to (t_i - d - w, t_i - d].
+
+The transpilation invariant follows from this: every transpiled construct
+produces, per output series, one array with exactly one slot per grid
+point — slot i holds the value at t_i, NULL means absent. This is what
+makes composition correct, not just convenient: the engine evaluates
+these operators independently per t_i, so any representation that gets
+every slot right gets the whole query right, and spatial aggregation over
+arrays is sound because it combines values that belong to the same t_i by
+construction. Slot index i maps back to t_i = start + i*step at scan time
+(toMatrix). Everything below is about filling those slots with exactly
+the numbers the engine would compute — and each equivalence was validated
+against the vendored engine on live data before its shape entered the
+allowlist; anything unproven stays on the engine path.
+
+## Classification: finding what a statement can answer
+
+classify walks the parsed AST looking for "core units" — maximal subtrees
+of the shape
+
+	[agg by/without (...)] [fn(] selector[range] [offset d] [)] [op scalar]...
+
+classifyCore peels that chain from the outside in: an optional
+sum/min/max/avg/count aggregation, then one of the allowlisted functions
+or a bare instant selector, then the selector with its offset; on the way
+out it accumulates number-literal arithmetic, comparisons (including
+bool) and unary minus into a scalar-op pipeline. A node qualifies only if
+its type, arguments and children are in the proven set — an allowlist, so
+an overlooked construct becomes a fallback instead of a wrong number.
+
+Three unit kinds come out of this, each with its own SQL form:
+unitRange (rate, irate, increase, delta, idelta over a range selector),
+unitInstant (instant vector selection, bare or comparison-filtered) and
+unitOverTime (avg/min/max/sum/count/last _over_time).
+
+If the entire tree is one unit, the plan is "full": the statement's rows
+are the query result. Otherwise every maximal unit is cut out and replaced
+in the expression with a synthetic selector __signoz_transpiled_N__, and
+the rewritten expression runs in the engine over the units' materialized
+results ("hybrid") — histogram_quantile, topk, or/and/unless and vector
+matching keep exact engine semantics while their expensive inputs were
+aggregated server-side.
+
+Classification refuses when exact semantics cannot be guaranteed
+server-side: the @ modifier anywhere and default-resolution subqueries
+(their resolution is a server runtime setting the transpiler cannot see);
+duration expressions (offset step(), [range()], ...) anywhere — they are
+resolved into the selector's static fields only at evaluation time, so at
+classification time those fields still hold their zero values and
+transpiling would silently use the wrong offset or range;
+steps or ranges that are not whole seconds (the grid functions take
+whole-second parameters); grouping by or matching on __name__ in hybrid
+plans (the synthetic name would leak into results); name-keeping units —
+bare/comparison instant selectors and last_over_time keep their real
+__name__ (keepsName), which substitution would replace, so they transpile
+only as full plans; and every function outside the allowlist (changes,
+resets, quantile_over_time, absent, native-histogram functions, ...).
+
+Units inside a fixed-resolution subquery evaluate on the subquery's own
+grid instead of the query grid: epoch-aligned multiples of the resolution
+strictly after outerStart - offset - range, ending at outer end - offset —
+the exact derivation the engine uses, because a grid shifted by one step
+changes which samples every window sees.
+
+## From one unit to one statement
+
+buildUnitSQL renders each unit as a single statement. For
+sum by (pod) (rate(m{job="api"}[5m])) the skeleton is:
+
+	SELECT gkey, sumForEach(grid) AS grid FROM (
+	    SELECT series.gkey AS gkey,
+	           timeSeriesRateToGrid(<start>, <end>, <step>, <range>)(fromUnixTimestamp64Milli(unix_milli), value) AS grid
+	    FROM signoz_metrics.distributed_samples_v4 AS points
+	    INNER JOIN (
+	        SELECT fingerprint, <group key expr> AS gkey
+	        FROM signoz_metrics.time_series_v4
+	        WHERE <series predicates>
+	        GROUP BY fingerprint, gkey
+	    ) AS series ON points.fingerprint = series.fingerprint
+	    WHERE metric_name = ? AND temporality IN ['Cumulative', 'Unspecified']
+	      AND points.fingerprint IN (<matched fingerprints>)
+	      AND unix_milli > <start - range> AND unix_milli <= <end>
+	      AND bitAnd(flags, 1) = 0
+	    GROUP BY points.fingerprint, series.gkey
+	) GROUP BY gkey
+	SETTINGS allow_experimental_ts_to_grid_aggregate_function = 1
+
+Reading it inside out:
+
+The time window is the selector's semantics verbatim: strict > on the
+lower bound and <= on the upper is the left-open (t - w, t] rule, with the
+whole window shifted by the offset. bitAnd(flags, 1) = 0 drops stale
+markers, which PromQL excludes from range vectors.
+
+The inner GROUP BY computes one grid array per series.
+timeSeriesRateToGrid(start, end, step, range) is a parametric aggregate:
+fed (timestamp, value) pairs it produces Array(Nullable(Float64)) with one
+slot per grid point. Correct because it implements the engine's
+extrapolatedRate decision for decision — counter resets, the zero-point
+clamp, the extrapolation thresholds, the >= 2 samples rule, the left-open
+window — verified by feeding identical samples to both and comparing
+slot for slot: the only difference ever observed is the last bit
+(ClickHouse's C++ and Go round the same formula differently), which is
+the floating-point floor, not a semantic gap. irate/delta/idelta map to
+their own timeSeries*ToGrid functions with the same verification;
+increase has no function of its own and is emitted as
+arrayMap(x -> x * <range seconds>, <rate expr>), exact by definition —
+extrapolatedRate computes the same extrapolated delta for both and
+divides by the range only when isRate, so multiplying it back is the
+identity, not an approximation. The grid parameters are rendered as
+literals, not bound args — they are aggregate-function parameters — and
+the experimental gate rides as a SETTINGS clause on the statement itself
+so telemetrystore hooks cannot clobber it.
+
+The join annotates each series with its group key, in one of two forms.
+by (...) extracts each listed label as a plain column
+(JSONExtractString(labels, 'pod') AS g0) and groups on the columns
+directly: the projection is a known short list and the label names live
+in Go, so building, sorting and stringifying every label pair per row
+would be waste. Correct because column-tuple equality is label-set
+equality on the projection, and an extracted '' is the label being
+absent — Prometheus semantics for by() over missing labels, and empties
+are skipped when the columns turn back into labels. without and
+no-aggregation project a label SET that varies per series, so they get
+the canonical key: toJSONString of the sorted [label, value] pairs the
+unit projects (without excludes the listed labels plus __name__; no
+aggregation keeps everything, the name coming off in Go per the engine's
+name-dropping rules). There the sort is load-bearing — stored JSON key
+order is not canonical across fingerprints, and two orderings of the same
+labels must land in one group — empty values are filtered for the same
+absent-label reason, and the same string parses back into the output
+label set (labelsFromGroupKey).
+
+The outer GROUP BY is the spatial aggregation: sum/min/max/avg/count
+by/without become the -ForEach combinators. Element-wise aggregation over
+grid arrays is the engine's per-t_i aggregation, because slot i of every
+input array refers to the same t_i; the combinators skip NULLs, which is
+the engine aggregating only the series present at t_i, and an index where
+every series is absent stays NULL. Two edges need explicit handling:
+countForEach wraps in a mapping of 0 back to NULL, because a count over
+an all-absent index is an absent point, not 0; and a unit without
+aggregation still passes through maxForEach — the identity for the common
+one-fingerprint group, and a deterministic NULL-skipping merge when a
+regex __name__ selector collapses distinct metrics onto one projected
+label set. One caveat is inherent: summation order over series differs
+from the engine's, so spatial aggregates can differ in the last ULP —
+float addition is not associative; no ordering reproduces the engine's
+bit-exactly from inside a GROUP BY.
+
+## Instant selectors: staleness needs two aggregates
+
+unitInstant uses window = lookback and must reproduce the shadowing rule:
+the point is absent when the latest in-window sample is a stale marker.
+timeSeriesLastToGrid alone cannot express that — skipping stale rows in
+WHERE would resurrect the older real sample the marker was written to
+bury. So stale rows stay in the scan for this kind only, and the grid
+expression compares three aggregates per slot:
+
+	arrayMap((tall, tok, vok) -> if(tall IS NULL OR tok IS NULL OR tall != tok, NULL, vok),
+	         timeSeriesLastToGrid(...)(ts, toFloat64(unix_milli)),                           -- last sample overall
+	         timeSeriesLastToGridIf(...)(ts, toFloat64(unix_milli), bitAnd(flags, 1) = 0),   -- last non-stale, its timestamp
+	         timeSeriesLastToGridIf(...)(ts, value, bitAnd(flags, 1) = 0))                   -- last non-stale, its value
+
+Correct by cases on a slot's window. No samples at all: both timestamp
+aggregates are NULL, the slot is NULL — absent, as the engine says. Latest
+sample non-stale: it is the latest overall and the latest non-stale, the
+timestamps agree, the slot takes its value — the engine's pick. Latest
+sample stale: the last-overall timestamp is the marker's, the
+last-non-stale timestamp is older (or NULL when only markers are in
+window), they disagree, the slot is NULL — the marker shadows, exactly
+the engine's rule. Timestamps are unique per series (ingest dedups), so
+timestamp equality identifies "the same sample" without ambiguity. The
+-If combinator's applicability to these experimental aggregates was
+probed before being trusted, not assumed.
+
+## Windowed *_over_time: whole buckets instead of a grid function
+
+avg/min/max/sum/count _over_time aggregate every raw sample in the window,
+and no timeSeries*ToGrid function computes them. (last_over_time is the
+exception: the last sample of a range vector — stale markers excluded from
+range vectors by PromQL, excluded here in WHERE — is exactly
+timeSeriesLastToGrid.) These transpile only when the range is a whole
+multiple of the step, and then the window needs no per-sample fan-out at
+all: with W = range/step, the window (t_k - range, t_k] is exactly the
+union of W step buckets — both are left-open on the same boundaries — so
+bucket membership fully determines window membership. Each sample lands
+in exactly one bucket by a plain GROUP BY:
+
+	intDiv(unix_milli - <start> + <range> - 1, <step>) AS jj
+
+(ceil((ts - start)/step) shifted by W-1 so the earliest in-window sample
+sits at 0; slot k's window is buckets jj in [k, k+W-1]). The alternative —
+fanning each sample into all W windows that cover it — multiplies rows by
+W, which for a long range over a short step is a row explosion measured
+in billions; the bucketed form's row count is series x buckets, the size
+of the output, regardless of W.
+
+The shard level aggregates per (series, group key, bucket): a bucket
+count plus the function's value aggregate (sum for sum/avg, min, max).
+The assembly level places the partials into dense arrays
+(groupArrayInsertAt — positions are unique, one row per bucket; counts
+and sums default to 0, which contributes nothing) and slides: slot k
+combines its at-most-W bucket partials by direct aggregation, so window
+sums are added the way the engine adds them — no prefix-sum differencing,
+whose large-minus-large cancellation would drift past the shadow
+tolerance on counter-sized values. Correct per slot because the bucket
+union is the exact window multiset and avg/min/max/sum/count are
+order-insensitive on a multiset (sum/avg up to summation order, the float
+caveat above). A slot with zero window count is absent; min/max filter
+their slices on the bucket counts, so an empty bucket's default can never
+be mistaken for a value — a real sample can legitimately be +Inf.
+
+Ranges that don't divide the step, and windows wider than
+maxWindowBuckets buckets (the slide costs W combines per slot), fall back
+to the engine path, which is exact.
+
+## Scalar ops, full plans, hybrid plans
+
+The scalar-op pipeline applies in Go to the returned arrays
+(applyScalarOps), slot by slot: arithmetic operators compute, comparisons
+filter (the slot keeps the vector-side value or becomes NULL) or return
+0/1 under bool. Correct trivially: it is the same float64 operation the
+engine would apply to the same slot value, in the same operator order the
+AST dictates — running it in Go instead of another SQL layer changes
+where, not what.
+
+A full plan's arrays map straight to the result matrix. A hybrid plan
+materializes each unit's arrays as synthetic series under its
+__signoz_transpiled_N__ name and evaluates the rewritten expression over
+a storage that serves synthetic names from memory and everything else
+live. Substitution is sound because a unit's output is a plain instant
+vector to the engine — same values at same timestamps under a different
+name, and the name cannot matter: plans that group by or match on
+__name__ were refused at classification, and name-keeping units are never
+substituted. One subtlety makes it exact: stale markers are written at
+absent grid points, because the engine's lookback would otherwise
+resurrect a point from up to lookback earlier — the marker encodes
+"absent here" the way the engine itself encodes it. Units evaluate
+concurrently; each is one series lookup plus one grid statement. A step
+of 0 is an instant query: a single evaluation at end.
+
 ## Series lookup
 
-Matchers resolve to series once per selector (`selectSeries`) against the series
-tables, which hold one row per (fingerprint, bucket) at 1h/6h/1d/1w
-granularities. Table selection and window rounding delegate to the shared
-metrics schema package (`pkg/telemetryschema/metricstelemetryschema`); the
-window start rounds down to the bucket boundary so a window beginning mid-bucket
-still matches the bucket's row.
+Both paths resolve matchers the same way, once per selector
+(selectSeries), against the series tables holding one row per
+(fingerprint, bucket) at 1h/6h/1d/1w granularities; timeSeriesTableFor
+picks the table whose bucket fits the window and rounds the window start
+down to the bucket boundary. How matchers become SQL, and why regexes are
+anchored, is documented at applySeriesConditions. Empty-valued labels come
+off at this boundary: an empty value means "label absent" in Prometheus,
+but stored attribute JSON can carry them.
 
-How matchers become SQL is documented at `applySeriesConditions`. The rules that
-carry semantics:
+## The engine path
 
-- `__name__` matchers (all four types) translate to the `metric_name` column.
-- Every other matcher becomes a `JSONExtractString` condition on the labels
-  column. An equality matcher against `""` matches series *without* the label,
-  mirroring PromQL, because `JSONExtractString` returns `""` for missing keys.
-- Regexes are anchored (`^(?:...)$`) before they reach `match()`: PromQL
-  matchers match the whole value, ClickHouse `match()` searches for a
-  substring.
-- The series-lookup upper bound is inclusive (`unix_milli <= end`) because the
-  exporter floors registration rows to the bucket start: a series first
-  registered in the bucket beginning exactly at `end` would otherwise be
-  invisible while its samples are in range.
-
-Empty-valued labels come off at this boundary: an empty value means "label
-absent" in Prometheus, but stored attribute JSON can carry them.
-
----
-
-## Sample fetch
-
-Samples are fetched per selector using the engine's per-selector hints, not the
-query-wide union window — `foo / foo offset 1d` reads two narrow windows
-instead of the widest one twice.
-
-**Last-sample-per-step reduction.** Instant selectors of subquery-free queries
-fetch only the last sample per step bucket. The engine resolves an instant
-selector at each grid timestamp `t` to the latest sample in the left-open
-lookback window `(t − lookback, t]`. Buckets anchor at the selector's first
-evaluation timestamp — recovered from the hints as
-`hints.Start + lookback − 1ms`, the inverse of how the engine derives
-`hints.Start` — so bucket boundaries coincide with evaluation timestamps, and a
-non-final sample of a bucket can never be the latest sample in
-`(t − lookback, t]` for any grid `t`. Real timestamps are preserved, so the
-engine's own lookback and staleness handling stay exact.
-
-Range selectors always fetch raw — every sample feeds the range function. The
-subquery-free proof travels in the context as `prometheus.QueryTraits`, because
-subquery selectors evaluate at the subquery's step while the hints carry the
-top-level step; call sites that do not attach traits get the conservative raw
-fetch.
-
-**Row assembly** maps stale flags to the engine's `StaleNaN` and merges series
-with identical label sets (`sortAndMerge`) — the engine assumes storages never
-emit duplicates. Duplicate timestamps pass through as stored: uniqueness is
-ingest's job, and v1 feeds them to the engine as-is over the same data.
-
-**The fingerprint filter is a shard-local semi-join.** The samples query
-restricts to the matched series by re-running the series predicates as an
-`IN (SELECT fingerprint FROM <local series table> ...)` subquery, not a GLOBAL
-broadcast of the matched set. ClickHouse materializes the subquery's set per
-shard before the scan, so it still engages the fingerprint primary-key column.
-Because the subquery re-executes the predicates after the lookup ran, it can
-match series registered in between; sample rows whose fingerprint the lookup
-never saw are skipped — the lookup is the read snapshot.
-
----
+Queries that do not transpile run in the stock engine over this package's
+storage.Querier, which is still not the v1 path. Samples are fetched per
+selector using the engine's per-selector hints, not the query-wide union
+window, so foo / foo offset 1d reads two narrow windows instead of the
+widest one twice. Instant selectors of subquery-free queries fetch only
+the last sample per step bucket (lastSamplePerStep): buckets anchor at the
+selector's first evaluation timestamp — recovered from the hints as
+hints.Start + lookback - 1ms, the inverse of how the engine derives
+hints.Start — so bucket boundaries coincide with evaluation timestamps and
+a non-final sample of a bucket can never be the latest sample in
+(t - lookback, t] for any grid t. Real timestamps are preserved, so the
+engine's own lookback and staleness handling stay exact. Range selectors
+always fetch raw — every sample feeds the range function — and the
+subquery-free proof travels in the context as prometheus.QueryTraits,
+because subquery selectors evaluate at the subquery's step while the
+hints carry the top-level step. Row assembly maps stale flags to the
+engine's StaleNaN and merges series with identical label sets
+(sortAndMerge) — the engine assumes storages never emit duplicates.
 
 ## Sharding
 
-`samples_v4` and `time_series_v4` (and all their rollups) shard on the same key
-— `cityHash64(env, temporality, metric_name, fingerprint)` — so a series'
-samples and catalog rows live on the same shard. The semi-join above exploits
-that: each shard filters by its own series rows, which are exactly the series
-of that shard's samples.
-
-The temporality filter on every samples statement
-(`temporality IN ['Cumulative', 'Unspecified']`) is a semantic no-op — the
-matched fingerprints already come from those temporalities — that engages the
-leading samples primary-key column.
-
-Delta-temporality series stay invisible to PromQL exactly as they are in v1:
-the rollout gate is parity with v1, and a Delta stream fed to `rate()`
-as-if-cumulative would be wrong, not just new.
-
----
+samples_v4 and time_series_v4 (and all their rollups) shard on the same
+key — cityHash64(env, temporality, metric_name, fingerprint) — so a
+series' samples and catalog rows live on the same shard. The transpiled
+statement above exploits that: the distributed samples table at the
+top-level FROM makes ClickHouse rewrite the whole inner query per shard,
+where the join against the shard-local series table and the per-series
+grid aggregation run next to the data; the initiator only merges
+aggregate states and applies the spatial -ForEach step. Same layout as
+the telemetrymetrics statement builder. The group-key join alone
+restricts the transpiled scan to the matched series; the engine path's
+samples fetch restricts by the same predicates as a shard-local
+semi-join, not a GLOBAL broadcast of the matched set. The temporality
+filter on every
+samples statement is a semantic no-op — the matched fingerprints already
+come from those temporalities — that engages the leading samples
+primary-key column. Delta-temporality series stay invisible to PromQL
+here exactly as they are in v1: the rollout gate is parity with v1, and
+making Delta visible is its own change with its own semantics to design —
+a Delta stream fed to rate() as-if-cumulative would be wrong, not just
+new.
 
 ## Observability
 
-Every statement carries a `log_comment` with
-`code.namespace=clickhouse-prometheus-v2` and `code.function.name` naming the
-call site, so this provider's work is attributable in `system.query_log`.
+Every statement carries a log_comment with
+code.namespace=clickhouse-prometheus-v2 and code.function.name naming the
+call site (selectSeries, selectSamples, transpiledUnit, LabelValues,
+LabelNames), so this provider's work is attributable in system.query_log
+without guessing from query text.

frontend/src/constants/queryBuilder.ts

@@ -1,8 +1,5 @@
 // ** Helpers
-import {
-	MetrictypesTemporalityDTO,
-	MetrictypesTypeDTO,
-} from 'api/generated/services/sigNoz.schemas';
+import { MetrictypesTypeDTO } from 'api/generated/services/sigNoz.schemas';
 import { defaultTraceSelectedColumns } from 'container/OptionsMenu/constants';
 import { createIdFromObjectFields } from 'lib/createIdFromObjectFields';
 import { createNewBuilderItemName } from 'lib/newQueryBuilder/createNewBuilderItemName';
@@ -392,17 +389,11 @@ const METRIC_TYPE_TO_ATTRIBUTE_TYPE: Record<
 export function toAttributeType(
 	metricType: MetrictypesTypeDTO | undefined,
 	isMonotonic?: boolean,
-	temporality?: MetrictypesTemporalityDTO,
 ): ATTRIBUTE_TYPES | '' {
 	if (!metricType) {
 		return '';
 	}
-	// Only non-monotonic cumulative sums are treated as gauges; delta sums stay Sum
-	if (
-		metricType === MetrictypesTypeDTO.sum &&
-		isMonotonic === false &&
-		temporality === MetrictypesTemporalityDTO.cumulative
-	) {
+	if (metricType === MetrictypesTypeDTO.sum && isMonotonic === false) {
 		return ATTRIBUTE_TYPES.GAUGE;
 	}
 	return METRIC_TYPE_TO_ATTRIBUTE_TYPE[metricType] || '';

frontend/src/container/MetricsExplorer/MetricDetails/AllAttributes.tsx

@@ -33,7 +33,6 @@ function AllAttributes({
 	metricName,
 	metricType,
 	isMonotonic,
-	temporality,
 	minTime,
 	maxTime,
 }: AllAttributesProps): JSX.Element {
@@ -72,7 +71,6 @@ function AllAttributes({
 				groupBy,
 				limit,
 				isMonotonic,
-				temporality,
 			);
 			handleExplorerTabChange(
 				PANEL_TYPES.TIME_SERIES,
@@ -91,7 +89,7 @@ function AllAttributes({
 				[MetricsExplorerEventKeys.AttributeKey]: groupBy,
 			});
 		},
-		[metricName, metricType, isMonotonic, temporality, handleExplorerTabChange],
+		[metricName, metricType, isMonotonic, handleExplorerTabChange],
 	);
 
 	const goToMetricsExploreWithAppliedAttribute = useCallback(
@@ -103,7 +101,6 @@ function AllAttributes({
 				undefined,
 				undefined,
 				isMonotonic,
-				temporality,
 			);
 			handleExplorerTabChange(
 				PANEL_TYPES.TIME_SERIES,
@@ -123,7 +120,7 @@ function AllAttributes({
 				[MetricsExplorerEventKeys.AttributeValue]: value,
 			});
 		},
-		[metricName, metricType, isMonotonic, temporality, handleExplorerTabChange],
+		[metricName, metricType, isMonotonic, handleExplorerTabChange],
 	);
 
 	const handleKeyMenuItemClick = useCallback(

frontend/src/container/MetricsExplorer/MetricDetails/MetricDetails.tsx

@@ -86,7 +86,6 @@ function MetricDetails({
 				undefined,
 				undefined,
 				metadata?.isMonotonic,
-				metadata?.temporality,
 			);
 			handleExplorerTabChange(
 				PANEL_TYPES.TIME_SERIES,
@@ -109,7 +108,6 @@ function MetricDetails({
 		handleExplorerTabChange,
 		metadata?.type,
 		metadata?.isMonotonic,
-		metadata?.temporality,
 	]);
 
 	useEffect(() => {
@@ -198,7 +196,6 @@ function MetricDetails({
 					metricName={metricName}
 					metricType={metadata?.type}
 					isMonotonic={metadata?.isMonotonic}
-					temporality={metadata?.temporality}
 					minTime={minTime}
 					maxTime={maxTime}
 				/>

frontend/src/container/MetricsExplorer/MetricDetails/__tests__/utils.test.ts

@@ -147,44 +147,6 @@ describe('MetricDetails utils', () => {
 			expect(query.builder.queryData[0]?.spaceAggregation).toBe('sum');
 		});
 
-		it('treats a cumulative non-monotonic Sum as a Gauge', () => {
-			const query = getMetricDetailsQuery(
-				TEST_METRIC_NAME,
-				MetrictypesTypeDTO.sum,
-				undefined,
-				undefined,
-				undefined,
-				false,
-				MetrictypesTemporalityDTO.cumulative,
-			);
-
-			expect(query.builder.queryData[0]?.aggregateAttribute?.type).toBe(
-				ATTRIBUTE_TYPES.GAUGE,
-			);
-			expect(query.builder.queryData[0]?.aggregateOperator).toBe('avg');
-			expect(query.builder.queryData[0]?.timeAggregation).toBe('avg');
-			expect(query.builder.queryData[0]?.spaceAggregation).toBe('avg');
-		});
-
-		it('treats a delta non-monotonic Sum as a Sum', () => {
-			const query = getMetricDetailsQuery(
-				TEST_METRIC_NAME,
-				MetrictypesTypeDTO.sum,
-				undefined,
-				undefined,
-				undefined,
-				false,
-				MetrictypesTemporalityDTO.delta,
-			);
-
-			expect(query.builder.queryData[0]?.aggregateAttribute?.type).toBe(
-				ATTRIBUTE_TYPES.SUM,
-			);
-			expect(query.builder.queryData[0]?.aggregateOperator).toBe('rate');
-			expect(query.builder.queryData[0]?.timeAggregation).toBe('rate');
-			expect(query.builder.queryData[0]?.spaceAggregation).toBe('sum');
-		});
-
 		it('should create correct query for GAUGE metric type', () => {
 			const query = getMetricDetailsQuery(
 				TEST_METRIC_NAME,

frontend/src/container/MetricsExplorer/MetricDetails/types.ts

@@ -35,7 +35,6 @@ export interface AllAttributesProps {
 	metricName: string;
 	metricType: MetrictypesTypeDTO | undefined;
 	isMonotonic?: boolean;
-	temporality?: MetrictypesTemporalityDTO;
 	minTime?: number;
 	maxTime?: number;
 }

frontend/src/container/MetricsExplorer/MetricDetails/utils.tsx

@@ -89,16 +89,12 @@ export function getMetricDetailsQuery(
 	groupBy?: string,
 	limit?: number,
 	isMonotonic?: boolean,
-	temporality?: MetrictypesTemporalityDTO,
 ): Query {
 	let timeAggregation;
 	let spaceAggregation;
 	let aggregateOperator;
-	// Only non-monotonic cumulative sums are treated as gauges; delta sums stay Sum
 	const isNonMonotonicSum =
-		metricType === MetrictypesTypeDTO.sum &&
-		isMonotonic === false &&
-		temporality === MetrictypesTemporalityDTO.cumulative;
+		metricType === MetrictypesTypeDTO.sum && isMonotonic === false;
 
 	switch (metricType) {
 		case MetrictypesTypeDTO.sum:
@@ -135,7 +131,7 @@ export function getMetricDetailsQuery(
 			break;
 	}
 
-	const attributeType = toAttributeType(metricType, isMonotonic, temporality);
+	const attributeType = toAttributeType(metricType, isMonotonic);
 
 	return {
 		...initialQueriesMap[DataSource.METRICS],

frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.test.tsx

@@ -393,13 +393,12 @@ describe('selecting a metric type updates the aggregation options', () => {
 		]);
 	});
 
-	it('cumulative non-monotonic Sum metric is treated as Gauge', () => {
+	it('non-monotonic Sum metric is treated as Gauge', () => {
 		returnMetrics([
 			makeMetric({
 				metricName: 'active_connections',
 				type: MetrictypesTypeDTO.sum,
 				isMonotonic: false,
-				temporality: 'cumulative' as never,
 			}),
 		]);
 
@@ -428,36 +427,6 @@ describe('selecting a metric type updates the aggregation options', () => {
 		]);
 	});
 
-	it('delta non-monotonic Sum metric is treated as Sum', () => {
-		returnMetrics([
-			makeMetric({
-				metricName: 'queue_depth_delta',
-				type: MetrictypesTypeDTO.sum,
-				isMonotonic: false,
-				temporality: 'delta' as never,
-			}),
-		]);
-
-		render(<MetricQueryHarness query={makeQuery()} />);
-
-		const input = screen.getByRole('combobox');
-		fireEvent.change(input, {
-			target: { value: 'queue_depth_delta' },
-		});
-		fireEvent.blur(input);
-
-		expect(getOptionLabels('time-agg-options')).toStrictEqual([
-			'Rate',
-			'Increase',
-		]);
-		expect(getOptionLabels('space-agg-options')).toStrictEqual([
-			'Sum',
-			'Avg',
-			'Min',
-			'Max',
-		]);
-	});
-
 	it('Histogram metric shows no time options and P50–P99 space options', () => {
 		returnMetrics([
 			makeMetric({

frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.tsx

@@ -34,7 +34,7 @@ export type MetricNameSelectorProps = {
 function getAttributeType(
 	metric: MetricsexplorertypesListMetricDTO,
 ): ATTRIBUTE_TYPES | '' {
-	return toAttributeType(metric.type, metric.isMonotonic, metric.temporality);
+	return toAttributeType(metric.type, metric.isMonotonic);
 }
 
 function createAutocompleteData(

frontend/src/pages/DashboardsListPageV2/utils/dslTokenizer.test.ts

@@ -114,23 +114,6 @@ describe('getCaretContext — stage detection', () => {
 		expect(ctx.partial).toBe('');
 	});
 
-	it('never replaces past the caret when it sits before the operator', () => {
-		const ctx = getCaretContext("env  = 'prod'", 4);
-		expect(ctx.stage).toBe('operator');
-		expect(ctx.partial).toBe('');
-		expect(ctx.replaceStart).toBe(4);
-		expect(ctx.replaceEnd).toBe(4);
-	});
-
-	it('never replaces past the caret when it sits before the value', () => {
-		const ctx = getCaretContext("env =  'prod'", 6);
-		expect(ctx.stage).toBe('value');
-		expect(ctx.operator).toBe('=');
-		expect(ctx.partial).toBe('');
-		expect(ctx.replaceStart).toBe(6);
-		expect(ctx.replaceEnd).toBe(6);
-	});
-
 	it('detects the stage of the term under a mid-string caret', () => {
 		const q = "env =  AND team = 'core'";
 		// caret right after the first `env ` (index 4) is the operator stage
@@ -159,13 +142,6 @@ describe('spliceAtCaret', () => {
 		expect(next).toBe("env = 'prod'");
 	});
 
-	it('inserts (without duplicating text) at a caret parked before a token', () => {
-		const q = "env  = 'prod'";
-		const ctx = getCaretContext(q, 4);
-		const { next } = spliceAtCaret(q, ctx, '!= ');
-		expect(next).toBe("env !=  = 'prod'");
-	});
-
 	it('preserves text after the caret', () => {
 		const q = "env  AND team = 'core'";
 		const ctx = getCaretContext(q, 4); // operator gap after `env`

frontend/src/pages/DashboardsListPageV2/utils/dslTokenizer.ts

@@ -328,7 +328,7 @@ export const getCaretContext = (query: string, caret: number): CaretContext => {
 		fieldKey: scan.key ? scan.key.text : '',
 		operator: slot.operator,
 		partial: slot.partial,
-		replaceStart: Math.min(term.start + slot.replaceStartRel, pos),
+		replaceStart: term.start + slot.replaceStartRel,
 		replaceEnd: pos,
 	};
 };

grammar/FilterQuery.g4

@@ -112,12 +112,15 @@ functionCall
     ;
 
 /*
- * Full-text search: search('term') or scoped search('term', body, ...).
- * First param is the search term; the rest are field-context scopes (body/attribute/
- * resource/log), quoted or bare. Handled in the visitor — no grammar change.
+ * Full-text search call: search('needle')
+ *
+ * Uses the shared functionParamList so future scoped forms like
+ * search(body, 'abc') / search(attribute, 'abc') need no grammar change. Today
+ * only a single needle is supported. Unlike bare/quoted free text (`fullText`),
+ * which only targets the body column, search() fans out across every field.
  */
 searchCall
-    : SEARCH LPAREN valueList RPAREN
+    : SEARCH LPAREN functionParamList RPAREN
     ;
 
 // Function parameters can be keys, single scalar values, or arrays

pkg/alertmanager/alertmanagerserver/server.go

@@ -241,12 +241,9 @@ func (server *Server) PutAlerts(ctx context.Context, postableAlerts alertmanager
 }
 
 func (server *Server) SetConfig(ctx context.Context, alertmanagerConfig *alertmanagertypes.Config) error {
-	resolved, err := alertmanagerConfig.Resolved()
-	if err != nil {
-		return err
-	}
-	config := resolved.AlertmanagerConfig()
+	config := alertmanagerConfig.AlertmanagerConfig()
 
+	var err error
 	// Load SigNoz's alertmanager notification templates from the configured
 	// globs. The upstream default templates (default.tmpl, email.tmpl) are
 	// always loaded from the embedded alertmanager assets inside FromGlobs, so
@@ -278,7 +275,7 @@ func (server *Server) SetConfig(ctx context.Context, alertmanagerConfig *alertma
 			server.logger.InfoContext(ctx, "skipping creation of receiver not referenced by any route", slog.String("receiver", rcv.Name))
 			continue
 		}
-		extendedRcv, err := resolved.GetReceiver(rcv.Name)
+		extendedRcv, err := alertmanagerConfig.GetReceiver(rcv.Name)
 		if err != nil {
 			return err
 		}
@@ -353,7 +350,7 @@ func (server *Server) SetConfig(ctx context.Context, alertmanagerConfig *alertma
 	go server.dispatcher.Run()
 	go server.inhibitor.Run()
 
-	server.alertmanagerConfig = resolved
+	server.alertmanagerConfig = alertmanagerConfig
 	return nil
 }
 

pkg/alertmanager/config.go

@@ -1,6 +1,7 @@
 package alertmanager
 
 import (
+	"net/url"
 	"strings"
 	"time"
 
@@ -25,6 +26,11 @@ type Signoz struct {
 	alertmanagerserver.Config `mapstructure:",squash" yaml:",squash"`
 }
 
+type Legacy struct {
+	// ApiURL is the URL of the legacy signoz alertmanager.
+	ApiURL *url.URL `mapstructure:"api_url"`
+}
+
 func NewConfigFactory() factory.ConfigFactory {
 	return factory.NewConfigFactory(factory.MustNewName("alertmanager"), newConfig)
 }

pkg/alertmanager/signozalertmanager/provider.go

@@ -167,10 +167,6 @@ func (provider *provider) UpdateChannelByReceiverAndID(ctx context.Context, orgI
 		return err
 	}
 
-	if err := config.SetGlobalConfig(provider.config.Signoz.Global); err != nil {
-		return err
-	}
-
 	if err := config.UpdateReceiver(receiver); err != nil {
 		return err
 	}
@@ -221,10 +217,6 @@ func (provider *provider) CreateChannel(ctx context.Context, orgID string, recei
 		return nil, err
 	}
 
-	if err := config.SetGlobalConfig(provider.config.Signoz.Global); err != nil {
-		return nil, err
-	}
-
 	if err := config.CreateReceiver(receiver); err != nil {
 		return nil, err
 	}

pkg/flagger/flaggertest/flaggertest.go

@@ -29,18 +29,13 @@ func New(t *testing.T) flagger.Flagger {
 
 // WithUseJSONBody returns a Flagger with use_json_body set to the given value.
 func WithUseJSONBody(t *testing.T, enabled bool) flagger.Flagger {
-	return WithBooleanFlags(t, map[string]bool{
-		flagger.FeatureUseJSONBody.String(): enabled,
-	})
-}
-
-// WithBooleanFlags returns a Flagger with the given boolean flags, keyed by feature name.
-func WithBooleanFlags(t *testing.T, flags map[string]bool) flagger.Flagger {
 	t.Helper()
 	registry := flagger.MustNewRegistry()
 	cfg := flagger.Config{}
-	if len(flags) > 0 {
-		cfg.Config.Boolean = flags
+	if enabled {
+		cfg.Config.Boolean = map[string]bool{
+			flagger.FeatureUseJSONBody.String(): true,
+		}
 	}
 	fl, err := flagger.New(
 		context.Background(),

pkg/modules/cloudintegration/implcloudintegration/definitionstore_test.go

@@ -1,40 +0,0 @@
-package implcloudintegration
-
-import (
-	"context"
-	"testing"
-
-	citypes "github.com/SigNoz/signoz/pkg/types/cloudintegrationtypes"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestServiceDefinitionsAreValid(t *testing.T) {
-	store := NewServiceDefinitionStore()
-
-	for _, provider := range []citypes.CloudProviderType{
-		citypes.CloudProviderTypeAWS,
-		citypes.CloudProviderTypeAzure,
-		citypes.CloudProviderTypeGCP,
-	} {
-		t.Run(provider.StringValue(), func(t *testing.T) {
-			defs, err := store.List(context.Background(), provider)
-			require.NoError(t, err, "all embedded definitions must load and validate")
-			require.NotEmpty(t, defs, "provider should ship at least one service definition")
-
-			for _, def := range defs {
-				assert.NotEmpty(t, def.ID, "service definition must have an id")
-				assert.NotEmpty(t, def.Title, "service %q must have a title", def.ID)
-
-				// Get() must agree with List() for every service it advertises.
-				serviceID, err := citypes.NewServiceID(provider, def.ID)
-				if !assert.NoError(t, err, "service id %q must be registered in serviceid.go", def.ID) {
-					continue
-				}
-				got, err := store.Get(context.Background(), provider, serviceID)
-				require.NoError(t, err, "service %q listed but not gettable", def.ID)
-				assert.Equal(t, def.ID, got.ID)
-			}
-		})
-	}
-}

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/cloudsql_postgres/assets/dashboards/overview.json

@@ -621,7 +621,7 @@
                       {
                         "metricName": "cloudsql.googleapis.com/database/postgresql/deadlock_count",
                         "temporality": "",
-                        "timeAggregation": "rate",
+                        "timeAggregation": "max",
                         "spaceAggregation": "sum",
                         "reduceTo": "avg"
                       }
@@ -882,7 +882,7 @@
                       {
                         "metricName": "cloudsql.googleapis.com/database/postgresql/transaction_count",
                         "temporality": "",
-                        "timeAggregation": "rate",
+                        "timeAggregation": "max",
                         "spaceAggregation": "sum",
                         "reduceTo": "avg"
                       }

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/cloudsql_postgres/integration.json

@@ -54,13 +54,13 @@
       {
         "name": "cloudsql.googleapis.com/database/postgresql/transaction_count",
         "unit": "Count",
-        "type": "Sum",
+        "type": "Gauge",
         "description": ""
       },
       {
         "name": "cloudsql.googleapis.com/database/postgresql/deadlock_count",
         "unit": "Count",
-        "type": "Sum",
+        "type": "Gauge",
         "description": ""
       },
       {

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/computeengine/assets/dashboards/overview.json

@@ -925,7 +925,7 @@
                         "metricName": "compute.googleapis.com/instance/disk/average_io_latency",
                         "temporality": "",
                         "timeAggregation": "avg",
-                        "spaceAggregation": "max",
+                        "spaceAggregation": "sum",
                         "reduceTo": "avg"
                       }
                     ],

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/gke/assets/dashboards/overview.json

@@ -1207,8 +1207,8 @@
                       {
                         "metricName": "kubernetes.io/container/restart_count",
                         "temporality": "",
-                        "timeAggregation": "increase",
-                        "spaceAggregation": "sum",
+                        "timeAggregation": "max",
+                        "spaceAggregation": "max",
                         "reduceTo": "avg"
                       }
                     ],

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/memorystore_redis/assets/dashboards/overview.json

@@ -601,8 +601,8 @@
                       {
                         "metricName": "redis.googleapis.com/stats/cache_hit_ratio",
                         "temporality": "",
-                        "timeAggregation": "min",
-                        "spaceAggregation": "min",
+                        "timeAggregation": "max",
+                        "spaceAggregation": "sum",
                         "reduceTo": "avg"
                       }
                     ],
@@ -788,7 +788,7 @@
                         "metricName": "redis.googleapis.com/commands/usec_per_call",
                         "temporality": "",
                         "timeAggregation": "max",
-                        "spaceAggregation": "max",
+                        "spaceAggregation": "sum",
                         "reduceTo": "avg"
                       }
                     ],
@@ -945,7 +945,7 @@
                       {
                         "metricName": "redis.googleapis.com/commands/calls",
                         "temporality": "",
-                        "timeAggregation": "rate",
+                        "timeAggregation": "max",
                         "spaceAggregation": "sum",
                         "reduceTo": "avg"
                       }
@@ -1044,8 +1044,8 @@
                       {
                         "metricName": "redis.googleapis.com/stats/reject_connections_count",
                         "temporality": "",
-                        "timeAggregation": "rate",
-                        "spaceAggregation": "sum",
+                        "timeAggregation": "avg",
+                        "spaceAggregation": "avg",
                         "reduceTo": "avg"
                       }
                     ],
@@ -1213,4 +1213,4 @@
     "refreshInterval": "",
     "links": []
   }
-}
+}

pkg/modules/rulestatehistory/implrulestatehistory/condition_builder.go

@@ -35,7 +35,7 @@ func (c *conditionBuilder) ConditionFor(
 	sb *sqlbuilder.SelectBuilder,
 ) ([]string, []string, error) {
 
-	// has/hasAny/hasAll/hasToken/search are logs-only functions; reject for rule state history.
+	// has/hasAny/hasAll/hasToken are logs-body-only; reject for rule state history.
 	if err := querybuilder.NewFunctionUnsupportedError(operator); err != nil {
 		return nil, nil, err
 	}

pkg/parser/filterquery/grammar/filterquery_parser.go

@@ -137,8 +137,8 @@ func filterqueryParserInit() {
 		0, 0, 191, 19, 1, 0, 0, 0, 192, 190, 1, 0, 0, 0, 193, 194, 7, 2, 0, 0,
 		194, 21, 1, 0, 0, 0, 195, 196, 7, 3, 0, 0, 196, 197, 5, 1, 0, 0, 197, 198,
 		3, 26, 13, 0, 198, 199, 5, 2, 0, 0, 199, 23, 1, 0, 0, 0, 200, 201, 5, 27,
-		0, 0, 201, 202, 5, 1, 0, 0, 202, 203, 3, 18, 9, 0, 203, 204, 5, 2, 0, 0,
-		204, 25, 1, 0, 0, 0, 205, 210, 3, 28, 14, 0, 206, 207, 5, 5, 0, 0, 207,
+		0, 0, 201, 202, 5, 1, 0, 0, 202, 203, 3, 26, 13, 0, 203, 204, 5, 2, 0,
+		0, 204, 25, 1, 0, 0, 0, 205, 210, 3, 28, 14, 0, 206, 207, 5, 5, 0, 0, 207,
 		209, 3, 28, 14, 0, 208, 206, 1, 0, 0, 0, 209, 212, 1, 0, 0, 0, 210, 208,
 		1, 0, 0, 0, 210, 211, 1, 0, 0, 0, 211, 27, 1, 0, 0, 0, 212, 210, 1, 0,
 		0, 0, 213, 217, 3, 34, 17, 0, 214, 217, 3, 32, 16, 0, 215, 217, 3, 30,
@@ -2945,7 +2945,7 @@ type ISearchCallContext interface {
 	// Getter signatures
 	SEARCH() antlr.TerminalNode
 	LPAREN() antlr.TerminalNode
-	ValueList() IValueListContext
+	FunctionParamList() IFunctionParamListContext
 	RPAREN() antlr.TerminalNode
 
 	// IsSearchCallContext differentiates from other interfaces.
@@ -2992,10 +2992,10 @@ func (s *SearchCallContext) LPAREN() antlr.TerminalNode {
 	return s.GetToken(FilterQueryParserLPAREN, 0)
 }
 
-func (s *SearchCallContext) ValueList() IValueListContext {
+func (s *SearchCallContext) FunctionParamList() IFunctionParamListContext {
 	var t antlr.RuleContext
 	for _, ctx := range s.GetChildren() {
-		if _, ok := ctx.(IValueListContext); ok {
+		if _, ok := ctx.(IFunctionParamListContext); ok {
 			t = ctx.(antlr.RuleContext)
 			break
 		}
@@ -3005,7 +3005,7 @@ func (s *SearchCallContext) ValueList() IValueListContext {
 		return nil
 	}
 
-	return t.(IValueListContext)
+	return t.(IFunctionParamListContext)
 }
 
 func (s *SearchCallContext) RPAREN() antlr.TerminalNode {
@@ -3064,7 +3064,7 @@ func (p *FilterQueryParser) SearchCall() (localctx ISearchCallContext) {
 	}
 	{
 		p.SetState(202)
-		p.ValueList()
+		p.FunctionParamList()
 	}
 	{
 		p.SetState(203)

pkg/prometheus/clickhouseprometheusv2/classification_golden_test.go

@@ -0,0 +1,119 @@
+package clickhouseprometheusv2
+
+import (
+	"encoding/json"
+	"flag"
+	"os"
+	"path/filepath"
+	"sort"
+	"testing"
+
+	"github.com/prometheus/prometheus/promql/parser"
+	"github.com/stretchr/testify/require"
+)
+
+var updateGolden = flag.Bool("update", false, "rewrite the classification golden file")
+
+const goldenFile = "testdata/classification_golden.json"
+
+// corpusFile is the conformance corpus the integration suite replays; the
+// golden freezes how the classifier routes every one of its expressions.
+const corpusFile = "../../../tests/integration/testdata/promqltestcorpus/corpus.json"
+
+type goldenEntry struct {
+	Expr    string `json:"expr"`
+	StartMs int64  `json:"start_ms"`
+	EndMs   int64  `json:"end_ms"`
+	StepMs  int64  `json:"step_ms"`
+	// Plan is the routing decision: "full" (whole query in ClickHouse),
+	// "hybrid" (units substituted, engine on top), "fallback" (engine over
+	// the native querier).
+	Plan string `json:"plan"`
+	// Units is the substituted-unit count for hybrid plans.
+	Units int `json:"units,omitempty"`
+	// Reason is the coarse fallback bucket (fallbackShape).
+	Reason string `json:"reason,omitempty"`
+}
+
+// TestClassificationGolden freezes the classifier's routing decision for
+// every (expression, grid) of the conformance corpus. Routing is a
+// correctness surface of its own: a change that silently sends rate() to the
+// engine path costs the pushdown, and one that silently starts transpiling a
+// shape never proven equivalent risks wrong numbers — both must show up in
+// review as a diff of this file, with the corpus suite's clickhousev2 leg
+// judging whether the new routing still returns the reference answers.
+//
+// Regenerate after intentional classifier changes:
+//
+//	go test ./pkg/prometheus/clickhouseprometheusv2 -run TestClassificationGolden -update
+func TestClassificationGolden(t *testing.T) {
+	raw, err := os.ReadFile(corpusFile)
+	require.NoError(t, err)
+
+	var corpus struct {
+		Cases []struct {
+			Expr    string `json:"expr"`
+			StartMs int64  `json:"start_ms"`
+			EndMs   int64  `json:"end_ms"`
+			StepMs  int64  `json:"step_ms"`
+		} `json:"cases"`
+	}
+	require.NoError(t, json.Unmarshal(raw, &corpus))
+	require.NotEmpty(t, corpus.Cases)
+
+	promParser := parser.NewParser(parser.Options{})
+	seen := map[goldenEntry]bool{}
+	var entries []goldenEntry
+	for _, c := range corpus.Cases {
+		key := goldenEntry{Expr: c.Expr, StartMs: c.StartMs, EndMs: c.EndMs, StepMs: c.StepMs}
+		if seen[key] {
+			continue
+		}
+		seen[key] = true
+
+		expr, err := promParser.ParseExpr(c.Expr)
+		require.NoError(t, err, "corpus expression must parse: %q", c.Expr)
+
+		entry := key
+		plan, ok := classify(expr, gridContext{startMs: c.StartMs, endMs: c.EndMs, stepMs: c.StepMs})
+		switch {
+		case ok && plan.full:
+			entry.Plan = "full"
+		case ok:
+			entry.Plan = "hybrid"
+			entry.Units = len(plan.units)
+		default:
+			entry.Plan = "fallback"
+			entry.Reason = fallbackShape(expr)
+		}
+		entries = append(entries, entry)
+	}
+	sort.Slice(entries, func(i, j int) bool {
+		a, b := entries[i], entries[j]
+		if a.Expr != b.Expr {
+			return a.Expr < b.Expr
+		}
+		if a.StartMs != b.StartMs {
+			return a.StartMs < b.StartMs
+		}
+		if a.EndMs != b.EndMs {
+			return a.EndMs < b.EndMs
+		}
+		return a.StepMs < b.StepMs
+	})
+
+	got, err := json.MarshalIndent(entries, "", "  ")
+	require.NoError(t, err)
+	got = append(got, '\n')
+
+	if *updateGolden {
+		require.NoError(t, os.MkdirAll(filepath.Dir(goldenFile), 0o755))
+		require.NoError(t, os.WriteFile(goldenFile, got, 0o644))
+		return
+	}
+
+	want, err := os.ReadFile(goldenFile)
+	require.NoError(t, err, "golden missing — generate it with -update")
+	require.Equal(t, string(want), string(got),
+		"classification routing changed; if intentional, regenerate with -update and justify the diff in review")
+}

pkg/prometheus/clickhouseprometheusv2/provider.go

@@ -2,27 +2,33 @@ package clickhouseprometheusv2
 
 import (
 	"context"
+	"time"
 
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/prometheus"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
+	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/storage"
 )
 
-// provider ties the package together: its own engine and parser, and the
-// ClickHouse client behind the native storage.Querier. It stays unexported:
-// callers hold the prometheus.Prometheus interface, which is the boundary
-// between the two provider implementations.
+// provider ties the package together: its own engine and parser, the
+// ClickHouse client behind the native storage.Querier, and the transpiler
+// executor. It stays unexported: callers hold the prometheus.Prometheus
+// interface, which is the boundary between the two provider implementations,
+// and reach the transpiler only through the prometheus.RangeExecutor
+// capability.
 type provider struct {
 	settings factory.ScopedProviderSettings
 	engine   *prometheus.Engine
 	parser   prometheus.Parser
 	client   *client
+	executor *executor
 }
 
 var (
 	_ prometheus.Prometheus        = (*provider)(nil)
 	_ prometheus.StatementCapturer = (*provider)(nil)
+	_ prometheus.RangeExecutor     = (*provider)(nil)
 )
 
 func NewFactory(telemetryStore telemetrystore.TelemetryStore) factory.ProviderFactory[prometheus.Prometheus, prometheus.Config] {
@@ -43,9 +49,17 @@ func New(_ context.Context, providerSettings factory.ProviderSettings, config pr
 		engine:   engine,
 		parser:   parser,
 		client:   client,
+		executor: &executor{client: client, engine: engine, parser: parser},
 	}, nil
 }
 
+// TryExecuteRange evaluates transpilable query shapes directly in ClickHouse
+// (see transpiler.go). ok=false means the shape is not transpilable and the
+// caller should evaluate through Engine over Storage instead.
+func (p *provider) TryExecuteRange(ctx context.Context, query string, start, end time.Time, step time.Duration) (promql.Matrix, bool, error) {
+	return p.executor.TryExecuteRange(ctx, query, start, end, step)
+}
+
 func (p *provider) Engine() *prometheus.Engine {
 	return p.engine
 }

pkg/prometheus/clickhouseprometheusv2/transpiler.go

@@ -0,0 +1,492 @@
+package clickhouseprometheusv2
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/prometheus/prometheus/model/labels"
+	"github.com/prometheus/prometheus/promql/parser"
+)
+
+// The compiler turns PromQL subtrees into single ClickHouse queries built on
+// the timeSeries*ToGrid aggregate functions (CH >= 25.6), whose semantics
+// were verified against this repo's vendored engine: exact extrapolatedRate
+// behavior including counter resets, the counter zero-point clamp, the
+// 1.1x-average extrapolation threshold, left-open windows, the >= 2 samples
+// rule, stale-marker shadowing, and millisecond grid starts. Sample rows
+// never leave ClickHouse: one row per output series comes back, holding the
+// whole grid as an array.
+//
+// Scope (the allowlist): an optional sum/min/max/avg/count by/without
+// aggregation over a core unit — a rate/increase/delta/irate/idelta range
+// selection, an instant vector selection, or an avg/min/max/sum/count/last
+// _over_time window — plus number-literal arithmetic/comparisons and unary
+// minus on top. Units inside fixed-resolution subqueries evaluate on the
+// subquery's own grid. Everything else either falls back to the engine over
+// this package's querier, or — when a transpilable subtree sits under a
+// non-transpilable node — runs hybrid: the subtree's grids are computed in
+// ClickHouse and substituted into the engine as synthetic series (see
+// compiler_exec.go). See doc.go for the fallback list and the reasons behind
+// each entry.
+
+// rangeFn is a transpilable range-vector function.
+type rangeFn string
+
+const (
+	fnRate     rangeFn = "rate"
+	fnIncrease rangeFn = "increase"
+	fnDelta    rangeFn = "delta"
+	fnIRate    rangeFn = "irate"
+	fnIDelta   rangeFn = "idelta"
+)
+
+var gridFunction = map[rangeFn]string{
+	fnRate:     "timeSeriesRateToGrid",
+	fnIncrease: "timeSeriesRateToGrid", // increase == rate * range seconds, exactly (same factor algebra)
+	fnDelta:    "timeSeriesDeltaToGrid",
+	fnIRate:    "timeSeriesInstantRateToGrid",
+	fnIDelta:   "timeSeriesInstantDeltaToGrid",
+}
+
+// scalarOp is one number-literal arithmetic or comparison applied to a
+// compiled vector, evaluated in Go during assembly with the same float64
+// operations the engine uses.
+type scalarOp struct {
+	op           parser.ItemType
+	scalar       float64
+	scalarOnLeft bool
+	returnBool   bool
+}
+
+// isComparison reports whether the op is a filtering/bool comparison, which
+// preserves the metric name (arithmetic drops it).
+func (o scalarOp) isComparison() bool {
+	return o.op.IsComparisonOperator()
+}
+
+// unitKind is the selector shape at the bottom of a core unit.
+type unitKind int
+
+const (
+	// unitRange: rate/increase/delta/irate/idelta over a matrix selector.
+	unitRange unitKind = iota
+	// unitInstant: a plain vector selector resolved per grid point with
+	// lookback and stale-marker shadowing.
+	unitInstant
+	// unitOverTime: avg/min/max/sum/count/last_over_time over a matrix
+	// selector (aggregation over the window's samples, stale rows excluded).
+	unitOverTime
+)
+
+// coreUnit is one transpilable subtree: selector [-> range function] ->
+// optional aggregation -> scalar op pipeline.
+type coreUnit struct {
+	kind     unitKind
+	matchers []*labels.Matcher
+	offsetMs int64
+	fn       rangeFn // unitRange
+	overFn   string  // unitOverTime: avg|min|max|sum|count|last
+	rangeMs  int64   // unitRange/unitOverTime window
+
+	hasAgg   bool
+	aggOp    parser.ItemType // SUM MIN MAX AVG COUNT
+	by       bool
+	grouping []string
+
+	ops []scalarOp
+}
+
+// keepsName reports whether the unit's output series keep their real
+// __name__: bare/comparison-filtered instant selectors and last_over_time do
+// (it returns the raw sample, name included); range functions, the other
+// *_over_time functions, aggregations, arithmetic and bool comparisons all
+// drop it — a bool comparison returns 0/1, not the sample, so the engine
+// drops the name there too. Units that keep the name cannot be substituted
+// as synthetic series in hybrid plans — the synthetic name would replace
+// the real one — but transpile fine as full plans, where assembly emits the
+// real names.
+func (u *coreUnit) keepsName() bool {
+	nameKeepingSelector := u.kind == unitInstant || (u.kind == unitOverTime && u.overFn == "last")
+	if !nameKeepingSelector || u.hasAgg {
+		return false
+	}
+	for _, op := range u.ops {
+		if !op.isComparison() || op.returnBool {
+			return false
+		}
+	}
+	return true
+}
+
+// gridContext is the evaluation grid a unit computes on. The query grid for
+// top-level units; for units inside subqueries, the subquery's own grid:
+// epoch-aligned multiples of its resolution covering the subquery window,
+// exactly as the engine derives it (engine.go, *parser.SubqueryExpr case).
+type gridContext struct {
+	startMs int64
+	endMs   int64
+	stepMs  int64
+}
+
+// subqueryGrid derives the inner grid for a subquery evaluated on outer:
+// interval S, end = outer end − offset, start = first multiple of S strictly
+// greater than outer start − offset − range.
+func subqueryGrid(outer gridContext, rangeMs, stepMs, offsetMs int64) gridContext {
+	lower := outer.startMs - offsetMs - rangeMs
+	start := stepMs * (lower / stepMs)
+	if start <= lower {
+		start += stepMs
+	}
+	return gridContext{startMs: start, endMs: outer.endMs - offsetMs, stepMs: stepMs}
+}
+
+// transpiledUnit is a coreUnit scheduled for execution, named for hybrid
+// substitution, carrying the grid it evaluates on.
+type transpiledUnit struct {
+	core coreUnit
+	name string // __signoz_transpiled_<n>__
+	grid gridContext
+}
+
+// transpilePlan is the outcome of classifying a query.
+type transpilePlan struct {
+	units []*transpiledUnit
+	grid  gridContext // the query's top-level grid
+	// full is set when the entire query is units[0]; otherwise rewritten
+	// holds the query with each unit replaced by a synthetic selector, to be
+	// evaluated by the engine over a hybrid storage.
+	full      bool
+	rewritten string
+}
+
+const syntheticNamePrefix = "__signoz_transpiled_"
+
+func syntheticName(i int) string {
+	return fmt.Sprintf("%s%d__", syntheticNamePrefix, i)
+}
+
+// classifyCore matches a subtree against the transpilable core shape.
+// stepMs gates second-granularity: the grid functions take whole-second step
+// and window parameters (grid *starts* are millisecond-precise).
+func classifyCore(node parser.Expr, stepMs int64) (*coreUnit, bool) {
+	unit := &coreUnit{}
+
+	expr := node
+	// Peel scalar ops and parens off the top, outermost first; ops apply in
+	// evaluation order, so prepend while peeling.
+	for {
+		switch n := expr.(type) {
+		case *parser.ParenExpr:
+			expr = n.Expr
+			continue
+		case *parser.UnaryExpr:
+			if n.Op != parser.SUB {
+				expr = n.Expr // unary '+' is a no-op
+				continue
+			}
+			// -x == -1 * x for every float64 (incl. NaN and signed zero).
+			unit.ops = append([]scalarOp{{op: parser.MUL, scalar: -1}}, unit.ops...)
+			expr = n.Expr
+			continue
+		case *parser.StepInvariantExpr:
+			// @-pinned expressions evaluate on a different grid.
+			return nil, false
+		case *parser.BinaryExpr:
+			lit, litOnLeft, ok := numberLiteralSide(n)
+			if !ok {
+				return nil, false
+			}
+			if !n.Op.IsOperator() && !n.Op.IsComparisonOperator() {
+				return nil, false
+			}
+			if n.Op == parser.ATAN2 {
+				// atan2 is arithmetic in PromQL but rarely used; keep the
+				// allowlist tight.
+				return nil, false
+			}
+			returnBool := n.ReturnBool
+			unit.ops = append([]scalarOp{{op: n.Op, scalar: lit, scalarOnLeft: litOnLeft, returnBool: returnBool}}, unit.ops...)
+			if litOnLeft {
+				expr = n.RHS
+			} else {
+				expr = n.LHS
+			}
+			continue
+		}
+		break
+	}
+
+	// Optional aggregation.
+	if agg, ok := expr.(*parser.AggregateExpr); ok {
+		switch agg.Op {
+		case parser.SUM, parser.MIN, parser.MAX, parser.AVG, parser.COUNT:
+		default:
+			return nil, false
+		}
+		for _, g := range agg.Grouping {
+			if g == metricNameLabel {
+				// by(__name__)/without(__name__) over synthetic or compiled
+				// output needs name bookkeeping the compiler doesn't do.
+				return nil, false
+			}
+		}
+		unit.hasAgg = true
+		unit.aggOp = agg.Op
+		unit.by = !agg.Without
+		unit.grouping = agg.Grouping
+		expr = agg.Expr
+		for {
+			if p, ok := expr.(*parser.ParenExpr); ok {
+				expr = p.Expr
+				continue
+			}
+			break
+		}
+	}
+
+	// The grid functions take whole-second steps; stepMs == 0 is an instant
+	// query (single-point grid).
+	if stepMs < 0 || stepMs%1000 != 0 {
+		return nil, false
+	}
+
+	// Bare instant selector: resolved per grid point with lookback and
+	// stale-marker shadowing (see compiler_sql.go).
+	if vs, ok := expr.(*parser.VectorSelector); ok {
+		// A duration expression (offset step(), offset range()*2, ...) is
+		// resolved into OriginalOffset only at evaluation time; at
+		// classification time the field still holds its zero value, so
+		// transpiling would silently use the wrong offset.
+		if vs.Timestamp != nil || vs.StartOrEnd != 0 || vs.Anchored || vs.Smoothed || vs.OriginalOffsetExpr != nil {
+			return nil, false
+		}
+		offsetMs := vs.OriginalOffset.Milliseconds()
+		if offsetMs < 0 {
+			return nil, false
+		}
+		unit.kind = unitInstant
+		unit.offsetMs = offsetMs
+		unit.matchers = vs.LabelMatchers
+		return unit, true
+	}
+
+	// Range or *_over_time function over a plain matrix selector.
+	call, ok := expr.(*parser.Call)
+	if !ok {
+		return nil, false
+	}
+	var fn rangeFn
+	var overFn string
+	switch call.Func.Name {
+	case "rate":
+		fn = fnRate
+	case "increase":
+		fn = fnIncrease
+	case "delta":
+		fn = fnDelta
+	case "irate":
+		fn = fnIRate
+	case "idelta":
+		fn = fnIDelta
+	case "avg_over_time", "min_over_time", "max_over_time", "sum_over_time", "count_over_time", "last_over_time":
+		overFn = strings.TrimSuffix(call.Func.Name, "_over_time")
+	default:
+		return nil, false
+	}
+	if len(call.Args) != 1 {
+		return nil, false
+	}
+	ms, ok := call.Args[0].(*parser.MatrixSelector)
+	if !ok {
+		return nil, false
+	}
+	vs, ok := ms.VectorSelector.(*parser.VectorSelector)
+	if !ok {
+		return nil, false
+	}
+	// Duration expressions resolve at evaluation time (see the instant
+	// selector case above); Range/OriginalOffset would be read as zero here.
+	if vs.Timestamp != nil || vs.StartOrEnd != 0 || vs.Anchored || vs.Smoothed || vs.OriginalOffsetExpr != nil || ms.RangeExpr != nil {
+		return nil, false
+	}
+
+	rangeMs := ms.Range.Milliseconds()
+	offsetMs := vs.OriginalOffset.Milliseconds()
+	if rangeMs <= 0 || rangeMs%1000 != 0 || offsetMs < 0 {
+		return nil, false
+	}
+
+	if overFn != "" {
+		unit.kind = unitOverTime
+		unit.overFn = overFn
+	} else {
+		unit.kind = unitRange
+		unit.fn = fn
+	}
+	unit.rangeMs = rangeMs
+	unit.offsetMs = offsetMs
+	unit.matchers = vs.LabelMatchers
+	return unit, true
+}
+
+// numberLiteralSide returns the number literal on one side of a binary
+// expression (peeling parens and unary minus), and which side it is on.
+func numberLiteralSide(b *parser.BinaryExpr) (float64, bool, bool) {
+	if v, ok := literalValue(b.LHS); ok {
+		return v, true, true
+	}
+	if v, ok := literalValue(b.RHS); ok {
+		return v, false, true
+	}
+	return 0, false, false
+}
+
+func literalValue(e parser.Expr) (float64, bool) {
+	neg := false
+	for {
+		switch n := e.(type) {
+		case *parser.ParenExpr:
+			e = n.Expr
+			continue
+		case *parser.StepInvariantExpr:
+			e = n.Expr
+			continue
+		case *parser.UnaryExpr:
+			if n.Op == parser.SUB {
+				neg = !neg
+			}
+			e = n.Expr
+			continue
+		case *parser.NumberLiteral:
+			if neg {
+				return -n.Val, true
+			}
+			return n.Val, true
+		default:
+			return 0, false
+		}
+	}
+}
+
+// classify builds the compile plan for a query: full when the root is a core
+// unit, hybrid when core units sit strictly below the root (including inside
+// fixed-resolution subqueries, computed on the subquery grid), none
+// otherwise.
+func classify(root parser.Expr, grid gridContext) (*transpilePlan, bool) {
+	if unit, ok := classifyCore(root, grid.stepMs); ok {
+		return &transpilePlan{
+			units: []*transpiledUnit{{core: *unit, name: syntheticName(0), grid: grid}},
+			grid:  grid,
+			full:  true,
+		}, true
+	}
+
+	plan := &transpilePlan{grid: grid}
+	rewritten := rewrite(root, grid, plan, false)
+	if len(plan.units) == 0 {
+		return nil, false
+	}
+	plan.rewritten = rewritten.String()
+	return plan, true
+}
+
+// rewrite walks top-down replacing maximal transpilable subtrees with synthetic
+// vector selectors. nameSensitive marks scopes where an ancestor's semantics
+// depend on __name__ (grouping or vector matching on it): synthetic series
+// carry a synthetic __name__, so substitution there would change results.
+// Fixed-resolution subqueries recurse with the subquery's own grid; scopes
+// whose evaluation grid is unknowable (@-pinned, default-resolution
+// subqueries) are not entered.
+func rewrite(node parser.Expr, grid gridContext, plan *transpilePlan, nameSensitive bool) parser.Expr {
+	if node == nil {
+		return nil
+	}
+
+	if !nameSensitive {
+		// Units whose output keeps the real __name__ (bare instant selectors)
+		// cannot be substituted: the synthetic name would replace it in the
+		// engine's output. They still compile as full plans.
+		if unit, ok := classifyCore(node, grid.stepMs); ok && !unit.keepsName() {
+			cu := &transpiledUnit{core: *unit, name: syntheticName(len(plan.units)), grid: grid}
+			plan.units = append(plan.units, cu)
+			return &parser.VectorSelector{
+				Name: cu.name,
+				LabelMatchers: []*labels.Matcher{
+					labels.MustNewMatcher(labels.MatchEqual, metricNameLabel, cu.name),
+				},
+				PosRange: node.PositionRange(),
+			}
+		}
+	}
+
+	switch n := node.(type) {
+	case *parser.ParenExpr:
+		n.Expr = rewrite(n.Expr, grid, plan, nameSensitive)
+	case *parser.UnaryExpr:
+		n.Expr = rewrite(n.Expr, grid, plan, nameSensitive)
+	case *parser.AggregateExpr:
+		sensitive := nameSensitive || groupingUsesName(n.Grouping)
+		n.Expr = rewrite(n.Expr, grid, plan, sensitive)
+		// n.Param is a scalar/string; nothing transpilable inside for our core.
+	case *parser.Call:
+		for i, arg := range n.Args {
+			n.Args[i] = rewrite(arg, grid, plan, nameSensitive)
+		}
+	case *parser.BinaryExpr:
+		sensitive := nameSensitive || vectorMatchingUsesName(n.VectorMatching)
+		n.LHS = rewrite(n.LHS, grid, plan, sensitive)
+		n.RHS = rewrite(n.RHS, grid, plan, sensitive)
+	case *parser.SubqueryExpr:
+		// The alert-smoothing idiom fn_over_time((expr)[R:S]) dominates real
+		// rule fleets; inner units evaluate on the subquery grid, and the
+		// engine does the smoothing over the synthetic series. Requires an
+		// explicit whole-second resolution (S == 0 needs the engine's
+		// default-interval function) and no @ pinning.
+		stepMs := n.Step.Milliseconds()
+		rangeMs := n.Range.Milliseconds()
+		offsetMs := n.OriginalOffset.Milliseconds()
+		if n.Timestamp == nil && n.StartOrEnd == 0 &&
+			n.RangeExpr == nil && n.StepExpr == nil && n.OriginalOffsetExpr == nil &&
+			stepMs > 0 && stepMs%1000 == 0 && rangeMs%1000 == 0 && offsetMs >= 0 {
+			inner := subqueryGrid(grid, rangeMs, stepMs, offsetMs)
+			n.Expr = rewrite(n.Expr, inner, plan, nameSensitive)
+		}
+	case *parser.StepInvariantExpr, *parser.MatrixSelector,
+		*parser.VectorSelector, *parser.NumberLiteral, *parser.StringLiteral:
+		// Leaves, or scopes substitution must not enter.
+	}
+	return node
+}
+
+func groupingUsesName(grouping []string) bool {
+	for _, g := range grouping {
+		if g == metricNameLabel {
+			return true
+		}
+	}
+	return false
+}
+
+func vectorMatchingUsesName(vm *parser.VectorMatching) bool {
+	if vm == nil {
+		return false
+	}
+	for _, l := range append(append([]string{}, vm.MatchingLabels...), vm.Include...) {
+		if l == metricNameLabel {
+			return true
+		}
+	}
+	// Default (all-labels) matching ignores __name__, and by()/ignoring()
+	// lists were checked above.
+	return false
+}
+
+// isSyntheticSelector reports whether matchers target a compiled unit.
+func isSyntheticSelector(matchers []*labels.Matcher) (string, bool) {
+	for _, m := range matchers {
+		if m.Name == metricNameLabel && m.Type == labels.MatchEqual && strings.HasPrefix(m.Value, syntheticNamePrefix) {
+			return m.Value, true
+		}
+	}
+	return "", false
+}

pkg/prometheus/clickhouseprometheusv2/transpiler_corpus_test.go

@@ -0,0 +1,161 @@
+package clickhouseprometheusv2
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"os"
+	"regexp"
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/prometheus/prometheus/promql/parser"
+	"github.com/stretchr/testify/require"
+)
+
+// TestClassifyCorpus measures real-workload compiler coverage: it classifies
+// every query of a JSON-lines corpus (one JSON-encoded PromQL string per
+// line) with the live classifier and reports full / hybrid / fallback
+// shares. Skipped unless PROMQL_CORPUS points to one or more files
+// (comma-separated). Dashboard template variables are substituted with
+// placeholder values before parsing, mirroring the production render step.
+//
+//	PROMQL_CORPUS=corpus-a.jsonl,corpus-b.jsonl go test -run TestClassifyCorpus -v
+func TestClassifyCorpus(t *testing.T) {
+	corpus := os.Getenv("PROMQL_CORPUS")
+	if corpus == "" {
+		t.Skip("PROMQL_CORPUS not set")
+	}
+
+	varRe := regexp.MustCompile(`\{\{\s*\.?[\w.]+\s*\}\}|\[\[\s*[\w.]+\s*\]\]|\$[\w.]+`)
+	promParser := parser.NewParser(parser.Options{})
+
+	for _, path := range strings.Split(corpus, ",") {
+		f, err := os.Open(path)
+		require.NoError(t, err)
+
+		var full, hybrid, fallbackInstant, fallbackOther, parseErrs int
+		fallbackReasons := map[string]int{}
+
+		scanner := bufio.NewScanner(f)
+		scanner.Buffer(make([]byte, 1024*1024), 1024*1024)
+		for scanner.Scan() {
+			var query string
+			require.NoError(t, json.Unmarshal(scanner.Bytes(), &query))
+			query = varRe.ReplaceAllString(query, "placeholder")
+
+			expr, err := promParser.ParseExpr(query)
+			if err != nil {
+				parseErrs++
+				continue
+			}
+
+			plan, ok := classify(expr, gridContext{startMs: 1_700_000_000_000, endMs: 1_700_007_200_000, stepMs: 60_000})
+			switch {
+			case ok && plan.full:
+				full++
+			case ok:
+				hybrid++
+			default:
+				reason := fallbackShape(expr)
+				fallbackReasons[reason]++
+				if reason == "instant-selector shape (last-sample-per-step engine path)" {
+					fallbackInstant++
+				} else {
+					fallbackOther++
+				}
+			}
+		}
+		require.NoError(t, scanner.Err())
+		_ = f.Close()
+
+		total := full + hybrid + fallbackInstant + fallbackOther
+		if total == 0 {
+			t.Logf("%s: no parseable queries (%d parse errors)", path, parseErrs)
+			continue
+		}
+		t.Logf("%s: %d queries — full=%d (%.0f%%) hybrid=%d (%.0f%%) fallback=%d (%.0f%%; instant-shape=%d) parse_errors=%d",
+			path, total,
+			full, 100*float64(full)/float64(total),
+			hybrid, 100*float64(hybrid)/float64(total),
+			fallbackInstant+fallbackOther, 100*float64(fallbackInstant+fallbackOther)/float64(total),
+			fallbackInstant, parseErrs)
+
+		reasons := make([]string, 0, len(fallbackReasons))
+		for r := range fallbackReasons {
+			reasons = append(reasons, r)
+		}
+		sort.Slice(reasons, func(i, j int) bool { return fallbackReasons[reasons[i]] > fallbackReasons[reasons[j]] })
+		for _, r := range reasons {
+			t.Logf("  fallback %4d  %s", fallbackReasons[r], r)
+		}
+	}
+}
+
+// fallbackShape buckets a non-transpilable query by why it stays on the engine
+// path, to separate "already served well" (instant selectors on the last-sample-per-step
+// path) from genuine compiler gaps.
+func fallbackShape(expr parser.Expr) string {
+	var hasMatrix, hasSubquery, hasAt, hasDurationExpr, overTime bool
+	rangeFns := map[string]bool{"rate": true, "increase": true, "delta": true, "irate": true, "idelta": true}
+	var unsupportedFns []string
+	parser.Inspect(expr, func(node parser.Node, _ []parser.Node) error {
+		switch n := node.(type) {
+		case *parser.MatrixSelector:
+			hasMatrix = true
+			if n.RangeExpr != nil {
+				hasDurationExpr = true
+			}
+		case *parser.SubqueryExpr:
+			hasSubquery = true
+			if n.RangeExpr != nil || n.StepExpr != nil || n.OriginalOffsetExpr != nil {
+				hasDurationExpr = true
+			}
+		case *parser.VectorSelector:
+			if n.Timestamp != nil || n.StartOrEnd != 0 {
+				hasAt = true
+			}
+			if n.OriginalOffsetExpr != nil {
+				hasDurationExpr = true
+			}
+		case *parser.Call:
+			if strings.HasSuffix(n.Func.Name, "_over_time") {
+				overTime = true
+			} else if !rangeFns[n.Func.Name] {
+				unsupportedFns = append(unsupportedFns, n.Func.Name)
+			}
+		}
+		return nil
+	})
+
+	switch {
+	case hasDurationExpr:
+		return "duration expression (resolved only at evaluation time)"
+	case hasSubquery:
+		return "subquery"
+	case hasAt:
+		return "@ modifier"
+	case overTime:
+		return "*_over_time range function"
+	case !hasMatrix:
+		return "instant-selector shape (last-sample-per-step engine path)"
+	case len(unsupportedFns) > 0:
+		return fmt.Sprintf("range shape with unsupported function(s): %s", strings.Join(dedupe(unsupportedFns), ",")) //nolint:makezero
+	default:
+		return "other range shape"
+	}
+}
+
+func dedupe(in []string) []string {
+	seen := map[string]bool{}
+	var out []string
+	for _, s := range in {
+		if !seen[s] {
+			seen[s] = true
+			out = append(out, s)
+		}
+	}
+	sort.Strings(out)
+	return out
+}

pkg/prometheus/clickhouseprometheusv2/transpiler_exec.go

@@ -0,0 +1,550 @@
+package clickhouseprometheusv2
+
+import (
+	"context"
+	"encoding/json"
+	"math"
+	"sort"
+	"time"
+
+	"github.com/SigNoz/signoz/pkg/errors"
+	"github.com/SigNoz/signoz/pkg/prometheus"
+	"github.com/prometheus/prometheus/model/labels"
+	promValue "github.com/prometheus/prometheus/model/value"
+	"github.com/prometheus/prometheus/promql"
+	"github.com/prometheus/prometheus/promql/parser"
+	"github.com/prometheus/prometheus/storage"
+	"golang.org/x/sync/errgroup"
+)
+
+// executor evaluates transpilable PromQL directly in ClickHouse, falling
+// back (ok=false) whenever the query shape or the step doesn't qualify. The
+// timeSeries*ToGrid functions it builds on are assumed available: the
+// supported ClickHouse floor is >= 25.6.
+type executor struct {
+	client *client
+	engine *prometheus.Engine
+	parser prometheus.Parser
+}
+
+// maxWindowBuckets caps range/step for the windowed *_over_time form: every
+// grid slot combines that many bucket partials, and the fleet's windows sit
+// well under it ([1m]..[17m] at 30-60s steps) — anything larger is a
+// long-range query whose step a dashboard scales up anyway, and the engine
+// path serves the rest.
+const maxWindowBuckets = 64
+
+// TryExecuteRange transpiles and runs the query in ClickHouse when its shape
+// is in the allowlist. ok=false means "not transpilable" and carries no
+// error; the caller runs the engine path.
+func (e *executor) TryExecuteRange(ctx context.Context, qs string, start, end time.Time, step time.Duration) (promql.Matrix, bool, error) {
+	expr, err := e.parser.ParseExpr(qs)
+	if err != nil {
+		// Let the engine path produce the (enhanced) parse error.
+		return nil, false, nil
+	}
+
+	plan, ok := classify(expr, queryGrid(start, end, step))
+	if !ok {
+		return nil, false, nil
+	}
+
+	// timeSeriesLastToGrid widens its window to max(window, step) — probed: a
+	// sample aged (window, step] still fills the slot — while the rate/delta
+	// family enforces the window strictly. The Last-style kinds used to fall
+	// back when window < step because of that widening; the window-sliver
+	// filter (see samplesConditions) makes the widening harmless there:
+	// samples exist only inside (t_k - window, t_k] slivers, so the widened
+	// window intersected with the data IS the lookback window — and if a
+	// future ClickHouse stops widening, the unwidened window is the sliver
+	// too. Correct either way. A non-positive window still falls back: the
+	// sliver argument needs a real window to filter to.
+	//
+	// The windowed *_over_time form gates only the range >= step regime: it
+	// decomposes the window into whole step buckets (see windowedInner),
+	// which is exact only when the range is a multiple of the step, and its
+	// per-slot slide costs range/step bucket combines — bounded by
+	// maxWindowBuckets so a long-range short-step query cannot turn the
+	// slide into the bottleneck. range < step needs neither gate: the
+	// windows are disjoint slivers, aggregated one slot each with no slide.
+	// Every miss falls back to the engine path, which is exact.
+	for _, unit := range plan.units {
+		stepMs := unit.grid.stepMs
+		if stepMs == 0 {
+			stepMs = 1000
+		}
+		switch {
+		case unit.core.kind == unitInstant || (unit.core.kind == unitOverTime && unit.core.overFn == "last"):
+			windowMs := unit.core.rangeMs
+			if unit.core.kind == unitInstant {
+				windowMs = e.client.lookbackMs
+			}
+			if windowMs <= 0 {
+				return nil, false, nil
+			}
+		case unit.core.kind == unitOverTime:
+			if unit.core.rangeMs < unit.grid.stepMs {
+				// Disjoint slivers: no divisibility or width requirement.
+				continue
+			}
+			if unit.core.rangeMs%stepMs != 0 || unit.core.rangeMs/stepMs > maxWindowBuckets {
+				return nil, false, nil
+			}
+		}
+	}
+
+	// Evaluate every unit concurrently on its own grid (the query grid, or a
+	// subquery grid); each is one series lookup plus one grid query.
+	results := make([][]transpiledSeries, len(plan.units))
+	eg, egCtx := errgroup.WithContext(ctx)
+	for i, unit := range plan.units {
+		eg.Go(func() error {
+			res, err := e.executeUnit(egCtx, &unit.core, unit.grid)
+			if err != nil {
+				return err
+			}
+			results[i] = res
+			return nil
+		})
+	}
+	if err := eg.Wait(); err != nil {
+		return nil, true, err
+	}
+
+	if plan.full {
+		g := plan.units[0].grid
+		return toMatrix(results[0], g.startMs, g.stepMs), true, nil
+	}
+
+	matrix, err := e.executeHybrid(ctx, plan, results)
+	if err != nil {
+		return nil, true, err
+	}
+	return matrix, true, nil
+}
+
+// queryGrid derives the top-level evaluation grid; step 0 is an instant
+// query: a single evaluation at end, whatever start was.
+func queryGrid(start, end time.Time, step time.Duration) gridContext {
+	startMs, endMs, stepMs := start.UnixMilli(), end.UnixMilli(), step.Milliseconds()
+	if stepMs == 0 {
+		startMs = endMs
+	}
+	return gridContext{startMs: startMs, endMs: endMs, stepMs: stepMs}
+}
+
+// transpiledSeries is one output series of a unit: projected labels and one
+// value pointer per grid point (nil = absent).
+type transpiledSeries struct {
+	lset   labels.Labels
+	values []*float64
+}
+
+// executeUnit runs one core unit on its grid: series lookup (budgets,
+// fingerprints, metric names), then the single grid query, then the
+// scalar-op pipeline.
+func (e *executor) executeUnit(ctx context.Context, unit *coreUnit, grid gridContext) ([]transpiledSeries, error) {
+	startMs, endMs, stepMs := grid.startMs, grid.endMs, grid.stepMs
+	windowMs := unit.rangeMs
+	if unit.kind == unitInstant {
+		windowMs = e.client.lookbackMs
+	}
+	dataStart := startMs - unit.offsetMs - windowMs
+	dataEnd := endMs - unit.offsetMs
+
+	seriesQuery, seriesArgs, err := buildSeriesQuery(dataStart, dataEnd, unit.matchers)
+	if err != nil {
+		return nil, err
+	}
+	lookup, err := e.client.selectSeries(ctx, seriesQuery, seriesArgs)
+	if err != nil {
+		return nil, err
+	}
+	if len(lookup.fingerprints) == 0 {
+		return nil, nil
+	}
+
+	query, args, err := buildUnitSQL(unit, lookup.metricNames, dataStart, dataEnd, startMs, endMs, stepMs, e.client.lookbackMs)
+	if err != nil {
+		return nil, err
+	}
+
+	rows, err := e.client.telemetryStore.ClickhouseDB().Query(e.client.withContext(ctx, "transpiledUnit"), query, args...)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	// Name-dropping units keep __name__ in the SQL group key so distinct
+	// metrics never merge server-side; the name comes off here. Two metrics
+	// can then share a labelset — the engine merges their samples into one
+	// series when they never overlap in time (a selector spanning metrics
+	// whose series alternate across lookback windows) and raises the
+	// duplicate-labelset error only when two samples land on the same
+	// evaluation timestamp. mergeSameLabelsetSeries reproduces exactly that.
+	stripName := !unit.hasAgg && !unit.keepsName()
+
+	// by (...) units return one plain column per grouped label; everything
+	// else returns the single canonical JSON key (see groupKeyColumns).
+	keyNames := groupKeyColumns(unit)
+	keyVals := make([]string, max(len(keyNames), 1))
+	targets := make([]any, 0, len(keyVals)+1)
+	for i := range keyVals {
+		targets = append(targets, &keyVals[i])
+	}
+	var gridValues []*float64
+	targets = append(targets, &gridValues)
+
+	var out []transpiledSeries
+	for rows.Next() {
+		if err := rows.Scan(targets...); err != nil {
+			return nil, err
+		}
+		var lset labels.Labels
+		if keyNames != nil {
+			builder := labels.NewScratchBuilder(len(keyNames))
+			for i, name := range keyNames {
+				// An empty extracted value is the label being absent.
+				if keyVals[i] != "" {
+					builder.Add(name, keyVals[i])
+				}
+			}
+			builder.Sort()
+			lset = builder.Labels()
+		} else {
+			lset, err = labelsFromGroupKey(keyVals[0])
+			if err != nil {
+				return nil, err
+			}
+		}
+		if stripName {
+			lset = labels.NewBuilder(lset).Del(metricNameLabel).Labels()
+		}
+		values := make([]*float64, len(gridValues))
+		copy(values, gridValues)
+		applyScalarOps(unit.ops, values)
+		out = append(out, transpiledSeries{lset: lset, values: values})
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+
+	if stripName {
+		if out, err = mergeSameLabelsetSeries(out); err != nil {
+			return nil, err
+		}
+	}
+	sort.Slice(out, func(i, j int) bool { return labels.Compare(out[i].lset, out[j].lset) < 0 })
+	return out, nil
+}
+
+// mergeSameLabelsetSeries combines series left with identical labelsets by a
+// name strip, slot by slot: the engine assembles its result matrix by
+// labelset, so post-strip twins whose points interleave in time are one
+// series to it, and two values on the same evaluation timestamp are its
+// duplicate-labelset error — v1 would have errored there too, so silently
+// picking one value would be a divergence.
+func mergeSameLabelsetSeries(in []transpiledSeries) ([]transpiledSeries, error) {
+	index := make(map[uint64]int, len(in))
+	out := in[:0]
+	for _, s := range in {
+		hash := s.lset.Hash()
+		idx, ok := index[hash]
+		if ok && labels.Equal(out[idx].lset, s.lset) {
+			dst := out[idx].values
+			for k, v := range s.values {
+				if v == nil {
+					continue
+				}
+				if dst[k] != nil {
+					return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "vector cannot contain metrics with the same labelset")
+				}
+				dst[k] = v
+			}
+			continue
+		}
+		index[hash] = len(out)
+		out = append(out, s)
+	}
+	return out, nil
+}
+
+// labelsFromGroupKey parses the toJSONString'd sorted [key, value] pairs.
+func labelsFromGroupKey(gkey string) (labels.Labels, error) {
+	var pairs [][]string
+	if err := json.Unmarshal([]byte(gkey), &pairs); err != nil {
+		return labels.EmptyLabels(), errors.WrapInternalf(err, errors.CodeInternal, "malformed compiled group key %q", gkey)
+	}
+	builder := labels.NewScratchBuilder(len(pairs))
+	for _, p := range pairs {
+		if len(p) != 2 {
+			return labels.EmptyLabels(), errors.NewInternalf(errors.CodeInternal, "malformed compiled group key pair %q", gkey)
+		}
+		builder.Add(p[0], p[1])
+	}
+	builder.Sort()
+	return builder.Labels(), nil
+}
+
+// applyScalarOps applies the number-literal op pipeline in place, with the
+// same float64 arithmetic and comparison-filter semantics as the engine.
+func applyScalarOps(ops []scalarOp, values []*float64) {
+	for _, op := range ops {
+		for i, v := range values {
+			if v == nil {
+				continue
+			}
+			lhs, rhs := *v, op.scalar
+			if op.scalarOnLeft {
+				lhs, rhs = op.scalar, *v
+			}
+			switch op.op {
+			case parser.ADD:
+				res := lhs + rhs
+				values[i] = &res
+			case parser.SUB:
+				res := lhs - rhs
+				values[i] = &res
+			case parser.MUL:
+				res := lhs * rhs
+				values[i] = &res
+			case parser.DIV:
+				res := lhs / rhs
+				values[i] = &res
+			case parser.MOD:
+				res := math.Mod(lhs, rhs)
+				values[i] = &res
+			case parser.POW:
+				res := math.Pow(lhs, rhs)
+				values[i] = &res
+			default:
+				keep := compare(op.op, lhs, rhs)
+				switch {
+				case op.returnBool:
+					res := 0.0
+					if keep {
+						res = 1.0
+					}
+					values[i] = &res
+				case keep:
+					// Filter comparisons keep the vector-side value.
+					vec := *v
+					values[i] = &vec
+				default:
+					values[i] = nil
+				}
+			}
+		}
+	}
+}
+
+func compare(op parser.ItemType, lhs, rhs float64) bool {
+	switch op {
+	case parser.EQLC:
+		return lhs == rhs
+	case parser.NEQ:
+		return lhs != rhs
+	case parser.GTR:
+		return lhs > rhs
+	case parser.LSS:
+		return lhs < rhs
+	case parser.GTE:
+		return lhs >= rhs
+	case parser.LTE:
+		return lhs <= rhs
+	}
+	return false
+}
+
+// toMatrix converts a unit result to a promql matrix on the query grid.
+func toMatrix(series []transpiledSeries, startMs, stepMs int64) promql.Matrix {
+	matrix := make(promql.Matrix, 0, len(series))
+	for _, s := range series {
+		var floats []promql.FPoint
+		for i, v := range s.values {
+			if v == nil {
+				continue
+			}
+			floats = append(floats, promql.FPoint{T: startMs + int64(i)*stepMs, F: *v})
+		}
+		if len(floats) == 0 {
+			continue
+		}
+		matrix = append(matrix, promql.Series{Metric: s.lset, Floats: floats})
+	}
+	return matrix
+}
+
+// executeHybrid substitutes each unit's grids into the engine as synthetic
+// series and evaluates the rewritten query over a storage that serves
+// synthetic selectors from memory and everything else from the live querier.
+// Absent grid points become stale markers so the engine's lookback cannot
+// resurrect the previous grid point. Each unit's synthetic samples sit on its
+// own grid (query grid, or subquery grid for units inside subqueries).
+func (e *executor) executeHybrid(ctx context.Context, plan *transpilePlan, results [][]transpiledSeries) (promql.Matrix, error) {
+	synthetic := make(map[string][]*series, len(plan.units))
+	staleMarker := math.Float64frombits(promValue.StaleNaN)
+
+	queryGrid := plan.grid
+
+	for i, unit := range plan.units {
+		g := unit.grid
+		gridLen := 1
+		if g.stepMs > 0 {
+			gridLen = int((g.endMs-g.startMs)/g.stepMs) + 1
+		}
+		list := make([]*series, 0, len(results[i]))
+		for _, cs := range results[i] {
+			builder := labels.NewBuilder(cs.lset)
+			builder.Set(metricNameLabel, unit.name)
+			s := &series{lset: builder.Labels()}
+			s.ts = make([]int64, 0, gridLen)
+			s.vs = make([]float64, 0, gridLen)
+			for idx := 0; idx < gridLen; idx++ {
+				t := g.startMs + int64(idx)*g.stepMs
+				var v float64
+				if idx < len(cs.values) && cs.values[idx] != nil {
+					v = *cs.values[idx]
+				} else {
+					v = staleMarker
+				}
+				s.ts = append(s.ts, t)
+				s.vs = append(s.vs, v)
+			}
+			list = append(list, s)
+		}
+		synthetic[unit.name] = list
+	}
+
+	hybrid := &hybridQueryable{client: e.client, synthetic: synthetic}
+
+	var qry promql.Query
+	var err error
+	if queryGrid.stepMs == 0 {
+		qry, err = e.engine.NewInstantQuery(ctx, hybrid, nil, plan.rewritten, time.UnixMilli(queryGrid.endMs))
+	} else {
+		qry, err = e.engine.NewRangeQuery(ctx, hybrid, nil, plan.rewritten, time.UnixMilli(queryGrid.startMs), time.UnixMilli(queryGrid.endMs), time.Duration(queryGrid.stepMs)*time.Millisecond)
+	}
+	if err != nil {
+		return nil, err
+	}
+	defer qry.Close()
+
+	res := qry.Exec(ctx)
+	if res.Err != nil {
+		return nil, res.Err
+	}
+
+	matrix, err := resultToMatrix(res)
+	if err != nil {
+		return nil, err
+	}
+
+	// Deep-copy before Close returns the result's slices to the engine pool,
+	// and drop the synthetic __name__ that filter comparisons preserve.
+	out := make(promql.Matrix, 0, len(matrix))
+	for _, s := range matrix {
+		lset := s.Metric
+		if name := lset.Get(metricNameLabel); len(name) >= len(syntheticNamePrefix) && name[:len(syntheticNamePrefix)] == syntheticNamePrefix {
+			builder := labels.NewBuilder(lset)
+			builder.Del(metricNameLabel)
+			lset = builder.Labels()
+		}
+		floats := make([]promql.FPoint, len(s.Floats))
+		copy(floats, s.Floats)
+		out = append(out, promql.Series{Metric: lset.Copy(), Floats: floats})
+	}
+	// The strip can leave twins: two units' outputs distinguishable only by
+	// their synthetic names (e.g. -metric_a or -metric_b, both {} to the
+	// engine's real evaluation once names dropped). The engine assembles its
+	// matrix by labelset, merging such temporally-disjoint elements into one
+	// series; reproduce that, with its duplicate error on same-timestamp
+	// overlap.
+	out, err = mergeMatrixByLabelset(out)
+	if err != nil {
+		return nil, err
+	}
+	sort.Slice(out, func(i, j int) bool { return labels.Compare(out[i].Metric, out[j].Metric) < 0 })
+	return out, nil
+}
+
+// mergeMatrixByLabelset merges series sharing a labelset by interleaving
+// their points in timestamp order; a timestamp present in both is the
+// engine's duplicate-labelset error.
+func mergeMatrixByLabelset(matrix promql.Matrix) (promql.Matrix, error) {
+	index := make(map[uint64]int, len(matrix))
+	out := matrix[:0]
+	for _, s := range matrix {
+		hash := s.Metric.Hash()
+		idx, ok := index[hash]
+		if ok && labels.Equal(out[idx].Metric, s.Metric) {
+			merged := make([]promql.FPoint, 0, len(out[idx].Floats)+len(s.Floats))
+			a, b := out[idx].Floats, s.Floats
+			for len(a) > 0 && len(b) > 0 {
+				switch {
+				case a[0].T < b[0].T:
+					merged, a = append(merged, a[0]), a[1:]
+				case b[0].T < a[0].T:
+					merged, b = append(merged, b[0]), b[1:]
+				default:
+					return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "vector cannot contain metrics with the same labelset")
+				}
+			}
+			out[idx].Floats = append(append(merged, a...), b...)
+			continue
+		}
+		index[hash] = len(out)
+		out = append(out, s)
+	}
+	return out, nil
+}
+
+func resultToMatrix(res *promql.Result) (promql.Matrix, error) {
+	switch v := res.Value.(type) {
+	case promql.Matrix:
+		return v, nil
+	case promql.Vector:
+		matrix := make(promql.Matrix, 0, len(v))
+		for _, s := range v {
+			matrix = append(matrix, promql.Series{Metric: s.Metric, Floats: []promql.FPoint{{T: s.T, F: s.F}}})
+		}
+		return matrix, nil
+	case promql.Scalar:
+		return promql.Matrix{{Metric: labels.EmptyLabels(), Floats: []promql.FPoint{{T: v.T, F: v.V}}}}, nil
+	default:
+		return nil, errors.NewInternalf(errors.CodeInternal, "unexpected hybrid result type %T", res.Value)
+	}
+}
+
+// hybridQueryable serves synthetic (compiled) selectors from memory and
+// everything else from the live storage.
+type hybridQueryable struct {
+	client    *client
+	synthetic map[string][]*series
+}
+
+func (h *hybridQueryable) Querier(mint, maxt int64) (storage.Querier, error) {
+	return &hybridQuerier{
+		querier:   querier{mint: mint, maxt: maxt, client: h.client},
+		synthetic: h.synthetic,
+	}, nil
+}
+
+type hybridQuerier struct {
+	querier
+	synthetic map[string][]*series
+}
+
+func (h *hybridQuerier) Select(ctx context.Context, sortSeries bool, hints *storage.SelectHints, matchers ...*labels.Matcher) storage.SeriesSet {
+	if name, ok := isSyntheticSelector(matchers); ok {
+		list := h.synthetic[name]
+		if sortSeries {
+			sorted := make([]*series, len(list))
+			copy(sorted, list)
+			sort.Slice(sorted, func(i, j int) bool { return labels.Compare(sorted[i].lset, sorted[j].lset) < 0 })
+			list = sorted
+		}
+		return newSeriesSet(list)
+	}
+	return h.querier.Select(ctx, sortSeries, hints, matchers...)
+}

pkg/prometheus/clickhouseprometheusv2/transpiler_sql.go

@@ -0,0 +1,414 @@
+package clickhouseprometheusv2
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/SigNoz/signoz/pkg/telemetryschema/metricstelemetryschema"
+	"github.com/huandu/go-sqlbuilder"
+)
+
+// experimental gate for the timeSeries*ToGrid aggregate functions; attached
+// as a SETTINGS clause so telemetrystore hooks cannot clobber it.
+const gridFunctionsSetting = "SETTINGS allow_experimental_ts_to_grid_aggregate_function = 1"
+
+var aggForEach = map[string]string{
+	"sum":   "sumForEach",
+	"min":   "minForEach",
+	"max":   "maxForEach",
+	"avg":   "avgForEach",
+	"count": "countForEach",
+}
+
+// buildUnitSQL renders the single ClickHouse query evaluating a core unit
+// over the [startMs, endMs] / stepMs evaluation grid: per-series grids via a
+// timeSeries*ToGrid aggregate (or a windowed aggregation for *_over_time),
+// then spatial aggregation with -ForEach combinators grouped by a canonical
+// JSON key of the projected label pairs.
+//
+// The heavy level is shaped to run on the shards: the top-level FROM is the
+// distributed samples table and the group-key join partner is a subquery on
+// the shard-local time series table, so the shard rewrite executes the join
+// and the per-(fingerprint, group key) aggregation next to the data —
+// complete by fingerprint co-locality (see localTimeSeriesTable) — and the
+// initiator only merges the per-series states and applies the spatial
+// -ForEach step. Same layout as the telemetrymetrics statement builder.
+// The windowed *_over_time form shares the frame but aggregates per
+// (series, group key, step bucket) instead of straight to grids
+// (see windowedInner).
+//
+// The selector's data window is offset-shifted; the resulting grid indices
+// map 1:1 onto the query grid (output ts = startMs + i*stepMs). Grid
+// parameters are rendered as literals — they are aggregate-function
+// parameters, not bindable values.
+//
+// Statements nest builder-rendered SQL as text, so the returned args must be
+// ordered by where each fragment lands in the final statement: ClickHouse
+// binds ? placeholders by position. A JOIN renders before WHERE, so a joined
+// subquery's args precede the outer query's own condition args.
+//
+// Row shape: the group-key columns (see groupKeyColumns) followed by
+// grid Array(Nullable(Float64)); NULL grid points are absent points (the
+// engine's "no value here"), which the -ForEach combinators preserve: an
+// index where every series is NULL aggregates to NULL, and countForEach's 0
+// is mapped back to NULL.
+func buildUnitSQL(unit *coreUnit, metricNames []string, dataStart, dataEnd int64, startMs, endMs, stepMs, lookbackMs int64) (string, []any, error) {
+	selStart := startMs - unit.offsetMs
+	selEnd := endMs - unit.offsetMs
+	stepSec := stepMs / 1000
+	if stepSec == 0 {
+		// Instant query: start == end, so the grid has one point for any
+		// positive step.
+		stepSec = 1
+	}
+	windowMs := unit.rangeMs
+	if unit.kind == unitInstant {
+		windowMs = lookbackMs
+	}
+	windowSec := windowMs / 1000
+
+	adjustedTsStartU, _, _, localTsTable := metricstelemetryschema.WhichTSTableToUse(uint64(dataStart), uint64(dataEnd), false, nil)
+	adjustedTsStart := int64(adjustedTsStartU)
+	keyNames := groupKeyColumns(unit)
+
+	// seriesSub computes fingerprint -> group key columns. It reads the
+	// local series table when it rides inside the shard-rewritten samples
+	// query, and the distributed one when it joins at the initiator
+	// (windowed form).
+	seriesSub := func(table string) (string, []any, error) {
+		sub := sqlbuilder.NewSelectBuilder()
+		selects := []string{"fingerprint"}
+		if keyNames == nil {
+			selects = append(selects, groupKeyExpr(unit)+" AS gkey")
+		} else {
+			// by (...) grouping extracts exactly the listed labels as plain
+			// columns: no reason to build, sort and stringify every label
+			// pair per row when the projection is a known short list and
+			// the label names live in Go anyway.
+			for i, name := range keyNames {
+				selects = append(selects, fmt.Sprintf("JSONExtractString(labels, %s) AS g%d", sub.Var(name), i))
+			}
+		}
+		sub.Select(selects...)
+		sub.From(fmt.Sprintf("%s.%s", metricstelemetryschema.DBName, table))
+		if err := applySeriesConditions(sub, adjustedTsStart, dataEnd, unit.matchers); err != nil {
+			return "", nil, err
+		}
+		sub.GroupBy(append([]string{"fingerprint"}, keyColumnAliases(keyNames)...)...)
+		q, args := sub.BuildWithFlavor(sqlbuilder.ClickHouse)
+		return q, args, nil
+	}
+
+	// samplesConditions adds the samples-side WHERE. The group-key join
+	// restricts to the matched series; no fingerprint condition is added
+	// here.
+	samplesConditions := func(sb *sqlbuilder.SelectBuilder, excludeStale bool) {
+		switch len(metricNames) {
+		case 0:
+			// No name constraint derivable; correct but unable to use the
+			// metric_name primary-key prefix.
+		case 1:
+			sb.Where(sb.EQ("metric_name", metricNames[0]))
+		default:
+			sb.Where(sb.In("metric_name", sqlbuilder.List(metricNames)))
+		}
+		// temporality precedes metric_name in the samples primary key; the
+		// fingerprints already come from these temporalities, so this only
+		// helps granule pruning.
+		sb.Where("temporality IN ['Cumulative', 'Unspecified']")
+		// When the window is narrower than the step, the grid windows
+		// (t_k − window, t_k] cover only window/step of the selector's
+		// timeline; a sample in a gap belongs to no window and cannot move
+		// any grid point, but the grid aggregate buffers every row it is
+		// fed. Keeping only in-window rows cut a 36k-series 1w rate from
+		// 74s/28GiB to 16s/4.3GiB on fleet data — the read stays the same,
+		// the aggregate input shrinks by the coverage ratio. The lattice
+		// anchors at selStart (end may sit off-lattice on unaligned grids),
+		// positiveModulo because samples above selStart make the dividend
+		// negative, and the upper bound tightens to the last grid point —
+		// rows past it are equally windowless. window >= step tiles the
+		// timeline and keeps today's plain bounds.
+		sliver := stepMs > 0 && windowMs > 0 && windowMs < stepMs
+		upper := selEnd
+		if sliver {
+			upper = selStart + (selEnd-selStart)/stepMs*stepMs
+		}
+		// Left-open window: a sample exactly at the window's lower boundary
+		// is never used (range selectors and lookback are both left-open).
+		sb.Where(sb.GT("unix_milli", selStart-windowMs), sb.LTE("unix_milli", upper))
+		if sliver {
+			sb.Where(fmt.Sprintf("positiveModulo(%s - unix_milli, %s) < %s",
+				sb.Var(selStart), sb.Var(stepMs), sb.Var(windowMs)))
+		}
+		if excludeStale {
+			// PromQL excludes stale markers from range vectors. Instant
+			// selectors need the stale rows for shadowing instead.
+			sb.Where("bitAnd(flags, 1) = 0")
+		}
+	}
+
+	keyCols := keyColumnAliases(keyNames)
+
+	// joinedInner builds the shard-side SELECT for the single-pass kinds:
+	// grid expression per (fingerprint, group key), group-key join against
+	// the local series table.
+	joinedInner := func(gridExpr string, excludeStale bool) (string, []any, error) {
+		seriesSQL, seriesArgs, err := seriesSub(localTsTable)
+		if err != nil {
+			return "", nil, err
+		}
+		sb := sqlbuilder.NewSelectBuilder()
+		selects := make([]string, 0, len(keyCols)+1)
+		// A fingerprint is the hash of one labelset, so every group-key
+		// column is functionally dependent on it: any() is exact, and
+		// grouping by the fingerprint alone spares hashing the joined
+		// string per sample row — measured -10-13% on a 1.9B-row rate.
+		for _, col := range keyCols {
+			selects = append(selects, fmt.Sprintf("any(series.%s) AS %s", col, col))
+		}
+		sb.Select(append(selects, gridExpr+" AS grid")...)
+		sb.From(fmt.Sprintf("%s.%s AS points", metricstelemetryschema.DBName, metricstelemetryschema.SamplesV4TableName))
+		sb.JoinWithOption(sqlbuilder.InnerJoin, fmt.Sprintf("(%s) AS series", seriesSQL), "points.fingerprint = series.fingerprint")
+		samplesConditions(sb, excludeStale)
+		sb.GroupBy("points.fingerprint")
+		q, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+		// The join text renders before WHERE: its args come first.
+		return q, append(seriesArgs, args...), nil
+	}
+
+	var inner string
+	var innerArgs []any
+	var err error
+	switch unit.kind {
+	case unitInstant:
+		// Instant selection with stale shadowing: the grid value is the last
+		// non-stale sample in (t-lookback, t], absent when the overall last
+		// sample in that window is a stale marker (verified semantics: the
+		// -If combinator applies to the grid aggregates, and NULL comparisons
+		// make a stale-latest point absent).
+		gridParams := fmt.Sprintf("(fromUnixTimestamp64Milli(%d), fromUnixTimestamp64Milli(%d), %d, %d)", selStart, selEnd, stepSec, windowSec)
+		gridExpr := fmt.Sprintf(
+			"arrayMap((tall, tok, vok) -> if(tall IS NULL OR tok IS NULL OR tall != tok, NULL, vok), timeSeriesLastToGrid%s(fromUnixTimestamp64Milli(unix_milli), toFloat64(unix_milli)), timeSeriesLastToGridIf%s(fromUnixTimestamp64Milli(unix_milli), toFloat64(unix_milli), bitAnd(flags, 1) = 0), timeSeriesLastToGridIf%s(fromUnixTimestamp64Milli(unix_milli), value, bitAnd(flags, 1) = 0))",
+			gridParams, gridParams, gridParams,
+		)
+		inner, innerArgs, err = joinedInner(gridExpr, false)
+	case unitOverTime:
+		if unit.overFn == "last" {
+			// last_over_time == last non-stale sample in the window: the
+			// stale rows are already excluded in WHERE.
+			gridExpr := fmt.Sprintf(
+				"timeSeriesLastToGrid(fromUnixTimestamp64Milli(%d), fromUnixTimestamp64Milli(%d), %d, %d)(fromUnixTimestamp64Milli(unix_milli), value)",
+				selStart, selEnd, stepSec, windowSec,
+			)
+			inner, innerArgs, err = joinedInner(gridExpr, true)
+			break
+		}
+		inner, innerArgs, err = windowedInner(unit, samplesConditions, seriesSub, keyCols, localTsTable, selStart, selEnd, stepMs, windowMs)
+	default: // unitRange
+		gridExpr := fmt.Sprintf(
+			"%s(fromUnixTimestamp64Milli(%d), fromUnixTimestamp64Milli(%d), %d, %d)(fromUnixTimestamp64Milli(unix_milli), value)",
+			gridFunction[unit.fn], selStart, selEnd, stepSec, windowSec,
+		)
+		if unit.fn == fnIncrease {
+			// increase == rate * range-seconds, exactly: extrapolatedRate
+			// divides by the range only when isRate.
+			gridExpr = fmt.Sprintf("arrayMap(x -> x * %d, %s)", windowSec, gridExpr)
+		}
+		inner, innerArgs, err = joinedInner(gridExpr, true)
+	}
+	if err != nil {
+		return "", nil, err
+	}
+
+	spatial := "maxForEach(grid)"
+	switch {
+	case !unit.hasAgg:
+		// Per-series output: one row per (labels-minus-__name__) group.
+		// Distinct fingerprints can collapse onto the same projected label
+		// set only via a regex __name__ selector over metrics with identical
+		// other labels; maxForEach is a deterministic NULL-skipping merge and
+		// the identity for the overwhelmingly common one-fingerprint group.
+	case unit.aggOp.String() == "count":
+		// count over an all-absent index is an absent point, not 0.
+		spatial = "arrayMap(c -> if(c = 0, NULL, toFloat64(c)), countForEach(grid))"
+	default:
+		spatial = fmt.Sprintf("%s(grid)", aggForEach[unit.aggOp.String()])
+	}
+
+	keyList := strings.Join(keyCols, ", ")
+	query := fmt.Sprintf("SELECT %s, %s AS grid FROM (%s) GROUP BY %s %s", keyList, spatial, inner, keyList, gridFunctionsSetting)
+	return query, innerArgs, nil
+}
+
+// groupKeyColumns returns the label names to extract as plain group-key
+// columns, or nil when the unit needs the canonical JSON key instead. Only
+// by (...) grouping qualifies: its projection is a known short list, so
+// extracting each label directly beats building, sorting and stringifying
+// every label pair per row. without and no-aggregation project a label SET
+// that varies per series — there the sorted-JSON key is load-bearing: the
+// sort is what makes two fingerprints with different stored JSON key order
+// land in one group, and the string carries the labels back out.
+func groupKeyColumns(unit *coreUnit) []string {
+	if unit.hasAgg && unit.by && len(unit.grouping) > 0 {
+		return unit.grouping
+	}
+	return nil
+}
+
+// keyColumnAliases names the group-key columns in every SELECT level: g0..gN
+// for direct extraction, the single canonical gkey otherwise.
+func keyColumnAliases(keyNames []string) []string {
+	if keyNames == nil {
+		return []string{"gkey"}
+	}
+	cols := make([]string, len(keyNames))
+	for i := range keyNames {
+		cols[i] = fmt.Sprintf("g%d", i)
+	}
+	return cols
+}
+
+// windowedInner builds the avg/min/max/sum/count _over_time form without
+// fanning samples out. It runs only when the range is a whole multiple of
+// the step (see the transpile gate), because then the window
+// (t_k - range, t_k] is exactly the union of W = range/step step buckets —
+// both are left-open on the same boundaries — so bucket membership fully
+// determines window membership. Fanning each sample into all W windows it
+// covers (ARRAY JOIN) multiplies rows by W, which at long ranges over short
+// steps is a row explosion measured in billions.
+//
+// The bucketing itself is the -Resample combinator: one group per (series,
+// group key) whose state is a fixed array of per-bucket aggregates, updated
+// in place per sample. Grouping by (series, bucket) instead — measured on a
+// 100k-series x 371-bucket workload — creates a 37M-entry hash aggregation
+// whose per-thread partial tables scale memory WITH max_threads (12 -> 48
+// GiB from 2 to 8 threads, dead at 16) and ships one row per group to the
+// initiator; the Resample form carries the same numbers in 100k compact
+// array states, like every other unit kind.
+//
+// The wrapper level slides the window: slot k combines buckets k..k+W-1 by
+// direct aggregation over at most W partials — no prefix-sum tricks, so no
+// large-minus-large cancellation against the engine's directly-summed
+// windows. A slot with zero window count is absent, which also keeps
+// min/max honest: their slices filter on the bucket counts, so an empty
+// bucket's zero-fill can never be mistaken for a value (a real sample can
+// legitimately be 0 or +Inf).
+func windowedInner(unit *coreUnit, samplesConditions func(*sqlbuilder.SelectBuilder, bool), seriesSub func(string) (string, []any, error), keyCols []string, localSeriesTable string, selStart, selEnd, stepMs, windowMs int64) (string, []any, error) {
+	effStepMs := stepMs
+	if effStepMs == 0 {
+		effStepMs = 1000
+	}
+	lastIdx := (selEnd - selStart) / effStepMs
+	gridLen := lastIdx + 1
+	w := windowMs / effStepMs
+	bucketLen := gridLen + w
+
+	// A window narrower than the step makes the windows (t_k - range, t_k]
+	// pairwise disjoint: there is nothing to slide, each slot reads exactly
+	// its own window's aggregate. This is exact ONLY over sliver-filtered
+	// rows (samplesConditions adds the window<step predicate): the index
+	// below assigns every gap sample to the window above it, and the filter
+	// is what removes them. Requires a real step — instant queries carry no
+	// sliver filter, so they keep the tiled form and its gates.
+	disjoint := stepMs > 0 && windowMs < stepMs
+	if disjoint {
+		w = 1
+		bucketLen = gridLen
+	}
+
+	seriesSQL, seriesArgs, err := seriesSub(localSeriesTable)
+	if err != nil {
+		return "", nil, err
+	}
+
+	// Bucket index, shifted so the earliest in-window sample lands at 0:
+	// jj = ceil((ts - selStart)/step) + W - 1, folded into one intDiv. Slot
+	// k's window is then buckets jj in [k, k+W-1]. In the disjoint form the
+	// same ceil lands each in-window sample directly on its slot (W = 1),
+	// and the numerator stays positive: the fetch floor is
+	// selStart - range > selStart - step.
+	jjShift := windowMs
+	if disjoint {
+		jjShift = effStepMs
+	}
+	jj := fmt.Sprintf("intDiv(unix_milli - %d + %d - 1, %d)", selStart, jjShift, effStepMs)
+	buckets := sqlbuilder.NewSelectBuilder()
+	selects := make([]string, 0, len(keyCols)+2)
+	// any() over the group key: exact because the key is functionally
+	// dependent on the fingerprint (see joinedInner).
+	for _, col := range keyCols {
+		selects = append(selects, fmt.Sprintf("any(series.%s) AS %s", col, col))
+	}
+	selects = append(selects, fmt.Sprintf("countResample(0, %d, 1)(value, %s) AS cnts", bucketLen, jj))
+	if unit.overFn != "count" {
+		selects = append(selects, fmt.Sprintf("%sResample(0, %d, 1)(value, %s) AS vals", map[string]string{
+			"avg": "sum",
+			"sum": "sum",
+			"min": "min",
+			"max": "max",
+		}[unit.overFn], bucketLen, jj))
+	}
+	buckets.Select(selects...)
+	buckets.From(fmt.Sprintf("%s.%s AS points", metricstelemetryschema.DBName, metricstelemetryschema.SamplesV4TableName))
+	buckets.JoinWithOption(sqlbuilder.InnerJoin, fmt.Sprintf("(%s) AS series", seriesSQL), "points.fingerprint = series.fingerprint")
+	samplesConditions(buckets, true)
+	buckets.GroupBy("points.fingerprint")
+	bucketsSQL, bucketsArgs := buckets.BuildWithFlavor(sqlbuilder.ClickHouse)
+
+	windowCnt := fmt.Sprintf("arraySum(arraySlice(cnts, k + 1, %d))", w)
+	var slot string
+	switch unit.overFn {
+	case "count":
+		slot = fmt.Sprintf("if(%s = 0, NULL, toFloat64(%s))", windowCnt, windowCnt)
+	case "sum":
+		slot = fmt.Sprintf("if(%s = 0, NULL, arraySum(arraySlice(vals, k + 1, %d)))", windowCnt, w)
+	case "avg":
+		slot = fmt.Sprintf("if(%s = 0, NULL, arraySum(arraySlice(vals, k + 1, %d)) / %s)", windowCnt, w, windowCnt)
+	case "min":
+		slot = fmt.Sprintf("if(%s = 0, NULL, arrayMin(arrayFilter((v, c) -> c > 0, arraySlice(vals, k + 1, %d), arraySlice(cnts, k + 1, %d))))", windowCnt, w, w)
+	case "max":
+		slot = fmt.Sprintf("if(%s = 0, NULL, arrayMax(arrayFilter((v, c) -> c > 0, arraySlice(vals, k + 1, %d), arraySlice(cnts, k + 1, %d))))", windowCnt, w, w)
+	}
+
+	keyList := strings.Join(keyCols, ", ")
+	inner := fmt.Sprintf(
+		"SELECT %s, arrayMap(k -> %s, range(toUInt64(%d))) AS grid FROM (%s)",
+		keyList, slot, gridLen, bucketsSQL,
+	)
+	return inner, append(seriesArgs, bucketsArgs...), nil
+}
+
+// groupKeyExpr renders the canonical JSON group key for the units whose
+// projected label SET varies per series (see groupKeyColumns): the sorted
+// [key, value] pairs of the projected labels, JSON-encoded.
+//   - by () with no labels: one constant group;
+//   - without (a, b): keep everything except the listed labels and __name__;
+//   - no aggregation: keep everything including __name__ — even when the
+//     unit drops the name from its OUTPUT, the key must keep it so distinct
+//     metrics never merge in SQL; executeUnit strips the name afterwards and
+//     turns a post-strip collision into the engine's duplicate-labelset
+//     error instead of a silently invented merge.
+func groupKeyExpr(unit *coreUnit) string {
+	// An empty label value means "label absent" in Prometheus; the stored
+	// labels JSON can carry empty attribute values, which must not become
+	// output labels or group keys.
+	pairs := "arraySort(JSONExtractKeysAndValues(labels, 'String'))"
+	if !unit.hasAgg {
+		return fmt.Sprintf("toJSONString(arrayFilter(p -> p.2 != '', %s))", pairs)
+	}
+	if unit.by {
+		// Non-empty by (...) never reaches here; groupKeyColumns extracts
+		// those labels as plain columns instead.
+		return "'[]'"
+	}
+	excluded := append([]string{metricNameLabel}, unit.grouping...)
+	return fmt.Sprintf("toJSONString(arrayFilter(p -> p.2 != '' AND p.1 NOT IN (%s), %s))", quotedList(excluded), pairs)
+}
+
+func quotedList(items []string) string {
+	quoted := make([]string, len(items))
+	for i, s := range items {
+		quoted[i] = "'" + strings.ReplaceAll(s, "'", "\\'") + "'"
+	}
+	return strings.Join(quoted, ", ")
+}

pkg/prometheus/clickhouseprometheusv2/transpiler_test.go

@@ -0,0 +1,751 @@
+package clickhouseprometheusv2
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/DATA-DOG/go-sqlmock"
+	cmock "github.com/SigNoz/clickhouse-go-mock"
+	"github.com/SigNoz/signoz/pkg/errors"
+	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
+	"github.com/SigNoz/signoz/pkg/prometheus"
+	"github.com/SigNoz/signoz/pkg/telemetrystore"
+	"github.com/SigNoz/signoz/pkg/telemetrystore/telemetrystoretest"
+	"github.com/prometheus/prometheus/model/labels"
+	"github.com/prometheus/prometheus/promql"
+	"github.com/prometheus/prometheus/promql/parser"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func newTestClient(t *testing.T) (*client, *telemetrystoretest.Provider) {
+	t.Helper()
+	store := telemetrystoretest.New(telemetrystore.Config{Provider: "clickhouse"}, sqlmock.QueryMatcherRegexp)
+	settings := factory.NewScopedProviderSettings(instrumentationtest.New().ToProviderSettings(), "clickhouseprometheusv2_test")
+	return newClient(settings, store, prometheus.Config{}), store
+}
+
+var seriesCols = []cmock.ColumnType{
+	{Name: "fingerprint", Type: "UInt64"},
+	{Name: "labels", Type: "String"},
+}
+
+func parse(t *testing.T, q string) parser.Expr {
+	t.Helper()
+	expr, err := parser.NewParser(parser.Options{}).ParseExpr(q)
+	require.NoError(t, err)
+	return expr
+}
+
+func TestClassifyFullShapes(t *testing.T) {
+	tests := []struct {
+		name  string
+		query string
+		check func(t *testing.T, u *coreUnit)
+	}{
+		{
+			name:  "sum by rate",
+			query: `sum by (pod) (rate(http_requests_total{job="api"}[5m]))`,
+			check: func(t *testing.T, u *coreUnit) {
+				assert.Equal(t, fnRate, u.fn)
+				assert.Equal(t, int64(300_000), u.rangeMs)
+				assert.True(t, u.hasAgg)
+				assert.True(t, u.by)
+				assert.Equal(t, []string{"pod"}, u.grouping)
+			},
+		},
+		{
+			name:  "bare increase with offset",
+			query: `increase(errors_total[10m] offset 30m)`,
+			check: func(t *testing.T, u *coreUnit) {
+				assert.Equal(t, fnIncrease, u.fn)
+				assert.Equal(t, int64(1_800_000), u.offsetMs)
+				assert.False(t, u.hasAgg)
+			},
+		},
+		{
+			name:  "avg without over delta",
+			query: `avg without (instance) (delta(gauge_metric[15m]))`,
+			check: func(t *testing.T, u *coreUnit) {
+				assert.Equal(t, fnDelta, u.fn)
+				assert.True(t, u.hasAgg)
+				assert.False(t, u.by)
+			},
+		},
+		{
+			name:  "scalar pipeline with comparison",
+			query: `sum(rate(x[5m])) * 100 > 5`,
+			check: func(t *testing.T, u *coreUnit) {
+				require.Len(t, u.ops, 2)
+				assert.Equal(t, parser.ItemType(parser.MUL), u.ops[0].op)
+				assert.Equal(t, 100.0, u.ops[0].scalar)
+				assert.Equal(t, parser.ItemType(parser.GTR), u.ops[1].op)
+			},
+		},
+		{
+			name:  "scalar on left with unary minus",
+			query: `-1 * sum(rate(x[5m]))`,
+			check: func(t *testing.T, u *coreUnit) {
+				require.Len(t, u.ops, 1)
+				assert.True(t, u.ops[0].scalarOnLeft)
+				assert.Equal(t, -1.0, u.ops[0].scalar)
+			},
+		},
+		{
+			name:  "bool comparison",
+			query: `sum(rate(x[5m])) >= bool 0.5`,
+			check: func(t *testing.T, u *coreUnit) {
+				require.Len(t, u.ops, 1)
+				assert.True(t, u.ops[0].returnBool)
+			},
+		},
+		{
+			name:  "irate utf8 name",
+			query: `sum by ("k8s.pod.name") (irate({"k8s.container.cpu.time"}[2m]))`,
+			check: func(t *testing.T, u *coreUnit) {
+				assert.Equal(t, fnIRate, u.fn)
+				assert.Equal(t, []string{"k8s.pod.name"}, u.grouping)
+			},
+		},
+		{
+			name:  "bare instant selector keeps name",
+			query: `up{job="api"}`,
+			check: func(t *testing.T, u *coreUnit) {
+				assert.Equal(t, unitInstant, u.kind)
+				assert.True(t, u.keepsName())
+			},
+		},
+		{
+			name:  "gauge aggregation",
+			query: `sum by (pod) (container_memory offset 5m)`,
+			check: func(t *testing.T, u *coreUnit) {
+				assert.Equal(t, unitInstant, u.kind)
+				assert.Equal(t, int64(300_000), u.offsetMs)
+				assert.True(t, u.hasAgg)
+				assert.False(t, u.keepsName())
+			},
+		},
+		{
+			name:  "gauge comparison keeps name",
+			query: `container_memory > 100`,
+			check: func(t *testing.T, u *coreUnit) {
+				assert.Equal(t, unitInstant, u.kind)
+				assert.True(t, u.keepsName())
+			},
+		},
+		{
+			name:  "gauge arithmetic drops name",
+			query: `container_memory / 1024`,
+			check: func(t *testing.T, u *coreUnit) {
+				assert.Equal(t, unitInstant, u.kind)
+				assert.False(t, u.keepsName())
+			},
+		},
+		{
+			name:  "avg_over_time",
+			query: `max by (node) (avg_over_time(load1[10m]))`,
+			check: func(t *testing.T, u *coreUnit) {
+				assert.Equal(t, unitOverTime, u.kind)
+				assert.Equal(t, "avg", u.overFn)
+				assert.Equal(t, int64(600_000), u.rangeMs)
+			},
+		},
+		{
+			name:  "last_over_time keeps name",
+			query: `last_over_time(load1[10m])`,
+			check: func(t *testing.T, u *coreUnit) {
+				assert.Equal(t, unitOverTime, u.kind)
+				assert.Equal(t, "last", u.overFn)
+				assert.True(t, u.keepsName())
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			plan, ok := classify(parse(t, tt.query), testGrid(60_000))
+			require.True(t, ok, "expected transpilable")
+			require.True(t, plan.full, "expected full compilation")
+			require.Len(t, plan.units, 1)
+			tt.check(t, &plan.units[0].core)
+		})
+	}
+}
+
+func TestClassifyFallbackShapes(t *testing.T) {
+	queries := []struct {
+		name  string
+		query string
+		step  int64
+	}{
+		{"default-resolution subquery", `max_over_time(rate(x[5m])[30m:])`, 60_000},
+		{"at modifier", `sum(rate(x[5m] @ 1609746000))`, 60_000},
+		{"at modifier on gauge", `sum(container_memory @ 1609746000)`, 60_000},
+		{"sub-second step", `sum(rate(x[5m]))`, 500},
+		{"sub-second range", `sum(rate(x[1500ms]))`, 60_000},
+		{"by __name__ full", `sum by (__name__) (rate({__name__=~"a|b"}[5m]))`, 60_000},
+		{"quantile_over_time unsupported", `quantile_over_time(0.9, load1[10m])`, 60_000},
+		// Duration expressions resolve into the selectors' static fields only
+		// at evaluation time; classification reads those fields as zero, so
+		// transpiling would silently use the wrong offset (caught by the
+		// conformance corpus' duration_expression.test cases). Offset
+		// expressions parse without the experimental-parser flag, so they do
+		// reach the transpiler; range-position expressions are rejected at
+		// parse (the RangeExpr/StepExpr guards are defense-in-depth).
+		{"duration expression offset on instant", `x offset step()`, 60_000},
+		{"duration expression offset arithmetic", `x offset -step()*2`, 60_000},
+		{"duration expression offset on range", `sum(rate(x[5m] offset max(3s, step())))`, 60_000},
+		{"duration expression subquery step", `max_over_time(rate(x[5m])[30m:step()])`, 60_000},
+	}
+	for _, tt := range queries {
+		t.Run(tt.name, func(t *testing.T) {
+			_, ok := classify(parse(t, tt.query), testGrid(tt.step))
+			assert.False(t, ok, "expected fallback for %s", tt.query)
+		})
+	}
+}
+
+func TestClassifyHybridShapes(t *testing.T) {
+	tests := []struct {
+		name          string
+		query         string
+		wantUnits     int
+		wantRewritten string
+	}{
+		{
+			name:          "histogram quantile",
+			query:         `histogram_quantile(0.95, sum by (le) (rate(http_bucket[5m])))`,
+			wantUnits:     1,
+			wantRewritten: `histogram_quantile(0.95, __signoz_transpiled_0__)`,
+		},
+		{
+			name:          "topk over compiled",
+			query:         `topk(5, sum by (pod) (rate(x[5m])))`,
+			wantUnits:     1,
+			wantRewritten: `topk(5, __signoz_transpiled_0__)`,
+		},
+		{
+			name:          "ratio of compiled units",
+			query:         `sum(rate(a[5m])) / sum(rate(b[5m]))`,
+			wantUnits:     2,
+			wantRewritten: `__signoz_transpiled_0__ / __signoz_transpiled_1__`,
+		},
+		{
+			name:          "or vector zero",
+			query:         `sum(rate(a[5m])) or vector(0)`,
+			wantUnits:     1,
+			wantRewritten: `__signoz_transpiled_0__ or vector(0)`,
+		},
+		{
+			name:          "quantile agg over compiled rate",
+			query:         `quantile(0.9, rate(x[5m]))`,
+			wantUnits:     1,
+			wantRewritten: `quantile(0.9, __signoz_transpiled_0__)`,
+		},
+		{
+			name:          "non-literal scalar side stays engine-side",
+			query:         `sum(rate(x[5m])) * scalar(y)`,
+			wantUnits:     1,
+			wantRewritten: `__signoz_transpiled_0__ * scalar(y)`,
+		},
+		{
+			name:          "compiled mixed with raw selector",
+			query:         `sum by (pod) (rate(a[5m])) / on (pod) group_left () b`,
+			wantUnits:     1,
+			wantRewritten: `__signoz_transpiled_0__ / on (pod) group_left () b`,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			plan, ok := classify(parse(t, tt.query), testGrid(60_000))
+			require.True(t, ok)
+			assert.False(t, plan.full)
+			assert.Len(t, plan.units, tt.wantUnits)
+			assert.Equal(t, tt.wantRewritten, plan.rewritten)
+		})
+	}
+}
+
+func TestClassifyHybridGuards(t *testing.T) {
+	t.Run("no substitution under on(__name__)", func(t *testing.T) {
+		plan, ok := classify(parse(t, `sum(rate(a[5m])) * on (__name__) b`), testGrid(60_000))
+		_ = plan
+		assert.False(t, ok, "matching on __name__ must not see synthetic names")
+	})
+	t.Run("no substitution inside @-pinned subquery", func(t *testing.T) {
+		_, ok := classify(parse(t, `max_over_time(rate(x[5m])[30m:1m] @ 1609746000)`), testGrid(60_000))
+		assert.False(t, ok)
+	})
+}
+
+// The alert-smoothing idiom: units inside a fixed-resolution subquery
+// evaluate on the subquery grid — epoch-aligned multiples of the resolution,
+// starting strictly after (outer start - range), exactly as the engine
+// derives it.
+func TestClassifySubqueryUnits(t *testing.T) {
+	grid := gridContext{startMs: 1_700_000_030_000, endMs: 1_700_007_200_000, stepMs: 60_000}
+
+	plan, ok := classify(parse(t, `min_over_time((sum by (ns) (increase(x[5m])))[10m:5m]) > 0`), grid)
+	require.True(t, ok)
+	require.False(t, plan.full)
+	require.Len(t, plan.units, 1)
+	assert.Equal(t, `min_over_time(__signoz_transpiled_0__[10m:5m]) > 0`, plan.rewritten)
+
+	unit := plan.units[0]
+	// lower bound = outer start - range = 1_699_999_430_000; first multiple
+	// of 300_000 strictly greater is 1_699_999_500_000.
+	assert.Equal(t, int64(1_699_999_500_000), unit.grid.startMs)
+	assert.Equal(t, grid.endMs, unit.grid.endMs)
+	assert.Equal(t, int64(300_000), unit.grid.stepMs)
+	assert.Equal(t, fnIncrease, unit.core.fn)
+
+	t.Run("subquery offset shifts the grid", func(t *testing.T) {
+		plan, ok := classify(parse(t, `max_over_time((sum(rate(x[5m])))[10m:5m] offset 30m)`), grid)
+		require.True(t, ok)
+		require.Len(t, plan.units, 1)
+		// lower = start - offset - range = 1_699_997_630_000 -> first
+		// multiple of 300_000 above = 1_699_997_700_000; end shifts too.
+		assert.Equal(t, int64(1_699_997_700_000), plan.units[0].grid.startMs)
+		assert.Equal(t, grid.endMs-1_800_000, plan.units[0].grid.endMs)
+	})
+
+	t.Run("mollusk ratio-inside-subquery idiom", func(t *testing.T) {
+		q := `min_over_time(((sum by (a) (rate(m1[5m]))) / (avg by (a) (m2)))[5m:1m])`
+		plan, ok := classify(parse(t, q), grid)
+		require.True(t, ok)
+		// Both sides compile on the subquery grid: the rate side and the
+		// gauge aggregation side; the engine joins them and smooths.
+		require.Len(t, plan.units, 2)
+		assert.Equal(t, int64(60_000), plan.units[0].grid.stepMs)
+		assert.Equal(t, unitInstant, plan.units[1].core.kind)
+		assert.Contains(t, plan.rewritten, `__signoz_transpiled_0__ / __signoz_transpiled_1__`)
+	})
+}
+
+func TestBuildUnitSQL(t *testing.T) {
+	unit := &coreUnit{
+		fn:       fnRate,
+		rangeMs:  300_000,
+		hasAgg:   true,
+		aggOp:    parser.SUM,
+		by:       true,
+		grouping: []string{"pod"},
+		matchers: []*labels.Matcher{mustMatcher(t, labels.MatchEqual, "__name__", "http_requests_total")},
+	}
+	sql, args, err := buildUnitSQL(unit, []string{"http_requests_total"}, 1_699_999_700_000, 1_700_003_600_000, 1_700_000_000_000, 1_700_003_600_000, 60_000, 300_000)
+	require.NoError(t, err)
+
+	assert.Contains(t, sql, "timeSeriesRateToGrid(fromUnixTimestamp64Milli(1700000000000), fromUnixTimestamp64Milli(1700003600000), 60, 300)(fromUnixTimestamp64Milli(unix_milli), value)")
+	assert.Contains(t, sql, "unix_milli > ? AND unix_milli <= ?")
+	assert.Contains(t, sql, "bitAnd(flags, 1) = 0")
+	assert.Contains(t, sql, "sumForEach(grid)")
+	// The group-key join rides inside the shard query: distributed samples
+	// at the top level, the local series table in the join subquery, the
+	// grid aggregation grouped per (fingerprint, group key) shard-side.
+	assert.Contains(t, sql, "FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint,")
+	assert.Contains(t, sql, "FROM signoz_metrics.time_series_v4 WHERE")
+	// The group key is functionally dependent on the fingerprint (one
+	// labelset per fingerprint): any() is exact and the per-row hash key
+	// shrinks to the fingerprint alone.
+	assert.Contains(t, sql, "any(series.g0) AS g0")
+	assert.Contains(t, sql, "GROUP BY points.fingerprint)")
+	// No samples-side fingerprint condition: the group-key join restricts.
+	assert.NotContains(t, sql, "points.fingerprint IN (")
+	// by (pod) extracts the grouped label directly — no per-row JSON
+	// build/sort/stringify for a known projection.
+	assert.Contains(t, sql, "JSONExtractString(labels, ?) AS g0")
+	assert.NotContains(t, sql, "toJSONString")
+	assert.Contains(t, sql, "SETTINGS allow_experimental_ts_to_grid_aggregate_function = 1")
+	// Args follow placeholder order: the joined series subquery renders
+	// before the samples WHERE, and its select list ('pod') renders before
+	// its own conditions.
+	assert.Equal(t, []any{"pod", "http_requests_total", int64(1_699_999_200_000), int64(1_700_003_600_000), "http_requests_total", int64(1_699_999_700_000), int64(1_700_003_600_000)}, args)
+}
+
+func TestBuildUnitSQLIncreaseAndOffset(t *testing.T) {
+	unit := &coreUnit{
+		fn:       fnIncrease,
+		rangeMs:  600_000,
+		offsetMs: 1_800_000,
+		matchers: []*labels.Matcher{mustMatcher(t, labels.MatchEqual, "__name__", "errors_total")},
+	}
+	sql, _, err := buildUnitSQL(unit, nil, 1_699_997_600_000, 1_700_001_800_000, 1_700_000_000_000, 1_700_003_600_000, 60_000, 300_000)
+	require.NoError(t, err)
+
+	// Grid and window shift by the offset; increase multiplies rate by the
+	// range in seconds.
+	assert.Contains(t, sql, "fromUnixTimestamp64Milli(1699998200000), fromUnixTimestamp64Milli(1700001800000)")
+	assert.Contains(t, sql, "arrayMap(x -> x * 600, timeSeriesRateToGrid")
+	assert.Contains(t, sql, "maxForEach(grid)")
+}
+
+func TestBuildUnitSQLOverLimitJoinOnly(t *testing.T) {
+	// Past the inline limit no fingerprint filter is rendered: the series
+	// join restricts to the matched fingerprints on its own.
+	unit := &coreUnit{
+		fn:       fnRate,
+		rangeMs:  300_000,
+		hasAgg:   true,
+		aggOp:    parser.SUM,
+		by:       true,
+		matchers: []*labels.Matcher{mustMatcher(t, labels.MatchEqual, "__name__", "http_requests_total")},
+	}
+	sql, _, err := buildUnitSQL(unit, []string{"http_requests_total"}, 1_699_999_700_000, 1_700_003_600_000, 1_700_000_000_000, 1_700_003_600_000, 60_000, 300_000)
+	require.NoError(t, err)
+
+	assert.NotContains(t, sql, "points.fingerprint IN")
+	assert.Contains(t, sql, "INNER JOIN (SELECT fingerprint,")
+	assert.Contains(t, sql, "FROM signoz_metrics.time_series_v4 WHERE")
+}
+
+func TestBuildUnitSQLWindowSliver(t *testing.T) {
+	// rate[5m] on a 30m grid evaluates only a 5m sliver before each grid
+	// point — samples in the gaps belong to no window and would only be
+	// buffered by the grid aggregate. The WHERE must keep exactly the
+	// in-window rows: positiveModulo anchored at the selector start (end
+	// can sit off-lattice on unaligned grids, and samples above the start
+	// make the plain modulo dividend negative), and the scan capped at the
+	// last grid point — rows past it are equally windowless.
+	unit := &coreUnit{
+		fn:       fnRate,
+		rangeMs:  300_000,
+		hasAgg:   true,
+		aggOp:    parser.SUM,
+		by:       true,
+		grouping: []string{"pod"},
+		matchers: []*labels.Matcher{mustMatcher(t, labels.MatchEqual, "__name__", "http_requests_total")},
+	}
+	sql, args, err := buildUnitSQL(unit, []string{"http_requests_total"}, 1_699_999_700_000, 1_700_003_600_000, 1_700_000_000_000, 1_700_003_600_000, 1_800_000, 300_000)
+	require.NoError(t, err)
+
+	assert.Contains(t, sql, "positiveModulo(? - unix_milli, ?) < ?")
+	assert.Equal(t, []any{"pod", "http_requests_total", int64(1_699_999_200_000), int64(1_700_003_600_000), "http_requests_total", int64(1_699_999_700_000), int64(1_700_003_600_000), int64(1_700_000_000_000), int64(1_800_000), int64(300_000)}, args)
+
+	t.Run("off-lattice end caps the scan at the last grid point", func(t *testing.T) {
+		// end - start = 50m at a 30m step: the only grid points are start
+		// and start+30m; samples in the trailing 20m serve no window.
+		_, args, err := buildUnitSQL(unit, []string{"http_requests_total"}, 1_699_999_700_000, 1_700_003_000_000, 1_700_000_000_000, 1_700_003_000_000, 1_800_000, 300_000)
+		require.NoError(t, err)
+		assert.Contains(t, args, int64(1_700_001_800_000))
+	})
+
+	t.Run("window covering the step keeps plain bounds", func(t *testing.T) {
+		sql, _, err := buildUnitSQL(unit, []string{"http_requests_total"}, 1_699_999_700_000, 1_700_003_600_000, 1_700_000_000_000, 1_700_003_600_000, 60_000, 300_000)
+		require.NoError(t, err)
+		assert.NotContains(t, sql, "positiveModulo")
+	})
+}
+
+func TestBuildUnitSQLWindowedBucketsWithoutFanOut(t *testing.T) {
+	// The window is W = range/step whole buckets, so each sample lands in
+	// exactly one bucket via GROUP BY and the window slides over bucket
+	// partials — fanning samples into every covered window (ARRAY JOIN)
+	// multiplies rows by W, a row explosion at long ranges.
+	unit := &coreUnit{
+		kind:     unitOverTime,
+		overFn:   "avg",
+		rangeMs:  600_000,
+		matchers: []*labels.Matcher{mustMatcher(t, labels.MatchEqual, "__name__", "node_load1")},
+	}
+	sql, _, err := buildUnitSQL(unit, []string{"node_load1"}, 1_699_999_400_000, 1_700_003_600_000, 1_700_000_000_000, 1_700_003_600_000, 60_000, 600_000)
+	require.NoError(t, err)
+
+	assert.NotContains(t, sql, "ARRAY JOIN")
+	// One group per series with fixed per-bucket arrays (-Resample); the
+	// bucket index jj = ceil((ts - start)/step) + W - 1 folded into a single
+	// intDiv. Grouping by (series, bucket) instead measured 37M hash groups
+	// whose per-thread partials scale memory with max_threads.
+	assert.Contains(t, sql, "countResample(0, 71, 1)(value, intDiv(unix_milli - 1700000000000 + 600000 - 1, 60000)) AS cnts")
+	assert.Contains(t, sql, "sumResample(0, 71, 1)(value, intDiv(unix_milli - 1700000000000 + 600000 - 1, 60000)) AS vals")
+	assert.Contains(t, sql, "any(series.gkey) AS gkey")
+	assert.Contains(t, sql, "GROUP BY points.fingerprint)")
+	assert.NotContains(t, sql, "jj) AS jj")
+	assert.Contains(t, sql, "INNER JOIN (SELECT fingerprint,")
+	assert.Contains(t, sql, "FROM signoz_metrics.time_series_v4 WHERE")
+	// Slide: W = 10 buckets per slot, absent when the window count is 0.
+	assert.Contains(t, sql, "arraySum(arraySlice(cnts, k + 1, 10))")
+	assert.Contains(t, sql, "arraySum(arraySlice(vals, k + 1, 10))")
+}
+
+func TestBuildUnitSQLDisjointOverTime(t *testing.T) {
+	// avg_over_time[5m] on a 30m grid: the windows are pairwise disjoint,
+	// so there is no slide — one Resample bucket per grid slot, read
+	// directly. Exact only together with the window-sliver predicate, which
+	// removes the gap samples the ceil index would otherwise assign to the
+	// window above them.
+	unit := &coreUnit{
+		kind:     unitOverTime,
+		overFn:   "avg",
+		rangeMs:  300_000,
+		matchers: []*labels.Matcher{mustMatcher(t, labels.MatchEqual, "__name__", "node_load1")},
+	}
+	sql, _, err := buildUnitSQL(unit, []string{"node_load1"}, 1_699_999_700_000, 1_700_003_600_000, 1_700_000_000_000, 1_700_003_600_000, 1_800_000, 300_000)
+	require.NoError(t, err)
+
+	assert.NotContains(t, sql, "ARRAY JOIN")
+	// gridLen = 3 slots, bucket array the same length — no W tail.
+	assert.Contains(t, sql, "countResample(0, 3, 1)(value, intDiv(unix_milli - 1700000000000 + 1800000 - 1, 1800000)) AS cnts")
+	assert.Contains(t, sql, "sumResample(0, 3, 1)(value, intDiv(unix_milli - 1700000000000 + 1800000 - 1, 1800000)) AS vals")
+	// Single-bucket window: the slide degenerates to reading one slot.
+	assert.Contains(t, sql, "arraySum(arraySlice(cnts, k + 1, 1))")
+	// The sliver predicate is the correctness precondition of this form.
+	assert.Contains(t, sql, "positiveModulo(? - unix_milli, ?) < ?")
+}
+
+// TestDisjointWindowLattice brute-forces the disjoint-form arithmetic: a
+// sample survives the sliver predicate exactly when some grid window
+// contains it, and the ceil bucket index then lands it on that window's
+// slot. This is the pure-Go mirror of the SQL expressions — the predicate
+// in samplesConditions and jj in windowedInner — over random lattices,
+// including off-lattice ends and samples beyond the last grid point.
+func TestDisjointWindowLattice(t *testing.T) {
+	rng := func(seed *uint64) int64 {
+		*seed = *seed*6364136223846793005 + 1442695040888963407
+		return int64(*seed >> 33)
+	}
+	seed := uint64(42)
+	for trial := 0; trial < 2000; trial++ {
+		stepMs := 1_000 * (1 + rng(&seed)%3600)
+		windowMs := 1 + rng(&seed)%(stepMs-1) // strictly below the step
+		selStart := 1_700_000_000_000 + rng(&seed)%1_000_000
+		selEnd := selStart + rng(&seed)%(50*stepMs) // end may sit off-lattice
+		lastIdx := (selEnd - selStart) / stepMs
+		upper := selStart + lastIdx*stepMs
+
+		for i := 0; i < 50; i++ {
+			u := selStart - windowMs - stepMs + rng(&seed)%(selEnd-selStart+3*stepMs)
+
+			// Oracle: is u inside any window (t_k - window, t_k]?
+			inWindow := false
+			var slot int64 = -1
+			for k := int64(0); k <= lastIdx; k++ {
+				tk := selStart + k*stepMs
+				if u > tk-windowMs && u <= tk {
+					inWindow = true
+					slot = k
+					break
+				}
+			}
+
+			// The SQL: fetch bounds, then the sliver predicate
+			// positiveModulo(selStart - u, step) < window.
+			kept := u > selStart-windowMs && u <= upper
+			if kept {
+				pmod := (selStart - u) % stepMs
+				if pmod < 0 {
+					pmod += stepMs
+				}
+				kept = pmod < windowMs
+			}
+
+			require.Equal(t, inWindow, kept,
+				"sliver keep mismatch: u=%d selStart=%d step=%d window=%d", u, selStart, stepMs, windowMs)
+			if !kept {
+				continue
+			}
+			// jj = ceil((u - selStart)/step) via one intDiv; numerator is
+			// positive because u > selStart - window > selStart - step.
+			jj := (u - selStart + stepMs - 1) / stepMs
+			require.Equal(t, slot, jj,
+				"slot mismatch: u=%d selStart=%d step=%d window=%d", u, selStart, stepMs, windowMs)
+		}
+	}
+}
+
+func TestTryExecuteRange_WindowedGateFallsBack(t *testing.T) {
+	c, store := newTestClient(t)
+	e := &executor{client: c, parser: prometheus.NewParser()}
+
+	start := time.UnixMilli(1_700_000_000_000)
+	end := time.UnixMilli(1_700_003_600_000)
+
+	// 10m range at 90s step: the window is not a whole number of buckets.
+	_, ok, err := e.TryExecuteRange(context.Background(), `avg_over_time(up[10m])`, start, end, 90*time.Second)
+	require.NoError(t, err)
+	assert.False(t, ok, "range not divisible by step must not transpile")
+
+	// 1d range at 60s step: 1440 bucket combines per slot, over the cap.
+	_, ok, err = e.TryExecuteRange(context.Background(), `avg_over_time(up[1d])`, start, end, time.Minute)
+	require.NoError(t, err)
+	assert.False(t, ok, "range/step above maxWindowBuckets must not transpile")
+
+	// 1m range at 5m step: the windows are disjoint slivers — no
+	// divisibility or width requirement, so this transpiles.
+	store.Mock().ExpectQuery("SELECT fingerprint, any\\(labels\\)").WithArgs("up", int64(1_699_999_200_000), int64(1_700_003_600_000)).WillReturnRows(cmock.NewRows(seriesCols, [][]any{}))
+	_, ok, err = e.TryExecuteRange(context.Background(), `avg_over_time(up[1m])`, start, end, 5*time.Minute)
+	require.NoError(t, err)
+	assert.True(t, ok, "range below step is the disjoint form and must transpile")
+}
+
+func TestApplyScalarOps(t *testing.T) {
+	f := func(v float64) *float64 { return &v }
+
+	t.Run("arithmetic chain", func(t *testing.T) {
+		values := []*float64{f(2), nil, f(4)}
+		applyScalarOps([]scalarOp{{op: parser.MUL, scalar: 100}, {op: parser.ADD, scalar: 1}}, values)
+		require.NotNil(t, values[0])
+		assert.Equal(t, 201.0, *values[0])
+		assert.Nil(t, values[1])
+		assert.Equal(t, 401.0, *values[2])
+	})
+
+	t.Run("comparison filters points", func(t *testing.T) {
+		values := []*float64{f(1), f(10)}
+		applyScalarOps([]scalarOp{{op: parser.GTR, scalar: 5}}, values)
+		assert.Nil(t, values[0])
+		require.NotNil(t, values[1])
+		assert.Equal(t, 10.0, *values[1], "filter comparisons keep the original value")
+	})
+
+	t.Run("bool comparison emits 0/1", func(t *testing.T) {
+		values := []*float64{f(1), f(10)}
+		applyScalarOps([]scalarOp{{op: parser.GTR, scalar: 5, returnBool: true}}, values)
+		assert.Equal(t, 0.0, *values[0])
+		assert.Equal(t, 1.0, *values[1])
+	})
+
+	t.Run("scalar on left division", func(t *testing.T) {
+		values := []*float64{f(4)}
+		applyScalarOps([]scalarOp{{op: parser.DIV, scalar: 100, scalarOnLeft: true}}, values)
+		assert.Equal(t, 25.0, *values[0])
+	})
+}
+
+func TestLabelsFromGroupKey(t *testing.T) {
+	lset, err := labelsFromGroupKey(`[["pod","api-0"],["ns","prod"]]`)
+	require.NoError(t, err)
+	assert.Equal(t, "api-0", lset.Get("pod"))
+	assert.Equal(t, "prod", lset.Get("ns"))
+
+	empty, err := labelsFromGroupKey(`[]`)
+	require.NoError(t, err)
+	assert.True(t, empty.IsEmpty())
+}
+
+// testGrid is a 2h query grid ending on a round timestamp.
+func testGrid(stepMs int64) gridContext {
+	return gridContext{startMs: 1_700_000_000_000, endMs: 1_700_007_200_000, stepMs: stepMs}
+}
+
+// A bool comparison returns 0/1, not the sample, so the engine drops
+// __name__; keeping it would change downstream vector matching.
+func TestKeepsName_BoolComparisonDropsName(t *testing.T) {
+	plan, ok := classify(parse(t, `up > bool 0`), testGrid(60_000))
+	require.True(t, ok)
+	assert.False(t, plan.units[0].core.keepsName())
+
+	plan, ok = classify(parse(t, `up > 0`), testGrid(60_000))
+	require.True(t, ok)
+	assert.True(t, plan.units[0].core.keepsName())
+}
+
+// timeSeriesLastToGrid widens its window to max(window, step) — probed on
+// 25.12 — so Last-style units at window < step must fall back or they would
+// resurrect samples the engine's lookback already dropped.
+func TestTryExecuteRange_LastStyleWindowBelowStepTranspiles(t *testing.T) {
+	// These used to fall back because timeSeriesLastToGrid widens its window
+	// to max(window, step). Over sliver-filtered rows the widening is
+	// harmless — the widened window intersected with the data IS the
+	// lookback window — so the gate is gone and both shapes transpile. The
+	// mock returns no series: the point here is the routing, the value
+	// semantics are the parity suite's job.
+	c, store := newTestClient(t)
+	e := &executor{client: c, parser: prometheus.NewParser()}
+
+	start := time.UnixMilli(1_700_000_000_000)
+	end := time.UnixMilli(1_700_003_600_000)
+
+	store.Mock().ExpectQuery("SELECT fingerprint, any\\(labels\\)").WithArgs("up", int64(1_699_999_200_000), int64(1_700_003_600_000)).WillReturnRows(cmock.NewRows(seriesCols, [][]any{}))
+	_, ok, err := e.TryExecuteRange(context.Background(), `sum by (pod) (up)`, start, end, time.Hour)
+	require.NoError(t, err)
+	assert.True(t, ok, "instant selection at step > lookback must transpile")
+
+	store.Mock().ExpectQuery("SELECT fingerprint, any\\(labels\\)").WithArgs("up", int64(1_699_999_200_000), int64(1_700_003_600_000)).WillReturnRows(cmock.NewRows(seriesCols, [][]any{}))
+	_, ok, err = e.TryExecuteRange(context.Background(), `last_over_time(up[10m])`, start, end, time.Hour)
+	require.NoError(t, err)
+	assert.True(t, ok, "last_over_time at range < step must transpile")
+}
+
+// Two metrics collapsing onto one labelset after the name drop, with values
+// on the same grid slot, is the engine's duplicate-labelset error; merging
+// them would invent a series no engine would produce. (Temporally disjoint
+// twins merge instead — see TestMergeSameLabelsetSeries.)
+func TestExecuteUnit_NameCollisionErrors(t *testing.T) {
+	c, store := newTestClient(t)
+	e := &executor{client: c, parser: prometheus.NewParser()}
+
+	store.Mock().ExpectQuery("SELECT fingerprint, any\\(labels\\)").WithArgs("^(?:a|b)$", int64(1_699_999_200_000), int64(1_700_003_600_000)).WillReturnRows(cmock.NewRows(seriesCols, [][]any{
+		{uint64(1), `{"__name__":"a","job":"x"}`},
+		{uint64(2), `{"__name__":"b","job":"x"}`},
+	}))
+	store.Mock().ExpectQuery("SELECT gkey").
+		WithArgs("^(?:a|b)$", int64(1_699_999_200_000), int64(1_700_003_600_000), "a", "b", int64(1_699_999_700_000), int64(1_700_003_600_000)).
+		WillReturnRows(cmock.NewRows(gkeyCols, [][]any{
+			{`[["__name__","a"],["job","x"]]`, []*float64{f64(1)}},
+			{`[["__name__","b"],["job","x"]]`, []*float64{f64(2)}},
+		}))
+
+	plan, ok := classify(parse(t, `rate({__name__=~"a|b"}[5m])`), gridContext{startMs: 1_700_000_000_000, endMs: 1_700_003_600_000, stepMs: 60_000})
+	require.True(t, ok)
+
+	_, err := e.executeUnit(context.Background(), &plan.units[0].core, plan.units[0].grid)
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), "vector cannot contain metrics with the same labelset")
+}
+
+var gkeyCols = []cmock.ColumnType{
+	{Name: "gkey", Type: "String"},
+	{Name: "grid", Type: "Array(Nullable(Float64))"},
+}
+
+func f64(v float64) *float64 { return &v }
+
+// A nameless selector can span metrics whose series alternate in time (one
+// dies inside the lookback before the other appears); after the name drop
+// the engine merges them into ONE series and errors only when two samples
+// share an evaluation timestamp. Pinned by conformance cases
+// operators.test:994/997 (-{job="api"} over http_requests/http_errors).
+func TestMergeSameLabelsetSeries(t *testing.T) {
+	f := func(v float64) *float64 { return &v }
+	api := labels.FromStrings("job", "api")
+
+	out, err := mergeSameLabelsetSeries([]transpiledSeries{
+		{lset: api, values: []*float64{f(-2), nil}},
+		{lset: api, values: []*float64{nil, f(-4)}},
+		{lset: labels.FromStrings("job", "web"), values: []*float64{f(7), nil}},
+	})
+	require.NoError(t, err)
+	require.Len(t, out, 2)
+	assert.Equal(t, []*float64{f(-2), f(-4)}, out[0].values, "temporally disjoint twins must merge into one series")
+
+	_, err = mergeSameLabelsetSeries([]transpiledSeries{
+		{lset: api, values: []*float64{f(1), nil}},
+		{lset: api, values: []*float64{f(2), nil}},
+	})
+	require.Error(t, err, "two values on one evaluation timestamp is the engine's duplicate error")
+	assert.True(t, errors.Ast(err, errors.TypeInvalidInput))
+}
+
+// Hybrid twin case: stripping the synthetic __name__ can leave two engine
+// output series distinguishable only by those names (-metric_a or -metric_b:
+// both {} once real names are dropped). Pinned by conformance cases
+// name_label_dropping.test:137 and operators.test:1016.
+func TestMergeMatrixByLabelset(t *testing.T) {
+	empty := labels.EmptyLabels()
+
+	out, err := mergeMatrixByLabelset(promql.Matrix{
+		{Metric: empty, Floats: []promql.FPoint{{T: 0, F: -1}}},
+		{Metric: empty, Floats: []promql.FPoint{{T: 600_000, F: -4}}},
+	})
+	require.NoError(t, err)
+	require.Len(t, out, 1)
+	assert.Equal(t, []promql.FPoint{{T: 0, F: -1}, {T: 600_000, F: -4}}, out[0].Floats)
+
+	_, err = mergeMatrixByLabelset(promql.Matrix{
+		{Metric: empty, Floats: []promql.FPoint{{T: 0, F: -1}}},
+		{Metric: empty, Floats: []promql.FPoint{{T: 0, F: -3}}},
+	})
+	require.Error(t, err)
+	assert.True(t, errors.Ast(err, errors.TypeInvalidInput))
+}

pkg/prometheus/prometheus.go

@@ -1,6 +1,9 @@
 package prometheus
 
 import (
+	"context"
+	"time"
+
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/promql/parser"
 	"github.com/prometheus/prometheus/storage"
@@ -41,3 +44,14 @@ type StatementCapturer interface {
 // X-SigNoz-PromQL-Provider request header all use it, so they cannot drift
 // apart.
 const ProviderClickhouseV2 = "clickhousev2"
+
+// RangeExecutor is the optional capability of a provider that can evaluate
+// some range queries entirely inside the datastore. ok=false means the query
+// is not evaluable that way and the caller should run the engine over the
+// provider's Storage instead — which is always exact. Only the clickhousev2
+// provider implements it; once that provider is the only one, the capability
+// folds into Prometheus itself and the engine-vs-datastore decision becomes
+// internal.
+type RangeExecutor interface {
+	TryExecuteRange(ctx context.Context, query string, start, end time.Time, step time.Duration) (promql.Matrix, bool, error)
+}

pkg/querier/builder_query.go

@@ -20,8 +20,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
 
-const estimateTimeout = 5 * time.Second
-
 const traceOutsideRangeWarn = "Query %s references a trace_id that exists between %s and %s (UTC) but lies outside the selected time range; adjust the time range to see results"
 
 type builderQuery[T any] struct {
@@ -249,10 +247,6 @@ func (q *builderQuery[T]) Execute(ctx context.Context) (*qbtypes.Result, error)
 		return nil, err
 	}
 
-	if err := q.enforceEstimate(ctx, stmt); err != nil {
-		return nil, err
-	}
-
 	// Execute the query with proper context for partial value detection
 	result, err := q.executeWithContext(ctx, stmt.Query, stmt.Args)
 	if err != nil {
@@ -264,65 +258,6 @@ func (q *builderQuery[T]) Execute(ctx context.Context) (*qbtypes.Result, error)
 	return result, nil
 }
 
-// estimateRows returns the per-shard EXPLAIN ESTIMATE scan rows for a cost-guarded
-// statement. guarded=false means nothing to enforce; a non-nil error means reject.
-// Callers own the budget comparison (per-statement or cumulative).
-func (q *builderQuery[T]) estimateRows(ctx context.Context, stmt *qbtypes.Statement) (int64, bool, error) {
-	if stmt.CostGuard == nil || stmt.CostGuard.MaxScanRows <= 0 {
-		return 0, false, nil
-	}
-
-	estCtx, cancel := context.WithTimeout(ctx, estimateTimeout)
-	defer cancel()
-
-	entries, err := q.telemetryStore.Estimate(estCtx, stmt.Query, stmt.Args...)
-	if err != nil {
-		if ctx.Err() != nil {
-			return 0, true, ctx.Err()
-		}
-		if errors.Is(estCtx.Err(), context.DeadlineExceeded) {
-			return 0, true, errors.NewInvalidInputf(errors.CodeInvalidInput,
-				"This query is too broad to plan within %s", estimateTimeout).
-				WithSuggestions(costGuardSuggestions(stmt.CostGuard.Warning)...)
-		}
-		return 0, true, err
-	}
-
-	var rows int64
-	for _, e := range entries {
-		rows += e.Rows
-	}
-	return rows, true, nil
-}
-
-// enforceEstimate rejects a scan-heavy statement whose estimate exceeds its own
-// budget, before executing. Budget 0 disables.
-func (q *builderQuery[T]) enforceEstimate(ctx context.Context, stmt *qbtypes.Statement) error {
-	rows, guarded, err := q.estimateRows(ctx, stmt)
-	if err != nil {
-		return err
-	}
-	if !guarded {
-		return nil
-	}
-	if budget := stmt.CostGuard.MaxScanRows; rows > budget {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput,
-			"This query would scan about %d rows per shard in this range, over the per-shard limit of %d", rows, budget).
-			WithSuggestions(costGuardSuggestions(stmt.CostGuard.Warning)...)
-	}
-	return nil
-}
-
-// costGuardSuggestions leads with the requirement's advisory (e.g. the search() hint),
-// then how to get under budget.
-func costGuardSuggestions(advisory string) []string {
-	suggestions := make([]string, 0, 2)
-	if advisory != "" {
-		suggestions = append(suggestions, advisory)
-	}
-	return append(suggestions, "Narrow the time range or add a more selective filter.")
-}
-
 // narrowWindowByTraceID inspects the filter for trace_id predicates and clamps
 // [fromMS,toMS] to the time range stored in signoz_traces.distributed_trace_summary.
 // Returns the (possibly narrowed) window, overlap=false when the trace lies
@@ -556,10 +491,6 @@ func (q *builderQuery[T]) executeWindowList(ctx context.Context) (*qbtypes.Resul
 	var warnings []string
 	var warningsDocURL string
 
-	// Cumulative across visited buckets: the budget bounds the whole query's per-shard
-	// scan, not each bucket independently.
-	var estimatedScan int64
-
 	for _, r := range buckets {
 		q.spec.Offset = 0
 		q.spec.Limit = need
@@ -570,18 +501,6 @@ func (q *builderQuery[T]) executeWindowList(ctx context.Context) (*qbtypes.Resul
 		}
 		warnings = stmt.Warnings
 		warningsDocURL = stmt.WarningsDocURL
-		rowsEst, guarded, err := q.estimateRows(ctx, stmt)
-		if err != nil {
-			return nil, err
-		}
-		if guarded {
-			estimatedScan += rowsEst
-			if budget := stmt.CostGuard.MaxScanRows; estimatedScan > budget {
-				return nil, errors.NewInvalidInputf(errors.CodeInvalidInput,
-					"This query would scan about %d rows per shard across the time range, over the per-shard limit of %d", estimatedScan, budget).
-					WithSuggestions(costGuardSuggestions(stmt.CostGuard.Warning)...)
-			}
-		}
 		// Execute with proper context for partial value detection
 		res, err := q.executeWithContext(ctx, stmt.Query, stmt.Args)
 		if err != nil {

pkg/querier/promql_query.go

@@ -344,8 +344,8 @@ func (q *promqlQuery) Execute(ctx context.Context) (*qbv5.Result, error) {
 	}
 
 	// Accumulate ClickHouse-side scan stats across every storage query this
-	// evaluation issues: progress options propagate to each ClickHouse query
-	// through the context.
+	// evaluation issues (engine selectors or the compiled executor): progress
+	// options propagate to each ClickHouse query through the context.
 	var statsMu sync.Mutex
 	var rowsScanned, bytesScanned uint64
 	ctx = clickhouse.Context(ctx, clickhouse.WithProgress(func(p *clickhouse.Progress) {
@@ -371,6 +371,23 @@ func (q *promqlQuery) Execute(ctx context.Context) (*qbv5.Result, error) {
 		return q.toResult(matrix, nil, began, &statsMu, &rowsScanned, &bytesScanned), nil
 	}
 
+	// When the serving provider has the RangeExecutor capability
+	// (prometheus::provider: clickhousev2), serve the way the provider is
+	// designed to serve: transpiled when the shape allows. Without this the
+	// override would silently run the engine path only.
+	if re, ok := q.promEngine.(prometheus.RangeExecutor); ok {
+		matrix, served, err := re.TryExecuteRange(ctx, query, time.Unix(0, start), time.Unix(0, end), q.query.Step.Duration)
+		if err != nil {
+			if enhanced := tryEnhancePromQLExecError(err); enhanced != nil {
+				return nil, enhanced
+			}
+			return nil, err
+		}
+		if served {
+			return q.toResult(matrix, nil, began, &statsMu, &rowsScanned, &bytesScanned), nil
+		}
+	}
+
 	qry, err := q.promEngine.Engine().NewRangeQuery(
 		ctx,
 		q.promEngine.Storage(),

pkg/querier/promql_shadow.go

@@ -19,11 +19,11 @@ import (
 const shadowTimeout = 2 * time.Minute
 
 // runShadowCompare executes the query on the clickhousev2 provider exactly
-// as it would serve (the engine over the v2 querier), compares against the
-// served result and logs the outcome. Serving is never affected: this runs
-// after the response, off the request context, and only logs. The mismatch
-// and failure logs are the rollout evidence — serving cuts over to v2 only
-// after they stay clean.
+// as it would serve (transpiled when the shape allows, engine over the v2
+// querier otherwise), compares against the served result and logs the
+// outcome. Serving is never affected: this runs after the response, off the
+// request context, and only logs. The mismatch and failure logs are the
+// rollout evidence — serving cuts over to v2 only after they stay clean.
 func (q *promqlQuery) runShadowCompare(ctx context.Context, query string, startNs, endNs int64, served promql.Matrix, servedIn time.Duration) {
 	defer func() {
 		if r := recover(); r != nil {
@@ -45,7 +45,7 @@ func (q *promqlQuery) runShadowCompare(ctx context.Context, query string, startN
 
 	start, end := time.Unix(0, startNs), time.Unix(0, endNs)
 	began := time.Now()
-	shadow, err := executeOnProvider(ctx, q.opts.shadow, query, start, end, q.query.Step.Duration)
+	shadow, transpiled, err := executeOnProvider(ctx, q.opts.shadow, query, start, end, q.query.Step.Duration)
 	shadowIn := time.Since(began)
 
 	logAttrs := []any{
@@ -53,6 +53,7 @@ func (q *promqlQuery) runShadowCompare(ctx context.Context, query string, startN
 		slog.Int64("start_ms", startNs/int64(time.Millisecond)),
 		slog.Int64("end_ms", endNs/int64(time.Millisecond)),
 		slog.Duration("step", q.query.Step.Duration),
+		slog.Bool("transpiled", transpiled),
 		slog.Duration("served_in", servedIn),
 		slog.Duration("shadow_in", shadowIn),
 	}
@@ -82,29 +83,41 @@ func (q *promqlQuery) runShadowCompare(ctx context.Context, query string, startN
 // serveFromProvider evaluates the query the way the pinned provider would
 // serve it.
 func (q *promqlQuery) serveFromProvider(ctx context.Context, query string, startNs, endNs int64) (promql.Matrix, error) {
-	return executeOnProvider(ctx, q.opts.serve, query, time.Unix(0, startNs), time.Unix(0, endNs), q.query.Step.Duration)
+	matrix, _, err := executeOnProvider(ctx, q.opts.serve, query, time.Unix(0, startNs), time.Unix(0, endNs), q.query.Step.Duration)
+	return matrix, err
 }
 
 // executeOnProvider evaluates the query the way the provider would serve it:
-// the engine over the provider's storage. The returned matrix is an owned
-// copy.
-func executeOnProvider(ctx context.Context, prov prometheus.Prometheus, query string, start, end time.Time, step time.Duration) (promql.Matrix, error) {
+// transpiled in the datastore when the provider has the RangeExecutor
+// capability and the shape allows, the engine over the provider's storage
+// otherwise. The returned matrix is an owned copy.
+func executeOnProvider(ctx context.Context, prov prometheus.Prometheus, query string, start, end time.Time, step time.Duration) (promql.Matrix, bool, error) {
+	if re, ok := prov.(prometheus.RangeExecutor); ok {
+		matrix, served, err := re.TryExecuteRange(ctx, query, start, end, step)
+		if err != nil {
+			return nil, true, err
+		}
+		if served {
+			return matrix, true, nil
+		}
+	}
+
 	qry, err := prov.Engine().NewRangeQuery(ctx, prov.Storage(), nil, query, start, end, step)
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 	defer qry.Close()
 
 	res := qry.Exec(ctx)
 	if res.Err != nil {
-		return nil, res.Err
+		return nil, false, res.Err
 	}
 	matrix, err := res.Matrix()
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 	// Close returns the result's sample slices to the engine pool.
-	return copyMatrix(matrix), nil
+	return copyMatrix(matrix), false, nil
 }
 
 func copyMatrix(matrix promql.Matrix) promql.Matrix {

pkg/querybuilder/constants.go

@@ -8,9 +8,6 @@ const (
 	// BodyFullTextSearchDefaultWarning is emitted when a full-text search or "body" searches are hit
 	// with New JSON Body enhancements.
 	BodyFullTextSearchDefaultWarning = "Full text searches default to `body.message:string`. Use `body.<key>` to search a different field inside body"
-
-	// SearchWarning is emitted on every search() call — it scans all fields.
-	SearchWarning = "search() runs across all fields and can be slow and expensive. Prefer a specific field, e.g. `<context>.<field_key>:<type>`"
 )
 
 var (

pkg/querybuilder/key_resolution.go

@@ -161,16 +161,14 @@ func inferDataTypesFromList(values []any) []telemetrytypes.FieldDataType {
 	return out
 }
 
-// NewFunctionUnsupportedError returns the error for a has/hasAny/hasAll/hasToken/search
-// operator on a builder that doesn't support it (logs only), or nil for other operators.
+// NewFunctionUnsupportedError returns the error for a has/hasAny/hasAll/hasToken operator
+// on a builder that doesn't support it (logs body only), or nil for other operators.
 func NewFunctionUnsupportedError(operator qbtypes.FilterOperator) error {
 	switch operator {
 	case qbtypes.FilterOperatorHasToken:
 		return errors.NewInvalidInputf(errors.CodeInvalidInput, "function `hasToken` only supports body field as first parameter").WithUrl(hasTokenFunctionDocURL)
 	case qbtypes.FilterOperatorHas, qbtypes.FilterOperatorHasAny, qbtypes.FilterOperatorHasAll:
 		return errors.NewInvalidInputf(errors.CodeInvalidInput, "function `%s` supports only body JSON search", operator.FunctionName()).WithUrl(functionBodyJSONSearchDocURL)
-	case qbtypes.FilterOperatorSearch:
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "function `search` is only supported for logs")
 	default:
 		return nil
 	}

pkg/querybuilder/where_clause_visitor.go

@@ -43,8 +43,6 @@ type filterExpressionVisitor struct {
 	keysWithWarnings map[string]bool
 	startNs          uint64
 	endNs            uint64
-
-	requiresCostGuard bool
 }
 
 type FilterExprVisitorOpts struct {
@@ -83,10 +81,9 @@ func newFilterExpressionVisitor(opts FilterExprVisitorOpts) *filterExpressionVis
 }
 
 type PreparedWhereClause struct {
-	WhereClause       *sqlbuilder.WhereClause
-	Warnings          []string
-	WarningsDocURL    string
-	RequiresCostGuard bool
+	WhereClause    *sqlbuilder.WhereClause
+	Warnings       []string
+	WarningsDocURL string
 }
 
 func (p PreparedWhereClause) IsEmpty() bool {
@@ -168,12 +165,12 @@ func PrepareWhereClause(query string, opts FilterExprVisitorOpts) (PreparedWhere
 
 	// Return empty where clause so callers can skip the WHERE clause
 	if cond == "" || cond == SkipConditionLiteral {
-		return PreparedWhereClause{WhereClause: nil, Warnings: visitor.warnings, WarningsDocURL: visitor.mainWarnURL, RequiresCostGuard: visitor.requiresCostGuard}, nil
+		return PreparedWhereClause{WhereClause: nil, Warnings: visitor.warnings, WarningsDocURL: visitor.mainWarnURL}, nil
 	}
 
 	whereClause := sqlbuilder.NewWhereClause().AddWhereExpr(visitor.builder.Args, cond)
 
-	return PreparedWhereClause{WhereClause: whereClause, Warnings: visitor.warnings, WarningsDocURL: visitor.mainWarnURL, RequiresCostGuard: visitor.requiresCostGuard}, nil
+	return PreparedWhereClause{WhereClause: whereClause, Warnings: visitor.warnings, WarningsDocURL: visitor.mainWarnURL}, nil
 }
 
 // Visit dispatches to the specific visit method based on node type.
@@ -779,77 +776,11 @@ func normalizeFunctionValue(operator qbtypes.FilterOperator, functionName string
 	return valueParams, nil
 }
 
-// VisitSearchCall handles search('term'[, body, resource, …]): a case-insensitive
-// search term plus optional field-context scopes, ORing one FilterOperatorSearch per
-// scope (no scope = keyless, covering every field).
+// VisitSearchCall handles search('needle'). The search() function is parsed but
+// not yet implemented; reject it with a clear invalid-input error.
 func (v *filterExpressionVisitor) VisitSearchCall(ctx *grammar.SearchCallContext) any {
-	// Flag scan-heavy so the statement builder attaches the cost guard.
-	v.requiresCostGuard = true
-
-	valueList := ctx.ValueList()
-	if valueList == nil {
-		v.errors = append(v.errors, "function `search` expects a search term, e.g. search('error')")
-		return ErrorConditionLiteral
-	}
-	params := valueList.AllValue()
-	if len(params) == 0 {
-		v.errors = append(v.errors, "function `search` expects a search term, e.g. search('error')")
-		return ErrorConditionLiteral
-	}
-
-	searchText, ok := searchParamText(params[0])
-	if !ok {
-		v.errors = append(v.errors, "function `search` expects a search term as its first argument, e.g. search('error')")
-		return ErrorConditionLiteral
-	}
-
-	var fieldContexts []telemetrytypes.FieldContext
-	if len(params) == 1 {
-		fieldContexts = []telemetrytypes.FieldContext{telemetrytypes.FieldContextUnspecified}
-	} else {
-		for _, p := range params[1:] {
-			scopeText, sok := searchParamText(p)
-			if !sok {
-				v.errors = append(v.errors, "function `search` expects each scope to be a context, e.g. search('error', body, resource)")
-				return ErrorConditionLiteral
-			}
-			fc, fok := telemetrytypes.FieldContextFromText(scopeText)
-			if !fok {
-				v.errors = append(v.errors, fmt.Sprintf("invalid search scope %q; expected a field context: body, attribute, resource, or log", scopeText))
-				return ErrorConditionLiteral
-			}
-			fieldContexts = append(fieldContexts, fc)
-		}
-	}
-
-	var conds []string
-	for _, fieldContext := range fieldContexts {
-		key := telemetrytypes.NewTelemetryFieldKey("", fieldContext, telemetrytypes.FieldDataTypeUnspecified)
-		scoped, cok := v.buildConditions(key, nil, qbtypes.FilterOperatorSearch, searchText)
-		if !cok {
-			return ErrorConditionLiteral
-		}
-		conds = append(conds, scoped...)
-	}
-	if len(conds) == 0 {
-		return SkipConditionLiteral
-	}
-	if len(conds) == 1 {
-		return conds[0]
-	}
-	return v.builder.Or(conds...)
-}
-
-// searchParamText returns an argument's raw token text (quoted or bare) rather than its
-// visited value, so a bare word stays literal and search(1000000) isn't "1e+06".
-func searchParamText(val grammar.IValueContext) (string, bool) {
-	if val == nil {
-		return "", false
-	}
-	if val.QUOTED_TEXT() != nil {
-		return trimQuotes(val.QUOTED_TEXT().GetText()), true
-	}
-	return val.GetText(), true
+	v.errors = append(v.errors, "function `search` is not yet supported")
+	return ErrorConditionLiteral
 }
 
 // VisitFunctionParamList handles the parameter list for function calls.

pkg/signoz/provider.go

@@ -232,8 +232,6 @@ func NewSQLMigrationProviderFactories(
 		sqlmigration.NewMigrateDashboardsV1ToV2Factory(sqlstore, sqlschema, dashboardStore, tagModule),
 		sqlmigration.NewFillDashboardMeterSourceFactory(sqlstore, dashboardStore),
 		sqlmigration.NewUpdateRoleTransactionGroupsFactory(),
-		sqlmigration.NewFillDashboardSpecCollectionsFactory(sqlstore, dashboardStore),
-		sqlmigration.NewScrubEmailChannelTransportFactory(sqlstore),
 	)
 }
 

pkg/sqlmigration/106_fill_dashboard_spec_collections.go

@@ -1,124 +0,0 @@
-package sqlmigration
-
-import (
-	"context"
-	"log/slog"
-
-	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/dashboardtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/uptrace/bun"
-	"github.com/uptrace/bun/migrate"
-)
-
-// Required, non-nullable v2 spec fields, mapped to their empty value.
-var nullableSpecCollections = map[string]any{
-	"variables": []any{},
-	"panels":    map[string]any{},
-	"layouts":   []any{},
-}
-
-type fillDashboardSpecCollections struct {
-	sqlstore       sqlstore.SQLStore
-	dashboardStore dashboardtypes.Store
-	settings       factory.ProviderSettings
-}
-
-func NewFillDashboardSpecCollectionsFactory(sqlstore sqlstore.SQLStore, dashboardStore dashboardtypes.Store) factory.ProviderFactory[SQLMigration, Config] {
-	return factory.NewProviderFactory(
-		factory.MustNewName("fill_dashboard_spec_collections"),
-		func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
-			return &fillDashboardSpecCollections{sqlstore: sqlstore, dashboardStore: dashboardStore, settings: ps}, nil
-		},
-	)
-}
-
-func (migration *fillDashboardSpecCollections) Register(migrations *migrate.Migrations) error {
-	return migrations.Register(migration.Up, migration.Down)
-}
-
-// Up replaces a missing or null spec.variables / spec.panels / spec.layouts with the
-// empty collection. One transaction; v1 dashboards are skipped.
-func (migration *fillDashboardSpecCollections) Up(ctx context.Context, _ *bun.DB) error {
-	return migration.sqlstore.RunInTxCtx(ctx, nil, func(ctx context.Context) error {
-		var orgIDs []string
-		if err := migration.sqlstore.BunDBCtx(ctx).NewSelect().Model((*types.Organization)(nil)).Column("id").Scan(ctx, &orgIDs); err != nil {
-			return err
-		}
-
-		for _, id := range orgIDs {
-			orgID, err := valuer.NewUUID(id)
-			if err != nil {
-				return err
-			}
-			if err := migration.fillOrg(ctx, orgID); err != nil {
-				return err
-			}
-		}
-
-		return nil
-	})
-}
-
-// fillOrg fills every v2 dashboard in the org that needs it, inside the caller's transaction.
-func (migration *fillDashboardSpecCollections) fillOrg(ctx context.Context, orgID valuer.UUID) error {
-	// List, not ListV2: ListV2 paginates and excludes system dashboards; a migration needs every row.
-	storables, err := migration.dashboardStore.List(ctx, orgID)
-	if err != nil {
-		return err
-	}
-
-	logger := migration.settings.Logger
-	var stillInV1, malformedSpec, skippedNoNulls, migrated int
-	for _, storable := range storables {
-		if !storable.IsV2() {
-			stillInV1++
-			continue
-		}
-		// Raw data, not ToDashboardV2: decoding validates, and these are the rows it rejects.
-		spec, ok := storable.Data["spec"].(map[string]any)
-		if !ok {
-			malformedSpec++
-			logger.WarnContext(ctx, "v2 dashboard has no spec object; leaving it untouched", slog.String("org_id", orgID.String()), slog.String("dashboard_id", storable.ID.String()))
-			continue
-		}
-		if !fillSpecCollections(spec) {
-			skippedNoNulls++
-			continue
-		}
-		if err := migration.dashboardStore.Update(ctx, orgID, storable); err != nil {
-			return err
-		}
-		migrated++
-	}
-
-	logger.InfoContext(ctx, "filled required collections on v2 dashboards",
-		slog.String("org_id", orgID.String()),
-		slog.Int("total", len(storables)),
-		slog.Int("still_in_v1", stillInV1),
-		slog.Int("malformed_spec", malformedSpec),
-		slog.Int("skipped_no_nulls", skippedNoNulls),
-		slog.Int("migrated", migrated),
-	)
-	return nil
-}
-
-// fillSpecCollections empties each absent or null required collection, reporting whether
-// anything changed. A present value is left alone whatever its shape, so a malformed one
-// still surfaces as a validation error.
-func fillSpecCollections(spec map[string]any) bool {
-	changed := false
-	for field, empty := range nullableSpecCollections {
-		if value, present := spec[field]; !present || value == nil {
-			spec[field] = empty
-			changed = true
-		}
-	}
-	return changed
-}
-
-func (migration *fillDashboardSpecCollections) Down(context.Context, *bun.DB) error {
-	return nil
-}

pkg/sqlmigration/107_scrub_email_channel_transport.go

@@ -1,274 +0,0 @@
-package sqlmigration
-
-import (
-	"context"
-	"crypto/md5"
-	"encoding/json"
-	"fmt"
-	"log/slog"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/uptrace/bun"
-	"github.com/uptrace/bun/migrate"
-)
-
-type scrubEmailChannelTransport struct {
-	sqlstore sqlstore.SQLStore
-	logger   *slog.Logger
-}
-
-type alertmanagerConfigScrubRow struct {
-	bun.BaseModel `bun:"table:alertmanager_config"`
-
-	ID     string `bun:"id"`
-	Config string `bun:"config"`
-}
-
-type notificationChannelScrubRow struct {
-	bun.BaseModel `bun:"table:notification_channel"`
-
-	ID   string `bun:"id"`
-	Data string `bun:"data"`
-}
-
-var emailTransportKeys = []string{
-	"from",
-	"hello",
-	"smarthost",
-	"auth_username",
-	"auth_password",
-	"auth_password_file",
-	"auth_secret",
-	"auth_secret_file",
-	"auth_identity",
-	"require_tls",
-	"tls_config",
-	"force_implicit_tls",
-}
-
-var globalSMTPKeys = []string{
-	"smtp_from",
-	"smtp_hello",
-	"smtp_smarthost",
-	"smtp_auth_username",
-	"smtp_auth_password",
-	"smtp_auth_password_file",
-	"smtp_auth_secret",
-	"smtp_auth_secret_file",
-	"smtp_auth_identity",
-	"smtp_require_tls",
-	"smtp_tls_config",
-	"smtp_force_implicit_tls",
-}
-
-func NewScrubEmailChannelTransportFactory(sqlstore sqlstore.SQLStore) factory.ProviderFactory[SQLMigration, Config] {
-	return factory.NewProviderFactory(
-		factory.MustNewName("scrub_email_channel_transport"),
-		func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
-			return &scrubEmailChannelTransport{sqlstore: sqlstore, logger: ps.Logger}, nil
-		},
-	)
-}
-
-func (migration *scrubEmailChannelTransport) Register(migrations *migrate.Migrations) error {
-	if err := migrations.Register(migration.Up, migration.Down); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (migration *scrubEmailChannelTransport) Up(ctx context.Context, db *bun.DB) error {
-	tx, err := db.BeginTx(ctx, nil)
-	if err != nil {
-		return err
-	}
-
-	defer func() {
-		_ = tx.Rollback()
-	}()
-
-	if err := migration.scrubConfigs(ctx, tx); err != nil {
-		return err
-	}
-
-	if err := migration.scrubChannels(ctx, tx); err != nil {
-		return err
-	}
-
-	return tx.Commit()
-}
-
-func (migration *scrubEmailChannelTransport) scrubConfigs(ctx context.Context, tx bun.Tx) error {
-	rows := make([]*alertmanagerConfigScrubRow, 0)
-	if err := tx.NewSelect().Model(&rows).Scan(ctx); err != nil {
-		return err
-	}
-
-	for _, row := range rows {
-		cfg := make(map[string]json.RawMessage)
-		if err := json.Unmarshal([]byte(row.Config), &cfg); err != nil {
-			migration.logger.WarnContext(ctx, "skipping alertmanager config with unreadable config", slog.String("config_id", row.ID), errors.Attr(err))
-			continue
-		}
-
-		changed := false
-
-		if globalRaw, ok := cfg["global"]; ok && string(globalRaw) != "null" {
-			global := make(map[string]json.RawMessage)
-			if err := json.Unmarshal(globalRaw, &global); err != nil {
-				migration.logger.WarnContext(ctx, "skipping alertmanager config with unreadable global", slog.String("config_id", row.ID), errors.Attr(err))
-				continue
-			}
-			if deleteKeys(global, globalSMTPKeys) {
-				newGlobal, err := json.Marshal(global)
-				if err != nil {
-					migration.logger.WarnContext(ctx, "skipping alertmanager config, cannot marshal global", slog.String("config_id", row.ID), errors.Attr(err))
-					continue
-				}
-				cfg["global"] = newGlobal
-				changed = true
-			}
-		}
-
-		if receiversRaw, ok := cfg["receivers"]; ok && string(receiversRaw) != "null" {
-			receivers := make([]map[string]json.RawMessage, 0)
-			if err := json.Unmarshal(receiversRaw, &receivers); err != nil {
-				migration.logger.WarnContext(ctx, "skipping alertmanager config with unreadable receivers", slog.String("config_id", row.ID), errors.Attr(err))
-				continue
-			}
-
-			receiversChanged := false
-			unreadable := false
-			for _, receiver := range receivers {
-				scrubbed, err := scrubEmailConfigs(receiver)
-				if err != nil {
-					migration.logger.WarnContext(ctx, "skipping alertmanager config with unreadable email configs", slog.String("config_id", row.ID), errors.Attr(err))
-					unreadable = true
-					break
-				}
-				receiversChanged = receiversChanged || scrubbed
-			}
-			if unreadable {
-				continue
-			}
-
-			if receiversChanged {
-				newReceivers, err := json.Marshal(receivers)
-				if err != nil {
-					migration.logger.WarnContext(ctx, "skipping alertmanager config, cannot marshal receivers", slog.String("config_id", row.ID), errors.Attr(err))
-					continue
-				}
-				cfg["receivers"] = newReceivers
-				changed = true
-			}
-		}
-
-		if !changed {
-			continue
-		}
-
-		newConfig, err := json.Marshal(cfg)
-		if err != nil {
-			migration.logger.WarnContext(ctx, "skipping alertmanager config, cannot marshal config", slog.String("config_id", row.ID), errors.Attr(err))
-			continue
-		}
-
-		if _, err := tx.NewUpdate().
-			Model((*alertmanagerConfigScrubRow)(nil)).
-			Set("config = ?", string(newConfig)).
-			Set("hash = ?", fmt.Sprintf("%x", md5.Sum(newConfig))).
-			Where("id = ?", row.ID).
-			Exec(ctx); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (migration *scrubEmailChannelTransport) scrubChannels(ctx context.Context, tx bun.Tx) error {
-	rows := make([]*notificationChannelScrubRow, 0)
-	if err := tx.NewSelect().Model(&rows).Where("type = ?", "email").Scan(ctx); err != nil {
-		return err
-	}
-
-	for _, row := range rows {
-		receiver := make(map[string]json.RawMessage)
-		if err := json.Unmarshal([]byte(row.Data), &receiver); err != nil {
-			migration.logger.WarnContext(ctx, "skipping notification channel with unreadable data", slog.String("channel_id", row.ID), errors.Attr(err))
-			continue
-		}
-
-		scrubbed, err := scrubEmailConfigs(receiver)
-		if err != nil {
-			migration.logger.WarnContext(ctx, "skipping notification channel with unreadable email configs", slog.String("channel_id", row.ID), errors.Attr(err))
-			continue
-		}
-		if !scrubbed {
-			continue
-		}
-
-		newData, err := json.Marshal(receiver)
-		if err != nil {
-			migration.logger.WarnContext(ctx, "skipping notification channel, cannot marshal data", slog.String("channel_id", row.ID), errors.Attr(err))
-			continue
-		}
-
-		if _, err := tx.NewUpdate().
-			Model((*notificationChannelScrubRow)(nil)).
-			Set("data = ?", string(newData)).
-			Where("id = ?", row.ID).
-			Exec(ctx); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func scrubEmailConfigs(receiver map[string]json.RawMessage) (bool, error) {
-	emailConfigsRaw, ok := receiver["email_configs"]
-	if !ok || string(emailConfigsRaw) == "null" {
-		return false, nil
-	}
-
-	emailConfigs := make([]map[string]json.RawMessage, 0)
-	if err := json.Unmarshal(emailConfigsRaw, &emailConfigs); err != nil {
-		return false, err
-	}
-
-	changed := false
-	for _, emailConfig := range emailConfigs {
-		changed = deleteKeys(emailConfig, emailTransportKeys) || changed
-	}
-
-	if !changed {
-		return false, nil
-	}
-
-	newEmailConfigs, err := json.Marshal(emailConfigs)
-	if err != nil {
-		return false, err
-	}
-	receiver["email_configs"] = newEmailConfigs
-
-	return true, nil
-}
-
-func deleteKeys(m map[string]json.RawMessage, keys []string) bool {
-	deleted := false
-	for _, key := range keys {
-		if _, ok := m[key]; ok {
-			delete(m, key)
-			deleted = true
-		}
-	}
-
-	return deleted
-}
-
-func (migration *scrubEmailChannelTransport) Down(context.Context, *bun.DB) error {
-	return nil
-}

pkg/statementbuilder/config.go

@@ -15,12 +15,6 @@ type SkipResourceFingerprint struct {
 type Config struct {
 	// SkipResourceFingerprint configures when the resource fingerprint subquery is skipped in favor of main-table filtering.
 	SkipResourceFingerprint SkipResourceFingerprint `yaml:"skip_resource_fingerprint" mapstructure:"skip_resource_fingerprint"`
-	// SearchMaxScanRows caps per-shard rows a search() may scan, enforced by the querier
-	// via EXPLAIN ESTIMATE (0 disables).
-	SearchMaxScanRows int64 `yaml:"search_max_scan_rows" mapstructure:"search_max_scan_rows"`
-	// SearchMaxScanRowsJSONBody is the same budget for body_v2, where each row costs far
-	// more: toString() rebuilds every document and no skip index prunes (0 disables).
-	SearchMaxScanRowsJSONBody int64 `yaml:"search_max_scan_rows_json_body" mapstructure:"search_max_scan_rows_json_body"`
 }
 
 func NewConfig() Config {
@@ -29,8 +23,6 @@ func NewConfig() Config {
 			Enabled:   false,
 			Threshold: 100000,
 		},
-		SearchMaxScanRows:         60_000_000,
-		SearchMaxScanRowsJSONBody: 6_000_000,
 	}
 }
 
@@ -39,11 +31,5 @@ func (c Config) Validate() error {
 	if c.SkipResourceFingerprint.Enabled && c.SkipResourceFingerprint.Threshold == 0 {
 		return errors.NewInvalidInputf(errors.CodeInvalidInput, "skip_resource_fingerprint.threshold must be > 0 when enabled")
 	}
-	if c.SearchMaxScanRows < 0 {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "search_max_scan_rows must not be negative, got %v", c.SearchMaxScanRows)
-	}
-	if c.SearchMaxScanRowsJSONBody < 0 {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "search_max_scan_rows_json_body must not be negative, got %v", c.SearchMaxScanRowsJSONBody)
-	}
 	return nil
 }

pkg/statementbuilder/logsstatementbuilder/search_cost_guard_test.go

@@ -1,85 +0,0 @@
-package logsstatementbuilder
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/flagger/flaggertest"
-	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
-	"github.com/SigNoz/signoz/pkg/querybuilder"
-	"github.com/SigNoz/signoz/pkg/statementbuilder"
-	"github.com/SigNoz/signoz/pkg/telemetryschema/logstelemetryschema"
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes/telemetrytypestest"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestSearchCostGuard asserts Build attaches the CostGuard budget and its advisory.
-func TestSearchCostGuard(t *testing.T) {
-	releaseTime := time.Date(2024, 1, 15, 10, 0, 0, 0, time.UTC)
-	ctx := context.Background()
-	start := uint64(releaseTime.Add(-5 * time.Minute).UnixMilli())
-	end := uint64(releaseTime.UnixMilli())
-
-	fl := flaggertest.WithBooleanFlags(t, map[string]bool{})
-	fm := logstelemetryschema.NewFieldMapper(fl)
-	cb := logstelemetryschema.NewConditionBuilder(fm, fl)
-	store := telemetrytypestest.NewMockMetadataStore()
-	store.KeysMap = logstelemetryschema.BuildCompleteFieldKeyMap(releaseTime)
-	rewriter := querybuilder.NewAggExprRewriter(instrumentationtest.New().ToProviderSettings(), nil, fm, cb, fl)
-	sb := NewLogQueryStatementBuilder(
-		instrumentationtest.New().ToProviderSettings(),
-		store, fm, cb, rewriter, logstelemetryschema.DefaultFullTextColumn, fl, nil,
-		statementbuilder.Config{SearchMaxScanRows: 100000, SkipResourceFingerprint: statementbuilder.SkipResourceFingerprint{Enabled: false, Threshold: 100000}},
-	)
-	query := qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-		Signal: telemetrytypes.SignalLogs,
-		Filter: &qbtypes.Filter{Expression: "search('error')"},
-		Limit:  1,
-	}
-
-	stmt, err := sb.Build(ctx, valuer.UUID{}, start, end, qbtypes.RequestTypeRaw, query, nil)
-	require.NoError(t, err)
-	require.NotNil(t, stmt.CostGuard)
-	assert.Equal(t, int64(100000), stmt.CostGuard.MaxScanRows)
-	assert.Contains(t, stmt.Warnings, querybuilder.SearchWarning)
-}
-
-// TestSearchCostGuardJSONBody asserts body_v2 gets its own, lower budget.
-func TestSearchCostGuardJSONBody(t *testing.T) {
-	releaseTime := time.Date(2024, 1, 15, 10, 0, 0, 0, time.UTC)
-	ctx := context.Background()
-	start := uint64(releaseTime.Add(-5 * time.Minute).UnixMilli())
-	end := uint64(releaseTime.UnixMilli())
-
-	fl := flaggertest.WithUseJSONBody(t, true)
-	fm := logstelemetryschema.NewFieldMapper(fl)
-	cb := logstelemetryschema.NewConditionBuilder(fm, fl)
-	store := telemetrytypestest.NewMockMetadataStore()
-	store.KeysMap = logstelemetryschema.BuildCompleteFieldKeyMap(releaseTime)
-	rewriter := querybuilder.NewAggExprRewriter(instrumentationtest.New().ToProviderSettings(), nil, fm, cb, fl)
-	sb := NewLogQueryStatementBuilder(
-		instrumentationtest.New().ToProviderSettings(),
-		store, fm, cb, rewriter, logstelemetryschema.DefaultFullTextColumn, fl, nil,
-		statementbuilder.Config{
-			SearchMaxScanRows:         100000,
-			SearchMaxScanRowsJSONBody: 10000,
-			SkipResourceFingerprint:   statementbuilder.SkipResourceFingerprint{Enabled: false, Threshold: 100000},
-		},
-	)
-	query := qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-		Signal: telemetrytypes.SignalLogs,
-		Filter: &qbtypes.Filter{Expression: "search('error')"},
-		Limit:  1,
-	}
-
-	stmt, err := sb.Build(ctx, valuer.UUID{}, start, end, qbtypes.RequestTypeRaw, query, nil)
-	require.NoError(t, err)
-	require.NotNil(t, stmt.CostGuard)
-	assert.Equal(t, int64(10000), stmt.CostGuard.MaxScanRows)
-	assert.Contains(t, stmt.Warnings, querybuilder.SearchWarning)
-}

pkg/statementbuilder/logsstatementbuilder/statement_builder.go

@@ -41,16 +41,14 @@ type logQueryStatementBuilder struct {
 	fl                             flagger.Flagger
 	skipResourceFingerprintEnabled bool
 
-	fullTextColumn            *telemetrytypes.TelemetryFieldKey
-	searchMaxScanRows         int64
-	searchMaxScanRowsJSONBody int64
+	fullTextColumn *telemetrytypes.TelemetryFieldKey
 }
 
 var _ qbtypes.StatementBuilder[qbtypes.LogAggregation] = (*logQueryStatementBuilder)(nil)
 
 // NewFactory returns a provider factory for the logs statement builder. Its New
 // internalizes the FieldMapper, ConditionBuilder, and AggExprRewriter, and reads
-// SkipResourceFingerprint and the search() scan budgets from the config.
+// SkipResourceFingerprint from the config.
 func NewFactory(
 	telemetryStore telemetrystore.TelemetryStore,
 	metadataStore telemetrytypes.MetadataStore,
@@ -96,7 +94,7 @@ func NewLogQueryStatementBuilder(
 		cfg.SkipResourceFingerprint.Threshold,
 	)
 
-	b := &logQueryStatementBuilder{
+	return &logQueryStatementBuilder{
 		logger:                         logsSettings.Logger(),
 		metadataStore:                  metadataStore,
 		fm:                             fieldMapper,
@@ -105,11 +103,8 @@ func NewLogQueryStatementBuilder(
 		aggExprRewriter:                aggExprRewriter,
 		fl:                             fl,
 		skipResourceFingerprintEnabled: cfg.SkipResourceFingerprint.Enabled,
-		searchMaxScanRows:              cfg.SearchMaxScanRows,
-		searchMaxScanRowsJSONBody:      cfg.SearchMaxScanRowsJSONBody,
 		fullTextColumn:                 fullTextColumn,
 	}
-	return b
 }
 
 // Build builds a SQL query for logs based on the given parameters.
@@ -155,26 +150,9 @@ func (b *logQueryStatementBuilder) Build(
 	}
 
 	stmt.Warnings = append(stmt.Warnings, warnings...)
-	// Surface the guard's advisory to the user alongside the other warnings.
-	if stmt.CostGuard != nil && stmt.CostGuard.Warning != "" {
-		stmt.Warnings = append(stmt.Warnings, stmt.CostGuard.Warning)
-	}
 	return stmt, nil
 }
 
-// costGuardFor pairs the search() advisory with the budget for the body path taken —
-// body_v2 has its own, lower one. nil when the statement needs no guard.
-func (b *logQueryStatementBuilder) costGuardFor(ctx context.Context, orgID valuer.UUID, required bool) *qbtypes.CostGuard {
-	if !required {
-		return nil
-	}
-	maxScanRows := b.searchMaxScanRows
-	if b.fl.BooleanOrEmpty(ctx, flagger.FeatureUseJSONBody, featuretypes.NewFlaggerEvaluationContext(orgID)) {
-		maxScanRows = b.searchMaxScanRowsJSONBody
-	}
-	return &qbtypes.CostGuard{Warning: querybuilder.SearchWarning, MaxScanRows: maxScanRows}
-}
-
 func getKeySelectors(query qbtypes.QueryBuilderQuery[qbtypes.LogAggregation], bodyJSONEnabled bool) ([]*telemetrytypes.FieldKeySelector, []string) {
 	var keySelectors []*telemetrytypes.FieldKeySelector
 	var warnings []string
@@ -411,7 +389,6 @@ func (b *logQueryStatementBuilder) buildListQuery(
 		Args:           finalArgs,
 		Warnings:       preparedWhereClause.Warnings,
 		WarningsDocURL: preparedWhereClause.WarningsDocURL,
-		CostGuard:      b.costGuardFor(ctx, orgID, preparedWhereClause.RequiresCostGuard),
 	}
 
 	return stmt, nil
@@ -578,7 +555,6 @@ func (b *logQueryStatementBuilder) buildTimeSeriesQuery(
 		Args:           finalArgs,
 		Warnings:       preparedWhereClause.Warnings,
 		WarningsDocURL: preparedWhereClause.WarningsDocURL,
-		CostGuard:      b.costGuardFor(ctx, orgID, preparedWhereClause.RequiresCostGuard),
 	}
 
 	return stmt, nil
@@ -706,7 +682,6 @@ func (b *logQueryStatementBuilder) buildScalarQuery(
 		Args:           finalArgs,
 		Warnings:       preparedWhereClause.Warnings,
 		WarningsDocURL: preparedWhereClause.WarningsDocURL,
-		CostGuard:      b.costGuardFor(ctx, orgID, preparedWhereClause.RequiresCostGuard),
 	}
 
 	return stmt, nil

pkg/telemetrymetadata/metadata.go

@@ -2303,15 +2303,6 @@ func unionTemporalities(existing, additional []metrictypes.Temporality) []metric
 	return existing
 }
 
-// resolveMetricType applies the non-monotonic-cumulative-sum-as-gauge rule.
-// Monotonicity is only meaningful for cumulative sums; delta sums always stay Sum.
-func resolveMetricType(metricType metrictypes.Type, isMonotonic bool, temporality metrictypes.Temporality) metrictypes.Type {
-	if metricType == metrictypes.SumType && !isMonotonic && temporality == metrictypes.Cumulative {
-		return metrictypes.GaugeType
-	}
-	return metricType
-}
-
 func (t *telemetryMetaStore) fetchTemporalityTypeForTable(ctx context.Context, tableName string, adjustedStartTs, adjustedEndTs uint64, metricNames []string, extraConds ...string) (map[string][]metrictypes.Temporality, map[string]metrictypes.Type, error) {
 	temporalities := make(map[string][]metrictypes.Temporality)
 	types := make(map[string]metrictypes.Type)
@@ -2348,7 +2339,9 @@ func (t *telemetryMetaStore) fetchTemporalityTypeForTable(ctx context.Context, t
 		if temporality != metrictypes.Unknown {
 			temporalities[metricName] = append(temporalities[metricName], temporality)
 		}
-		metricType = resolveMetricType(metricType, isMonotonic, temporality)
+		if metricType == metrictypes.SumType && !isMonotonic {
+			metricType = metrictypes.GaugeType
+		}
 		types[metricName] = metricType
 	}
 	if err := rows.Err(); err != nil {
@@ -2399,7 +2392,9 @@ func (t *telemetryMetaStore) fetchMeterSourceMetricsTemporalityAndType(ctx conte
 		if err := rows.Scan(&metricName, &temporality, &metricType, &isMonotonic); err != nil {
 			return nil, nil, errors.Wrapf(err, errors.TypeInternal, errors.CodeInternal, "failed to scan temporality result")
 		}
-		metricType = resolveMetricType(metricType, isMonotonic, temporality)
+		if metricType == metrictypes.SumType && !isMonotonic {
+			metricType = metrictypes.GaugeType
+		}
 		temporalities[metricName] = temporality
 		types[metricName] = metricType
 	}

pkg/telemetrymetadata/metric_type_test.go

@@ -1,64 +0,0 @@
-package telemetrymetadata
-
-import (
-	"testing"
-
-	"github.com/SigNoz/signoz/pkg/types/metrictypes"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestResolveMetricType(t *testing.T) {
-	testCases := []struct {
-		description        string
-		inputMetricType    metrictypes.Type
-		inputIsMonotonic   bool
-		inputTemporality   metrictypes.Temporality
-		expectedMetricType metrictypes.Type
-	}{
-		{
-			description:        "delta non-monotonic sum stays a sum",
-			inputMetricType:    metrictypes.SumType,
-			inputIsMonotonic:   false,
-			inputTemporality:   metrictypes.Delta,
-			expectedMetricType: metrictypes.SumType,
-		},
-		{
-			description:        "cumulative non-monotonic sum becomes a gauge",
-			inputMetricType:    metrictypes.SumType,
-			inputIsMonotonic:   false,
-			inputTemporality:   metrictypes.Cumulative,
-			expectedMetricType: metrictypes.GaugeType,
-		},
-		{
-			description:        "cumulative monotonic sum stays a sum",
-			inputMetricType:    metrictypes.SumType,
-			inputIsMonotonic:   true,
-			inputTemporality:   metrictypes.Cumulative,
-			expectedMetricType: metrictypes.SumType,
-		},
-		{
-			description:        "delta monotonic sum stays a sum",
-			inputMetricType:    metrictypes.SumType,
-			inputIsMonotonic:   true,
-			inputTemporality:   metrictypes.Delta,
-			expectedMetricType: metrictypes.SumType,
-		},
-		{
-			description:        "gauge is unaffected by monotonicity",
-			inputMetricType:    metrictypes.GaugeType,
-			inputIsMonotonic:   false,
-			inputTemporality:   metrictypes.Unspecified,
-			expectedMetricType: metrictypes.GaugeType,
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.description, func(t *testing.T) {
-			assert.Equal(
-				t,
-				testCase.expectedMetricType,
-				resolveMetricType(testCase.inputMetricType, testCase.inputIsMonotonic, testCase.inputTemporality),
-			)
-		})
-	}
-}

pkg/telemetryschema/audittelemetryschema/condition_builder.go

@@ -134,7 +134,7 @@ func (c *conditionBuilder) ConditionFor(
 	sb *sqlbuilder.SelectBuilder,
 ) ([]string, []string, error) {
 
-	// has/hasAny/hasAll/hasToken/search are logs-only functions; reject for audit.
+	// has/hasAny/hasAll/hasToken are logs-body-only; reject for audit.
 	if err := querybuilder.NewFunctionUnsupportedError(operator); err != nil {
 		return nil, nil, err
 	}

pkg/telemetryschema/logstelemetryschema/condition_builder.go

@@ -3,7 +3,6 @@ package logstelemetryschema
 import (
 	"context"
 	"fmt"
-	"regexp"
 
 	schema "github.com/SigNoz/signoz-otel-collector/cmd/signozschemamigrator/schema_migrator"
 	"github.com/SigNoz/signoz/pkg/errors"
@@ -28,52 +27,6 @@ func NewConditionBuilder(fm qbtypes.FieldMapper, fl flagger.Flagger) *conditionB
 	return &conditionBuilder{fm: fm, fl: fl}
 }
 
-// conditionForSearch ORs a case-insensitive match of the search term across the key
-// context's searchable columns (unspecified context = every column).
-func (c *conditionBuilder) conditionForSearch(
-	ctx context.Context,
-	orgID valuer.UUID,
-	key *telemetrytypes.TelemetryFieldKey,
-	value any,
-	sb *sqlbuilder.SelectBuilder,
-) ([]string, []string, error) {
-	// QuoteMeta + LOWER on both sides, not (?i): a literal match that can still use the
-	// LOWER(toString(body_v2)) skip index.
-	term := regexp.QuoteMeta(fmt.Sprintf("%v", value))
-
-	useJSONBody := c.fl.BooleanOrEmpty(ctx, flagger.FeatureUseJSONBody, featuretypes.NewFlaggerEvaluationContext(orgID))
-
-	var conditions []string
-
-	for _, col := range searchColumns(key.FieldContext, useJSONBody) {
-		switch col.Type.GetType() {
-		case schema.ColumnTypeEnumMap:
-			keysExpr := fmt.Sprintf("mapKeys(%s)", col.Name)
-			valsExpr := fmt.Sprintf("mapValues(%s)", col.Name)
-			// match() needs a String array; cast non-string map values first.
-			if mc, ok := col.Type.(schema.MapColumnType); ok && mc.ValueType.GetType() != schema.ColumnTypeEnumString {
-				valsExpr = fmt.Sprintf("arrayMap(x -> toString(x), mapValues(%s))", col.Name)
-			}
-			conditions = append(conditions, sb.Or(
-				fmt.Sprintf("arrayExists(x -> match(LOWER(x), LOWER(%s)), %s)", sb.Var(term), keysExpr),
-				fmt.Sprintf("arrayExists(x -> match(LOWER(x), LOWER(%s)), %s)", sb.Var(term), valsExpr),
-			))
-		case schema.ColumnTypeEnumJSON:
-			conditions = append(conditions, fmt.Sprintf("match(LOWER(toString(%s)), LOWER(%s))", col.Name, sb.Var(term)))
-		case schema.ColumnTypeEnumString, schema.ColumnTypeEnumLowCardinality:
-			conditions = append(conditions, fmt.Sprintf("match(LOWER(%s), LOWER(%s))", col.Name, sb.Var(term)))
-		default:
-			return nil, nil, errors.NewInternalf(errors.CodeInternal, "search does not support the column type of %q", col.Name)
-		}
-	}
-
-	if len(conditions) == 0 {
-		return nil, nil, nil
-	}
-	// The advisory rides on CostGuard (set by the visitor), not warnings.
-	return []string{sb.Or(conditions...)}, nil, nil
-}
-
 // isBodyJSONSearch reports whether a key addresses a path within the body JSON. Only
 // an explicit Body context qualifies; a bare, context-less `body` (e.g. full-text
 // `count_distinct(body)` or `body EXISTS`) is a full-text match, not a `$.body` path.
@@ -455,11 +408,6 @@ func (c *conditionBuilder) ConditionFor(
 	matches := querybuilder.MatchingFieldKeys(key, fieldKeys)
 	skipResourceFilter := options.SkipResourceFilter
 
-	// search() resolves its own (optional) scope; handle it before key resolution.
-	if operator == qbtypes.FilterOperatorSearch {
-		return c.conditionForSearch(ctx, orgID, key, value, sb)
-	}
-
 	keys, warning := querybuilder.ResolveKeys(key, matches)
 	var warnings []string
 	if warning != "" {

pkg/telemetryschema/logstelemetryschema/field_mapper.go

@@ -635,37 +635,3 @@ func (m *fieldMapper) existsExpressionFor(
 	}
 	return querybuilder.ExistsExpression(columns, key, tsStart, tsEnd, fieldExpression, exists)
 }
-
-// searchColumns is the single source of truth for the columns search() fans out across,
-// by context; body is body_v2 when useJSONBody, else the legacy body string.
-func searchColumns(fieldContext telemetrytypes.FieldContext, useJSONBody bool) []*schema.Column {
-	switch fieldContext {
-	case telemetrytypes.FieldContextLog:
-		return []*schema.Column{
-			logsV2Columns[LogsV2SeverityTextColumn],
-			logsV2Columns[LogsV2TraceIDColumn],
-			logsV2Columns[LogsV2SpanIDColumn],
-		}
-	case telemetrytypes.FieldContextBody:
-		if useJSONBody {
-			return []*schema.Column{logsV2Columns[LogsV2BodyV2Column]}
-		}
-		return []*schema.Column{logsV2Columns[LogsV2BodyColumn]}
-	case telemetrytypes.FieldContextAttribute:
-		return []*schema.Column{
-			logsV2Columns[LogsV2AttributesStringColumn],
-			logsV2Columns[LogsV2AttributesNumberColumn],
-			logsV2Columns[LogsV2AttributesBoolColumn],
-		}
-	case telemetrytypes.FieldContextResource:
-		return []*schema.Column{
-			logsV2Columns[LogsV2ResourcesStringColumn],
-		}
-	default:
-		columns := searchColumns(telemetrytypes.FieldContextLog, useJSONBody)
-		columns = append(columns, searchColumns(telemetrytypes.FieldContextBody, useJSONBody)...)
-		columns = append(columns, searchColumns(telemetrytypes.FieldContextAttribute, useJSONBody)...)
-		columns = append(columns, searchColumns(telemetrytypes.FieldContextResource, useJSONBody)...)
-		return columns
-	}
-}

pkg/telemetryschema/logstelemetryschema/filter_expr_search_test.go

@@ -1,284 +0,0 @@
-package logstelemetryschema
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/flagger"
-	"github.com/SigNoz/signoz/pkg/flagger/flaggertest"
-	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
-	"github.com/SigNoz/signoz/pkg/querybuilder"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-	"github.com/huandu/go-sqlbuilder"
-	"github.com/stretchr/testify/require"
-)
-
-// searchFanOut returns the WHERE fragment search() fans out to; bodyExpr differs
-// between the legacy string body and the body_v2 JSON column.
-func searchFanOut(bodyExpr string) string {
-	return "(match(LOWER(severity_text), LOWER(?)) OR match(LOWER(trace_id), LOWER(?)) OR match(LOWER(span_id), LOWER(?)) OR " +
-		bodyExpr + " OR " +
-		"(arrayExists(x -> match(LOWER(x), LOWER(?)), mapKeys(attributes_string)) OR arrayExists(x -> match(LOWER(x), LOWER(?)), mapValues(attributes_string))) OR " +
-		"(arrayExists(x -> match(LOWER(x), LOWER(?)), mapKeys(attributes_number)) OR arrayExists(x -> match(LOWER(x), LOWER(?)), arrayMap(x -> toString(x), mapValues(attributes_number)))) OR " +
-		"(arrayExists(x -> match(LOWER(x), LOWER(?)), mapKeys(attributes_bool)) OR arrayExists(x -> match(LOWER(x), LOWER(?)), arrayMap(x -> toString(x), mapValues(attributes_bool)))) OR " +
-		"(arrayExists(x -> match(LOWER(x), LOWER(?)), mapKeys(resources_string)) OR arrayExists(x -> match(LOWER(x), LOWER(?)), mapValues(resources_string))))"
-}
-
-// searchArgs returns v once per bound parameter search() emits — one per searchable
-// column expression (currently 12).
-func searchArgs(v any) []any {
-	const searchColumnParams = 12
-	args := make([]any, searchColumnParams)
-	for i := range args {
-		args[i] = v
-	}
-	return args
-}
-
-// TestFilterExprSearch covers search('term') fanning out across every searchable
-// column via FilterOperatorSearch.
-func TestFilterExprSearch(t *testing.T) {
-	releaseTime := time.Date(2024, 1, 15, 10, 0, 0, 0, time.UTC)
-	inWindowStart := uint64(releaseTime.Add(-5 * time.Minute).UnixNano())
-	inWindowEnd := uint64(releaseTime.Add(5 * time.Minute).UnixNano())
-
-	legacyBody := "match(LOWER(body), LOWER(?))"
-	jsonBody := "match(LOWER(toString(body_v2)), LOWER(?))"
-
-	// Single-context scope fragments (the fan-out narrowed to one context).
-	logScope := "(match(LOWER(severity_text), LOWER(?)) OR match(LOWER(trace_id), LOWER(?)) OR match(LOWER(span_id), LOWER(?)))"
-	resourceScope := "(arrayExists(x -> match(LOWER(x), LOWER(?)), mapKeys(resources_string)) OR arrayExists(x -> match(LOWER(x), LOWER(?)), mapValues(resources_string)))"
-
-	serviceNameEq := "(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) = ? " +
-		"AND multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL) IS NOT NULL)"
-
-	testCases := []struct {
-		name                  string
-		query                 string
-		jsonBodyEnabled       bool
-		fullTextColumn        *telemetrytypes.TelemetryFieldKey
-		startNs               uint64
-		endNs                 uint64
-		shouldPass            bool
-		expectedQuery         string
-		expectedArgs          []any
-		expectWarning         bool
-		expectedErrorContains string
-	}{
-		{
-			name:           "quoted, legacy body",
-			query:          "search('error')",
-			fullTextColumn: DefaultFullTextColumn,
-			startNs:        inWindowStart,
-			endNs:          inWindowEnd,
-			shouldPass:     true,
-			expectedQuery:  "WHERE " + searchFanOut(legacyBody),
-			expectedArgs:   searchArgs("error"),
-			expectWarning:  true,
-		},
-		{
-			name:            "quoted, json body",
-			query:           "search('error')",
-			jsonBodyEnabled: true,
-			fullTextColumn:  DefaultFullTextColumn,
-			startNs:         inWindowStart,
-			endNs:           inWindowEnd,
-			shouldPass:      true,
-			expectedQuery:   "WHERE " + searchFanOut(jsonBody),
-			expectedArgs:    searchArgs("error"),
-			expectWarning:   true,
-		},
-		{
-			name:           "bare word",
-			query:          "search(timeout)",
-			fullTextColumn: DefaultFullTextColumn,
-			startNs:        inWindowStart,
-			endNs:          inWindowEnd,
-			shouldPass:     true,
-			expectedQuery:  "WHERE " + searchFanOut(legacyBody),
-			expectedArgs:   searchArgs("timeout"),
-			expectWarning:  true,
-		},
-		{
-			name:           "negated",
-			query:          "NOT search('error')",
-			fullTextColumn: DefaultFullTextColumn,
-			startNs:        inWindowStart,
-			endNs:          inWindowEnd,
-			shouldPass:     true,
-			expectedQuery:  "WHERE NOT (" + searchFanOut(legacyBody) + ")",
-			expectedArgs:   searchArgs("error"),
-			expectWarning:  true,
-		},
-		{
-			name:           "combined with field filter",
-			query:          "search('error') AND service.name=\"api\"",
-			fullTextColumn: DefaultFullTextColumn,
-			startNs:        inWindowStart,
-			endNs:          inWindowEnd,
-			shouldPass:     true,
-			expectedQuery:  "WHERE (" + searchFanOut(legacyBody) + " AND " + serviceNameEq + ")",
-			expectedArgs:   append(searchArgs("error"), "api"),
-			expectWarning:  true,
-		},
-		{
-			// The builder caps no window; the querier's estimate gate bounds scan cost.
-			name:           "wide window builds (estimate gate lives in querier)",
-			query:          "search('error')",
-			fullTextColumn: DefaultFullTextColumn,
-			startNs:        uint64(releaseTime.Add(-10 * time.Hour).UnixNano()),
-			endNs:          inWindowEnd,
-			shouldPass:     true,
-			expectedQuery:  "WHERE " + searchFanOut(legacyBody),
-			expectedArgs:   searchArgs("error"),
-			expectWarning:  true,
-		},
-		{
-			// fullTextColumn governs only bare/quoted free text, so search() must
-			// work when it is unset.
-			name:           "independent of full text column",
-			query:          "search('error')",
-			fullTextColumn: nil,
-			startNs:        inWindowStart,
-			endNs:          inWindowEnd,
-			shouldPass:     true,
-			expectedQuery:  "WHERE " + searchFanOut(legacyBody),
-			expectedArgs:   searchArgs("error"),
-			expectWarning:  true,
-		},
-		{
-			// The bare word is the literal search term; Normalize would strip "resource.".
-			name:           "bare word with context prefix is not normalized",
-			query:          "search(resource.deployment)",
-			fullTextColumn: DefaultFullTextColumn,
-			startNs:        inWindowStart,
-			endNs:          inWindowEnd,
-			shouldPass:     true,
-			expectedQuery:  "WHERE " + searchFanOut(legacyBody),
-			expectedArgs:   searchArgs("resource\\.deployment"),
-			expectWarning:  true,
-		},
-		{
-			// Literal digits, not %v of a parsed float64 (which would scan "1e+06").
-			name:           "numeric search term is not scientific notation",
-			query:          "search(1000000)",
-			fullTextColumn: DefaultFullTextColumn,
-			startNs:        inWindowStart,
-			endNs:          inWindowEnd,
-			shouldPass:     true,
-			expectedQuery:  "WHERE " + searchFanOut(legacyBody),
-			expectedArgs:   searchArgs("1000000"),
-			expectWarning:  true,
-		},
-		{
-			name:           "scoped to body, legacy",
-			query:          "search('error', body)",
-			fullTextColumn: DefaultFullTextColumn,
-			startNs:        inWindowStart,
-			endNs:          inWindowEnd,
-			shouldPass:     true,
-			expectedQuery:  "WHERE (" + legacyBody + ")",
-			expectedArgs:   []any{"error"},
-			expectWarning:  true,
-		},
-		{
-			name:            "scoped to body, json",
-			query:           "search('error', body)",
-			jsonBodyEnabled: true,
-			fullTextColumn:  DefaultFullTextColumn,
-			startNs:         inWindowStart,
-			endNs:           inWindowEnd,
-			shouldPass:      true,
-			expectedQuery:   "WHERE (" + jsonBody + ")",
-			expectedArgs:    []any{"error"},
-			expectWarning:   true,
-		},
-		{
-			name:           "scoped to resource (quoted scope)",
-			query:          "search('error', 'resource')",
-			fullTextColumn: DefaultFullTextColumn,
-			startNs:        inWindowStart,
-			endNs:          inWindowEnd,
-			shouldPass:     true,
-			expectedQuery:  "WHERE (" + resourceScope + ")",
-			expectedArgs:   []any{"error", "error"},
-			expectWarning:  true,
-		},
-		{
-			name:           "scoped to log fields",
-			query:          "search('error', log)",
-			fullTextColumn: DefaultFullTextColumn,
-			startNs:        inWindowStart,
-			endNs:          inWindowEnd,
-			shouldPass:     true,
-			expectedQuery:  "WHERE " + logScope,
-			expectedArgs:   []any{"error", "error", "error"},
-			expectWarning:  true,
-		},
-		{
-			name:           "scoped to multiple contexts",
-			query:          "search('error', body, resource)",
-			fullTextColumn: DefaultFullTextColumn,
-			startNs:        inWindowStart,
-			endNs:          inWindowEnd,
-			shouldPass:     true,
-			expectedQuery:  "WHERE ((" + legacyBody + ") OR (" + resourceScope + "))",
-			expectedArgs:   []any{"error", "error", "error"},
-			expectWarning:  true,
-		},
-		{
-			name:                  "invalid scope",
-			query:                 "search('error', 'timeout')",
-			fullTextColumn:        DefaultFullTextColumn,
-			startNs:               inWindowStart,
-			endNs:                 inWindowEnd,
-			shouldPass:            false,
-			expectedErrorContains: "invalid search scope",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			fl := flaggertest.WithBooleanFlags(t, map[string]bool{
-				flagger.FeatureUseJSONBody.String(): tc.jsonBodyEnabled,
-			})
-			fm := NewFieldMapper(fl)
-			cb := NewConditionBuilder(fm, fl)
-			keys := BuildCompleteFieldKeyMap(releaseTime)
-
-			opts := querybuilder.FilterExprVisitorOpts{
-				Context:          context.Background(),
-				Logger:           instrumentationtest.New().Logger(),
-				FieldMapper:      fm,
-				ConditionBuilder: cb,
-				FieldKeys:        keys,
-				FullTextColumn:   tc.fullTextColumn,
-				StartNs:          tc.startNs,
-				EndNs:            tc.endNs,
-			}
-
-			clause, err := querybuilder.PrepareWhereClause(tc.query, opts)
-
-			if !tc.shouldPass {
-				require.Error(t, err)
-				require.True(t, detailContains(err, tc.expectedErrorContains),
-					"error %v should contain %q", err, tc.expectedErrorContains)
-				return
-			}
-
-			require.NoError(t, err)
-			require.False(t, clause.IsEmpty())
-
-			sql, args := clause.WhereClause.BuildWithFlavor(sqlbuilder.ClickHouse)
-			require.Equal(t, tc.expectedQuery, sql)
-			require.Equal(t, tc.expectedArgs, args)
-
-			if tc.expectWarning {
-				// The visitor only flags the guard; the statement builder
-				// materializes it from config.
-				require.True(t, clause.RequiresCostGuard)
-			}
-		})
-	}
-}

pkg/telemetryschema/metricstelemetryschema/condition_builder.go

@@ -157,7 +157,7 @@ func (c *conditionBuilder) ConditionFor(
 	sb *sqlbuilder.SelectBuilder,
 ) ([]string, []string, error) {
 
-	// has/hasAny/hasAll/hasToken/search are logs-only functions; reject for metrics.
+	// has/hasAny/hasAll/hasToken are logs-body-only; reject for metrics.
 	if err := querybuilder.NewFunctionUnsupportedError(operator); err != nil {
 		return nil, nil, err
 	}

pkg/telemetryschema/tracestelemetryschema/condition_builder.go

@@ -205,7 +205,7 @@ func (c *conditionBuilder) ConditionFor(
 	sb *sqlbuilder.SelectBuilder,
 ) ([]string, []string, error) {
 
-	// has/hasAny/hasAll/hasToken/search are logs-only functions; reject for traces.
+	// has/hasAny/hasAll/hasToken are logs-body-only; reject for traces.
 	if err := querybuilder.NewFunctionUnsupportedError(operator); err != nil {
 		return nil, nil, err
 	}

pkg/types/alertmanagertypes/channel_test.go

@@ -35,8 +35,12 @@ func TestNewConfigFromChannels(t *testing.T) {
 					"email_configs": []any{map[string]any{
 						"send_resolved": false,
 						"to":            "test@example.com",
-						"smarthost":     "",
+						"from":          "alerts@example.com",
+						"hello":         "localhost",
+						"smarthost":     "smtp.example.com:587",
+						"require_tls":   true,
 						"html":          "{{ template \"email.default.html\" . }}",
+						"tls_config":    map[string]any{"insecure_skip_verify": false},
 						"threading":     map[string]any{},
 					}},
 				},
@@ -59,6 +63,7 @@ func TestNewConfigFromChannels(t *testing.T) {
 					"slack_configs": []any{map[string]any{
 						"send_resolved": true,
 						"api_url":       "https://slack.com/api/test",
+						"app_url":       "https://slack.com/api/chat.postMessage",
 						"channel":       "#alerts",
 						"callback_id":   "{{ template \"slack.default.callbackid\" . }}",
 						"color":         "{{ if eq .Status \"firing\" }}danger{{ else }}good{{ end }}",
@@ -72,6 +77,12 @@ func TestNewConfigFromChannels(t *testing.T) {
 						"title":         "{{ template \"slack.default.title\" . }}",
 						"title_link":    "{{ template \"slack.default.titlelink\" . }}",
 						"username":      "{{ template \"slack.default.username\" . }}",
+						"http_config": map[string]any{
+							"tls_config":       map[string]any{"insecure_skip_verify": false},
+							"follow_redirects": true,
+							"enable_http2":     true,
+							"proxy_url":        nil,
+						},
 					}},
 				},
 			},
@@ -93,6 +104,7 @@ func TestNewConfigFromChannels(t *testing.T) {
 					"pagerduty_configs": []any{map[string]any{
 						"send_resolved": false,
 						"service_key":   "test",
+						"url":           "https://events.pagerduty.com/v2/enqueue",
 						"client":        "{{ template \"pagerduty.default.client\" . }}",
 						"client_url":    "{{ template \"pagerduty.default.clientURL\" . }}",
 						"description":   "{{ template \"pagerduty.default.description\" .}}",
@@ -104,6 +116,12 @@ func TestNewConfigFromChannels(t *testing.T) {
 							"num_resolved": "{{ .Alerts.Resolved | len }}",
 							"resolved":     "{{ .Alerts.Resolved | toJson }}",
 						},
+						"http_config": map[string]any{
+							"tls_config":       map[string]any{"insecure_skip_verify": false},
+							"follow_redirects": true,
+							"enable_http2":     true,
+							"proxy_url":        nil,
+						},
 					}},
 				},
 			},
@@ -130,6 +148,7 @@ func TestNewConfigFromChannels(t *testing.T) {
 					"pagerduty_configs": []any{map[string]any{
 						"send_resolved": false,
 						"service_key":   "test",
+						"url":           "https://events.pagerduty.com/v2/enqueue",
 						"client":        "{{ template \"pagerduty.default.client\" . }}",
 						"client_url":    "{{ template \"pagerduty.default.clientURL\" . }}",
 						"description":   "{{ template \"pagerduty.default.description\" .}}",
@@ -141,6 +160,12 @@ func TestNewConfigFromChannels(t *testing.T) {
 							"num_resolved": "{{ .Alerts.Resolved | len }}",
 							"resolved":     "{{ .Alerts.Resolved | toJson }}",
 						},
+						"http_config": map[string]any{
+							"tls_config":       map[string]any{"insecure_skip_verify": false},
+							"follow_redirects": true,
+							"enable_http2":     true,
+							"proxy_url":        nil,
+						},
 					}},
 				},
 				{
@@ -148,6 +173,7 @@ func TestNewConfigFromChannels(t *testing.T) {
 					"slack_configs": []any{map[string]any{
 						"send_resolved": true,
 						"api_url":       "https://slack.com/api/test",
+						"app_url":       "https://slack.com/api/chat.postMessage",
 						"channel":       "#alerts",
 						"callback_id":   "{{ template \"slack.default.callbackid\" . }}",
 						"color":         "{{ if eq .Status \"firing\" }}danger{{ else }}good{{ end }}",
@@ -161,6 +187,12 @@ func TestNewConfigFromChannels(t *testing.T) {
 						"title":         "{{ template \"slack.default.title\" . }}",
 						"title_link":    "{{ template \"slack.default.titlelink\" . }}",
 						"username":      "{{ template \"slack.default.username\" . }}",
+						"http_config": map[string]any{
+							"tls_config":       map[string]any{"insecure_skip_verify": false},
+							"follow_redirects": true,
+							"enable_http2":     true,
+							"proxy_url":        nil,
+						},
 					}},
 				},
 			},

pkg/types/alertmanagertypes/config.go

@@ -117,11 +117,6 @@ func NewConfigFromStoreableConfig(sc *StoreableConfig) (*Config, error) {
 		return nil, err
 	}
 
-	// It must be replaced with an empty, non-nil global, upstream swaps nil for
-	// DefaultGlobalConfig, which would let a path that skips SetGlobalConfig pass
-	// validation and fail silently at delivery instead of failing fast here.
-	alertmanagerConfig.Global = &config.GlobalConfig{}
-
 	return &Config{
 		alertmanagerConfig: alertmanagerConfig,
 		customConfigs:      customConfigs,
@@ -179,7 +174,7 @@ func newConfigFromString(s string) (*config.Config, map[string]customReceiverCon
 	return amConfig, customConfigs, nil
 }
 
-func extendedReceivers(c *config.Config, customConfigs map[string]customReceiverConfigs) []*Receiver {
+func newRawFromConfig(c *config.Config, customConfigs map[string]customReceiverConfigs) []byte {
 	receivers := make([]*Receiver, len(c.Receivers))
 	for i := range c.Receivers {
 		base := c.Receivers[i]
@@ -190,14 +185,7 @@ func extendedReceivers(c *config.Config, customConfigs map[string]customReceiver
 		}
 	}
 
-	return receivers
-}
-
-func newRawFromConfig(c *config.Config, customConfigs map[string]customReceiverConfigs) []byte {
-	persistable := *c
-	persistable.Global = nil
-
-	b, err := json.Marshal(storedConfig{Config: &persistable, Receivers: extendedReceivers(c, customConfigs)})
+	b, err := json.Marshal(storedConfig{Config: c, Receivers: receivers})
 	if err != nil {
 		// Taking inspiration from the upstream. This is never expected to happen.
 		return []byte(fmt.Sprintf("<error creating config string: %s>", err))
@@ -218,37 +206,6 @@ func (c *Config) flush() {
 	c.storeableConfig.UpdatedAt = time.Now()
 }
 
-func (c *Config) Resolved() (*Config, error) {
-	raw, err := json.Marshal(storedConfig{Config: c.alertmanagerConfig, Receivers: extendedReceivers(c.alertmanagerConfig, c.customConfigs)})
-	if err != nil {
-		return nil, err
-	}
-
-	alertmanagerConfig, customConfigs, err := newConfigFromString(string(raw))
-	if err != nil {
-		return nil, err
-	}
-
-	if err := alertmanagerConfig.UnmarshalYAML(func(i interface{}) error { return nil }); err != nil {
-		return nil, err
-	}
-
-	storeableConfig := *c.storeableConfig
-	resolved := &Config{
-		alertmanagerConfig: alertmanagerConfig,
-		customConfigs:      customConfigs,
-		storeableConfig:    &storeableConfig,
-	}
-	resolved.applyNativeDefaults()
-
-	return resolved, nil
-}
-
-func (c *Config) validate() error {
-	_, err := c.Resolved()
-	return err
-}
-
 func (c *Config) CopyWithReset() (*Config, error) {
 	newConfig, err := NewDefaultConfig(
 		*c.alertmanagerConfig.Global,
@@ -314,15 +271,6 @@ func (c *Config) StoreableConfig() *StoreableConfig {
 	return c.storeableConfig
 }
 
-func cloneReceiver(receiver *Receiver) (*Receiver, error) {
-	raw, err := json.Marshal(receiver)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewReceiver(string(raw))
-}
-
 func (c *Config) CreateReceiver(receiver *Receiver) error {
 	// check that receiver name is not already used
 	for _, existingReceiver := range c.alertmanagerConfig.Receivers {
@@ -331,21 +279,16 @@ func (c *Config) CreateReceiver(receiver *Receiver) error {
 		}
 	}
 
-	owned, err := cloneReceiver(receiver)
-	if err != nil {
-		return err
-	}
-
-	route, err := NewRouteFromReceiver(owned)
+	route, err := NewRouteFromReceiver(receiver)
 	if err != nil {
 		return err
 	}
 
 	c.alertmanagerConfig.Route.Routes = append(c.alertmanagerConfig.Route.Routes, route)
-	c.alertmanagerConfig.Receivers = append(c.alertmanagerConfig.Receivers, *owned.Receiver)
-	c.setCustomConfigs(owned)
+	c.alertmanagerConfig.Receivers = append(c.alertmanagerConfig.Receivers, *receiver.Receiver)
+	c.setCustomConfigs(receiver)
 
-	if err := c.validate(); err != nil {
+	if err := c.alertmanagerConfig.UnmarshalYAML(func(i interface{}) error { return nil }); err != nil {
 		return err
 	}
 	c.applyNativeDefaults()
@@ -370,21 +313,16 @@ func (c *Config) GetReceiver(name string) (*Receiver, error) {
 }
 
 func (c *Config) UpdateReceiver(receiver *Receiver) error {
-	owned, err := cloneReceiver(receiver)
-	if err != nil {
-		return err
-	}
-
 	// find and update receiver
 	for i, existingReceiver := range c.alertmanagerConfig.Receivers {
-		if existingReceiver.Name == owned.Name {
-			c.alertmanagerConfig.Receivers[i] = *owned.Receiver
-			c.setCustomConfigs(owned)
+		if existingReceiver.Name == receiver.Name {
+			c.alertmanagerConfig.Receivers[i] = *receiver.Receiver
+			c.setCustomConfigs(receiver)
 			break
 		}
 	}
 
-	if err := c.validate(); err != nil {
+	if err := c.alertmanagerConfig.UnmarshalYAML(func(i interface{}) error { return nil }); err != nil {
 		return err
 	}
 	c.applyNativeDefaults()

pkg/types/alertmanagertypes/config_test.go

@@ -330,150 +330,6 @@ func TestSetGlobalConfigPreservesSMTPRequireTLS(t *testing.T) {
 	}
 }
 
-func newSMTPGlobalConfig() GlobalConfig {
-	return GlobalConfig{
-		SMTPFrom:         "alerts@example.com",
-		SMTPHello:        "example.com",
-		SMTPSmarthost:    config.HostPort{Host: "smtp.sendgrid.net", Port: "587"},
-		SMTPAuthUsername: "apikey",
-		SMTPAuthPassword: "operator-secret",
-		SMTPRequireTLS:   true,
-	}
-}
-
-func newEmailTestConfig(t *testing.T) *Config {
-	t.Helper()
-
-	cfg, err := NewDefaultConfig(
-		newSMTPGlobalConfig(),
-		RouteConfig{GroupInterval: time.Minute, GroupWait: time.Minute, RepeatInterval: time.Minute},
-		"1",
-	)
-	require.NoError(t, err)
-
-	receiver, err := NewReceiver(`{"name":"email-receiver","email_configs":[{"to":"team@example.com"}]}`)
-	require.NoError(t, err)
-	require.NoError(t, cfg.CreateReceiver(receiver))
-
-	return cfg
-}
-
-func TestStoreableConfigCarriesNoSMTPSettings(t *testing.T) {
-	cfg := newEmailTestConfig(t)
-
-	raw := cfg.StoreableConfig().Config
-	assert.NotContains(t, raw, "operator-secret")
-	assert.NotContains(t, raw, "smtp.sendgrid.net")
-	assert.NotContains(t, raw, "apikey")
-	assert.NotContains(t, raw, "alerts@example.com")
-
-	assert.Equal(t, "operator-secret", string(cfg.alertmanagerConfig.Global.SMTPAuthPassword))
-}
-
-func TestStoreableConfigCarriesNoGlobal(t *testing.T) {
-	cfg := newEmailTestConfig(t)
-
-	stored := map[string]json.RawMessage{}
-	require.NoError(t, json.Unmarshal([]byte(cfg.StoreableConfig().Config), &stored))
-	assert.NotContains(t, stored, "global")
-}
-
-func TestSetGlobalConfigDoesNotChangeStoreableHash(t *testing.T) {
-	cfg := newEmailTestConfig(t)
-	hash := cfg.StoreableConfig().Hash
-
-	require.NoError(t, cfg.SetGlobalConfig(GlobalConfig{SMTPSmarthost: config.HostPort{Host: "smtp.other.net", Port: "2525"}, SMTPAuthPassword: "rotated-secret"}))
-
-	assert.Equal(t, hash, cfg.StoreableConfig().Hash)
-	assert.NotContains(t, cfg.StoreableConfig().Config, "rotated-secret")
-}
-
-func TestNewConfigFromStoreableConfigDiscardsStoredGlobal(t *testing.T) {
-	stored := &StoreableConfig{
-		Config: `{"global":{"resolve_timeout":"5m","smtp_smarthost":"email-smtp.us-east-1.amazonaws.com:587","smtp_auth_password":"old-secret","slack_api_url":"https://hooks.slack.com/services/T/B/X"},"route":{"receiver":"default-receiver"},"receivers":[{"name":"default-receiver"}]}`,
-		OrgID:  "1",
-	}
-
-	cfg, err := NewConfigFromStoreableConfig(stored)
-	require.NoError(t, err)
-
-	assert.Equal(t, &config.GlobalConfig{}, cfg.alertmanagerConfig.Global)
-}
-
-func TestResolvedFillsEmailTransportFromGlobal(t *testing.T) {
-	cfg := newEmailTestConfig(t)
-
-	resolved, err := cfg.Resolved()
-	require.NoError(t, err)
-
-	receiver, err := resolved.GetReceiver("email-receiver")
-	require.NoError(t, err)
-	require.Len(t, receiver.EmailConfigs, 1)
-
-	got := receiver.EmailConfigs[0]
-	assert.Equal(t, "team@example.com", got.To)
-	assert.Equal(t, "smtp.sendgrid.net:587", got.Smarthost.String())
-	assert.Equal(t, "alerts@example.com", got.From)
-	assert.Equal(t, "apikey", got.AuthUsername)
-	assert.Equal(t, "operator-secret", string(got.AuthPassword))
-	require.NotNil(t, got.RequireTLS)
-	assert.True(t, *got.RequireTLS)
-
-	stored, err := cfg.GetReceiver("email-receiver")
-	require.NoError(t, err)
-	assert.Empty(t, stored.EmailConfigs[0].Smarthost.String())
-	assert.NotContains(t, cfg.StoreableConfig().Config, "operator-secret")
-}
-
-func TestStaleStoredSMTPSettingsAreReplacedOnLoad(t *testing.T) {
-	stored := &StoreableConfig{
-		Config: `{"global":{"resolve_timeout":"5m","smtp_from":"old@example.com","smtp_hello":"localhost","smtp_smarthost":"email-smtp.us-east-1.amazonaws.com:587","smtp_auth_username":"old-user","smtp_auth_password":"old-secret","smtp_require_tls":true},"route":{"receiver":"default-receiver","group_by":["ruleId"],"routes":[{"receiver":"email-receiver","continue":true,"matchers":["ruleId=~\"-1\""]}],"group_wait":"30s","group_interval":"5m","repeat_interval":"4h"},"receivers":[{"name":"default-receiver"},{"name":"email-receiver","email_configs":[{"send_resolved":false,"to":"team@example.com","from":"old@example.com","hello":"localhost","smarthost":"email-smtp.us-east-1.amazonaws.com:587","auth_username":"old-user","auth_password":"old-secret","require_tls":true}]}]}`,
-		OrgID:  "1",
-	}
-
-	cfg, err := NewConfigFromStoreableConfig(stored)
-	require.NoError(t, err)
-
-	loaded, err := cfg.GetReceiver("email-receiver")
-	require.NoError(t, err)
-	require.Len(t, loaded.EmailConfigs, 1)
-	assert.Empty(t, loaded.EmailConfigs[0].Smarthost.String())
-	assert.Empty(t, string(loaded.EmailConfigs[0].AuthPassword))
-
-	require.NoError(t, cfg.SetGlobalConfig(newSMTPGlobalConfig()))
-
-	resolved, err := cfg.Resolved()
-	require.NoError(t, err)
-
-	receiver, err := resolved.GetReceiver("email-receiver")
-	require.NoError(t, err)
-	got := receiver.EmailConfigs[0]
-	assert.Equal(t, "smtp.sendgrid.net:587", got.Smarthost.String())
-	assert.Equal(t, "operator-secret", string(got.AuthPassword))
-	assert.Equal(t, "alerts@example.com", got.From)
-
-	assert.NotContains(t, cfg.StoreableConfig().Config, "old-secret")
-	assert.NotContains(t, cfg.StoreableConfig().Config, "amazonaws.com")
-	assert.NotContains(t, cfg.StoreableConfig().Config, "operator-secret")
-}
-
-func TestCreateReceiverDoesNotMutateCaller(t *testing.T) {
-	cfg := newEmailTestConfig(t)
-
-	resolved, err := cfg.Resolved()
-	require.NoError(t, err)
-	receiver, err := resolved.GetReceiver("email-receiver")
-	require.NoError(t, err)
-	require.Equal(t, "smtp.sendgrid.net:587", receiver.EmailConfigs[0].Smarthost.String())
-
-	throwaway, err := cfg.CopyWithReset()
-	require.NoError(t, err)
-	require.NoError(t, throwaway.CreateReceiver(receiver))
-
-	assert.Equal(t, "smtp.sendgrid.net:587", receiver.EmailConfigs[0].Smarthost.String())
-	assert.Equal(t, "operator-secret", string(receiver.EmailConfigs[0].AuthPassword))
-}
-
 // Round-trip: create → serialize → reload → GetReceiver still has the configs.
 func TestConfigPreservesGoogleChatConfigs(t *testing.T) {
 	webhookURL, err := url.Parse("https://chat.googleapis.com/v1/spaces/test/messages")

pkg/types/alertmanagertypes/receiver.go

@@ -37,7 +37,6 @@ func NewReceiver(input string) (*Receiver, error) {
 	if err != nil {
 		return nil, err
 	}
-	stripEmailTransport(withDefaults)
 	receiver.Receiver = withDefaults
 
 	// Extend this block when adding another native notifier type.
@@ -54,23 +53,6 @@ func NewReceiver(input string) (*Receiver, error) {
 	return receiver, nil
 }
 
-func stripEmailTransport(base *config.Receiver) {
-	for _, ec := range base.EmailConfigs {
-		ec.From = ""
-		ec.Hello = ""
-		ec.Smarthost = config.HostPort{}
-		ec.AuthUsername = ""
-		ec.AuthPassword = ""
-		ec.AuthPasswordFile = ""
-		ec.AuthSecret = ""
-		ec.AuthSecretFile = ""
-		ec.AuthIdentity = ""
-		ec.RequireTLS = nil
-		ec.TLSConfig = nil
-		ec.ForceImplicitTLS = nil
-	}
-}
-
 func defaultedBaseReceiver(base *config.Receiver) (*config.Receiver, error) {
 	bytes, err := yaml.Marshal(base)
 	if err != nil {
@@ -120,12 +102,7 @@ func TestReceiver(ctx context.Context, receiver *Receiver, receiverIntegrationsF
 		return err
 	}
 
-	resolvedConfig, err := testConfig.Resolved()
-	if err != nil {
-		return err
-	}
-
-	defaultedReceiver, err := resolvedConfig.GetReceiver(receiver.Name)
+	defaultedReceiver, err := testConfig.GetReceiver(receiver.Name)
 	if err != nil {
 		return err
 	}

pkg/types/alertmanagertypes/receiver_test.go

@@ -46,31 +46,6 @@ func TestNewReceiver(t *testing.T) {
 	}
 }
 
-func TestNewReceiverStripsEmailTransport(t *testing.T) {
-	receiver, err := NewReceiver(`{"name":"email","email_configs":[{"to":"team@example.com","from":"attacker@example.com","hello":"example.com","smarthost":"smtp.example.com:587","auth_username":"user","auth_password":"supersecret","auth_secret":"alsosecret","auth_identity":"id","require_tls":false,"headers":{"Subject":"custom"}}]}`)
-	require.NoError(t, err)
-	require.Len(t, receiver.EmailConfigs, 1)
-
-	got := receiver.EmailConfigs[0]
-	assert.Equal(t, "team@example.com", got.To)
-	assert.Equal(t, map[string]string{"Subject": "custom"}, got.Headers)
-
-	assert.Empty(t, got.From)
-	assert.Empty(t, got.Hello)
-	assert.Empty(t, got.Smarthost.String())
-	assert.Empty(t, got.AuthUsername)
-	assert.Empty(t, string(got.AuthPassword))
-	assert.Empty(t, string(got.AuthSecret))
-	assert.Empty(t, got.AuthIdentity)
-	assert.Nil(t, got.RequireTLS)
-	assert.Nil(t, got.TLSConfig)
-
-	bytes, err := json.Marshal(receiver)
-	require.NoError(t, err)
-	assert.NotContains(t, string(bytes), "supersecret")
-	assert.NotContains(t, string(bytes), "smtp.example.com")
-}
-
 // Omitted fields fall back to DefaultGoogleChatReceiverConfig.
 func TestNewReceiverGoogleChatAppliesDefaults(t *testing.T) {
 	receiver, err := NewReceiver(`{"name":"googlechat","googlechat_configs":[{"webhook_url":"https://chat.googleapis.com/v1/spaces/test/messages"}]}`)

pkg/types/dashboardtypes/perses_dashboard_convertors_test.go

@@ -22,8 +22,7 @@ func newTestDashboardV2(t *testing.T, orgID valuer.UUID, source Source) *Dashboa
 	updatedAt := time.Date(2026, time.January, 2, 12, 0, 0, 0, time.UTC)
 
 	spec := DashboardSpec{
-		Display:   Display{Name: "Test Dashboard"},
-		Variables: []Variable{},
+		Display: Display{Name: "Test Dashboard"},
 		Panels: map[string]*Panel{
 			"p1": {
 				Kind: "Panel",

pkg/types/dashboardtypes/perses_dashboard_data.go

@@ -63,13 +63,8 @@ func (d *DashboardSpec) Validate() error {
 	return d.validateLayouts()
 }
 
-// validateVariables rejects an absent or null list, and duplicate variable names.
+// validateVariables rejects two variables sharing the same name.
 func (d *DashboardSpec) validateVariables() error {
-	// Nil is an absent or explicitly null field; `[]` decodes non-nil. The schema
-	// declares it required and non-nullable, so both are rejected.
-	if d.Variables == nil {
-		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "spec.variables: is required and must not be null; use [] for a dashboard with no variables")
-	}
 	seen := make(map[string]struct{}, len(d.Variables))
 	for i, v := range d.Variables {
 		var name string
@@ -99,9 +94,6 @@ func (d *DashboardSpec) validateVariables() error {
 }
 
 func (d *DashboardSpec) validatePanels() error {
-	if d.Panels == nil {
-		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "spec.panels: is required and must not be null; use {} for a dashboard with no panels")
-	}
 	for key, panel := range d.Panels {
 		if err := common.ValidateID(key); err != nil {
 			return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "spec.panels: %s", err.Error())
@@ -260,9 +252,6 @@ const maxLayoutsPerDashboard = 500
 // Geometry (validateGridLayoutGeometry) needs only each layout's own data but
 // runs here so its errors can name the layout by index.
 func (d *DashboardSpec) validateLayouts() error {
-	if d.Layouts == nil {
-		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "spec.layouts: is required and must not be null; use [] for a dashboard with no layouts")
-	}
 	if len(d.Layouts) > maxLayoutsPerDashboard {
 		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "spec.layouts: dashboard has %d layouts; maximum is %d", len(d.Layouts), maxLayoutsPerDashboard)
 	}

pkg/types/dashboardtypes/perses_dashboard_test.go

@@ -47,7 +47,6 @@ func TestInvalidateNotAJSON(t *testing.T) {
 // UnmarshalJSON methods (panel/query/variable plugin envelopes).
 func TestUnmarshalErrorPreservesNestedMessage(t *testing.T) {
 	data := []byte(`{
-		"variables": [],
 		"panels": {
 			"p1": {
 				"kind": "Panel",
@@ -78,15 +77,14 @@ func TestUnmarshalErrorPreservesNestedMessage(t *testing.T) {
 }
 
 func TestValidateEmptySpec(t *testing.T) {
-	// The three required collections must be present, but may be empty.
-	data := []byte(`{"variables": [], "panels": {}, "layouts": []}`)
+	// no variables no panels no links
+	data := []byte(`{}`)
 	_, err := unmarshalDashboard(data)
 	assert.NoError(t, err, "expected valid")
 }
 
 func TestValidateOnlyVariables(t *testing.T) {
 	data := []byte(`{
-		"panels": {},
 		"variables": [
 			{
 				"kind": "ListVariable",
@@ -118,60 +116,8 @@ func TestValidateOnlyVariables(t *testing.T) {
 	assert.NoError(t, err, "expected valid")
 }
 
-// TestInvalidateAbsentOrNullRequiredCollections pins the strict reading of the
-// schema on the three required, non-nullable collections: an absent key breaks
-// `required`, an explicit null breaks the array/object type, and both are
-// rejected. Only the empty collection is accepted.
-func TestInvalidateAbsentOrNullRequiredCollections(t *testing.T) {
-	cases := []struct {
-		description  string
-		specJSON     string
-		expectedPath string
-	}{
-		{
-			description:  "variables absent",
-			specJSON:     `{"panels": {}, "layouts": []}`,
-			expectedPath: "spec.variables",
-		},
-		{
-			description:  "variables null",
-			specJSON:     `{"variables": null, "panels": {}, "layouts": []}`,
-			expectedPath: "spec.variables",
-		},
-		{
-			description:  "panels absent",
-			specJSON:     `{"variables": [], "layouts": []}`,
-			expectedPath: "spec.panels",
-		},
-		{
-			description:  "panels null",
-			specJSON:     `{"variables": [], "panels": null, "layouts": []}`,
-			expectedPath: "spec.panels",
-		},
-		{
-			description:  "layouts absent",
-			specJSON:     `{"variables": [], "panels": {}}`,
-			expectedPath: "spec.layouts",
-		},
-		{
-			description:  "layouts null",
-			specJSON:     `{"variables": [], "panels": {}, "layouts": null}`,
-			expectedPath: "spec.layouts",
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.description, func(t *testing.T) {
-			_, err := unmarshalDashboard([]byte(c.specJSON))
-			require.Error(t, err)
-			assert.Contains(t, err.Error(), c.expectedPath+": is required and must not be null")
-		})
-	}
-}
-
 func TestInvalidateDuplicateVariableNames(t *testing.T) {
 	data := []byte(`{
-		"panels": {},
 		"variables": [
 			{
 				"kind": "TextVariable",
@@ -201,7 +147,6 @@ func TestInvalidateDuplicateVariableNames(t *testing.T) {
 func TestInvalidateVariableNameWithInvalidChars(t *testing.T) {
 	listVarWithName := func(name string) []byte {
 		return []byte(`{
-			"panels": {},
 			"variables": [
 				{
 					"kind": "ListVariable",
@@ -242,7 +187,6 @@ func TestInvalidateVariableNameWithInvalidChars(t *testing.T) {
 
 func TestInvalidatePanelKey(t *testing.T) {
 	data := []byte(`{
-		"variables": [],
 		"panels": {
 			"bad key!": {
 				"kind": "Panel",
@@ -269,7 +213,6 @@ func TestInvalidatePanelKey(t *testing.T) {
 func TestInvalidateListVariableCrossFields(t *testing.T) {
 	listVar := func(specFields string) []byte {
 		return []byte(`{
-			"panels": {},
 			"variables": [
 				{
 					"kind": "ListVariable",
@@ -352,13 +295,11 @@ func TestInvalidateListVariableCrossFields(t *testing.T) {
 func TestInvalidateEmptyVariableName(t *testing.T) {
 	cases := map[string][]byte{
 		"text variable": []byte(`{
-			"panels": {},
 			"variables": [{"kind": "TextVariable", "spec": {"name": "", "value": "x"}}],
 			"links": [],
 			"layouts": []
 		}`),
 		"list variable": []byte(`{
-			"panels": {},
 			"variables": [{
 				"kind": "ListVariable",
 				"spec": {
@@ -390,7 +331,6 @@ func TestInvalidateUnknownPluginKind(t *testing.T) {
 		{
 			name: "unknown panel plugin",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -408,7 +348,6 @@ func TestInvalidateUnknownPluginKind(t *testing.T) {
 		{
 			name: "unknown panel envelope kind",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Row",
@@ -425,7 +364,6 @@ func TestInvalidateUnknownPluginKind(t *testing.T) {
 		{
 			name: "unknown query plugin",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -449,7 +387,6 @@ func TestInvalidateUnknownPluginKind(t *testing.T) {
 		{
 			name: "unknown query envelope kind",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -473,7 +410,6 @@ func TestInvalidateUnknownPluginKind(t *testing.T) {
 		{
 			name: "empty query envelope kind",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -497,7 +433,6 @@ func TestInvalidateUnknownPluginKind(t *testing.T) {
 		{
 			name: "unknown variable plugin",
 			data: `{
-				"panels": {},
 				"variables": [{
 					"kind": "ListVariable",
 					"spec": {
@@ -525,7 +460,6 @@ func TestInvalidateUnknownPluginKind(t *testing.T) {
 
 func TestInvalidateOneInvalidPanel(t *testing.T) {
 	data := []byte(`{
-		"variables": [],
 		"panels": {
 			"good": {
 				"kind": "Panel",
@@ -561,7 +495,7 @@ func TestInvalidateLayoutPanelReferences(t *testing.T) {
 		}
 	}`
 	layout := func(items string) []byte {
-		return []byte(`{"variables": [], ` + validPanels + `, "links": [], "layouts": [{"kind": "Grid", "spec": {"items": [` + items + `]}}]}`)
+		return []byte(`{` + validPanels + `, "links": [], "layouts": [{"kind": "Grid", "spec": {"items": [` + items + `]}}]}`)
 	}
 
 	tests := []struct {
@@ -613,7 +547,6 @@ func TestRejectUnknownFieldsInPluginSpec(t *testing.T) {
 		{
 			name: "unknown field in panel spec",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -634,7 +567,6 @@ func TestRejectUnknownFieldsInPluginSpec(t *testing.T) {
 		{
 			name: "unknown field in query spec",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -661,7 +593,6 @@ func TestRejectUnknownFieldsInPluginSpec(t *testing.T) {
 		{
 			name: "unknown field in variable spec",
 			data: `{
-				"panels": {},
 				"variables": [{
 					"kind": "ListVariable",
 					"spec": {
@@ -699,7 +630,6 @@ func TestInvalidateWrongFieldTypeInPluginSpec(t *testing.T) {
 		{
 			name: "wrong type on panel plugin field",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -720,7 +650,6 @@ func TestInvalidateWrongFieldTypeInPluginSpec(t *testing.T) {
 		{
 			name: "wrong type on query plugin field",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -747,7 +676,6 @@ func TestInvalidateWrongFieldTypeInPluginSpec(t *testing.T) {
 		{
 			name: "wrong type on variable plugin field",
 			data: `{
-				"panels": {},
 				"variables": [{
 					"kind": "ListVariable",
 					"spec": {
@@ -787,7 +715,6 @@ func TestInvalidateBadPanelSpecValues(t *testing.T) {
 		{
 			name: "bad signal in builder query",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -817,7 +744,6 @@ func TestInvalidateBadPanelSpecValues(t *testing.T) {
 		{
 			name: "bad line interpolation",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -838,7 +764,6 @@ func TestInvalidateBadPanelSpecValues(t *testing.T) {
 		{
 			name: "bad line style",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -859,7 +784,6 @@ func TestInvalidateBadPanelSpecValues(t *testing.T) {
 		{
 			name: "bad fill mode",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -880,7 +804,6 @@ func TestInvalidateBadPanelSpecValues(t *testing.T) {
 		{
 			name: "bad spanGaps fillLessThan",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -901,7 +824,6 @@ func TestInvalidateBadPanelSpecValues(t *testing.T) {
 		{
 			name: "bad time preference",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -922,7 +844,6 @@ func TestInvalidateBadPanelSpecValues(t *testing.T) {
 		{
 			name: "bad legend position",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -943,7 +864,6 @@ func TestInvalidateBadPanelSpecValues(t *testing.T) {
 		{
 			name: "bad legend mode",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -964,7 +884,6 @@ func TestInvalidateBadPanelSpecValues(t *testing.T) {
 		{
 			name: "bad threshold format",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -985,7 +904,6 @@ func TestInvalidateBadPanelSpecValues(t *testing.T) {
 		{
 			name: "bad comparison operator",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -1006,7 +924,6 @@ func TestInvalidateBadPanelSpecValues(t *testing.T) {
 		{
 			name: "bad precision",
 			data: `{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -1047,7 +964,6 @@ func TestThresholdLabelOptional(t *testing.T) {
 	} {
 		t.Run(tt.name, func(t *testing.T) {
 			data := []byte(`{
-				"variables": [],
 				"panels": {
 					"p1": {
 						"kind": "Panel",
@@ -1073,7 +989,6 @@ func TestThresholdLabelOptional(t *testing.T) {
 
 func TestInvalidatePanelWithoutQueries(t *testing.T) {
 	data := []byte(`{
-		"variables": [],
 		"panels": {
 			"p1": {
 				"kind": "Panel",
@@ -1090,7 +1005,6 @@ func TestInvalidatePanelWithoutQueries(t *testing.T) {
 
 func TestInvalidatePanelWithEmptyQueriesArray(t *testing.T) {
 	data := []byte(`{
-		"variables": [],
 		"panels": {
 			"p1": {
 				"kind": "Panel",
@@ -1113,7 +1027,6 @@ func TestInvalidatePanelWithEmptyQueriesArray(t *testing.T) {
 // signoz/CompositeQuery, not by listing multiple top-level queries.
 func TestInvalidatePanelWithMultipleDirectQueries(t *testing.T) {
 	data := []byte(`{
-		"variables": [],
 		"panels": {
 			"p1": {
 				"kind": "Panel",
@@ -1223,7 +1136,6 @@ func TestValidateRequiredFields(t *testing.T) {
 
 func TestTimeSeriesPanelDefaults(t *testing.T) {
 	data := []byte(`{
-		"variables": [],
 		"panels": {
 			"p1": {
 				"kind": "Panel",
@@ -1276,7 +1188,6 @@ func TestTimeSeriesPanelDefaults(t *testing.T) {
 
 func TestNumberPanelDefaults(t *testing.T) {
 	data := []byte(`{
-		"variables": [],
 		"panels": {
 			"p1": {
 				"kind": "Panel",
@@ -1340,7 +1251,6 @@ func TestPersesFixtureStorageRoundTrip(t *testing.T) {
 // then unmarshal it back (what would be read from DB), and verify defaults survive.
 func TestStorageRoundTrip(t *testing.T) {
 	input := []byte(`{
-		"variables": [],
 		"panels": {
 			"p1": {
 				"kind": "Panel",
@@ -1426,7 +1336,7 @@ func TestStorageRoundTrip(t *testing.T) {
 }
 
 func TestPostableDashboardV2GenerateNameFlag(t *testing.T) {
-	const validSpec = `"spec": {"variables": [], "panels": {}, "layouts": [], "links": []}`
+	const validSpec = `"spec": {"panels": {}, "layouts": [], "links": []}`
 
 	tests := []struct {
 		scenario     string
@@ -1438,13 +1348,13 @@ func TestPostableDashboardV2GenerateNameFlag(t *testing.T) {
 	}{
 		{
 			scenario:    "flag true with display.name derives name on conversion",
-			body:        `{"schemaVersion":"` + SchemaVersion + `","generateName":true,"spec":{"display":{"name":"My Dashboard!"},"variables":[],"panels":{},"layouts":[],"links":[]}}`,
+			body:        `{"schemaVersion":"` + SchemaVersion + `","generateName":true,"spec":{"display":{"name":"My Dashboard!"},"panels":{},"layouts":[],"links":[]}}`,
 			wantName:    "",
 			wantDisplay: "My Dashboard!",
 		},
 		{
 			scenario:     "flag true with non-empty name is rejected",
-			body:         `{"schemaVersion":"` + SchemaVersion + `","name":"already-set","generateName":true,"spec":{"display":{"name":"My Dashboard"},"variables":[],"panels":{},"layouts":[],"links":[]}}`,
+			body:         `{"schemaVersion":"` + SchemaVersion + `","name":"already-set","generateName":true,"spec":{"display":{"name":"My Dashboard"},"panels":{},"layouts":[],"links":[]}}`,
 			wantErr:      true,
 			wantErrMatch: "name must be empty when generateName is true",
 		},
@@ -1603,7 +1513,6 @@ func TestPanelTypeQueryTypeCompatibility(t *testing.T) {
 	}
 	mkQuery := func(panelKind, queryKind, querySpec string) []byte {
 		return []byte(`{
-			"variables": [],
 			"panels": {"p1": {"kind": "Panel", "spec": {
 				"links": [],
 				"plugin": {"kind": "` + panelKind + `", "spec": {}},
@@ -1615,7 +1524,6 @@ func TestPanelTypeQueryTypeCompatibility(t *testing.T) {
 	}
 	mkComposite := func(panelKind, subType, subSpec string) []byte {
 		return []byte(`{
-			"variables": [],
 			"panels": {"p1": {"kind": "Panel", "spec": {
 				"links": [],
 				"plugin": {"kind": "` + panelKind + `", "spec": {}},
@@ -1666,7 +1574,6 @@ func TestPanelTypeQueryTypeCompatibility(t *testing.T) {
 func TestCommaSeparatedAggregationRejectedOnWrite(t *testing.T) {
 	buildDashboardWithLogsAggregation := func(aggregationsJSON string) []byte {
 		return []byte(`{
-		"variables": [],
 		"panels": {"p1": {"kind": "Panel", "spec": {
 			"links": [],
 			"plugin": {"kind": "signoz/TimeSeriesPanel", "spec": {}},
@@ -1787,7 +1694,6 @@ func TestValidateGridItemLimit(t *testing.T) {
 // the unmarshal path — it does, via DashboardSpec.Validate -> validateLayouts.
 func TestInvalidateLayoutOverlapViaUnmarshal(t *testing.T) {
 	data := []byte(`{
-		"variables": [],
 		"panels": {
 			"p1": {"kind": "Panel", "spec": {"links": [],"plugin": {"kind": "signoz/TablePanel", "spec": {}}, "queries": [{"kind": "time_series", "spec": {"plugin": {"kind": "signoz/BuilderQuery", "spec": {"name": "A", "signal": "logs", "aggregations": [{"expression": "count()"}]}}}}]}},
 			"p2": {"kind": "Panel", "spec": {"links": [],"plugin": {"kind": "signoz/TablePanel", "spec": {}}, "queries": [{"kind": "time_series", "spec": {"plugin": {"kind": "signoz/BuilderQuery", "spec": {"name": "A", "signal": "logs", "aggregations": [{"expression": "count()"}]}}}}]}}
@@ -1808,7 +1714,6 @@ func TestInvalidateLayoutOverlapViaUnmarshal(t *testing.T) {
 // two items are side by side so they clear the overlap check first.
 func TestInvalidateDuplicatePanelReference(t *testing.T) {
 	data := []byte(`{
-		"variables": [],
 		"panels": {
 			"p1": {"kind": "Panel", "spec": {"links": [],"plugin": {"kind": "signoz/TablePanel", "spec": {}}, "queries": [{"kind": "time_series", "spec": {"plugin": {"kind": "signoz/BuilderQuery", "spec": {"name": "A", "signal": "logs", "aggregations": [{"expression": "count()"}]}}}}]}}
 		},
@@ -1840,43 +1745,39 @@ func TestInvalidateDisplayNameTooLong(t *testing.T) {
 		expectedLabel    string
 	}{
 		{
-			scenario: "dashboard display name",
-			limit:    MaxDisplayNameLen,
-			dashboardJSONFmt: `{
-		"variables": [],
-		"panels": {},"display": {"name": "%s"}, "links": [], "layouts": []}`,
-			expectedLabel: "dashboard",
-			expectedPath:  "spec.display.name",
+			scenario:         "dashboard display name",
+			limit:            MaxDisplayNameLen,
+			dashboardJSONFmt: `{"display": {"name": "%s"}, "links": [], "layouts": []}`,
+			expectedLabel:    "dashboard",
+			expectedPath:     "spec.display.name",
 		},
 		{
 			scenario:         "panel display name",
 			limit:            MaxDisplayNameLen,
-			dashboardJSONFmt: `{"variables": [], "panels": {"p1": {"kind": "Panel", "spec": {"links": [], "display": {"name": "%s"}, "plugin": {"kind": "signoz/TablePanel", "spec": {}}, "queries": []}}}, "links": [], "layouts": []}`,
+			dashboardJSONFmt: `{"panels": {"p1": {"kind": "Panel", "spec": {"links": [], "display": {"name": "%s"}, "plugin": {"kind": "signoz/TablePanel", "spec": {}}, "queries": []}}}, "links": [], "layouts": []}`,
 			expectedLabel:    "panel",
 			expectedPath:     "spec.panels.p1.spec.display.name",
 		},
 		{
 			scenario:         "list variable display name",
 			limit:            MaxDisplayNameLen,
-			dashboardJSONFmt: `{"panels": {}, "variables": [{"kind": "ListVariable", "spec": {"name": "svc", "display": {"name": "%s"}, "plugin": {"kind": "signoz/DynamicVariable", "spec": {"name": "service.name", "signal": "metrics"}}}}], "links": [], "layouts": []}`,
+			dashboardJSONFmt: `{"variables": [{"kind": "ListVariable", "spec": {"name": "svc", "display": {"name": "%s"}, "plugin": {"kind": "signoz/DynamicVariable", "spec": {"name": "service.name", "signal": "metrics"}}}}], "links": [], "layouts": []}`,
 			expectedLabel:    "variable",
 			expectedPath:     "spec.variables[0].spec.display.name",
 		},
 		{
 			scenario:         "text variable display name",
 			limit:            MaxDisplayNameLen,
-			dashboardJSONFmt: `{"panels": {}, "variables": [{"kind": "TextVariable", "spec": {"name": "mytext", "value": "v", "display": {"name": "%s"}}}], "links": [], "layouts": []}`,
+			dashboardJSONFmt: `{"variables": [{"kind": "TextVariable", "spec": {"name": "mytext", "value": "v", "display": {"name": "%s"}}}], "links": [], "layouts": []}`,
 			expectedLabel:    "variable",
 			expectedPath:     "spec.variables[0].spec.display.name",
 		},
 		{
-			scenario: "layout title",
-			limit:    MaxLayoutTitleLen,
-			dashboardJSONFmt: `{
-		"variables": [],
-		"panels": {},"links": [], "layouts": [{"kind": "Grid", "spec": {"display": {"title": "%s"}, "items": []}}]}`,
-			expectedLabel: "layout",
-			expectedPath:  "spec.layouts[0].spec.display.title",
+			scenario:         "layout title",
+			limit:            MaxLayoutTitleLen,
+			dashboardJSONFmt: `{"links": [], "layouts": [{"kind": "Grid", "spec": {"display": {"title": "%s"}, "items": []}}]}`,
+			expectedLabel:    "layout",
+			expectedPath:     "spec.layouts[0].spec.display.title",
 		},
 	}
 
@@ -1896,9 +1797,7 @@ func TestInvalidateDisplayNameTooLong(t *testing.T) {
 // A display name at exactly the limit is accepted.
 func TestValidateDisplayNameAtMaxLength(t *testing.T) {
 	atLimit := strings.Repeat("x", MaxDisplayNameLen)
-	_, err := unmarshalDashboard([]byte(`{
-		"variables": [],
-		"panels": {},"display": {"name": "` + atLimit + `"}, "links": [], "layouts": []}`))
+	_, err := unmarshalDashboard([]byte(`{"display": {"name": "` + atLimit + `"}, "links": [], "layouts": []}`))
 	assert.NoError(t, err)
 }
 

pkg/types/dashboardtypes/testdata/perses_with_sections.json

@@ -1,5 +1,4 @@
 {
-    "variables": [],
     "display": {
         "name": "NV dashboard with sections",
         "description": ""

pkg/types/querybuildertypes/querybuildertypesv5/builder_elements.go

@@ -118,10 +118,6 @@ const (
 	FilterOperatorHasToken
 	FilterOperatorHasAny
 	FilterOperatorHasAll
-
-	// FilterOperatorSearch backs search('term'): keyless, fanned out by the condition
-	// builder across every searchable column.
-	FilterOperatorSearch
 )
 
 var operatorInverseMapping = map[FilterOperator]FilterOperator{
@@ -190,8 +186,7 @@ func (f FilterOperator) IsNegativeOperator() bool {
 		FilterOperatorIn,
 		FilterOperatorExists,
 		FilterOperatorRegexp,
-		FilterOperatorContains,
-		FilterOperatorSearch:
+		FilterOperatorContains:
 		return false
 	}
 	return true
@@ -248,11 +243,10 @@ func (f FilterOperator) IsArrayFunctionOperator() bool {
 }
 
 // IsFunctionOperator reports whether the operator is a query function
-// (has/hasAny/hasAll/hasToken/search) — logs-only, and skipped by the
-// resource-fingerprint builder.
+// (has/hasAny/hasAll/hasToken); these apply to the logs body column only.
 func (f FilterOperator) IsFunctionOperator() bool {
 	switch f {
-	case FilterOperatorHas, FilterOperatorHasAny, FilterOperatorHasAll, FilterOperatorHasToken, FilterOperatorSearch:
+	case FilterOperatorHas, FilterOperatorHasAny, FilterOperatorHasAll, FilterOperatorHasToken:
 		return true
 	default:
 		return false
@@ -271,8 +265,6 @@ func (f FilterOperator) FunctionName() string {
 		return "hasAll"
 	case FilterOperatorHasToken:
 		return "hasToken"
-	case FilterOperatorSearch:
-		return "search"
 	default:
 		return ""
 	}

pkg/types/querybuildertypes/querybuildertypesv5/qb.go

@@ -57,12 +57,6 @@ type Statement struct {
 	Args           []any
 	Warnings       []string
 	WarningsDocURL string
-	CostGuard      *CostGuard
-}
-
-type CostGuard struct {
-	Warning     string
-	MaxScanRows int64
 }
 
 // StatementBuilder builds the query.

pkg/types/telemetrytypes/field_context.go

@@ -79,14 +79,6 @@ var (
 	}
 )
 
-// FieldContextFromText resolves a context word with the same aliases as key parsing
-// ("tag" -> attribute). ok is false for an unknown word, so callers can reject it
-// rather than get unspecified.
-func FieldContextFromText(text string) (FieldContext, bool) {
-	fc, ok := fieldContexts[strings.ToLower(strings.TrimSpace(text))]
-	return fc, ok
-}
-
 // UnmarshalJSON implements the json.Unmarshaler interface.
 func (f *FieldContext) UnmarshalJSON(data []byte) error {
 	var str string

pkg/variables/variable_replace_visitor.go

@@ -412,15 +412,10 @@ func (v *variableReplacementVisitor) VisitFunctionCall(ctx *grammar.FunctionCall
 }
 
 func (v *variableReplacementVisitor) VisitSearchCall(ctx *grammar.SearchCallContext) any {
-	if ctx.ValueList() == nil {
+	if ctx.FunctionParamList() == nil {
 		return "search()"
 	}
-	// VisitValueList already parenthesizes the args and propagates the __all__ marker.
-	result := v.Visit(ctx.ValueList()).(string)
-	if result == specialSkipMarker {
-		return specialSkipMarker
-	}
-	return "search" + result
+	return "search(" + v.Visit(ctx.FunctionParamList()).(string) + ")"
 }
 
 func (v *variableReplacementVisitor) VisitFunctionParamList(ctx *grammar.FunctionParamListContext) any {

tests/conftest.py

@@ -24,7 +24,6 @@ pytest_plugins = [
     "fixtures.keycloak",
     "fixtures.idp",
     "fixtures.notification_channel",
-    "fixtures.maildev",
     "fixtures.alerts",
     "fixtures.cloudintegrations",
     "fixtures.jsontypes",

tests/fixtures/alerts.py

@@ -1,13 +1,11 @@
 import base64
 import json
-import re
 import time
 import urllib.parse
 import uuid
 from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from http import HTTPStatus
-from urllib.parse import urlparse
 
 import pytest
 import requests
@@ -17,7 +15,6 @@ from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
 from fixtures.fs import get_testdata_file_path
 from fixtures.logger import setup_logger
 from fixtures.logs import Logs
-from fixtures.maildev import get_all_mails, verify_email_received
 from fixtures.metrics import Metrics
 from fixtures.traces import Traces
 
@@ -314,145 +311,3 @@ def update_rule_channel_name(rule_data: dict, channel_name: str):
         # loop over all the sepcs and update the channels
         for spec in thresholds["spec"]:
             spec["channels"] = [channel_name]
-
-
-def _is_json_subset(subset, superset) -> bool:
-    """Check if subset is contained within superset recursively.
-    - For dicts: all keys in subset must exist in superset with matching values
-    - For lists: all items in subset must be present in superset
-    - For scalars: exact equality
-    """
-    if isinstance(subset, dict):
-        if not isinstance(superset, dict):
-            return False
-        return all(key in superset and _is_json_subset(value, superset[key]) for key, value in subset.items())
-    if isinstance(subset, list):
-        if not isinstance(superset, list):
-            return False
-        return all(any(_is_json_subset(sub_item, sup_item) for sup_item in superset) for sub_item in subset)
-    if isinstance(subset, re.Pattern):
-        return isinstance(superset, str) and subset.search(superset) is not None
-    return subset == superset
-
-
-def verify_webhook_notification_expectation(
-    notification_channel: types.TestContainerDocker,
-    validation_data: dict,
-) -> bool:
-    """Check if wiremock received a request at the given path
-    whose JSON body is a superset of the expected json_body."""
-    path = validation_data["path"]
-    json_body = validation_data["json_body"]
-
-    url = notification_channel.host_configs["8080"].get("__admin/requests/find")
-    try:
-        res = requests.post(url, json={"method": "POST", "url": path}, timeout=10)
-    except requests.exceptions.RequestException:
-        return False
-    if res.status_code != HTTPStatus.OK:
-        return False
-
-    for req in res.json()["requests"]:
-        body = json.loads(base64.b64decode(req["bodyAsBase64"]).decode("utf-8"))
-        if _is_json_subset(json_body, body):
-            return True
-    return False
-
-
-def _check_notification_validation(
-    validation: types.NotificationValidation,
-    notification_channel: types.TestContainerDocker,
-    maildev: types.TestContainerDocker,
-) -> bool:
-    """Dispatch a single validation check to the appropriate verifier."""
-    if validation.destination_type == "webhook":
-        return verify_webhook_notification_expectation(notification_channel, validation.validation_data)
-    if validation.destination_type == "email":
-        return verify_email_received(maildev, validation.validation_data)
-    raise ValueError(f"Invalid destination type: {validation.destination_type}")
-
-
-def verify_notification_expectation(
-    notification_channel: types.TestContainerDocker,
-    maildev: types.TestContainerDocker,
-    expected_notification: types.AMNotificationExpectation,
-) -> bool:
-    """Poll for expected notifications across webhook and email channels."""
-    time_to_wait = datetime.now() + timedelta(seconds=expected_notification.wait_time_seconds)
-
-    while datetime.now() < time_to_wait:
-        all_found = all(_check_notification_validation(v, notification_channel, maildev) for v in expected_notification.notification_validations)
-
-        if expected_notification.should_notify and all_found:
-            logger.info("All expected notifications found")
-            return True
-
-        time.sleep(1)
-
-    # Timeout reached
-    if not expected_notification.should_notify:
-        # Verify no notifications were received
-        for validation in expected_notification.notification_validations:
-            found = _check_notification_validation(validation, notification_channel, maildev)
-            assert not found, f"Expected no notification but found one for {validation.destination_type} with data {validation.validation_data}"
-        logger.info("No notifications found, as expected")
-        return True
-
-    missing = [v for v in expected_notification.notification_validations if not _check_notification_validation(v, notification_channel, maildev)]
-    assert len(missing) == 0, f"Expected all notifications to be found but missing: {missing}, received: {_received_notifications(notification_channel, maildev, missing)}"
-    return True
-
-
-def _received_notifications(
-    notification_channel: types.TestContainerDocker,
-    maildev: types.TestContainerDocker,
-    missing: list[types.NotificationValidation],
-) -> dict:
-    received = {}
-    if any(v.destination_type == "webhook" for v in missing):
-        webhook_bodies = []
-        for validation in missing:
-            if validation.destination_type != "webhook":
-                continue
-            url = notification_channel.host_configs["8080"].get("__admin/requests/find")
-            try:
-                res = requests.post(url, json={"method": "POST", "url": validation.validation_data["path"]}, timeout=10)
-                webhook_bodies.extend(json.loads(base64.b64decode(req["bodyAsBase64"]).decode("utf-8")) for req in res.json()["requests"])
-            except requests.exceptions.RequestException as exc:
-                webhook_bodies.append(f"<failed to fetch wiremock journal: {exc}>")
-        received["webhook"] = webhook_bodies
-    if any(v.destination_type == "email" for v in missing):
-        received["email"] = get_all_mails(maildev)
-    return received
-
-
-def update_raw_channel_config(
-    channel_config: dict,
-    channel_name: str,
-    notification_channel: types.TestContainerDocker,
-) -> dict:
-    """
-    Updates the channel config to point to the given wiremock
-    notification_channel container to receive notifications.
-    """
-    config = channel_config.copy()
-
-    config["name"] = channel_name
-
-    url_field_map = {
-        "slack_configs": "api_url",
-        "msteamsv2_configs": "webhook_url",
-        "webhook_configs": "url",
-        "pagerduty_configs": "url",
-        "opsgenie_configs": "api_url",
-    }
-
-    for config_key, url_field in url_field_map.items():
-        if config_key in config:
-            for entry in config[config_key]:
-                if url_field in entry:
-                    original_url = entry[url_field]
-                    path = urlparse(original_url).path
-                    entry[url_field] = notification_channel.container_configs["8080"].get(path)
-
-    return config

tests/fixtures/auth.py

@@ -77,7 +77,7 @@ def register_admin(
             timeout=5,
         )
 
-        assert response.status_code == HTTPStatus.OK, f"failed to register admin: {response.status_code} {response.text}"
+        assert response.status_code == HTTPStatus.OK
 
         return types.Operation(name="create_user_admin")
 

tests/fixtures/http.py

@@ -125,19 +125,13 @@ def gateway(
 
 @pytest.fixture(name="make_http_mocks", scope="function")
 def make_http_mocks() -> Callable[[types.TestContainerDocker, list[Mapping]], None]:
-    mocked_containers = []
-
     def _make_http_mocks(container: types.TestContainerDocker, mappings: list[Mapping]) -> None:
         Config.base_url = container.host_configs["8080"].get("/__admin")
 
         for mapping in mappings:
             Mappings.create_mapping(mapping=mapping)
 
-        mocked_containers.append(container)
-
     yield _make_http_mocks
 
-    for container in mocked_containers:
-        Config.base_url = container.host_configs["8080"].get("/__admin")
-        Mappings.delete_all_mappings()
-        Requests.reset_request_journal()
+    Mappings.delete_all_mappings()
+    Requests.reset_request_journal()

tests/fixtures/idp.py

@@ -7,7 +7,6 @@ import pytest
 import requests
 from keycloak import KeycloakAdmin
 from selenium import webdriver
-from selenium.common.exceptions import WebDriverException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.wait import WebDriverWait
@@ -371,20 +370,11 @@ def idp_login(driver: webdriver.Chrome) -> Callable[[str, str], None]:
         password_field.send_keys(password)
 
         # Click the login button
-        idp_host = urlparse(driver.current_url).netloc
         login_button = wait.until(EC.element_to_be_clickable((By.ID, "kc-login")))
         login_button.click()
 
-        # Wait till the browser has left the idp host — not just the login page: keycloak's SAML flow inserts an
-        # auto-submitting interstitial on the idp whose POST is what creates the user in signoz. The button is
-        # re-queried per poll; a mid-navigation WebDriverException (detached node) just retries the poll.
-        def _left_idp(drv: webdriver.Chrome) -> bool:
-            try:
-                return urlparse(drv.current_url).netloc != idp_host and not drv.find_elements(By.ID, "kc-login")
-            except WebDriverException:
-                return False
-
-        wait.until(_left_idp)
+        # Wait till kc-login element has vanished from the page, which means that a redirection is taking place.
+        wait.until(EC.invisibility_of_element((By.ID, "kc-login")))
 
     return _idp_login
 

tests/fixtures/maildev.py

@@ -1,143 +0,0 @@
-import re
-from http import HTTPStatus
-
-import docker
-import docker.errors
-import pytest
-import requests
-from testcontainers.core.container import DockerContainer, Network
-
-from fixtures import reuse, types
-from fixtures.logger import setup_logger
-
-logger = setup_logger(__name__)
-
-MAILDEV_INCOMING_USER = "apikey"
-MAILDEV_INCOMING_PASS = "integration-smtp-secret"
-
-SMTP_TEST_FROM = "alertmanager@integration.test"
-
-OLD_PROVIDER_SMTP_PASS = "old-provider-smtp-secret"
-NEW_PROVIDER_SMTP_PASS = "new-provider-smtp-secret"
-
-
-def signoz_smtp_env(maildev: "types.TestContainerDocker", password: str = MAILDEV_INCOMING_PASS) -> dict:
-    return {
-        "SIGNOZ_ALERTMANAGER_SIGNOZ_GLOBAL_SMTP__SMARTHOST": f"{maildev.container_configs['1025'].address}:{maildev.container_configs['1025'].port}",
-        "SIGNOZ_ALERTMANAGER_SIGNOZ_GLOBAL_SMTP__FROM": SMTP_TEST_FROM,
-        "SIGNOZ_ALERTMANAGER_SIGNOZ_GLOBAL_SMTP__AUTH__USERNAME": MAILDEV_INCOMING_USER,
-        "SIGNOZ_ALERTMANAGER_SIGNOZ_GLOBAL_SMTP__AUTH__PASSWORD": password,
-        "SIGNOZ_ALERTMANAGER_SIGNOZ_GLOBAL_SMTP__REQUIRE__TLS": "false",
-    }
-
-
-def create_maildev(
-    network: Network,
-    request: pytest.FixtureRequest,
-    pytestconfig: pytest.Config,
-    cache_key: str = "maildev",
-    incoming_user: str = MAILDEV_INCOMING_USER,
-    incoming_pass: str = MAILDEV_INCOMING_PASS,
-) -> types.TestContainerDocker:
-    def create() -> types.TestContainerDocker:
-        container = DockerContainer(image="maildev/maildev:2.2.1")
-        container.with_env("MAILDEV_INCOMING_USER", incoming_user)
-        container.with_env("MAILDEV_INCOMING_PASS", incoming_pass)
-        container.with_exposed_ports(1025, 1080)
-        container.with_network(network=network)
-        container.start()
-
-        return types.TestContainerDocker(
-            id=container.get_wrapped_container().id,
-            host_configs={
-                "1025": types.TestContainerUrlConfig(
-                    scheme="smtp",
-                    address=container.get_container_host_ip(),
-                    port=container.get_exposed_port(1025),
-                ),
-                "1080": types.TestContainerUrlConfig(
-                    scheme="http",
-                    address=container.get_container_host_ip(),
-                    port=container.get_exposed_port(1080),
-                ),
-            },
-            container_configs={
-                "1025": types.TestContainerUrlConfig(
-                    scheme="smtp",
-                    address=container.get_wrapped_container().name,
-                    port=1025,
-                ),
-                "1080": types.TestContainerUrlConfig(
-                    scheme="http",
-                    address=container.get_wrapped_container().name,
-                    port=1080,
-                ),
-            },
-        )
-
-    def delete(container: types.TestContainerDocker):
-        client = docker.from_env()
-        try:
-            client.containers.get(container_id=container.id).stop()
-            client.containers.get(container_id=container.id).remove(v=True)
-        except docker.errors.NotFound:
-            logger.info(
-                "Skipping removal of MailDev, MailDev(%s) not found. Maybe it was manually removed?",
-                {"id": container.id},
-            )
-
-    def restore(cache: dict) -> types.TestContainerDocker:
-        return types.TestContainerDocker.from_cache(cache)
-
-    return reuse.wrap(
-        request,
-        pytestconfig,
-        cache_key,
-        lambda: types.TestContainerDocker(id="", host_configs={}, container_configs={}),
-        create,
-        delete,
-        restore,
-    )
-
-
-@pytest.fixture(name="maildev", scope="package")
-def maildev(network: Network, request: pytest.FixtureRequest, pytestconfig: pytest.Config) -> types.TestContainerDocker:
-    return create_maildev(network, request, pytestconfig)
-
-
-def get_all_mails(_maildev: types.TestContainerDocker) -> list[dict]:
-    url = _maildev.host_configs["1080"].get("/email")
-    response = requests.get(url, timeout=5)
-    assert response.status_code == HTTPStatus.OK, f"Failed to fetch emails from MailDev, status code: {response.status_code}, response: {response.text}"
-
-    def addresses(entries: list[dict]) -> str:
-        return ",".join(sorted(entry.get("address", "") for entry in entries))
-
-    return [
-        {
-            "subject": email.get("subject", ""),
-            "html": email.get("html", ""),
-            "text": email.get("text", ""),
-            "from": addresses(email.get("from", [])),
-            "to": addresses(email.get("to", [])),
-        }
-        for email in response.json()
-    ]
-
-
-def verify_email_received(_maildev: types.TestContainerDocker, filters: dict) -> bool:
-    def matches(expected, actual: str) -> bool:
-        if isinstance(expected, re.Pattern):
-            return expected.search(actual) is not None
-        return expected == actual
-
-    for email in get_all_mails(_maildev):
-        if all(key in email and matches(filter_value, email[key]) for key, filter_value in filters.items()):
-            return True
-    return False
-
-
-def delete_all_mails(_maildev: types.TestContainerDocker) -> None:
-    url = _maildev.host_configs["1080"].get("/email/all")
-    response = requests.delete(url, timeout=5)
-    assert response.status_code == HTTPStatus.OK, f"Failed to delete emails from MailDev, status code: {response.status_code}, response: {response.text}"

tests/fixtures/notification_channel.py

@@ -1,6 +1,3 @@
-# pylint: disable=line-too-long
-import json
-import time
 from collections.abc import Callable
 from http import HTTPStatus
 
@@ -14,116 +11,10 @@ from wiremock.testing.testcontainer import WireMockContainer
 from fixtures import reuse, types
 from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
 from fixtures.logger import setup_logger
-from fixtures.maildev import MAILDEV_INCOMING_PASS, SMTP_TEST_FROM
 
 logger = setup_logger(__name__)
 
 
-EMAIL_TRANSPORT_KEYS = [
-    "from",
-    "hello",
-    "smarthost",
-    "auth_username",
-    "auth_password",
-    "auth_password_file",
-    "auth_secret",
-    "auth_secret_file",
-    "auth_identity",
-    "require_tls",
-    "tls_config",
-    "force_implicit_tls",
-]
-
-
-def assert_email_channel_payload_clean(payload: str) -> None:
-    receiver = json.loads(payload)
-    for email_config in receiver["email_configs"]:
-        transport_keys = set(email_config.keys()) & set(EMAIL_TRANSPORT_KEYS)
-        transport_keys -= {"smarthost"} if email_config.get("smarthost", "") == "" else set()
-        assert not transport_keys, f"email channel payload carries transport keys {transport_keys}: {payload}"
-
-    assert MAILDEV_INCOMING_PASS not in payload
-    assert SMTP_TEST_FROM not in payload
-
-
-"""
-Default notification channel configs shared across alertmanager tests.
-"""
-slack_default_config = {
-    # channel name configured on runtime
-    "slack_configs": [
-        {
-            "api_url": "services/TEAM_ID/BOT_ID/TOKEN_ID",  # base_url configured on runtime
-            "title": '[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }}\n {{- if gt (len .CommonLabels) (len .GroupLabels) -}}\n {{" "}}(\n {{- with .CommonLabels.Remove .GroupLabels.Names }}\n {{- range $index, $label := .SortedPairs -}}\n {{ if $index }}, {{ end }}\n {{- $label.Name }}="{{ $label.Value -}}"\n {{- end }}\n {{- end -}}\n )\n {{- end }}',
-            "text": '{{ range .Alerts -}}\r\n *Alert:* {{ .Labels.alertname }}{{ if .Labels.severity }} - {{ .Labels.severity }}{{ end }}\r\n\r\n *Summary:* {{ .Annotations.summary }}\r\n *Description:* {{ .Annotations.description }}\r\n *RelatedLogs:* {{ if gt (len .Annotations.related_logs) 0 -}} View in <{{ .Annotations.related_logs }}|logs explorer> {{- end}}\r\n *RelatedTraces:* {{ if gt (len .Annotations.related_traces) 0 -}} View in <{{ .Annotations.related_traces }}|traces explorer> {{- end}}\r\n\r\n *Details:*\r\n {{ range .Labels.SortedPairs -}}\r\n   {{- if ne .Name "ruleId" -}}\r\n \u2022 *{{ .Name }}:* {{ .Value }}\r\n   {{ end -}}\r\n {{ end -}}\r\n{{ end }}',
-        }
-    ],
-}
-
-msteams_default_config = {
-    "msteamsv2_configs": [
-        {
-            "webhook_url": "msteams/webhook_url",  # base_url configured on runtime
-            "title": '[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }}\n {{- if gt (len .CommonLabels) (len .GroupLabels) -}}\n {{" "}}(\n {{- with .CommonLabels.Remove .GroupLabels.Names }}\n {{- range $index, $label := .SortedPairs -}}\n {{ if $index }}, {{ end }}\n {{- $label.Name }}="{{ $label.Value -}}"\n {{- end }}\n {{- end -}}\n )\n {{- end }}',
-            "text": '{{ range .Alerts -}}\r\n *Alert:* {{ .Labels.alertname }}{{ if .Labels.severity }} - {{ .Labels.severity }}{{ end }}\r\n\r\n *Summary:* {{ .Annotations.summary }}\r\n *Description:* {{ .Annotations.description }}\r\n *RelatedLogs:* {{ if gt (len .Annotations.related_logs) 0 -}} View in <{{ .Annotations.related_logs }}|logs explorer> {{- end}}\r\n *RelatedTraces:* {{ if gt (len .Annotations.related_traces) 0 -}} View in <{{ .Annotations.related_traces }}|traces explorer> {{- end}}\r\n\r\n *Details:*\r\n {{ range .Labels.SortedPairs -}}\r\n   {{- if ne .Name "ruleId" -}}\r\n \u2022 *{{ .Name }}:* {{ .Value }}\r\n   {{ end -}}\r\n {{ end -}}\r\n{{ end }}',
-        }
-    ],
-}
-
-pagerduty_default_config = {
-    "pagerduty_configs": [
-        {
-            "routing_key": "PagerDutyRoutingKey",
-            "url": "v2/enqueue",  # base_url configured on runtime
-            "client": "SigNoz Alert Manager",
-            "client_url": "https://enter-signoz-host-n-port-here/alerts",
-            "description": '[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }}\n\t{{- if gt (len .CommonLabels) (len .GroupLabels) -}}\n\t {{" "}}(\n\t {{- with .CommonLabels.Remove .GroupLabels.Names }}\n\t\t{{- range $index, $label := .SortedPairs -}}\n\t\t {{ if $index }}, {{ end }}\n\t\t {{- $label.Name }}="{{ $label.Value -}}"\n\t\t{{- end }}\n\t {{- end -}}\n\t )\n\t{{- end }}',
-            "details": {
-                "firing": '{{ template "pagerduty.default.instances" .Alerts.Firing }}',
-                "num_firing": "{{ .Alerts.Firing | len }}",
-                "num_resolved": "{{ .Alerts.Resolved | len }}",
-                "resolved": '{{ template "pagerduty.default.instances" .Alerts.Resolved }}',
-            },
-            "source": "SigNoz Alert Manager",
-            "severity": "{{ (index .Alerts 0).Labels.severity }}",
-        }
-    ],
-}
-
-opsgenie_default_config = {
-    "opsgenie_configs": [
-        {
-            "api_key": "OpsGenieAPIKey",
-            "api_url": "/",  # base_url configured on runtime
-            "description": '{{ if gt (len .Alerts.Firing) 0 -}}\r\n\tAlerts Firing:\r\n\t{{ range .Alerts.Firing }}\r\n\t - Message: {{ .Annotations.description }}\r\n\tLabels:\r\n\t{{ range .Labels.SortedPairs -}}\r\n\t\t{{- if ne .Name "ruleId" }}   - {{ .Name }} = {{ .Value }}\r\n\t{{ end -}}\r\n\t{{- end }}   Annotations:\r\n\t{{ range .Annotations.SortedPairs }}   - {{ .Name }} = {{ .Value }}\r\n\t{{ end }}   Source: {{ .GeneratorURL }}\r\n\t{{ end }}\r\n{{- end }}\r\n{{ if gt (len .Alerts.Resolved) 0 -}}\r\n\tAlerts Resolved:\r\n\t{{ range .Alerts.Resolved }}\r\n\t - Message: {{ .Annotations.description }}\r\n\tLabels:\r\n\t{{ range .Labels.SortedPairs -}}\r\n\t\t{{- if ne .Name "ruleId" }}   - {{ .Name }} = {{ .Value }}\r\n\t{{ end -}}\r\n\t{{- end }}   Annotations:\r\n\t{{ range .Annotations.SortedPairs }}   - {{ .Name }} = {{ .Value }}\r\n\t{{ end }}   Source: {{ .GeneratorURL }}\r\n\t{{ end }}\r\n{{- end }}',
-            "priority": '{{ if eq (index .Alerts 0).Labels.severity "critical" }}P1{{ else if eq (index .Alerts 0).Labels.severity "warning" }}P2{{ else if eq (index .Alerts 0).Labels.severity "info" }}P3{{ else }}P4{{ end }}',
-            "message": "{{ .CommonLabels.alertname }}",
-            "details": {},
-        }
-    ],
-}
-
-webhook_default_config = {
-    "webhook_configs": [
-        {
-            "url": "webhook/webhook_url",  # base_url configured on runtime
-        }
-    ],
-}
-
-email_default_config = {
-    "email_configs": [
-        {
-            "to": "test@example.com",
-            "html": '<html><body>{{ range .Alerts -}}\r\n *Alert:* {{ .Labels.alertname }}{{ if .Labels.severity }} - {{ .Labels.severity }}{{ end }}\r\n\r\n *Summary:* {{ .Annotations.summary }}\r\n *Description:* {{ .Annotations.description }}\r\n *RelatedLogs:* {{ if gt (len .Annotations.related_logs) 0 -}} View in <{{ .Annotations.related_logs }}|logs explorer> {{- end}}\r\n *RelatedTraces:* {{ if gt (len .Annotations.related_traces) 0 -}} View in <{{ .Annotations.related_traces }}|traces explorer> {{- end}}\r\n\r\n *Details:*\r\n {{ range .Labels.SortedPairs -}}\r\n   {{- if ne .Name "ruleId" -}}\r\n \u2022 *{{ .Name }}:* {{ .Value }}\r\n   {{ end -}}\r\n {{ end -}}\r\n{{ end }}</body></html>',
-            "headers": {
-                "Subject": '[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }}\n {{- if gt (len .CommonLabels) (len .GroupLabels) -}}\n {{" "}}(\n {{- with .CommonLabels.Remove .GroupLabels.Names }}\n {{- range $index, $label := .SortedPairs -}}\n {{ if $index }}, {{ end }}\n {{- $label.Name }}="{{ $label.Value -}}"\n {{- end }}\n {{- end -}}\n )\n {{- end }}'
-            },
-        }
-    ],
-}
-
-
 @pytest.fixture(name="notification_channel", scope="package")
 def notification_channel(
     network: Network,
@@ -176,40 +67,6 @@ def notification_channel(
     )
 
 
-@pytest.fixture(name="create_notification_channel", scope="function")
-def create_notification_channel(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-) -> Callable[[dict], str]:
-    admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    channel_ids = []
-
-    def _create_notification_channel(channel_config: dict) -> str:
-        response = requests.post(
-            signoz.self.host_configs["8080"].get("/api/v1/channels"),
-            json=channel_config,
-            headers={"Authorization": f"Bearer {admin_token}"},
-            timeout=5,
-        )
-        assert response.status_code == HTTPStatus.CREATED, f"Failed to create channel, Response: {response.text} Response status: {response.status_code}"
-        channel_id = response.json()["data"]["id"]
-        channel_ids.append(channel_id)
-        return channel_id
-
-    yield _create_notification_channel
-
-    for channel_id in channel_ids:
-        response = requests.delete(
-            signoz.self.host_configs["8080"].get(f"/api/v1/channels/{channel_id}"),
-            headers={"Authorization": f"Bearer {admin_token}"},
-            timeout=5,
-        )
-        if response.status_code != HTTPStatus.NO_CONTENT:
-            logger.error("Failed to delete channel: %s", {"channel_id": channel_id, "status": response.status_code, "response": response.text})
-
-
 @pytest.fixture(name="create_webhook_notification_channel", scope="function")
 def create_webhook_notification_channel(
     signoz: types.SigNoz,
@@ -246,19 +103,3 @@ def create_webhook_notification_channel(
         return channel_id
 
     return _create_webhook_notification_channel
-
-
-def send_test_notification(signoz: types.SigNoz, token: str, receiver: dict, wait_seconds: int = 90) -> None:
-    deadline = time.time() + wait_seconds
-    last = None
-    while time.time() < deadline:
-        last = requests.post(
-            signoz.self.host_configs["8080"].get("/api/v1/channels/test"),
-            json=receiver,
-            headers={"Authorization": f"Bearer {token}"},
-            timeout=30,
-        )
-        if last.status_code == HTTPStatus.NO_CONTENT:
-            return
-        time.sleep(2)
-    raise AssertionError(f"test notification did not succeed within {wait_seconds}s, last response: {last.status_code} {last.text}")

tests/fixtures/types.py

@@ -197,40 +197,3 @@ class AlertTestCase:
     alert_data: list[AlertData]
     # list of alert expectations for the test case
     alert_expectation: AlertExpectation
-
-
-@dataclass(frozen=True)
-class NotificationValidation:
-    # destination type of the notification, either webhook or email
-    # slack, msteams, pagerduty, opsgenie, webhook channels send notifications through webhook
-    # email channels send notifications through email
-    destination_type: Literal["webhook", "email"]
-    # validation data for validating the received notification payload
-    validation_data: dict[str, any]
-
-
-@dataclass(frozen=True)
-class AMNotificationExpectation:
-    # whether we expect any notifications to be fired or not, false when testing downtime scenarios
-    # or don't expect any notifications to be fired in given time period
-    should_notify: bool
-    # seconds to wait for the notifications to be fired, if no
-    # notifications are fired in the expected time, the test will fail
-    wait_time_seconds: int
-    # list of notifications to expect, as a single rule can trigger multiple notifications
-    # spanning across different notifiers
-    notification_validations: list[NotificationValidation]
-
-
-@dataclass(frozen=True)
-class AlertManagerNotificationTestCase:
-    # name of the test case
-    name: str
-    # path to the rule file in testdata directory
-    rule_path: str
-    # list of alert data that will be inserted into the database for the rule to be triggered
-    alert_data: list[AlertData]
-    # configuration for the notification channel
-    channel_config: dict[str, any]
-    # notification expectations for the test case
-    notification_expectation: AMNotificationExpectation

tests/integration/bootstrap/setup.py

@@ -39,7 +39,5 @@ def test_teardown(
     idp: types.TestContainerIDP,  # pylint: disable=unused-argument
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     migrator: types.Operation,  # pylint: disable=unused-argument
-    maildev: types.TestContainerDocker,  # pylint: disable=unused-argument
-    notification_channel: types.TestContainerDocker,  # pylint: disable=unused-argument
 ) -> None:
     pass

tests/integration/testdata/alertmanager/content_templating/logs_data.jsonl

@@ -1,20 +0,0 @@
-{ "timestamp": "2026-01-29T10:00:00.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "User login successful", "severity_text": "INFO" }
-{ "timestamp": "2026-01-29T10:00:30.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: gateway timeout", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:01:00.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: card declined", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:01:30.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "Database connection established", "severity_text": "INFO" }
-{ "timestamp": "2026-01-29T10:02:00.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: insufficient funds", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:02:30.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: invalid token", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:03:00.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "API request received", "severity_text": "INFO" }
-{ "timestamp": "2026-01-29T10:03:30.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: gateway timeout", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:04:00.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: card declined", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:04:30.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: invalid token", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:05:00.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: gateway timeout", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:05:30.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: card declined", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:06:00.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: gateway timeout", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:06:30.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: insufficient funds", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:07:00.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: card declined", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:07:30.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: gateway timeout", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:08:00.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "Response sent to client", "severity_text": "INFO" }
-{ "timestamp": "2026-01-29T10:08:30.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: invalid token", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:09:00.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: card declined", "severity_text": "ERROR" }
-{ "timestamp": "2026-01-29T10:10:00.000000Z", "resources": { "service.name": "payment-service" }, "attributes": { "code.file": "payment_handler.py" }, "body": "payment failure: gateway timeout", "severity_text": "ERROR" }

tests/integration/testdata/alertmanager/content_templating/logs_rule.json

@@ -1,69 +0,0 @@
-{
-  "alert": "content_templating_logs",
-  "ruleType": "threshold_rule",
-  "alertType": "LOGS_BASED_ALERT",
-  "condition": {
-    "thresholds": {
-      "kind": "basic",
-      "spec": [
-        {
-          "name": "critical",
-          "target": 0,
-          "matchType": "1",
-          "op": "1",
-          "channels": [
-            "test channel"
-          ]
-        }
-      ]
-    },
-    "compositeQuery": {
-      "queryType": "builder",
-      "panelType": "graph",
-      "queries": [
-        {
-          "type": "builder_query",
-          "spec": {
-            "name": "A",
-            "signal": "logs",
-            "filter": {
-              "expression": "body CONTAINS 'payment failure'"
-            },
-            "aggregations": [
-              {
-                "expression": "count()"
-              }
-            ],
-            "groupBy": [
-              {"name": "service.name", "fieldContext": "resource"}
-            ]
-          }
-        }
-      ]
-    },
-    "selectedQueryName": "A"
-  },
-  "evaluation": {
-    "kind": "rolling",
-    "spec": {
-      "evalWindow": "5m0s",
-      "frequency": "15s"
-    }
-  },
-  "labels": {},
-  "annotations": {
-    "description": "Payment failure spike detected on $service_name",
-    "summary": "Payment failures elevated on $service_name"
-  },
-  "notificationSettings": {
-    "groupBy": [],
-    "usePolicy": false,
-    "renotify": {
-      "enabled": false,
-      "interval": "30m",
-      "alertStates": []
-    }
-  },
-  "version": "v5",
-  "schemaVersion": "v2alpha1"
-}

tests/integration/testdata/alertmanager/content_templating/metrics_data.jsonl

@@ -1,12 +0,0 @@
-{"metric_name":"container_memory_bytes_content_templating","labels":{"namespace":"production","pod":"checkout-7d9c8b5f4-x2k9p","container":"checkout","node":"ip-10-0-1-23","severity":"critical","service":"checkout"},"timestamp":"2026-01-29T10:01:00+00:00","value":80,"temporality":"Unspecified","type_":"Gauge","is_monotonic":false,"flags":0,"description":"","unit":"bytes","env":"default","resource_attrs":{},"scope_attrs":{}}
-{"metric_name":"container_memory_bytes_content_templating","labels":{"namespace":"production","pod":"checkout-7d9c8b5f4-x2k9p","container":"checkout","node":"ip-10-0-1-23","severity":"critical","service":"checkout"},"timestamp":"2026-01-29T10:02:00+00:00","value":95,"temporality":"Unspecified","type_":"Gauge","is_monotonic":false,"flags":0,"description":"","unit":"bytes","env":"default","resource_attrs":{},"scope_attrs":{}}
-{"metric_name":"container_memory_bytes_content_templating","labels":{"namespace":"production","pod":"checkout-7d9c8b5f4-x2k9p","container":"checkout","node":"ip-10-0-1-23","severity":"critical","service":"checkout"},"timestamp":"2026-01-29T10:03:00+00:00","value":110,"temporality":"Unspecified","type_":"Gauge","is_monotonic":false,"flags":0,"description":"","unit":"bytes","env":"default","resource_attrs":{},"scope_attrs":{}}
-{"metric_name":"container_memory_bytes_content_templating","labels":{"namespace":"production","pod":"checkout-7d9c8b5f4-x2k9p","container":"checkout","node":"ip-10-0-1-23","severity":"critical","service":"checkout"},"timestamp":"2026-01-29T10:04:00+00:00","value":120,"temporality":"Unspecified","type_":"Gauge","is_monotonic":false,"flags":0,"description":"","unit":"bytes","env":"default","resource_attrs":{},"scope_attrs":{}}
-{"metric_name":"container_memory_bytes_content_templating","labels":{"namespace":"production","pod":"checkout-7d9c8b5f4-x2k9p","container":"checkout","node":"ip-10-0-1-23","severity":"critical","service":"checkout"},"timestamp":"2026-01-29T10:05:00+00:00","value":125,"temporality":"Unspecified","type_":"Gauge","is_monotonic":false,"flags":0,"description":"","unit":"bytes","env":"default","resource_attrs":{},"scope_attrs":{}}
-{"metric_name":"container_memory_bytes_content_templating","labels":{"namespace":"production","pod":"checkout-7d9c8b5f4-x2k9p","container":"checkout","node":"ip-10-0-1-23","severity":"critical","service":"checkout"},"timestamp":"2026-01-29T10:06:00+00:00","value":130,"temporality":"Unspecified","type_":"Gauge","is_monotonic":false,"flags":0,"description":"","unit":"bytes","env":"default","resource_attrs":{},"scope_attrs":{}}
-{"metric_name":"container_memory_bytes_content_templating","labels":{"namespace":"production","pod":"checkout-7d9c8b5f4-x2k9p","container":"checkout","node":"ip-10-0-1-23","severity":"critical","service":"checkout"},"timestamp":"2026-01-29T10:07:00+00:00","value":135,"temporality":"Unspecified","type_":"Gauge","is_monotonic":false,"flags":0,"description":"","unit":"bytes","env":"default","resource_attrs":{},"scope_attrs":{}}
-{"metric_name":"container_memory_bytes_content_templating","labels":{"namespace":"production","pod":"checkout-7d9c8b5f4-x2k9p","container":"checkout","node":"ip-10-0-1-23","severity":"critical","service":"checkout"},"timestamp":"2026-01-29T10:08:00+00:00","value":140,"temporality":"Unspecified","type_":"Gauge","is_monotonic":false,"flags":0,"description":"","unit":"bytes","env":"default","resource_attrs":{},"scope_attrs":{}}
-{"metric_name":"container_memory_bytes_content_templating","labels":{"namespace":"production","pod":"checkout-7d9c8b5f4-x2k9p","container":"checkout","node":"ip-10-0-1-23","severity":"critical","service":"checkout"},"timestamp":"2026-01-29T10:09:00+00:00","value":145,"temporality":"Unspecified","type_":"Gauge","is_monotonic":false,"flags":0,"description":"","unit":"bytes","env":"default","resource_attrs":{},"scope_attrs":{}}
-{"metric_name":"container_memory_bytes_content_templating","labels":{"namespace":"production","pod":"checkout-7d9c8b5f4-x2k9p","container":"checkout","node":"ip-10-0-1-23","severity":"critical","service":"checkout"},"timestamp":"2026-01-29T10:10:00+00:00","value":150,"temporality":"Unspecified","type_":"Gauge","is_monotonic":false,"flags":0,"description":"","unit":"bytes","env":"default","resource_attrs":{},"scope_attrs":{}}
-{"metric_name":"container_memory_bytes_content_templating","labels":{"namespace":"production","pod":"checkout-7d9c8b5f4-x2k9p","container":"checkout","node":"ip-10-0-1-23","severity":"critical","service":"checkout"},"timestamp":"2026-01-29T10:11:00+00:00","value":155,"temporality":"Unspecified","type_":"Gauge","is_monotonic":false,"flags":0,"description":"","unit":"bytes","env":"default","resource_attrs":{},"scope_attrs":{}}
-{"metric_name":"container_memory_bytes_content_templating","labels":{"namespace":"production","pod":"checkout-7d9c8b5f4-x2k9p","container":"checkout","node":"ip-10-0-1-23","severity":"critical","service":"checkout"},"timestamp":"2026-01-29T10:12:00+00:00","value":160,"temporality":"Unspecified","type_":"Gauge","is_monotonic":false,"flags":0,"description":"","unit":"bytes","env":"default","resource_attrs":{},"scope_attrs":{}}

tests/integration/testdata/alertmanager/content_templating/metrics_rule.json

@@ -1,72 +0,0 @@
-{
-  "alert": "content_templating_metrics",
-  "ruleType": "threshold_rule",
-  "alertType": "METRIC_BASED_ALERT",
-  "condition": {
-    "thresholds": {
-      "kind": "basic",
-      "spec": [
-        {
-          "name": "critical",
-          "target": 100,
-          "matchType": "1",
-          "op": "1",
-          "channels": [
-            "test channel"
-          ]
-        }
-      ]
-    },
-    "compositeQuery": {
-      "queryType": "builder",
-      "panelType": "graph",
-      "queries": [
-        {
-          "type": "builder_query",
-          "spec": {
-            "name": "A",
-            "signal": "metrics",
-            "aggregations": [
-              {
-                "metricName": "container_memory_bytes_content_templating",
-                "timeAggregation": "avg",
-                "spaceAggregation": "max"
-              }
-            ],
-            "groupBy": [
-              {"name": "namespace", "fieldContext": "attribute", "fieldDataType": "string"},
-              {"name": "pod", "fieldContext": "attribute", "fieldDataType": "string"},
-              {"name": "container", "fieldContext": "attribute", "fieldDataType": "string"},
-              {"name": "node", "fieldContext": "attribute", "fieldDataType": "string"},
-              {"name": "severity", "fieldContext": "attribute", "fieldDataType": "string"}
-            ]
-          }
-        }
-      ]
-    },
-    "selectedQueryName": "A"
-  },
-  "evaluation": {
-    "kind": "rolling",
-    "spec": {
-      "evalWindow": "5m0s",
-      "frequency": "15s"
-    }
-  },
-  "labels": {},
-  "annotations": {
-    "description": "Container $container in pod $pod ($namespace) exceeded memory threshold",
-    "summary": "High container memory in $namespace/$pod"
-  },
-  "notificationSettings": {
-    "groupBy": [],
-    "usePolicy": false,
-    "renotify": {
-      "enabled": false,
-      "interval": "30m",
-      "alertStates": []
-    }
-  },
-  "version": "v5",
-  "schemaVersion": "v2alpha1"
-}

tests/integration/testdata/alertmanager/content_templating/traces_data.jsonl

@@ -1,20 +0,0 @@
-{ "timestamp": "2026-01-29T10:00:00.000000Z", "duration": "PT1.2S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6a1", "span_id": "c1b2c3d4e5f6a7b8", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:00:30.000000Z", "duration": "PT1.4S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6a2", "span_id": "c2b3c4d5e6f7a8b9", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:01:00.000000Z", "duration": "PT1.6S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6a3", "span_id": "c3b4c5d6e7f8a9b0", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:01:30.000000Z", "duration": "PT1.8S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6a4", "span_id": "c4b5c6d7e8f9a0b1", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:02:00.000000Z", "duration": "PT2.1S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6a5", "span_id": "c5b6c7d8e9f0a1b2", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:02:30.000000Z", "duration": "PT2.3S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6a6", "span_id": "c6b7c8d9e0f1a2b3", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:03:00.000000Z", "duration": "PT2.5S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6a7", "span_id": "c7b8c9d0e1f2a3b4", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:03:30.000000Z", "duration": "PT2.7S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6a8", "span_id": "c8b9c0d1e2f3a4b5", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:04:00.000000Z", "duration": "PT2.9S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6a9", "span_id": "c9b0c1d2e3f4a5b6", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:04:30.000000Z", "duration": "PT3.1S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6b1", "span_id": "d1c2d3e4f5a6b7c8", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:05:00.000000Z", "duration": "PT3.3S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6b2", "span_id": "d2c3d4e5f6a7b8c9", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:05:30.000000Z", "duration": "PT3.5S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6b3", "span_id": "d3c4d5e6f7a8b9c0", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:06:00.000000Z", "duration": "PT3.7S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6b4", "span_id": "d4c5d6e7f8a9b0c1", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:06:30.000000Z", "duration": "PT3.9S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6b5", "span_id": "d5c6d7e8f9a0b1c2", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:07:00.000000Z", "duration": "PT4.1S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6b6", "span_id": "d6c7d8e9f0a1b2c3", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:07:30.000000Z", "duration": "PT4.3S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6b7", "span_id": "d7c8d9e0f1a2b3c4", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:08:00.000000Z", "duration": "PT4.5S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6b8", "span_id": "d8c9d0e1f2a3b4c5", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:08:30.000000Z", "duration": "PT4.7S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6b9", "span_id": "d9c0d1e2f3a4b5c6", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:09:00.000000Z", "duration": "PT4.9S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6c1", "span_id": "e1d2e3f4a5b6c7d8", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }
-{ "timestamp": "2026-01-29T10:10:00.000000Z", "duration": "PT5.1S", "trace_id": "591f6d3d6b0a1f9e8a71b2c3d4e5f6c2", "span_id": "e2d3e4f5a6b7c8d9", "parent_span_id": "", "name": "POST /checkout", "kind": 2, "status_code": 1, "status_message": "", "resources": { "deployment.environment": "production", "service.name": "checkout-service", "os.type": "linux", "host.name": "ip-10-0-1-23" }, "attributes": { "net.transport": "IP.TCP", "http.scheme": "http", "http.user_agent": "Integration Test", "http.request.method": "POST", "http.response.status_code": "200", "http.request.path": "/checkout" } }

tests/integration/testdata/alertmanager/content_templating/traces_rule.json

@@ -1,71 +0,0 @@
-{
-  "alert": "content_templating_traces",
-  "ruleType": "threshold_rule",
-  "alertType": "TRACES_BASED_ALERT",
-  "condition": {
-    "thresholds": {
-      "kind": "basic",
-      "spec": [
-        {
-          "name": "critical",
-          "target": 1,
-          "matchType": "1",
-          "op": "1",
-          "channels": [
-            "test channel"
-          ],
-          "targetUnit": "s"
-        }
-      ]
-    },
-    "compositeQuery": {
-      "queryType": "builder",
-      "unit": "ns",
-      "panelType": "graph",
-      "queries": [
-        {
-          "type": "builder_query",
-          "spec": {
-            "name": "A",
-            "signal": "traces",
-            "filter": {
-              "expression": "http.request.path = '/checkout'"
-            },
-            "aggregations": [
-              {
-                "expression": "p90(duration_nano)"
-              }
-            ],
-            "groupBy": [
-              {"name": "service.name", "fieldContext": "resource"}
-            ]
-          }
-        }
-      ]
-    },
-    "selectedQueryName": "A"
-  },
-  "evaluation": {
-    "kind": "rolling",
-    "spec": {
-      "evalWindow": "5m0s",
-      "frequency": "15s"
-    }
-  },
-  "labels": {},
-  "annotations": {
-    "description": "p90 latency high on $service_name",
-    "summary": "p90 latency exceeded threshold on $service_name"
-  },
-  "notificationSettings": {
-    "groupBy": [],
-    "usePolicy": false,
-    "renotify": {
-      "enabled": false,
-      "interval": "30m",
-      "alertStates": []
-    }
-  },
-  "version": "v5",
-  "schemaVersion": "v2alpha1"
-}

tests/integration/testdata/promqltestcorpus/known_divergences_v2.json

@@ -1,4 +1,17 @@
 {
-  "note": "Divergences of the clickhousev2 provider (pinned via X-SigNoz-PromQL-Provider) from the upstream reference engine, enforced exactly by 01_upstream_corpus.py in both directions. This ledger is the rollout scorecard for the provider swap: the default provider cannot be replaced by clickhousev2 while anything is listed here. Entries must carry the defect's cause and be REMOVED as the provider is fixed.",
-  "divergences": {}
+  "note": "Divergences of the clickhousev2 provider (pinned via X-SigNoz-PromQL-Provider) from the upstream reference engine, enforced exactly by 01_upstream_corpus.py in both directions. This ledger is the rollout scorecard for the provider swap: the default provider cannot be replaced by clickhousev2 while anything is listed here. Entries must carry the defect's cause and be REMOVED as the provider is fixed. Current class: the engine aggregates floats with Kahan compensated summation (sum, sum_over_time) and an overflow-free incremental mean (avg); ClickHouse's sumForEach/avgForEach/arraySum are naive, so extreme-magnitude corpus data (±1e100 cancellation, ±1.8e308 overflow) diverges on transpiled plans. Burn-down candidates: sumKahanForEach for the cancellation class; the overflow class needs an incremental-mean aggregate ClickHouse does not have.",
+  "divergences": {
+    "aggregators.test:651[base]": "avg over near-max-float64 values: engine's incremental mean never forms the overflowing sum; avgForEach sums then divides, overflowing to +Inf",
+    "aggregators.test:651[instant-coarse]": "same as aggregators.test:651[base] on the coarse-step grid variant",
+    "aggregators.test:654[base]": "avg over near-min-float64 values: engine's incremental mean never forms the overflowing sum; avgForEach overflows to -Inf",
+    "aggregators.test:654[instant-coarse]": "same as aggregators.test:654[base] on the coarse-step grid variant",
+    "aggregators.test:687[base]": "sum over {1e100, -1e100, small}: engine uses Kahan compensated summation; sumForEach's naive summation loses the small terms to cancellation and returns 0",
+    "aggregators.test:687[instant-coarse]": "same as aggregators.test:687[base] on the coarse-step grid variant",
+    "aggregators.test:695[base]": "avg over {1e100, -1e100, small}: same Kahan-vs-naive cancellation as aggregators.test:687, divided by count",
+    "aggregators.test:695[instant-coarse]": "same as aggregators.test:695[base] on the coarse-step grid variant",
+    "functions.test:1084[instant-coarse]": "sum_over_time over a window containing ±1e100: the disjoint coarse-step form's arraySum slide is naive summation, cancelling to 0 (the base variant's W>64 shape falls back to the engine and is exact)",
+    "functions.test:1087[instant-coarse]": "avg_over_time, same window and cancellation as functions.test:1084[instant-coarse]",
+    "functions.test:1149[base]": "avg_over_time over ±2.258e220-magnitude samples: engine's Kahan-compensated incremental mean cancels exactly to 0; the bucketed form's naive slide summation leaves a ~1e202 residue",
+    "functions.test:1149[instant-coarse]": "same as functions.test:1149[base] through the disjoint coarse-step form"
+  }
 }

tests/integration/tests/alertmanager/01_channels.py

@@ -1,268 +0,0 @@
-import time
-import uuid
-from collections.abc import Callable
-from http import HTTPStatus
-
-import pytest
-import requests
-from sqlalchemy import text
-
-from fixtures import types
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.maildev import (
-    MAILDEV_INCOMING_PASS,
-    SMTP_TEST_FROM,
-    delete_all_mails,
-    verify_email_received,
-)
-from fixtures.notification_channel import assert_email_channel_payload_clean, send_test_notification
-
-TIMEOUT = 10
-
-
-CHANNEL_TYPE_CASES = [
-    (
-        "webhook",
-        lambda sink: {"webhook_configs": [{"url": sink.container_configs["8080"].get("/webhook/crud-original"), "send_resolved": True}]},
-        lambda sink: {"webhook_configs": [{"url": sink.container_configs["8080"].get("/webhook/crud-updated"), "send_resolved": True}]},
-        "crud-original",
-        "crud-updated",
-    ),
-    (
-        "slack",
-        lambda sink: {"slack_configs": [{"api_url": sink.container_configs["8080"].get("/services/T/B/X"), "channel": "#crud-original"}]},
-        lambda sink: {"slack_configs": [{"api_url": sink.container_configs["8080"].get("/services/T/B/X"), "channel": "#crud-updated"}]},
-        "#crud-original",
-        "#crud-updated",
-    ),
-    (
-        "pagerduty",
-        lambda sink: {"pagerduty_configs": [{"routing_key": "crud-original-routing-key"}]},
-        lambda sink: {"pagerduty_configs": [{"routing_key": "crud-updated-routing-key"}]},
-        "crud-original-routing-key",
-        "crud-updated-routing-key",
-    ),
-    (
-        "opsgenie",
-        lambda sink: {"opsgenie_configs": [{"api_key": "crud-original-api-key", "message": "{{ .CommonLabels.alertname }}"}]},
-        lambda sink: {"opsgenie_configs": [{"api_key": "crud-updated-api-key", "message": "{{ .CommonLabels.alertname }}"}]},
-        "crud-original-api-key",
-        "crud-updated-api-key",
-    ),
-    (
-        "msteamsv2",
-        lambda sink: {"msteamsv2_configs": [{"webhook_url": sink.container_configs["8080"].get("/msteams/crud-original")}]},
-        lambda sink: {"msteamsv2_configs": [{"webhook_url": sink.container_configs["8080"].get("/msteams/crud-updated")}]},
-        "crud-original",
-        "crud-updated",
-    ),
-    (
-        "email",
-        lambda sink: {"email_configs": [{"to": "crud-original@integration.test"}]},
-        lambda sink: {"email_configs": [{"to": "crud-updated@integration.test"}]},
-        "crud-original@integration.test",
-        "crud-updated@integration.test",
-    ),
-]
-
-
-@pytest.mark.parametrize(
-    "channel_type,make_config,make_updated_config,created_marker,updated_marker",
-    CHANNEL_TYPE_CASES,
-    ids=[case[0] for case in CHANNEL_TYPE_CASES],
-)
-def test_channel_crud(  # pylint: disable=too-many-arguments,too-many-positional-arguments
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    notification_channel: types.TestContainerDocker,
-    channel_type: str,
-    make_config: Callable[[types.TestContainerDocker], dict],
-    make_updated_config: Callable[[types.TestContainerDocker], dict],
-    created_marker: str,
-    updated_marker: str,
-) -> None:
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    name = f"crud-{channel_type}-{uuid.uuid4()}"
-
-    config = {"name": name, **make_config(notification_channel)}
-    response = requests.post(signoz.self.host_configs["8080"].get("/api/v1/channels"), json=config, headers={"Authorization": f"Bearer {token}"}, timeout=TIMEOUT)
-    assert response.status_code == HTTPStatus.CREATED, response.text
-    created = response.json()["data"]
-    channel_id = created["id"]
-    assert created["name"] == name
-    assert created["type"] == channel_type
-
-    response = requests.get(signoz.self.host_configs["8080"].get("/api/v1/channels"), headers={"Authorization": f"Bearer {token}"}, timeout=TIMEOUT)
-    assert response.status_code == HTTPStatus.OK, response.text
-    listed = {channel["name"]: channel for channel in response.json()["data"]}
-    assert name in listed
-    assert listed[name]["type"] == channel_type
-
-    response = requests.get(signoz.self.host_configs["8080"].get(f"/api/v1/channels/{channel_id}"), headers={"Authorization": f"Bearer {token}"}, timeout=TIMEOUT)
-    assert response.status_code == HTTPStatus.OK, response.text
-    assert created_marker in response.json()["data"]["data"]
-
-    updated_config = {"name": name, **make_updated_config(notification_channel)}
-    response = requests.put(signoz.self.host_configs["8080"].get(f"/api/v1/channels/{channel_id}"), json=updated_config, headers={"Authorization": f"Bearer {token}"}, timeout=TIMEOUT)
-    assert response.status_code == HTTPStatus.NO_CONTENT, response.text
-
-    response = requests.get(signoz.self.host_configs["8080"].get(f"/api/v1/channels/{channel_id}"), headers={"Authorization": f"Bearer {token}"}, timeout=TIMEOUT)
-    assert response.status_code == HTTPStatus.OK, response.text
-    data = response.json()["data"]["data"]
-    assert updated_marker in data
-    assert created_marker not in data
-
-    response = requests.delete(signoz.self.host_configs["8080"].get(f"/api/v1/channels/{channel_id}"), headers={"Authorization": f"Bearer {token}"}, timeout=TIMEOUT)
-    assert response.status_code == HTTPStatus.NO_CONTENT, response.text
-
-    response = requests.get(signoz.self.host_configs["8080"].get(f"/api/v1/channels/{channel_id}"), headers={"Authorization": f"Bearer {token}"}, timeout=TIMEOUT)
-    assert response.status_code == HTTPStatus.NOT_FOUND, response.text
-
-
-def test_create_rejects_duplicate_name(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    create_notification_channel: Callable[[dict], str],
-) -> None:
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    name = f"duplicate-{uuid.uuid4()}"
-
-    create_notification_channel({"name": name, "email_configs": [{"to": "first@integration.test"}]})
-
-    response = requests.post(
-        signoz.self.host_configs["8080"].get("/api/v1/channels"),
-        json={"name": name, "email_configs": [{"to": "second@integration.test"}]},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=TIMEOUT,
-    )
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert "unique" in response.text
-
-
-def test_create_rejects_channel_without_configs(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-) -> None:
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    response = requests.post(
-        signoz.self.host_configs["8080"].get("/api/v1/channels"),
-        json={"name": f"empty-{uuid.uuid4()}"},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=TIMEOUT,
-    )
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert "notification configuration" in response.text
-
-
-def test_update_rejects_name_change(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    create_notification_channel: Callable[[dict], str],
-) -> None:
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    name = f"rename-{uuid.uuid4()}"
-    channel_id = create_notification_channel({"name": name, "email_configs": [{"to": "rename@integration.test"}]})
-
-    response = requests.put(
-        signoz.self.host_configs["8080"].get(f"/api/v1/channels/{channel_id}"),
-        json={"name": f"{name}-renamed", "email_configs": [{"to": "rename@integration.test"}]},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=TIMEOUT,
-    )
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert "cannot update channel name" in response.text
-
-
-def test_channels_require_authentication(signoz: types.SigNoz) -> None:
-    response = requests.get(signoz.self.host_configs["8080"].get("/api/v1/channels"), timeout=TIMEOUT)
-    assert response.status_code == HTTPStatus.UNAUTHORIZED, response.text
-
-
-def test_email_channel_never_stores_or_serves_smtp_settings(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-) -> None:
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    hostile_name = f"hostile-email-{uuid.uuid4()}"
-    hostile_config = {
-        "name": hostile_name,
-        "email_configs": [
-            {
-                "to": "hostile@integration.test",
-                "from": "spoofed@integration.test",
-                "hello": "attacker.test",
-                "smarthost": "smtp.attacker.test:2525",
-                "auth_username": "attacker",
-                "auth_password": "tenant-posted-secret",
-                "require_tls": False,
-                "headers": {"Subject": "hostile subject"},
-            }
-        ],
-    }
-
-    response = requests.post(signoz.self.host_configs["8080"].get("/api/v1/channels"), json=hostile_config, headers={"Authorization": f"Bearer {token}"}, timeout=TIMEOUT)
-    assert response.status_code == HTTPStatus.CREATED, response.text
-    created = response.json()["data"]
-    assert_email_channel_payload_clean(created["data"])
-
-    response = requests.get(signoz.self.host_configs["8080"].get(f"/api/v1/channels/{created['id']}"), headers={"Authorization": f"Bearer {token}"}, timeout=TIMEOUT)
-    assert response.status_code == HTTPStatus.OK, response.text
-    served = response.json()["data"]["data"]
-    assert_email_channel_payload_clean(served)
-    assert "hostile@integration.test" in served
-    assert "hostile subject" in served
-    assert "smtp.attacker.test" not in served
-    assert "tenant-posted-secret" not in served
-
-    response = requests.get(signoz.self.host_configs["8080"].get("/api/v1/channels"), headers={"Authorization": f"Bearer {token}"}, timeout=TIMEOUT)
-    assert response.status_code == HTTPStatus.OK, response.text
-    assert "tenant-posted-secret" not in response.text
-    assert MAILDEV_INCOMING_PASS not in response.text
-
-    with signoz.sqlstore.conn.connect() as conn:
-        stored = conn.execute(
-            text("SELECT data FROM notification_channel WHERE name = :name"),
-            {"name": hostile_name},
-        ).fetchone()
-        assert stored is not None
-        assert_email_channel_payload_clean(stored[0])
-        assert "tenant-posted-secret" not in stored[0]
-
-        configs = conn.execute(text("SELECT config FROM alertmanager_config")).fetchall()
-        assert len(configs) > 0
-        for (config_raw,) in configs:
-            assert MAILDEV_INCOMING_PASS not in config_raw
-            assert "tenant-posted-secret" not in config_raw
-            assert '"smtp_auth_password"' not in config_raw
-            assert '"auth_password"' not in config_raw
-
-
-def test_email_test_channel_delivers_via_env_transport(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    maildev: types.TestContainerDocker,
-) -> None:
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    delete_all_mails(maildev)
-
-    recipient = f"delivery-{uuid.uuid4()}@integration.test"
-    send_test_notification(
-        signoz,
-        token,
-        {"name": f"delivery-{uuid.uuid4()}", "email_configs": [{"to": recipient}]},
-    )
-
-    deadline = time.time() + 30
-    while time.time() < deadline:
-        if verify_email_received(maildev, {"to": recipient, "from": SMTP_TEST_FROM}):
-            return
-        time.sleep(1)
-    raise AssertionError(f"no email delivered to {recipient} from {SMTP_TEST_FROM}")

tests/integration/tests/alertmanager/02_notifiers.py

@@ -1,360 +0,0 @@
-import json
-import re
-import time
-import uuid
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-
-import pytest
-from wiremock.client import HttpMethods, Mapping, MappingRequest, MappingResponse
-
-from fixtures import types
-from fixtures.alerts import (
-    get_testdata_file_path,
-    update_raw_channel_config,
-    update_rule_channel_name,
-    verify_notification_expectation,
-)
-from fixtures.logger import setup_logger
-from fixtures.maildev import delete_all_mails
-from fixtures.notification_channel import (
-    email_default_config,
-    msteams_default_config,
-    opsgenie_default_config,
-    pagerduty_default_config,
-    slack_default_config,
-    webhook_default_config,
-)
-
-logger = setup_logger(__name__)
-
-NOTIFIERS_TEST = [
-    types.AlertManagerNotificationTestCase(
-        name="slack_notifier_default_templating",
-        rule_path="alerts/test_scenarios/threshold_above_at_least_once/rule.json",
-        alert_data=[
-            types.AlertData(
-                type="metrics",
-                data_path="alerts/test_scenarios/threshold_above_at_least_once/alert_data.jsonl",
-            ),
-        ],
-        channel_config=slack_default_config,
-        notification_expectation=types.AMNotificationExpectation(
-            should_notify=True,
-            # extra wait for alertmanager server setup
-            wait_time_seconds=120,
-            notification_validations=[
-                types.NotificationValidation(
-                    destination_type="webhook",
-                    validation_data={
-                        "path": "/services/TEAM_ID/BOT_ID/TOKEN_ID",
-                        "json_body": {
-                            "username": "Alertmanager",
-                            "attachments": [
-                                {
-                                    "color": "danger",
-                                    "mrkdwn_in": ["fallback", "pretext", "text"],
-                                }
-                            ],
-                        },
-                    },
-                ),
-            ],
-        ),
-    ),
-    types.AlertManagerNotificationTestCase(
-        name="msteams_notifier_default_templating",
-        rule_path="alerts/test_scenarios/threshold_above_at_least_once/rule.json",
-        alert_data=[
-            types.AlertData(
-                type="metrics",
-                data_path="alerts/test_scenarios/threshold_above_at_least_once/alert_data.jsonl",
-            ),
-        ],
-        channel_config=msteams_default_config,
-        notification_expectation=types.AMNotificationExpectation(
-            should_notify=True,
-            wait_time_seconds=120,
-            notification_validations=[
-                types.NotificationValidation(
-                    destination_type="webhook",
-                    validation_data={
-                        "path": "/msteams/webhook_url",
-                        "json_body": {
-                            "type": "message",
-                            "attachments": [
-                                {
-                                    "contentType": "application/vnd.microsoft.card.adaptive",
-                                    "content": {
-                                        "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
-                                        "type": "AdaptiveCard",
-                                        "version": "1.2",
-                                        "body": [
-                                            {
-                                                "type": "TextBlock",
-                                                "text": "Alerts",
-                                                "weight": "Bolder",
-                                                "size": "Medium",
-                                                "wrap": True,
-                                                "color": "Attention",
-                                            },
-                                            {
-                                                "type": "TextBlock",
-                                                "text": "Labels",
-                                                "weight": "Bolder",
-                                                "size": "Medium",
-                                            },
-                                            {
-                                                "type": "FactSet",
-                                                "text": "",
-                                                "facts": [
-                                                    {
-                                                        "title": "threshold.name",
-                                                        "value": "critical",
-                                                    }
-                                                ],
-                                            },
-                                            {
-                                                "type": "TextBlock",
-                                                "text": "Annotations",
-                                                "weight": "Bolder",
-                                                "size": "Medium",
-                                            },
-                                            {
-                                                "type": "FactSet",
-                                                "text": "",
-                                                "facts": [
-                                                    {
-                                                        "title": "description",
-                                                        "value": "This alert is fired when the defined metric (current value: 15) crosses the threshold (10)",
-                                                    },
-                                                ],
-                                            },
-                                        ],
-                                        "msteams": {"width": "full"},
-                                        "actions": [
-                                            {
-                                                "type": "Action.OpenUrl",
-                                                "title": "View Alert",
-                                            }
-                                        ],
-                                    },
-                                }
-                            ],
-                        },
-                    },
-                ),
-            ],
-        ),
-    ),
-    types.AlertManagerNotificationTestCase(
-        name="pagerduty_notifier_default_templating",
-        rule_path="alerts/test_scenarios/threshold_above_at_least_once/rule.json",
-        alert_data=[
-            types.AlertData(
-                type="metrics",
-                data_path="alerts/test_scenarios/threshold_above_at_least_once/alert_data.jsonl",
-            ),
-        ],
-        channel_config=pagerduty_default_config,
-        notification_expectation=types.AMNotificationExpectation(
-            should_notify=True,
-            wait_time_seconds=120,
-            notification_validations=[
-                types.NotificationValidation(
-                    destination_type="webhook",
-                    validation_data={
-                        "path": "/v2/enqueue",
-                        "json_body": {
-                            "routing_key": "PagerDutyRoutingKey",
-                            "event_action": "trigger",
-                            "payload": {
-                                "source": "SigNoz Alert Manager",
-                                "severity": "critical",
-                                "custom_details": {
-                                    "firing": {
-                                        "Annotations": [
-                                            {"description = This alert is fired when the defined metric (current value": "15) crosses the threshold (10)"},
-                                        ],
-                                        "Labels": [
-                                            "alertname = threshold_above_at_least_once",
-                                            "severity = critical",
-                                            "threshold.name = critical",
-                                        ],
-                                    }
-                                },
-                            },
-                            "client": "SigNoz Alert Manager",
-                            "client_url": "https://enter-signoz-host-n-port-here/alerts",
-                        },
-                    },
-                ),
-            ],
-        ),
-    ),
-    types.AlertManagerNotificationTestCase(
-        name="opsgenie_notifier_default_templating",
-        rule_path="alerts/test_scenarios/threshold_above_at_least_once/rule.json",
-        alert_data=[
-            types.AlertData(
-                type="metrics",
-                data_path="alerts/test_scenarios/threshold_above_at_least_once/alert_data.jsonl",
-            ),
-        ],
-        channel_config=opsgenie_default_config,
-        notification_expectation=types.AMNotificationExpectation(
-            should_notify=True,
-            wait_time_seconds=120,
-            notification_validations=[
-                types.NotificationValidation(
-                    destination_type="webhook",
-                    validation_data={
-                        "path": "/v2/alerts",
-                        "json_body": {
-                            "message": "threshold_above_at_least_once",
-                            "details": {
-                                "alertname": "threshold_above_at_least_once",
-                                "severity": "critical",
-                                "threshold.name": "critical",
-                            },
-                            "priority": "P1",
-                        },
-                    },
-                ),
-            ],
-        ),
-    ),
-    types.AlertManagerNotificationTestCase(
-        name="webhook_notifier_default_templating",
-        rule_path="alerts/test_scenarios/threshold_above_at_least_once/rule.json",
-        alert_data=[
-            types.AlertData(
-                type="metrics",
-                data_path="alerts/test_scenarios/threshold_above_at_least_once/alert_data.jsonl",
-            ),
-        ],
-        channel_config=webhook_default_config,
-        notification_expectation=types.AMNotificationExpectation(
-            should_notify=True,
-            wait_time_seconds=120,
-            notification_validations=[
-                types.NotificationValidation(
-                    destination_type="webhook",
-                    validation_data={
-                        "path": "/webhook/webhook_url",
-                        "json_body": {
-                            "status": "firing",
-                            "alerts": [
-                                {
-                                    "status": "firing",
-                                    "labels": {
-                                        "alertname": "threshold_above_at_least_once",
-                                        "severity": "critical",
-                                        "threshold.name": "critical",
-                                    },
-                                    "annotations": {
-                                        "description": "This alert is fired when the defined metric (current value: 15) crosses the threshold (10)",
-                                        "summary": "This alert is fired when the defined metric (current value: 15) crosses the threshold (10)",
-                                    },
-                                }
-                            ],
-                            "commonLabels": {
-                                "alertname": "threshold_above_at_least_once",
-                                "severity": "critical",
-                                "threshold.name": "critical",
-                            },
-                            "commonAnnotations": {
-                                "description": "This alert is fired when the defined metric (current value: 15) crosses the threshold (10)",
-                                "summary": "This alert is fired when the defined metric (current value: 15) crosses the threshold (10)",
-                            },
-                        },
-                    },
-                ),
-            ],
-        ),
-    ),
-    types.AlertManagerNotificationTestCase(
-        name="email_notifier_default_templating",
-        rule_path="alerts/test_scenarios/threshold_above_at_least_once/rule.json",
-        alert_data=[
-            types.AlertData(
-                type="metrics",
-                data_path="alerts/test_scenarios/threshold_above_at_least_once/alert_data.jsonl",
-            ),
-        ],
-        channel_config=email_default_config,
-        notification_expectation=types.AMNotificationExpectation(
-            should_notify=True,
-            wait_time_seconds=120,
-            notification_validations=[
-                types.NotificationValidation(
-                    destination_type="email",
-                    validation_data={
-                        "subject": re.compile(r'\[FIRING:1\] threshold_above_at_least_once for  \(alertname="threshold_above_at_least_once", ruleSource="http://localhost:8080/alerts/overview\?ruleId=[0-9a-f-]+", severity="critical", threshold\.name="critical"\)'),
-                    },
-                ),
-            ],
-        ),
-    ),
-]
-
-
-@pytest.mark.parametrize(
-    "notifier_test_case",
-    NOTIFIERS_TEST,
-    ids=lambda notifier_test_case: notifier_test_case.name,
-)
-def test_notifier_templating(  # pylint: disable=too-many-arguments,too-many-positional-arguments
-    notification_channel: types.TestContainerDocker,
-    make_http_mocks: Callable[[types.TestContainerDocker, list[Mapping]], None],
-    create_notification_channel: Callable[[dict], str],
-    create_alert_rule: Callable[[dict], str],
-    insert_alert_data: Callable[[list[types.AlertData], datetime], None],
-    maildev: types.TestContainerDocker,
-    notifier_test_case: types.AlertManagerNotificationTestCase,
-):
-    channel_name = str(uuid.uuid4())
-
-    channel_config = update_raw_channel_config(notifier_test_case.channel_config, channel_name, notification_channel)
-    logger.info("Channel config: %s", {"channel_config": channel_config})
-
-    webhook_validations = [v for v in notifier_test_case.notification_expectation.notification_validations if v.destination_type == "webhook"]
-    if len(webhook_validations) > 0:
-        mock_mappings = [
-            Mapping(
-                request=MappingRequest(method=HttpMethods.POST, url=v.validation_data["path"]),
-                response=MappingResponse(status=200, json_body={}),
-                persistent=False,
-            )
-            for v in webhook_validations
-        ]
-
-        make_http_mocks(notification_channel, mock_mappings)
-        logger.info("Mock mappings created")
-
-    if any(v.destination_type == "email" for v in notifier_test_case.notification_expectation.notification_validations):
-        delete_all_mails(maildev)
-        logger.info("Mails deleted")
-
-    create_notification_channel(channel_config)
-    logger.info("Channel created with name: %s", {"channel_name": channel_name})
-
-    time.sleep(12)
-
-    insert_alert_data(
-        notifier_test_case.alert_data,
-        base_time=datetime.now(tz=UTC) - timedelta(minutes=5),
-    )
-
-    rule_path = get_testdata_file_path(notifier_test_case.rule_path)
-    with open(rule_path, encoding="utf-8") as f:
-        rule_data = json.loads(f.read())
-    update_rule_channel_name(rule_data, channel_name)
-    rule_id = create_alert_rule(rule_data)
-    logger.info("rule created: %s", {"rule_id": rule_id, "rule_name": rule_data["alert"]})
-
-    verify_notification_expectation(
-        notification_channel,
-        maildev,
-        notifier_test_case.notification_expectation,
-    )

tests/integration/tests/alertmanager/03_content_templating.py

@@ -1,332 +0,0 @@
-import json
-import re
-import time
-import uuid
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-
-import pytest
-from wiremock.client import HttpMethods, Mapping, MappingRequest, MappingResponse
-
-from fixtures import types
-from fixtures.alerts import (
-    get_testdata_file_path,
-    update_raw_channel_config,
-    update_rule_channel_name,
-    verify_notification_expectation,
-)
-from fixtures.logger import setup_logger
-from fixtures.maildev import delete_all_mails
-from fixtures.notification_channel import (
-    msteams_default_config,
-    opsgenie_default_config,
-    pagerduty_default_config,
-    slack_default_config,
-    webhook_default_config,
-)
-
-logger = setup_logger(__name__)
-
-
-CONTENT_TEMPLATING_TEST = [
-    types.AlertManagerNotificationTestCase(
-        name="msteams_metrics_default_templating",
-        rule_path="alertmanager/content_templating/metrics_rule.json",
-        alert_data=[
-            types.AlertData(
-                type="metrics",
-                data_path="alertmanager/content_templating/metrics_data.jsonl",
-            ),
-        ],
-        channel_config=msteams_default_config,
-        notification_expectation=types.AMNotificationExpectation(
-            should_notify=True,
-            wait_time_seconds=120,
-            notification_validations=[
-                types.NotificationValidation(
-                    destination_type="webhook",
-                    validation_data={
-                        "path": "/msteams/webhook_url",
-                        "json_body": {
-                            "type": "message",
-                            "attachments": [
-                                {
-                                    "contentType": "application/vnd.microsoft.card.adaptive",
-                                    "content": {
-                                        "type": "AdaptiveCard",
-                                        "body": [
-                                            {
-                                                "type": "TextBlock",
-                                                "text": re.compile(
-                                                    r'\[FIRING:1\] content_templating_metrics for  \(alertname="content_templating_metrics", container="checkout", namespace="production", node="ip-10-0-1-23", pod="checkout-7d9c8b5f4-x2k9p", ruleSource="http://localhost:8080/alerts/overview\?ruleId=[0-9a-f-]+", severity="critical", threshold\.name="critical"\)'
-                                                ),
-                                            },
-                                        ],
-                                    },
-                                }
-                            ],
-                        },
-                    },
-                ),
-            ],
-        ),
-    ),
-    types.AlertManagerNotificationTestCase(
-        name="opsgenie_metrics_default_templating",
-        rule_path="alertmanager/content_templating/metrics_rule.json",
-        alert_data=[
-            types.AlertData(
-                type="metrics",
-                data_path="alertmanager/content_templating/metrics_data.jsonl",
-            ),
-        ],
-        channel_config=opsgenie_default_config,
-        notification_expectation=types.AMNotificationExpectation(
-            should_notify=True,
-            wait_time_seconds=120,
-            notification_validations=[
-                types.NotificationValidation(
-                    destination_type="webhook",
-                    validation_data={
-                        "path": "/v2/alerts",
-                        "json_body": {
-                            "message": "content_templating_metrics",
-                            "details": {
-                                "alertname": "content_templating_metrics",
-                                "container": "checkout",
-                                "namespace": "production",
-                                "node": "ip-10-0-1-23",
-                                "pod": "checkout-7d9c8b5f4-x2k9p",
-                                "severity": "critical",
-                                "threshold.name": "critical",
-                            },
-                            "priority": "P1",
-                        },
-                    },
-                ),
-            ],
-        ),
-    ),
-    types.AlertManagerNotificationTestCase(
-        name="pagerduty_metrics_default_templating",
-        rule_path="alertmanager/content_templating/metrics_rule.json",
-        alert_data=[
-            types.AlertData(
-                type="metrics",
-                data_path="alertmanager/content_templating/metrics_data.jsonl",
-            ),
-        ],
-        channel_config=pagerduty_default_config,
-        notification_expectation=types.AMNotificationExpectation(
-            should_notify=True,
-            wait_time_seconds=120,
-            notification_validations=[
-                types.NotificationValidation(
-                    destination_type="webhook",
-                    validation_data={
-                        "path": "/v2/enqueue",
-                        "json_body": {
-                            "routing_key": "PagerDutyRoutingKey",
-                            "payload": {
-                                "severity": "critical",
-                                "custom_details": {
-                                    "firing": {
-                                        "Labels": [
-                                            "alertname = content_templating_metrics",
-                                            "container = checkout",
-                                            "namespace = production",
-                                            "node = ip-10-0-1-23",
-                                            "pod = checkout-7d9c8b5f4-x2k9p",
-                                            "severity = critical",
-                                            "threshold.name = critical",
-                                        ],
-                                    }
-                                },
-                            },
-                            "client": "SigNoz Alert Manager",
-                            "client_url": "https://enter-signoz-host-n-port-here/alerts",
-                        },
-                    },
-                ),
-            ],
-        ),
-    ),
-    types.AlertManagerNotificationTestCase(
-        name="slack_logs_default_templating",
-        rule_path="alertmanager/content_templating/logs_rule.json",
-        alert_data=[
-            types.AlertData(
-                type="logs",
-                data_path="alertmanager/content_templating/logs_data.jsonl",
-            ),
-        ],
-        channel_config=slack_default_config,
-        notification_expectation=types.AMNotificationExpectation(
-            should_notify=True,
-            wait_time_seconds=120,
-            notification_validations=[
-                types.NotificationValidation(
-                    destination_type="webhook",
-                    validation_data={
-                        "path": "/services/TEAM_ID/BOT_ID/TOKEN_ID",
-                        "json_body": {
-                            "username": "Alertmanager",
-                            "attachments": [
-                                {
-                                    "color": "danger",
-                                    "mrkdwn_in": ["fallback", "pretext", "text"],
-                                }
-                            ],
-                        },
-                    },
-                ),
-            ],
-        ),
-    ),
-    types.AlertManagerNotificationTestCase(
-        name="slack_metrics_default_templating",
-        rule_path="alertmanager/content_templating/metrics_rule.json",
-        alert_data=[
-            types.AlertData(
-                type="metrics",
-                data_path="alertmanager/content_templating/metrics_data.jsonl",
-            ),
-        ],
-        channel_config=slack_default_config,
-        notification_expectation=types.AMNotificationExpectation(
-            should_notify=True,
-            wait_time_seconds=120,
-            notification_validations=[
-                types.NotificationValidation(
-                    destination_type="webhook",
-                    validation_data={
-                        "path": "/services/TEAM_ID/BOT_ID/TOKEN_ID",
-                        "json_body": {
-                            "username": "Alertmanager",
-                            "attachments": [
-                                {
-                                    "color": "danger",
-                                    "mrkdwn_in": ["fallback", "pretext", "text"],
-                                }
-                            ],
-                        },
-                    },
-                ),
-            ],
-        ),
-    ),
-    types.AlertManagerNotificationTestCase(
-        name="webhook_metrics_default_templating",
-        rule_path="alertmanager/content_templating/metrics_rule.json",
-        alert_data=[
-            types.AlertData(
-                type="metrics",
-                data_path="alertmanager/content_templating/metrics_data.jsonl",
-            ),
-        ],
-        channel_config=webhook_default_config,
-        notification_expectation=types.AMNotificationExpectation(
-            should_notify=True,
-            wait_time_seconds=120,
-            notification_validations=[
-                types.NotificationValidation(
-                    destination_type="webhook",
-                    validation_data={
-                        "path": "/webhook/webhook_url",
-                        "json_body": {
-                            "status": "firing",
-                            "alerts": [
-                                {
-                                    "status": "firing",
-                                    "labels": {
-                                        "alertname": "content_templating_metrics",
-                                        "container": "checkout",
-                                        "namespace": "production",
-                                        "node": "ip-10-0-1-23",
-                                        "pod": "checkout-7d9c8b5f4-x2k9p",
-                                        "severity": "critical",
-                                        "threshold.name": "critical",
-                                    },
-                                    "annotations": {
-                                        "description": "Container checkout in pod checkout-7d9c8b5f4-x2k9p (production) exceeded memory threshold",
-                                        "summary": "High container memory in production/checkout-7d9c8b5f4-x2k9p",
-                                    },
-                                }
-                            ],
-                            "commonLabels": {
-                                "alertname": "content_templating_metrics",
-                                "container": "checkout",
-                                "namespace": "production",
-                                "node": "ip-10-0-1-23",
-                                "pod": "checkout-7d9c8b5f4-x2k9p",
-                                "severity": "critical",
-                                "threshold.name": "critical",
-                            },
-                        },
-                    },
-                ),
-            ],
-        ),
-    ),
-]
-
-
-@pytest.mark.parametrize(
-    "content_templating_test_case",
-    CONTENT_TEMPLATING_TEST,
-    ids=lambda content_templating_test_case: content_templating_test_case.name,
-)
-def test_content_templating(  # pylint: disable=too-many-arguments,too-many-positional-arguments
-    notification_channel: types.TestContainerDocker,
-    make_http_mocks: Callable[[types.TestContainerDocker, list[Mapping]], None],
-    create_notification_channel: Callable[[dict], str],
-    create_alert_rule: Callable[[dict], str],
-    insert_alert_data: Callable[[list[types.AlertData], datetime], None],
-    maildev: types.TestContainerDocker,
-    content_templating_test_case: types.AlertManagerNotificationTestCase,
-):
-    channel_name = str(uuid.uuid4())
-
-    channel_config = update_raw_channel_config(content_templating_test_case.channel_config, channel_name, notification_channel)
-    logger.info("Channel config: %s", {"channel_config": channel_config})
-
-    webhook_validations = [v for v in content_templating_test_case.notification_expectation.notification_validations if v.destination_type == "webhook"]
-    if len(webhook_validations) > 0:
-        mock_mappings = [
-            Mapping(
-                request=MappingRequest(method=HttpMethods.POST, url=v.validation_data["path"]),
-                response=MappingResponse(status=200, json_body={}),
-                persistent=False,
-            )
-            for v in webhook_validations
-        ]
-
-        make_http_mocks(notification_channel, mock_mappings)
-        logger.info("Mock mappings created")
-
-    if any(v.destination_type == "email" for v in content_templating_test_case.notification_expectation.notification_validations):
-        delete_all_mails(maildev)
-        logger.info("Mails deleted")
-
-    create_notification_channel(channel_config)
-    logger.info("Channel created with name: %s", {"channel_name": channel_name})
-
-    time.sleep(12)
-
-    insert_alert_data(
-        content_templating_test_case.alert_data,
-        base_time=datetime.now(tz=UTC) - timedelta(minutes=10),
-    )
-
-    rule_path = get_testdata_file_path(content_templating_test_case.rule_path)
-    with open(rule_path, encoding="utf-8") as f:
-        rule_data = json.loads(f.read())
-    update_rule_channel_name(rule_data, channel_name)
-    rule_id = create_alert_rule(rule_data)
-    logger.info("rule created: %s", {"rule_id": rule_id, "rule_name": rule_data["alert"]})
-
-    verify_notification_expectation(
-        notification_channel,
-        maildev,
-        content_templating_test_case.notification_expectation,
-    )

tests/integration/tests/alertmanager/conftest.py

@@ -1,35 +0,0 @@
-import pytest
-from testcontainers.core.container import Network
-
-from fixtures import types
-from fixtures.maildev import signoz_smtp_env
-from fixtures.signoz import create_signoz
-
-
-@pytest.fixture(name="signoz", scope="package")
-def signoz(  # pylint: disable=too-many-arguments,too-many-positional-arguments
-    network: Network,
-    zeus: types.TestContainerDocker,
-    gateway: types.TestContainerDocker,
-    sqlstore: types.TestContainerSQL,
-    clickhouse: types.TestContainerClickhouse,
-    request: pytest.FixtureRequest,
-    pytestconfig: pytest.Config,
-    maildev: types.TestContainerDocker,
-    notification_channel: types.TestContainerDocker,
-) -> types.SigNoz:
-    return create_signoz(
-        network=network,
-        zeus=zeus,
-        gateway=gateway,
-        sqlstore=sqlstore,
-        clickhouse=clickhouse,
-        request=request,
-        pytestconfig=pytestconfig,
-        cache_key="signoz_alertmanager",
-        env_overrides={
-            **signoz_smtp_env(maildev),
-            "SIGNOZ_ALERTMANAGER_SIGNOZ_GLOBAL_PAGERDUTY__URL": notification_channel.container_configs["8080"].get("/v2/enqueue"),
-            "SIGNOZ_ALERTMANAGER_SIGNOZ_GLOBAL_OPSGENIE__API__URL": notification_channel.container_configs["8080"].get("/"),
-        },
-    )

tests/integration/tests/alertmanagerrotation/01_smtp_rotation.py

@@ -1,99 +0,0 @@
-import time
-import uuid
-from collections.abc import Callable
-from http import HTTPStatus
-
-import docker
-import pytest
-import requests
-from testcontainers.core.container import Network
-
-from fixtures import types
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD, token_getter
-from fixtures.logger import setup_logger
-from fixtures.maildev import (
-    NEW_PROVIDER_SMTP_PASS,
-    SMTP_TEST_FROM,
-    delete_all_mails,
-    get_all_mails,
-    signoz_smtp_env,
-    verify_email_received,
-)
-from fixtures.notification_channel import send_test_notification
-from fixtures.signoz import create_signoz
-
-logger = setup_logger(__name__)
-
-
-def wait_for_email(maildev: types.TestContainerDocker, filters: dict, wait_seconds: int = 30) -> None:
-    deadline = time.time() + wait_seconds
-    while time.time() < deadline:
-        if verify_email_received(maildev, filters):
-            return
-        time.sleep(1)
-    raise AssertionError(f"no email matching {filters} within {wait_seconds}s, inbox: {get_all_mails(maildev)}")
-
-
-def test_smtp_rotation_applies_to_existing_channels(  # pylint: disable=too-many-arguments,too-many-positional-arguments,too-many-locals
-    network: Network,
-    zeus: types.TestContainerDocker,
-    gateway: types.TestContainerDocker,
-    sqlstore: types.TestContainerSQL,
-    clickhouse: types.TestContainerClickhouse,
-    request: pytest.FixtureRequest,
-    pytestconfig: pytest.Config,
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    maildev_old: types.TestContainerDocker,
-    maildev_new: types.TestContainerDocker,
-) -> None:
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    channel_name = f"rotation-{uuid.uuid4()}"
-    recipient = f"rotation-{uuid.uuid4()}@integration.test"
-
-    response = requests.post(
-        signoz.self.host_configs["8080"].get("/api/v1/channels"),
-        json={"name": channel_name, "email_configs": [{"to": recipient}]},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=10,
-    )
-    assert response.status_code == HTTPStatus.CREATED, response.text
-
-    delete_all_mails(maildev_old)
-    recipient_old_probe = f"probe-old-{uuid.uuid4()}@integration.test"
-    send_test_notification(signoz, token, {"name": f"probe-{uuid.uuid4()}", "email_configs": [{"to": recipient_old_probe}]})
-    wait_for_email(maildev_old, {"to": recipient_old_probe, "from": SMTP_TEST_FROM})
-    logger.info("Delivery through the old provider verified")
-
-    docker.from_env().containers.get(signoz.self.id).stop()
-    logger.info("Stopped signoz running against the old provider")
-
-    signoz_new = create_signoz(
-        network=network,
-        zeus=zeus,
-        gateway=gateway,
-        sqlstore=sqlstore,
-        clickhouse=clickhouse,
-        request=request,
-        pytestconfig=pytestconfig,
-        cache_key="signoz_smtp_rotation_new",
-        env_overrides=signoz_smtp_env(maildev_new, password=NEW_PROVIDER_SMTP_PASS),
-    )
-    token_new = token_getter(signoz_new)(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    response = requests.get(
-        signoz_new.self.host_configs["8080"].get("/api/v1/channels"),
-        headers={"Authorization": f"Bearer {token_new}"},
-        timeout=10,
-    )
-    assert response.status_code == HTTPStatus.OK, response.text
-    listed = {channel["name"]: channel for channel in response.json()["data"]}
-    assert channel_name in listed
-
-    delete_all_mails(maildev_new)
-    mails_at_old_provider = len(get_all_mails(maildev_old))
-    recipient_new_probe = f"probe-new-{uuid.uuid4()}@integration.test"
-    send_test_notification(signoz_new, token_new, {"name": f"probe-{uuid.uuid4()}", "email_configs": [{"to": recipient_new_probe}]})
-    wait_for_email(maildev_new, {"to": recipient_new_probe, "from": SMTP_TEST_FROM})
-    assert len(get_all_mails(maildev_old)) == mails_at_old_provider, "old provider must receive nothing after rotation"

tests/integration/tests/alertmanagerrotation/conftest.py

@@ -1,40 +0,0 @@
-import pytest
-from testcontainers.core.container import Network
-
-from fixtures import types
-from fixtures.maildev import NEW_PROVIDER_SMTP_PASS, OLD_PROVIDER_SMTP_PASS, create_maildev, signoz_smtp_env
-from fixtures.signoz import create_signoz
-
-
-@pytest.fixture(name="maildev_old", scope="package")
-def maildev_old(network: Network, request: pytest.FixtureRequest, pytestconfig: pytest.Config) -> types.TestContainerDocker:
-    return create_maildev(network, request, pytestconfig, cache_key="maildev_smtp_old", incoming_pass=OLD_PROVIDER_SMTP_PASS)
-
-
-@pytest.fixture(name="maildev_new", scope="package")
-def maildev_new(network: Network, request: pytest.FixtureRequest, pytestconfig: pytest.Config) -> types.TestContainerDocker:
-    return create_maildev(network, request, pytestconfig, cache_key="maildev_smtp_new", incoming_pass=NEW_PROVIDER_SMTP_PASS)
-
-
-@pytest.fixture(name="signoz", scope="package")
-def signoz(  # pylint: disable=too-many-arguments,too-many-positional-arguments
-    network: Network,
-    zeus: types.TestContainerDocker,
-    gateway: types.TestContainerDocker,
-    sqlstore: types.TestContainerSQL,
-    clickhouse: types.TestContainerClickhouse,
-    request: pytest.FixtureRequest,
-    pytestconfig: pytest.Config,
-    maildev_old: types.TestContainerDocker,
-) -> types.SigNoz:
-    return create_signoz(
-        network=network,
-        zeus=zeus,
-        gateway=gateway,
-        sqlstore=sqlstore,
-        clickhouse=clickhouse,
-        request=request,
-        pytestconfig=pytestconfig,
-        cache_key="signoz_smtp_rotation",
-        env_overrides=signoz_smtp_env(maildev_old, password=OLD_PROVIDER_SMTP_PASS),
-    )

tests/integration/tests/dashboard/02_public_dashboard.py

@@ -34,7 +34,7 @@ def test_create_and_get_public_dashboard(
         json={
             "schemaVersion": "v6",
             "name": "sample-title",
-            "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "Sample Title"}, "links": []},
+            "spec": {"display": {"name": "Sample Title"}, "links": []},
             "tags": [],
         },
         headers={"Authorization": f"Bearer {admin_token}"},

tests/integration/tests/dashboard/03_v2_dashboard.py

@@ -91,7 +91,7 @@ def test_create_rejects_non_dns_name(
         json={
             "schemaVersion": "v6",
             "name": "Not A Label",
-            "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "Not A Label"}},
+            "spec": {"display": {"name": "Not A Label"}},
             "tags": [],
         },
         headers={"Authorization": f"Bearer {token}"},
@@ -114,7 +114,7 @@ def test_create_rejects_unknown_field(
         json={
             "schemaVersion": "v6",
             "name": "rejects-unknown",
-            "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "Rejects Unknown"}, "links": []},
+            "spec": {"display": {"name": "Rejects Unknown"}, "links": []},
             "tags": [],
             "unknownfield": "boom",
         },
@@ -139,7 +139,7 @@ def test_create_rejects_reserved_tag_key(
         json={
             "schemaVersion": "v6",
             "name": "rejects-reserved",
-            "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "Rejects Reserved"}},
+            "spec": {"display": {"name": "Rejects Reserved"}},
             "tags": [{"key": "source", "value": "x"}],
         },
         headers={"Authorization": f"Bearer {token}"},
@@ -163,7 +163,7 @@ def test_create_rejects_too_many_tags(
         json={
             "schemaVersion": "v6",
             "name": "too-many-tags",
-            "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "Too Many"}},
+            "spec": {"display": {"name": "Too Many"}},
             "tags": tags,
         },
         headers={"Authorization": f"Bearer {token}"},
@@ -187,7 +187,7 @@ def test_create_rejects_long_display_name(
         json={
             "schemaVersion": "v6",
             "name": "long-display-name",
-            "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "x" * 129}},
+            "spec": {"display": {"name": "x" * 129}},
         },
         headers={"Authorization": f"Bearer {token}"},
         timeout=5,
@@ -205,8 +205,6 @@ def test_create_rejects_long_display_name(
             "schemaVersion": "v6",
             "name": "long-layout-title",
             "spec": {
-                "variables": [],
-                "panels": {},
                 "display": {"name": "Long Layout Title"},
                 "links": [],
                 "layouts": [{"kind": "Grid", "spec": {"display": {"title": "x" * 257}, "items": []}}],
@@ -236,8 +234,6 @@ def test_create_rejects_all_value_without_multiselect(
             "schemaVersion": "v6",
             "name": "all-without-multi",
             "spec": {
-                "panels": {},
-                "layouts": [],
                 "display": {"name": "All Without Multi"},
                 "links": [],
                 "variables": [
@@ -306,7 +302,6 @@ def test_create_rejects_invalid_grid_layout(
             "schemaVersion": "v6",
             "name": "rejects-overlap",
             "spec": {
-                "variables": [],
                 "display": {"name": "Rejects Overlap"},
                 "panels": {"p1": panel("P1"), "p2": panel("P2")},
                 "layouts": [
@@ -339,7 +334,6 @@ def test_create_rejects_invalid_grid_layout(
             "schemaVersion": "v6",
             "name": "rejects-multiref",
             "spec": {
-                "variables": [],
                 "display": {"name": "Rejects Multiref"},
                 "panels": {"p1": panel("P1")},
                 "layouts": [
@@ -372,8 +366,6 @@ def test_create_rejects_invalid_grid_layout(
             "schemaVersion": "v6",
             "name": "rejects-too-many-items",
             "spec": {
-                "variables": [],
-                "panels": {},
                 "display": {"name": "Rejects Too Many"},
                 "layouts": [
                     {
@@ -465,7 +457,7 @@ def test_update_rejects_malformed_id(
         json={
             "schemaVersion": "v6",
             "name": "malformed-id",
-            "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "Malformed Id"}},
+            "spec": {"display": {"name": "Malformed Id"}},
             "tags": [],
         },
         headers={"Authorization": f"Bearer {token}"},
@@ -487,7 +479,7 @@ def test_update_missing_dashboard_returns_not_found(
         json={
             "schemaVersion": "v6",
             "name": "missing-dashboard",
-            "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "Missing Dashboard"}, "links": []},
+            "spec": {"display": {"name": "Missing Dashboard"}, "links": []},
             "tags": [],
         },
         headers={"Authorization": f"Bearer {token}"},
@@ -683,7 +675,7 @@ def test_dashboard_v2_lifecycle(  # pylint: disable=too-many-locals,too-many-sta
             json={
                 "schemaVersion": "v6",
                 "name": name,
-                "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": display}, "links": []},
+                "spec": {"display": {"name": display}, "links": []},
                 "tags": tags,
             },
             headers={"Authorization": f"Bearer {token}"},
@@ -1045,7 +1037,7 @@ def test_dashboard_v2_lifecycle(  # pylint: disable=too-many-locals,too-many-sta
     update_body = {
         "schemaVersion": "v6",
         "name": "lc-alpha",
-        "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "Alpha Overview"}, "links": []},
+        "spec": {"display": {"name": "Alpha Overview"}, "links": []},
         "tags": [
             {"key": "team", "value": "pulse"},
             {"key": "env", "value": "prod"},
@@ -1089,7 +1081,7 @@ def test_dashboard_v2_lifecycle(  # pylint: disable=too-many-locals,too-many-sta
     beta_body = {
         "schemaVersion": "v6",
         "name": "lc-beta",
-        "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "Beta Overview"}, "links": []},
+        "spec": {"display": {"name": "Beta Overview"}, "links": []},
         "tags": [{"key": "team", "value": "pulse"}, {"key": "env", "value": "dev"}],
     }
     response = requests.put(
@@ -1193,7 +1185,7 @@ def test_dashboard_v2_tag_order_round_trips(
     ]
     response = requests.post(
         signoz.self.host_configs["8080"].get(BASE_URL),
-        json={"schemaVersion": "v6", "name": "tag-order", "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "Tag Order"}, "links": []}, "tags": created_order},
+        json={"schemaVersion": "v6", "name": "tag-order", "spec": {"display": {"name": "Tag Order"}, "links": []}, "tags": created_order},
         headers={"Authorization": f"Bearer {token}"},
         timeout=5,
     )
@@ -1219,7 +1211,7 @@ def test_dashboard_v2_tag_order_round_trips(
     ]
     response = requests.put(
         signoz.self.host_configs["8080"].get(f"{BASE_URL}/{dashboard_id}"),
-        json={"schemaVersion": "v6", "name": "tag-order", "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "Tag Order"}, "links": []}, "tags": reordered},
+        json={"schemaVersion": "v6", "name": "tag-order", "spec": {"display": {"name": "Tag Order"}, "links": []}, "tags": reordered},
         headers={"Authorization": f"Bearer {token}"},
         timeout=5,
     )
@@ -1248,7 +1240,7 @@ def test_dashboard_v2_tag_order_round_trips(
     ]
     response = requests.put(
         signoz.self.host_configs["8080"].get(f"{BASE_URL}/{dashboard_id}"),
-        json={"schemaVersion": "v6", "name": "tag-order", "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": "Tag Order"}, "links": []}, "tags": new_order},
+        json={"schemaVersion": "v6", "name": "tag-order", "spec": {"display": {"name": "Tag Order"}, "links": []}, "tags": new_order},
         headers={"Authorization": f"Bearer {token}"},
         timeout=5,
     )
@@ -1285,7 +1277,7 @@ def test_dashboard_v2_pin_limit(
             json={
                 "schemaVersion": "v6",
                 "name": f"pl-{i}",
-                "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": f"Pin Limit {i}"}, "links": []},
+                "spec": {"display": {"name": f"Pin Limit {i}"}, "links": []},
                 "tags": [],
             },
             headers={"Authorization": f"Bearer {token}"},
@@ -1383,7 +1375,7 @@ def test_dashboard_v2_like_escaping(
             json={
                 "schemaVersion": "v6",
                 "name": name,
-                "spec": {"variables": [], "panels": {}, "layouts": [], "display": {"name": display}, "links": []},
+                "spec": {"display": {"name": display}, "links": []},
                 "tags": [],
             },
             headers={"Authorization": f"Bearer {token}"},
@@ -1473,8 +1465,6 @@ def test_dashboard_v2_get_by_metric_name(
             "schemaVersion": "v6",
             "name": "by-metric-builder",
             "spec": {
-                "variables": [],
-                "layouts": [],
                 "display": {"name": "by-metric-builder"},
                 "links": [],
                 "panels": {
@@ -1526,8 +1516,6 @@ def test_dashboard_v2_get_by_metric_name(
             "schemaVersion": "v6",
             "name": "by-metric-ch-promql",
             "spec": {
-                "variables": [],
-                "layouts": [],
                 "display": {"name": "by-metric-ch-promql"},
                 "links": [],
                 "panels": {
@@ -1593,8 +1581,6 @@ def test_dashboard_v2_get_by_metric_name(
             "schemaVersion": "v6",
             "name": "by-metric-promql",
             "spec": {
-                "variables": [],
-                "layouts": [],
                 "display": {"name": "by-metric-promql"},
                 "links": [],
                 "panels": {
@@ -1640,8 +1626,6 @@ def test_dashboard_v2_get_by_metric_name(
             "schemaVersion": "v6",
             "name": "by-metric-false-positive",
             "spec": {
-                "variables": [],
-                "layouts": [],
                 "display": {"name": "by-metric-false-positive"},
                 "links": [],
                 "panels": {
@@ -1773,8 +1757,6 @@ def test_dashboard_v2_rejects_comma_separated_aggregation(
             "name": f"agg-{uuid.uuid4().hex[:8]}",
             "tags": [],
             "spec": {
-                "variables": [],
-                "layouts": [],
                 "display": {"name": "Aggregation"},
                 "links": [],
                 "panels": {
@@ -1868,7 +1850,6 @@ def test_dashboard_v2_roundtrip_preserves_zero_values(
         "name": "roundtrip-zero-values",
         "tags": [],
         "spec": {
-            "layouts": [],
             "display": {"name": "Roundtrip Zero Values", "description": ""},
             "duration": "",
             "refreshInterval": "",
@@ -2108,8 +2089,6 @@ def test_dashboard_v2_omitted_enums_apply_defaults(
         "name": f"enum-{uuid.uuid4().hex[:8]}",
         "tags": [],
         "spec": {
-            "variables": [],
-            "layouts": [],
             "display": {"name": "Enum"},
             "panels": {
                 "ts": {
@@ -2217,8 +2196,6 @@ def test_dashboard_v2_rejects_explicit_empty_enum(
             "name": f"enum-{uuid.uuid4().hex[:8]}",
             "tags": [],
             "spec": {
-                "variables": [],
-                "layouts": [],
                 "display": {"name": "Enum"},
                 "panels": {
                     "p": {
@@ -2248,8 +2225,6 @@ def test_dashboard_v2_rejects_explicit_empty_enum(
             "name": f"enum-{uuid.uuid4().hex[:8]}",
             "tags": [],
             "spec": {
-                "panels": {},
-                "layouts": [],
                 "display": {"name": "Enum"},
                 "variables": [
                     {

tests/integration/tests/metricreduction/04_reduced_delta_nonmonotonic_sum.py

@@ -1,94 +0,0 @@
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-
-import pytest
-
-from fixtures import types
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.metrics import (
-    MetricsReducedSampleLast60s,
-    MetricsReducedSampleSum60s,
-    MetricsReducedTimeSeries,
-)
-from fixtures.querier import aligned_epoch, query_metric_values
-
-
-# Same setup and expected values as 02_reduced_counter, but the metric is a
-# delta, non-monotonic Sum. It must still be treated as a Sum (read from the
-# sum_60s table), so the values match. The last_60s rows are decoys: a gauge
-# misclassification would read them (999.0) instead of the sum_60s counter.
-@pytest.mark.parametrize(
-    "time_agg, expected",
-    [
-        # 2 groups x 5 minutes x 30.0 per 300s step
-        ("rate", 1.0),  # 300 / 300s
-        ("increase", 300.0),
-    ],
-)
-def test_delta_nonmonotonic_sum_rate_and_increase(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_reduced_metrics: Callable[..., None],
-    time_agg: str,
-    expected: float,
-) -> None:
-    metric_name = f"test_reduction_delta_nonmonotonic_sum_{time_agg}"
-    base_epoch = aligned_epoch(timedelta(hours=30), step_seconds=300)
-
-    # delta non-monotonic sum: MetricsReducedTimeSeries keeps the Delta temporality as-is
-    time_series = [
-        MetricsReducedTimeSeries(
-            metric_name=metric_name,
-            kept_labels={"service": service},
-            timestamp=datetime.fromtimestamp(base_epoch, tz=UTC),
-            temporality="Delta",
-            type_="Sum",
-            is_monotonic=False,
-        )
-        for service in ("a", "b")
-    ]
-    assert all(ts.temporality == "Delta" for ts in time_series)
-
-    insert_reduced_metrics(
-        time_series,
-        sum_samples=[
-            MetricsReducedSampleSum60s(
-                metric_name=metric_name,
-                reduced_fingerprint=ts.fingerprint,
-                timestamp=datetime.fromtimestamp(base_epoch + minute * 60, tz=UTC),
-                sum_value=30.0,
-                count_series=2,
-                count_samples=2,
-                temporality="Delta",
-            )
-            for ts in time_series
-            for minute in range(20)
-        ],
-        # Decoy last_60s rows: WhichReducedSamplesTableToUse reads this table only
-        # if the metric is (mis)classified as a Gauge. The 999.0 values are chosen
-        # to differ from the sum_60s result, so a regression that treats this delta
-        # sum as a Gauge makes the assertion below fail instead of silently passing.
-        last_samples=[
-            MetricsReducedSampleLast60s(
-                metric_name=metric_name,
-                reduced_fingerprint=ts.fingerprint,
-                timestamp=datetime.fromtimestamp(base_epoch + minute * 60, tz=UTC),
-                sum_last=999.0,
-                min_value=999.0,
-                max_value=999.0,
-                sum_values=999.0,
-                count_series=2,
-                count_samples=2,
-                temporality="Delta",
-            )
-            for ts in time_series
-            for minute in range(20)
-        ],
-    )
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    values = query_metric_values(signoz, token, metric_name, base_epoch, base_epoch + 20 * 60, time_agg, "sum", step_interval=300)
-
-    assert [v["timestamp"] for v in values] == [(base_epoch + step * 300) * 1000 for step in range(4)]
-    assert [v["value"] for v in values] == [expected] * 4

tests/integration/tests/querier_json_body/05_search.py

@@ -1,253 +0,0 @@
-import json
-from collections import namedtuple
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-from http import HTTPStatus
-
-import pytest
-
-from fixtures import types
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.logs import Logs
-from fixtures.querier import build_order_by, build_raw_query, get_rows, make_query_request
-
-# querierlogs/15_search.py with use_json_body on (see conftest.py): body matches run against
-# body_v2, the map/log fan-out is unchanged, and the response `body` comes back parsed — a
-# plain-string body is {"message": <body>}.
-
-Bodies = namedtuple("Bodies", ["a", "b", "c", "d"])
-
-
-@pytest.mark.parametrize(
-    "expression,expected",
-    [
-        # ── keyless: fans across every field ────────────────────────────────
-        pytest.param("search('login')", lambda b: {b.a}, id="keyless_body"),
-        pytest.param("search('checkout')", lambda b: {b.a, b.d}, id="keyless_body_and_resource"),
-        pytest.param("search('useast')", lambda b: {b.a, b.c}, id="keyless_resource_value"),
-        pytest.param("search('acme')", lambda b: {b.a, b.c}, id="keyless_attribute_value"),
-        pytest.param("search('tenant')", lambda b: {b.a, b.b, b.c, b.d}, id="keyless_attribute_key"),
-        pytest.param("search('error')", lambda b: {b.b, b.d}, id="keyless_severity_case_insensitive"),
-        pytest.param("search('CHECKOUT')", lambda b: {b.a, b.d}, id="keyless_term_case_insensitive"),
-        # ── scoped: narrows to one context ──────────────────────────────────
-        pytest.param("search('login', body)", lambda b: {b.a}, id="scope_body"),
-        pytest.param("search('login', 'body')", lambda b: {b.a}, id="scope_body_quoted"),
-        pytest.param("search('checkout', body)", lambda b: {b.a}, id="scope_body_excludes_resource"),
-        pytest.param("search('checkout', resource)", lambda b: {b.a, b.d}, id="scope_resource"),
-        pytest.param("search('acme', attribute)", lambda b: {b.a, b.c}, id="scope_attribute"),
-        pytest.param("search('error', log)", lambda b: {b.b, b.d}, id="scope_log_severity"),
-        pytest.param("search('acme', body)", lambda b: set(), id="scope_body_no_match"),
-        pytest.param("search('checkout', attribute)", lambda b: set(), id="scope_attribute_no_match"),
-        # ── multiple scopes: union of the named contexts ────────────────────
-        pytest.param("search('login', body, resource)", lambda b: {b.a}, id="scopes_body_resource_body_only"),
-        pytest.param("search('checkout', body, resource)", lambda b: {b.a, b.d}, id="scopes_body_resource_union"),
-        # ── composition with boolean / field filters ────────────────────────
-        pytest.param("NOT search('login')", lambda b: {b.b, b.c, b.d}, id="negated"),
-        pytest.param("search('useast') AND severity_text = 'INFO'", lambda b: {b.a}, id="and_field_filter"),
-    ],
-)
-def test_search(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-    expression: str,
-    expected: Callable[[Bodies], set[str]],
-) -> None:
-    """Four self-naming logs, each with a token planted in a distinct place (body,
-    resource, attribute, severity), assert search() reaches exactly the right ones."""
-    body = Bodies(
-        a="alpha checkout login ok",  # service checkout / region useast / tenant acme    / INFO
-        b="bravo declined",  # service payment  / region euwest / tenant globex  / ERROR
-        c="charlie miss",  # service cart     / region useast / tenant acme    / WARN
-        d="delta slow",  # service checkout / region apac   / tenant initech / ERROR
-    )
-    # (body, resources, attributes, severity_text)
-    specs = [
-        (body.a, {"service.name": "checkout", "region": "useast"}, {"tenant": "acme"}, "INFO"),
-        (body.b, {"service.name": "payment", "region": "euwest"}, {"tenant": "globex"}, "ERROR"),
-        (body.c, {"service.name": "cart", "region": "useast"}, {"tenant": "acme"}, "WARN"),
-        (body.d, {"service.name": "checkout", "region": "apac"}, {"tenant": "initech"}, "ERROR"),
-    ]
-
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    logs = [Logs(timestamp=now - timedelta(seconds=i + 1), resources=res, attributes=attrs, body=b, severity_text=sev) for i, (b, res, attrs, sev) in enumerate(specs)]
-    insert_logs(logs)
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    response = make_query_request(
-        signoz,
-        token,
-        start_ms=int((now - timedelta(minutes=5)).timestamp() * 1000),
-        end_ms=int(now.timestamp() * 1000),
-        request_type="raw",
-        queries=[
-            build_raw_query(
-                "A",
-                "logs",
-                filter_expression=expression,
-                order=[build_order_by("timestamp", "desc"), build_order_by("id", "desc")],
-                limit=100,
-            )
-        ],
-    )
-
-    assert response.status_code == HTTPStatus.OK, response.text
-    assert response.json()["status"] == "success"
-    # body_v2 comes back parsed; a plain-string body is {"message": <body>}.
-    assert {row["data"]["body"]["message"] for row in get_rows(response)} == expected(body)
-
-
-@pytest.mark.parametrize(
-    "term",
-    [
-        pytest.param("eve@acme.io", id="nested_string_value"),
-        pytest.param("503", id="nested_numeric_value"),
-        pytest.param("status", id="nested_key"),
-    ],
-)
-def test_search_body_reaches_nested_json(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-    term: str,
-) -> None:
-    """A body-scoped search matches values and keys nested inside the body_v2 JSON."""
-    # searchable content lives only in nested fields, not a top-level message
-    nested_body = json.dumps({"user": {"email": "eve@acme.io"}, "http": {"status": 503}}, separators=(",", ":"))
-
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    insert_logs([Logs(timestamp=now - timedelta(seconds=1), resources={"service.name": "api"}, body=nested_body, severity_text="INFO")])
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    response = make_query_request(
-        signoz,
-        token,
-        start_ms=int((now - timedelta(minutes=5)).timestamp() * 1000),
-        end_ms=int(now.timestamp() * 1000),
-        request_type="raw",
-        queries=[build_raw_query("A", "logs", filter_expression=f"search('{term}', body)", order=[build_order_by("timestamp", "desc")], limit=100)],
-    )
-
-    assert response.status_code == HTTPStatus.OK, response.text
-    rows = get_rows(response)
-    assert len(rows) == 1
-    assert rows[0]["data"]["body"]["user"]["email"] == "eve@acme.io"
-
-
-@pytest.mark.parametrize(
-    "expression",
-    [
-        pytest.param("search('login', bogus)", id="unknown_scope_word"),
-        pytest.param("search('login', body.message)", id="qualified_field_not_a_scope"),
-    ],
-)
-def test_search_invalid_scope_rejected(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    expression: str,
-) -> None:
-    """A scope that is not a field context (an unknown word, or a qualified
-    `context.field`) is rejected at build time with a 400 — even when, as with
-    `body.message`, it names a real body path."""
-    now = datetime.now(tz=UTC)
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    response = make_query_request(
-        signoz,
-        token,
-        start_ms=int((now - timedelta(minutes=5)).timestamp() * 1000),
-        end_ms=int(now.timestamp() * 1000),
-        request_type="raw",
-        queries=[build_raw_query("A", "logs", filter_expression=expression, limit=100)],
-    )
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert "invalid search scope" in response.text
-
-
-# The querier gates search() on EXPLAIN ESTIMATE against search_max_scan_rows_json_body on
-# this path (50000 here, see conftest.py). Both recoveries the advisory suggests — a
-# selective filter, a narrower range — are exercised below.
-
-
-def test_search_cost_guard_trips_then_passes_with_filter(
-    signoz_search_scan_budget: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-) -> None:
-    """A broad search() over ~61000 logs exceeds the 50000-row budget and is rejected;
-    the same search narrowed to the 1000-log 'checkout' service scans under budget and
-    succeeds — the advisory's "add a more selective filter" made real."""
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    # 60000 'catalog' logs now + 1000 'checkout' logs ~45m back, in an earlier ts_bucket, so
-    # the checkout fingerprint owns its own marks and a resource filter on it prunes the scan.
-    logs = [Logs(timestamp=now - timedelta(seconds=1 + i % 30), resources={"service.name": "catalog"}, body="log line") for i in range(60000)]
-    logs += [Logs(timestamp=now - timedelta(minutes=45, seconds=i % 30), resources={"service.name": "checkout"}, body="log line") for i in range(1000)]
-    insert_logs(logs)
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    start_ms = int((now - timedelta(minutes=60)).timestamp() * 1000)
-    end_ms = int((now + timedelta(minutes=1)).timestamp() * 1000)
-
-    def run(expression: str):
-        return make_query_request(
-            signoz_search_scan_budget,
-            token,
-            start_ms=start_ms,
-            end_ms=end_ms,
-            request_type="raw",
-            queries=[build_raw_query("A", "logs", filter_expression=expression, order=[build_order_by("timestamp", "desc")], limit=100)],
-        )
-
-    # Broad search over the whole range is over budget -> rejected before executing.
-    over_budget = run("search('log')")
-    assert over_budget.status_code == HTTPStatus.BAD_REQUEST, over_budget.text
-    assert "over the per-shard limit" in over_budget.text
-    # The advisory leads the suggestions, then how to get under budget.
-    assert "runs across all fields" in over_budget.text
-    assert "Narrow the time range or add a more selective filter." in over_budget.text
-
-    # Adding a selective resource filter prunes the scan under budget -> runs.
-    within_budget = run("search('log') AND resource.service.name = 'checkout'")
-    assert within_budget.status_code == HTTPStatus.OK, within_budget.text
-    assert len(get_rows(within_budget)) > 0
-
-
-def test_search_cost_guard_passes_with_narrower_time_range(
-    signoz_search_scan_budget: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-) -> None:
-    """A steady stream of ~80000 logs (~4/sec over the last ~5.5h). A search() over the
-    whole window is over the 50000-row budget and rejected; the same search over the last
-    15 minutes scans only a few thousand rows and runs — the advisory's "narrow the time
-    range" made real."""
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    # ~4 logs/sec, oldest ~5.5h back, newest ~now.
-    logs = [Logs(timestamp=now - timedelta(seconds=i // 4), resources={"service.name": "app"}, body="log line") for i in range(80000)]
-    insert_logs(logs)
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    def run(lookback_minutes: int):
-        return make_query_request(
-            signoz_search_scan_budget,
-            token,
-            start_ms=int((now - timedelta(minutes=lookback_minutes)).timestamp() * 1000),
-            end_ms=int((now + timedelta(minutes=1)).timestamp() * 1000),
-            request_type="raw",
-            queries=[build_raw_query("A", "logs", filter_expression="search('log')", order=[build_order_by("timestamp", "desc")], limit=100)],
-        )
-
-    # The last 6 hours cover the whole stream (~80000) -> over budget -> rejected.
-    wide = run(360)
-    assert wide.status_code == HTTPStatus.BAD_REQUEST, wide.text
-    assert "over the per-shard limit" in wide.text
-
-    # The last 15 minutes hold only ~3600 logs -> under budget -> runs, returning rows.
-    narrow = run(15)
-    assert narrow.status_code == HTTPStatus.OK, narrow.text
-    assert len(get_rows(narrow)) > 0

tests/integration/tests/querier_json_body/conftest.py

@@ -55,34 +55,3 @@ def signoz_json_body(
             "SIGNOZ_FLAGGER_CONFIG_BOOLEAN_USE__JSON__BODY": True,
         },
     )
-
-
-@pytest.fixture(name="signoz_search_scan_budget", scope="package")
-def signoz_search_scan_budget(
-    network: Network,
-    migrator: types.Operation,  # pylint: disable=unused-argument
-    zeus: types.TestContainerDocker,
-    gateway: types.TestContainerDocker,
-    sqlstore: types.TestContainerSQL,
-    clickhouse: types.TestContainerClickhouse,
-    request: pytest.FixtureRequest,
-    pytestconfig: pytest.Config,
-) -> types.SigNoz:
-    """The querierlogs budget instance over body_v2: same 50000 rows, but on
-    search_max_scan_rows_json_body. search_max_scan_rows keeps its 60M default, so only the
-    body_v2 budget can trip here. Shares the default instance's sqlstore + clickhouse, so
-    the same admin token and seeded logs work against it."""
-    return create_signoz(
-        network=network,
-        zeus=zeus,
-        gateway=gateway,
-        sqlstore=sqlstore,
-        clickhouse=clickhouse,
-        request=request,
-        pytestconfig=pytestconfig,
-        cache_key="signoz-json-body-search-scan-budget-50k",
-        env_overrides={
-            "SIGNOZ_FLAGGER_CONFIG_BOOLEAN_USE__JSON__BODY": True,
-            "SIGNOZ_QUERIER_SEARCH__MAX__SCAN__ROWS__JSON__BODY": 50000,
-        },
-    )

tests/integration/tests/querierlogs/15_search.py

@@ -1,212 +0,0 @@
-from collections import namedtuple
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-from http import HTTPStatus
-
-import pytest
-
-from fixtures import types
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.logs import Logs
-from fixtures.querier import build_order_by, build_raw_query, get_column_data_from_response, get_rows, make_query_request
-
-# search(): keyless fans across every field; scoped search('term', <ctx>...) narrows to
-# the named contexts (body/attribute/resource/log). Flag off here, so body matches the
-# `body` String column (querier_json_body mirrors this over body_v2).
-
-Bodies = namedtuple("Bodies", ["a", "b", "c", "d"])
-
-
-@pytest.mark.parametrize(
-    "expression,expected",
-    [
-        # ── keyless: fans across every field ────────────────────────────────
-        pytest.param("search('login')", lambda b: {b.a}, id="keyless_body"),
-        pytest.param("search('checkout')", lambda b: {b.a, b.d}, id="keyless_body_and_resource"),
-        pytest.param("search('useast')", lambda b: {b.a, b.c}, id="keyless_resource_value"),
-        pytest.param("search('acme')", lambda b: {b.a, b.c}, id="keyless_attribute_value"),
-        pytest.param("search('tenant')", lambda b: {b.a, b.b, b.c, b.d}, id="keyless_attribute_key"),
-        pytest.param("search('error')", lambda b: {b.b, b.d}, id="keyless_severity_case_insensitive"),
-        pytest.param("search('CHECKOUT')", lambda b: {b.a, b.d}, id="keyless_term_case_insensitive"),
-        # ── scoped: narrows to one context ──────────────────────────────────
-        pytest.param("search('login', body)", lambda b: {b.a}, id="scope_body"),
-        pytest.param("search('login', 'body')", lambda b: {b.a}, id="scope_body_quoted"),
-        pytest.param("search('checkout', body)", lambda b: {b.a}, id="scope_body_excludes_resource"),
-        pytest.param("search('checkout', resource)", lambda b: {b.a, b.d}, id="scope_resource"),
-        pytest.param("search('acme', attribute)", lambda b: {b.a, b.c}, id="scope_attribute"),
-        pytest.param("search('error', log)", lambda b: {b.b, b.d}, id="scope_log_severity"),
-        pytest.param("search('acme', body)", lambda b: set(), id="scope_body_no_match"),
-        pytest.param("search('checkout', attribute)", lambda b: set(), id="scope_attribute_no_match"),
-        # ── multiple scopes: union of the named contexts ────────────────────
-        pytest.param("search('login', body, resource)", lambda b: {b.a}, id="scopes_body_resource_body_only"),
-        pytest.param("search('checkout', body, resource)", lambda b: {b.a, b.d}, id="scopes_body_resource_union"),
-        # ── composition with boolean / field filters ────────────────────────
-        pytest.param("NOT search('login')", lambda b: {b.b, b.c, b.d}, id="negated"),
-        pytest.param("search('useast') AND severity_text = 'INFO'", lambda b: {b.a}, id="and_field_filter"),
-    ],
-)
-def test_search(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-    expression: str,
-    expected: Callable[[Bodies], set[str]],
-) -> None:
-    """Four self-naming logs, each with a token planted in a distinct place (body,
-    resource, attribute, severity), assert search() reaches exactly the right ones."""
-    body = Bodies(
-        a="alpha checkout login ok",  # service checkout / region useast / tenant acme    / INFO
-        b="bravo declined",  # service payment  / region euwest / tenant globex  / ERROR
-        c="charlie miss",  # service cart     / region useast / tenant acme    / WARN
-        d="delta slow",  # service checkout / region apac   / tenant initech / ERROR
-    )
-    # (body, resources, attributes, severity_text)
-    specs = [
-        (body.a, {"service.name": "checkout", "region": "useast"}, {"tenant": "acme"}, "INFO"),
-        (body.b, {"service.name": "payment", "region": "euwest"}, {"tenant": "globex"}, "ERROR"),
-        (body.c, {"service.name": "cart", "region": "useast"}, {"tenant": "acme"}, "WARN"),
-        (body.d, {"service.name": "checkout", "region": "apac"}, {"tenant": "initech"}, "ERROR"),
-    ]
-
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    logs = [Logs(timestamp=now - timedelta(seconds=i + 1), resources=res, attributes=attrs, body=b, severity_text=sev) for i, (b, res, attrs, sev) in enumerate(specs)]
-    insert_logs(logs)
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    response = make_query_request(
-        signoz,
-        token,
-        start_ms=int((now - timedelta(minutes=5)).timestamp() * 1000),
-        end_ms=int(now.timestamp() * 1000),
-        request_type="raw",
-        queries=[
-            build_raw_query(
-                "A",
-                "logs",
-                filter_expression=expression,
-                order=[build_order_by("timestamp", "desc"), build_order_by("id", "desc")],
-                limit=100,
-            )
-        ],
-    )
-
-    assert response.status_code == HTTPStatus.OK, response.text
-    assert response.json()["status"] == "success"
-    assert set(get_column_data_from_response(response.json(), "body")) == expected(body)
-
-
-@pytest.mark.parametrize(
-    "expression",
-    [
-        pytest.param("search('login', bogus)", id="unknown_scope_word"),
-        pytest.param("search('login', body.message)", id="qualified_field_not_a_scope"),
-    ],
-)
-def test_search_invalid_scope_rejected(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    expression: str,
-) -> None:
-    """A scope that is not a field context (an unknown word, or a qualified
-    `context.field`) is rejected at build time with a 400."""
-    now = datetime.now(tz=UTC)
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    response = make_query_request(
-        signoz,
-        token,
-        start_ms=int((now - timedelta(minutes=5)).timestamp() * 1000),
-        end_ms=int(now.timestamp() * 1000),
-        request_type="raw",
-        queries=[build_raw_query("A", "logs", filter_expression=expression, limit=100)],
-    )
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert "invalid search scope" in response.text
-
-
-# The querier gates search() on EXPLAIN ESTIMATE against search_max_scan_rows (50000 here,
-# see conftest.py). Both recoveries the advisory suggests — a selective filter, a narrower
-# range — are exercised below.
-
-
-def test_search_cost_guard_trips_then_passes_with_filter(
-    signoz_search_scan_budget: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-) -> None:
-    """A broad search() over ~61000 logs exceeds the 50000-row budget and is rejected;
-    the same search narrowed to the 1000-log 'checkout' service scans under budget and
-    succeeds — the advisory's "add a more selective filter" made real."""
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    # 60000 'catalog' logs now + 1000 'checkout' logs ~45m back, in an earlier ts_bucket, so
-    # the checkout fingerprint owns its own marks and a resource filter on it prunes the scan.
-    logs = [Logs(timestamp=now - timedelta(seconds=1 + i % 30), resources={"service.name": "catalog"}, body="log line") for i in range(60000)]
-    logs += [Logs(timestamp=now - timedelta(minutes=45, seconds=i % 30), resources={"service.name": "checkout"}, body="log line") for i in range(1000)]
-    insert_logs(logs)
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    start_ms = int((now - timedelta(minutes=60)).timestamp() * 1000)
-    end_ms = int((now + timedelta(minutes=1)).timestamp() * 1000)
-
-    def run(expression: str):
-        return make_query_request(
-            signoz_search_scan_budget,
-            token,
-            start_ms=start_ms,
-            end_ms=end_ms,
-            request_type="raw",
-            queries=[build_raw_query("A", "logs", filter_expression=expression, order=[build_order_by("timestamp", "desc")], limit=100)],
-        )
-
-    # Broad search over the whole range is over budget -> rejected before executing.
-    over_budget = run("search('log')")
-    assert over_budget.status_code == HTTPStatus.BAD_REQUEST, over_budget.text
-    assert "over the per-shard limit" in over_budget.text
-    # The advisory leads the suggestions, then how to get under budget.
-    assert "runs across all fields" in over_budget.text
-    assert "Narrow the time range or add a more selective filter." in over_budget.text
-
-    # Adding a selective resource filter prunes the scan under budget -> runs.
-    within_budget = run("search('log') AND resource.service.name = 'checkout'")
-    assert within_budget.status_code == HTTPStatus.OK, within_budget.text
-    assert len(get_rows(within_budget)) > 0
-
-
-def test_search_cost_guard_passes_with_narrower_time_range(
-    signoz_search_scan_budget: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_logs: Callable[[list[Logs]], None],
-) -> None:
-    """A steady stream of ~80000 logs (~4/sec over the last ~5.5h). A search() over the
-    whole window is over the 50000-row budget and rejected; the same search over the last
-    15 minutes scans only a few thousand rows and runs — the advisory's "narrow the time
-    range" made real."""
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    # ~4 logs/sec, oldest ~5.5h back, newest ~now.
-    logs = [Logs(timestamp=now - timedelta(seconds=i // 4), resources={"service.name": "app"}, body="log line") for i in range(80000)]
-    insert_logs(logs)
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    def run(lookback_minutes: int):
-        return make_query_request(
-            signoz_search_scan_budget,
-            token,
-            start_ms=int((now - timedelta(minutes=lookback_minutes)).timestamp() * 1000),
-            end_ms=int((now + timedelta(minutes=1)).timestamp() * 1000),
-            request_type="raw",
-            queries=[build_raw_query("A", "logs", filter_expression="search('log')", order=[build_order_by("timestamp", "desc")], limit=100)],
-        )
-
-    # The last 6 hours cover the whole stream (~80000) -> over budget -> rejected.
-    wide = run(360)
-    assert wide.status_code == HTTPStatus.BAD_REQUEST, wide.text
-    assert "over the per-shard limit" in wide.text
-
-    # The last 15 minutes hold only ~3600 logs -> under budget -> runs, returning rows.
-    narrow = run(15)
-    assert narrow.status_code == HTTPStatus.OK, narrow.text
-    assert len(get_rows(narrow)) > 0

tests/integration/tests/querierlogs/conftest.py

@@ -1,34 +0,0 @@
-import pytest
-from testcontainers.core.container import Network
-
-from fixtures import types
-from fixtures.signoz import create_signoz
-
-
-@pytest.fixture(name="signoz_search_scan_budget", scope="package")
-def signoz_search_scan_budget(
-    network: Network,
-    migrator: types.Operation,  # pylint: disable=unused-argument
-    zeus: types.TestContainerDocker,
-    gateway: types.TestContainerDocker,
-    sqlstore: types.TestContainerSQL,
-    clickhouse: types.TestContainerClickhouse,
-    request: pytest.FixtureRequest,
-    pytestconfig: pytest.Config,
-) -> types.SigNoz:
-    """SigNoz with a low search_max_scan_rows (50000) so a broad search() trips the cost
-    guard while a selective one stays under it. Shares the default instance's sqlstore +
-    clickhouse, so the same admin token and seeded logs work against it."""
-    return create_signoz(
-        network=network,
-        zeus=zeus,
-        gateway=gateway,
-        sqlstore=sqlstore,
-        clickhouse=clickhouse,
-        request=request,
-        pytestconfig=pytestconfig,
-        cache_key="signoz-search-scan-budget-50k",
-        env_overrides={
-            "SIGNOZ_QUERIER_SEARCH__MAX__SCAN__ROWS": 50000,
-        },
-    )

tests/integration/tests/queriermetrics/12_delta_nonmonotonic_sum.py

@@ -1,62 +0,0 @@
-from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
-from http import HTTPStatus
-
-import pytest
-
-from fixtures import types
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.metrics import Metrics
-from fixtures.querier import build_builder_query, get_series_values, make_query_request
-
-
-# A delta, non-monotonic Sum queried without an explicit type must be treated as
-# a Sum: the server resolves the type and the delta rate/increase values must be
-# correct. Non-reduced delta values are temporality-driven, so this is a
-# forward-looking guard against a future change routing the delta path by type
-# (e.g. gauge -> avg/last).
-@pytest.mark.parametrize(
-    "time_aggregation, expected",
-    [
-        ("rate", 1.0),  # 60 per 60s bucket / 60s
-        ("increase", 60.0),
-    ],
-)
-def test_delta_nonmonotonic_sum_is_treated_as_sum(
-    signoz: types.SigNoz,
-    create_user_admin: None,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    insert_metrics: Callable[[list[Metrics]], None],
-    time_aggregation: str,
-    expected: float,
-) -> None:
-    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
-    start_ms = int((now - timedelta(minutes=6)).timestamp() * 1000)
-    end_ms = int(now.timestamp() * 1000)
-    metric_name = f"test_delta_nonmonotonic_sum_{time_aggregation}"
-
-    metrics = [
-        Metrics(
-            metric_name=metric_name,
-            labels={"service": "a"},
-            timestamp=now - timedelta(minutes=minute),
-            value=60.0,
-            temporality="Delta",
-            type_="Sum",
-            is_monotonic=False,
-        )
-        for minute in range(1, 6)
-    ]
-    insert_metrics(metrics)
-
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    # No type and no temporality: the server resolves both from the seeded series.
-    query = build_builder_query("A", metric_name, time_aggregation, "sum")
-
-    response = make_query_request(signoz, token, start_ms, end_ms, [query])
-    assert response.status_code == HTTPStatus.OK, response.text
-
-    values = get_series_values(response.json(), "A")
-    assert len(values) == 5, f"Expected 5 buckets, got {values}"
-    for value in values:
-        assert value["value"] == expected, f"Expected {expected}, got {value['value']}"