dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Return Accumulator interface from NewAccumulator

This commit is contained in:
Daniel Nelson 2018-01-26 11:39:58 -08:00
parent c17427631d
commit efb9d5b4cb
No known key found for this signature in database
GPG Key ID: CAAD59C9444F6155
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/accumulator.go
View File

@ -26,7 +26,7 @@ type MetricMaker interface {
func NewAccumulator( func NewAccumulator(
maker MetricMaker, maker MetricMaker,
metrics chan telegraf.Metric, metrics chan telegraf.Metric,
) *accumulator { ) telegraf.Accumulator {
acc := accumulator{ acc := accumulator{
maker: maker, maker: maker,
metrics: metrics, metrics: metrics,

26
agent/accumulator_test.go
View File

@ -115,15 +115,15 @@ func TestAddNoIntervalWithPrecision(t *testing.T) {
map[string]interface{}{"value": float64(101)}, map[string]interface{}{"value": float64(101)},
map[string]string{"acc": "test"}, now) map[string]string{"acc": "test"}, now)
testm := <-a.metrics testm := <-metrics
actual := testm.String() actual := testm.String()
assert.Contains(t, actual, "acctest value=101") assert.Contains(t, actual, "acctest value=101")
testm = <-a.metrics testm = <-metrics
actual = testm.String() actual = testm.String()
assert.Contains(t, actual, "acctest,acc=test value=101") assert.Contains(t, actual, "acctest,acc=test value=101")
testm = <-a.metrics testm = <-metrics
actual = testm.String() actual = testm.String()
assert.Equal(t, assert.Equal(t,
fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)), fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
@ -147,15 +147,15 @@ func TestAddDisablePrecision(t *testing.T) {
map[string]interface{}{"value": float64(101)}, map[string]interface{}{"value": float64(101)},
map[string]string{"acc": "test"}, now) map[string]string{"acc": "test"}, now)
testm := <-a.metrics testm := <-metrics
actual := testm.String() actual := testm.String()
assert.Contains(t, actual, "acctest value=101") assert.Contains(t, actual, "acctest value=101")
testm = <-a.metrics testm = <-metrics
actual = testm.String() actual = testm.String()
assert.Contains(t, actual, "acctest,acc=test value=101") assert.Contains(t, actual, "acctest,acc=test value=101")
testm = <-a.metrics testm = <-metrics
actual = testm.String() actual = testm.String()
assert.Equal(t, assert.Equal(t,
fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)), fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)),
@ -179,15 +179,15 @@ func TestAddNoPrecisionWithInterval(t *testing.T) {
map[string]interface{}{"value": float64(101)}, map[string]interface{}{"value": float64(101)},
map[string]string{"acc": "test"}, now) map[string]string{"acc": "test"}, now)
testm := <-a.metrics testm := <-metrics
actual := testm.String() actual := testm.String()
assert.Contains(t, actual, "acctest value=101") assert.Contains(t, actual, "acctest value=101")
testm = <-a.metrics testm = <-metrics
actual = testm.String() actual = testm.String()
assert.Contains(t, actual, "acctest,acc=test value=101") assert.Contains(t, actual, "acctest,acc=test value=101")
testm = <-a.metrics testm = <-metrics
actual = testm.String() actual = testm.String()
assert.Equal(t, assert.Equal(t,
fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)), fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
@ -204,7 +204,7 @@ func TestDifferentPrecisions(t *testing.T) {
a.AddFields("acctest", a.AddFields("acctest",
map[string]interface{}{"value": float64(101)}, map[string]interface{}{"value": float64(101)},
map[string]string{"acc": "test"}, now) map[string]string{"acc": "test"}, now)
testm := <-a.metrics testm := <-metrics
actual := testm.String() actual := testm.String()
assert.Equal(t, assert.Equal(t,
fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)), fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
@ -214,7 +214,7 @@ func TestDifferentPrecisions(t *testing.T) {
a.AddFields("acctest", a.AddFields("acctest",
map[string]interface{}{"value": float64(101)}, map[string]interface{}{"value": float64(101)},
map[string]string{"acc": "test"}, now) map[string]string{"acc": "test"}, now)
testm = <-a.metrics testm = <-metrics
actual = testm.String() actual = testm.String()
assert.Equal(t, assert.Equal(t,
fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800083000000)), fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800083000000)),
@ -224,7 +224,7 @@ func TestDifferentPrecisions(t *testing.T) {
a.AddFields("acctest", a.AddFields("acctest",
map[string]interface{}{"value": float64(101)}, map[string]interface{}{"value": float64(101)},
map[string]string{"acc": "test"}, now) map[string]string{"acc": "test"}, now)
testm = <-a.metrics testm = <-metrics
actual = testm.String() actual = testm.String()
assert.Equal(t, assert.Equal(t,
fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082913000)), fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082913000)),
@ -234,7 +234,7 @@ func TestDifferentPrecisions(t *testing.T) {
a.AddFields("acctest", a.AddFields("acctest",
map[string]interface{}{"value": float64(101)}, map[string]interface{}{"value": float64(101)},
map[string]string{"acc": "test"}, now) map[string]string{"acc": "test"}, now)
testm = <-a.metrics testm = <-metrics
actual = testm.String() actual = testm.String()
assert.Equal(t, assert.Equal(t,
fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)), fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)),

2
agent/agent.go
View File

@ -143,7 +143,7 @@ func (a *Agent) gatherer(
func gatherWithTimeout( func gatherWithTimeout(
shutdown chan struct{}, shutdown chan struct{},
input *models.RunningInput, input *models.RunningInput,
acc *accumulator, acc telegraf.Accumulator,
timeout time.Duration, timeout time.Duration,
) { ) {
ticker := time.NewTicker(timeout) ticker := time.NewTicker(timeout)