TraceQL: fix queries like {.foo && true} and {.foo || false} (#4855)

* Add test cases for {.foo && true} and {.foo || false}

* Fix behavior for queries like {.foo && true} and {.foo || false}

* CHANGELOG.md

Author: stoewer

CHANGELOG.md

@@ -52,6 +52,7 @@ configurable via the throughput_bytes_slo field, and it will populate op="traces
 * [ENHANCEMENT] distributor: add IPv6 support [#4840](https://github.com/grafana/tempo/pull/4840) (@gjacquet)
 * [BUGFIX] Choose a default step for a gRPC streaming query range request if none is provided. [#4546](https://github.com/grafana/tempo/pull/4576) (@joe-elliott)
   Correctly copy exemplars for metrics like `| rate()` when gRPC streaming.
+* [BUGFIX] Fix behavior for queries like {.foo && true} and {.foo || false} [#4855](https://github.com/grafana/tempo/pull/4855) (@stoewer)
 * [BUGFIX] Fix performance bottleneck and file cleanup in block builder [#4550](https://github.com/grafana/tempo/pull/4550) (@mdisibio)
 * [BUGFIX] TraceQL incorrect results for additional spanset filters after a select operation [#4600](https://github.com/grafana/tempo/pull/4600) (@mdisibio)
 * [BUGFIX] TraceQL results caching bug for floats ending in .0 [#4539](https://github.com/grafana/tempo/pull/4539) (@carles-grafana)

pkg/traceql/ast_conditions.go

@@ -54,6 +54,12 @@ func (o *BinaryOperation) extractConditions(request *FetchSpansRequest) {
 					Op:        OpNone,
 					Operands:  nil,
 				})
+			} else if o.RHS.(Static).Type == TypeBoolean && (o.Op == OpOr || o.Op == OpAnd) {
+				request.appendCondition(Condition{
+					Attribute: o.LHS.(Attribute),
+					Op:        OpNone,
+					Operands:  nil,
+				})
 			} else {
 				request.appendCondition(Condition{
 					Attribute: o.LHS.(Attribute),
@@ -94,6 +100,12 @@ func (o *BinaryOperation) extractConditions(request *FetchSpansRequest) {
 					Op:        OpNone,
 					Operands:  nil,
 				})
+			} else if o.LHS.(Static).Type == TypeBoolean && (o.Op == OpOr || o.Op == OpAnd) {
+				request.appendCondition(Condition{
+					Attribute: o.RHS.(Attribute),
+					Op:        OpNone,
+					Operands:  nil,
+				})
 			} else {
 				request.appendCondition(Condition{
 					Attribute: o.RHS.(Attribute),

pkg/traceql/ast_conditions_test.go

@@ -105,6 +105,20 @@ func TestSpansetFilter_extractConditions(t *testing.T) {
 			},
 			allConditions: true,
 		},
+		{
+			query: `{ .foo && true }`,
+			conditions: []Condition{
+				newCondition(NewAttribute("foo"), OpNone),
+			},
+			allConditions: true,
+		},
+		{
+			query: `{ true || .foo }`,
+			conditions: []Condition{
+				newCondition(NewAttribute("foo"), OpNone),
+			},
+			allConditions: true,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.query, func(t *testing.T) {

tempodb/encoding/vparquet4/block_traceql_test.go

@@ -214,6 +214,8 @@ func TestBackendBlockSearchTraceQL(t *testing.T) {
 		{"service.name present on span", traceql.MustExtractFetchSpansRequestWithMetadata(`{.` + LabelServiceName + ` = "spanservicename"}`)},
 		{"http.status_code doesn't match type of dedicated column", traceql.MustExtractFetchSpansRequestWithMetadata(`{.` + LabelHTTPStatusCode + ` = "500ouch"}`)},
 		{`.foo = "def"`, traceql.MustExtractFetchSpansRequestWithMetadata(`{.foo = "def"}`)},
+		{".bool && true", traceql.MustExtractFetchSpansRequestWithMetadata(`{.bool && true}`)},
+		{"false || .bool", traceql.MustExtractFetchSpansRequestWithMetadata(`{false || .bool}`)},
 		{
 			name: "Range at unscoped",
 			req: traceql.FetchSpansRequest{