diff --git a/storage/remote/intern.go b/storage/remote/intern.go index af84d21bc9..8dc2de4a12 100644 --- a/storage/remote/intern.go +++ b/storage/remote/intern.go @@ -102,8 +102,8 @@ func (p *pool) intern(ref chunks.HeadSeriesRef, lset labels.Labels) labels.Label return interned.lset } - if len(lset) == 0 { - return nil + if lset.Len() == 0 { + return labels.EmptyLabels() } p.pool[ref] = newEntry(lset) diff --git a/storage/remote/queue_manager.go b/storage/remote/queue_manager.go index a8f356575a..3802ab2de3 100644 --- a/storage/remote/queue_manager.go +++ b/storage/remote/queue_manager.go @@ -704,11 +704,11 @@ outer: t.seriesMtx.Lock() var lbls labels.Labels if t.interner.shouldIntern { - lbls = t.interner.intern(s.Ref, nil) + lbls = t.interner.intern(s.Ref, labels.EmptyLabels()) } else { lbls = t.seriesLabels[s.Ref] } - if len(lbls) == 0 { + if lbls.Len() == 0 { t.dataDropped.incr(1) if _, ok := t.droppedSeries[s.Ref]; !ok { level.Info(t.logger).Log("msg", "Dropped sample for series that was not explicitly dropped via relabelling", "ref", s.Ref) @@ -771,11 +771,11 @@ outer: t.seriesMtx.Lock() var lbls labels.Labels if t.interner.shouldIntern { - lbls = t.interner.intern(e.Ref, nil) + lbls = t.interner.intern(e.Ref, labels.EmptyLabels()) } else { lbls = t.seriesLabels[e.Ref] } - if len(lbls) == 0 { + if lbls.Len() == 0 { // Track dropped exemplars in the same EWMA for sharding calc. t.dataDropped.incr(1) if _, ok := t.droppedSeries[e.Ref]; !ok { @@ -833,11 +833,11 @@ outer: t.seriesMtx.Lock() var lbls labels.Labels if t.interner.shouldIntern { - lbls = t.interner.intern(h.Ref, nil) + lbls = t.interner.intern(h.Ref, labels.EmptyLabels()) } else { lbls = t.seriesLabels[h.Ref] } - if len(lbls) == 0 { + if lbls.Len() == 0 { t.dataDropped.incr(1) if _, ok := t.droppedSeries[h.Ref]; !ok { level.Info(t.logger).Log("msg", "Dropped histogram for series that was not explicitly dropped via relabelling", "ref", h.Ref) @@ -893,11 +893,11 @@ outer: t.seriesMtx.Lock() var lbls labels.Labels if t.interner.shouldIntern { - lbls = t.interner.intern(h.Ref, nil) + lbls = t.interner.intern(h.Ref, labels.EmptyLabels()) } else { lbls = t.seriesLabels[h.Ref] } - if len(lbls) == 0 { + if lbls.Len() == 0 { t.dataDropped.incr(1) if _, ok := t.droppedSeries[h.Ref]; !ok { level.Info(t.logger).Log("msg", "Dropped histogram for series that was not explicitly dropped via relabelling", "ref", h.Ref)