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: unescape attribute values #3939

Merged
merged 2 commits into from
Jul 17, 2024
Merged

fix: unescape attribute values #3939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a92f20
fix: unescape attribute values
mathnogueira Jul 17, 2024
1e7c465
simplify test
mathnogueira Jul 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
3 changes: 2 additions & 1 deletion server/expression/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,8 @@ func (e Executor) resolveAttribute(attribute *Attribute) (value.Value, error) {
return value.Nil, resolutionError(err)
}

return value.NewFromString(attributeValue), nil
str := value.NewFromString(attributeValue)
return value.NewFromString(str.UnescappedString()), nil
}

func (e Executor) resolveEnvironment(environment *Environment) (value.Value, error) {
Expand Down
13 changes: 13 additions & 0 deletions server/expression/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,19 @@ func TestBasicExpressionExecution(t *testing.T) {
Query: `'This should be workin\'' = "This should be workin'"`,
ShouldPass: true,
},
{
Name: "escaped_strings_must_be_equal_to_unescaped_strings_when_escaping_is_not_required",
Query: `attr:response = '"text \"quoted\" and another \"quote\"",'`,
ShouldPass: true,
AttributeDataStore: expression.AttributeDataStore{
Span: traces.Span{
ID: id.NewRandGenerator().SpanID(),
Attributes: traces.NewAttributes(map[string]string{
"response": `"text \"quoted\" and another \"quote\"",`,
}),
},
},
},
}

executeTestCases(t, testCases)
Expand Down
Loading