From cf909874d784e618c47df1f73e693d80784b6b79 Mon Sep 17 00:00:00 2001 From: rw Date: Mon, 9 May 2016 11:40:35 -0700 Subject: [PATCH] UTC timestamp tweaks. --- bulk_query_gen/main.go | 6 ++++-- bulk_query_gen/time_interval.go | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bulk_query_gen/main.go b/bulk_query_gen/main.go index 085d39685..4fc49d7e8 100644 --- a/bulk_query_gen/main.go +++ b/bulk_query_gen/main.go @@ -52,8 +52,8 @@ func init() { flag.StringVar(&dbName, "db", "benchmark_db", "Database for influx to use (ignored for elastic)") - flag.StringVar(×tampStartStr, "timestamp-start", "2016-01-01T00:00:00-00:00", "Beginning timestamp (RFC3339).") - flag.StringVar(×tampEndStr, "timestamp-end", "2016-01-01T06:00:00-00:00", "Ending timestamp (RFC3339).") + flag.StringVar(×tampStartStr, "timestamp-start", "2016-01-01T00:00:00Z", "Beginning timestamp (RFC3339).") + flag.StringVar(×tampEndStr, "timestamp-end", "2016-01-01T06:00:00Z", "Ending timestamp (RFC3339).") flag.Int64Var(&seed, "seed", 0, "PRNG seed (default, or 0, uses the current timestamp).") flag.IntVar(&debug, "debug", 0, "Debug printing (choices: 0, 1) (default 0).") @@ -83,10 +83,12 @@ func init() { if err != nil { log.Fatal(err) } + timestampStart = timestampStart.UTC() timestampEnd, err = time.Parse(time.RFC3339, timestampEndStr) if err != nil { log.Fatal(err) } + timestampEnd = timestampEnd.UTC() } func main() { diff --git a/bulk_query_gen/time_interval.go b/bulk_query_gen/time_interval.go index 03f41f6d9..67656c965 100644 --- a/bulk_query_gen/time_interval.go +++ b/bulk_query_gen/time_interval.go @@ -46,10 +46,10 @@ func (ti *TimeInterval) RandWindow(window time.Duration) TimeInterval { // StartString formats the start of the time interval. func (ti *TimeInterval) StartString() string { - return ti.Start.Format(time.RFC3339) + return ti.Start.UTC().Format(time.RFC3339) } // EndString formats the end of the time interval. func (ti *TimeInterval) EndString() string { - return ti.End.Format(time.RFC3339) + return ti.End.UTC().Format(time.RFC3339) }