amassivus/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-07-02 18:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

refactor(nhcb): get rid of extra lastHistogramExponential state

Browse source 
and make it a regular state of inhibiting NHCB conversion.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
This commit is contained in:
György Krajcsovits 2025-06-11 20:06:38 +02:00
parent 3844a21738
commit 85d63ba861
No known key found for this signature in database
GPG key ID: 47A8F9CE80FD7C7F
1 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
model/textparse/nhcbparse.go
View file

@ -34,6 +34,7 @@ const (
stateStart collectionState = iota stateStart collectionState = iota
stateCollecting stateCollecting
stateEmitting stateEmitting
stateInhibiting // Inhibiting NHCB, because there was an exponential histogram with the same labels.
) )
// The NHCBParser wraps a Parser and converts classic histograms to native // The NHCBParser wraps a Parser and converts classic histograms to native
@ -97,9 +98,8 @@ type NHCBParser struct {
// Remembers the last base histogram metric name (assuming it's // Remembers the last base histogram metric name (assuming it's
// a classic histogram) so we can tell if the next float series // a classic histogram) so we can tell if the next float series
// is part of the same classic histogram. // is part of the same classic histogram.
lastHistogramName string lastHistogramName string
lastHistogramLabelsHash uint64 lastHistogramLabelsHash uint64
lastHistogramExponential bool
// Reused buffer for hashing labels. // Reused buffer for hashing labels.
hBuffer []byte hBuffer []byte
} }
@ -162,7 +162,7 @@ func (p *NHCBParser) Exemplar(ex *exemplar.Exemplar) bool {
func (p *NHCBParser) CreatedTimestamp() int64 { func (p *NHCBParser) CreatedTimestamp() int64 {
switch p.state { switch p.state {
case stateStart: case stateStart, stateInhibiting:
if p.entry == EntrySeries || p.entry == EntryHistogram { if p.entry == EntrySeries || p.entry == EntryHistogram {
return p.parser.CreatedTimestamp() return p.parser.CreatedTimestamp()
} }
@ -209,24 +209,21 @@ func (p *NHCBParser) Next() (Entry, error) {
return EntryHistogram, nil return EntryHistogram, nil
} }
isNHCB = p.handleClassicHistogramSeries(p.lset) isNHCB = p.handleClassicHistogramSeries(p.lset)
case stateStart: case stateInhibiting:
if p.lastHistogramExponential { if p.differentMetric() {
// We are in start state, but after an exponential histogram. // Next has different labels than the previous exponential
if p.differentMetric() { // histogram so we can start collecting classic histogram
// It has different labels than the next classic histogram, // series.
// so we can start collecting classic histogram series. p.state = stateStart
isNHCB = p.handleClassicHistogramSeries(p.lset)
p.lastHistogramExponential = false
} else {
// It has the same labels as the next classic histogram, then
// we need to inhibit NHCB until we see a different metric type or labels.
// p.lastHistogramExponential is not reset!
isNHCB = false
}
} else {
// We are in the start state, so we can start collecting classic histogram series.
isNHCB = p.handleClassicHistogramSeries(p.lset) isNHCB = p.handleClassicHistogramSeries(p.lset)
} else {
// Next has the same labels as the previous exponential
// histogram, so we are still in the inhibiting state and
// we should not convert to NHCB.
isNHCB = false
} }
case stateStart:
isNHCB = p.handleClassicHistogramSeries(p.lset)
default: default:
// This should not happen. // This should not happen.
return EntryInvalid, errors.New("unexpected state in NHCBParser") return EntryInvalid, errors.New("unexpected state in NHCBParser")
@ -237,7 +234,7 @@ func (p *NHCBParser) Next() (Entry, error) {
} }
return p.entry, p.err return p.entry, p.err
case EntryHistogram: case EntryHistogram:
p.lastHistogramExponential = true p.state = stateInhibiting
p.bytes, p.ts, p.h, p.fh = p.parser.Histogram() p.bytes, p.ts, p.h, p.fh = p.parser.Histogram()
p.parser.Labels(&p.lset) p.parser.Labels(&p.lset)
p.storeExponentialLabels() p.storeExponentialLabels()