Fixes a panic with whitespace key. (#3372)

* Fixes a panic with whitespace key. Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com> * Removes empty key. Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
grafana · Feb 23, 2021 · f10535f · f10535f
1 parent cb59069
commit f10535f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/pkg/logql/log/parser.go b/pkg/logql/log/parser.go
@@ -164,6 +164,9 @@ func readValue(iter *jsoniter.Iterator) string {
 
 func addLabel(lbs *LabelsBuilder, key, value string) {
 	key = sanitizeLabelKey(key, true)
+	if len(key) == 0 {
+		return
+	}
 	if lbs.BaseHas(key) {
 		key = fmt.Sprintf("%s%s", key, duplicateSuffix)
 	}
@@ -266,7 +269,7 @@ type JSONExpressionParser struct {
 }
 
 func NewJSONExpressionParser(expressions []JSONExpression) (*JSONExpressionParser, error) {
-	var paths = make(map[string][]interface{})
+	paths := make(map[string][]interface{})
 
 	for _, exp := range expressions {
 		path, err := jsonexpr.Parse(exp.Expression, false)

diff --git a/pkg/logql/log/util.go b/pkg/logql/log/util.go
@@ -23,6 +23,9 @@ func sanitizeLabelKey(key string, isPrefix bool) string {
 		return key
 	}
 	key = strings.TrimSpace(key)
+	if len(key) == 0 {
+		return key
+	}
 	if isPrefix && key[0] >= '0' && key[0] <= '9' {
 		key = "_" + key
 	}

diff --git a/pkg/logql/log/util_test.go b/pkg/logql/log/util_test.go
@@ -7,6 +7,7 @@ func Test_sanitizeLabelKey(t *testing.T) {
 		key  string
 		want string
 	}{
+		{"  ", ""},
 		{"1", "_1"},
 		{"1 1 1", "_1_1_1"},
 		{"abc", "abc"},