Merge pull request #2895 from saschagrunert/version-bumpg

Update version to v0.7.3 and update linter

Author: saschagrunert

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 env:
   CARGO_TERM_COLOR: always
-  NIX_VERSION: "2.30.1"
+  NIX_VERSION: "2.32.4"
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -50,7 +50,7 @@ jobs:
           go-version-file: go.mod
       - uses: golangci/golangci-lint-action@0a35821d5c230e903fcfe077583637dea1b27b47 # v9.0.0
         with:
-          version: v2.4.0
+          version: v2.6.2
           only-new-issues: true
 
   get-script:

.golangci.yml

@@ -39,6 +39,7 @@ linters:
     - goconst
     - gocritic
     - gocyclo
+    - godoclint
     - godot
     - godox
     - goheader
@@ -55,6 +56,7 @@ linters:
     - ineffassign
     - interfacebloat
     - intrange
+    - iotamixing
     - ireturn
     - lll
     - loggercheck
@@ -63,6 +65,7 @@ linters:
     - mirror
     - misspell
     - mnd
+    - modernize
     - musttag
     - nakedret
     - nestif
@@ -95,6 +98,7 @@ linters:
     - tparallel
     - unconvert
     - unparam
+    - unqueryvet
     - unused
     - usestdlibvars
     - usetesting

Cargo.lock

@@ -11,8 +11,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 := v2.4.0
-ZEITGEIST_VERSION := v0.4.4
+GOLANGCI_LINT_VERSION := v2.6.2
+ZEITGEIST_VERSION := v0.5.4
 
 COLOR:=\\033[36m
 NOCOLOR:=\\033[0m

Makefile

@@ -1,6 +1,6 @@
 [package]
 name = "conmonrs-cli"
-version = "0.7.1"
+version = "0.7.3"
 edition = "2024"
 
 [dependencies]

conmon-rs/client/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "conmon-common"
 # Version listed below is also used by .packit.sh
-version = "0.7.1"
+version = "0.7.3"
 edition = "2024"
 
 [dependencies]

conmon-rs/common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "conmonrs"
-version = "0.7.1"
+version = "0.7.3"
 edition = "2024"
 
 [[bin]]

conmon-rs/server/Cargo.toml

@@ -5,7 +5,7 @@ set -uo pipefail
 # shellcheck source=stop
 source "$(dirname "${BASH_SOURCE[0]}")"/stop
 
-JAEGER_IMG="cr.jaegertracing.io/jaegertracing/jaeger:2.8.0"
+JAEGER_IMG="cr.jaegertracing.io/jaegertracing/jaeger:2.11.0"
 
 echo "Starting $JAEGER_CTR"
 "$CONTAINER_RUNTIME" run -d --rm --network host --name "$JAEGER_CTR" "$JAEGER_IMG"

contrib/tracing/start

@@ -7,27 +7,27 @@ dependencies:
         match: go
 
   - name: golangci-lint
-    version: 2.4.0
+    version: 2.6.2
     refPaths:
       - path: .github/workflows/ci.yml
         match: version
       - path: Makefile
         match: GOLANGCI_LINT_VERSION
 
   - name: zeitgeist
-    version: 0.4.4
+    version: 0.5.4
     refPaths:
       - path: Makefile
         match: ZEITGEIST_VERSION
 
   - name: jaeger
-    version: 2.8.0
+    version: 2.11.0
     refPaths:
       - path: contrib/tracing/start
         match: JAEGER_IMG
 
   - name: nix
-    version: 2.30.1
+    version: 2.32.4
     refPaths:
       - path: .github/workflows/ci.yml
         match: NIX_VERSION

dependencies.yaml

@@ -500,7 +500,7 @@ var _ = Describe("ConmonClient", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			type traceData struct {
-				Data []interface{} `json:"data"`
+				Data []any `json:"data"`
 			}
 			traces := &traceData{}
 			Expect(json.Unmarshal(body, traces)).NotTo(HaveOccurred())