From 95162ebc16144542e16044f2e7a502c549718989 Mon Sep 17 00:00:00 2001
From: Brian Brazil <brian.brazil@robustperception.io>
Date: Wed, 10 May 2017 14:44:13 +0100
Subject: [PATCH] Add log messages for out of order samples

---
 retrieval/scrape.go | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/retrieval/scrape.go b/retrieval/scrape.go
index 46ccb78278..3678627ced 100644
--- a/retrieval/scrape.go
+++ b/retrieval/scrape.go
@@ -567,7 +567,13 @@ loop:
 				samplesScraped[sl.lsetCache[ref].str] = sl.lsetCache[ref].lset
 			case storage.ErrNotFound:
 				ok = false
-			case errSeriesDropped, storage.ErrOutOfOrderSample, storage.ErrDuplicateSampleForTimestamp:
+			case errSeriesDropped:
+				continue
+			case storage.ErrOutOfOrderSample:
+				log.With("timeseries", string(met)).Warn("Out of order sample")
+				continue
+			case storage.ErrDuplicateSampleForTimestamp:
+				log.With("timeseries", string(met)).Warn("Duplicate sample for timestamp")
 				continue
 			default:
 				break loop
@@ -581,7 +587,16 @@ loop:
 			// TODO(fabxc): also add a dropped-cache?
 			switch err {
 			case nil:
-			case errSeriesDropped, storage.ErrOutOfOrderSample, storage.ErrDuplicateSampleForTimestamp:
+			case errSeriesDropped:
+				err = nil
+				continue
+			case storage.ErrOutOfOrderSample:
+				err = nil
+				log.With("timeseries", string(met)).Warn("Out of order sample")
+				continue
+			case storage.ErrDuplicateSampleForTimestamp:
+				err = nil
+				log.With("timeseries", string(met)).Warn("Duplicate sample for timestamp")
 				continue
 			default:
 				break loop