TraceQL: Support negative values on aggregates (#2289)

* support negative values on aggregates Signed-off-by: Joe Elliott <[email protected]> * changelog Signed-off-by: Joe Elliott <[email protected]> * lint Signed-off-by: Joe Elliott <[email protected]> --------- Signed-off-by: Joe Elliott <[email protected]>
grafana · Mar 31, 2023 · bfaac00 · bfaac00
1 parent 0c9a822
commit bfaac00
Show file tree

Hide file tree

Showing 5 changed files with 281 additions and 257 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@
 * [BUGFIX] Stop searching for virtual tags if there are any hits.
   This prevents invalid values from showing up for intrinsics like `status` [#2219](https://github.com/grafana/tempo/pull/2152) (@joe-elliott)
 * [BUGFIX] Correctly return unique spans when &&ing and ||ing spansets. [#2254](https://github.com/grafana/tempo/pull/2254) (@joe-elliott)
+* [BUGFIX] Support negative values on aggregate filters like `count() > -1`. [#2289](https://github.com/grafana/tempo/pull/2289) (@joe-elliott)
 
 ## v2.0.1 / 2023-03-03
 

diff --git a/pkg/traceql/expr.y b/pkg/traceql/expr.y
@@ -194,7 +194,12 @@ scalarExpression: // shares the same operators as scalarPipelineExpression. spli
   | scalarExpression MOD scalarExpression      { $$ = newScalarOperation(OpMod, $1, $3) }
   | scalarExpression POW scalarExpression      { $$ = newScalarOperation(OpPower, $1, $3) }
   | aggregate                                  { $$ = $1 }
-  | static                                     { $$ = $1 }
+  | INTEGER                                    { $$ = NewStaticInt($1)              }
+  | FLOAT                                      { $$ = NewStaticFloat($1)            }
+  | DURATION                                   { $$ = NewStaticDuration($1)         }
+  | SUB INTEGER                                { $$ = NewStaticInt(-$2)             }
+  | SUB FLOAT                                  { $$ = NewStaticFloat(-$2)           }
+  | SUB DURATION                               { $$ = NewStaticDuration(-$2)        }
   ;
 
 aggregate: