From c5e015d29534f06bd1d238c64a06b7ac41abdd7f Mon Sep 17 00:00:00 2001 From: Manik Rana Date: Mon, 2 Sep 2024 22:39:46 +0530 Subject: [PATCH] fix: Properly put OM text p.CreatedTimestamp behind feature flag (#14809) Mitigates https://github.com/prometheus/prometheus/issues/14808 Signed-off-by: Manik Rana --- scrape/scrape.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scrape/scrape.go b/scrape/scrape.go index ccb068b68..4d018df70 100644 --- a/scrape/scrape.go +++ b/scrape/scrape.go @@ -1634,12 +1634,14 @@ loop: if seriesAlreadyScraped && parsedTimestamp == nil { err = storage.ErrDuplicateSampleForTimestamp } else { - if ctMs := p.CreatedTimestamp(); sl.enableCTZeroIngestion && ctMs != nil { - ref, err = app.AppendCTZeroSample(ref, lset, t, *ctMs) - if err != nil && !errors.Is(err, storage.ErrOutOfOrderCT) { // OOO is a common case, ignoring completely for now. - // CT is an experimental feature. For now, we don't need to fail the - // 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) + if sl.enableCTZeroIngestion { + if ctMs := p.CreatedTimestamp(); ctMs != nil { + ref, err = app.AppendCTZeroSample(ref, lset, t, *ctMs) + if err != nil && !errors.Is(err, storage.ErrOutOfOrderCT) { // OOO is a common case, ignoring completely for now. + // CT is an experimental feature. For now, we don't need to fail the + // 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) + } } }