Skip to content

Commit dccd7cc

Browse files
authored
Add linters that check for bugs (#779)
1 parent 2358dcc commit dccd7cc

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

.golangci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,19 @@ linters:
3737
- asasalint
3838
- asciicheck
3939
- bidichk
40+
- contextcheck
4041
- dupword
42+
- durationcheck
4143
- errcheck
44+
- errchkjson
4245
- errname
4346
- errorlint
4447
- exportloopref
4548
- fatcontext
4649
- forcetypeassert
4750
- gocheckcompilerdirectives
51+
- gochecksumtype
52+
- gocritic
4853
- godot
4954
- gofmt
5055
- gofumpt
@@ -58,6 +63,7 @@ linters:
5863
- loggercheck
5964
- makezero
6065
- misspell
66+
- musttag
6167
- nilerr
6268
- noctx
6369
- nolintlint

collector/nginx_plus.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,11 @@ func NewVariableLabelNames(upstreamServerVariableLabelNames []string, serverZone
251251

252252
// NewNginxPlusCollector creates an NginxPlusCollector.
253253
func NewNginxPlusCollector(nginxClient *plusclient.NginxClient, namespace string, variableLabelNames VariableLabelNames, constLabels map[string]string, logger log.Logger) *NginxPlusCollector {
254-
upstreamServerVariableLabelNames := append(variableLabelNames.UpstreamServerVariableLabelNames, variableLabelNames.UpstreamServerPeerVariableLabelNames...)
255-
streamUpstreamServerVariableLabelNames := append(variableLabelNames.StreamUpstreamServerVariableLabelNames, variableLabelNames.StreamUpstreamServerPeerVariableLabelNames...)
254+
upstreamServerVariableLabelNames := variableLabelNames.UpstreamServerVariableLabelNames
255+
streamUpstreamServerVariableLabelNames := variableLabelNames.StreamUpstreamServerVariableLabelNames
256+
257+
upstreamServerVariableLabelNames = append(upstreamServerVariableLabelNames, variableLabelNames.UpstreamServerPeerVariableLabelNames...)
258+
streamUpstreamServerVariableLabelNames = append(streamUpstreamServerVariableLabelNames, variableLabelNames.StreamUpstreamServerPeerVariableLabelNames...)
256259
return &NginxPlusCollector{
257260
variableLabelNames: variableLabelNames,
258261
upstreamServerLabels: make(map[string][]string),

0 commit comments

Comments
 (0)