remove unnecessary change to how we check if series labels were present
Some checks are pending
CI / Go tests (push) Waiting to run
CI / More Go tests (push) Waiting to run
CI / Go tests with previous Go version (push) Waiting to run
CI / UI tests (push) Waiting to run
CI / Go tests on Windows (push) Waiting to run
CI / Mixins tests (push) Waiting to run
CI / Build Prometheus for common architectures (0) (push) Waiting to run
CI / Build Prometheus for common architectures (1) (push) Waiting to run
CI / Build Prometheus for common architectures (2) (push) Waiting to run
CI / Build Prometheus for all architectures (0) (push) Waiting to run
CI / Build Prometheus for all architectures (1) (push) Waiting to run
CI / Build Prometheus for all architectures (10) (push) Waiting to run
CI / Build Prometheus for all architectures (11) (push) Waiting to run
CI / Build Prometheus for all architectures (2) (push) Waiting to run
CI / Build Prometheus for all architectures (3) (push) Waiting to run
CI / Build Prometheus for all architectures (4) (push) Waiting to run
CI / Build Prometheus for all architectures (5) (push) Waiting to run
CI / Build Prometheus for all architectures (6) (push) Waiting to run
CI / Build Prometheus for all architectures (7) (push) Waiting to run
CI / Build Prometheus for all architectures (8) (push) Waiting to run
CI / Build Prometheus for all architectures (9) (push) Waiting to run
CI / Report status of build Prometheus for all architectures (push) Blocked by required conditions
CI / Check generated parser (push) Waiting to run
CI / golangci-lint (push) Waiting to run
CI / fuzzing (push) Waiting to run
CI / codeql (push) Waiting to run
CI / Publish main branch artifacts (push) Blocked by required conditions
CI / Publish release artefacts (push) Blocked by required conditions
CI / Publish UI on npm Registry (push) Blocked by required conditions

in local cache

Signed-off-by: Callum Styan <callumstyan@gmail.com>
This commit is contained in:
Callum Styan 2024-09-17 10:50:16 -07:00
parent 271cffddf5
commit 7da79a238f

View file

@ -702,8 +702,8 @@ outer:
continue continue
} }
t.seriesMtx.Lock() t.seriesMtx.Lock()
lbls := t.seriesLabels[s.Ref] lbls, ok := t.seriesLabels[s.Ref]
if lbls.Len() == 0 { if !ok {
t.dataDropped.incr(1) t.dataDropped.incr(1)
if _, ok := t.droppedSeries[s.Ref]; !ok { 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) level.Info(t.logger).Log("msg", "Dropped sample for series that was not explicitly dropped via relabelling", "ref", s.Ref)
@ -764,8 +764,8 @@ outer:
continue continue
} }
t.seriesMtx.Lock() t.seriesMtx.Lock()
lbls := t.seriesLabels[e.Ref] lbls, ok := t.seriesLabels[e.Ref]
if lbls.Len() == 0 { if !ok {
// Track dropped exemplars in the same EWMA for sharding calc. // Track dropped exemplars in the same EWMA for sharding calc.
t.dataDropped.incr(1) t.dataDropped.incr(1)
if _, ok := t.droppedSeries[e.Ref]; !ok { if _, ok := t.droppedSeries[e.Ref]; !ok {
@ -821,8 +821,8 @@ outer:
continue continue
} }
t.seriesMtx.Lock() t.seriesMtx.Lock()
lbls := t.seriesLabels[h.Ref] lbls, ok := t.seriesLabels[h.Ref]
if lbls.Len() == 0 { if !ok {
t.dataDropped.incr(1) t.dataDropped.incr(1)
if _, ok := t.droppedSeries[h.Ref]; !ok { 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) level.Info(t.logger).Log("msg", "Dropped histogram for series that was not explicitly dropped via relabelling", "ref", h.Ref)
@ -876,8 +876,8 @@ outer:
continue continue
} }
t.seriesMtx.Lock() t.seriesMtx.Lock()
lbls := t.seriesLabels[h.Ref] lbls, ok := t.seriesLabels[h.Ref]
if lbls.Len() == 0 { if !ok {
t.dataDropped.incr(1) t.dataDropped.incr(1)
if _, ok := t.droppedSeries[h.Ref]; !ok { 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) level.Info(t.logger).Log("msg", "Dropped histogram for series that was not explicitly dropped via relabelling", "ref", h.Ref)