Adds backtick for the quoted string token lexer. #2095
Conversation
* Fix unit conversion in stats log. 🤦 Signed-off-by: Cyril Tovena <[email protected]> * Fix the tests because you know ! you know ? Signed-off-by: Cyril Tovena <[email protected]> wip Signed-off-by: Cyril Tovena <[email protected]>
This allows to pass unescaped string to Loki.
For example we now support this :
`` {name="cassandra"} |~ `error=\w+` ``
`` {name!~`mysql-\d+`} ``
As you can see no escape is required when using ` quoted strings.
Signed-off-by: Cyril Tovena <[email protected]>
Signed-off-by: Cyril Tovena <[email protected]>
Signed-off-by: Cyril Tovena <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #2095 +/- ##
==========================================
+ Coverage 61.24% 61.26% +0.02%
==========================================
Files 146 146
Lines 11187 11187
==========================================
+ Hits 6851 6854 +3
+ Misses 3788 3787 -1
+ Partials 548 546 -2
|
| @@ -20,6 +20,25 @@ func TestParse(t *testing.T) { | |||
| exp Expr | |||
| err error | |||
| }{ | |||
| { | |||
| // raw string | |||
| in: "count_over_time({foo=~`bar\\w+`}[12h] |~ `error\\`)", | |||
There was a problem hiding this comment.
should this be:
"count_over_time({foo=~`bar\w+`}[12h] |~ `error\`)",
With only a single backlash because it's inside the new backticks?
There was a problem hiding this comment.
Yes, unless you have an alternative we can't escape backtick here, basically foo |~ error`` is interpreted as "foo |~" + identifier(error) + empty raw string . So I need to use " quoted query. and that requires escape. I call this go quote inception. Not sure I explained this correctly.
There was a problem hiding this comment.
yeah, ok, i was more just asking if this was a mistake or if it was a requirement of how to get the value in the test... no worries LGTM
This allows to pass unescaped string to Loki.
For example we now support this :
{name="cassandra"} |~ `error=\w+`{name!~`mysql-\d+`}As you can see no escape is required when using ` quoted strings.
Fixes #2016 #2061
Signed-off-by: Cyril Tovena [email protected]