Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX-2605: Make span.resource.xyz attributes work #3284

Merged
merged 2 commits into from
Jan 17, 2024
Merged

FIX-2605: Make span.resource.xyz attributes work #3284

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad945d6
FIX-2605: Make span.resource.xyz attributes work
mghildiy Jan 11, 2024
ab7f999
Update CHANGELOG.md
mghildiy Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## main / unreleased

* [FEATURE] Add support for multi-tenant queries. [#3087](https://github.com/grafana/tempo/pull/3087) (@electron0zero)
* [BUGFIX] Make span.resource.xyz attributes work. [#3284](https://github.com/grafana/tempo/pull/3284) (@mghildiy)
mghildiy marked this conversation as resolved.
Show resolved Hide resolved
* [BUGFIX] Change exit code if config is successfully verified [#3174](https://github.com/grafana/tempo/pull/3174) (@am3o @agrib-01)
* [BUGFIX] The tempo-cli analyse blocks command no longer fails on compacted blocks [#3183](https://github.com/grafana/tempo/pull/3183) (@stoewer)
* [BUGFIX] Move waitgroup handling for poller error condition [#3224](https://github.com/grafana/tempo/pull/3224) (@zalegrala)
Expand Down
13 changes: 10 additions & 3 deletions pkg/traceql/lexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ type lexer struct {
errs []*ParseError

parsingAttribute bool
currentScope int
}

func (l *lexer) Lex(lval *yySymType) int {
Expand All @@ -100,8 +101,9 @@ func (l *lexer) Lex(lval *yySymType) int {

if l.parsingAttribute {
// parse out any scopes here
scopeToken, ok := tryScopeAttribute(&l.Scanner)
scopeToken, ok := tryScopeAttribute(&l.Scanner, l.currentScope)
if ok {
l.currentScope = scopeToken
return scopeToken
}

Expand Down Expand Up @@ -184,6 +186,10 @@ func (l *lexer) Lex(lval *yySymType) int {
break
}

if multiTok == PARENT_DOT || multiTok == SPAN_DOT || multiTok == RESOURCE_DOT {
l.currentScope = multiTok
}

// did we find a combination token?
if multiTok != -1 {
l.parsingAttribute = startsAttribute(multiTok)
Expand Down Expand Up @@ -258,7 +264,7 @@ func parseQuotedAtrribute(s *scanner.Scanner) (string, error) {
return sb.String(), nil
}

func tryScopeAttribute(l *scanner.Scanner) (int, bool) {
func tryScopeAttribute(l *scanner.Scanner, currentScope int) (int, bool) {
// copy the scanner to avoid advancing if it's not a scope.
s := *l
str := ""
Expand All @@ -270,7 +276,8 @@ func tryScopeAttribute(l *scanner.Scanner) (int, bool) {
str += string(s.Next())
}
tok := tokens[str]
if tok == RESOURCE_DOT || tok == SPAN_DOT {

if (tok == SPAN_DOT || tok == RESOURCE_DOT) && currentScope == PARENT_DOT {
// we have found scope attribute so consume the original scanner
for i := 0; i < len(str); i++ {
l.Next()
Expand Down
22 changes: 22 additions & 0 deletions pkg/traceql/lexer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,28 @@ func TestLexerParseDuration(t *testing.T) {
}
}

func TestLexerScoping(t *testing.T) {
testLexer(t, ([]lexerTestCase{
{`span.foo3`, []int{SPAN_DOT, IDENTIFIER, END_ATTRIBUTE}},
{`span.foo+bar`, []int{SPAN_DOT, IDENTIFIER, END_ATTRIBUTE}},
{`span.foo-bar`, []int{SPAN_DOT, IDENTIFIER, END_ATTRIBUTE}},
{`span.resource.foo`, []int{SPAN_DOT, IDENTIFIER, END_ATTRIBUTE}},
{`parent.span.foo`, []int{PARENT_DOT, SPAN_DOT, IDENTIFIER, END_ATTRIBUTE}},
{`span.foo.bar`, []int{SPAN_DOT, IDENTIFIER, END_ATTRIBUTE}},
// resource attributes
{`resource.foo`, []int{RESOURCE_DOT, IDENTIFIER, END_ATTRIBUTE}},
{`resource.count`, []int{RESOURCE_DOT, IDENTIFIER, END_ATTRIBUTE}},
{`resource.foo3`, []int{RESOURCE_DOT, IDENTIFIER, END_ATTRIBUTE}},
{`resource.foo+bar`, []int{RESOURCE_DOT, IDENTIFIER, END_ATTRIBUTE}},
{`resource.foo-bar`, []int{RESOURCE_DOT, IDENTIFIER, END_ATTRIBUTE}},
{`resource.span.foo`, []int{RESOURCE_DOT, IDENTIFIER, END_ATTRIBUTE}},
// parent span attributes
{`parent.span.foo`, []int{PARENT_DOT, SPAN_DOT, IDENTIFIER, END_ATTRIBUTE}},
{`parent.span.count`, []int{PARENT_DOT, SPAN_DOT, IDENTIFIER, END_ATTRIBUTE}},
{`parent.span.resource.id`, []int{PARENT_DOT, SPAN_DOT, IDENTIFIER, END_ATTRIBUTE}},
}))
}

func testLexer(t *testing.T, tcs []lexerTestCase) {
for _, tc := range tcs {
t.Run(tc.input, func(t *testing.T) {
Expand Down