diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a713a150e8..dc7c2fd3f7 100644 --- a/.github/workflows/ci.yml +++ b/.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: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5ed7504de..1469713fcd 100644 --- a/.github/workflows/release.yml +++ b/.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: diff --git a/.golangci.yml b/.golangci.yml index b3d9a27c64..f99e13cbbb 100644 --- a/.golangci.yml +++ b/.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,12 +72,16 @@ linters: - noctx - nolintlint - nosprintfhostport + - perfsprint - prealloc - predeclared - promlinter + - protogetter - reassign - revive - rowserrcheck + - sloglint + - spancheck - sqlclosecheck - staticcheck - stylecheck @@ -83,6 +89,7 @@ linters: - 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 diff --git a/Makefile b/Makefile index 28b7bcabd9..56aa57ef35 100644 --- a/Makefile +++ b/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: diff --git a/dependencies.yaml b/dependencies.yaml index cd809c75ba..bef0f21573 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -11,7 +11,7 @@ dependencies: match: GO_VERSION - name: rust - version: 1.71.0 + version: 1.75.0 refPaths: - path: .github/workflows/ci.yml match: ACTION_MSRV_TOOLCHAIN @@ -19,7 +19,7 @@ dependencies: match: ACTION_MSRV_TOOLCHAIN - name: golangci-lint - version: 1.55.0 + version: 1.56.2 refPaths: - path: .github/workflows/ci.yml match: version @@ -27,7 +27,7 @@ dependencies: 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 diff --git a/pkg/client/client.go b/pkg/client/client.go index 0927d423ec..6b361817b9 100644 --- a/pkg/client/client.go +++ b/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)) } diff --git a/pkg/client/remote_fds.go b/pkg/client/remote_fds.go index f4b929d946..6163445b6c 100644 --- a/pkg/client/remote_fds.go +++ b/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 ( diff --git a/pkg/client/suite_test.go b/pkg/client/suite_test.go index 6d2d9746c9..f70bacca6f 100644 --- a/pkg/client/suite_test.go +++ b/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.