Use one struct for Logfmt and JSON Expressions

grafana · Feb 22, 2023 · 685021d · 685021d
1 parent e9420ac
commit 685021d
Show file tree

Hide file tree

Showing 10 changed files with 145 additions and 158 deletions.
diff --git a/pkg/logql/log/json_expr.go b/pkg/logql/log/json_expr.go
diff --git a/pkg/logql/log/logfmt_expr.go b/pkg/logql/log/logfmt_expr.go
diff --git a/pkg/logql/log/parser.go b/pkg/logql/log/parser.go
@@ -347,7 +347,7 @@ type LogfmtExpressionParser struct {
 	keys        internedStringSet
 }
 
-func NewLogfmtExpressionParser(expressions []LogfmtExpression) (*LogfmtExpressionParser, error) {
+func NewLogfmtExpressionParser(expressions []XExpression) (*LogfmtExpressionParser, error) {
 	if len(expressions) == 0 {
 		return nil, fmt.Errorf("no logfmt expression provided")
 	}
@@ -447,7 +447,7 @@ type JSONExpressionParser struct {
 	keys internedStringSet
 }
 
-func NewJSONExpressionParser(expressions []JSONExpression) (*JSONExpressionParser, error) {
+func NewJSONExpressionParser(expressions []XExpression) (*JSONExpressionParser, error) {
 	paths := make(map[string][]interface{})
 
 	for _, exp := range expressions {