Change go version to latest go 1.23.2

.github/workflows/ci.yml

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

Makefile

@@ -21,6 +21,8 @@ GOINST  = ${GOCMD} install
 GOGET   = ${GOCMD} get
 GOGEN   = ${GOCMD} generate
 GOVET   = ${GOCMD} vet
+GOMOD   = ${GOCMD} mod
+GOTIDY  = ${GOMOD} tidy
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # https://docs.nginx.com/nginx/releases/                                                                                          #
@@ -129,7 +131,7 @@ no-local-changes:
 lint: ## Run linter
 	GOWORK=off go vet ./...
 	GOWORK=off $(GORUN) $(GOLANGCI_LINT) run -c ./scripts/.golangci.yml
-	cd sdk && make lint
+	cd sdk && make lint GOLANGCI_LINT=$(GOLANGCI_LINT)
 
 format: ## Format code
 	$(GORUN) ${GOFUMPT} -l -w .

Makefile.tools

@@ -5,7 +5,7 @@ OAPI_CODEGEN       = "github.com/deepmap/oapi-codegen/v2/cmd/[email protected]
 LEFTHOOK           = "github.com/evilmartians/[email protected]"
 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/[email protected]"
-GOLANGCI_LINT      = "github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2"
+GOLANGCI_LINT      = "github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0"
 PROTOC_GENGO       = "google.golang.org/protobuf/cmd/[email protected]"
 PROTOC_VALIDATORS  = "github.com/mwitkow/go-proto-validators/[email protected]"
 PROTOC_GEN_DOC     = "github.com/pseudomuto/protoc-gen-doc/cmd/[email protected]"
@@ -31,5 +31,7 @@ install-tools: ## Install tool dependencies
 	@$(GOGET) $(MOCKGEN)
 	@$(GOINST) $(GOFUMPT)
 	@$(GOGET) $(COUNTERFEITER)
+	@$(GOGET) ./...
+	@${GOTIDY}
 	@echo "Setting up git hooks"
 	@$(GORUN) $(LEFTHOOK) install pre-push

README.md

@@ -193,7 +193,7 @@ Follow steps in the [Installation](#installation) section to download, install,
 Using your preferred method, clone the NGINX Agent repository into your development directory. See [Cloning a GitHub Repository](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository) for additional help.
 
 ## Installing Go
-NGINX Agent and the Mock Control Plane are written in Go. Go 1.22 or higher is required to build and run either application from the source code directory. You can [download Go from the official website](https://go.dev/dl/).
+NGINX Agent and the Mock Control Plane are written in Go. Go 1.23 or higher is required to build and run either application from the source code directory. You can [download Go from the official website](https://go.dev/dl/).
 
 ## Starting the gRPC Mock Control Plane
 Start the mock control plane by running the following command from the `agent` source code root directory:

go.mod

@@ -1,8 +1,8 @@
 module github.com/nginx/agent/v2
 
-go 1.22.0
+go 1.23
 
-toolchain go1.22.4
+toolchain go1.23.2
 
 require (
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
@@ -37,7 +37,7 @@ require (
 
 require (
 	github.com/go-resty/resty/v2 v2.11.0
-	github.com/nginx/agent/sdk/v2 v2.30.3
+	github.com/nginx/agent/sdk/v2 v2.38.0
 	github.com/prometheus/client_golang v1.19.1
 	github.com/rs/cors v1.11.0
 	go.uber.org/goleak v1.3.0

go.work

@@ -1,6 +1,6 @@
-go 1.22.0
+go 1.23
 
-toolchain go1.22.4
+toolchain go1.23.2
 
 use (
 	.

scripts/.golangci.yml

@@ -1,9 +1,8 @@
 run:
   timeout: 3m
-  go: '1.22.4'
+  go: '1.23.2'
 linters:
   disable:
     - gosimple
     - staticcheck
     - unused
-    - structcheck

scripts/packages/packager/Dockerfile

@@ -1,6 +1,6 @@
 ARG package_type
 
-FROM docker.io/golang:1.22-bullseye AS base
+FROM docker.io/golang:1.23-bullseye AS base
 
 ARG PKG_VER="1.17.5"
 ARG PKG_DIR="/tmp/pkg"

sdk/Makefile

@@ -5,7 +5,7 @@ clean: ## Remove all .pb.go files
 	find . -name "*.pb.go" -not -path "*/vendor/*" -exec rm -f {} \;
 
 lint: ## Run linter
-	GOWORK=off go run github.com/golangci/golangci-lint/cmd/[email protected] run -c ../scripts/.golangci.yml
+	GOWORK=off go run $(GOLANGCI_LINT) run -c ../scripts/.golangci.yml
 
 generate: clean ## Generate .pb.go files
 	for packageName in "common" "events"; do \

sdk/client/commander.go

@@ -317,7 +317,7 @@ func (c *commander) Upload(ctx context.Context, cfg *proto.NginxConfig, messageI
 		}
 
 		if status.Status != proto.UploadStatus_OK {
-			return fmt.Errorf(status.Reason)
+			return fmt.Errorf("%s", status.Reason)
 		}
 
 		return nil

sdk/go.mod

@@ -1,8 +1,8 @@
 module github.com/nginx/agent/sdk/v2
 
-go 1.22.0
+go 1.23
 
-toolchain go1.22.4
+toolchain go1.23.2
 
 require (
 	github.com/cenkalti/backoff/v4 v4.2.1

site/content/installation-upgrade/getting-started.md

@@ -23,7 +23,7 @@ Using your preferred method, clone the NGINX Agent repository into your developm
 
 ## Install Go
 
-NGINX Agent and the Mock Control Plane are written in Go. Go 1.22 or higher is required to build and run either application from the source code directory. You can [download Go from the official website](https://go.dev/dl/).
+NGINX Agent and the Mock Control Plane are written in Go. Go 1.23 or higher is required to build and run either application from the source code directory. You can [download Go from the official website](https://go.dev/dl/).
 
 ## Start the gRPC Mock Control Plane
 

site/go.mod

@@ -1,5 +1,5 @@
 module github.com/nginx/agent/site
 
-go 1.22.0
+go 1.23
 
 require github.com/nginxinc/nginx-hugo-theme v0.41.19 // indirect

src/core/metrics/collectors/container_test.go

@@ -30,7 +30,7 @@ func TestNewContainerCollector(t *testing.T) {
 
 	_, _, cleanupFunc, err := tutils.CreateTestAgentConfigEnv()
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	defer cleanupFunc()
 

src/core/metrics/collectors/nginx_test.go

@@ -141,7 +141,7 @@ func TestNewNginxCollector(t *testing.T) {
 		t.Run(tc.testName, func(t *testing.T) {
 			_, _, cleanupFunc, err := tutils.CreateTestAgentConfigEnv()
 			if err != nil {
-				t.Fatalf(err.Error())
+				t.Fatal(err.Error())
 			}
 			defer cleanupFunc()
 

src/core/metrics/sources/util.go

@@ -23,7 +23,7 @@ func NewMetricSourceLogger() *MetricSourceLogger {
 
 func (m *MetricSourceLogger) Log(message string) {
 	m.once.Do(func() {
-		log.Warnf(message)
+		log.Warn(message)
 	})
-	log.Tracef(message)
+	log.Trace(message)
 }

src/plugins/commander_test.go

@@ -398,7 +398,7 @@ func TestCommander_Process(t *testing.T) {
 			// Need to either not run parallel or properly lock the code.
 			_, _, cleanupFunc, err := tutils.CreateTestAgentConfigEnv()
 			if err != nil {
-				tt.Fatalf(err.Error())
+				tt.Fatal(err.Error())
 			}
 			defer cleanupFunc()
 

src/plugins/config_reader_test.go

@@ -132,7 +132,7 @@ func TestUpdateAgentConfig(t *testing.T) {
 	// Get the current config so we can correctly set a few test case variables
 	_, _, _, err := tutils.CreateTestAgentConfigEnv()
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	curConf, err := config.GetConfig("12345")
 	if err != nil {
@@ -256,7 +256,7 @@ func TestUpdateAgentConfig(t *testing.T) {
 			// based off of it, clean up when done.
 			_, _, cleanupFunc, err := tutils.CreateTestAgentConfigEnv()
 			if err != nil {
-				t.Fatalf(err.Error())
+				t.Fatal(err.Error())
 			}
 			defer cleanupFunc()
 

src/plugins/dataplane_status_test.go

@@ -266,7 +266,7 @@ func TestDPSSyncAgentConfigChange(t *testing.T) {
 			// based off of it, clean up when done.
 			_, _, cleanupFunc, err := tutils.CreateTestAgentConfigEnv()
 			if err != nil {
-				t.Fatalf(err.Error())
+				t.Fatal(err.Error())
 			}
 			defer cleanupFunc()
 

src/plugins/events_test.go

@@ -518,7 +518,7 @@ func TestActivityEvents_Process(t *testing.T) {
 			// Need to either not run parallel or properly lock the code.
 			_, _, cleanupFunc, err := tutils.CreateTestAgentConfigEnv()
 			if err != nil {
-				t.Fatalf(err.Error())
+				t.Fatal(err.Error())
 			}
 			defer cleanupFunc()
 

src/plugins/extensions_test.go

@@ -44,7 +44,7 @@ func TestExtensions_Process(t *testing.T) {
 	// Need to either not run parallel or properly lock the code.
 	_, _, cleanupFunc, err := tutils.CreateTestAgentConfigEnv()
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	defer cleanupFunc()
 

src/plugins/features_test.go

@@ -76,7 +76,7 @@ func TestFeatures_Process(t *testing.T) {
 
 	_, _, cleanupFunc, err := tutils.CreateTestAgentConfigEnv()
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	defer cleanupFunc()
 

src/plugins/metrics_test.go

@@ -139,7 +139,7 @@ func TestMetricsProcessNginxDetailProcUpdate(t *testing.T) {
 		t.Run(tc.testName, func(t *testing.T) {
 			_, _, cleanupFunc, err := tutils.CreateTestAgentConfigEnv()
 			if err != nil {
-				t.Fatalf(err.Error())
+				t.Fatal(err.Error())
 			}
 			defer cleanupFunc()
 
@@ -241,7 +241,7 @@ func TestMetrics_Process_AgentConfigChanged(t *testing.T) {
 			// based off of it, clean up when done.
 			_, _, cleanupFunc, err := tutils.CreateTestAgentConfigEnv()
 			if err != nil {
-				t.Fatalf(err.Error())
+				t.Fatal(err.Error())
 			}
 			defer cleanupFunc()
 

src/plugins/nginx.go

@@ -189,7 +189,7 @@ func (n *Nginx) Process(message *core.Message) {
 			n.rollbackConfigApply(response.correlationId, response.config.GetConfigData().GetNginxId(), response.nginxDetails, response.configApply, response.err, false)
 			status := &proto.Command_NginxConfigResponse{
 				NginxConfigResponse: &proto.NginxConfigResponse{
-					Status:     newErrStatus(fmt.Sprintf("Config apply failed (write): " + response.err.Error())).CmdStatus,
+					Status:     newErrStatus(fmt.Sprintf("Config apply failed (write): %s", response.err.Error())).CmdStatus,
 					Action:     proto.NginxConfigAction_APPLY,
 					ConfigData: response.config.ConfigData,
 				},
@@ -416,7 +416,7 @@ func (n *Nginx) writeConfigAndReloadNginx(correlationId string, config *proto.Ng
 			n.messagePipeline.Process(core.NewMessage(core.ConfigRollbackResponse, configRollbackResponse))
 		}
 
-		message := fmt.Sprintf("Config apply failed (write): " + err.Error())
+		message := fmt.Sprintf("Config apply failed (write): %s", err.Error())
 		return n.handleErrorStatus(status, message)
 	}
 
@@ -654,7 +654,7 @@ func (n *Nginx) rollbackConfigApply(correlationId string, nginxId string, nginxD
 			reloadErr := n.nginxBinary.Reload(nginxDetails.ProcessId, nginxDetails.ProcessPath)
 			if reloadErr != nil {
 				nginxConfigStatusMessage = fmt.Sprintf("Config rollback failed: %v", reloadErr)
-				log.Errorf(nginxConfigStatusMessage)
+				log.Error(nginxConfigStatusMessage)
 				succeeded = false
 			}
 		}

test/docker/performance/Dockerfile

@@ -86,8 +86,8 @@ STOPSIGNAL SIGQUIT
 RUN git config --global --add safe.directory /home/nginx
 
 # Install Go
-RUN wget https://go.dev/dl/go1.22.4.linux-amd64.tar.gz \
-    && tar -xvf go1.22.4.linux-amd64.tar.gz \
+RUN wget https://go.dev/dl/go1.23.2.linux-amd64.tar.gz \
+    && tar -xvf go1.23.2.linux-amd64.tar.gz \
     && mv go /usr/local
 
 ENV GOROOT=/usr/local/go

test/integration/go.mod

@@ -1,12 +1,12 @@
 module github.com/nginx/agent/test/integration
 
-go 1.22.0
+go 1.23
 
-toolchain go1.22.4
+toolchain go1.23.2
 
 require (
 	github.com/go-resty/resty/v2 v2.11.0
-	github.com/nginx/agent/sdk/v2 v2.30.3
+	github.com/nginx/agent/sdk/v2 v2.38.0
 	github.com/nginx/agent/v2 v2.0.0-00010101000000-000000000000
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0
@@ -67,9 +67,9 @@ require (
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
-	github.com/go-openapi/jsonpointer v0.20.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-openapi/jsonpointer v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.20.4 // indirect
+	github.com/go-openapi/swag v0.22.8 // indirect
 	github.com/go-sql-driver/mysql v1.7.1 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect

test/integration/go.sum

@@ -191,14 +191,12 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
-github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
-github.com/go-openapi/jsonpointer v0.20.0 h1:ESKJdU9ASRfaPNOPRx12IUyA1vn3R9GiE3KYD14BXdQ=
-github.com/go-openapi/jsonpointer v0.20.0/go.mod h1:6PGzBjjIIumbLYysB73Klnms1mwnU4G3YHOECG3CedA=
-github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
-github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
-github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
-github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
+github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs=
+github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU=
+github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4=
+github.com/go-openapi/swag v0.22.8 h1:/9RjDSQ0vbFR+NyjGMkFTsA1IA0fmhKSThmfGZjicbw=
+github.com/go-openapi/swag v0.22.8/go.mod h1:6QT22icPLEqAM/z/TChgb4WAveCHF92+2gF0CNjHpPI=
 github.com/go-resty/resty/v2 v2.11.0 h1:i7jMfNOJYMp69lq7qozJP+bjgzfAzeOhuGlyDrqxT/8=
 github.com/go-resty/resty/v2 v2.11.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
 github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
@@ -254,8 +252,8 @@ github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
+github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
@@ -326,7 +324,6 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -527,7 +524,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=