take variadic args for labels

Author: rybit

metriks/metriks.go

@@ -127,8 +127,12 @@ func L(name string, value string) metrics.Label {
 //
 // metriks.Inc("publisher.errors", 1)
 //
-func Inc(name string, val int64) {
-	metrics.IncrCounter([]string{name}, float32(val))
+func Inc(name string, val int64, labels ...metrics.Label) {
+	if len(labels) > 0 {
+		metrics.IncrCounterWithLabels([]string{name}, float32(val), labels)
+	} else {
+		metrics.IncrCounter([]string{name}, float32(val))
+	}
 }
 
 // IncLabels increments a counter with additional labels

metriks/metriks_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/armon/go-metrics"
 	"github.com/armon/go-metrics/datadog"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/nettest"
 )
@@ -69,3 +70,20 @@ func TestInMemorySink(t *testing.T) {
 	require.Equal(t, "test.test_counter", met[0].Counters["test.test_counter"].Name)
 	require.Equal(t, 1, met[0].Counters["test.test_counter"].Count)
 }
+
+func TestIncWithLabels(t *testing.T) {
+	sink, err := InitWithURL("test", "inmem://?interval=1s&retain=2s")
+	require.NoError(t, err)
+	require.IsType(t, &metrics.InmemSink{}, sink)
+
+	Inc("test_counter", 1, L("tag", "value"))
+	met := sink.(*metrics.InmemSink).Data()
+	require.Len(t, met, 1)
+
+	require.Len(t, met[0].Counters, 1)
+	require.Contains(t, met[0].Counters, "test.test_counter;tag=value")
+	incr := met[0].Counters["test.test_counter;tag=value"]
+	assert.Len(t, incr.Labels, 1)
+	assert.Equal(t, "value", incr.Labels[0].Value)
+	assert.Equal(t, "tag", incr.Labels[0].Name)
+}