Merge pull request #43 from mozilla-services/add-statsd

Add statsd

Author: oremj

glide.lock

@@ -10,6 +10,7 @@ import (
 	"go.mozilla.org/mozlogrus"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/alexcesaro/statsd"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -18,6 +19,7 @@ import (
 	"github.com/mozilla-services/stubattribution/attributioncode"
 	"github.com/mozilla-services/stubattribution/stubservice/backends"
 	"github.com/mozilla-services/stubattribution/stubservice/stubhandlers"
+	"github.com/oremj/asyncstatsd"
 )
 
 const hmacTimeoutDefault = 10 * time.Minute
@@ -33,13 +35,26 @@ var (
 	s3Bucket = os.Getenv("S3_BUCKET")
 	s3Prefix = os.Getenv("S3_PREFIX")
 
+	statsdPrefix = os.Getenv("STATSD_PREFIX")
+	statsdAddr   = os.Getenv("STATSD_ADDR")
+
 	cdnPrefix = os.Getenv("CDN_PREFIX")
 
 	addr = os.Getenv("ADDR")
 
 	sentryDSN = os.Getenv("SENTRY_DSN")
 )
 
+var statsdClient asyncstatsd.Client
+
+func mustStatsd(opts ...statsd.Option) *statsd.Client {
+	c, err := statsd.New(opts...)
+	if err != nil {
+		logrus.WithError(err).Fatal("Could not initiate statsd")
+	}
+	return c
+}
+
 func init() {
 	mozlogrus.Enable("StubAttribution")
 
@@ -85,6 +100,17 @@ func init() {
 			awsSess = awsSess.Copy(&aws.Config{Region: aws.String(region)})
 		}
 	}
+
+	if statsdAddr == "" {
+		statsdAddr = "127.0.0.1:8125"
+	}
+	if statsdPrefix == "" {
+		statsdPrefix = "stubattribution"
+	}
+	statsdClient = asyncstatsd.New(mustStatsd(
+		statsd.Prefix(statsdPrefix),
+		statsd.Address(statsdAddr),
+	), 10000)
 }
 
 func okHandler(w http.ResponseWriter, req *http.Request) {
@@ -119,10 +145,11 @@ func main() {
 		stubHandler = stubhandlers.NewDirectHandler()
 	}
 
-	stubService := &stubhandlers.StubService{
-		Handler:                  stubHandler,
-		AttributionCodeValidator: attributioncode.NewValidator(hmacKey, hmacTimeout),
-	}
+	stubService := stubhandlers.NewStubService(
+		stubHandler,
+		attributioncode.NewValidator(hmacKey, hmacTimeout),
+		statsdClient,
+	)
 
 	mux := http.NewServeMux()
 	mux.Handle("/", stubService)

stubservice/main.go

@@ -113,10 +113,9 @@ func TestRedirectFull(t *testing.T) {
 		BouncerURL = "https://download.mozilla.org/"
 	}()
 
-	svc := &StubService{
-		AttributionCodeValidator: &attributioncode.Validator{},
-		Handler:                  NewRedirectHandler(storage, server.URL+"/cdn/", ""),
-	}
+	svc := NewStubService(
+		NewRedirectHandler(storage, server.URL+"/cdn/", ""),
+		&attributioncode.Validator{}, nil)
 
 	recorder := httptest.NewRecorder()
 	attributionCode := "campaign=%28not+set%29&content=%28not+set%29&medium=organic&source=www.google.com"
@@ -176,10 +175,9 @@ func TestDirectFull(t *testing.T) {
 		BouncerURL = "https://download.mozilla.org/"
 	}()
 
-	svc := &StubService{
-		AttributionCodeValidator: &attributioncode.Validator{},
-		Handler:                  NewDirectHandler(),
-	}
+	svc := NewStubService(
+		NewDirectHandler(),
+		&attributioncode.Validator{}, nil)
 
 	recorder := httptest.NewRecorder()
 	attributionCode := "campaign=%28not+set%29&content=%28not+set%29&medium=organic&source=www.google.com"
@@ -206,10 +204,9 @@ func TestDirectFull(t *testing.T) {
 }
 
 func TestStubServiceErrorCases(t *testing.T) {
-	svc := &StubService{
-		AttributionCodeValidator: &attributioncode.Validator{},
-		Handler:                  NewDirectHandler(),
-	}
+	svc := NewStubService(
+		NewDirectHandler(),
+		&attributioncode.Validator{}, nil)
 
 	fetchURL := func(url string) *httptest.ResponseRecorder {
 		recorder := httptest.NewRecorder()

stubservice/stubhandlers/stubhandler_test.go

@@ -5,21 +5,37 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/mozilla-services/stubattribution/attributioncode"
+	"github.com/oremj/asyncstatsd"
 )
 
-// StubService serves redirects or modified stubs
-type StubService struct {
+type stubService struct {
 	Handler StubHandler
 
 	AttributionCodeValidator *attributioncode.Validator
+	Statsd                   asyncstatsd.Client
 }
 
-func (s *StubService) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+func NewStubService(stubHandler StubHandler, validator *attributioncode.Validator, statsd asyncstatsd.Client) http.Handler {
+	if statsd == nil {
+		statsd = asyncstatsd.NewNoop()
+	}
+	return &stubService{
+		Handler:                  stubHandler,
+		AttributionCodeValidator: validator,
+		Statsd: statsd,
+	}
+}
+
+func (s *stubService) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	defer s.Statsd.NewTiming().Send("request.time")
+	defer s.Statsd.Increment("request.count")
+
 	query := req.URL.Query()
 
 	redirectBouncer := func() {
 		backupURL := bouncerURL(query.Get("product"), query.Get("lang"), query.Get("os"))
 		http.Redirect(w, req, backupURL, http.StatusFound)
+		defer s.Statsd.Increment("request.error")
 	}
 
 	attributionCode := query.Get("attribution_code")