mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 13:44:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Update package tsdb/agent for new labels.Labels type

Browse source 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
This commit is contained in:
Bryan Boreham 2022-02-20 20:42:11 +00:00
parent a5bdff414b
commit 14ad2e780b
2 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tsdb/agent/db.go
View file

@ -713,7 +713,7 @@ func (a *appender) Append(ref storage.SeriesRef, l labels.Labels, t int64, v flo
// Ensure no empty or duplicate labels have gotten through. This mirrors the // Ensure no empty or duplicate labels have gotten through. This mirrors the
// equivalent validation code in the TSDB's headAppender. // equivalent validation code in the TSDB's headAppender.
l = l.WithoutEmpty() l = l.WithoutEmpty()
if len(l) == 0 { if l.IsEmpty() {
return 0, errors.Wrap(tsdb.ErrInvalidSample, "empty labelset") return 0, errors.Wrap(tsdb.ErrInvalidSample, "empty labelset")
} }
@ -786,13 +786,17 @@ func (a *appender) AppendExemplar(ref storage.SeriesRef, l labels.Labels, e exem
// Exemplar label length does not include chars involved in text rendering such as quotes // Exemplar label length does not include chars involved in text rendering such as quotes
// equals sign, or commas. See definition of const ExemplarMaxLabelLength. // equals sign, or commas. See definition of const ExemplarMaxLabelLength.
labelSetLen := 0 labelSetLen := 0
for _, l := range e.Labels { err := e.Labels.Validate(func(l labels.Label) error {
labelSetLen += utf8.RuneCountInString(l.Name) labelSetLen += utf8.RuneCountInString(l.Name)
labelSetLen += utf8.RuneCountInString(l.Value) labelSetLen += utf8.RuneCountInString(l.Value)
if labelSetLen > exemplar.ExemplarMaxLabelSetLength { if labelSetLen > exemplar.ExemplarMaxLabelSetLength {
return 0, storage.ErrExemplarLabelLength return storage.ErrExemplarLabelLength
} }
return nil
})
if err != nil {
return 0, err
} }
// Check for duplicate vs last stored exemplar for this series, and discard those. // Check for duplicate vs last stored exemplar for this series, and discard those.

52
tsdb/agent/db_test.go
View file

@ -49,28 +49,28 @@ func TestDB_InvalidSeries(t *testing.T) {
_, err := app.Append(0, labels.Labels{}, 0, 0) _, err := app.Append(0, labels.Labels{}, 0, 0)
require.ErrorIs(t, err, tsdb.ErrInvalidSample, "should reject empty labels") require.ErrorIs(t, err, tsdb.ErrInvalidSample, "should reject empty labels")
_, err = app.Append(0, labels.Labels{{Name: "a", Value: "1"}, {Name: "a", Value: "2"}}, 0, 0) _, err = app.Append(0, labels.FromStrings("a", "1", "a", "2"), 0, 0)
require.ErrorIs(t, err, tsdb.ErrInvalidSample, "should reject duplicate labels") require.ErrorIs(t, err, tsdb.ErrInvalidSample, "should reject duplicate labels")
}) })
t.Run("Exemplars", func(t *testing.T) { t.Run("Exemplars", func(t *testing.T) {
sRef, err := app.Append(0, labels.Labels{{Name: "a", Value: "1"}}, 0, 0) sRef, err := app.Append(0, labels.FromStrings("a", "1"), 0, 0)
require.NoError(t, err, "should not reject valid series") require.NoError(t, err, "should not reject valid series")
_, err = app.AppendExemplar(0, nil, exemplar.Exemplar{}) _, err = app.AppendExemplar(0, labels.EmptyLabels(), exemplar.Exemplar{})
require.EqualError(t, err, "unknown series ref when trying to add exemplar: 0") require.EqualError(t, err, "unknown series ref when trying to add exemplar: 0")
e := exemplar.Exemplar{Labels: labels.Labels{{Name: "a", Value: "1"}, {Name: "a", Value: "2"}}} e := exemplar.Exemplar{Labels: labels.FromStrings("a", "1", "a", "2")}
_, err = app.AppendExemplar(sRef, nil, e) _, err = app.AppendExemplar(sRef, labels.EmptyLabels(), e)
require.ErrorIs(t, err, tsdb.ErrInvalidExemplar, "should reject duplicate labels") require.ErrorIs(t, err, tsdb.ErrInvalidExemplar, "should reject duplicate labels")
e = exemplar.Exemplar{Labels: labels.Labels{{Name: "a_somewhat_long_trace_id", Value: "nYJSNtFrFTY37VR7mHzEE/LIDt7cdAQcuOzFajgmLDAdBSRHYPDzrxhMA4zz7el8naI/AoXFv9/e/G0vcETcIoNUi3OieeLfaIRQci2oa"}}} e = exemplar.Exemplar{Labels: labels.FromStrings("a_somewhat_long_trace_id", "nYJSNtFrFTY37VR7mHzEE/LIDt7cdAQcuOzFajgmLDAdBSRHYPDzrxhMA4zz7el8naI/AoXFv9/e/G0vcETcIoNUi3OieeLfaIRQci2oa")}
_, err = app.AppendExemplar(sRef, nil, e) _, err = app.AppendExemplar(sRef, labels.EmptyLabels(), e)
require.ErrorIs(t, err, storage.ErrExemplarLabelLength, "should reject too long label length") require.ErrorIs(t, err, storage.ErrExemplarLabelLength, "should reject too long label length")
// Inverse check // Inverse check
e = exemplar.Exemplar{Labels: labels.Labels{{Name: "a", Value: "1"}}, Value: 20, Ts: 10, HasTs: true} e = exemplar.Exemplar{Labels: labels.FromStrings("a", "1"), Value: 20, Ts: 10, HasTs: true}
_, err = app.AppendExemplar(sRef, nil, e) _, err = app.AppendExemplar(sRef, labels.EmptyLabels(), e)
require.NoError(t, err, "should not reject valid exemplars") require.NoError(t, err, "should not reject valid exemplars")
}) })
} }
@ -426,9 +426,7 @@ func Test_ExistingWAL_NextRef(t *testing.T) {
// Append <seriesCount> series // Append <seriesCount> series
app := db.Appender(context.Background()) app := db.Appender(context.Background())
for i := 0; i < seriesCount; i++ { for i := 0; i < seriesCount; i++ {
lset := labels.Labels{ lset := labels.FromStrings(model.MetricNameLabel, fmt.Sprintf("series_%d", i))
{Name: model.MetricNameLabel, Value: fmt.Sprintf("series_%d", i)},
}
_, err := app.Append(0, lset, 0, 100) _, err := app.Append(0, lset, 0, 100)
require.NoError(t, err) require.NoError(t, err)
} }
@ -470,11 +468,11 @@ func startTime() (int64, error) {
} }
// Create series for tests. // Create series for tests.
func labelsForTest(lName string, seriesCount int) []labels.Labels { func labelsForTest(lName string, seriesCount int) [][]labels.Label {
var series []labels.Labels var series [][]labels.Label
for i := 0; i < seriesCount; i++ { for i := 0; i < seriesCount; i++ {
lset := labels.Labels{ lset := []labels.Label{
{Name: "a", Value: lName}, {Name: "a", Value: lName},
{Name: "instance", Value: "localhost" + strconv.Itoa(i)}, {Name: "instance", Value: "localhost" + strconv.Itoa(i)},
{Name: "job", Value: "prometheus"}, {Name: "job", Value: "prometheus"},
@ -507,28 +505,28 @@ func TestStorage_DuplicateExemplarsIgnored(t *testing.T) {
app := s.Appender(context.Background()) app := s.Appender(context.Background())
defer s.Close() defer s.Close()
sRef, err := app.Append(0, labels.Labels{{Name: "a", Value: "1"}}, 0, 0) sRef, err := app.Append(0, labels.FromStrings("a", "1"), 0, 0)
require.NoError(t, err, "should not reject valid series") require.NoError(t, err, "should not reject valid series")
// Write a few exemplars to our appender and call Commit(). // Write a few exemplars to our appender and call Commit().
// If the Labels, Value or Timestamp are different than the last exemplar, // If the Labels, Value or Timestamp are different than the last exemplar,
// then a new one should be appended; Otherwise, it should be skipped. // then a new one should be appended; Otherwise, it should be skipped.
e := exemplar.Exemplar{Labels: labels.Labels{{Name: "a", Value: "1"}}, Value: 20, Ts: 10, HasTs: true} e := exemplar.Exemplar{Labels: labels.FromStrings("a", "1"), Value: 20, Ts: 10, HasTs: true}
_, _ = app.AppendExemplar(sRef, nil, e) _, _ = app.AppendExemplar(sRef, labels.EmptyLabels(), e)
_, _ = app.AppendExemplar(sRef, nil, e) _, _ = app.AppendExemplar(sRef, labels.EmptyLabels(), e)
e.Labels = labels.Labels{{Name: "b", Value: "2"}} e.Labels = labels.FromStrings("b", "2")
_, _ = app.AppendExemplar(sRef, nil, e) _, _ = app.AppendExemplar(sRef, labels.EmptyLabels(), e)
_, _ = app.AppendExemplar(sRef, nil, e) _, _ = app.AppendExemplar(sRef, labels.EmptyLabels(), e)
_, _ = app.AppendExemplar(sRef, nil, e) _, _ = app.AppendExemplar(sRef, labels.EmptyLabels(), e)
e.Value = 42 e.Value = 42
_, _ = app.AppendExemplar(sRef, nil, e) _, _ = app.AppendExemplar(sRef, labels.EmptyLabels(), e)
_, _ = app.AppendExemplar(sRef, nil, e) _, _ = app.AppendExemplar(sRef, labels.EmptyLabels(), e)
e.Ts = 25 e.Ts = 25
_, _ = app.AppendExemplar(sRef, nil, e) _, _ = app.AppendExemplar(sRef, labels.EmptyLabels(), e)
_, _ = app.AppendExemplar(sRef, nil, e) _, _ = app.AppendExemplar(sRef, labels.EmptyLabels(), e)
require.NoError(t, app.Commit()) require.NoError(t, app.Commit())