Skip to content

Commit

Permalink
Fixes a bug that would add __error__ labels incorrectly. (#2796)
Browse files Browse the repository at this point in the history
Wrong usage of slices would add error label to the original set of labels.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
  • Loading branch information
cyriltovena authored Oct 23, 2020
1 parent edc6215 commit 3f93b5b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/logql/log/labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func (b *LabelsBuilder) Labels() labels.Labels {
if b.err == "" {
return b.base
}
res := append(b.base, labels.Label{Name: ErrorLabel, Value: b.err})
res := append(b.base.Copy(), labels.Label{Name: ErrorLabel, Value: b.err})
sort.Sort(res)
return res
}
Expand Down
18 changes: 18 additions & 0 deletions pkg/logql/log/labels_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,21 @@ func TestLabelsBuilder_Get(t *testing.T) {
_, ok = b.Get("already")
require.False(t, ok)
}

func TestLabelsBuilder_LabelsError(t *testing.T) {
lbs := labels.Labels{labels.Label{Name: "already", Value: "in"}}
b := NewLabelsBuilder()
b.Reset(lbs)
b.SetErr("err")
lbsWithErr := b.Labels()
require.Equal(
t,
labels.Labels{
labels.Label{Name: ErrorLabel, Value: "err"},
labels.Label{Name: "already", Value: "in"},
},
lbsWithErr,
)
// make sure the original labels is unchanged.
require.Equal(t, labels.Labels{labels.Label{Name: "already", Value: "in"}}, lbs)
}

0 comments on commit 3f93b5b

Please sign in to comment.