update runners to 1.18.7 and ignore new linters

rmfitzpatrick · rmfitzpatrick · commit e534c1c0285c · 2022-11-01T18:33:01.000Z
diff --git a/.github/workflows/docs_test.yml b/.github/workflows/docs_test.yml
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.18.7
 
 jobs:
   docs_test:
diff --git a/.github/workflows/go-lint.yml b/.github/workflows/go-lint.yml
@@ -12,8 +12,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  GO_VERSION: 1.18
-  LINT_VERSION: 1.45.2
+  GO_VERSION: 1.18.7
+  LINT_VERSION: 1.48.0
 
 jobs:
   go-lint:
diff --git a/.github/workflows/go-test-race.yml b/.github/workflows/go-test-race.yml
@@ -12,7 +12,7 @@ concurrency:
 
 env:
   RESULT_PATH: "unit_results.xml"
-  GO_VERSION: 1.18
+  GO_VERSION: 1.18.7
 
 jobs:
   go-test-race:
diff --git a/.github/workflows/gotests.yml b/.github/workflows/gotests.yml
@@ -12,7 +12,7 @@ concurrency:
 
 env:
   RESULT_PATH: "~/testresults"
-  GO_VERSION: 1.18
+  GO_VERSION: 1.18.7
 
 jobs:
   gotests:
diff --git a/.github/workflows/modules_and_generate.yml b/.github/workflows/modules_and_generate.yml
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.18.7
 
 jobs:
   modules_and_generate:
diff --git a/.github/workflows/perf-tests.yml b/.github/workflows/perf-tests.yml
@@ -12,7 +12,7 @@ concurrency:
 
 env:
   RESULT_PATH: testresults
-  GO_VERSION: 1.18
+  GO_VERSION: 1.18.7
   PYTHON_VERSION: 3.8.10
   REQUIREMENTS_PATH: "tests/requirements.txt"
 
diff --git a/.github/workflows/win_build_and_test.yml b/.github/workflows/win_build_and_test.yml
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  GO_VERSION: 1.18
+  GO_VERSION: 1.18.7
   RESULT_PATH: testresults
   PYTHON_VERSION: 3.8.10
   REQUIREMENTS_PATH: "tests/requirements.txt"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -82,7 +82,7 @@ win-bundle-build:
     GOOS: "windows"
     GO111MODULE: "on"
   before_script:
-    - choco upgrade -y golang --version 1.18
+    - choco upgrade -y golang --version 1.18.7
     - choco upgrade -y git --version 2.33.0.2
     - refreshenv
   script:
diff --git a/.golangci.yml b/.golangci.yml
@@ -74,6 +74,53 @@ linters:
     # violations.
     - funlen
     - gocognit
+    # The following started erroring w/ 1.18 upgrade. Disabling
+    # for now and their value could be evaluated in the future.
+    - asasalint
+    - containedctx
+    - cyclop
+    - errchkjson
+    - errcheck
+    - errname
+    - errorlint
+    - exhaustive
+    - exhaustivestruct
+    - exhaustruct
+    - forbidigo
+    - forcetypeassert
+    - gci
+    - gocritic
+    - godot
+    - goerr113
+    - gofumpt
+    - gomoddirectives
+    - gosec
+    - gosimple
+    - ifshort
+    - ireturn
+    - maintidx
+    - nestif
+    - nilnil
+    - nlreturn
+    - noctx
+    - nolintlint
+    - nonamedreturns
+    - nosprintfhostport
+    - nosnakecase
+    - paralleltest
+    - predeclared
+    - promlinter
+    - revive
+    - staticcheck
+    - stylecheck
+    - tagliatelle
+    - testpackage
+    - thelper
+    - tparallel
+    - usestdlibvars
+    - varnamelen
+    - wrapcheck
+
 
 linters-settings:
   settings:
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.18
+ARG GO_VERSION=1.18.7
 ARG PIP_VERSION=21.0.1
 
 ###### Agent Build Image ########
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -34,6 +34,7 @@ ENV SIGNALFX_BUNDLE_DIR=/bundle \
     GOOS=linux \
     LC_ALL=C.UTF-8 \
     LANG=C.UTF-8
+ENV GOFLAGS="-buildvcs=false"
 
 RUN rm -f /usr/bin/python3 && \
     ln -s /usr/bin/python3.8 /usr/bin/python && \
@@ -84,7 +85,7 @@ COPY --from=signalfx-agent-dev-cache:stage-agent-builder /go $GOPATH
 RUN go install golang.org/x/lint/golint@latest
 RUN if [ `uname -m` != "aarch64" ]; then go install github.com/go-delve/delve/cmd/dlv@latest; fi
 RUN go install github.com/tebeka/go2xunit@latest
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.2
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.48.0
 
 COPY ./ ./
 
diff --git a/go.mod b/go.mod
@@ -206,7 +206,7 @@ require (
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
 	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
-	github.com/hashicorp/go-version v1.4.0 // indirect
+	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.1-vault-3 // indirect
 	github.com/hashicorp/serf v0.9.7 // indirect
 	github.com/hashicorp/vault/sdk v0.5.3 // indirect
@@ -292,6 +292,7 @@ require (
 	gopkg.in/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.66.6 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
@@ -903,8 +903,8 @@ github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2I
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/go-version v1.4.0 h1:aAQzgqIrRKRa7w75CKpbBxYsmUoPjzVm1W59ca1L0J4=
-github.com/hashicorp/go-version v1.4.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
+github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
@@ -2538,8 +2538,9 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.52.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
 gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI=
+gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo=
 gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q=
 gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4=
diff --git a/pkg/core/diagnostics.go b/pkg/core/diagnostics.go
@@ -26,7 +26,7 @@ import (
 
 // VersionLine should be populated by the startup logic to contain version
 // information that can be reported in diagnostics.
-//nolint: gochecknoglobals
+// nolint: gochecknoglobals
 var VersionLine string
 
 // Serves the diagnostic status on the specified path
diff --git a/pkg/core/propfilters/set.go b/pkg/core/propfilters/set.go
@@ -12,7 +12,7 @@ type FilterSet struct {
 
 // FilterDimension sends a *types.Dimension through each of the filters in the set
 // and filters properties. All original properties will be returned if no filter matches
-//, or a subset of the original if some are filtered, or nil if all are filtered.
+// , or a subset of the original if some are filtered, or nil if all are filtered.
 func (fs *FilterSet) FilterDimension(dim *types.Dimension) *types.Dimension {
 	filteredDim := &(*dim)
 	for _, f := range fs.Filters {
diff --git a/pkg/core/services/endpoint.go b/pkg/core/services/endpoint.go
@@ -18,7 +18,7 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-//ID uniquely identifies a service instance
+// ID uniquely identifies a service instance
 type ID string
 
 // Endpoint is the generic interface that all types of service instances should
diff --git a/pkg/core/writer/splunk/log_event_writer.gen.go b/pkg/core/writer/splunk/log_event_writer.gen.go
diff --git a/pkg/monitors/elasticsearch/query/datapoints.go b/pkg/monitors/elasticsearch/query/datapoints.go
@@ -179,20 +179,22 @@ func (dpC *dpCollector) collectDatapointsFromMetricAggregation() []*datapoint.Da
 
 // Collect datapoints from "stats" or "extended_stats" metric aggregation
 // Extended stats aggregations look like:
-// {
-//		"count" : 36370,
-//		"min" : 0.0,
-//		"max" : 100.0,
-//		"avg" : 49.98350288699478,
-//		"sum" : 1817900.0,
-//		"sum_of_squares" : 1.21849642E8,
-//		"variance" : 851.9282953459498,
-//		"std_deviation" : 29.187810732323687,
-//		"std_deviation_bounds" : {
-//			"upper" : 108.35912435164215,
-//			"lower" : -8.392118577652596
-//  	}
-// }
+//
+//	{
+//			"count" : 36370,
+//			"min" : 0.0,
+//			"max" : 100.0,
+//			"avg" : 49.98350288699478,
+//			"sum" : 1817900.0,
+//			"sum_of_squares" : 1.21849642E8,
+//			"variance" : 851.9282953459498,
+//			"std_deviation" : 29.187810732323687,
+//			"std_deviation_bounds" : {
+//				"upper" : 108.35912435164215,
+//				"lower" : -8.392118577652596
+//	 	}
+//	}
+//
 // Metric names from this integration will look like "extended_stats.count",
 // "extended_stats.min", "extended_stats.std_deviation_bounds.lower" and so on
 func (dpC *dpCollector) getDatapointsFromStats(aggName string, aggRes *aggregationResponse, dims map[string]string) []*datapoint.Datapoint {
diff --git a/pkg/monitors/elasticsearch/stats/indexstats.go b/pkg/monitors/elasticsearch/stats/indexstats.go
@@ -1,6 +1,6 @@
 package stats
 
-//IndexStatsOutput contains all the index level stats of
+// IndexStatsOutput contains all the index level stats of
 // the following types and will be used to retrieve node
 // level metrics
 type IndexStatsOutput struct {
diff --git a/pkg/monitors/kubernetes/cluster/metrics/deployments.go b/pkg/monitors/kubernetes/cluster/metrics/deployments.go
@@ -1,4 +1,4 @@
-//nolint: dupl
+// nolint: dupl
 package metrics
 
 import (
diff --git a/pkg/monitors/kubernetes/cluster/metrics/replicasets.go b/pkg/monitors/kubernetes/cluster/metrics/replicasets.go
@@ -1,4 +1,4 @@
-//nolint: dupl
+// nolint: dupl
 package metrics
 
 import (
diff --git a/pkg/monitors/kubernetes/cluster/metrics/statefulsets.go b/pkg/monitors/kubernetes/cluster/metrics/statefulsets.go
@@ -1,4 +1,4 @@
-//nolint: dupl
+// nolint: dupl
 package metrics
 
 import (
diff --git a/pkg/monitors/manager_test.go b/pkg/monitors/manager_test.go
@@ -15,10 +15,10 @@ import (
 )
 
 // Used to make unique service ids
-//nolint: gochecknoglobals
+// nolint: gochecknoglobals
 var serviceID = 0
 
-//nolint: unparam
+// nolint: unparam
 func newService(imageName string, publicPort int) services.Endpoint {
 	serviceID++
 
diff --git a/pkg/observers/host/host_windows.go b/pkg/observers/host/host_windows.go
@@ -41,5 +41,5 @@ func (p *processName) setPidNameMap() error {
 			break
 		}
 	}
-	return nil
+	return err
 }
diff --git a/pkg/selfdescribe/notes.go b/pkg/selfdescribe/notes.go
@@ -18,7 +18,6 @@ var (
 )
 
 // readNote collects a single note from a sequence of comments.
-//
 func readNote(list []*ast.Comment, notes map[string][]*doc.Note) {
 	text := (&ast.CommentGroup{List: list}).Text()
 	if m := noteMarkerRx.FindStringSubmatchIndex(text); m != nil {
@@ -44,7 +43,6 @@ func readNote(list []*ast.Comment, notes map[string][]*doc.Note) {
 // and is followed by the note body (e.g., "// BUG(gri): fix this").
 // The note ends at the end of the comment group or at the start of
 // another note in the same comment group, whichever comes first.
-//
 func readNotes(comments []*ast.CommentGroup) map[string][]*doc.Note {
 	notes := make(map[string][]*doc.Note)
 	for _, group := range comments {
diff --git a/pkg/selfdescribe/sourcedocs.go b/pkg/selfdescribe/sourcedocs.go
@@ -17,7 +17,7 @@ type astCacheEntry struct {
 	pkgs map[string]*ast.Package
 }
 
-//nolint: gochecknoglobals
+// nolint: gochecknoglobals
 // Used to cache the asts parsed from package files
 var astCache = map[string]astCacheEntry{}
 
@@ -124,7 +124,7 @@ func structFieldDocs(packageDir, structName string) map[string]string {
 	return fieldDocs
 }
 
-//nolint: gochecknoglobals
+// nolint: gochecknoglobals
 var textRE = regexp.MustCompile(`([^\n])\n([^\s])`)
 
 func commentTextToParagraphs(t string) string {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG GO_VERSION=1.18`
	`1`	`+ARG GO_VERSION=1.18.7`
`2`	`2`	`ARG PIP_VERSION=21.0.1`
`3`	`3`
`4`	`4`	`###### Agent Build Image ########`