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

Fix race condition in logparser tests (#6825)

This commit is contained in:
Daniel Nelson 2020-01-02 16:14:32 -08:00 committed by GitHub
parent a5ef34f6e2
commit 25e1636775
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
plugins/inputs/logparser/logparser_test.go
View File

@ -6,10 +6,12 @@ import (
"runtime" "runtime"
"strings" "strings"
"testing" "testing"
"time"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/testutil" "github.com/influxdata/telegraf/testutil"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
) )
func TestStartNoParsers(t *testing.T) { func TestStartNoParsers(t *testing.T) {
@ -56,32 +58,56 @@ func TestGrokParseLogFiles(t *testing.T) {
} }
acc := testutil.Accumulator{} acc := testutil.Accumulator{}
assert.NoError(t, logparser.Start(&acc)) require.NoError(t, logparser.Start(&acc))
acc.Wait(2) acc.Wait(3)
logparser.Stop() logparser.Stop()
acc.AssertContainsTaggedFields(t, "logparser_grok", expected := []telegraf.Metric{
map[string]interface{}{ testutil.MustMetric(
"clientip": "192.168.1.1", "logparser_grok",
"myfloat": float64(1.25), map[string]string{
"response_time": int64(5432), "response_code": "200",
"myint": int64(101), "path": thisdir + "testdata/test_a.log",
}, },
map[string]string{ map[string]interface{}{
"response_code": "200", "clientip": "192.168.1.1",
"path": thisdir + "testdata/test_a.log", "myfloat": float64(1.25),
}) "response_time": int64(5432),
"myint": int64(101),
},
time.Unix(0, 0),
),
testutil.MustMetric(
"logparser_grok",
map[string]string{
"path": thisdir + "testdata/test_b.log",
},
map[string]interface{}{
"myfloat": 1.25,
"mystring": "mystring",
"nomodifier": "nomodifier",
},
time.Unix(0, 0),
),
testutil.MustMetric(
"logparser_grok",
map[string]string{
"path": thisdir + "testdata/test_c.log",
"response_code": "200",
},
map[string]interface{}{
"clientip": "192.168.1.1",
"myfloat": 1.25,
"myint": 101,
"response_time": 5432,
},
time.Unix(0, 0),
),
}
acc.AssertContainsTaggedFields(t, "logparser_grok", testutil.RequireMetricsEqual(t, expected, acc.GetTelegrafMetrics(),
map[string]interface{}{ testutil.IgnoreTime(), testutil.SortMetrics())
"myfloat": 1.25,
"mystring": "mystring",
"nomodifier": "nomodifier",
},
map[string]string{
"path": thisdir + "testdata/test_b.log",
})
} }
func TestGrokParseLogFilesAppearLater(t *testing.T) { func TestGrokParseLogFilesAppearLater(t *testing.T) {