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.

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

fix: skipping label if it contains special symbol #14068

Merged
merged 3 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 15 additions & 7 deletions pkg/logql/log/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"errors"
"fmt"
"strings"
"unicode/utf8"

"github.com/grafana/jsonparser"
Expand Down Expand Up @@ -39,6 +40,14 @@ var (
errMissingCapture = errors.New("at least one named capture must be supplied")
errFoundAllLabels = errors.New("found all required labels")
errLabelDoesNotMatch = errors.New("found a label with a matcher that didn't match")

// the rune error replacement is rejected by Prometheus hence replacing them with space.
removeInvalidUtf = func(r rune) rune {
if r == utf8.RuneError {
return 32 // rune value for space
}
return r
}
)

type JSONParser struct {
Expand Down Expand Up @@ -200,12 +209,11 @@ func unescapeJSONString(b []byte) string {
return ""
}
res := string(bU)
// rune error is rejected by Prometheus
for _, r := range res {
if r == utf8.RuneError {
return ""
}

if strings.ContainsRune(res, utf8.RuneError) {
res = strings.Map(removeInvalidUtf, res)
}

return res
}

Expand Down Expand Up @@ -339,9 +347,9 @@ func (l *LogfmtParser) Process(_ int64, line []byte, lbs *LabelsBuilder) ([]byte
}

val := l.dec.Value()
// the rune error replacement is rejected by Prometheus, so we skip it.

if bytes.ContainsRune(val, utf8.RuneError) {
val = nil
val = bytes.Map(removeInvalidUtf, val)
}

if !l.keepEmpty && len(val) == 0 {
Expand Down
8 changes: 4 additions & 4 deletions pkg/logql/log/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func Test_jsonParser_Parse(t *testing.T) {
labels.EmptyLabels(),
labels.FromStrings("counter", "1",
"price__net_", "5.56909",
"foo", "",
"foo", " ",
),
NoParserHints(),
},
Expand Down Expand Up @@ -802,7 +802,7 @@ func TestLogfmtParser_parse(t *testing.T) {
"utf8 error rune",
[]byte(`buzz=foo bar=�f`),
labels.EmptyLabels(),
labels.FromStrings("buzz", "foo"),
labels.FromStrings("bar", " f", "buzz", "foo"),
nil,
NoParserHints(),
},
Expand Down Expand Up @@ -1037,15 +1037,15 @@ func TestLogfmtParser_keepEmpty(t *testing.T) {
false,
labels.FromStrings("foo", "bar"),
labels.FromStrings("foo", "bar",
"bar", "buzz"),
"bar", "buzz", "foo_extracted", "b r"),
},
{
"utf8 error rune with keep empty",
[]byte("foo=b�r bar=buzz"),
true,
labels.FromStrings("foo", "bar"),
labels.FromStrings("foo", "bar",
"foo_extracted", "",
"foo_extracted", "b r",
"bar", "buzz"),
},
}
Expand Down
Loading