use program name as prefix in default engine

segmentio · Nov 28, 2016 · e15f6b9 · e15f6b9
1 parent c560eb1
commit e15f6b9
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 48 deletions.
diff --git a/datadog/server_test.go b/datadog/server_test.go
@@ -19,13 +19,13 @@ func TestServer(t *testing.T) {
 
 	addr, closer := startTestServer(t, HandlerFunc(func(m stats.Metric, _ net.Addr) {
 		switch m.Name {
-		case "test.A":
+		case "datadog.test.A":
 			atomic.AddUint32(&a, uint32(m.Value))
 
-		case "test.B":
+		case "datadog.test.B":
 			atomic.AddUint32(&b, uint32(m.Value))
 
-		case "test.C":
+		case "datadog.test.C":
 			atomic.AddUint32(&c, uint32(m.Value))
 		}
 	}))
@@ -38,30 +38,30 @@ func TestServer(t *testing.T) {
 	})
 	defer client.Close()
 
-	ma := stats.MakeCounter(engine, "test.A")
+	ma := stats.MakeCounter(engine, "A")
 	ma.Incr()
 
-	mb := stats.MakeCounter(engine, "test.B")
+	mb := stats.MakeCounter(engine, "B")
 	mb.Incr()
 	mb.Incr()
 
-	mc := stats.MakeCounter(engine, "test.C")
+	mc := stats.MakeCounter(engine, "C")
 	mc.Incr()
 	mc.Incr()
 	mc.Incr()
 
 	time.Sleep(10 * time.Millisecond)
 
 	if atomic.LoadUint32(&a) != 1 {
-		t.Error("test.A not reported")
+		t.Error("datadog.test.A not reported")
 	}
 
 	if atomic.LoadUint32(&b) != 2 {
-		t.Error("test.B not reported")
+		t.Error("datadog.test.B not reported")
 	}
 
 	if atomic.LoadUint32(&c) != 3 {
-		t.Error("test.C not reported")
+		t.Error("datadog.test.C not reported")
 	}
 }
 

diff --git a/engine.go b/engine.go
@@ -1,6 +1,8 @@
 package stats
 
 import (
+	"os"
+	"path/filepath"
 	"runtime"
 	"sync"
 	"time"
@@ -84,7 +86,7 @@ func Time(name string, start time.Time, tags ...Tag) *Clock {
 
 // NewDefaultEngine creates and returns an engine configured with default settings.
 func NewDefaultEngine() *Engine {
-	return NewEngine(EngineConfig{})
+	return NewEngine(EngineConfig{Prefix: progname()})
 }
 
 // NewEngine creates and returns an engine configured with config.
@@ -229,3 +231,10 @@ func runEngine(e engine) {
 		}
 	}
 }
+
+func progname() (name string) {
+	if args := os.Args; len(args) != 0 {
+		name = filepath.Base(args[0])
+	}
+	return
+}
diff --git a/netstats/conn_test.go b/netstats/conn_test.go
@@ -33,50 +33,50 @@ func TestConn(t *testing.T) {
 	expects := []stats.Metric{
 		stats.Metric{
 			Type:   stats.CounterType,
-			Key:    "conn.bytes.count?operation=read&protocol=tcp",
-			Name:   "conn.bytes.count",
+			Key:    "netstats.test.conn.bytes.count?operation=read&protocol=tcp",
+			Name:   "netstats.test.conn.bytes.count",
 			Tags:   []stats.Tag{{"operation", "read"}, {"protocol", "tcp"}},
 			Value:  12,
 			Sample: 1,
 		},
 		stats.Metric{
 			Type:   stats.CounterType,
-			Key:    "conn.bytes.count?operation=write&protocol=tcp",
-			Name:   "conn.bytes.count",
+			Key:    "netstats.test.conn.bytes.count?operation=write&protocol=tcp",
+			Name:   "netstats.test.conn.bytes.count",
 			Tags:   []stats.Tag{{"operation", "write"}, {"protocol", "tcp"}},
 			Value:  12,
 			Sample: 1,
 		},
 		stats.Metric{
 			Type:   stats.CounterType,
-			Key:    "conn.close.count?protocol=tcp",
-			Name:   "conn.close.count",
+			Key:    "netstats.test.conn.close.count?protocol=tcp",
+			Name:   "netstats.test.conn.close.count",
 			Tags:   []stats.Tag{{"protocol", "tcp"}},
 			Value:  1,
 			Sample: 1,
 		},
 		stats.Metric{
 			Type:   stats.HistogramType,
-			Group:  "conn.iops?operation=read&protocol=tcp",
-			Key:    "conn.iops?operation=read&protocol=tcp#0",
-			Name:   "conn.iops",
+			Group:  "netstats.test.conn.iops?operation=read&protocol=tcp",
+			Key:    "netstats.test.conn.iops?operation=read&protocol=tcp#0",
+			Name:   "netstats.test.conn.iops",
 			Tags:   []stats.Tag{{"operation", "read"}, {"protocol", "tcp"}},
 			Value:  12,
 			Sample: 1,
 		},
 		stats.Metric{
 			Type:   stats.HistogramType,
-			Group:  "conn.iops?operation=write&protocol=tcp",
-			Key:    "conn.iops?operation=write&protocol=tcp#0",
-			Name:   "conn.iops",
+			Group:  "netstats.test.conn.iops?operation=write&protocol=tcp",
+			Key:    "netstats.test.conn.iops?operation=write&protocol=tcp#0",
+			Name:   "netstats.test.conn.iops",
 			Tags:   []stats.Tag{{"operation", "write"}, {"protocol", "tcp"}},
 			Value:  12,
 			Sample: 1,
 		},
 		stats.Metric{
 			Type:   stats.CounterType,
-			Key:    "conn.open.count?protocol=tcp",
-			Name:   "conn.open.count",
+			Key:    "netstats.test.conn.open.count?protocol=tcp",
+			Name:   "netstats.test.conn.open.count",
 			Tags:   []stats.Tag{{"protocol", "tcp"}},
 			Value:  1,
 			Sample: 1,
@@ -128,64 +128,64 @@ func TestConnError(t *testing.T) {
 	expects := []stats.Metric{
 		stats.Metric{
 			Type:   stats.CounterType,
-			Key:    "conn.close.count?protocol=tcp",
-			Name:   "conn.close.count",
+			Key:    "netstats.test.conn.close.count?protocol=tcp",
+			Name:   "netstats.test.conn.close.count",
 			Tags:   []stats.Tag{{"protocol", "tcp"}},
 			Value:  1,
 			Sample: 1,
 		},
 		stats.Metric{
 			Type:   stats.CounterType,
-			Key:    "conn.errors.count?operation=close&protocol=tcp",
-			Name:   "conn.errors.count",
+			Key:    "netstats.test.conn.errors.count?operation=close&protocol=tcp",
+			Name:   "netstats.test.conn.errors.count",
 			Tags:   []stats.Tag{{"operation", "close"}, {"protocol", "tcp"}},
 			Value:  1,
 			Sample: 1,
 		},
 		stats.Metric{
 			Type:   stats.CounterType,
-			Key:    "conn.errors.count?operation=read&protocol=tcp",
-			Name:   "conn.errors.count",
+			Key:    "netstats.test.conn.errors.count?operation=read&protocol=tcp",
+			Name:   "netstats.test.conn.errors.count",
 			Tags:   []stats.Tag{{"operation", "read"}, {"protocol", "tcp"}},
 			Value:  3,
 			Sample: 3,
 		},
 		stats.Metric{
 			Type:   stats.CounterType,
-			Key:    "conn.errors.count?operation=set-read-timeout&protocol=tcp",
-			Name:   "conn.errors.count",
+			Key:    "netstats.test.conn.errors.count?operation=set-read-timeout&protocol=tcp",
+			Name:   "netstats.test.conn.errors.count",
 			Tags:   []stats.Tag{{"operation", "set-read-timeout"}, {"protocol", "tcp"}},
 			Value:  1,
 			Sample: 1,
 		},
 		stats.Metric{
 			Type:   stats.CounterType,
-			Key:    "conn.errors.count?operation=set-timeout&protocol=tcp",
-			Name:   "conn.errors.count",
+			Key:    "netstats.test.conn.errors.count?operation=set-timeout&protocol=tcp",
+			Name:   "netstats.test.conn.errors.count",
 			Tags:   []stats.Tag{{"operation", "set-timeout"}, {"protocol", "tcp"}},
 			Value:  1,
 			Sample: 1,
 		},
 		stats.Metric{
 			Type:   stats.CounterType,
-			Key:    "conn.errors.count?operation=set-write-timeout&protocol=tcp",
-			Name:   "conn.errors.count",
+			Key:    "netstats.test.conn.errors.count?operation=set-write-timeout&protocol=tcp",
+			Name:   "netstats.test.conn.errors.count",
 			Tags:   []stats.Tag{{"operation", "set-write-timeout"}, {"protocol", "tcp"}},
 			Value:  1,
 			Sample: 1,
 		},
 		stats.Metric{
 			Type:   stats.CounterType,
-			Key:    "conn.errors.count?operation=write&protocol=tcp",
-			Name:   "conn.errors.count",
+			Key:    "netstats.test.conn.errors.count?operation=write&protocol=tcp",
+			Name:   "netstats.test.conn.errors.count",
 			Tags:   []stats.Tag{{"operation", "write"}, {"protocol", "tcp"}},
 			Value:  1,
 			Sample: 1,
 		},
 		stats.Metric{
 			Type:   stats.CounterType,
-			Key:    "conn.open.count?protocol=tcp",
-			Name:   "conn.open.count",
+			Key:    "netstats.test.conn.open.count?protocol=tcp",
+			Name:   "netstats.test.conn.open.count",
 			Tags:   []stats.Tag{{"protocol", "tcp"}},
 			Value:  1,
 			Sample: 1,

diff --git a/procstats/go_test.go b/procstats/go_test.go
@@ -28,8 +28,8 @@ func TestGoMetrics(t *testing.T) {
 
 	for _, m := range metrics {
 		switch {
-		case strings.HasPrefix(m.Name, "go.runtime."):
-		case strings.HasPrefix(m.Name, "go.memstats."):
+		case strings.HasPrefix(m.Name, "procstats.test.go.runtime."):
+		case strings.HasPrefix(m.Name, "procstats.test.go.memstats."):
 		default:
 			t.Error("invalid metric name:", m.Name)
 		}
@@ -59,8 +59,8 @@ func TestGoMetricsMock(t *testing.T) {
 
 	for _, m := range metrics {
 		switch {
-		case strings.HasPrefix(m.Name, "go.runtime."):
-		case strings.HasPrefix(m.Name, "go.memstats."):
+		case strings.HasPrefix(m.Name, "procstats.test.go.runtime."):
+		case strings.HasPrefix(m.Name, "procstats.test.go.memstats."):
 		default:
 			t.Error("invalid metric name:", m.Name)
 		}

diff --git a/procstats/proc_test.go b/procstats/proc_test.go
@@ -26,10 +26,10 @@ func TestProcMetrics(t *testing.T) {
 
 	for _, m := range metrics {
 		switch {
-		case strings.HasPrefix(m.Name, "cpu."):
-		case strings.HasPrefix(m.Name, "memory."):
-		case strings.HasPrefix(m.Name, "files."):
-		case strings.HasPrefix(m.Name, "thread."):
+		case strings.HasPrefix(m.Name, "procstats.test.cpu."):
+		case strings.HasPrefix(m.Name, "procstats.test.memory."):
+		case strings.HasPrefix(m.Name, "procstats.test.files."):
+		case strings.HasPrefix(m.Name, "procstats.test.thread."):
 		default:
 			t.Error("invalid metric name:", m.Name)
 		}