re
/
client_golang
forked from mirror/client_golang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change all time formatting to UTC and off of time.RFC3339Nano 

Prometheus has issues parsing RFC3339Nano timestamps if the year has more than 4 digits, in addition it is the second-pass parse attempt. Since this is a client library and the interface is a `time.Time` it makes sense that we pick the clearest simplest format-- so I propose we use the `model.Time` representation of time in our communications to prometheus. This (1) removes the issues with timezones in those queries going downstream and (2) completely works around this #614 issue as the parsing mechanism in prometheus can handle those times in this format.

Related to #614

Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>
This commit is contained in:
Thomas Jackson 2019-07-07 12:40:02 -07:00
parent a6c69798cc
commit c52580de2b
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
api/prometheus/v1/api.go
View File

@ -594,8 +594,8 @@ func (h *httpAPI) DeleteSeries(ctx context.Context, matches []string, startTime
q.Add("match[]", m) q.Add("match[]", m)
} }
q.Set("start", startTime.Format(time.RFC3339Nano)) q.Set("start", formatTime(startTime))
q.Set("end", endTime.Format(time.RFC3339Nano)) q.Set("end", formatTime(endTime))
u.RawQuery = q.Encode() u.RawQuery = q.Encode()
@ -659,7 +659,7 @@ func (h *httpAPI) Query(ctx context.Context, query string, ts time.Time) (model.
q.Set("query", query) q.Set("query", query)
if !ts.IsZero() { if !ts.IsZero() {
q.Set("time", ts.Format(time.RFC3339Nano)) q.Set("time", formatTime(ts))
} }
_, body, warnings, err := api.DoGetFallback(h.client, ctx, u, q) _, body, warnings, err := api.DoGetFallback(h.client, ctx, u, q)
@ -675,16 +675,10 @@ func (h *httpAPI) QueryRange(ctx context.Context, query string, r Range) (model.
u := h.client.URL(epQueryRange, nil) u := h.client.URL(epQueryRange, nil)
q := u.Query() q := u.Query()
var (
start = r.Start.Format(time.RFC3339Nano)
end = r.End.Format(time.RFC3339Nano)
step = strconv.FormatFloat(r.Step.Seconds(), 'f', 3, 64)
)
q.Set("query", query) q.Set("query", query)
q.Set("start", start) q.Set("start", formatTime(r.Start))
q.Set("end", end) q.Set("end", formatTime(r.End))
q.Set("step", step) q.Set("step", strconv.FormatFloat(r.Step.Seconds(), 'f', 3, 64))
_, body, warnings, err := api.DoGetFallback(h.client, ctx, u, q) _, body, warnings, err := api.DoGetFallback(h.client, ctx, u, q)
if err != nil { if err != nil {
@ -704,8 +698,8 @@ func (h *httpAPI) Series(ctx context.Context, matches []string, startTime time.T
q.Add("match[]", m) q.Add("match[]", m)
} }
q.Set("start", startTime.Format(time.RFC3339Nano)) q.Set("start", formatTime(startTime))
q.Set("end", endTime.Format(time.RFC3339Nano)) q.Set("end", formatTime(endTime))
u.RawQuery = q.Encode() u.RawQuery = q.Encode()
@ -877,3 +871,7 @@ func (c apiClient) Do(ctx context.Context, req *http.Request) (*http.Response, [
return resp, []byte(result.Data), warnings, err return resp, []byte(result.Data), warnings, err
} }
func formatTime(t time.Time) string {
return strconv.FormatFloat(float64(t.UnixNano())/1e9, 'f', -1, 64)
}