Remove return error from NewNginxMetricsCollector

Kate Osborn · Kate Osborn · commit 2023463425c8 · 2024-01-08T11:19:15.000-07:00
diff --git a/internal/mode/static/manager.go b/internal/mode/static/manager.go
@@ -158,7 +158,7 @@ func StartManager(cfg config.Config) error {
 		if cfg.Plus {
 			ngxCollector, err = collectors.NewNginxPlusMetricsCollector(constLabels, promLogger)
 		} else {
-			ngxCollector, err = collectors.NewNginxMetricsCollector(constLabels, promLogger)
+			ngxCollector = collectors.NewNginxMetricsCollector(constLabels, promLogger)
 		}
 		if err != nil {
 			return fmt.Errorf("cannot create nginx metrics collector: %w", err)
diff --git a/internal/mode/static/metrics/collectors/nginx.go b/internal/mode/static/metrics/collectors/nginx.go
@@ -23,12 +23,11 @@ const (
 )
 
 // NewNginxMetricsCollector creates an NginxCollector which fetches stats from NGINX over a unix socket
-func NewNginxMetricsCollector(constLabels map[string]string, logger log.Logger) (prometheus.Collector, error) {
+func NewNginxMetricsCollector(constLabels map[string]string, logger log.Logger) prometheus.Collector {
 	httpClient := getSocketClient(nginxStatusSock)
-
 	ngxClient := prometheusClient.NewNginxClient(&httpClient, nginxStatusURI)
 
-	return nginxCollector.NewNginxCollector(ngxClient, metrics.Namespace, constLabels, logger), nil
+	return nginxCollector.NewNginxCollector(ngxClient, metrics.Namespace, constLabels, logger)
 }
 
 // NewNginxPlusMetricsCollector creates an NginxCollector which fetches stats from NGINX Plus API over a unix socket

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ func StartManager(cfg config.Config) error {`
`158`	`158`	`if cfg.Plus {`
`159`	`159`	`ngxCollector, err = collectors.NewNginxPlusMetricsCollector(constLabels, promLogger)`
`160`	`160`	`} else {`
`161`		`- ngxCollector, err = collectors.NewNginxMetricsCollector(constLabels, promLogger)`
	`161`	`+ ngxCollector = collectors.NewNginxMetricsCollector(constLabels, promLogger)`
`162`	`162`	`}`
`163`	`163`	`if err != nil {`
`164`	`164`	`return fmt.Errorf("cannot create nginx metrics collector: %w", err)`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,11 @@ const (`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`// NewNginxMetricsCollector creates an NginxCollector which fetches stats from NGINX over a unix socket`
`26`		`-func NewNginxMetricsCollector(constLabels map[string]string, logger log.Logger) (prometheus.Collector, error) {`
	`26`	`+func NewNginxMetricsCollector(constLabels map[string]string, logger log.Logger) prometheus.Collector {`
`27`	`27`	`httpClient := getSocketClient(nginxStatusSock)`
`28`		`-`
`29`	`28`	`ngxClient := prometheusClient.NewNginxClient(&httpClient, nginxStatusURI)`
`30`	`29`
`31`		`- return nginxCollector.NewNginxCollector(ngxClient, metrics.Namespace, constLabels, logger), nil`
	`30`	`+ return nginxCollector.NewNginxCollector(ngxClient, metrics.Namespace, constLabels, logger)`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`// NewNginxPlusMetricsCollector creates an NginxCollector which fetches stats from NGINX Plus API over a unix socket`