fix: unescape attribute values (#3939)

* fix: unescape attribute values * simplify test
kubeshop · Jul 17, 2024 · da31ff9 · da31ff9
1 parent e634079
commit da31ff9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/server/expression/executor.go b/server/expression/executor.go
@@ -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) {

diff --git a/server/expression/executor_test.go b/server/expression/executor_test.go
@@ -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)