feat: add support for router bytes metric

Author: Ladislav Prskavec

client.go

@@ -1,13 +1,14 @@
 package main
 
 import (
-	statsd "github.com/DataDog/datadog-go/statsd"
-	log "github.com/Sirupsen/logrus"
-	"strconv"
-	"strings"
 	"errors"
 	"regexp"
 	"sort"
+	"strconv"
+	"strings"
+
+	statsd "github.com/DataDog/datadog-go/statsd"
+	log "github.com/Sirupsen/logrus"
 )
 
 const sampleRate = 1.0
@@ -56,7 +57,6 @@ func (c *Client) sendToStatsd(in chan *logMetrics) {
 			"prefix": data.prefix,
 		}).Debug("logMetrics received")
 
-
 		if data.typ == routerMsg {
 			c.sendRouterMsg(data)
 		} else if data.typ == sampleMsg {
@@ -139,6 +139,20 @@ func (c *Client) sendRouterMsg(data *logMetrics) {
 		return
 	}
 
+	bytes, err := strconv.ParseFloat(data.metrics["bytes"].Val, 10)
+	if err != nil {
+		log.WithFields(log.Fields{
+			"type":   "router",
+			"metric": "bytes",
+			"err":    err,
+		}).Info("Could not parse metric value")
+		return
+	}
+	// https://devcenter.heroku.com/articles/http-routing
+	err = c.Histogram(*data.prefix+"heroku.router.response.bytes", bytes, tags, sampleRate)
+	if err != nil {
+		log.WithField("error", err).Info("Failed to send Histogram")
+	}
 	err = c.Histogram(*data.prefix+"heroku.router.request.connect", conn, tags, sampleRate)
 	if err != nil {
 		log.WithField("error", err).Info("Failed to send Histogram")
@@ -214,10 +228,14 @@ func (c *Client) sendScalingMsg(data *logMetrics) {
 
 func (c *Client) sendMetric(metricType string, metricName string, value float64, tags []string) error {
 	switch metricType {
-	case "metric", "sample": return c.Gauge(metricName, value, tags, sampleRate)
-	case "measure": return c.Histogram(metricName, value, tags, sampleRate)
-	case "count": return c.Count(metricName, int64(value), tags, sampleRate)
-	default: return errors.New("Unknown metric type"+metricType)
+	case "metric", "sample":
+		return c.Gauge(metricName, value, tags, sampleRate)
+	case "measure":
+		return c.Histogram(metricName, value, tags, sampleRate)
+	case "count":
+		return c.Count(metricName, int64(value), tags, sampleRate)
+	default:
+		return errors.New("Unknown metric type" + metricType)
 	}
 }
 

client_test.go

@@ -16,7 +16,7 @@ var statsdTests = []struct {
 	Expected []string
 }{
 	{
-		cnt: 2,
+		cnt: 3,
 		m: logMetrics{
 			routerMsg,
 			&app,
@@ -27,12 +27,14 @@ var statsdTests = []struct {
 				"path":    {"/foo", ""},
 				"connect": {"1", "ms"},
 				"service": {"37", "ms"},
-				"status": {"401", ""},
+				"status":  {"401", ""},
+				"bytes":   {"244000", ""},
 				"garbage": {"bar", ""},
 			},
 			events,
 		},
 		Expected: []string{
+			"prefix.heroku.router.response.bytes:244000.000000|h|#at:info,status:401,tag1,tag2,statusFamily:4xx",
 			"prefix.heroku.router.request.connect:1.000000|h|#at:info,status:401,tag1,tag2,statusFamily:4xx",
 			"prefix.heroku.router.request.service:37.000000|h|#at:info,status:401,tag1,tag2,statusFamily:4xx",
 		},
@@ -146,8 +148,7 @@ var statsdTests = []struct {
 			&app,
 			&tags,
 			&prefix,
-			map[string]logValue{
-			},
+			map[string]logValue{},
 			[]string{
 				"Release v1 created by foo@bar",
 			},
@@ -156,7 +157,6 @@ var statsdTests = []struct {
 			"_e{13,29}:app/api: test|Release v1 created by foo@bar|#tag1,tag2",
 		},
 	},
-
 }
 
 func TestStatsdClient(t *testing.T) {

server_test.go

@@ -19,9 +19,10 @@ var fullTests = []struct {
 	Expected []string
 }{
 	{
-		cnt: 2,
+		cnt: 3,
 		Req: `255 <158>1 2015-04-02T11:52:34.520012+00:00 host heroku router - at=info method=POST path="/users" host=myapp.com request_id=c1806361-2081-42e7-a8aa-92b6808eac8e fwd="24.76.242.18" dyno=web.1 connect=1ms service=37ms status=201 bytes=828`,
 		Expected: []string{
+			"heroku.router.response.bytes:828.000000|h|#at:info,dyno:web.1,host:myapp.com,method:POST,path:/users,status:201,statusFamily:2xx",
 			"heroku.router.request.connect:1.000000|h|#at:info,dyno:web.1,host:myapp.com,method:POST,path:/users,status:201,statusFamily:2xx",
 			"heroku.router.request.service:37.000000|h|#at:info,dyno:web.1,host:myapp.com,method:POST,path:/users,status:201,statusFamily:2xx",
 		},