Skip to content

Commit 7be17ee

Browse files
committed
experimental fix
1 parent eda39b2 commit 7be17ee

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

internal/mode/static/manager.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"time"
99

1010
"github.com/go-logr/logr"
11-
ngxclient "github.com/nginxinc/nginx-plus-go-client/client"
1211
tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry"
1312
"github.com/prometheus/client_golang/prometheus"
1413
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
@@ -159,7 +158,7 @@ func StartManager(cfg config.Config) error {
159158
handlerCollector handlerMetricsCollector = collectors.NewControllerNoopCollector()
160159
)
161160

162-
var ngxPlusClient *ngxclient.NginxClient
161+
var ngxPlusClient ngxruntime.NginxPlusClient
163162
var usageSecret *usage.Secret
164163

165164
if cfg.Plus {

internal/mode/static/metrics/collectors/nginx.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package collectors
22

33
import (
44
"github.com/go-kit/log"
5-
"github.com/nginxinc/nginx-plus-go-client/client"
65
prometheusClient "github.com/nginxinc/nginx-prometheus-exporter/client"
76
nginxCollector "github.com/nginxinc/nginx-prometheus-exporter/collector"
87
"github.com/prometheus/client_golang/prometheus"
@@ -26,7 +25,7 @@ func NewNginxMetricsCollector(constLabels map[string]string, logger log.Logger)
2625

2726
// NewNginxPlusMetricsCollector creates an NginxCollector which fetches stats from NGINX Plus API over a unix socket.
2827
func NewNginxPlusMetricsCollector(
29-
plusClient *client.NginxClient,
28+
plusClient runtime.NginxPlusClient,
3029
constLabels map[string]string,
3130
logger log.Logger,
3231
) (prometheus.Collector, error) {

internal/mode/static/nginx/runtime/manager.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var childProcPathFmt = "/proc/%[1]v/task/%[1]v/children"
3636

3737
//counterfeiter:generate . nginxPlusClient
3838

39-
type nginxPlusClient interface {
39+
type NginxPlusClient interface {
4040
UpdateHTTPServers(
4141
upstream string,
4242
servers []ngxclient.UpstreamServer,
@@ -79,13 +79,13 @@ type ManagerImpl struct {
7979
processHandler ProcessHandler
8080
metricsCollector MetricsCollector
8181
verifyClient nginxConfigVerifier
82-
ngxPlusClient nginxPlusClient
82+
ngxPlusClient NginxPlusClient
8383
logger logr.Logger
8484
}
8585

8686
// NewManagerImpl creates a new ManagerImpl.
8787
func NewManagerImpl(
88-
ngxPlusClient nginxPlusClient,
88+
ngxPlusClient NginxPlusClient,
8989
collector MetricsCollector,
9090
logger logr.Logger,
9191
processHandler ProcessHandler,

0 commit comments

Comments
 (0)