6

metricbeat/helper/privileges_windows.go

@@ -18,6 +18,7 @@
 package helper
 
 import (
+	"fmt"
 	"sync"
 	"syscall"
 
@@ -102,7 +103,7 @@ func checkAndEnableSeDebugPrivilege() error {
 	}
 
 	if !seDebug.Enabled {
-		return errors.Errorf("Metricbeat failed to enable the "+
+		return fmt.Errorf("Metricbeat failed to enable the "+
 			"SeDebugPrivilege, a Windows privilege that allows it to collect "+
 			"metrics from other processes. %v", seDebug)
 	}

metricbeat/module/munin/node/node.go

@@ -18,10 +18,10 @@
 package node
 
 import (
+	"errors"
+	"fmt"
 	"time"
 
-	"github.com/pkg/errors"
-
 	"github.com/elastic/beats/v7/metricbeat/mb"
 	"github.com/elastic/beats/v7/metricbeat/module/munin"
 	"github.com/elastic/elastic-agent-libs/mapstr"
@@ -70,22 +70,22 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 func (m *MetricSet) Fetch(r mb.ReporterV2) error {
 	node, err := munin.Connect(m.Host(), m.timeout)
 	if err != nil {
-		return errors.Wrap(err, "error in Connect")
+		return fmt.Errorf("error in Connect: %w", err)
 	}
 	defer node.Close()
 
 	plugins := m.plugins
 	if len(plugins) == 0 {
 		plugins, err = node.List()
 		if err != nil {
-			return errors.Wrap(err, "error getting plugin list")
+			return fmt.Errorf("error getting plugin list: %w", err)
 		}
 	}
 
 	for _, plugin := range plugins {
 		metrics, err := node.Fetch(plugin, m.sanitize)
 		if err != nil {
-			msg := errors.Wrap(err, "error fetching metrics")
+			msg := fmt.Errorf("error fetching metrics: %w", err)
 			r.Error(err)
 			m.Logger().Error(msg)
 			continue

metricbeat/module/mysql/galera_status/status.go

@@ -26,12 +26,11 @@ package galera_status
 
 import (
 	"database/sql"
+	"fmt"
 
 	"github.com/elastic/beats/v7/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/v7/metricbeat/mb"
 	"github.com/elastic/beats/v7/metricbeat/module/mysql"
-
-	"github.com/pkg/errors"
 )
 
 // init registers the MetricSet with the central registry.
@@ -61,7 +60,7 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) error {
 		var err error
 		m.db, err = mysql.NewDB(m.HostData().URI)
 		if err != nil {
-			return errors.Wrap(err, "Galera-status fetch failed")
+			return fmt.Errorf("Galera-status fetch failed: %w", err)
 		}
 	}
 
@@ -114,5 +113,5 @@ func (m *MetricSet) Close() error {
 	if m.db == nil {
 		return nil
 	}
-	return errors.Wrap(m.db.Close(), "failed to close mysql database client")
+	return fmt.Errorf("failed to close mysql database client: %w", m.db.Close())
 }

metricbeat/module/mysql/mysql.go

@@ -22,11 +22,11 @@ package mysql
 
 import (
 	"database/sql"
+	"fmt"
 
 	"github.com/elastic/beats/v7/metricbeat/mb"
 
 	"github.com/go-sql-driver/mysql"
-	"github.com/pkg/errors"
 )
 
 func init() {
@@ -64,7 +64,7 @@ func ParseDSN(mod mb.Module, host string) (mb.HostData, error) {
 
 	config, err := mysql.ParseDSN(host)
 	if err != nil {
-		return mb.HostData{}, errors.Wrapf(err, "error parsing mysql host")
+		return mb.HostData{}, fmt.Errorf("error parsing mysql host: %w", err)
 	}
 
 	if config.User == "" {
@@ -102,7 +102,7 @@ func ParseDSN(mod mb.Module, host string) (mb.HostData, error) {
 func NewDB(dsn string) (*sql.DB, error) {
 	db, err := sql.Open("mysql", dsn)
 	if err != nil {
-		return nil, errors.Wrap(err, "sql open failed")
+		return nil, fmt.Errorf("sql open failed: %w", err)
 	}
 	return db, nil
 }

metricbeat/module/mysql/query/query.go

@@ -25,8 +25,7 @@ package query
 
 import (
 	"context"
-
-	"github.com/pkg/errors"
+	"fmt"
 
 	"github.com/elastic/beats/v7/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/v7/metricbeat/helper/sql"
@@ -82,7 +81,7 @@ func (m *MetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) error {
 		var err error
 		m.db, err = sql.NewDBClient("mysql", m.HostData().URI, m.Logger())
 		if err != nil {
-			return errors.Wrap(err, "mysql-status fetch failed")
+			return fmt.Errorf("mysql-status fetch failed: %w", err)
 		}
 	}
 
@@ -142,5 +141,5 @@ func (m *MetricSet) Close() error {
 	if m.db == nil {
 		return nil
 	}
-	return errors.Wrap(m.db.Close(), "failed to close mysql database client")
+	return fmt.Errorf("failed to close mysql database client: %w", m.db.Close())
 }

metricbeat/module/mysql/status/status.go

@@ -25,11 +25,10 @@ package status
 
 import (
 	"database/sql"
+	"fmt"
 
 	"github.com/elastic/beats/v7/metricbeat/mb"
 	"github.com/elastic/beats/v7/metricbeat/module/mysql"
-
-	"github.com/pkg/errors"
 )
 
 func init() {
@@ -56,7 +55,7 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) error {
 		var err error
 		m.db, err = mysql.NewDB(m.HostData().URI)
 		if err != nil {
-			return errors.Wrap(err, "mysql-status fetch failed")
+			return fmt.Errorf("mysql-status fetch failed: %w", err)
 		}
 	}
 
@@ -109,5 +108,5 @@ func (m *MetricSet) Close() error {
 	if m.db == nil {
 		return nil
 	}
-	return errors.Wrap(m.db.Close(), "failed to close mysql database client")
+	return fmt.Errorf("failed to close mysql database client: %w", m.db.Close())
 }

metricbeat/module/postgresql/bgwriter/bgwriter.go

@@ -21,8 +21,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/pkg/errors"
-
 	"github.com/elastic/beats/v7/metricbeat/mb"
 	"github.com/elastic/beats/v7/metricbeat/module/postgresql"
 )
@@ -57,7 +55,7 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) error {
 	ctx := context.Background()
 	results, err := m.QueryStats(ctx, "SELECT * FROM pg_stat_bgwriter")
 	if err != nil {
-		return errors.Wrap(err, "error in QueryStats")
+		return fmt.Errorf("error in QueryStats: %w", err)
 	}
 	if len(results) == 0 {
 		return fmt.Errorf("No results from the pg_stat_bgwriter query")