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

running output: Drop nil metrics 

fixes #2317
This commit is contained in:
Cameron Sparr 2017-02-01 08:55:22 +00:00
parent 738cbbdbb6
commit e87ce22af9
No known key found for this signature in database
GPG Key ID: 19E67263DCB25D0F
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/models/running_output.go
View File

@ -90,6 +90,9 @@ func NewRunningOutput(
// AddMetric adds a metric to the output. This function can also write cached // AddMetric adds a metric to the output. This function can also write cached
// points if FlushBufferWhenFull is true. // points if FlushBufferWhenFull is true.
func (ro *RunningOutput) AddMetric(m telegraf.Metric) { func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
if m == nil {
return
}
// Filter any tagexclude/taginclude parameters before adding metric // Filter any tagexclude/taginclude parameters before adding metric
if ro.Config.Filter.IsActive() { if ro.Config.Filter.IsActive() {
// In order to filter out tags, we need to create a new metric, since // In order to filter out tags, we need to create a new metric, since

17
internal/models/running_output_test.go
View File

@ -75,6 +75,23 @@ func BenchmarkRunningOutputAddFailWrites(b *testing.B) {
} }
} }
func TestAddingNilMetric(t *testing.T) {
conf := &OutputConfig{
Filter: Filter{},
}
m := &mockOutput{}
ro := NewRunningOutput("test", m, conf, 1000, 10000)
ro.AddMetric(nil)
ro.AddMetric(nil)
ro.AddMetric(nil)
err := ro.Write()
assert.NoError(t, err)
assert.Len(t, m.Metrics(), 0)
}
// Test that NameDrop filters ger properly applied. // Test that NameDrop filters ger properly applied.
func TestRunningOutput_DropFilter(t *testing.T) { func TestRunningOutput_DropFilter(t *testing.T) {
conf := &OutputConfig{ conf := &OutputConfig{