Merge pull request #2062 from saschagrunert/updates

Bump golang, linter and other third party deps

.github/workflows/ci.yml

@@ -9,8 +9,8 @@ on:
 env:
   CARGO_TERM_COLOR: always
   GO_VERSION: '1.21'
-  ACTION_MSRV_TOOLCHAIN: 1.71.0
-  NIX_VERSION: '2.17.0'
+  ACTION_MSRV_TOOLCHAIN: 1.75.0
+  NIX_VERSION: '2.21.0'
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.55.0
+          version: v1.56.2
           only-new-issues: true
 
   get-script:

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
 env:
   CARGO_TERM_COLOR: always
   GO_VERSION: '1.21'
-  ACTION_MSRV_TOOLCHAIN: 1.71.0
+  ACTION_MSRV_TOOLCHAIN: 1.75.0
 
 jobs:
   build:

.golangci.yml

@@ -31,6 +31,7 @@ linters:
     - ginkgolinter
     - gocheckcompilerdirectives
     - gochecknoinits
+    - gochecksumtype
     - gocognit
     - goconst
     - gocritic
@@ -52,6 +53,7 @@ linters:
     - govet
     - grouper
     - importas
+    - inamedparam
     - ineffassign
     - interfacebloat
     - ireturn
@@ -70,19 +72,24 @@ linters:
     - noctx
     - nolintlint
     - nosprintfhostport
+    - perfsprint
     - prealloc
     - predeclared
     - promlinter
+    - protogetter
     - reassign
     - revive
     - rowserrcheck
+    - sloglint
+    - spancheck
     - sqlclosecheck
     - staticcheck
     - stylecheck
     - tagalign
     - tagliatelle
     - tenv
     - testableexamples
+    - testifylint
     - testpackage
     - thelper
     - tparallel
@@ -96,12 +103,6 @@ linters:
     - whitespace
     - wrapcheck
     - zerologlint
-    - gochecksumtype
-    - inamedparam
-    - perfsprint
-    - protogetter
-    - sloglint
-    - testifylint
     # - depguard
     # - exhaustruct
     # - gochecknoglobals
@@ -145,6 +146,7 @@ linters-settings:
       - badLock
       - badRegexp
       - badSorting
+      - badSyncOnceFunc
       - boolExprSimplify
       - builtinShadow
       - builtinShadowDecl
@@ -210,7 +212,6 @@ linters-settings:
       - sliceClear
       - sloppyLen
       - sloppyReassign
-      - sloppyTestFuncName
       - sloppyTypeAssert
       - sortSlice
       - sprintfQuotedString
@@ -220,7 +221,6 @@ linters-settings:
       - stringsCompare
       - switchTrue
       - syncMapLoadAndDelete
-      - timeCmpSimplify
       - timeExprSimplify
       - todoCommentWithoutDetail
       - tooManyResultsChecker

Makefile

@@ -10,8 +10,8 @@ TEST_FLAGS ?=
 PACKAGE_NAME ?= $(shell cargo metadata --no-deps --format-version 1 | jq -r '.packages[2] | [ .name, .version ] | join("-v")')
 PREFIX ?= /usr
 CI_TAG ?=
-GOLANGCI_LINT_VERSION := v1.55.0
-ZEITGEIST_VERSION := v0.4.1
+GOLANGCI_LINT_VERSION := v1.56.2
+ZEITGEIST_VERSION := v0.4.4
 
 default:
 	cargo build
@@ -55,7 +55,7 @@ integration-static: .install.ginkgo # It needs to be release so we correctly tes
 		$(MAKE) release-static; \
 	fi && \
 	export RUNTIME_BINARY="$(RUNTIME_PATH)" && \
-	export MAX_RSS_KB=7500 && \
+	export MAX_RSS_KB=9500 && \
 	sudo -E "$(GOTOOLS_BINDIR)/ginkgo" $(TEST_FLAGS) $(GINKGO_FLAGS)
 
 .install.ginkgo:
@@ -69,7 +69,7 @@ integration-static: .install.ginkgo # It needs to be release so we correctly tes
 $(GOTOOLS_BINDIR)/zeitgeist:
 	mkdir -p $(GOTOOLS_BINDIR)
 	curl -sSfL -o $(GOTOOLS_BINDIR)/zeitgeist \
-		https://github.com/kubernetes-sigs/zeitgeist/releases/download/$(ZEITGEIST_VERSION)/zeitgeist_$(ZEITGEIST_VERSION:v%=%)_linux_amd64
+		https://storage.googleapis.com/k8s-artifacts-sig-release/kubernetes-sigs/zeitgeist/$(ZEITGEIST_VERSION)/zeitgeist-amd64-linux
 	chmod +x $(GOTOOLS_BINDIR)/zeitgeist
 
 clean:

dependencies.yaml

@@ -11,23 +11,23 @@ dependencies:
         match: GO_VERSION
 
   - name: rust
-    version: 1.71.0
+    version: 1.75.0
     refPaths:
       - path: .github/workflows/ci.yml
         match: ACTION_MSRV_TOOLCHAIN
       - path: .github/workflows/release.yml
         match: ACTION_MSRV_TOOLCHAIN
 
   - name: golangci-lint
-    version: 1.55.0
+    version: 1.56.2
     refPaths:
       - path: .github/workflows/ci.yml
         match: version
       - path: Makefile
         match: GOLANGCI_LINT_VERSION
 
   - name: zeitgeist
-    version: 0.4.1
+    version: 0.4.4
     refPaths:
       - path: Makefile
         match: ZEITGEIST_VERSION
@@ -39,7 +39,7 @@ dependencies:
         match: JAEGER_IMG
 
   - name: nix
-    version: 2.17.0
+    version: 2.21.0
     refPaths:
       - path: .github/workflows/ci.yml
         match: NIX_VERSION

pkg/client/client.go

@@ -238,6 +238,7 @@ func (c *ConmonClient) startSpan(ctx context.Context, name string) (context.Cont
 	}
 	const prefix = "conmonrs-client: "
 
+	//nolint:spancheck // https://github.com/jjti/go-spancheck/issues/7
 	return c.tracer.Start(ctx, prefix+name, trace.WithSpanKind(trace.SpanKindClient))
 }
 

pkg/client/remote_fds.go

@@ -22,7 +22,7 @@ var (
 type serverError string
 
 func (s serverError) Error() string {
-	return fmt.Sprintf("server error: %s", string(s))
+	return "server error: " + string(s)
 }
 
 const (

pkg/client/suite_test.go

@@ -38,7 +38,7 @@ var (
 	busyboxDest = filepath.Join(busyboxDestDir, "busybox")
 	runtimePath = os.Getenv("RUNTIME_BINARY")
 	conmonPath  = os.Getenv(conmonBinaryKey)
-	maxRSSKB    = 7500
+	maxRSSKB    = 9500
 )
 
 // TestConmonClient runs the created specs.