Fix #5, turn off caching for all queries

MacroPower · Aug 12, 2020 · e78e048 · e78e048
1 parent b2f3801
commit e78e048
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 14 deletions.
diff --git a/collectors/alltime/main.go b/collectors/alltime/main.go
@@ -47,9 +47,9 @@ var (
 // Exporter is the local definition of Exporter
 type Exporter exporter.Exporter
 
-// NewExporter creates the Summary exporter
+// NewExporter creates the AllTime exporter
 func NewExporter(baseURI *url.URL, user string, token string, sslVerify bool, timeout time.Duration, logger log.Logger) *Exporter {
-	var fetchStat func(url.URL, string) (io.ReadCloser, error)
+	var fetchStat func(url.URL, string, url.Values) (io.ReadCloser, error)
 	fetchStat = exporter.FetchHTTP(token, sslVerify, timeout, logger)
 
 	return &Exporter{
@@ -121,7 +121,10 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric) error {
 
 	userURL := exporter.UserPath(e.URI, e.User)
 
-	body, fetchErr := e.FetchStat(userURL, endpoint)
+	params := url.Values{}
+	params.Add("cache", "false")
+
+	body, fetchErr := e.FetchStat(userURL, endpoint, params)
 	if fetchErr != nil {
 		return fetchErr
 	}

diff --git a/collectors/goal/main.go b/collectors/goal/main.go
@@ -48,9 +48,9 @@ var (
 // Exporter is the local definition of Exporter
 type Exporter exporter.Exporter
 
-// NewExporter creates the Summary exporter
+// NewExporter creates the Goal exporter
 func NewExporter(baseURI *url.URL, user string, token string, sslVerify bool, timeout time.Duration, logger log.Logger) *Exporter {
-	var fetchStat func(url.URL, string) (io.ReadCloser, error)
+	var fetchStat func(url.URL, string, url.Values) (io.ReadCloser, error)
 	fetchStat = exporter.FetchHTTP(token, sslVerify, timeout, logger)
 
 	return &Exporter{
@@ -122,7 +122,10 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric) error {
 
 	userURL := exporter.UserPath(e.URI, e.User)
 
-	body, fetchErr := e.FetchStat(userURL, endpoint)
+	params := url.Values{}
+	params.Add("cache", "false")
+
+	body, fetchErr := e.FetchStat(userURL, endpoint, params)
 	if fetchErr != nil {
 		return fetchErr
 	}

diff --git a/collectors/leader/main.go b/collectors/leader/main.go
@@ -48,7 +48,7 @@ type Exporter exporter.Exporter
 
 // NewExporter creates the Leader exporter
 func NewExporter(baseURI *url.URL, user string, token string, sslVerify bool, timeout time.Duration, logger log.Logger) *Exporter {
-	var fetchStat func(url.URL, string) (io.ReadCloser, error)
+	var fetchStat func(url.URL, string, url.Values) (io.ReadCloser, error)
 	fetchStat = exporter.FetchHTTP(token, sslVerify, timeout, logger)
 
 	return &Exporter{
@@ -118,7 +118,10 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric) error {
 
 	e.TotalScrapes.Inc()
 
-	body, fetchErr := e.FetchStat(*e.URI, endpoint)
+	params := url.Values{}
+	params.Add("cache", "false")
+
+	body, fetchErr := e.FetchStat(*e.URI, endpoint, params)
 	if fetchErr != nil {
 		return fetchErr
 	}

diff --git a/collectors/summary/main.go b/collectors/summary/main.go
@@ -54,7 +54,7 @@ type Exporter exporter.Exporter
 
 // NewExporter creates the Summary exporter
 func NewExporter(baseURI *url.URL, user string, token string, sslVerify bool, timeout time.Duration, logger log.Logger) *Exporter {
-	var fetchStat func(url.URL, string) (io.ReadCloser, error)
+	var fetchStat func(url.URL, string, url.Values) (io.ReadCloser, error)
 	fetchStat = exporter.FetchHTTP(token, sslVerify, timeout, logger)
 
 	return &Exporter{
@@ -127,11 +127,11 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric) error {
 	params := url.Values{}
 	params.Add("start", "today")
 	params.Add("end", "today")
+	params.Add("cache", "false")
 
 	userURL := exporter.UserPath(e.URI, e.User)
-	userURL.RawQuery = params.Encode()
 
-	body, fetchErr := e.FetchStat(userURL, endpoint)
+	body, fetchErr := e.FetchStat(userURL, endpoint, params)
 	if fetchErr != nil {
 		return fetchErr
 	}

diff --git a/lib/types.go b/lib/types.go
@@ -33,7 +33,7 @@ type Exporter struct {
 	URI            *url.URL
 	Endpoint, User string
 	Mutex          sync.RWMutex
-	FetchStat      func(url.URL, string) (io.ReadCloser, error)
+	FetchStat      func(url.URL, string, url.Values) (io.ReadCloser, error)
 
 	Up                          prometheus.Gauge
 	TotalScrapes, QueryFailures prometheus.Counter

diff --git a/lib/utils.go b/lib/utils.go
@@ -62,16 +62,17 @@ func BoolToBinary(b bool) string {
 }
 
 // FetchHTTP is a generic fetch method for Wakatime API endpoints
-func FetchHTTP(token string, sslVerify bool, timeout time.Duration, logger log.Logger) func(uri url.URL, subPath string) (io.ReadCloser, error) {
+func FetchHTTP(token string, sslVerify bool, timeout time.Duration, logger log.Logger) func(uri url.URL, subPath string, params url.Values) (io.ReadCloser, error) {
 	tr := &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: !sslVerify}}
 	client := http.Client{
 		Timeout:   timeout,
 		Transport: tr,
 	}
 	sEnc := b64.StdEncoding.EncodeToString([]byte(token))
-	return func(uri url.URL, subPath string) (io.ReadCloser, error) {
+	return func(uri url.URL, subPath string, params url.Values) (io.ReadCloser, error) {
 
 		uri.Path = path.Join(uri.Path, subPath)
+		uri.RawQuery = params.Encode()
 		url := uri.String()
 
 		level.Info(logger).Log("msg", "Scraping Wakatime", "path", subPath, "url", url)