Просмотр исходного кода

chore(go.d.plugin): remove duplicate logging in init/check (#18955)

Ilya Mashchenko 4 месяцев назад
Родитель
Сommit
8f0401ac3b

+ 5 - 9
src/go/plugin/go.d/modules/activemq/activemq.go

@@ -5,6 +5,7 @@ package activemq
 import (
 	_ "embed"
 	"errors"
+	"fmt"
 	"time"
 
 	"github.com/netdata/netdata/go/plugins/pkg/matcher"
@@ -75,28 +76,24 @@ func (a *ActiveMQ) Configuration() any {
 
 func (a *ActiveMQ) Init() error {
 	if err := a.validateConfig(); err != nil {
-		a.Errorf("config validation: %v", err)
-		return err
+		return fmt.Errorf("config validation: %v", err)
 	}
 
 	qf, err := a.initQueuesFiler()
 	if err != nil {
-		a.Error(err)
-		return err
+		return fmt.Errorf("init queues filer: %v", err)
 	}
 	a.queuesFilter = qf
 
 	tf, err := a.initTopicsFilter()
 	if err != nil {
-		a.Error(err)
-		return err
+		return fmt.Errorf("init topics filter: %v", err)
 	}
 	a.topicsFilter = tf
 
 	client, err := web.NewHTTPClient(a.ClientConfig)
 	if err != nil {
-		a.Error(err)
-		return err
+		return fmt.Errorf("create http client: %v", err)
 	}
 
 	a.apiClient = newAPIClient(client, a.RequestConfig, a.Webadmin)
@@ -107,7 +104,6 @@ func (a *ActiveMQ) Init() error {
 func (a *ActiveMQ) Check() error {
 	mx, err := a.collect()
 	if err != nil {
-		a.Error(err)
 		return err
 	}
 	if len(mx) == 0 {

+ 2 - 3
src/go/plugin/go.d/modules/adaptecraid/adaptec.go

@@ -7,6 +7,7 @@ package adaptecraid
 import (
 	_ "embed"
 	"errors"
+	"fmt"
 	"time"
 
 	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -68,8 +69,7 @@ func (a *AdaptecRaid) Configuration() any {
 func (a *AdaptecRaid) Init() error {
 	arcconfExec, err := a.initArcconfCliExec()
 	if err != nil {
-		a.Errorf("arcconf exec initialization: %v", err)
-		return err
+		return fmt.Errorf("arcconf exec initialization: %v", err)
 	}
 	a.exec = arcconfExec
 
@@ -79,7 +79,6 @@ func (a *AdaptecRaid) Init() error {
 func (a *AdaptecRaid) Check() error {
 	mx, err := a.collect()
 	if err != nil {
-		a.Error(err)
 		return err
 	}
 

+ 3 - 5
src/go/plugin/go.d/modules/ap/ap.go

@@ -7,6 +7,7 @@ package ap
 import (
 	_ "embed"
 	"errors"
+	"fmt"
 	"time"
 
 	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -67,14 +68,12 @@ func (a *AP) Configuration() any {
 
 func (a *AP) Init() error {
 	if err := a.validateConfig(); err != nil {
-		a.Errorf("config validation: %s", err)
-		return err
+		return fmt.Errorf("config validation: %s", err)
 	}
 
 	iw, err := a.initIwExec()
 	if err != nil {
-		a.Errorf("iw dev exec initialization: %v", err)
-		return err
+		return fmt.Errorf("iw exec initialization: %v", err)
 	}
 	a.exec = iw
 
@@ -84,7 +83,6 @@ func (a *AP) Init() error {
 func (a *AP) Check() error {
 	mx, err := a.collect()
 	if err != nil {
-		a.Error(err)
 		return err
 	}
 

+ 3 - 5
src/go/plugin/go.d/modules/apache/apache.go

@@ -5,6 +5,7 @@ package apache
 import (
 	_ "embed"
 	"errors"
+	"fmt"
 	"net/http"
 	"sync"
 	"time"
@@ -64,14 +65,12 @@ func (a *Apache) Configuration() any {
 
 func (a *Apache) Init() error {
 	if err := a.validateConfig(); err != nil {
-		a.Errorf("config validation: %v", err)
-		return err
+		return fmt.Errorf("config validation: %v", err)
 	}
 
 	httpClient, err := a.initHTTPClient()
 	if err != nil {
-		a.Errorf("init HTTP client: %v", err)
-		return err
+		return fmt.Errorf("init HTTP client: %v", err)
 	}
 	a.httpClient = httpClient
 
@@ -84,7 +83,6 @@ func (a *Apache) Init() error {
 func (a *Apache) Check() error {
 	mx, err := a.collect()
 	if err != nil {
-		a.Error(err)
 		return err
 	}
 	if len(mx) == 0 {

+ 1 - 3
src/go/plugin/go.d/modules/apcupsd/apcupsd.go

@@ -55,8 +55,7 @@ func (a *Apcupsd) Configuration() any {
 
 func (a *Apcupsd) Init() error {
 	if a.Address == "" {
-		a.Error("config: 'address' not set")
-		return errors.New("address not set")
+		return errors.New("config: 'address' not set")
 	}
 
 	return nil
@@ -65,7 +64,6 @@ func (a *Apcupsd) Init() error {
 func (a *Apcupsd) Check() error {
 	mx, err := a.collect()
 	if err != nil {
-		a.Error(err)
 		return err
 	}
 	if len(mx) == 0 {

+ 0 - 1
src/go/plugin/go.d/modules/beanstalk/beanstalk.go

@@ -85,7 +85,6 @@ func (b *Beanstalk) Init() error {
 func (b *Beanstalk) Check() error {
 	mx, err := b.collect()
 	if err != nil {
-		b.Error(err)
 		return err
 	}
 

+ 5 - 9
src/go/plugin/go.d/modules/bind/bind.go

@@ -5,6 +5,7 @@ package bind
 import (
 	_ "embed"
 	"errors"
+	"fmt"
 	"net/http"
 	"time"
 
@@ -71,14 +72,12 @@ func (b *Bind) Configuration() any {
 
 func (b *Bind) Init() error {
 	if err := b.validateConfig(); err != nil {
-		b.Errorf("config verification: %v", err)
-		return err
+		return fmt.Errorf("config verification: %v", err)
 	}
 
 	pvm, err := b.initPermitViewMatcher()
 	if err != nil {
-		b.Error(err)
-		return err
+		return fmt.Errorf("init permit view matcher: %v", err)
 	}
 	if pvm != nil {
 		b.permitView = pvm
@@ -86,15 +85,13 @@ func (b *Bind) Init() error {
 
 	httpClient, err := web.NewHTTPClient(b.ClientConfig)
 	if err != nil {
-		b.Errorf("creating http client : %v", err)
-		return err
+		return fmt.Errorf("creating http client : %v", err)
 	}
 	b.httpClient = httpClient
 
 	bindClient, err := b.initBindApiClient(httpClient)
 	if err != nil {
-		b.Error(err)
-		return err
+		return fmt.Errorf("init bind api client: %v", err)
 	}
 	b.bindAPIClient = bindClient
 
@@ -104,7 +101,6 @@ func (b *Bind) Init() error {
 func (b *Bind) Check() error {
 	mx, err := b.collect()
 	if err != nil {
-		b.Error(err)
 		return err
 	}
 	if len(mx) == 0 {

+ 1 - 3
src/go/plugin/go.d/modules/boinc/boinc.go

@@ -57,8 +57,7 @@ func (b *Boinc) Configuration() any {
 
 func (b *Boinc) Init() error {
 	if b.Address == "" {
-		b.Error("config: 'address' not set")
-		return errors.New("address not set")
+		return errors.New("config: 'address' not set")
 	}
 
 	return nil
@@ -67,7 +66,6 @@ func (b *Boinc) Init() error {
 func (b *Boinc) Check() error {
 	mx, err := b.collect()
 	if err != nil {
-		b.Error(err)
 		return err
 	}
 

+ 3 - 5
src/go/plugin/go.d/modules/cassandra/cassandra.go

@@ -5,6 +5,7 @@ package cassandra
 import (
 	_ "embed"
 	"errors"
+	"fmt"
 	"time"
 
 	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
@@ -69,14 +70,12 @@ func (c *Cassandra) Configuration() any {
 
 func (c *Cassandra) Init() error {
 	if err := c.validateConfig(); err != nil {
-		c.Errorf("error on validating config: %v", err)
-		return err
+		return fmt.Errorf("error on validating config: %v", err)
 	}
 
 	prom, err := c.initPrometheusClient()
 	if err != nil {
-		c.Errorf("error on init prometheus client: %v", err)
-		return err
+		return fmt.Errorf("error on init prometheus client: %v", err)
 	}
 	c.prom = prom
 
@@ -86,7 +85,6 @@ func (c *Cassandra) Init() error {
 func (c *Cassandra) Check() error {
 	mx, err := c.collect()
 	if err != nil {
-		c.Error(err)
 		return err
 	}
 	if len(mx) == 0 {

+ 1 - 2
src/go/plugin/go.d/modules/ceph/ceph.go

@@ -84,7 +84,7 @@ func (c *Ceph) Init() error {
 
 	httpClient, err := web.NewHTTPClient(c.ClientConfig)
 	if err != nil {
-		return err
+		return fmt.Errorf("create http client: %v", err)
 	}
 	c.httpClient = httpClient
 
@@ -94,7 +94,6 @@ func (c *Ceph) Init() error {
 func (c *Ceph) Check() error {
 	mx, err := c.collect()
 	if err != nil {
-		c.Error(err)
 		return err
 	}
 

Некоторые файлы не были показаны из-за большого количества измененных файлов