CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(linters): Fix findings found by testifylint for Windows and enable it. (#14238)

This commit is contained in:
Paweł Żak 2023-11-02 13:40:30 +01:00 committed by GitHub
parent a4603f1e86
commit 7da8956434
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 321 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.golangci.yml
View File

@ -31,6 +31,7 @@ linters:
- sqlclosecheck - sqlclosecheck
- staticcheck - staticcheck
- tenv - tenv
- testifylint
- tparallel - tparallel
- typecheck - typecheck
- unconvert - unconvert
@ -246,6 +247,22 @@ linters-settings:
# Otherwise, only methods that take `*testing.T`, `*testing.B`, and `testing.TB` as arguments are checked. # Otherwise, only methods that take `*testing.T`, `*testing.B`, and `testing.TB` as arguments are checked.
# Default: false # Default: false
all: true all: true
testifylint:
# Enable specific checkers.
# https://github.com/Antonboom/testifylint#checkers
# Default: ["bool-compare", "compares", "empty", "error-is-as", "error-nil", "expected-actual", "float-compare", "len", "require-error", "suite-dont-use-pkg", "suite-extra-assert-call"]
enable:
- bool-compare
- compares
- empty
- error-is-as
- error-nil
- expected-actual
- len
- require-error
- suite-dont-use-pkg
- suite-extra-assert-call
- suite-thelper
run: run:
# timeout for analysis, e.g. 30s, 5m, default is 1m # timeout for analysis, e.g. 30s, 5m, default is 1m

4
cmd/telegraf/main_win_test.go
View File

@ -33,6 +33,6 @@ func TestWindowsFlagsAreSet(t *testing.T) {
require.Equal(t, expectedString, m.serviceName) require.Equal(t, expectedString, m.serviceName)
require.Equal(t, expectedString, m.serviceDisplayName) require.Equal(t, expectedString, m.serviceDisplayName)
require.Equal(t, expectedString, m.serviceRestartDelay) require.Equal(t, expectedString, m.serviceRestartDelay)
require.Equal(t, true, m.serviceAutoRestart) require.True(t, m.serviceAutoRestart)
require.Equal(t, true, m.console) require.True(t, m.console)
} }

2
plugins/inputs/ping/ping_windows_test.go
View File

@ -368,7 +368,7 @@ func TestPingBinary(t *testing.T) {
Urls: []string{"www.google.com"}, Urls: []string{"www.google.com"},
Binary: "ping6", Binary: "ping6",
pingHost: func(binary string, timeout float64, args ...string) (string, error) { pingHost: func(binary string, timeout float64, args ...string) (string, error) {
require.True(t, binary == "ping6") require.Equal(t, "ping6", binary)
return "", nil return "", nil
}, },
} }

6
plugins/inputs/procstat/native_finder_windows_test.go
View File

@ -17,7 +17,7 @@ func TestGather_RealPatternIntegration(t *testing.T) {
pids, err := pg.Pattern(`procstat`) pids, err := pg.Pattern(`procstat`)
require.NoError(t, err) require.NoError(t, err)
fmt.Println(pids) fmt.Println(pids)
require.Equal(t, true, len(pids) > 0) require.NotEmpty(t, pids)
} }
func TestGather_RealFullPatternIntegration(t *testing.T) { func TestGather_RealFullPatternIntegration(t *testing.T) {
@ -29,7 +29,7 @@ func TestGather_RealFullPatternIntegration(t *testing.T) {
pids, err := pg.FullPattern(`%procstat%`) pids, err := pg.FullPattern(`%procstat%`)
require.NoError(t, err) require.NoError(t, err)
fmt.Println(pids) fmt.Println(pids)
require.Equal(t, true, len(pids) > 0) require.NotEmpty(t, pids)
} }
func TestGather_RealUserIntegration(t *testing.T) { func TestGather_RealUserIntegration(t *testing.T) {
@ -43,5 +43,5 @@ func TestGather_RealUserIntegration(t *testing.T) {
pids, err := pg.UID(currentUser.Username) pids, err := pg.UID(currentUser.Username)
require.NoError(t, err) require.NoError(t, err)
fmt.Println(pids) fmt.Println(pids)
require.Equal(t, true, len(pids) > 0) require.NotEmpty(t, pids)
} }

22
plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go
View File

@ -62,28 +62,28 @@ func TestWinPerformanceQueryImplIntegration(t *testing.T) {
fcounter, err := query.GetFormattedCounterValueDouble(hCounter) fcounter, err := query.GetFormattedCounterValueDouble(hCounter)
require.NoError(t, err) require.NoError(t, err)
require.True(t, fcounter > 0) require.Greater(t, fcounter, 0)
rcounter, err := query.GetRawCounterValue(hCounter) rcounter, err := query.GetRawCounterValue(hCounter)
require.NoError(t, err) require.NoError(t, err)
require.True(t, rcounter > 10000000) require.Greater(t, rcounter, 10000000)
now := time.Now() now := time.Now()
mtime, err := query.CollectDataWithTime() mtime, err := query.CollectDataWithTime()
require.NoError(t, err) require.NoError(t, err)
require.True(t, mtime.Sub(now) < time.Second) require.Less(t, mtime.Sub(now), time.Second)
counterPath = "\\Process(*)\\% Processor Time" counterPath = "\\Process(*)\\% Processor Time"
paths, err := query.ExpandWildCardPath(counterPath) paths, err := query.ExpandWildCardPath(counterPath)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, paths) require.NotNil(t, paths)
require.True(t, len(paths) > 1) require.Greater(t, len(paths), 1) //nolint:testifylint // https://github.com/Antonboom/testifylint/issues/6
counterPath = "\\Process(_Total)\\*" counterPath = "\\Process(_Total)\\*"
paths, err = query.ExpandWildCardPath(counterPath) paths, err = query.ExpandWildCardPath(counterPath)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, paths) require.NotNil(t, paths)
require.True(t, len(paths) > 1) require.Greater(t, len(paths), 1) //nolint:testifylint // https://github.com/Antonboom/testifylint/issues/6
require.NoError(t, query.Open()) require.NoError(t, query.Open())
@ -104,11 +104,11 @@ func TestWinPerformanceQueryImplIntegration(t *testing.T) {
farr, err = query.GetFormattedCounterArrayDouble(hCounter) farr, err = query.GetFormattedCounterArrayDouble(hCounter)
} }
require.NoError(t, err) require.NoError(t, err)
require.True(t, len(farr) > 0) require.NotEmpty(t, farr)
rarr, err := query.GetRawCounterArray(hCounter) rarr, err := query.GetRawCounterArray(hCounter)
require.NoError(t, err) require.NoError(t, err)
require.True(t, len(rarr) > 0, "Too") require.NotEmpty(t, rarr, "Too")
require.NoError(t, query.Close()) require.NoError(t, query.Close())
} }
@ -559,7 +559,7 @@ func TestWinPerfCountersCollectRawIntegration(t *testing.T) {
time.Sleep(2000 * time.Millisecond) time.Sleep(2000 * time.Millisecond)
require.NoError(t, m.Gather(&acc)) require.NoError(t, m.Gather(&acc))
require.True(t, len(acc.Metrics) > 1) require.Greater(t, len(acc.Metrics), 1) //nolint:testifylint // https://github.com/Antonboom/testifylint/issues/6
expectedCounter := "Percent_Idle_Time_Raw" expectedCounter := "Percent_Idle_Time_Raw"
for _, metric := range acc.Metrics { for _, metric := range acc.Metrics {
@ -567,7 +567,7 @@ func TestWinPerfCountersCollectRawIntegration(t *testing.T) {
require.True(t, ok, "Expected presence of %s field", expectedCounter) require.True(t, ok, "Expected presence of %s field", expectedCounter)
valInt64, ok := val.(int64) valInt64, ok := val.(int64)
require.True(t, ok, fmt.Sprintf("Expected int64, got %T", val)) require.True(t, ok, fmt.Sprintf("Expected int64, got %T", val))
require.True(t, valInt64 > 0, fmt.Sprintf("Expected > 0, got %d, for %#v", valInt64, metric)) require.Greater(t, valInt64, 0, fmt.Sprintf("Expected > 0, got %d, for %#v", valInt64, metric))
} }
// Test *Array way // Test *Array way
@ -583,13 +583,13 @@ func TestWinPerfCountersCollectRawIntegration(t *testing.T) {
time.Sleep(2000 * time.Millisecond) time.Sleep(2000 * time.Millisecond)
require.NoError(t, m.Gather(&acc2)) require.NoError(t, m.Gather(&acc2))
require.True(t, len(acc2.Metrics) > 1) require.Greater(t, len(acc2.Metrics), 1) //nolint:testifylint // https://github.com/Antonboom/testifylint/issues/6
for _, metric := range acc2.Metrics { for _, metric := range acc2.Metrics {
val, ok := metric.Fields[expectedCounter] val, ok := metric.Fields[expectedCounter]
require.True(t, ok, "Expected presence of %s field", expectedCounter) require.True(t, ok, "Expected presence of %s field", expectedCounter)
valInt64, ok := val.(int64) valInt64, ok := val.(int64)
require.True(t, ok, fmt.Sprintf("Expected int64, got %T", val)) require.True(t, ok, fmt.Sprintf("Expected int64, got %T", val))
require.True(t, valInt64 > 0, fmt.Sprintf("Expected > 0, got %d, for %#v", valInt64, metric)) require.Greater(t, valInt64, 0, fmt.Sprintf("Expected > 0, got %d, for %#v", valInt64, metric))
} }
} }

574
plugins/inputs/win_perf_counters/win_perf_counters_test.go
View File

@ -347,11 +347,11 @@ func TestAddItemSimple(t *testing.T) {
counters, ok := m.hostCounters["localhost"] counters, ok := m.hostCounters["localhost"]
require.True(t, ok) require.True(t, ok)
require.Len(t, counters.counters, 1) require.Len(t, counters.counters, 1)
require.True(t, counters.counters[0].computer == "localhost") require.Equal(t, "localhost", counters.counters[0].computer)
require.True(t, counters.counters[0].objectName == "O") require.Equal(t, "O", counters.counters[0].objectName)
require.True(t, counters.counters[0].instance == "I") require.Equal(t, "I", counters.counters[0].instance)
require.True(t, counters.counters[0].counter == "c") require.Equal(t, "c", counters.counters[0].counter)
require.True(t, counters.counters[0].measurement == "test") require.Equal(t, "test", counters.counters[0].measurement)
require.False(t, counters.counters[0].includeTotal) require.False(t, counters.counters[0].includeTotal)
} }
@ -501,161 +501,161 @@ func TestParseConfigMultiComps(t *testing.T) {
counters, ok := m.hostCounters["localhost"] counters, ok := m.hostCounters["localhost"]
require.True(t, ok) require.True(t, ok)
require.Len(t, counters.counters, 8) require.Len(t, counters.counters, 8)
require.True(t, counters.tag == hostname()) require.Equal(t, counters.tag, hostname())
require.True(t, counters.counters[0].computer == "localhost") require.Equal(t, "localhost", counters.counters[0].computer)
require.True(t, counters.counters[0].objectName == "O") require.Equal(t, "O", counters.counters[0].objectName)
require.True(t, counters.counters[0].instance == "I") require.Equal(t, "I", counters.counters[0].instance)
require.True(t, counters.counters[0].counter == "C") require.Equal(t, "C", counters.counters[0].counter)
require.True(t, counters.counters[0].measurement == "m") require.Equal(t, "m", counters.counters[0].measurement)
require.True(t, !counters.counters[0].includeTotal) require.False(t, counters.counters[0].includeTotal)
require.True(t, counters.counters[1].computer == "localhost") require.Equal(t, "localhost", counters.counters[1].computer)
require.True(t, counters.counters[1].objectName == "O1") require.Equal(t, "O1", counters.counters[1].objectName)
require.True(t, counters.counters[1].instance == "I1") require.Equal(t, "I1", counters.counters[1].instance)
require.True(t, counters.counters[1].counter == "C1") require.Equal(t, "C1", counters.counters[1].counter)
require.True(t, counters.counters[1].measurement == "m") require.Equal(t, "m", counters.counters[1].measurement)
require.True(t, !counters.counters[1].includeTotal) require.False(t, counters.counters[1].includeTotal)
require.True(t, counters.counters[2].computer == "localhost") require.Equal(t, "localhost", counters.counters[2].computer)
require.True(t, counters.counters[2].objectName == "O1") require.Equal(t, "O1", counters.counters[2].objectName)
require.True(t, counters.counters[2].instance == "I2") require.Equal(t, "I2", counters.counters[2].instance)
require.True(t, counters.counters[2].counter == "C1") require.Equal(t, "C1", counters.counters[2].counter)
require.True(t, counters.counters[2].measurement == "m") require.Equal(t, "m", counters.counters[2].measurement)
require.True(t, !counters.counters[2].includeTotal) require.False(t, counters.counters[2].includeTotal)
require.True(t, counters.counters[3].computer == "localhost") require.Equal(t, "localhost", counters.counters[3].computer)
require.True(t, counters.counters[3].objectName == "O1") require.Equal(t, "O1", counters.counters[3].objectName)
require.True(t, counters.counters[3].instance == "I1") require.Equal(t, "I1", counters.counters[3].instance)
require.True(t, counters.counters[3].counter == "C2") require.Equal(t, "C2", counters.counters[3].counter)
require.True(t, counters.counters[3].measurement == "m") require.Equal(t, "m", counters.counters[3].measurement)
require.True(t, !counters.counters[3].includeTotal) require.False(t, counters.counters[3].includeTotal)
require.True(t, counters.counters[4].computer == "localhost") require.Equal(t, "localhost", counters.counters[4].computer)
require.True(t, counters.counters[4].objectName == "O1") require.Equal(t, "O1", counters.counters[4].objectName)
require.True(t, counters.counters[4].instance == "I2") require.Equal(t, "I2", counters.counters[4].instance)
require.True(t, counters.counters[4].counter == "C2") require.Equal(t, "C2", counters.counters[4].counter)
require.True(t, counters.counters[4].measurement == "m") require.Equal(t, "m", counters.counters[4].measurement)
require.True(t, !counters.counters[4].includeTotal) require.False(t, counters.counters[4].includeTotal)
require.True(t, counters.counters[5].computer == "localhost") require.Equal(t, "localhost", counters.counters[5].computer)
require.True(t, counters.counters[5].objectName == "O2") require.Equal(t, "O2", counters.counters[5].objectName)
require.True(t, counters.counters[5].instance == "I") require.Equal(t, "I", counters.counters[5].instance)
require.True(t, counters.counters[5].counter == "C1") require.Equal(t, "C1", counters.counters[5].counter)
require.True(t, counters.counters[5].measurement == "m") require.Equal(t, "m", counters.counters[5].measurement)
require.True(t, !counters.counters[5].includeTotal) require.False(t, counters.counters[5].includeTotal)
require.True(t, counters.counters[6].computer == "localhost") require.Equal(t, "localhost", counters.counters[6].computer)
require.True(t, counters.counters[6].objectName == "O2") require.Equal(t, "O2", counters.counters[6].objectName)
require.True(t, counters.counters[6].instance == "I") require.Equal(t, "I", counters.counters[6].instance)
require.True(t, counters.counters[6].counter == "C2") require.Equal(t, "C2", counters.counters[6].counter)
require.True(t, counters.counters[6].measurement == "m") require.Equal(t, "m", counters.counters[6].measurement)
require.True(t, !counters.counters[6].includeTotal) require.False(t, counters.counters[6].includeTotal)
require.True(t, counters.counters[7].computer == "localhost") require.Equal(t, "localhost", counters.counters[7].computer)
require.True(t, counters.counters[7].objectName == "O2") require.Equal(t, "O2", counters.counters[7].objectName)
require.True(t, counters.counters[7].instance == "I") require.Equal(t, "I", counters.counters[7].instance)
require.True(t, counters.counters[7].counter == "C3") require.Equal(t, "C3", counters.counters[7].counter)
require.True(t, counters.counters[7].measurement == "m") require.Equal(t, "m", counters.counters[7].measurement)
require.True(t, !counters.counters[7].includeTotal) require.False(t, counters.counters[7].includeTotal)
counters, ok = m.hostCounters["cmp1"] counters, ok = m.hostCounters["cmp1"]
require.True(t, ok) require.True(t, ok)
require.Len(t, counters.counters, 8) require.Len(t, counters.counters, 8)
require.True(t, counters.tag == "cmp1") require.Equal(t, "cmp1", counters.tag)
require.True(t, counters.counters[0].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[0].computer)
require.True(t, counters.counters[0].objectName == "O") require.Equal(t, "O", counters.counters[0].objectName)
require.True(t, counters.counters[0].instance == "I") require.Equal(t, "I", counters.counters[0].instance)
require.True(t, counters.counters[0].counter == "C") require.Equal(t, "C", counters.counters[0].counter)
require.True(t, counters.counters[0].measurement == "m") require.Equal(t, "m", counters.counters[0].measurement)
require.True(t, !counters.counters[0].includeTotal) require.False(t, counters.counters[0].includeTotal)
require.True(t, counters.counters[1].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[1].computer)
require.True(t, counters.counters[1].objectName == "O1") require.Equal(t, "O1", counters.counters[1].objectName)
require.True(t, counters.counters[1].instance == "I1") require.Equal(t, "I1", counters.counters[1].instance)
require.True(t, counters.counters[1].counter == "C1") require.Equal(t, "C1", counters.counters[1].counter)
require.True(t, counters.counters[1].measurement == "m") require.Equal(t, "m", counters.counters[1].measurement)
require.True(t, !counters.counters[1].includeTotal) require.False(t, counters.counters[1].includeTotal)
require.True(t, counters.counters[2].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[2].computer)
require.True(t, counters.counters[2].objectName == "O1") require.Equal(t, "O1", counters.counters[2].objectName)
require.True(t, counters.counters[2].instance == "I2") require.Equal(t, "I2", counters.counters[2].instance)
require.True(t, counters.counters[2].counter == "C1") require.Equal(t, "C1", counters.counters[2].counter)
require.True(t, counters.counters[2].measurement == "m") require.Equal(t, "m", counters.counters[2].measurement)
require.True(t, !counters.counters[2].includeTotal) require.False(t, counters.counters[2].includeTotal)
require.True(t, counters.counters[3].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[3].computer)
require.True(t, counters.counters[3].objectName == "O1") require.Equal(t, "O1", counters.counters[3].objectName)
require.True(t, counters.counters[3].instance == "I1") require.Equal(t, "I1", counters.counters[3].instance)
require.True(t, counters.counters[3].counter == "C2") require.Equal(t, "C2", counters.counters[3].counter)
require.True(t, counters.counters[3].measurement == "m") require.Equal(t, "m", counters.counters[3].measurement)
require.True(t, !counters.counters[3].includeTotal) require.False(t, counters.counters[3].includeTotal)
require.True(t, counters.counters[4].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[4].computer)
require.True(t, counters.counters[4].objectName == "O1") require.Equal(t, "O1", counters.counters[4].objectName)
require.True(t, counters.counters[4].instance == "I2") require.Equal(t, "I2", counters.counters[4].instance)
require.True(t, counters.counters[4].counter == "C2") require.Equal(t, "C2", counters.counters[4].counter)
require.True(t, counters.counters[4].measurement == "m") require.Equal(t, "m", counters.counters[4].measurement)
require.True(t, !counters.counters[4].includeTotal) require.False(t, counters.counters[4].includeTotal)
require.True(t, counters.counters[5].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[5].computer)
require.True(t, counters.counters[5].objectName == "O2") require.Equal(t, "O2", counters.counters[5].objectName)
require.True(t, counters.counters[5].instance == "I") require.Equal(t, "I", counters.counters[5].instance)
require.True(t, counters.counters[5].counter == "C1") require.Equal(t, "C1", counters.counters[5].counter)
require.True(t, counters.counters[5].measurement == "m") require.Equal(t, "m", counters.counters[5].measurement)
require.True(t, !counters.counters[5].includeTotal) require.False(t, counters.counters[5].includeTotal)
require.True(t, counters.counters[6].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[6].computer)
require.True(t, counters.counters[6].objectName == "O2") require.Equal(t, "O2", counters.counters[6].objectName)
require.True(t, counters.counters[6].instance == "I") require.Equal(t, "I", counters.counters[6].instance)
require.True(t, counters.counters[6].counter == "C2") require.Equal(t, "C2", counters.counters[6].counter)
require.True(t, counters.counters[6].measurement == "m") require.Equal(t, "m", counters.counters[6].measurement)
require.True(t, !counters.counters[6].includeTotal) require.False(t, counters.counters[6].includeTotal)
require.True(t, counters.counters[7].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[7].computer)
require.True(t, counters.counters[7].objectName == "O2") require.Equal(t, "O2", counters.counters[7].objectName)
require.True(t, counters.counters[7].instance == "I") require.Equal(t, "I", counters.counters[7].instance)
require.True(t, counters.counters[7].counter == "C3") require.Equal(t, "C3", counters.counters[7].counter)
require.True(t, counters.counters[7].measurement == "m") require.Equal(t, "m", counters.counters[7].measurement)
require.True(t, !counters.counters[7].includeTotal) require.False(t, counters.counters[7].includeTotal)
counters, ok = m.hostCounters["cmp2"] counters, ok = m.hostCounters["cmp2"]
require.True(t, ok) require.True(t, ok)
require.Len(t, counters.counters, 8) require.Len(t, counters.counters, 8)
require.True(t, counters.tag == "cmp2") require.Equal(t, "cmp2", counters.tag)
require.True(t, counters.counters[0].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[0].computer)
require.True(t, counters.counters[0].objectName == "O") require.Equal(t, "O", counters.counters[0].objectName)
require.True(t, counters.counters[0].instance == "I") require.Equal(t, "I", counters.counters[0].instance)
require.True(t, counters.counters[0].counter == "C") require.Equal(t, "C", counters.counters[0].counter)
require.True(t, counters.counters[0].measurement == "m") require.Equal(t, "m", counters.counters[0].measurement)
require.True(t, !counters.counters[0].includeTotal) require.False(t, counters.counters[0].includeTotal)
require.True(t, counters.counters[1].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[1].computer)
require.True(t, counters.counters[1].objectName == "O1") require.Equal(t, "O1", counters.counters[1].objectName)
require.True(t, counters.counters[1].instance == "I1") require.Equal(t, "I1", counters.counters[1].instance)
require.True(t, counters.counters[1].counter == "C1") require.Equal(t, "C1", counters.counters[1].counter)
require.True(t, counters.counters[1].measurement == "m") require.Equal(t, "m", counters.counters[1].measurement)
require.True(t, !counters.counters[1].includeTotal) require.False(t, counters.counters[1].includeTotal)
require.True(t, counters.counters[2].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[2].computer)
require.True(t, counters.counters[2].objectName == "O1") require.Equal(t, "O1", counters.counters[2].objectName)
require.True(t, counters.counters[2].instance == "I2") require.Equal(t, "I2", counters.counters[2].instance)
require.True(t, counters.counters[2].counter == "C1") require.Equal(t, "C1", counters.counters[2].counter)
require.True(t, counters.counters[2].measurement == "m") require.Equal(t, "m", counters.counters[2].measurement)
require.True(t, !counters.counters[2].includeTotal) require.False(t, counters.counters[2].includeTotal)
require.True(t, counters.counters[3].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[3].computer)
require.True(t, counters.counters[3].objectName == "O1") require.Equal(t, "O1", counters.counters[3].objectName)
require.True(t, counters.counters[3].instance == "I1") require.Equal(t, "I1", counters.counters[3].instance)
require.True(t, counters.counters[3].counter == "C2") require.Equal(t, "C2", counters.counters[3].counter)
require.True(t, counters.counters[3].measurement == "m") require.Equal(t, "m", counters.counters[3].measurement)
require.True(t, !counters.counters[3].includeTotal) require.False(t, counters.counters[3].includeTotal)
require.True(t, counters.counters[4].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[4].computer)
require.True(t, counters.counters[4].objectName == "O1") require.Equal(t, "O1", counters.counters[4].objectName)
require.True(t, counters.counters[4].instance == "I2") require.Equal(t, "I2", counters.counters[4].instance)
require.True(t, counters.counters[4].counter == "C2") require.Equal(t, "C2", counters.counters[4].counter)
require.True(t, counters.counters[4].measurement == "m") require.Equal(t, "m", counters.counters[4].measurement)
require.True(t, !counters.counters[4].includeTotal) require.False(t, counters.counters[4].includeTotal)
require.True(t, counters.counters[5].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[5].computer)
require.True(t, counters.counters[5].objectName == "O2") require.Equal(t, "O2", counters.counters[5].objectName)
require.True(t, counters.counters[5].instance == "I") require.Equal(t, "I", counters.counters[5].instance)
require.True(t, counters.counters[5].counter == "C1") require.Equal(t, "C1", counters.counters[5].counter)
require.True(t, counters.counters[5].measurement == "m") require.Equal(t, "m", counters.counters[5].measurement)
require.True(t, !counters.counters[5].includeTotal) require.False(t, counters.counters[5].includeTotal)
require.True(t, counters.counters[6].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[6].computer)
require.True(t, counters.counters[6].objectName == "O2") require.Equal(t, "O2", counters.counters[6].objectName)
require.True(t, counters.counters[6].instance == "I") require.Equal(t, "I", counters.counters[6].instance)
require.True(t, counters.counters[6].counter == "C2") require.Equal(t, "C2", counters.counters[6].counter)
require.True(t, counters.counters[6].measurement == "m") require.Equal(t, "m", counters.counters[6].measurement)
require.True(t, !counters.counters[6].includeTotal) require.False(t, counters.counters[6].includeTotal)
require.True(t, counters.counters[7].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[7].computer)
require.True(t, counters.counters[7].objectName == "O2") require.Equal(t, "O2", counters.counters[7].objectName)
require.True(t, counters.counters[7].instance == "I") require.Equal(t, "I", counters.counters[7].instance)
require.True(t, counters.counters[7].counter == "C3") require.Equal(t, "C3", counters.counters[7].counter)
require.True(t, counters.counters[7].measurement == "m") require.Equal(t, "m", counters.counters[7].measurement)
require.True(t, !counters.counters[7].includeTotal) require.False(t, counters.counters[7].includeTotal)
} }
func TestParseConfigMultiCompsOverrideMultiplePerfObjects(t *testing.T) { func TestParseConfigMultiCompsOverrideMultiplePerfObjects(t *testing.T) {
@ -720,86 +720,86 @@ func TestParseConfigMultiCompsOverrideMultiplePerfObjects(t *testing.T) {
counters, ok := m.hostCounters["localhost"] counters, ok := m.hostCounters["localhost"]
require.True(t, ok) require.True(t, ok)
require.Len(t, counters.counters, 4) require.Len(t, counters.counters, 4)
require.True(t, counters.counters[0].computer == "localhost") require.Equal(t, "localhost", counters.counters[0].computer)
require.True(t, counters.counters[0].objectName == "O") require.Equal(t, "O", counters.counters[0].objectName)
require.True(t, counters.counters[0].instance == "I1") require.Equal(t, "I1", counters.counters[0].instance)
require.True(t, counters.counters[0].counter == "C1") require.Equal(t, "C1", counters.counters[0].counter)
require.True(t, counters.counters[0].measurement == "m") require.Equal(t, "m", counters.counters[0].measurement)
require.True(t, !counters.counters[0].includeTotal) require.False(t, counters.counters[0].includeTotal)
require.True(t, counters.counters[1].computer == "localhost") require.Equal(t, "localhost", counters.counters[1].computer)
require.True(t, counters.counters[1].objectName == "O") require.Equal(t, "O", counters.counters[1].objectName)
require.True(t, counters.counters[1].instance == "I2") require.Equal(t, "I2", counters.counters[1].instance)
require.True(t, counters.counters[1].counter == "C1") require.Equal(t, "C1", counters.counters[1].counter)
require.True(t, counters.counters[1].measurement == "m") require.Equal(t, "m", counters.counters[1].measurement)
require.True(t, !counters.counters[1].includeTotal) require.False(t, counters.counters[1].includeTotal)
require.True(t, counters.counters[2].computer == "localhost") require.Equal(t, "localhost", counters.counters[2].computer)
require.True(t, counters.counters[2].objectName == "O") require.Equal(t, "O", counters.counters[2].objectName)
require.True(t, counters.counters[2].instance == "I1") require.Equal(t, "I1", counters.counters[2].instance)
require.True(t, counters.counters[2].counter == "C2") require.Equal(t, "C2", counters.counters[2].counter)
require.True(t, counters.counters[2].measurement == "m") require.Equal(t, "m", counters.counters[2].measurement)
require.True(t, !counters.counters[2].includeTotal) require.False(t, counters.counters[2].includeTotal)
require.True(t, counters.counters[3].computer == "localhost") require.Equal(t, "localhost", counters.counters[3].computer)
require.True(t, counters.counters[3].objectName == "O") require.Equal(t, "O", counters.counters[3].objectName)
require.True(t, counters.counters[3].instance == "I2") require.Equal(t, "I2", counters.counters[3].instance)
require.True(t, counters.counters[3].counter == "C2") require.Equal(t, "C2", counters.counters[3].counter)
require.True(t, counters.counters[3].measurement == "m") require.Equal(t, "m", counters.counters[3].measurement)
require.True(t, !counters.counters[3].includeTotal) require.False(t, counters.counters[3].includeTotal)
counters, ok = m.hostCounters["cmp1"] counters, ok = m.hostCounters["cmp1"]
require.True(t, ok) require.True(t, ok)
require.Len(t, counters.counters, 4) require.Len(t, counters.counters, 4)
require.True(t, counters.counters[0].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[0].computer)
require.True(t, counters.counters[0].objectName == "O1") require.Equal(t, "O1", counters.counters[0].objectName)
require.True(t, counters.counters[0].instance == "I1") require.Equal(t, "I1", counters.counters[0].instance)
require.True(t, counters.counters[0].counter == "C1") require.Equal(t, "C1", counters.counters[0].counter)
require.True(t, counters.counters[0].measurement == "m") require.Equal(t, "m", counters.counters[0].measurement)
require.True(t, !counters.counters[0].includeTotal) require.False(t, counters.counters[0].includeTotal)
require.True(t, counters.counters[1].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[1].computer)
require.True(t, counters.counters[1].objectName == "O1") require.Equal(t, "O1", counters.counters[1].objectName)
require.True(t, counters.counters[1].instance == "I2") require.Equal(t, "I2", counters.counters[1].instance)
require.True(t, counters.counters[1].counter == "C1") require.Equal(t, "C1", counters.counters[1].counter)
require.True(t, counters.counters[1].measurement == "m") require.Equal(t, "m", counters.counters[1].measurement)
require.True(t, !counters.counters[1].includeTotal) require.False(t, counters.counters[1].includeTotal)
require.True(t, counters.counters[2].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[2].computer)
require.True(t, counters.counters[2].objectName == "O1") require.Equal(t, "O1", counters.counters[2].objectName)
require.True(t, counters.counters[2].instance == "I1") require.Equal(t, "I1", counters.counters[2].instance)
require.True(t, counters.counters[2].counter == "C2") require.Equal(t, "C2", counters.counters[2].counter)
require.True(t, counters.counters[2].measurement == "m") require.Equal(t, "m", counters.counters[2].measurement)
require.True(t, !counters.counters[2].includeTotal) require.False(t, counters.counters[2].includeTotal)
require.True(t, counters.counters[3].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[3].computer)
require.True(t, counters.counters[3].objectName == "O1") require.Equal(t, "O1", counters.counters[3].objectName)
require.True(t, counters.counters[3].instance == "I2") require.Equal(t, "I2", counters.counters[3].instance)
require.True(t, counters.counters[3].counter == "C2") require.Equal(t, "C2", counters.counters[3].counter)
require.True(t, counters.counters[3].measurement == "m") require.Equal(t, "m", counters.counters[3].measurement)
require.True(t, !counters.counters[3].includeTotal) require.False(t, counters.counters[3].includeTotal)
counters, ok = m.hostCounters["cmp2"] counters, ok = m.hostCounters["cmp2"]
require.True(t, ok) require.True(t, ok)
require.Len(t, counters.counters, 4) require.Len(t, counters.counters, 4)
require.True(t, counters.counters[0].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[0].computer)
require.True(t, counters.counters[0].objectName == "O2") require.Equal(t, "O2", counters.counters[0].objectName)
require.True(t, counters.counters[0].instance == "I1") require.Equal(t, "I1", counters.counters[0].instance)
require.True(t, counters.counters[0].counter == "C1") require.Equal(t, "C1", counters.counters[0].counter)
require.True(t, counters.counters[0].measurement == "m") require.Equal(t, "m", counters.counters[0].measurement)
require.True(t, !counters.counters[0].includeTotal) require.False(t, counters.counters[0].includeTotal)
require.True(t, counters.counters[1].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[1].computer)
require.True(t, counters.counters[1].objectName == "O2") require.Equal(t, "O2", counters.counters[1].objectName)
require.True(t, counters.counters[1].instance == "I2") require.Equal(t, "I2", counters.counters[1].instance)
require.True(t, counters.counters[1].counter == "C1") require.Equal(t, "C1", counters.counters[1].counter)
require.True(t, counters.counters[1].measurement == "m") require.Equal(t, "m", counters.counters[1].measurement)
require.True(t, !counters.counters[1].includeTotal) require.False(t, counters.counters[1].includeTotal)
require.True(t, counters.counters[2].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[2].computer)
require.True(t, counters.counters[2].objectName == "O2") require.Equal(t, "O2", counters.counters[2].objectName)
require.True(t, counters.counters[2].instance == "I1") require.Equal(t, "I1", counters.counters[2].instance)
require.True(t, counters.counters[2].counter == "C2") require.Equal(t, "C2", counters.counters[2].counter)
require.True(t, counters.counters[2].measurement == "m") require.Equal(t, "m", counters.counters[2].measurement)
require.True(t, !counters.counters[2].includeTotal) require.False(t, counters.counters[2].includeTotal)
require.True(t, counters.counters[3].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[3].computer)
require.True(t, counters.counters[3].objectName == "O2") require.Equal(t, "O2", counters.counters[3].objectName)
require.True(t, counters.counters[3].instance == "I2") require.Equal(t, "I2", counters.counters[3].instance)
require.True(t, counters.counters[3].counter == "C2") require.Equal(t, "C2", counters.counters[3].counter)
require.True(t, counters.counters[3].measurement == "m") require.Equal(t, "m", counters.counters[3].measurement)
require.True(t, !counters.counters[3].includeTotal) require.False(t, counters.counters[3].includeTotal)
} }
func TestParseConfigMultiCompsOverrideOnePerfObject(t *testing.T) { func TestParseConfigMultiCompsOverrideOnePerfObject(t *testing.T) {
@ -871,77 +871,77 @@ func TestParseConfigMultiCompsOverrideOnePerfObject(t *testing.T) {
counters, ok := m.hostCounters["localhost"] counters, ok := m.hostCounters["localhost"]
require.True(t, ok) require.True(t, ok)
require.Len(t, counters.counters, 1) require.Len(t, counters.counters, 1)
require.True(t, counters.tag == hostname()) require.Equal(t, counters.tag, hostname())
require.True(t, counters.counters[0].computer == "localhost") require.Equal(t, "localhost", counters.counters[0].computer)
require.True(t, counters.counters[0].objectName == "O1") require.Equal(t, "O1", counters.counters[0].objectName)
require.True(t, counters.counters[0].instance == "I") require.Equal(t, "I", counters.counters[0].instance)
require.True(t, counters.counters[0].counter == "C") require.Equal(t, "C", counters.counters[0].counter)
require.True(t, counters.counters[0].measurement == "m") require.Equal(t, "m", counters.counters[0].measurement)
require.True(t, !counters.counters[0].includeTotal) require.False(t, counters.counters[0].includeTotal)
counters, ok = m.hostCounters["cmp1"] counters, ok = m.hostCounters["cmp1"]
require.True(t, ok) require.True(t, ok)
require.Len(t, counters.counters, 5) require.Len(t, counters.counters, 5)
require.True(t, counters.tag == "cmp1") require.Equal(t, "cmp1", counters.tag)
require.True(t, counters.counters[0].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[0].computer)
require.True(t, counters.counters[0].objectName == "O") require.Equal(t, "O", counters.counters[0].objectName)
require.True(t, counters.counters[0].instance == "I1") require.Equal(t, "I1", counters.counters[0].instance)
require.True(t, counters.counters[0].counter == "C1") require.Equal(t, "C1", counters.counters[0].counter)
require.True(t, counters.counters[0].measurement == "m") require.Equal(t, "m", counters.counters[0].measurement)
require.True(t, !counters.counters[0].includeTotal) require.False(t, counters.counters[0].includeTotal)
require.True(t, counters.counters[0].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[0].computer)
require.True(t, counters.counters[1].objectName == "O") require.Equal(t, "O", counters.counters[1].objectName)
require.True(t, counters.counters[1].instance == "I2") require.Equal(t, "I2", counters.counters[1].instance)
require.True(t, counters.counters[1].counter == "C1") require.Equal(t, "C1", counters.counters[1].counter)
require.True(t, counters.counters[1].measurement == "m") require.Equal(t, "m", counters.counters[1].measurement)
require.True(t, !counters.counters[1].includeTotal) require.False(t, counters.counters[1].includeTotal)
require.True(t, counters.counters[2].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[2].computer)
require.True(t, counters.counters[2].objectName == "O") require.Equal(t, "O", counters.counters[2].objectName)
require.True(t, counters.counters[2].instance == "I1") require.Equal(t, "I1", counters.counters[2].instance)
require.True(t, counters.counters[2].counter == "C2") require.Equal(t, "C2", counters.counters[2].counter)
require.True(t, counters.counters[2].measurement == "m") require.Equal(t, "m", counters.counters[2].measurement)
require.True(t, !counters.counters[2].includeTotal) require.False(t, counters.counters[2].includeTotal)
require.True(t, counters.counters[3].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[3].computer)
require.True(t, counters.counters[3].objectName == "O") require.Equal(t, "O", counters.counters[3].objectName)
require.True(t, counters.counters[3].instance == "I2") require.Equal(t, "I2", counters.counters[3].instance)
require.True(t, counters.counters[3].counter == "C2") require.Equal(t, "C2", counters.counters[3].counter)
require.True(t, counters.counters[3].measurement == "m") require.Equal(t, "m", counters.counters[3].measurement)
require.True(t, !counters.counters[3].includeTotal) require.False(t, counters.counters[3].includeTotal)
require.True(t, counters.counters[4].computer == "cmp1") require.Equal(t, "cmp1", counters.counters[4].computer)
require.True(t, counters.counters[4].objectName == "O1") require.Equal(t, "O1", counters.counters[4].objectName)
require.True(t, counters.counters[4].instance == "I") require.Equal(t, "I", counters.counters[4].instance)
require.True(t, counters.counters[4].counter == "C") require.Equal(t, "C", counters.counters[4].counter)
require.True(t, counters.counters[4].measurement == "m") require.Equal(t, "m", counters.counters[4].measurement)
require.True(t, !counters.counters[4].includeTotal) require.False(t, counters.counters[4].includeTotal)
counters, ok = m.hostCounters["cmp2"] counters, ok = m.hostCounters["cmp2"]
require.True(t, ok) require.True(t, ok)
require.Len(t, counters.counters, 4) require.Len(t, counters.counters, 4)
require.True(t, counters.tag == "cmp2") require.Equal(t, "cmp2", counters.tag)
require.True(t, counters.counters[0].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[0].computer)
require.True(t, counters.counters[0].objectName == "O") require.Equal(t, "O", counters.counters[0].objectName)
require.True(t, counters.counters[0].instance == "I1") require.Equal(t, "I1", counters.counters[0].instance)
require.True(t, counters.counters[0].counter == "C1") require.Equal(t, "C1", counters.counters[0].counter)
require.True(t, counters.counters[0].measurement == "m") require.Equal(t, "m", counters.counters[0].measurement)
require.True(t, !counters.counters[0].includeTotal) require.False(t, counters.counters[0].includeTotal)
require.True(t, counters.counters[1].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[1].computer)
require.True(t, counters.counters[1].objectName == "O") require.Equal(t, "O", counters.counters[1].objectName)
require.True(t, counters.counters[1].instance == "I2") require.Equal(t, "I2", counters.counters[1].instance)
require.True(t, counters.counters[1].counter == "C1") require.Equal(t, "C1", counters.counters[1].counter)
require.True(t, counters.counters[1].measurement == "m") require.Equal(t, "m", counters.counters[1].measurement)
require.True(t, !counters.counters[1].includeTotal) require.False(t, counters.counters[1].includeTotal)
require.True(t, counters.counters[2].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[2].computer)
require.True(t, counters.counters[2].objectName == "O") require.Equal(t, "O", counters.counters[2].objectName)
require.True(t, counters.counters[2].instance == "I1") require.Equal(t, "I1", counters.counters[2].instance)
require.True(t, counters.counters[2].counter == "C2") require.Equal(t, "C2", counters.counters[2].counter)
require.True(t, counters.counters[2].measurement == "m") require.Equal(t, "m", counters.counters[2].measurement)
require.True(t, !counters.counters[2].includeTotal) require.False(t, counters.counters[2].includeTotal)
require.True(t, counters.counters[3].computer == "cmp2") require.Equal(t, "cmp2", counters.counters[3].computer)
require.True(t, counters.counters[3].objectName == "O") require.Equal(t, "O", counters.counters[3].objectName)
require.True(t, counters.counters[3].instance == "I2") require.Equal(t, "I2", counters.counters[3].instance)
require.True(t, counters.counters[3].counter == "C2") require.Equal(t, "C2", counters.counters[3].counter)
require.True(t, counters.counters[3].measurement == "m") require.Equal(t, "m", counters.counters[3].measurement)
require.True(t, !counters.counters[3].includeTotal) require.False(t, counters.counters[3].includeTotal)
} }
func TestParseConfigLocalhost(t *testing.T) { func TestParseConfigLocalhost(t *testing.T) {