Update nginx-plus-go-client to v3.0.1 (#1327)

dhurley · web-flow · commit 1cf4ea0abc2d · 2025-10-13T10:53:03.000+01:00
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/nginx/agent/v3
 
-go 1.24.0
+go 1.24.2
 
 toolchain go1.24.7
 
@@ -17,7 +17,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2
 	github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
-	github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1
+	github.com/nginx/nginx-plus-go-client/v3 v3.0.1
 	github.com/nginxinc/nginx-prometheus-exporter v1.3.0
 	github.com/nxadm/tail v1.4.11
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.135.0
@@ -340,7 +340,7 @@ require (
 	golang.org/x/arch v0.12.0 // indirect
 	golang.org/x/exp v0.0.0-20250808145144-a408d31f581a // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	golang.org/x/tools v0.36.0 // indirect
 	gonum.org/v1/gonum v0.16.0 // indirect
diff --git a/go.sum b/go.sum
@@ -468,10 +468,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/nginx/nginx-plus-go-client/v3 v3.0.1 h1:SU8MoRQVSa1aXqNUI3fc+OA9GM30aqAhV4yBWs9tD2s=
+github.com/nginx/nginx-plus-go-client/v3 v3.0.1/go.mod h1:PjlGB6drb5RCWnUp1XDTlzKFPRI2a3ePg2kNCb1AN94=
 github.com/nginxinc/nginx-go-crossplane v0.4.46 h1:QsmhZRHkl2IcPjqjbLB8s55ViH0u5hopSv6DpwgtmOo=
 github.com/nginxinc/nginx-go-crossplane v0.4.46/go.mod h1:UzbZnyFv0vPlt1Urbnp/mrFCzBL4tYCReFuNBpFQEfI=
-github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1 h1:5VVK38bnELMDWnwfF6dSv57ResXh9AUzeDa72ENj94o=
-github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1/go.mod h1:He+1izxYxVVO5/C9ZTukwOpvkAx5eS19nRQgKXDhX5I=
 github.com/nginxinc/nginx-prometheus-exporter v1.3.0 h1:1JtdxsZH0Uwhu1nL/j/QyOXytP5V5j68AEo2X+DFWb0=
 github.com/nginxinc/nginx-prometheus-exporter v1.3.0/go.mod h1:hXoH+X6aIKSyQuO6QTIiPKH3eZyxqy/wW8GYiE3dflU=
 github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
@@ -1028,8 +1028,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/internal/collector/nginxplusreceiver/record/cache_metrics.go b/internal/collector/nginxplusreceiver/record/cache_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
diff --git a/internal/collector/nginxplusreceiver/record/http_metrics.go b/internal/collector/nginxplusreceiver/record/http_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
@@ -35,22 +35,22 @@ func (hm *HTTPMetrics) RecordHTTPMetrics(stats *plusapi.Stats, now pcommon.Times
 	// Connections
 	hm.mb.RecordNginxHTTPConnectionsDataPoint(
 		now,
-		int64(stats.Connections.Accepted),
+		stats.Connections.Accepted,
 		metadata.AttributeNginxConnectionsOutcomeACCEPTED,
 	)
 	hm.mb.RecordNginxHTTPConnectionsDataPoint(
 		now,
-		int64(stats.Connections.Dropped),
+		stats.Connections.Dropped,
 		metadata.AttributeNginxConnectionsOutcomeDROPPED,
 	)
 	hm.mb.RecordNginxHTTPConnectionCountDataPoint(
 		now,
-		int64(stats.Connections.Active),
+		stats.Connections.Active,
 		metadata.AttributeNginxConnectionsOutcomeACTIVE,
 	)
 	hm.mb.RecordNginxHTTPConnectionCountDataPoint(
 		now,
-		int64(stats.Connections.Idle),
+		stats.Connections.Idle,
 		metadata.AttributeNginxConnectionsOutcomeIDLE,
 	)
 }
diff --git a/internal/collector/nginxplusreceiver/record/location_zone_metrics.go b/internal/collector/nginxplusreceiver/record/location_zone_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
diff --git a/internal/collector/nginxplusreceiver/record/server_zone_metrics.go b/internal/collector/nginxplusreceiver/record/server_zone_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
diff --git a/internal/collector/nginxplusreceiver/record/slab_metrics.go b/internal/collector/nginxplusreceiver/record/slab_metrics.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.uber.org/zap"
 )
diff --git a/internal/collector/nginxplusreceiver/record/ssl_metrics.go b/internal/collector/nginxplusreceiver/record/ssl_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
diff --git a/internal/collector/nginxplusreceiver/record/stream_metrics.go b/internal/collector/nginxplusreceiver/record/stream_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
diff --git a/internal/collector/nginxplusreceiver/record/upstream_metrics.go b/internal/collector/nginxplusreceiver/record/upstream_metrics.go
@@ -7,7 +7,7 @@ package record
 
 import (
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
diff --git a/internal/collector/nginxplusreceiver/scraper.go b/internal/collector/nginxplusreceiver/scraper.go
@@ -27,7 +27,7 @@ import (
 	"go.opentelemetry.io/collector/receiver"
 
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"
-	plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"
+	plusapi "github.com/nginx/nginx-plus-go-client/v3/client"
 )
 
 type NginxPlusScraper struct {
diff --git a/internal/resource/resource_plugin_test.go b/internal/resource/resource_plugin_test.go
@@ -17,7 +17,7 @@ import (
 	"google.golang.org/protobuf/types/known/structpb"
 
 	"github.com/nginx/agent/v3/test/helpers"
-	"github.com/nginxinc/nginx-plus-go-client/v2/client"
+	"github.com/nginx/nginx-plus-go-client/v3/client"
 
 	"github.com/nginx/agent/v3/internal/bus/busfakes"
 
diff --git a/internal/resource/resource_service.go b/internal/resource/resource_service.go
@@ -30,7 +30,7 @@ import (
 
 	"google.golang.org/protobuf/proto"
 
-	"github.com/nginxinc/nginx-plus-go-client/v2/client"
+	"github.com/nginx/nginx-plus-go-client/v3/client"
 	"google.golang.org/protobuf/types/known/structpb"
 
 	"github.com/nginx/agent/v3/internal/config"
diff --git a/internal/resource/resource_service_test.go b/internal/resource/resource_service_test.go
diff --git a/internal/resource/resourcefakes/fake_resource_service_interface.go b/internal/resource/resourcefakes/fake_resource_service_interface.go
diff --git a/test/helpers/nginx_plus.go b/test/helpers/nginx_plus.go

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ package record`
`7`	`7`
`8`	`8`	`import (`
`9`	`9`	`"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"`
`10`		`- plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"`
	`10`	`+ plusapi "github.com/nginx/nginx-plus-go-client/v3/client"`
`11`	`11`	`"go.opentelemetry.io/collector/pdata/pcommon"`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"strconv"`
`10`	`10`
`11`	`11`	`"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver/internal/metadata"`
`12`		`- plusapi "github.com/nginxinc/nginx-plus-go-client/v2/client"`
	`12`	`+ plusapi "github.com/nginx/nginx-plus-go-client/v3/client"`
`13`	`13`	`"go.opentelemetry.io/collector/pdata/pcommon"`
`14`	`14`	`"go.uber.org/zap"`
`15`	`15`	`)`