fix subset of errors import and replace Cause with Is and As mostly

Signed-off-by: Bisakh Mondal <[email protected]>

pkg/block/block.go

@@ -20,10 +20,10 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/oklog/ulid"
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/thanos-io/thanos/pkg/block/metadata"
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/objstore"
 	"github.com/thanos-io/thanos/pkg/runutil"
 )

pkg/block/fetcher.go

@@ -18,7 +18,6 @@ import (
 	"github.com/go-kit/log/level"
 	"github.com/golang/groupcache/singleflight"
 	"github.com/oklog/ulid"
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prometheus/prometheus/model/labels"
@@ -27,6 +26,7 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"github.com/thanos-io/thanos/pkg/block/metadata"
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/errutil"
 	"github.com/thanos-io/thanos/pkg/extprom"
 	"github.com/thanos-io/thanos/pkg/model"
@@ -328,20 +328,20 @@ func (f *BaseFetcher) fetchMetadata(ctx context.Context) (interface{}, error) {
 					continue
 				}
 
-				switch errors.Cause(err) {
-				default:
-					mtx.Lock()
-					resp.metaErrs.Add(err)
-					mtx.Unlock()
-					continue
-				case ErrorSyncMetaNotFound:
+				switch {
+				case errors.Is(err, ErrorSyncMetaNotFound):
 					mtx.Lock()
 					resp.noMetas++
 					mtx.Unlock()
-				case ErrorSyncMetaCorrupted:
+				case errors.Is(err, ErrorSyncMetaCorrupted):
 					mtx.Lock()
 					resp.corruptedMetas++
 					mtx.Unlock()
+				default:
+					mtx.Lock()
+					resp.metaErrs.Add(err)
+					mtx.Unlock()
+					continue
 				}
 
 				mtx.Lock()
@@ -832,10 +832,10 @@ func (f *IgnoreDeletionMarkFilter) Filter(ctx context.Context, metas map[ulid.UL
 			for id := range ch {
 				m := &metadata.DeletionMark{}
 				if err := metadata.ReadMarker(ctx, f.logger, f.bkt, id.String(), m); err != nil {
-					if errors.Cause(err) == metadata.ErrorMarkerNotFound {
+					if errors.Is(err, metadata.ErrorMarkerNotFound) {
 						continue
 					}
-					if errors.Cause(err) == metadata.ErrorUnmarshalMarker {
+					if errors.Is(err, metadata.ErrorUnmarshalMarker) {
 						level.Warn(f.logger).Log("msg", "found partial deletion-mark.json; if we will see it happening often for the same block, consider manually deleting deletion-mark.json from the object storage", "block", id, "err", err)
 						continue
 					}

pkg/block/index.go

@@ -17,14 +17,14 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/oklog/ulid"
-	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/tsdb"
 	"github.com/prometheus/prometheus/tsdb/chunks"
 	"github.com/prometheus/prometheus/tsdb/index"
 
 	"github.com/thanos-io/thanos/pkg/block/metadata"
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/runutil"
 )
 

pkg/block/metadata/hash.go

@@ -12,8 +12,8 @@ import (
 	"path/filepath"
 
 	"github.com/go-kit/log"
-	"github.com/pkg/errors"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/runutil"
 )
 

pkg/block/metadata/markers.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/oklog/ulid"
-	"github.com/pkg/errors"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/objstore"
 	"github.com/thanos-io/thanos/pkg/runutil"
 )

pkg/block/metadata/meta.go

@@ -17,7 +17,6 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/oklog/ulid"
-	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/relabel"
 	"github.com/prometheus/prometheus/promql/parser"
@@ -26,6 +25,7 @@ import (
 	"github.com/prometheus/prometheus/tsdb/tombstones"
 	"gopkg.in/yaml.v3"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/runutil"
 )
 

pkg/discovery/dns/godns/resolver.go

@@ -6,7 +6,7 @@ package godns
 import (
 	"net"
 
-	"github.com/pkg/errors"
+	"github.com/thanos-io/thanos/pkg/errors"
 )
 
 // Resolver is a wrapper for net.Resolver.
@@ -19,7 +19,9 @@ func (r *Resolver) IsNotFound(err error) bool {
 	if err == nil {
 		return false
 	}
-	err = errors.Cause(err)
-	dnsErr, ok := err.(*net.DNSError)
-	return ok && dnsErr.IsNotFound
+	dnsErr := new(net.DNSError)
+	if errors.As(err, dnsErr) {
+		return dnsErr.IsNotFound
+	}
+	return false
 }

pkg/discovery/dns/miekgdns/lookup.go

@@ -8,7 +8,8 @@ import (
 	"net"
 
 	"github.com/miekg/dns"
-	"github.com/pkg/errors"
+
+	"github.com/thanos-io/thanos/pkg/errors"
 )
 
 var ErrNoSuchHost = errors.New("no such host")

pkg/discovery/dns/miekgdns/resolver.go

@@ -8,7 +8,8 @@ import (
 	"net"
 
 	"github.com/miekg/dns"
-	"github.com/pkg/errors"
+
+	"github.com/thanos-io/thanos/pkg/errors"
 )
 
 // DefaultResolvConfPath is a common, default resolv.conf file present on linux server.
@@ -74,5 +75,5 @@ func (r *Resolver) LookupIPAddr(ctx context.Context, host string) ([]net.IPAddr,
 }
 
 func (r *Resolver) IsNotFound(err error) bool {
-	return errors.Is(errors.Cause(err), ErrNoSuchHost)
+	return errors.Is(err, ErrNoSuchHost)
 }

pkg/discovery/dns/resolver.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 
-	"github.com/pkg/errors"
+	"github.com/thanos-io/thanos/pkg/errors"
 )
 
 type QType string

pkg/objstore/azure/azure.go

@@ -16,10 +16,10 @@ import (
 	blob "github.com/Azure/azure-storage-blob-go/azblob"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 	"gopkg.in/yaml.v2"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/objstore"
 )
 

pkg/objstore/filesystem/filesystem.go

@@ -7,13 +7,14 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"io/fs"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/objstore"
 	"github.com/thanos-io/thanos/pkg/runutil"
 )
@@ -232,7 +233,7 @@ func (b *Bucket) Delete(_ context.Context, name string) error {
 
 // IsObjNotFoundErr returns true if error means that object is not found. Relevant to Get operations.
 func (b *Bucket) IsObjNotFoundErr(err error) bool {
-	return os.IsNotExist(errors.Cause(err))
+	return errors.Is(err, fs.ErrNotExist)
 }
 
 func (b *Bucket) Close() error { return nil }

pkg/objstore/gcs/gcs.go

@@ -14,13 +14,13 @@ import (
 
 	"cloud.google.com/go/storage"
 	"github.com/go-kit/log"
-	"github.com/pkg/errors"
 	"github.com/prometheus/common/version"
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"gopkg.in/yaml.v2"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/objstore"
 )
 

pkg/objstore/inmem.go

@@ -13,7 +13,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pkg/errors"
+	"github.com/thanos-io/thanos/pkg/errors"
 )
 
 var errNotFound = errors.New("inmem: object not found")

pkg/objstore/objstore.go

@@ -14,10 +14,10 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/runutil"
 )
 

pkg/objstore/s3/s3.go

@@ -23,11 +23,11 @@ import (
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/minio/minio-go/v7/pkg/encrypt"
-	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/common/version"
 	"gopkg.in/yaml.v2"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/objstore"
 	"github.com/thanos-io/thanos/pkg/runutil"
 )
@@ -523,7 +523,7 @@ func (b *Bucket) Delete(ctx context.Context, name string) error {
 
 // IsObjNotFoundErr returns true if error means that object is not found. Relevant to Get operations.
 func (b *Bucket) IsObjNotFoundErr(err error) bool {
-	return minio.ToErrorResponse(errors.Cause(err)).Code == "NoSuchKey"
+	return minio.ToErrorResponse(errors.UnwrapTillCause(err)).Code == "NoSuchKey"
 }
 
 func (b *Bucket) Close() error { return nil }

pkg/objstore/s3/s3_aws_sdk_auth.go

@@ -9,7 +9,8 @@ import (
 	aws "github.com/aws/aws-sdk-go-v2/aws"
 	awsconfig "github.com/aws/aws-sdk-go-v2/config"
 	"github.com/minio/minio-go/v7/pkg/credentials"
-	"github.com/pkg/errors"
+
+	"github.com/thanos-io/thanos/pkg/errors"
 )
 
 // AWSSDKAuth retrieves credentials from the aws-sdk-go.

pkg/objstore/swift/swift.go

@@ -17,10 +17,10 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/ncw/swift"
-	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 	"gopkg.in/yaml.v2"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/objstore"
 	"github.com/thanos-io/thanos/pkg/runutil"
 )

pkg/runutil/runutil.go

@@ -60,8 +60,8 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/pkg/errors"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/errutil"
 )
 

pkg/targets/prometheus_test.go

@@ -13,10 +13,10 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/gogo/protobuf/proto"
-	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/storage"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/promclient"
 	"github.com/thanos-io/thanos/pkg/runutil"
 	"github.com/thanos-io/thanos/pkg/store/labelpb"

pkg/testutil/testutil.go

@@ -15,7 +15,6 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/pkg/errors"
 	"github.com/pmezard/go-difflib/difflib"
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
@@ -25,6 +24,8 @@ import (
 	"github.com/prometheus/prometheus/tsdb/chunks"
 	"github.com/prometheus/prometheus/tsdb/index"
 	"go.uber.org/goleak"
+
+	"github.com/thanos-io/thanos/pkg/errors"
 )
 
 // Assert fails the test if the condition is false.

test/e2e/exemplars_api_test.go

@@ -10,9 +10,9 @@ import (
 	"time"
 
 	"github.com/efficientgo/e2e"
-	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/model/timestamp"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/exemplars/exemplarspb"
 	"github.com/thanos-io/thanos/pkg/store/labelpb"
 	"github.com/thanos-io/thanos/pkg/testutil"

test/e2e/query_frontend_test.go

@@ -11,12 +11,12 @@ import (
 
 	"github.com/efficientgo/e2e"
 	"github.com/efficientgo/e2e/matchers"
-	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/timestamp"
 
 	"github.com/thanos-io/thanos/pkg/cacheutil"
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/promclient"
 	"github.com/thanos-io/thanos/pkg/queryfrontend"
 	"github.com/thanos-io/thanos/pkg/testutil"

test/e2e/query_test.go

@@ -28,13 +28,13 @@ import (
 	"github.com/chromedp/chromedp"
 	"github.com/efficientgo/e2e"
 	"github.com/go-kit/log"
-	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/timestamp"
 	"github.com/prometheus/prometheus/rules"
 
 	"github.com/thanos-io/thanos/pkg/block/metadata"
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/exemplars/exemplarspb"
 	"github.com/thanos-io/thanos/pkg/metadata/metadatapb"
 	"github.com/thanos-io/thanos/pkg/objstore"

test/e2e/rules_api_test.go

@@ -15,11 +15,11 @@ import (
 
 	"github.com/efficientgo/e2e"
 	"github.com/go-kit/log"
-	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/rules"
 
 	"github.com/thanos-io/thanos/pkg/httpconfig"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/promclient"
 	"github.com/thanos-io/thanos/pkg/rules/rulespb"
 	"github.com/thanos-io/thanos/pkg/runutil"

test/e2e/targets_api_test.go

@@ -14,8 +14,8 @@ import (
 
 	"github.com/efficientgo/e2e"
 	"github.com/go-kit/log"
-	"github.com/pkg/errors"
 
+	"github.com/thanos-io/thanos/pkg/errors"
 	"github.com/thanos-io/thanos/pkg/promclient"
 	"github.com/thanos-io/thanos/pkg/runutil"
 	"github.com/thanos-io/thanos/pkg/store/labelpb"