Merge pull request #488 from peczenyj/substitute-pkg/errors-by-stdlib-errors

Substitute pkg/errors by stdlib errors

Author: danielqsj

go.mod

@@ -7,7 +7,6 @@ require (
 	github.com/alecthomas/kingpin/v2 v2.4.0
 	github.com/aws/aws-msk-iam-sasl-signer-go v1.0.0
 	github.com/krallistic/kazoo-go v0.0.0-20170526135507-a15279744f4e
-	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.20.0
 	github.com/prometheus/common v0.55.0
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475

go.sum

@@ -90,8 +90,6 @@ 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/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
 github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI=

kafka_exporter.go

@@ -19,7 +19,6 @@ import (
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/aws/aws-msk-iam-sasl-signer-go/signer"
 	"github.com/krallistic/kazoo-go"
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	plog "github.com/prometheus/common/promlog"
@@ -212,7 +211,7 @@ func NewExporter(opts kafkaOpts, topicFilter string, topicExclude string, groupF
 		case "plain":
 		default:
 			return nil, fmt.Errorf(
-				`invalid sasl mechanism "%s": can only be "scram-sha256", "scram-sha512", "gssapi", "awsiam" or "plain"`,
+				`invalid sasl mechanism %q: can only be "scram-sha256", "scram-sha512", "gssapi", "awsiam" or "plain"`,
 				opts.saslMechanism,
 			)
 		}
@@ -248,7 +247,7 @@ func NewExporter(opts kafkaOpts, topicFilter string, topicExclude string, groupF
 
 		canReadCertAndKey, err := CanReadCertAndKey(opts.tlsCertFile, opts.tlsKeyFile)
 		if err != nil {
-			return nil, errors.Wrap(err, "error reading cert and key")
+			return nil, fmt.Errorf("error reading cert and key: %w", err)
 		}
 		if canReadCertAndKey {
 			cert, err := tls.LoadX509KeyPair(opts.tlsCertFile, opts.tlsKeyFile)
@@ -264,23 +263,22 @@ func NewExporter(opts kafkaOpts, topicFilter string, topicExclude string, groupF
 		klog.V(DEBUG).Infoln("Using zookeeper lag, so connecting to zookeeper")
 		zookeeperClient, err = kazoo.NewKazoo(opts.uriZookeeper, nil)
 		if err != nil {
-			return nil, errors.Wrap(err, "error connecting to zookeeper")
+			return nil, fmt.Errorf("error connecting to zookeeper: %w", err)
 		}
 	}
 
 	interval, err := time.ParseDuration(opts.metadataRefreshInterval)
 	if err != nil {
-		return nil, errors.Wrap(err, "Cannot parse metadata refresh interval")
+		return nil, fmt.Errorf("Cannot parse metadata refresh interval: %w", err)
 	}
 
 	config.Metadata.RefreshFrequency = interval
 
 	config.Metadata.AllowAutoTopicCreation = opts.allowAutoTopicCreation
 
 	client, err := sarama.NewClient(opts.uri, config)
-
 	if err != nil {
-		return nil, errors.Wrap(err, "Error Init Kafka Client")
+		return nil, fmt.Errorf("Error Init Kafka Client: %w", err)
 	}
 
 	klog.V(TRACE).Infoln("Done Init Clients")
@@ -387,7 +385,7 @@ func (e *Exporter) collectChans(quit chan struct{}) {
 }
 
 func (e *Exporter) collect(ch chan<- prometheus.Metric) {
-	var wg = sync.WaitGroup{}
+	wg := sync.WaitGroup{}
 	ch <- prometheus.MustNewConstMetric(
 		clusterBrokers, prometheus.GaugeValue, float64(len(e.client.Brokers())),
 	)
@@ -508,7 +506,6 @@ func (e *Exporter) collect(ch chan<- prometheus.Metric) {
 
 			if e.useZooKeeperLag {
 				ConsumerGroups, err := e.zookeeperClient.Consumergroups()
-
 				if err != nil {
 					klog.Errorf("Cannot get consumer group %v", err)
 				}

scram_client.go

@@ -8,8 +8,10 @@ import (
 	"github.com/xdg-go/scram"
 )
 
-var SHA256 scram.HashGeneratorFcn = func() hash.Hash { return sha256.New() }
-var SHA512 scram.HashGeneratorFcn = func() hash.Hash { return sha512.New() }
+var (
+	SHA256 scram.HashGeneratorFcn = func() hash.Hash { return sha256.New() }
+	SHA512 scram.HashGeneratorFcn = func() hash.Hash { return sha512.New() }
+)
 
 type XDGSCRAMClient struct {
 	*scram.Client

simple_test.go

@@ -47,7 +47,7 @@ func assumeKafka() bool {
 }
 
 func execute(handler func(response *http.Response)) {
-	var e = errors.New("dummy")
+	e := errors.New("dummy")
 	for e != nil {
 		resp, err := http.Get("http://localhost:9304/metrics")
 		if err != nil {