Use std lib errors

daemon.go

@@ -3,13 +3,13 @@ package indexer
 import (
 	"context"
 	"database/sql"
+	"fmt"
 	"log/slog"
 	"sync"
 	"time"
 
 	"github.com/nyaruka/gocommon/analytics"
 	"github.com/nyaruka/rp-indexer/v9/indexers"
-	"github.com/pkg/errors"
 )
 
 type Daemon struct {
@@ -148,12 +148,12 @@ func (d *Daemon) reportStats(includeLag bool) {
 func (d *Daemon) calculateLag(ctx context.Context, ix indexers.Indexer) (time.Duration, error) {
 	esLastModified, err := ix.GetESLastModified(ix.Name())
 	if err != nil {
-		return 0, errors.Wrap(err, "error getting ES last modified")
+		return 0, fmt.Errorf("error getting ES last modified: %w", err)
 	}
 
 	dbLastModified, err := ix.GetDBLastModified(ctx, d.db)
 	if err != nil {
-		return 0, errors.Wrap(err, "error getting DB last modified")
+		return 0, fmt.Errorf("error getting DB last modified: %w", err)
 	}
 
 	return dbLastModified.Sub(esLastModified), nil

go.mod

@@ -7,7 +7,6 @@ require (
 	github.com/lib/pq v1.10.9
 	github.com/nyaruka/ezconf v0.3.0
 	github.com/nyaruka/gocommon v1.55.0
-	github.com/pkg/errors v0.9.1
 	github.com/samber/slog-multi v1.0.2
 	github.com/samber/slog-sentry v1.2.2
 	github.com/stretchr/testify v1.9.0
@@ -25,6 +24,7 @@ require (
 	github.com/nyaruka/librato v1.1.1 // indirect
 	github.com/nyaruka/null/v2 v2.0.3 // indirect
 	github.com/nyaruka/phonenumbers v1.3.5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/samber/lo v1.39.0 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect

indexers/contacts.go

@@ -7,8 +7,6 @@ import (
 	_ "embed"
 	"fmt"
 	"time"
-
-	"github.com/pkg/errors"
 )
 
 //go:embed contacts.index.json
@@ -51,15 +49,15 @@ func (i *ContactIndexer) Index(db *sql.DB, rebuild, cleanup bool) (string, error
 	if physicalIndex == "" || rebuild {
 		physicalIndex, err = i.createNewIndex(i.definition)
 		if err != nil {
-			return "", errors.Wrap(err, "error creating new index")
+			return "", fmt.Errorf("error creating new index: %w", err)
 		}
 		i.log().Info("created new physical index", "index", physicalIndex)
 		remapAlias = true
 	}
 
 	lastModified, err := i.GetESLastModified(physicalIndex)
 	if err != nil {
-		return "", errors.Wrap(err, "error finding last modified")
+		return "", fmt.Errorf("error finding last modified: %w", err)
 	}
 
 	i.log().Debug("indexing newer than last modified", "index", physicalIndex, "last_modified", lastModified)
@@ -68,7 +66,7 @@ func (i *ContactIndexer) Index(db *sql.DB, rebuild, cleanup bool) (string, error
 	start := time.Now()
 	indexed, deleted, err := i.indexModified(ctx, db, physicalIndex, lastModified.Add(-5*time.Second), rebuild)
 	if err != nil {
-		return "", errors.Wrap(err, "error indexing documents")
+		return "", fmt.Errorf("error indexing documents: %w", err)
 	}
 
 	i.recordComplete(indexed, deleted, time.Since(start))
@@ -77,7 +75,7 @@ func (i *ContactIndexer) Index(db *sql.DB, rebuild, cleanup bool) (string, error
 	if remapAlias {
 		err := i.updateAlias(physicalIndex)
 		if err != nil {
-			return "", errors.Wrap(err, "error updating alias")
+			return "", fmt.Errorf("error updating alias: %w", err)
 		}
 		remapAlias = false
 	}
@@ -86,7 +84,7 @@ func (i *ContactIndexer) Index(db *sql.DB, rebuild, cleanup bool) (string, error
 	if cleanup {
 		err := i.cleanupIndexes()
 		if err != nil {
-			return "", errors.Wrap(err, "error cleaning up old indexes")
+			return "", fmt.Errorf("error cleaning up old indexes: %w", err)
 		}
 	}