remove direct github.com/pkg/errors dependency

Author: dennis-tra

cmd/nebula/cmd_resolve.go

@@ -3,10 +3,11 @@ package main
 import (
 	"context"
 	"database/sql"
+	"errors"
+	"fmt"
 
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	"github.com/volatiletech/null/v8"
@@ -84,7 +85,7 @@ func ResolveAction(c *cli.Context) error {
 		if errors.Is(err, context.Canceled) {
 			return nil
 		} else if err != nil {
-			return errors.Wrap(err, "fetching multi addresses")
+			return fmt.Errorf("fetching multi addresses: %w", err)
 		}
 		log.Infof("Fetched %d multi addresses", len(dbmaddrs))
 		if len(dbmaddrs) == 0 {
@@ -114,7 +115,7 @@ func resolveAddr(ctx context.Context, dbh *sql.DB, mmc *maxmind.Client, uclient
 	logEntry := log.WithField("maddr", dbmaddr.Maddr)
 	txn, err := dbh.BeginTx(ctx, nil)
 	if err != nil {
-		return errors.Wrap(err, "begin txn")
+		return fmt.Errorf("begin txn: %w", err)
 	}
 	defer db.Rollback(txn)
 
@@ -124,7 +125,7 @@ func resolveAddr(ctx context.Context, dbh *sql.DB, mmc *maxmind.Client, uclient
 		if _, err = dbmaddr.Delete(ctx, txn); err != nil {
 			logEntry.WithError(err).Warnln("Error deleting multi address")
 		}
-		return errors.Wrap(err, "parse multi address")
+		return fmt.Errorf("parse multi address: %w", err)
 	}
 
 	dbmaddr.Resolved = true
@@ -184,13 +185,13 @@ func resolveAddr(ctx context.Context, dbh *sql.DB, mmc *maxmind.Client, uclient
 			}
 			if err := dbmaddr.AddIPAddresses(ctx, txn, true, ipaddr); err != nil {
 				logEntry.WithError(err).WithField("addr", ipaddr.Address).Warnln("Could not insert ip address")
-				return errors.Wrap(err, "add ip addresses")
+				return fmt.Errorf("add ip addresses: %w", err)
 			}
 		}
 	}
 	if _, err = dbmaddr.Update(ctx, txn, boil.Infer()); err != nil {
 		logEntry.WithError(err).Warnln("Could not update multi address")
-		return errors.Wrap(err, "update multi address")
+		return fmt.Errorf("update multi address: %w", err)
 	}
 
 	return txn.Commit()

go.mod

@@ -15,7 +15,6 @@ require (
 	github.com/multiformats/go-multiaddr v0.9.0
 	github.com/multiformats/go-multiaddr-dns v0.3.1
 	github.com/oschwald/geoip2-golang v1.8.0
-	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.15.0
 	github.com/sirupsen/logrus v1.9.0
 	github.com/stretchr/testify v1.8.2
@@ -104,6 +103,7 @@ require (
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/oschwald/maxminddb-golang v1.10.0 // indirect
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/polydawn/refmt v0.89.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect

pkg/crawl/crawl_api.go

@@ -2,11 +2,11 @@ package crawl
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/libp2p/go-libp2p/core/peer"
 	manet "github.com/multiformats/go-multiaddr/net"
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/sync/errgroup"
 

pkg/crawl/db.go

@@ -2,11 +2,11 @@ package crawl
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
 	"github.com/libp2p/go-libp2p/core/peer"
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"github.com/volatiletech/null/v8"
 

pkg/crawl/persister.go

@@ -2,10 +2,10 @@ package crawl
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"go.uber.org/atomic"
 

pkg/crawl/scheduler.go

@@ -2,6 +2,7 @@ package crawl
 
 import (
 	"context"
+	"fmt"
 	"math"
 	"time"
 
@@ -10,7 +11,6 @@ import (
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
 	rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager"
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 
 	"github.com/dennis-tra/nebula-crawler/pkg/config"
@@ -95,13 +95,13 @@ func NewScheduler(conf *config.Crawl, dbc db.Client) (*Scheduler, error) {
 	limiter := rcmgr.NewFixedLimiter(rcmgr.InfiniteLimits)
 	rm, err := rcmgr.NewResourceManager(limiter)
 	if err != nil {
-		return nil, errors.Wrap(err, "new resource manager")
+		return nil, fmt.Errorf("new resource manager: %w", err)
 	}
 
 	// Initialize a single libp2p node that's shared between all crawlers.
 	h, err := libp2p.New(libp2p.NoListenAddrs, libp2p.ResourceManager(rm), libp2p.UserAgent("nebula-crawler/"+conf.Root.Version()))
 	if err != nil {
-		return nil, errors.Wrap(err, "new libp2p host")
+		return nil, fmt.Errorf("new libp2p host: %w", err)
 	}
 
 	s := &Scheduler{
@@ -219,12 +219,12 @@ func (s *Scheduler) CrawlNetwork(ctx context.Context, bootstrap []peer.AddrInfo)
 
 	// Persist the crawl results
 	if err := s.updateCrawl(context.Background(), crawlerCtx, len(s.inCrawlQueue) == 0); err != nil {
-		return errors.Wrap(err, "persist crawl")
+		return fmt.Errorf("persist crawl: %w", err)
 	}
 
 	// Persist associated crawl properties
 	if err := s.persistCrawlProperties(context.Background()); err != nil {
-		return errors.Wrap(err, "persist crawl properties")
+		return fmt.Errorf("persist crawl properties: %w", err)
 	}
 
 	// persist all neighbor information
@@ -265,7 +265,7 @@ func (s *Scheduler) initCrawl(ctx context.Context) error {
 	log.Infoln("Initializing crawl...")
 	crawl, err := s.dbc.InitCrawl(ctx)
 	if err != nil {
-		return errors.Wrap(err, "creating crawl in db")
+		return fmt.Errorf("creating crawl in db: %w", err)
 	}
 	s.crawl = crawl
 	s.crawlStart = crawl.StartedAt
@@ -283,7 +283,7 @@ func (s *Scheduler) startCrawlers(ctx context.Context) ([]*Crawler, context.Cont
 		c, err := NewCrawler(s.host, s.config)
 		if err != nil {
 			crawlerCancel()
-			return nil, nil, nil, errors.Wrap(err, "new crawler")
+			return nil, nil, nil, fmt.Errorf("new crawler: %w", err)
 		}
 		crawlers = append(crawlers, c)
 		go c.StartCrawling(crawlerCtx, s.crawlQueue, s.crawlResultsQueue)
@@ -306,7 +306,7 @@ func (s *Scheduler) startPersisters(ctx context.Context) ([]*Persister, context.
 		p, err := NewPersister(s.dbc, s.config, s.crawl)
 		if err != nil {
 			persistersCancel()
-			return nil, nil, errors.Wrap(err, "new persister")
+			return nil, nil, fmt.Errorf("new persister: %w", err)
 		}
 		persisters = append(persisters, p)
 		go p.StartPersisting(persistersCtx, s.persistQueue, s.persistResultsQueue)

pkg/db/db_client.go

@@ -6,6 +6,7 @@ import (
 	"database/sql"
 	"embed"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"io/fs"
 	"os"
@@ -25,7 +26,6 @@ import (
 	_ "github.com/lib/pq"
 	"github.com/libp2p/go-libp2p/core/peer"
 	ma "github.com/multiformats/go-multiaddr"
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	log "github.com/sirupsen/logrus"
 	"github.com/volatiletech/null/v8"
@@ -337,7 +337,7 @@ func (c *DBClient) GetOrCreateProtocol(ctx context.Context, exec boil.ContextExe
 	log.WithField("protocol", protocol).Infoln("Upsert protocol")
 	row := exec.QueryRowContext(ctx, "SELECT upsert_protocol($1)", protocol)
 	if row.Err() != nil {
-		return nil, errors.Wrap(row.Err(), "unable to upsert protocol")
+		return nil, fmt.Errorf("unable to upsert protocol: %w", row.Err())
 	}
 
 	var protocolID *int
@@ -434,7 +434,7 @@ func (c *DBClient) GetOrCreateProtocolsSetID(ctx context.Context, exec boil.Cont
 	log.WithField("key", hex.EncodeToString([]byte(key))).Infoln("Upsert protocols set")
 	row := exec.QueryRowContext(ctx, "SELECT upsert_protocol_set_id($1)", types.Int64Array(protocolIDs))
 	if row.Err() != nil {
-		return nil, errors.Wrap(row.Err(), "unable to upsert protocols set")
+		return nil, fmt.Errorf("unable to upsert protocols set: %w", row.Err())
 	}
 
 	var protocolsSetID *int
@@ -465,7 +465,7 @@ func (c *DBClient) GetOrCreateAgentVersionID(ctx context.Context, exec boil.Cont
 	log.WithField("agentVersion", agentVersion).Infoln("Upsert agent version")
 	row := exec.QueryRowContext(ctx, "SELECT upsert_agent_version($1)", agentVersion)
 	if row.Err() != nil {
-		return nil, errors.Wrap(row.Err(), "unable to upsert agent version")
+		return nil, fmt.Errorf("unable to upsert agent version: %w", row.Err())
 	}
 
 	var agentVersionID *int

pkg/monitor/dialer.go

@@ -2,12 +2,12 @@ package monitor
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"go.uber.org/atomic"
 

pkg/monitor/scheduler.go

@@ -3,6 +3,8 @@ package monitor
 import (
 	"context"
 	"database/sql"
+	"errors"
+	"fmt"
 	"sync"
 	"time"
 
@@ -12,7 +14,6 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager"
 	ma "github.com/multiformats/go-multiaddr"
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"go.uber.org/atomic"
 
@@ -60,7 +61,7 @@ func NewScheduler(conf *config.Monitor, dbc *db.DBClient) (*Scheduler, error) {
 	limiter := rcmgr.NewFixedLimiter(rcmgr.InfiniteLimits)
 	rm, err := rcmgr.NewResourceManager(limiter)
 	if err != nil {
-		return nil, errors.Wrap(err, "new resource manager")
+		return nil, fmt.Errorf("new resource manager: %w", err)
 	}
 
 	// Initialize a single libp2p node that's shared between all dialers.
@@ -97,7 +98,7 @@ func (s *Scheduler) StartMonitoring(ctx context.Context) error {
 	for i := 0; i < s.config.MonitorWorkerCount; i++ {
 		d, err := NewDialer(s.host, s.config)
 		if err != nil {
-			return errors.Wrap(err, "new dialer")
+			return fmt.Errorf("new dialer: %w", err)
 		}
 
 		dialers = append(dialers, d)
@@ -206,7 +207,7 @@ func (s *Scheduler) scheduleDial(ctx context.Context, session *models.SessionsOp
 	// Parse peer ID from database
 	peerID, err := peer.Decode(session.R.Peer.MultiHash)
 	if err != nil {
-		return errors.Wrap(err, "decode peer ID")
+		return fmt.Errorf("decode peer ID: %w", err)
 	}
 	logEntry := log.WithField("peerID", utils.FmtPeerID(peerID))