Merge pull request #13737 from bboreham/fix-scrape-tolerance

[BUGFIX] Scraping: Tolerance should be max 1% of interval
prometheus · Mar 8, 2024 · 54f50e1 · 54f50e1
2 parents 9acae57 + 6c41ec9
commit 54f50e1
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/scrape/scrape.go b/scrape/scrape.go
@@ -1218,10 +1218,8 @@ mainLoop:
 		// and .Add on time.Time behave differently (see time package docs).
 		scrapeTime := time.Now().Round(0)
 		if AlignScrapeTimestamps {
-			tolerance := ScrapeTimestampTolerance
-			if maxTolerance := sl.interval / 100; tolerance < maxTolerance {
-				tolerance = maxTolerance
-			}
+			// Tolerance is clamped to maximum 1% of the scrape interval.
+			tolerance := min(sl.interval/100, ScrapeTimestampTolerance)
 			// For some reason, a tick might have been skipped, in which case we
 			// would call alignedScrapeTime.Add(interval) multiple times.
 			for scrapeTime.Sub(alignedScrapeTime) >= sl.interval {