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

Enable gofmt code simplification (#4887)

Browse Source
This commit is contained in:
Trevor Pounds
2018-10-19 16:32:54 -04:00
committed by Daniel Nelson
parent 4a311830c6
commit ee056278f5
59 changed files with 599 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
plugins/processors/strings/strings_test.go
View File

@@ -53,7 +53,7 @@ func TestFieldConversions(t *testing.T) {
name: "Should change existing field to lowercase",
plugin: &Strings{
Lowercase: []converter{
converter{
{
Field: "request",
},
},
@@ -68,7 +68,7 @@ func TestFieldConversions(t *testing.T) {
name: "Should change existing field to uppercase",
plugin: &Strings{
Uppercase: []converter{
converter{
{
Field: "request",
},
},
@@ -83,7 +83,7 @@ func TestFieldConversions(t *testing.T) {
name: "Should add new lowercase field",
plugin: &Strings{
Lowercase: []converter{
converter{
{
Field: "request",
Dest: "lowercase_request",
},
@@ -103,7 +103,7 @@ func TestFieldConversions(t *testing.T) {
name: "Should trim from both sides",
plugin: &Strings{
Trim: []converter{
converter{
{
Field: "request",
Cutset: "/w",
},
@@ -119,13 +119,13 @@ func TestFieldConversions(t *testing.T) {
name: "Should trim from both sides and make lowercase",
plugin: &Strings{
Trim: []converter{
converter{
{
Field: "request",
Cutset: "/w",
},
},
Lowercase: []converter{
converter{
{
Field: "request",
},
},
@@ -140,7 +140,7 @@ func TestFieldConversions(t *testing.T) {
name: "Should trim from left side",
plugin: &Strings{
TrimLeft: []converter{
converter{
{
Field: "request",
Cutset: "/w",
},
@@ -156,7 +156,7 @@ func TestFieldConversions(t *testing.T) {
name: "Should trim from right side",
plugin: &Strings{
TrimRight: []converter{
converter{
{
Field: "request",
Cutset: "/w",
},
@@ -172,7 +172,7 @@ func TestFieldConversions(t *testing.T) {
name: "Should trim prefix '/mixed'",
plugin: &Strings{
TrimPrefix: []converter{
converter{
{
Field: "request",
Prefix: "/mixed",
},
@@ -188,7 +188,7 @@ func TestFieldConversions(t *testing.T) {
name: "Should trim suffix '-1D&to=now'",
plugin: &Strings{
TrimSuffix: []converter{
converter{
{
Field: "request",
Suffix: "-1D&to=now",
},
@@ -204,7 +204,7 @@ func TestFieldConversions(t *testing.T) {
name: "Trim without cutset removes whitespace",
plugin: &Strings{
Trim: []converter{
converter{
{
Field: "whitespace",
},
},
@@ -219,7 +219,7 @@ func TestFieldConversions(t *testing.T) {
name: "Trim left without cutset removes whitespace",
plugin: &Strings{
TrimLeft: []converter{
converter{
{
Field: "whitespace",
},
},
@@ -234,7 +234,7 @@ func TestFieldConversions(t *testing.T) {
name: "Trim right without cutset removes whitespace",
plugin: &Strings{
TrimRight: []converter{
converter{
{
Field: "whitespace",
},
},
@@ -249,7 +249,7 @@ func TestFieldConversions(t *testing.T) {
name: "No change if field missing",
plugin: &Strings{
Lowercase: []converter{
converter{
{
Field: "xyzzy",
Suffix: "-1D&to=now",
},
@@ -281,7 +281,7 @@ func TestTagConversions(t *testing.T) {
name: "Should change existing tag to lowercase",
plugin: &Strings{
Lowercase: []converter{
converter{
{
Tag: "s-computername",
},
},
@@ -300,7 +300,7 @@ func TestTagConversions(t *testing.T) {
name: "Should add new lowercase tag",
plugin: &Strings{
Lowercase: []converter{
converter{
{
Tag: "s-computername",
Dest: "s-computername_lowercase",
},
@@ -324,7 +324,7 @@ func TestTagConversions(t *testing.T) {
name: "Should add new uppercase tag",
plugin: &Strings{
Uppercase: []converter{
converter{
{
Tag: "s-computername",
Dest: "s-computername_uppercase",
},
@@ -365,7 +365,7 @@ func TestMeasurementConversions(t *testing.T) {
name: "lowercase measurement",
plugin: &Strings{
Lowercase: []converter{
converter{
{
Measurement: "IIS_log",
},
},
@@ -388,19 +388,19 @@ func TestMeasurementConversions(t *testing.T) {
func TestMultipleConversions(t *testing.T) {
plugin := &Strings{
Lowercase: []converter{
converter{
{
Tag: "s-computername",
},
converter{
{
Field: "request",
},
converter{
{
Field: "cs-host",
Dest: "cs-host_lowercase",
},
},
Uppercase: []converter{
converter{
{
Tag: "verb",
},
},
@@ -428,18 +428,18 @@ func TestMultipleConversions(t *testing.T) {
func TestReadmeExample(t *testing.T) {
plugin := &Strings{
Lowercase: []converter{
converter{
{
Tag: "uri_stem",
},
},
TrimPrefix: []converter{
converter{
{
Tag: "uri_stem",
Prefix: "/api/",
},
},
Uppercase: []converter{
converter{
{
Field: "cs-host",
Dest: "cs-host_normalised",
},
@@ -492,7 +492,7 @@ func newMetric(name string) telegraf.Metric {
func TestMeasurementReplace(t *testing.T) {
plugin := &Strings{
Replace: []converter{
converter{
{
Old: "_",
New: "-",
Measurement: "*",
@@ -513,7 +513,7 @@ func TestMeasurementReplace(t *testing.T) {
func TestMeasurementCharDeletion(t *testing.T) {
plugin := &Strings{
Replace: []converter{
converter{
{
Old: "foo",
New: "",
Measurement: "*",

2
plugins/processors/topk/topk.go
View File

@@ -405,7 +405,7 @@ func (t *TopK) getAggregationFunction(aggOperation string) (func([]telegraf.Metr
}
// Divide by the number of recorded measurements collected for every field
noMeasurementsFound := true // Canary to check if no field with values was found, so we can return nil
for k, _ := range mean {
for k := range mean {
if meanCounters[k] == 0 {
mean[k] = 0
continue

106
plugins/processors/topk/topk_test.go
View File

@@ -178,11 +178,11 @@ func TestTopkMeanAddAggregateFields(t *testing.T) {
// Generate the answer
chng := fieldList(field{"a_topk_aggregate", float64(28.044)})
changeSet := map[int]metricChange{
0: metricChange{newFields: chng},
1: metricChange{newFields: chng},
2: metricChange{newFields: chng},
3: metricChange{newFields: chng},
4: metricChange{newFields: chng},
0: {newFields: chng},
1: {newFields: chng},
2: {newFields: chng},
3: {newFields: chng},
4: {newFields: chng},
}
answer := generateAns(input, changeSet)
@@ -208,11 +208,11 @@ func TestTopkSumAddAggregateFields(t *testing.T) {
// Generate the answer
chng := fieldList(field{"a_topk_aggregate", float64(140.22)})
changeSet := map[int]metricChange{
0: metricChange{newFields: chng},
1: metricChange{newFields: chng},
2: metricChange{newFields: chng},
3: metricChange{newFields: chng},
4: metricChange{newFields: chng},
0: {newFields: chng},
1: {newFields: chng},
2: {newFields: chng},
3: {newFields: chng},
4: {newFields: chng},
}
answer := generateAns(input, changeSet)
@@ -238,11 +238,11 @@ func TestTopkMaxAddAggregateFields(t *testing.T) {
// Generate the answer
chng := fieldList(field{"a_topk_aggregate", float64(50.5)})
changeSet := map[int]metricChange{
0: metricChange{newFields: chng},
1: metricChange{newFields: chng},
2: metricChange{newFields: chng},
3: metricChange{newFields: chng},
4: metricChange{newFields: chng},
0: {newFields: chng},
1: {newFields: chng},
2: {newFields: chng},
3: {newFields: chng},
4: {newFields: chng},
}
answer := generateAns(input, changeSet)
@@ -268,11 +268,11 @@ func TestTopkMinAddAggregateFields(t *testing.T) {
// Generate the answer
chng := fieldList(field{"a_topk_aggregate", float64(0.3)})
changeSet := map[int]metricChange{
0: metricChange{newFields: chng},
1: metricChange{newFields: chng},
2: metricChange{newFields: chng},
3: metricChange{newFields: chng},
4: metricChange{newFields: chng},
0: {newFields: chng},
1: {newFields: chng},
2: {newFields: chng},
3: {newFields: chng},
4: {newFields: chng},
}
answer := generateAns(input, changeSet)
@@ -297,10 +297,10 @@ func TestTopkGroupby1(t *testing.T) {
// Generate the answer
changeSet := map[int]metricChange{
2: metricChange{newFields: fieldList(field{"value_topk_aggregate", float64(74.18)})},
3: metricChange{newFields: fieldList(field{"value_topk_aggregate", float64(72)})},
4: metricChange{newFields: fieldList(field{"value_topk_aggregate", float64(163.22)})},
5: metricChange{newFields: fieldList(field{"value_topk_aggregate", float64(163.22)})},
2: {newFields: fieldList(field{"value_topk_aggregate", float64(74.18)})},
3: {newFields: fieldList(field{"value_topk_aggregate", float64(72)})},
4: {newFields: fieldList(field{"value_topk_aggregate", float64(163.22)})},
5: {newFields: fieldList(field{"value_topk_aggregate", float64(163.22)})},
}
answer := generateAns(input, changeSet)
@@ -326,11 +326,11 @@ func TestTopkGroupby2(t *testing.T) {
chng2 := fieldList(field{"value_topk_aggregate", float64(72)})
chng3 := fieldList(field{"value_topk_aggregate", float64(81.61)})
changeSet := map[int]metricChange{
1: metricChange{newFields: chng1},
2: metricChange{newFields: chng1},
3: metricChange{newFields: chng2},
4: metricChange{newFields: chng3},
5: metricChange{newFields: chng3},
1: {newFields: chng1},
2: {newFields: chng1},
3: {newFields: chng2},
4: {newFields: chng3},
5: {newFields: chng3},
}
answer := generateAns(input, changeSet)
@@ -354,8 +354,8 @@ func TestTopkGroupby3(t *testing.T) {
// Generate the answer
chng := fieldList(field{"value_topk_aggregate", float64(75.3)})
changeSet := map[int]metricChange{
4: metricChange{newFields: chng},
5: metricChange{newFields: chng},
4: {newFields: chng},
5: {newFields: chng},
}
answer := generateAns(input, changeSet)
@@ -381,10 +381,10 @@ func TestTopkGroupbyFields1(t *testing.T) {
// Generate the answer
changeSet := map[int]metricChange{
0: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(95.36)})},
1: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(39.01)})},
2: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(39.01)})},
5: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(29.45)})},
0: {newFields: fieldList(field{"A_topk_aggregate", float64(95.36)})},
1: {newFields: fieldList(field{"A_topk_aggregate", float64(39.01)})},
2: {newFields: fieldList(field{"A_topk_aggregate", float64(39.01)})},
5: {newFields: fieldList(field{"A_topk_aggregate", float64(29.45)})},
}
answer := generateAns(input, changeSet)
@@ -409,10 +409,10 @@ func TestTopkGroupbyFields2(t *testing.T) {
// Generate the answer
changeSet := map[int]metricChange{
0: metricChange{newFields: fieldList(field{"C_topk_aggregate", float64(72.41)})},
2: metricChange{newFields: fieldList(field{"B_topk_aggregate", float64(60.96)})},
4: metricChange{newFields: fieldList(field{"B_topk_aggregate", float64(81.55)}, field{"C_topk_aggregate", float64(49.96)})},
5: metricChange{newFields: fieldList(field{"C_topk_aggregate", float64(49.96)})},
0: {newFields: fieldList(field{"C_topk_aggregate", float64(72.41)})},
2: {newFields: fieldList(field{"B_topk_aggregate", float64(60.96)})},
4: {newFields: fieldList(field{"B_topk_aggregate", float64(81.55)}, field{"C_topk_aggregate", float64(49.96)})},
5: {newFields: fieldList(field{"C_topk_aggregate", float64(49.96)})},
}
answer := generateAns(input, changeSet)
@@ -438,9 +438,9 @@ func TestTopkGroupbyMetricName1(t *testing.T) {
// Generate the answer
chng := fieldList(field{"value_topk_aggregate", float64(235.22000000000003)})
changeSet := map[int]metricChange{
3: metricChange{newFields: chng},
4: metricChange{newFields: chng},
5: metricChange{newFields: chng},
3: {newFields: chng},
4: {newFields: chng},
5: {newFields: chng},
}
answer := generateAns(input, changeSet)
@@ -465,10 +465,10 @@ func TestTopkGroupbyMetricName2(t *testing.T) {
// Generate the answer
changeSet := map[int]metricChange{
0: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(95.36)})},
1: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(78.02)}, field{"value_topk_aggregate", float64(133.61)})},
2: metricChange{newFields: fieldList(field{"A_topk_aggregate", float64(78.02)}, field{"value_topk_aggregate", float64(133.61)})},
4: metricChange{newFields: fieldList(field{"value_topk_aggregate", float64(87.92)})},
0: {newFields: fieldList(field{"A_topk_aggregate", float64(95.36)})},
1: {newFields: fieldList(field{"A_topk_aggregate", float64(78.02)}, field{"value_topk_aggregate", float64(133.61)})},
2: {newFields: fieldList(field{"A_topk_aggregate", float64(78.02)}, field{"value_topk_aggregate", float64(133.61)})},
4: {newFields: fieldList(field{"value_topk_aggregate", float64(87.92)})},
}
answer := generateAns(input, changeSet)
@@ -493,9 +493,9 @@ func TestTopkBottomk(t *testing.T) {
// Generate the answer
changeSet := map[int]metricChange{
0: metricChange{},
1: metricChange{},
3: metricChange{},
0: {},
1: {},
3: {},
}
answer := generateAns(input, changeSet)
@@ -520,10 +520,10 @@ func TestTopkGroupByKeyTag(t *testing.T) {
// Generate the answer
changeSet := map[int]metricChange{
2: metricChange{newTags: tagList(tag{"gbt", "metric1&tag1=TWO&tag3=SIX&"})},
3: metricChange{newTags: tagList(tag{"gbt", "metric2&tag1=ONE&tag3=THREE&"})},
4: metricChange{newTags: tagList(tag{"gbt", "metric2&tag1=TWO&tag3=SEVEN&"})},
5: metricChange{newTags: tagList(tag{"gbt", "metric2&tag1=TWO&tag3=SEVEN&"})},
2: {newTags: tagList(tag{"gbt", "metric1&tag1=TWO&tag3=SIX&"})},
3: {newTags: tagList(tag{"gbt", "metric2&tag1=ONE&tag3=THREE&"})},
4: {newTags: tagList(tag{"gbt", "metric2&tag1=TWO&tag3=SEVEN&"})},
5: {newTags: tagList(tag{"gbt", "metric2&tag1=TWO&tag3=SEVEN&"})},
}
answer := generateAns(input, changeSet)