Add metric counter for Heartbeat requests (#77)

Author: cristinaleonr

handler/handler.go

@@ -161,7 +161,7 @@ func (c *Client) Nearest(rw http.ResponseWriter, req *http.Request) {
 		status := http.StatusServiceUnavailable
 		result.Error = v2.NewError("nearest", "Failed to lookup nearest machines", status)
 		writeResult(rw, result.Error.Status, &result)
-		metrics.RequestsTotal.WithLabelValues(http.StatusText(result.Error.Status)).Inc()
+		metrics.RequestsTotal.WithLabelValues("nearest", http.StatusText(result.Error.Status)).Inc()
 		return
 	}
 
@@ -171,7 +171,7 @@ func (c *Client) Nearest(rw http.ResponseWriter, req *http.Request) {
 	if errLat != nil || errLon != nil {
 		result.Error = v2.NewError("client", errFailedToLookupClient.Error(), http.StatusInternalServerError)
 		writeResult(rw, result.Error.Status, &result)
-		metrics.RequestsTotal.WithLabelValues(http.StatusText(result.Error.Status)).Inc()
+		metrics.RequestsTotal.WithLabelValues("nearest", http.StatusText(result.Error.Status)).Inc()
 		return
 	}
 
@@ -181,15 +181,15 @@ func (c *Client) Nearest(rw http.ResponseWriter, req *http.Request) {
 	if err != nil {
 		result.Error = v2.NewError("nearest", "Failed to lookup nearest machines", http.StatusInternalServerError)
 		writeResult(rw, result.Error.Status, &result)
-		metrics.RequestsTotal.WithLabelValues(http.StatusText(result.Error.Status)).Inc()
+		metrics.RequestsTotal.WithLabelValues("nearest", http.StatusText(result.Error.Status)).Inc()
 		return
 	}
 
 	// Populate target URLs and write out response.
 	c.populateURLs(targets, urls, experiment, req.Form)
 	result.Results = targets
 	writeResult(rw, http.StatusOK, &result)
-	metrics.RequestsTotal.WithLabelValues(http.StatusText(http.StatusOK)).Inc()
+	metrics.RequestsTotal.WithLabelValues("nearest", http.StatusText(http.StatusOK)).Inc()
 }
 
 // checkClientLocation looks up the client location and copies the location

handler/heartbeat.go

@@ -25,9 +25,11 @@ func (c *Client) Heartbeat(rw http.ResponseWriter, req *http.Request) {
 	ws, err := upgrader.Upgrade(rw, req, nil)
 	if err != nil {
 		log.Errorf("failed to establish a connection: %v", err)
+		metrics.RequestsTotal.WithLabelValues("heartbeat", err.Error()).Inc()
 		return
 	}
 	metrics.CurrentHeartbeatConnections.Inc()
+	metrics.RequestsTotal.WithLabelValues("heartbeat", "OK").Inc()
 	go c.handleHeartbeats(ws)
 }
 

metrics/metrics.go

@@ -6,17 +6,17 @@ import (
 )
 
 var (
-	// RequestsTotal counts the number of 'nearest' requests served by
+	// RequestsTotal counts the number of requests served by
 	// the Locate service.
 	//
 	// Example usage:
-	// metrics.RequestsTotal.WithLabelValues("200").Inc()
+	// metrics.RequestsTotal.WithLabelValues("nearest", "200").Inc()
 	RequestsTotal = promauto.NewCounterVec(
 		prometheus.CounterOpts{
 			Name: "locate_requests_total",
-			Help: "Number of 'nearest' requests served by the Locate service.",
+			Help: "Number of requests served by the Locate service.",
 		},
-		[]string{"status"},
+		[]string{"type", "status"},
 	)
 
 	// AppEngineTotal counts the number of times App Engine headers are

metrics/metrics_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestLintMetrics(t *testing.T) {
-	RequestsTotal.WithLabelValues("status")
+	RequestsTotal.WithLabelValues("type", "status")
 	AppEngineTotal.WithLabelValues("country")
 	CurrentHeartbeatConnections.Set(0)
 	promtest.LintMetrics(nil)