chore: enable lll linter (#12226)

This commit is contained in:
Paweł Żak 2022-11-11 16:17:15 +01:00 committed by GitHub
parent c528d31515
commit 0c5d8de5e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 85 additions and 54 deletions

View File

@ -15,6 +15,7 @@ linters:
- govet
- ineffassign
- interfacebloat
- lll
- nakedret
- nilerr
- predeclared
@ -67,6 +68,14 @@ linters-settings:
- "**/testutil/**"
- "**/tools/**"
- "**/*_test.go"
lll:
# Max line length, lines longer will be reported.
# '\t' is counted as 1 character by default, and can be changed with the tab-width option.
# Default: 120.
line-length: 160
# Tab width in spaces.
# Default: 1
tab-width: 4
revive:
rules:
- name: argument-limit

View File

@ -11,7 +11,7 @@ import (
"github.com/influxdata/telegraf/testutil"
)
//nolint:lll,revive // conditionally long lines allowed
//nolint:lll // conditionally long lines allowed
var apacheStatus = `
Total Accesses: 129811861
Total kBytes: 5213701865

View File

@ -1556,25 +1556,26 @@ var clusterstatsNodesExpected = map[string]interface{}{
"process_open_file_descriptors_min": float64(145),
"versions_0_version": "2.3.3",
"plugins_0_classname": "org.elasticsearch.plugin.cloud.aws.CloudAwsPlugin",
"plugins_0_description": "The Amazon Web Service (AWS) Cloud plugin allows to use AWS API for the unicast discovery mechanism and add S3 repositories.",
"plugins_0_isolated": true,
"plugins_0_jvm": true,
"plugins_0_name": "cloud-aws",
"plugins_0_site": false,
"plugins_0_version": "2.3.3",
"plugins_1_description": "kopf - simple web administration tool for Elasticsearch",
"plugins_1_jvm": false,
"plugins_1_name": "kopf",
"plugins_1_site": true,
"plugins_1_url": "/_plugin/kopf/",
"plugins_1_version": "2.0.1",
"plugins_2_classname": "com.trgr.elasticsearch.plugin.metrics.MetricsPlugin",
"plugins_2_description": "Logs cluster and node stats for performance monitoring.",
"plugins_2_isolated": true,
"plugins_2_jvm": true,
"plugins_2_name": "tr-metrics",
"plugins_2_site": false,
"plugins_2_version": "7bd5b4b",
"plugins_0_description": "The Amazon Web Service (AWS) Cloud plugin allows to use AWS API " +
"for the unicast discovery mechanism and add S3 repositories.",
"plugins_0_isolated": true,
"plugins_0_jvm": true,
"plugins_0_name": "cloud-aws",
"plugins_0_site": false,
"plugins_0_version": "2.3.3",
"plugins_1_description": "kopf - simple web administration tool for Elasticsearch",
"plugins_1_jvm": false,
"plugins_1_name": "kopf",
"plugins_1_site": true,
"plugins_1_url": "/_plugin/kopf/",
"plugins_1_version": "2.0.1",
"plugins_2_classname": "com.trgr.elasticsearch.plugin.metrics.MetricsPlugin",
"plugins_2_description": "Logs cluster and node stats for performance monitoring.",
"plugins_2_isolated": true,
"plugins_2_jvm": true,
"plugins_2_name": "tr-metrics",
"plugins_2_site": false,
"plugins_2_version": "7bd5b4b",
}
const IsMasterResult = "SDFsfSDFsdfFSDSDfSFDSDF 10.206.124.66 10.206.124.66 test.host.com "

View File

@ -35,7 +35,7 @@ func (s statServer) serverSocket(l net.Listener) {
data := buf[:n]
if string(data) == "show stat\n" {
//nolint:errcheck,revive // we return anyway
c.Write([]byte(csvOutputSample))
c.Write(csvOutputSample)
}
}(conn)
}
@ -53,7 +53,7 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) {
}
if username == "user" && password == "password" {
_, err := fmt.Fprint(w, csvOutputSample)
_, err := fmt.Fprint(w, string(csvOutputSample))
require.NoError(t, err)
} else {
w.WriteHeader(http.StatusNotFound)
@ -94,7 +94,7 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) {
func TestHaproxyGeneratesMetricsWithoutAuthentication(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
_, err := fmt.Fprint(w, csvOutputSample)
_, err := fmt.Fprint(w, string(csvOutputSample))
require.NoError(t, err)
}))
defer ts.Close()
@ -184,7 +184,7 @@ func TestHaproxyDefaultGetFromLocalhost(t *testing.T) {
func TestHaproxyKeepFieldNames(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
_, err := fmt.Fprint(w, csvOutputSample)
_, err := fmt.Fprint(w, string(csvOutputSample))
require.NoError(t, err)
}))
defer ts.Close()
@ -230,6 +230,16 @@ func TestHaproxyKeepFieldNames(t *testing.T) {
acc.AssertContainsTaggedFields(t, "haproxy", fields, tags)
}
func mustReadSampleOutput() []byte {
filePath := "testdata/sample_output.csv"
data, err := os.ReadFile(filePath)
if err != nil {
panic(fmt.Errorf("could not read from file %s: %w", filePath, err))
}
return data
}
func HaproxyGetFieldValues() map[string]interface{} {
fields := map[string]interface{}{
"active_servers": uint64(1),
@ -285,19 +295,4 @@ func HaproxyGetFieldValues() map[string]interface{} {
}
// Can obtain from official haproxy demo: 'http://demo.haproxy.org/;csv'
const csvOutputSample = `
# pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,hrsp_1xx,hrsp_2xx,hrsp_3xx,hrsp_4xx,hrsp_5xx,hrsp_other,hanafail,req_rate,req_rate_max,req_tot,cli_abrt,srv_abrt,comp_in,comp_out,comp_byp,comp_rsp,lastsess,last_chk,last_agt,qtime,ctime,rtime,ttime,agent_status,agent_code,agent_duration,check_desc,agent_desc,check_rise,check_fall,check_health,agent_rise,agent_fall,agent_health,addr,cookie,mode,algo,conn_rate,conn_rate_max,conn_tot,intercepted,dcon,dses,
http-in,FRONTEND,,,3,100,100,2639994,813557487,65937668635,505252,0,47567,,,,,OPEN,,,,,,,,,1,2,0,,,,0,1,0,157,,,,0,1514640,606647,136264,496535,14948,,1,155,2754255,,,36370569635,17435137766,0,642264,,,,,,,,,,,,,,,,,,,,,http,,1,157,2649922,339471,0,0,
http-in,IPv4-direct,,,3,41,100,349801,57445827,1503928881,269899,0,287,,,,,OPEN,,,,,,,,,1,2,1,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
http-in,IPv4-cached,,,0,33,100,1786155,644395819,57905460294,60511,0,1,,,,,OPEN,,,,,,,,,1,2,2,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
http-in,IPv6-direct,,,0,100,100,325619,92414745,6205208728,3399,0,47279,,,,,OPEN,,,,,,,,,1,2,3,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
http-in,local,,,0,0,100,0,0,0,0,0,0,,,,,OPEN,,,,,,,,,1,2,4,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
http-in,local-https,,,0,5,100,188347,19301096,323070732,171443,0,0,,,,,OPEN,,,,,,,,,1,2,5,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
www,www,0,0,0,20,20,1719698,672044109,64806076656,,0,,0,5285,22,0,UP,1,1,0,561,84,1036557,3356,,1,3,1,,1715117,,2,0,,45,L7OK,200,5,671,1144889,481714,87038,4,0,,,,,105016,167,,,,,5,OK,,0,5,16,1167,,,,Layer7 check passed,,2,3,4,,,,,,http,,,,,,,,
www,bck,0,0,0,10,10,1483,537137,7544118,,0,,0,0,0,0,UP,1,0,1,4,0,5218087,0,,1,3,2,,1371,,2,0,,17,L7OK,200,2,0,629,99,755,0,0,,,,,16,0,,,,,1036557,OK,,756,1,13,1184,,,,Layer7 check passed,,2,5,6,,,,,,http,,,,,,,,
www,BACKEND,0,25,0,46,100,1721835,674684790,64813732170,314,0,,130,5285,22,0,UP,1,1,1,,0,5218087,0,,1,3,0,,1716488,,1,0,,45,,,,0,1145518,481813,88664,5719,121,,,,1721835,105172,167,35669268059,17250148556,0,556042,5,,,0,5,16,1167,,,,,,,,,,,,,,http,,,,,,,,
git,www,0,0,0,2,2,14539,5228218,303747244,,0,,0,21,0,0,UP,1,1,0,559,84,1036557,3352,,1,4,1,,9481,,2,0,,2,L7OK,200,3,0,5668,8710,140,0,0,,,,,690,0,,,,,1342,OK,,1268,1,2908,4500,,,,Layer7 check passed,,2,3,4,,,,,,http,,,,,,,,
git,bck,0,0,0,0,2,0,0,0,,0,,0,0,0,0,UP,1,0,1,2,0,5218087,0,,1,4,2,,0,,2,0,,0,L7OK,200,2,0,0,0,0,0,0,,,,,0,0,,,,,-1,OK,,0,0,0,0,,,,Layer7 check passed,,2,3,4,,,,,,http,,,,,,,,
git,BACKEND,0,6,0,8,2,14541,8082393,303747668,0,0,,2,21,0,0,UP,1,1,1,,0,5218087,0,,1,4,0,,9481,,1,0,,7,,,,0,5668,8710,140,23,0,,,,14541,690,0,133458298,38104818,0,4379,1342,,,1268,1,2908,4500,,,,,,,,,,,,,,http,,,,,,,,
demo,BACKEND,0,0,1,5,20,24063,7876647,659864417,48,0,,1,0,0,0,UP,0,0,0,,0,5218087,,,1,17,0,,0,,1,1,,26,,,,0,23983,21,0,1,57,,,,24062,111,0,567843278,146884392,0,1083,0,,,2706,0,0,887,,,,,,,,,,,,,,http,,,,,,,,
`
var csvOutputSample = mustReadSampleOutput()

View File

@ -0,0 +1,15 @@
# pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,hrsp_1xx,hrsp_2xx,hrsp_3xx,hrsp_4xx,hrsp_5xx,hrsp_other,hanafail,req_rate,req_rate_max,req_tot,cli_abrt,srv_abrt,comp_in,comp_out,comp_byp,comp_rsp,lastsess,last_chk,last_agt,qtime,ctime,rtime,ttime,agent_status,agent_code,agent_duration,check_desc,agent_desc,check_rise,check_fall,check_health,agent_rise,agent_fall,agent_health,addr,cookie,mode,algo,conn_rate,conn_rate_max,conn_tot,intercepted,dcon,dses,
http-in,FRONTEND,,,3,100,100,2639994,813557487,65937668635,505252,0,47567,,,,,OPEN,,,,,,,,,1,2,0,,,,0,1,0,157,,,,0,1514640,606647,136264,496535,14948,,1,155,2754255,,,36370569635,17435137766,0,642264,,,,,,,,,,,,,,,,,,,,,http,,1,157,2649922,339471,0,0,
http-in,IPv4-direct,,,3,41,100,349801,57445827,1503928881,269899,0,287,,,,,OPEN,,,,,,,,,1,2,1,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
http-in,IPv4-cached,,,0,33,100,1786155,644395819,57905460294,60511,0,1,,,,,OPEN,,,,,,,,,1,2,2,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
http-in,IPv6-direct,,,0,100,100,325619,92414745,6205208728,3399,0,47279,,,,,OPEN,,,,,,,,,1,2,3,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
http-in,local,,,0,0,100,0,0,0,0,0,0,,,,,OPEN,,,,,,,,,1,2,4,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
http-in,local-https,,,0,5,100,188347,19301096,323070732,171443,0,0,,,,,OPEN,,,,,,,,,1,2,5,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,http,,,,,,0,0,
www,www,0,0,0,20,20,1719698,672044109,64806076656,,0,,0,5285,22,0,UP,1,1,0,561,84,1036557,3356,,1,3,1,,1715117,,2,0,,45,L7OK,200,5,671,1144889,481714,87038,4,0,,,,,105016,167,,,,,5,OK,,0,5,16,1167,,,,Layer7 check passed,,2,3,4,,,,,,http,,,,,,,,
www,bck,0,0,0,10,10,1483,537137,7544118,,0,,0,0,0,0,UP,1,0,1,4,0,5218087,0,,1,3,2,,1371,,2,0,,17,L7OK,200,2,0,629,99,755,0,0,,,,,16,0,,,,,1036557,OK,,756,1,13,1184,,,,Layer7 check passed,,2,5,6,,,,,,http,,,,,,,,
www,BACKEND,0,25,0,46,100,1721835,674684790,64813732170,314,0,,130,5285,22,0,UP,1,1,1,,0,5218087,0,,1,3,0,,1716488,,1,0,,45,,,,0,1145518,481813,88664,5719,121,,,,1721835,105172,167,35669268059,17250148556,0,556042,5,,,0,5,16,1167,,,,,,,,,,,,,,http,,,,,,,,
git,www,0,0,0,2,2,14539,5228218,303747244,,0,,0,21,0,0,UP,1,1,0,559,84,1036557,3352,,1,4,1,,9481,,2,0,,2,L7OK,200,3,0,5668,8710,140,0,0,,,,,690,0,,,,,1342,OK,,1268,1,2908,4500,,,,Layer7 check passed,,2,3,4,,,,,,http,,,,,,,,
git,bck,0,0,0,0,2,0,0,0,,0,,0,0,0,0,UP,1,0,1,2,0,5218087,0,,1,4,2,,0,,2,0,,0,L7OK,200,2,0,0,0,0,0,0,,,,,0,0,,,,,-1,OK,,0,0,0,0,,,,Layer7 check passed,,2,3,4,,,,,,http,,,,,,,,
git,BACKEND,0,6,0,8,2,14541,8082393,303747668,0,0,,2,21,0,0,UP,1,1,1,,0,5218087,0,,1,4,0,,9481,,1,0,,7,,,,0,5668,8710,140,23,0,,,,14541,690,0,133458298,38104818,0,4379,1342,,,1268,1,2908,4500,,,,,,,,,,,,,,http,,,,,,,,
demo,BACKEND,0,0,1,5,20,24063,7876647,659864417,48,0,,1,0,0,0,UP,0,0,0,,0,5218087,,,1,17,0,,0,,1,1,,26,,,,0,23983,21,0,1,57,,,,24062,111,0,567843278,146884392,0,1083,0,,,2706,0,0,887,,,,,,,,,,,,,,http,,,,,,,,
1 # pxname svname qcur qmax scur smax slim stot bin bout dreq dresp ereq econ eresp wretr wredis status weight act bck chkfail chkdown lastchg downtime qlimit pid iid sid throttle lbtot tracked type rate rate_lim rate_max check_status check_code check_duration hrsp_1xx hrsp_2xx hrsp_3xx hrsp_4xx hrsp_5xx hrsp_other hanafail req_rate req_rate_max req_tot cli_abrt srv_abrt comp_in comp_out comp_byp comp_rsp lastsess last_chk last_agt qtime ctime rtime ttime agent_status agent_code agent_duration check_desc agent_desc check_rise check_fall check_health agent_rise agent_fall agent_health addr cookie mode algo conn_rate conn_rate_max conn_tot intercepted dcon dses
2 http-in FRONTEND 3 100 100 2639994 813557487 65937668635 505252 0 47567 OPEN 1 2 0 0 1 0 157 0 1514640 606647 136264 496535 14948 1 155 2754255 36370569635 17435137766 0 642264 http 1 157 2649922 339471 0 0
3 http-in IPv4-direct 3 41 100 349801 57445827 1503928881 269899 0 287 OPEN 1 2 1 3 http 0 0
4 http-in IPv4-cached 0 33 100 1786155 644395819 57905460294 60511 0 1 OPEN 1 2 2 3 http 0 0
5 http-in IPv6-direct 0 100 100 325619 92414745 6205208728 3399 0 47279 OPEN 1 2 3 3 http 0 0
6 http-in local 0 0 100 0 0 0 0 0 0 OPEN 1 2 4 3 http 0 0
7 http-in local-https 0 5 100 188347 19301096 323070732 171443 0 0 OPEN 1 2 5 3 http 0 0
8 www www 0 0 0 20 20 1719698 672044109 64806076656 0 0 5285 22 0 UP 1 1 0 561 84 1036557 3356 1 3 1 1715117 2 0 45 L7OK 200 5 671 1144889 481714 87038 4 0 105016 167 5 OK 0 5 16 1167 Layer7 check passed 2 3 4 http
9 www bck 0 0 0 10 10 1483 537137 7544118 0 0 0 0 0 UP 1 0 1 4 0 5218087 0 1 3 2 1371 2 0 17 L7OK 200 2 0 629 99 755 0 0 16 0 1036557 OK 756 1 13 1184 Layer7 check passed 2 5 6 http
10 www BACKEND 0 25 0 46 100 1721835 674684790 64813732170 314 0 130 5285 22 0 UP 1 1 1 0 5218087 0 1 3 0 1716488 1 0 45 0 1145518 481813 88664 5719 121 1721835 105172 167 35669268059 17250148556 0 556042 5 0 5 16 1167 http
11 git www 0 0 0 2 2 14539 5228218 303747244 0 0 21 0 0 UP 1 1 0 559 84 1036557 3352 1 4 1 9481 2 0 2 L7OK 200 3 0 5668 8710 140 0 0 690 0 1342 OK 1268 1 2908 4500 Layer7 check passed 2 3 4 http
12 git bck 0 0 0 0 2 0 0 0 0 0 0 0 0 UP 1 0 1 2 0 5218087 0 1 4 2 0 2 0 0 L7OK 200 2 0 0 0 0 0 0 0 0 -1 OK 0 0 0 0 Layer7 check passed 2 3 4 http
13 git BACKEND 0 6 0 8 2 14541 8082393 303747668 0 0 2 21 0 0 UP 1 1 1 0 5218087 0 1 4 0 9481 1 0 7 0 5668 8710 140 23 0 14541 690 0 133458298 38104818 0 4379 1342 1268 1 2908 4500 http
14 demo BACKEND 0 0 1 5 20 24063 7876647 659864417 48 0 1 0 0 0 UP 0 0 0 0 5218087 1 17 0 0 1 1 26 0 23983 21 0 1 57 24062 111 0 567843278 146884392 0 1083 0 2706 0 0 887 http

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
//nolint:lll,revive // conditionally long lines allowed
//nolint:lll // conditionally long lines allowed
package sqlserver
import (

View File

@ -1,4 +1,4 @@
//nolint:lll,revive // conditionally long lines allowed
//nolint:lll // conditionally long lines allowed
package sqlserver
import (

View File

@ -1,4 +1,4 @@
//nolint:lll,revive // conditionally long lines allowed
//nolint:lll // conditionally long lines allowed
package sqlserver
import (

View File

@ -1,4 +1,4 @@
//nolint:lll,revive // conditionally long lines allowed
//nolint:lll // conditionally long lines allowed
package sqlserver
import (

View File

@ -1,4 +1,4 @@
//nolint:lll,revive // conditionally long lines allowed
//nolint:lll // conditionally long lines allowed
package sqlserver
import (

View File

@ -1,4 +1,4 @@
//nolint:lll,revive // conditionally long lines allowed
//nolint:lll // conditionally long lines allowed
package sqlserver
import (

View File

@ -36,7 +36,7 @@ var (
//vcl name and backend restriction regexp [A-Za-z][A-Za-z0-9_-]*
defaultRegexps = []*regexp.Regexp{
//dynamic backends
//nolint:lll,revive // conditionally long line allowed to have a better understanding of following regexp
//nolint:lll // conditionally long line allowed to have a better understanding of following regexp
//VBE.VCL_xxxx_xxx_VOD_SHIELD_Vxxxxxxxxxxxxx_xxxxxxxxxxxxx.goto.000007c8.(xx.xx.xxx.xx).(http://xxxxxxx-xxxxx-xxxxx-xxxxxx-xx-xxxx-x-xxxx.xx-xx-xxxx-x.amazonaws.com:80).(ttl:5.000000).fail_eaddrnotavail
regexp.MustCompile(
`^VBE\.(?P<_vcl>[\w\-]*)\.goto\.[[:alnum:]]+\.\((?P<backend>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\)\.\((?P<server>.*)\)\.\(ttl:\d*\.\d*.*\)`,

View File

@ -1,6 +1,6 @@
package grok
//nolint:lll,revive // conditionally long lines allowed
//nolint:lll // conditionally long lines allowed
const DefaultPatterns = `
# Example log file pattern, example log looks like this:
# [04/Jun/2016:12:41:45 +0100] 1.25 200 192.168.1.1 5.432µs

View File

@ -18,7 +18,7 @@ import (
)
const (
//nolint:lll,revive // conditionally long lines allowed
//nolint:lll // conditionally long lines allowed
validUniqueGauge = `# HELP cadvisor_version_info A metric with a constant '1' value labeled by kernel version, OS version, docker version, cadvisor version & cadvisor revision.
# TYPE cadvisor_version_info gauge
cadvisor_version_info{cadvisorRevision="",cadvisorVersion="",dockerVersion="1.8.2",kernelVersion="3.10.0-229.20.1.el7.x86_64",osVersion="CentOS Linux 7 (Core)"} 1