experimental fix

nginx · Aug 21, 2024 · 7be17ee · 7be17ee
1 parent eda39b2
commit 7be17ee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/internal/mode/static/manager.go b/internal/mode/static/manager.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	ngxclient "github.com/nginxinc/nginx-plus-go-client/client"
 	tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry"
 	"github.com/prometheus/client_golang/prometheus"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
@@ -159,7 +158,7 @@ func StartManager(cfg config.Config) error {
 		handlerCollector    handlerMetricsCollector     = collectors.NewControllerNoopCollector()
 	)
 
-	var ngxPlusClient *ngxclient.NginxClient
+	var ngxPlusClient ngxruntime.NginxPlusClient
 	var usageSecret *usage.Secret
 
 	if cfg.Plus {

diff --git a/internal/mode/static/metrics/collectors/nginx.go b/internal/mode/static/metrics/collectors/nginx.go
@@ -2,7 +2,6 @@ package collectors
 
 import (
 	"github.com/go-kit/log"
-	"github.com/nginxinc/nginx-plus-go-client/client"
 	prometheusClient "github.com/nginxinc/nginx-prometheus-exporter/client"
 	nginxCollector "github.com/nginxinc/nginx-prometheus-exporter/collector"
 	"github.com/prometheus/client_golang/prometheus"
@@ -26,7 +25,7 @@ func NewNginxMetricsCollector(constLabels map[string]string, logger log.Logger)
 
 // NewNginxPlusMetricsCollector creates an NginxCollector which fetches stats from NGINX Plus API over a unix socket.
 func NewNginxPlusMetricsCollector(
-	plusClient *client.NginxClient,
+	plusClient runtime.NginxPlusClient,
 	constLabels map[string]string,
 	logger log.Logger,
 ) (prometheus.Collector, error) {

diff --git a/internal/mode/static/nginx/runtime/manager.go b/internal/mode/static/nginx/runtime/manager.go
@@ -36,7 +36,7 @@ var childProcPathFmt = "/proc/%[1]v/task/%[1]v/children"
 
 //counterfeiter:generate . nginxPlusClient
 
-type nginxPlusClient interface {
+type NginxPlusClient interface {
 	UpdateHTTPServers(
 		upstream string,
 		servers []ngxclient.UpstreamServer,
@@ -79,13 +79,13 @@ type ManagerImpl struct {
 	processHandler   ProcessHandler
 	metricsCollector MetricsCollector
 	verifyClient     nginxConfigVerifier
-	ngxPlusClient    nginxPlusClient
+	ngxPlusClient    NginxPlusClient
 	logger           logr.Logger
 }
 
 // NewManagerImpl creates a new ManagerImpl.
 func NewManagerImpl(
-	ngxPlusClient nginxPlusClient,
+	ngxPlusClient NginxPlusClient,
 	collector MetricsCollector,
 	logger logr.Logger,
 	processHandler ProcessHandler,