Merge branch 'dev-v2' into check-metrics-report-type

Author: aphralG

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ permissions:
   contents: read
 
 env:
-  GOLANGCI_LINT_VERSION: 'v2.2.1'
+  GOLANGCI_LINT_VERSION: 'v2.10.1'
   NFPM_VERSION: 'v2.35.3'
   NGINX_OSS_REGISTRY: 'docker-registry.nginx.com'
 

Makefile.tools

@@ -6,7 +6,7 @@ LEFTHOOK           = "github.com/evilmartians/lefthook@v1.5.5"
 GO_SWAGGER         = "github.com/go-swagger/go-swagger/cmd/swagger@abb53530bfcf49c470e5f4c7071ee43f37ec7437" # v0.30.5 currently broken. Update expected shortly. Ref: https://github.com/go-swagger/go-swagger/issues/3070
 PROTOBUF           = "github.com/gogo/protobuf/protoc-gen-gogo@v1.3.2"
 GOGOFAST           = "github.com/gogo/protobuf/protoc-gen-gogofast@v1.3.2"
-GOLANGCI_LINT       = "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.4.0"
+GOLANGCI_LINT       = "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.10.0"
 PROTOC_GENGO       = "google.golang.org/protobuf/cmd/protoc-gen-go@v1.32.0"
 PROTOC_VALIDATORS  = "github.com/mwitkow/go-proto-validators/protoc-gen-govalidators@v0.3.2"
 PROTOC_GEN_DOC     = "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v1.5.1"

go.mod

@@ -1,8 +1,8 @@
 module github.com/nginx/agent/v2
 
-go 1.24.2
+go 1.25
 
-toolchain go1.24.13
+toolchain go1.25.7
 
 require (
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect

go.work

@@ -1,6 +1,6 @@
-go 1.24.2
+go 1.25.7
 
-toolchain go1.24.13
+toolchain go1.25.7
 
 use (
 	.

sdk/go.mod

@@ -1,8 +1,8 @@
 module github.com/nginx/agent/sdk/v2
 
-go 1.24.2
+go 1.25
 
-toolchain go1.24.13
+toolchain go1.25.7
 
 require (
 	github.com/cenkalti/backoff/v4 v4.2.1

test/integration/go.mod

@@ -1,8 +1,8 @@
 module github.com/nginx/agent/test/integration
 
-go 1.24.2
+go 1.25
 
-toolchain go1.24.13
+toolchain go1.25.7
 
 require (
 	github.com/docker/docker v28.0.1+incompatible

test/integration/vendor/modules.txt

@@ -178,7 +178,7 @@ github.com/moby/term/windows
 ## explicit
 github.com/morikuni/aec
 # github.com/nginx/agent/sdk/v2 v2.0.0-00010101000000-000000000000 => ./../../sdk
-## explicit; go 1.24.2
+## explicit; go 1.25
 github.com/nginx/agent/sdk/v2
 github.com/nginx/agent/sdk/v2/agent/config
 github.com/nginx/agent/sdk/v2/agent/events
@@ -193,7 +193,7 @@ github.com/nginx/agent/sdk/v2/proto/common
 github.com/nginx/agent/sdk/v2/proto/events
 github.com/nginx/agent/sdk/v2/zip
 # github.com/nginx/agent/v2 v2.0.0-00010101000000-000000000000 => ./../../
-## explicit; go 1.24.2
+## explicit; go 1.25
 github.com/nginx/agent/v2/src/core
 github.com/nginx/agent/v2/src/core/config
 github.com/nginx/agent/v2/src/core/network

test/performance/go.mod

@@ -1,8 +1,8 @@
 module github.com/nginx/agent/test/performance
 
-go 1.24.2
+go 1.25
 
-toolchain go1.24.13
+toolchain go1.25.7
 
 require (
 	github.com/gogo/protobuf v1.3.2

test/performance/vendor/modules.txt

@@ -119,7 +119,7 @@ github.com/nats-io/nkeys
 ## explicit
 github.com/nats-io/nuid
 # github.com/nginx/agent/sdk/v2 v2.0.0-00010101000000-000000000000 => ./../../sdk
-## explicit; go 1.24.2
+## explicit; go 1.25
 github.com/nginx/agent/sdk/v2
 github.com/nginx/agent/sdk/v2/agent/config
 github.com/nginx/agent/sdk/v2/agent/events
@@ -134,7 +134,7 @@ github.com/nginx/agent/sdk/v2/proto/common
 github.com/nginx/agent/sdk/v2/proto/events
 github.com/nginx/agent/sdk/v2/zip
 # github.com/nginx/agent/v2 v2.0.0-00010101000000-000000000000 => ./../../
-## explicit; go 1.24.2
+## explicit; go 1.25
 github.com/nginx/agent/v2/src/core
 github.com/nginx/agent/v2/src/core/config
 github.com/nginx/agent/v2/src/core/logger

vendor/modules.txt

@@ -240,9 +240,9 @@ github.com/nats-io/nkeys
 ## explicit
 github.com/nats-io/nuid
 # github.com/nginx/agent/sdk/v2 v2.0.0-00010101000000-000000000000 => ./sdk
-## explicit; go 1.24.2
+## explicit; go 1.25
 # github.com/nginx/agent/v2 v2.0.0-00010101000000-000000000000 => .
-## explicit; go 1.24.2
+## explicit; go 1.25
 # github.com/nginx/nginx-plus-go-client/v3 v3.0.1
 ## explicit; go 1.24.2
 github.com/nginx/nginx-plus-go-client/v3/client