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

fix: Properly put OM text p.CreatedTimestamp behind feature flag (#14809) (#14815)

Browse source 
Mitigates https://github.com/prometheus/prometheus/issues/14808

Signed-off-by: Manik Rana <manikrana54@gmail.com>
Co-authored-by: Manik Rana <Manikrana54@gmail.com>
This commit is contained in:
Bartlomiej Plotka 2024-09-03 08:33:44 +02:00 committed by GitHub
parent 442f24e099
commit f1d3c3f464
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scrape/scrape.go
View file

@ -1655,12 +1655,14 @@ loop:
if seriesAlreadyScraped && parsedTimestamp == nil { if seriesAlreadyScraped && parsedTimestamp == nil {
err = storage.ErrDuplicateSampleForTimestamp err = storage.ErrDuplicateSampleForTimestamp
} else { } else {
if ctMs := p.CreatedTimestamp(); sl.enableCTZeroIngestion && ctMs != nil { if sl.enableCTZeroIngestion {
ref, err = app.AppendCTZeroSample(ref, lset, t, *ctMs) if ctMs := p.CreatedTimestamp(); ctMs != nil {
if err != nil && !errors.Is(err, storage.ErrOutOfOrderCT) { // OOO is a common case, ignoring completely for now. ref, err = app.AppendCTZeroSample(ref, lset, t, *ctMs)
// CT is an experimental feature. For now, we don't need to fail the if err != nil && !errors.Is(err, storage.ErrOutOfOrderCT) { // OOO is a common case, ignoring completely for now.
// scrape on errors updating the created timestamp, log debug. // CT is an experimental feature. For now, we don't need to fail the
level.Debug(sl.l).Log("msg", "Error when appending CT in scrape loop", "series", string(met), "ct", *ctMs, "t", t, "err", err) // scrape on errors updating the created timestamp, log debug.
level.Debug(sl.l).Log("msg", "Error when appending CT in scrape loop", "series", string(met), "ct", *ctMs, "t", t, "err", err)
}
} }
} }