Add MetricName as command line flag, refactor the Dogstatsd function to be more useful.

darron · darron · commit 50c08e6fb6a6 · 2015-11-28T18:49:56.000-07:00
diff --git a/commands/dogstatsd.go b/commands/dogstatsd.go
@@ -6,23 +6,27 @@ import (
 	"time"
 )
 
-func makeTags(event, exec, ltime string) []string {
-	tags := make([]string, 3)
-	eventTag := fmt.Sprintf("event:%s", event)
+func makeTags(exec, watchType, watchId, id string) []string {
+	tags := make([]string, 4)
 	execTag := fmt.Sprintf("exec:%s", exec)
-	lTimeTag := fmt.Sprintf("ltime:%s", ltime)
-	tags = append(tags, eventTag)
+	watchTypeTag := fmt.Sprintf("watchtype:%s", watchType)
+	watchIdTag := fmt.Sprintf("watchid:%s", watchId)
+	idTag := fmt.Sprintf("id:%s", id)
 	tags = append(tags, execTag)
-	tags = append(tags, lTimeTag)
+	tags = append(tags, watchTypeTag)
+	tags = append(tags, watchIdTag)
+	tags = append(tags, idTag)
 	return tags
 }
 
-func StatsdRunTime(start time.Time, event string, exec string, ltime int64) {
-	elapsed := time.Since(start)
-	milliseconds := int64(elapsed / time.Millisecond)
-	Log(fmt.Sprintf("dogstatsd='true' event='%s' exec='%s' ltime='%d' elapsed='%s'", event, exec, ltime, elapsed), "info")
-	statsd, _ := godspeed.NewDefault()
-	defer statsd.Conn.Close()
-	tags := makeTags(event, exec, string(ltime))
-	statsd.Gauge("sifter.time", float64(milliseconds), tags)
+func StatsdRunTime(start time.Time, exec string, watchType string, watchId string, id string) {
+	if DogStatsd {
+		elapsed := time.Since(start)
+		milliseconds := int64(elapsed / time.Millisecond)
+		Log(fmt.Sprintf("dogstatsd='true' %s='%s' exec='%s' id='%s' elapsed='%s'", watchType, watchId, exec, id, elapsed), "info")
+		statsd, _ := godspeed.NewDefault()
+		defer statsd.Conn.Close()
+		tags := makeTags(exec, watchType, watchId, id)
+		statsd.Gauge(MetricName, float64(milliseconds), tags)
+	}
 }
diff --git a/commands/event.go b/commands/event.go
@@ -41,9 +41,7 @@ func startEvent(cmd *cobra.Command, args []string) {
 			Set(c, ConsulKey, lTimeString)
 			runCommand(Exec, Payload)
 			RunTime(start, "complete", fmt.Sprintf("watch='event' exec='%s' ltime='%d'", Exec, lTime))
-			if DogStatsd {
-				StatsdRunTime(start, EventName, Exec, lTime)
-			}
+			StatsdRunTime(start, Exec, "event", EventName, strconv.FormatInt(lTime, 10))
 		} else {
 			RunTime(start, "duplicate", fmt.Sprintf("watch='event' exec='%s' ltime='%d'", Exec, lTime))
 		}
diff --git a/commands/key.go b/commands/key.go
@@ -37,6 +37,7 @@ func startKey(cmd *cobra.Command, args []string) {
 			Set(c, url, shaValue)
 			runCommand(Exec, "")
 			RunTime(start, "complete", fmt.Sprintf("watch='key' exec='%s' sha='%s'", Exec, shaValue))
+			StatsdRunTime(start, Exec, "key", d.getKey(), shaValue)
 		} else {
 			RunTime(start, "duplicate", fmt.Sprintf("watch='key' exec='%s' sha='%s'", Exec, shaValue))
 		}
@@ -92,6 +93,11 @@ func (c *ConsulKey) getSHA() string {
 	return sha
 }
 
+func (c *ConsulKey) getKey() string {
+	keyName := c.Key
+	return keyName
+}
+
 func init() {
 	RootCmd.AddCommand(keyCmd)
 }
diff --git a/commands/root.go b/commands/root.go
@@ -15,15 +15,17 @@ var RootCmd = &cobra.Command{
 }
 
 var (
-	Exec      string
-	Token     string
-	DogStatsd bool
-	Prefix    string
+	Exec       string
+	Token      string
+	DogStatsd  bool
+	Prefix     string
+	MetricName string
 )
 
 func init() {
 	RootCmd.PersistentFlags().StringVarP(&Exec, "exec", "e", "", "Execute this command if a new event is present.")
 	RootCmd.PersistentFlags().StringVarP(&Prefix, "prefix", "p", "sifter", "Consul prefix for saved state.")
 	RootCmd.PersistentFlags().StringVarP(&Token, "token", "t", "anonymous", "Token for Consul access")
+	RootCmd.PersistentFlags().StringVarP(&MetricName, "metric", "m", "sifter.time", "Metric name for dogstatsd.")
 	RootCmd.PersistentFlags().BoolVarP(&DogStatsd, "dogstatsd", "d", false, "send metrics to dogstatsd")
 }

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ func startKey(cmd *cobra.Command, args []string) {`
`37`	`37`	`Set(c, url, shaValue)`
`38`	`38`	`runCommand(Exec, "")`
`39`	`39`	`RunTime(start, "complete", fmt.Sprintf("watch='key' exec='%s' sha='%s'", Exec, shaValue))`
	`40`	`+ StatsdRunTime(start, Exec, "key", d.getKey(), shaValue)`
`40`	`41`	`} else {`
`41`	`42`	`RunTime(start, "duplicate", fmt.Sprintf("watch='key' exec='%s' sha='%s'", Exec, shaValue))`
`42`	`43`	`}`
`@@ -92,6 +93,11 @@ func (c *ConsulKey) getSHA() string {`
`92`	`93`	`return sha`
`93`	`94`	`}`
`94`	`95`
	`96`	`+func (c *ConsulKey) getKey() string {`
	`97`	`+ keyName := c.Key`
	`98`	`+ return keyName`
	`99`	`+}`
	`100`	`+`
`95`	`101`	`func init() {`
`96`	`102`	`RootCmd.AddCommand(keyCmd)`
`97`	`103`	`}`