extensions/statsd -> dogstatsd

config/test.yaml

@@ -11,9 +11,6 @@ extensions:
   redis:
     url: redis://localhost:6333
     connectionTimeout: 200
-  statsd:
-    host: "0.0.0.0:8125"
-    prefix: "test"
 watcher:
   autoScalingPeriod: 10
   lockKey: "maestro-lock-key"
@@ -26,8 +23,9 @@ worker:
   retrieveFreePortsPeriod: 3600
   getLocksTimeout: 300
 reporters:
-  statsd:
-    name: "datadog"
+  dogstatsd:
+    host: "0.0.0.0:8125"
+    prefix: "test"
 scaleUpTimeoutSeconds: 300
 scaleDownTimeoutSeconds: 300
 deleteTimeoutSeconds: 150

metadata/version.go

@@ -11,4 +11,4 @@ package metadata
 var Version = "3.7.4"
 
 //KubeVersion is the desired Kubernetes version
-var KubeVersion = "v1.7.0"
+var KubeVersion = "v1.7.5"

reporters/reporter.go

@@ -39,8 +39,8 @@ func (r *Reporters) Report(str string) error {
 }
 
 func MakeReporters(config *viper.Viper, logger *logrus.Logger) {
-	if config.IsSet("reporters.statsd") {
-		MakeStatsD(config, logger)
+	if config.IsSet("reporters.dogstatsd") {
+		MakeDogStatsD(config, logger)
 	}
 }
 

reporters/reporter_test.go

@@ -19,6 +19,7 @@ var _ = Describe("Reporters", func() {
 		for _, mr := range mrs {
 			mr.EXPECT().Report("report")
 		}
+		reporters.MakeDogStatsD(config, logger)
 
 		singleton.Report("report")
 	})
@@ -31,7 +32,7 @@ var _ = Describe("Reporters", func() {
 		It("must create a reporter for every key in config.reporters", func() {
 			reporters.MakeReporters(config, logger)
 			singleton := reporters.GetInstance()
-			_, prs := singleton.GetReporter("datadog")
+			_, prs := singleton.GetReporter("dogstatsd")
 			Expect(prs).To(Equal(true))
 		})
 	})

reporters/statsd.go

@@ -9,35 +9,35 @@ package reporters
 
 import (
 	"github.com/Sirupsen/logrus"
+	"github.com/ooyala/go-dogstatsd"
 	"github.com/spf13/viper"
-	"github.com/topfreegames/extensions/statsd"
 )
 
-type StatsD struct {
-	client *statsd.StatsD
+type DogStatsD struct {
+	client *dogstatsd.Client
 }
 
-func (d *StatsD) Report(str string) error {
-	d.client.Increment(str)
-	d.client.Flush()
+func (d *DogStatsD) Report(str string) error {
+	d.client.Count(str, 1, []string{}, 1)
 	return nil
 }
 
-func MakeStatsD(config *viper.Viper, logger *logrus.Logger) {
+func MakeDogStatsD(config *viper.Viper, logger *logrus.Logger) {
 	r := GetInstance()
-	statsdR, err := NewStatsD(config, logger)
-	name := config.GetString("reporters.statsd.name")
+	dogstatsdR, err := NewDogStatsD(config, logger)
 
 	if err == nil {
-		r.SetReporter(name, statsdR)
+		r.SetReporter("dogstatsd", dogstatsdR)
 	}
 }
 
-func NewStatsD(config *viper.Viper, logger *logrus.Logger) (*StatsD, error) {
-	client, err := statsd.NewStatsD(config, logger)
+func NewDogStatsD(config *viper.Viper, logger *logrus.Logger) (*DogStatsD, error) {
+	// handle non-existent host
+	host := config.GetString("reporters.dogstatsd.host")
+	c, err := dogstatsd.New(host)
 	if err != nil {
 		return nil, err
 	}
-	statsdR := &StatsD{client: client}
-	return statsdR, nil
+	dogstatsdR := &DogStatsD{client: c}
+	return dogstatsdR, nil
 }