fix(logql): properly parse rename in label_format

go-faster · Apr 17, 2024 · fbb5ade · fbb5ade
1 parent fcd4e90
commit fbb5ade
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/internal/logql/logqlengine/label_format.go b/internal/logql/logqlengine/label_format.go
@@ -48,9 +48,9 @@ type RenameLabel struct {
 // Process implements Processor.
 func (rl *RenameLabel) Process(_ otelstorage.Timestamp, line string, set LabelSet) (_ string, keep bool) {
 	for _, p := range rl.pairs {
-		if v, ok := set.Get(p.Label); ok {
+		if v, ok := set.Get(p.From); ok {
 			set.Set(p.To, v)
-			set.Delete(p.Label)
+			set.Delete(p.From)
 		}
 	}
 	return line, true

diff --git a/internal/logql/logqlengine/label_format_test.go b/internal/logql/logqlengine/label_format_test.go
@@ -21,7 +21,7 @@ func TestLabelFormat(t *testing.T) {
 		// No label.
 		{
 			map[logql.Label]pcommon.Value{},
-			[]logql.RenameLabel{{Label: "foo", To: "bar"}},
+			[]logql.RenameLabel{{From: "foo", To: "bar"}},
 			nil,
 			map[logql.Label]pcommon.Value{},
 			false,
@@ -32,7 +32,7 @@ func TestLabelFormat(t *testing.T) {
 			map[logql.Label]pcommon.Value{
 				"foo": pcommon.NewValueStr("foo"),
 			},
-			[]logql.RenameLabel{{Label: "foo", To: "bar"}},
+			[]logql.RenameLabel{{From: "foo", To: "bar"}},
 			nil,
 			map[logql.Label]pcommon.Value{
 				"bar": pcommon.NewValueStr("foo"),
@@ -46,7 +46,7 @@ func TestLabelFormat(t *testing.T) {
 				"foo": pcommon.NewValueStr("foo"),
 			},
 			[]logql.RenameLabel{
-				{Label: "foo", To: "bar"},
+				{From: "foo", To: "bar"},
 			},
 			[]logql.LabelTemplate{
 				{Label: "tmpl", Template: `{{ __timestamp__.Unix }}`},

diff --git a/internal/logql/parser_pipeline.go b/internal/logql/parser_pipeline.go
@@ -423,7 +423,7 @@ func (p *parser) parseLabelFormatExpr() (lf *LabelFormatExpr, err error) {
 			if err != nil {
 				return nil, err
 			}
-			lf.Labels = append(lf.Labels, RenameLabel{Label: label, To: value})
+			lf.Labels = append(lf.Labels, RenameLabel{To: label, From: value})
 		case lexer.String:
 			value, err := p.parseString()
 			if err != nil {

diff --git a/internal/logql/parser_test.go b/internal/logql/parser_test.go
@@ -298,7 +298,7 @@ var tests = []TestCase{
 	},
 	{
 		`{name="kafka"}
-				| label_format foo=foo
+				| label_format foo=bar
 				| label_format bar="bar"
 				| label_format foo=foo,bar="bar"
 			`,
@@ -311,7 +311,7 @@ var tests = []TestCase{
 			Pipeline: []PipelineStage{
 				&LabelFormatExpr{
 					Labels: []RenameLabel{
-						{"foo", "foo"},
+						{To: "foo", From: "bar"},
 					},
 				},
 				&LabelFormatExpr{

diff --git a/internal/logql/pipeline.go b/internal/logql/pipeline.go
@@ -156,8 +156,8 @@ type LabelTemplate struct {
 
 // RenameLabel renames label.
 type RenameLabel struct {
-	Label Label
-	To    Label
+	To   Label
+	From Label
 }
 
 // DropLabelsExpr drops given labels in a pipeline (i.e. deny list).