SigNoz is an open-source, OpenTelemetry-native observability platform for your team and their AI agents. Get logs, metrics, and traces in one tool with features like APM, distributed tracing, log management, infra monitoring, etc. Combined with SigNoz MCP and a native AI teammate (in SigNoz Cloud) it helps you build more resilient apps.
TypeScript apmapplication-monitoringdistributed-tracinggogood-first-issuejaegerloglogsmetricsmonitoringnextjsobservabilityopen-sourceopentelemetryprometheusreactreactjsself-hostedtracingtypescript
fix(querier): apply the limit to scalar trace operator queries (#13091)
Abhi kumar140498cb11c0
diff --git a/pkg/statementbuilder/tracesstatementbuilder/trace_operator_cte_builder.go b/pkg/statementbuilder/tracesstatementbuilder/trace_operator_cte_builder.goindex 035268e9a4..681428a88e 100644--- a/pkg/statementbuilder/tracesstatementbuilder/trace_operator_cte_builder.go+++ b/pkg/statementbuilder/tracesstatementbuilder/trace_operator_cte_builder.go@@ -918,6 +918,10 @@ func (b *traceOperatorCTEBuilder) buildScalarQuery(ctx context.Context, selectFrsb.OrderBy("__result_0 DESC")}+ if b.operator.Limit > 0 {+ sb.Limit(b.operator.Limit)+ }+combinedArgs := allAggChArgs// Add HAVING clause if specifieddiff --git a/pkg/statementbuilder/tracesstatementbuilder/trace_operator_cte_builder_test.go b/pkg/statementbuilder/tracesstatementbuilder/trace_operator_cte_builder_test.goindex 6b2fc497d9..d75eae9090 100644--- a/pkg/statementbuilder/tracesstatementbuilder/trace_operator_cte_builder_test.go+++ b/pkg/statementbuilder/tracesstatementbuilder/trace_operator_cte_builder_test.go@@ -343,8 +343,8 @@ func TestTraceOperatorStatementBuilder(t *testing.T) {},},expected: qbtypes.Statement{- Query: "WITH toDateTime64(1747947419000000000, 9) AS t_from, toDateTime64(1747983448000000000, 9) AS t_to, 1747945619 AS bucket_from, 1747983448 AS bucket_to, all_spans AS (SELECT *, resource_string_service$$name AS `service.name` FROM signoz_traces.distributed_signoz_index_v3 WHERE timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), __resource_filter_A AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), A AS (SELECT * FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter_A) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), B AS (SELECT * FROM signoz_traces.distributed_signoz_index_v3 WHERE timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND toFloat64(response_status_code) < ?), A_AND_B AS (SELECT l.* FROM A AS l INNER JOIN B AS r ON l.trace_id = r.trace_id) SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `service.name`, avg(toFloat64(duration_nano)) AS __result_0 FROM A_AND_B GROUP BY `service.name` ORDER BY __result_0 desc SETTINGS distributed_product_mode='allow', max_memory_usage=10000000000",- Args: []any{"1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "frontend", "%service.name%", "%service.name\":\"frontend%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), float64(400)},+ Query: "WITH toDateTime64(1747947419000000000, 9) AS t_from, toDateTime64(1747983448000000000, 9) AS t_to, 1747945619 AS bucket_from, 1747983448 AS bucket_to, all_spans AS (SELECT *, resource_string_service$$name AS `service.name` FROM signoz_traces.distributed_signoz_index_v3 WHERE timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), __resource_filter_A AS (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (simpleJSONExtractString(labels, 'service.name') = ? AND labels LIKE ? AND labels LIKE ?) AND seen_at_ts_bucket_start >= ? AND seen_at_ts_bucket_start <= ? GROUP BY fingerprint), A AS (SELECT * FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_fingerprint GLOBAL IN (SELECT fingerprint FROM __resource_filter_A) AND timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ?), B AS (SELECT * FROM signoz_traces.distributed_signoz_index_v3 WHERE timestamp >= ? AND timestamp < ? AND ts_bucket_start >= ? AND ts_bucket_start <= ? AND toFloat64(response_status_code) < ?), A_AND_B AS (SELECT l.* FROM A AS l INNER JOIN B AS r ON l.trace_id = r.trace_id) SELECT toString(multiIf(resource.`service.name` IS NOT NULL, resource.`service.name`::String, mapContains(resources_string, 'service.name'), resources_string['service.name'], NULL)) AS `service.name`, avg(toFloat64(duration_nano)) AS __result_0 FROM A_AND_B GROUP BY `service.name` ORDER BY __result_0 desc LIMIT ? SETTINGS distributed_product_mode='allow', max_memory_usage=10000000000",+ Args: []any{"1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "frontend", "%service.name%", "%service.name\":\"frontend%", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), "1747947419000000000", "1747983448000000000", uint64(1747945619), uint64(1747983448), float64(400), 10},},expectedErr: nil,},diff --git a/tests/integration/tests/queriertraces/06_trace_operator.py b/tests/integration/tests/queriertraces/06_trace_operator.pyindex 04cc0a6770..3eb2f975da 100644--- a/tests/integration/tests/queriertraces/06_trace_operator.py+++ b/tests/integration/tests/queriertraces/06_trace_operator.py@@ -784,3 +784,84 @@ def test_trace_operator_select_fields(# (events/links/attributes/resource) and the rest of the intrinsics never# appear because the consume-layer merge isn't triggered.assert set(parent_row.keys()) == set(TRACE_OPERATOR_CORE_FIELDS + ["service.name"])++[email protected]("attribute_backend", ["map", "json"])+def test_trace_operator_scalar_limit(+ signoz: types.SigNoz,+ create_user_admin: None, # pylint: disable=unused-argument+ get_token: Callable[[str, str], str],+ insert_traces: Callable[[list[Traces]], None],+ use_attribute_backend: Callable[[str], None],+ attribute_backend: str,+) -> None:+ """+ Setup:+ Insert 4, 3, 2 and 1 spans for services limit-a..limit-d.++ Tests:+ 1. A scalar trace operator grouped by service.name with limit=2 returns+ only the top two groups by count.+ """+ use_attribute_backend(attribute_backend)++ now = datetime.now(tz=UTC).replace(second=0, microsecond=0)+ span_counts = {"limit-a": 4, "limit-b": 3, "limit-c": 2, "limit-d": 1}++ insert_traces(+ [+ Traces(+ timestamp=now - timedelta(seconds=10),+ duration=timedelta(seconds=1),+ trace_id=TraceIdGenerator.trace_id(),+ span_id=TraceIdGenerator.span_id(),+ parent_span_id="",+ name="scalar-limit",+ kind=TracesKind.SPAN_KIND_SERVER,+ status_code=TracesStatusCode.STATUS_CODE_OK,+ status_message="",+ resources={"service.name": service},+ attributes={"operation.type": "scalar-limit"},+ )+ for service, count in span_counts.items()+ for _ in range(count)+ ]+ )++ 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=RequestType.SCALAR,+ queries=[+ {+ "type": "builder_query",+ "spec": {+ "name": "A",+ "signal": "traces",+ "disabled": True,+ "filter": {"expression": "operation.type = 'scalar-limit'"},+ "aggregations": [{"expression": "count()"}],+ },+ },+ {+ "type": "builder_trace_operator",+ "spec": {+ "name": "C",+ "expression": "A",+ "aggregations": [{"expression": "count()"}],+ "groupBy": [{"name": "service.name", "fieldContext": "resource"}],+ "limit": 2,+ },+ },+ ],+ )++ assert response.status_code == HTTPStatus.OK, response.text++ result = find_named_result(response.json()["data"]["data"]["results"], "C")+ assert result is not None, "trace_operator result C not found"+ assert result["data"] == [["limit-a", 4], ["limit-b", 3]]