event pod -> gru. opts

config/test.yaml

@@ -25,7 +25,7 @@ worker:
 reporters:
   dogstatsd:
     host: "0.0.0.0:8125"
-    prefix: "test"
+    prefix: "test."
 scaleUpTimeoutSeconds: 300
 scaleDownTimeoutSeconds: 300
 deleteTimeoutSeconds: 150

models/pod.go

@@ -9,7 +9,6 @@ package models
 
 import (
 	"bytes"
-	"fmt"
 	"strings"
 	"text/template"
 
@@ -149,7 +148,10 @@ func NewPod(
 	err := pod.configureHostPorts(clientset, redisClient)
 
 	if err == nil {
-		reporters.GetInstance().Report(fmt.Sprintf("pod.new.%s", namespace))
+		reporters.GetInstance().Report("gru.new", map[string]string{
+			"name":      game,
+			"scheduler": namespace,
+		})
 	}
 
 	return pod, err
@@ -208,7 +210,10 @@ func (p *Pod) Delete(clientset kubernetes.Interface, redisClient redisinterfaces
 		//TODO: try again?
 	}
 	if err == nil {
-		reporters.GetInstance().Report(fmt.Sprintf("pod.delete.%s", p.Namespace))
+		reporters.GetInstance().Report("gru.delete", map[string]string{
+			"name":      p.Game,
+			"scheduler": p.Namespace,
+		})
 	}
 
 	return nil

models/pod_test.go

@@ -36,7 +36,10 @@ var _ = Describe("Pod", func() {
 	)
 
 	createPod := func() (*models.Pod, error) {
-		mr.EXPECT().Report("pod.new.pong-free-for-all")
+		mr.EXPECT().Report("gru.new", map[string]string{
+			"name":      "pong",
+			"scheduler": "pong-free-for-all",
+		})
 
 		pod, err := models.NewPod(
 			game,
@@ -129,11 +132,11 @@ var _ = Describe("Pod", func() {
 		})
 
 		Describe("Calling Reporters' singleton instance", func() {
-			It("should report pod.new on models.NewPod()", func() {
+			It("should report gru.new on models.NewPod()", func() {
 				createPod()
 			})
 
-			It("should report pod.delete on pod.Delete()", func() {
+			It("should report gru.delete on pod.Delete()", func() {
 				mockRedisClient.EXPECT().TxPipeline().Return(mockPipeline)
 				mockPipeline.EXPECT().SAdd(models.FreePortsRedisKey(), 5000)
 				mockPipeline.EXPECT().SAdd(models.FreePortsRedisKey(), 5001)
@@ -144,7 +147,10 @@ var _ = Describe("Pod", func() {
 				_, err = pod.Create(clientset)
 				Expect(err).NotTo(HaveOccurred())
 
-				mr.EXPECT().Report("pod.delete.pong-free-for-all")
+				mr.EXPECT().Report("gru.delete", map[string]string{
+					"name":      "pong",
+					"scheduler": "pong-free-for-all",
+				})
 				err = pod.Delete(clientset, mockRedisClient)
 				Expect(err).NotTo(HaveOccurred())
 			})
@@ -212,7 +218,10 @@ var _ = Describe("Pod", func() {
 		})
 
 		It("should create pod without requests and limits", func() {
-			mr.EXPECT().Report("pod.new.pong-free-for-all")
+			mr.EXPECT().Report("gru.new", map[string]string{
+				"name":      "pong",
+				"scheduler": "pong-free-for-all",
+			})
 			pod, err := models.NewPod(
 				game,
 				image,
@@ -340,7 +349,10 @@ var _ = Describe("Pod", func() {
 			_, err = pod.Create(clientset)
 			Expect(err).NotTo(HaveOccurred())
 
-			mr.EXPECT().Report("pod.delete.pong-free-for-all")
+			mr.EXPECT().Report("gru.delete", map[string]string{
+				"name":      "pong",
+				"scheduler": "pong-free-for-all",
+			})
 			err = pod.Delete(clientset, mockRedisClient)
 			Expect(err).NotTo(HaveOccurred())
 		})

models/room_test.go

@@ -272,7 +272,10 @@ var _ = Describe("Room", func() {
 				Return(goredis.NewStringResult("5001", nil))
 			mockPipeline.EXPECT().Exec()
 
-			mr.EXPECT().Report("pod.new.pong-free-for-all")
+			mr.EXPECT().Report("gru.new", map[string]string{
+				"name":      "pong",
+				"scheduler": "pong-free-for-all",
+			})
 			pod, err := models.NewPod(
 				game,
 				image,

reporters/reporter_test.go

@@ -16,12 +16,14 @@ import (
 
 var _ = Describe("Reporters", func() {
 	It("Reporters.Report() must call Report on all children", func() {
+		opts := map[string]string{"game": "pong"}
+
 		for _, mr := range mrs {
-			mr.EXPECT().Report("report", map[string]string{})
+			mr.EXPECT().Report("report", opts)
 		}
 		reporters.MakeDogStatsD(config, logger)
 
-		singleton.Report("report", map[string]string{})
+		singleton.Report("report", opts)
 	})
 
 	It("Reporters must be Singleton", func() {

reporters/statsd.go

@@ -17,8 +17,19 @@ type DogStatsD struct {
 	client *dogstatsd.Client
 }
 
+func appendTag(key string, tags []string, opts map[string]string) []string {
+	tag, prs := opts[key]
+	if prs {
+		return append(tags, tag)
+	}
+	return tags
+}
+
 func (d *DogStatsD) Report(event string, opts map[string]string) error {
-	d.client.Count(event, 1, []string{}, 1)
+	var tags []string
+	tags = appendTag("game", tags, opts)
+	tags = appendTag("scheduler", tags, opts)
+	d.client.Count(event, 1, tags, 1)
 	return nil
 }
 
@@ -38,6 +49,8 @@ func NewDogStatsD(config *viper.Viper, logger *logrus.Logger) (*DogStatsD, error
 	if err != nil {
 		return nil, err
 	}
+	prefix := config.GetString("reporters.dogstatsd.prefix")
+	c.Namespace = prefix
 	dogstatsdR := &DogStatsD{client: c}
 	return dogstatsdR, nil
 }