Merge pull request #177 from checkr/zz/add-dd-metrics

Add dd metrics

pkg/entity/flag_snapshot.go

@@ -4,7 +4,10 @@ package entity
 
 import (
 	"encoding/json"
+	"fmt"
 
+	"github.com/checkr/flagr/pkg/config"
+	"github.com/checkr/flagr/pkg/util"
 	"github.com/jinzhu/gorm"
 	"github.com/sirupsen/logrus"
 )
@@ -66,4 +69,21 @@ func SaveFlagSnapshot(db *gorm.DB, flagID uint, updatedBy string) {
 	if err := tx.Commit().Error; err != nil {
 		tx.Rollback()
 	}
+
+	logFlagSnapshotUpdate(flagID, updatedBy)
+}
+
+var logFlagSnapshotUpdate = func(flagID uint, updatedBy string) {
+	if config.Global.StatsdClient == nil {
+		return
+	}
+
+	config.Global.StatsdClient.Incr(
+		"flag.snapshot.updated",
+		[]string{
+			fmt.Sprintf("FlagID:%d", flagID),
+			fmt.Sprintf("UpdatedBy:%s", util.SafeStringWithDefault(updatedBy, "null")),
+		},
+		float64(1),
+	)
 }

pkg/handler/eval.go

@@ -169,13 +169,34 @@ var logEvalResult = func(r *models.EvalResult, dataRecordsEnabled bool) {
 		rateLimitPerFlagConsoleLogging(r)
 	}
 
+	logEvalResultToDatadog(r)
+
 	if !config.Config.RecorderEnabled || !dataRecordsEnabled {
 		return
 	}
 	rec := GetDataRecorder()
 	rec.AsyncRecord(r)
 }
 
+var logEvalResultToDatadog = func(r *models.EvalResult) {
+	if config.Global.StatsdClient == nil {
+		return
+	}
+
+	config.Global.StatsdClient.Incr(
+		"evaluation",
+		[]string{
+			fmt.Sprintf("EntityType:%s", util.SafeStringWithDefault(r.EvalContext.EntityType, "null")),
+			fmt.Sprintf("FlagID:%d", util.SafeUint(r.FlagID)),
+			fmt.Sprintf("FlagSnapshotID:%d", util.SafeUint(r.FlagSnapshotID)),
+			fmt.Sprintf("SegmentID:%d", util.SafeUint(r.SegmentID)),
+			fmt.Sprintf("VariantID:%d", util.SafeUint(r.VariantID)),
+			fmt.Sprintf("VariantKey:%s", util.SafeStringWithDefault(r.VariantKey, "null")),
+		},
+		float64(1),
+	)
+}
+
 var evalSegment = func(
 	flagID uint,
 	evalContext models.EvalContext,

pkg/util/util.go

@@ -34,6 +34,16 @@ func NewSecureRandomKey() string {
 	return randomKeyPrefix + uniuri.NewLenChars(uniuri.StdLen, randomKeyCharset)
 }
 
+// SafeStringWithDefault parse an interface to string
+// and set it to default value if it's empty
+func SafeStringWithDefault(s interface{}, deft string) (ret string) {
+	ret = SafeString(s)
+	if ret == "" {
+		ret = deft
+	}
+	return ret
+}
+
 // SafeString safely cast to string
 func SafeString(s interface{}) (ret string) {
 	return cast.ToString(s)

pkg/util/util_test.go

@@ -17,6 +17,18 @@ func TestSafeString(t *testing.T) {
 	assert.Equal(t, SafeString(ptr), "")
 }
 
+func TestSafeStringWithDefault(t *testing.T) {
+	assert.Equal(t, SafeStringWithDefault("123", ""), "123")
+	assert.Equal(t, SafeStringWithDefault(StringPtr("123"), ""), "123")
+	assert.Equal(t, SafeStringWithDefault(123, ""), "123")
+	assert.Equal(t, SafeStringWithDefault(nil, ""), "")
+
+	assert.Equal(t, SafeStringWithDefault("123", "<nil>"), "123")
+	assert.Equal(t, SafeStringWithDefault(StringPtr("123"), "<nil>"), "123")
+	assert.Equal(t, SafeStringWithDefault(123, "<nil>"), "123")
+	assert.Equal(t, SafeStringWithDefault(nil, "<nil>"), "<nil>")
+}
+
 func TestSafeUint(t *testing.T) {
 	assert.Equal(t, SafeUint(nil), uint(0))
 	assert.Equal(t, SafeUint("123"), uint(123))