From 67274f0794fd8ac1d7e731c40db40885eca9360a Mon Sep 17 00:00:00 2001
From: Brian Brazil <brian.brazil@robustperception.io>
Date: Thu, 5 Oct 2017 12:55:14 +0100
Subject: [PATCH] Remove 4 interval staleness heuristic. (#3244)

This means that if there is no stale marker, only the usual staleness
delta (5m) applies.

It has occured to me that there is an oddity in the heurestic. It works
fine as long as you have 2 points within the last 5m, but breaks down
when the time window advances to the point where you have just 1 point.

Consider you had points at t=0 and t=10. With the heurestic it goes stale
at t=51, up until t=300. However from t=301 until t=310 we only
see the t=10 point and the series comes back to life. That is not
desirable.

I don't see a way to keep this form of heurestic working given this
issue, so thus I'm removing it.
---
 promql/engine.go               | 14 --------------
 promql/testdata/staleness.test |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/promql/engine.go b/promql/engine.go
index 68b87a5de..41f9238a1 100644
--- a/promql/engine.go
+++ b/promql/engine.go
@@ -779,20 +779,6 @@ func (ev *evaluator) vectorSelector(node *VectorSelector) Vector {
 		if value.IsStaleNaN(v) {
 			continue
 		}
-		// Find timestamp before this point, within the staleness delta.
-		prevT, _, ok := it.PeekBack(peek)
-		if ok && prevT >= refTime-durationMilliseconds(LookbackDelta) {
-			interval := t - prevT
-			if interval*4+interval/10 < refTime-t {
-				// It is more than 4 (+10% for safety) intervals
-				// since the last data point, skip as stale.
-				//
-				// We need 4 to allow for federation, as with a 10s einterval an eval
-				// started at t=10 could be ingested at t=20, scraped for federation at
-				// t=30 and only ingested by federation at t=40.
-				continue
-			}
-		}
 
 		vec = append(vec, Sample{
 			Metric: node.series[i].Labels(),
diff --git a/promql/testdata/staleness.test b/promql/testdata/staleness.test
index 9c24fe31c..76ee2f287 100644
--- a/promql/testdata/staleness.test
+++ b/promql/testdata/staleness.test
@@ -13,11 +13,11 @@ eval instant at 30s metric
 eval instant at 40s metric
   {__name__="metric"} 2
 
-# It goes stale 4 intervals + 10% after the last sample.
-eval instant at 71s metric
+# It goes stale 5 minutes after the last sample.
+eval instant at 330s metric
   {__name__="metric"} 2
 
-eval instant at 72s metric
+eval instant at 331s metric
 
 
 # Range vector ignores stale sample.