Add tag support in statsd reporter | Upgrade go-statsd-client

README.md

@@ -65,8 +65,13 @@ import (
 )
 
 func newScope() (tally.Scope, io.Closer) {
-	statter, _ := statsd.NewBufferedClient("127.0.0.1:8125",
-		"stats", 100*time.Millisecond, 1440)
+	statter, err := statsd.NewClientWithConfig(&statsd.ClientConfig{
+		Address:       "127.0.0.1:8125",
+		Prefix:        "stats",
+		FlushInterval: 100 * time.Millisecond,
+		FlushBytes:    1440,
+		TagFormat:     statsd.InfixComma,
+	})
 
 	reporter := tallystatsd.NewReporter(statter, tallystatsd.Options{
 		SampleRate: 1.0,

glide.yaml

@@ -1,7 +1,7 @@
 package: github.com/uber-go/tally
 import:
 - package: github.com/cactus/go-statsd-client
-  version: ~3.1.0
+  version: ^5.0.0
   subpackages:
   - statsd
 - package: github.com/m3db/prometheus_client_golang

statsd/example/statsd_main.go

@@ -21,21 +21,26 @@
 package main
 
 import (
+	"io"
 	"log"
 	"math/rand"
 	"time"
 
+	"github.com/cactus/go-statsd-client/statsd"
 	"github.com/uber-go/tally"
 	statsdreporter "github.com/uber-go/tally/statsd"
-
-	"github.com/cactus/go-statsd-client/statsd"
 )
 
 // To view statsd emitted metrics locally you can use
 // netcat with "nc 8125 -l -u"
 func main() {
-	statter, err := statsd.NewBufferedClient("127.0.0.1:8125",
-		"stats", 100*time.Millisecond, 1440)
+	statter, err := statsd.NewClientWithConfig(&statsd.ClientConfig{
+		Address:       "127.0.0.1:8125",
+		Prefix:        "stats",
+		FlushInterval: 100 * time.Millisecond,
+		FlushBytes:    1440,
+		TagFormat:     statsd.InfixComma,
+	})
 	if err != nil {
 		log.Fatalf("could not create statsd client: %v", err)
 	}
@@ -48,9 +53,15 @@ func main() {
 		Tags:     map[string]string{},
 		Reporter: r,
 	}, 1*time.Second)
-	defer closer.Close()
 
-	counter := scope.Counter("test-counter")
+	defer func(closer io.Closer) {
+		_ = closer.Close()
+	}(closer)
+
+	counter := scope.Tagged(map[string]string{
+		"host": "local",
+		"env":  "dev",
+	}).Counter("test-counter")
 
 	gauge := scope.Gauge("test-gauge")
 

statsd/reporter.go

@@ -26,9 +26,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/uber-go/tally"
-
 	"github.com/cactus/go-statsd-client/statsd"
+	"github.com/uber-go/tally"
 )
 
 const (
@@ -74,15 +73,15 @@ func NewReporter(statsd statsd.Statter, opts Options) tally.StatsReporter {
 }
 
 func (r *cactusStatsReporter) ReportCounter(name string, tags map[string]string, value int64) {
-	r.statter.Inc(name, value, r.sampleRate)
+	r.statter.Inc(name, value, r.sampleRate, getStatsdTagPairs(tags)...)
 }
 
 func (r *cactusStatsReporter) ReportGauge(name string, tags map[string]string, value float64) {
-	r.statter.Gauge(name, int64(value), r.sampleRate)
+	r.statter.Gauge(name, int64(value), r.sampleRate, getStatsdTagPairs(tags)...)
 }
 
 func (r *cactusStatsReporter) ReportTimer(name string, tags map[string]string, interval time.Duration) {
-	r.statter.TimingDuration(name, interval, r.sampleRate)
+	r.statter.TimingDuration(name, interval, r.sampleRate, getStatsdTagPairs(tags)...)
 }
 
 func (r *cactusStatsReporter) ReportHistogramValueSamples(
@@ -97,7 +96,7 @@ func (r *cactusStatsReporter) ReportHistogramValueSamples(
 		fmt.Sprintf("%s.%s-%s", name,
 			r.valueBucketString(bucketLowerBound),
 			r.valueBucketString(bucketUpperBound)),
-		samples, r.sampleRate)
+		samples, r.sampleRate, getStatsdTagPairs(tags)...)
 }
 
 func (r *cactusStatsReporter) ReportHistogramDurationSamples(
@@ -112,7 +111,7 @@ func (r *cactusStatsReporter) ReportHistogramDurationSamples(
 		fmt.Sprintf("%s.%s-%s", name,
 			r.durationBucketString(bucketLowerBound),
 			r.durationBucketString(bucketUpperBound)),
-		samples, r.sampleRate)
+		samples, r.sampleRate, getStatsdTagPairs(tags)...)
 }
 
 func (r *cactusStatsReporter) valueBucketString(
@@ -148,9 +147,17 @@ func (r *cactusStatsReporter) Reporting() bool {
 }
 
 func (r *cactusStatsReporter) Tagging() bool {
-	return false
+	return true
 }
 
 func (r *cactusStatsReporter) Flush() {
 	// no-op
 }
+
+func getStatsdTagPairs(tags map[string]string) []statsd.Tag {
+	tagPairs := make([]statsd.Tag, 0, len(tags))
+	for k, v := range tags {
+		tagPairs = append(tagPairs, statsd.Tag{k, v})
+	}
+	return tagPairs
+}

statsd/reporter_test.go

@@ -29,5 +29,17 @@ import (
 func TestCapabilities(t *testing.T) {
 	r := NewReporter(nil, Options{})
 	assert.True(t, r.Capabilities().Reporting())
-	assert.False(t, r.Capabilities().Tagging())
+	assert.True(t, r.Capabilities().Tagging())
+}
+
+func TestGetStatsdTagPairs(t *testing.T) {
+	tags := map[string]string{
+		"K1": "V1",
+		"K2": "V2",
+	}
+	tagPairs := getStatsdTagPairs(tags)
+	assert.Equal(t, "K1", tagPairs[0][0])
+	assert.Equal(t, "V1", tagPairs[0][1])
+	assert.Equal(t, "K2", tagPairs[1][0])
+	assert.Equal(t, "V2", tagPairs[1][1])
 }