From c784acc20db91d63c1a994a782b1113222dfd135 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Sat, 28 Mar 2020 13:58:34 +0000
Subject: [PATCH] Revert change to use report timestamp

This reverts commit 6b72246fe6f0e8fec5e1310550561e6ba07a93fb.

The app merges reports within a 15-second window of its own time, so
if one or more probes have a time that is several seconds different
they will get excluded from the window.
---
 app/collector.go                   | 1 -
 app/multitenant/aws_collector.go   | 2 +-
 app/multitenant/billing_emitter.go | 2 +-
 app/router.go                      | 4 ----
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/collector.go b/app/collector.go
index a495b055a..f59f6f75f 100644
--- a/app/collector.go
+++ b/app/collector.go
@@ -348,7 +348,6 @@ func replay(a Adder, timestamps []time.Time, reports []report.Report) {
 	due := time.Now()
 	for {
 		for i, r := range reports {
-			r.TS = due
 			a.Add(nil, r, nil)
 			due = due.Add(delays[i])
 			delay := due.Sub(time.Now())
diff --git a/app/multitenant/aws_collector.go b/app/multitenant/aws_collector.go
index f3a9ef6ba..0e84bdba1 100644
--- a/app/multitenant/aws_collector.go
+++ b/app/multitenant/aws_collector.go
@@ -538,7 +538,7 @@ func (c *awsCollector) Add(ctx context.Context, rep report.Report, buf []byte) e
 	}
 
 	// first, put the report on s3
-	rowKey, colKey := calculateDynamoKeys(userid, rep.TS)
+	rowKey, colKey := calculateDynamoKeys(userid, time.Now())
 	reportKey, err := calculateReportKey(rowKey, colKey)
 	if err != nil {
 		return err
diff --git a/app/multitenant/billing_emitter.go b/app/multitenant/billing_emitter.go
index 6f5cb5d5c..ba0919b5e 100644
--- a/app/multitenant/billing_emitter.go
+++ b/app/multitenant/billing_emitter.go
@@ -59,7 +59,7 @@ func (e *BillingEmitter) Add(ctx context.Context, rep report.Report, buf []byte)
 		// proceeding.
 		return err
 	}
-	rowKey, colKey := calculateDynamoKeys(userID, rep.TS)
+	rowKey, colKey := calculateDynamoKeys(userID, now)
 
 	interval := e.reportInterval(rep)
 	// Cache the last-known value of interval for this user, and use
diff --git a/app/router.go b/app/router.go
index 73a2b1954..24bcf1749 100644
--- a/app/router.go
+++ b/app/router.go
@@ -148,10 +148,6 @@ func RegisterReportPostHandler(a Adder, router *mux.Router) {
 			buf, _ = rpt.WriteBinary()
 		}
 
-		// If it didn't come in with a timestamp, give it one now
-		if rpt.TS.IsZero() {
-			rpt.TS = time.Now().UTC()
-		}
 		if err := a.Add(ctx, *rpt, buf.Bytes()); err != nil {
 			log.Errorf("Error Adding report: %v", err)
 			respondWith(w, http.StatusInternalServerError, err)