fixup! Add jsonpath support

Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
grafana · Dec 18, 2024 · 01d71ce · 01d71ce
1 parent aae4ffe
commit 01d71ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pkg/distributor/field_detection.go b/pkg/distributor/field_detection.go
@@ -210,7 +210,7 @@ func getValueUsingJSONParser(line []byte, hints []string) []byte {
 		if err != nil {
 			continue
 		}
-		l, _, _, err := jsonparser.Get(line, log.JSONPathsToStrings(parsed)...)
+		l, _, _, err := jsonparser.Get(line, log.JSONPathToStrings(parsed)...)
 		if err != nil {
 			continue
 		}

diff --git a/pkg/logql/log/parser.go b/pkg/logql/log/parser.go
@@ -571,7 +571,7 @@ func NewJSONExpressionParser(expressions []LabelExtractionExpr) (*JSONExpression
 		}
 
 		ids = append(ids, exp.Identifier)
-		paths = append(paths, JSONPathsToStrings(path))
+		paths = append(paths, JSONPathToStrings(path))
 	}
 
 	return &JSONExpressionParser{
@@ -581,17 +581,17 @@ func NewJSONExpressionParser(expressions []LabelExtractionExpr) (*JSONExpression
 	}, nil
 }
 
-func JSONPathsToStrings(paths []interface{}) []string {
-	stingPaths := make([]string, 0, len(paths))
+func JSONPathToStrings(paths []interface{}) []string {
+	stringPaths := make([]string, 0, len(paths))
 	for _, p := range paths {
 		switch v := p.(type) {
 		case int:
-			stingPaths = append(stingPaths, fmt.Sprintf("[%d]", v))
+			stringPaths = append(stringPaths, fmt.Sprintf("[%d]", v))
 		case string:
-			stingPaths = append(stingPaths, v)
+			stringPaths = append(stringPaths, v)
 		}
 	}
-	return stingPaths
+	return stringPaths
 }
 
 func (j *JSONExpressionParser) Process(_ int64, line []byte, lbs *LabelsBuilder) ([]byte, bool) {