Skip to content

Commit fe354b5

Browse files
linux019oleksandr
linux019
and
oleksandr
authored
Remove deprecated github.com/pkg/errors (prebid#4174)
Co-authored-by: oleksandr <[email protected]>
1 parent 2b23016 commit fe354b5

9 files changed

Lines changed: 24 additions & 26 deletions

File tree

‎adservertargeting/requestlookup.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"strings"
88

99
"github.com/buger/jsonparser"
10-
"github.com/pkg/errors"
1110
"github.com/prebid/prebid-server/v3/openrtb_ext"
1211
)
1312

@@ -93,7 +92,7 @@ func getValueFromQueryParam(path string, queryParams url.Values) (json.RawMessag
9392
if val != "" {
9493
return json.RawMessage(val), nil
9594
} else {
96-
return nil, errors.Errorf("value not found for path: %s", path)
95+
return nil, fmt.Errorf("value not found for path: %s", path)
9796
}
9897
}
9998
return nil, nil

‎adservertargeting/respdataprocessor.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/pkg/errors"
98
"github.com/prebid/openrtb/v20/openrtb2"
109
"github.com/prebid/prebid-server/v3/openrtb_ext"
1110
"github.com/prebid/prebid-server/v3/util/jsonutil"
@@ -170,7 +169,7 @@ func getRespData(bidderResp *openrtb2.BidResponse, field string) (string, error)
170169
return fmt.Sprint(bidderResp.NBR.Val()), nil
171170

172171
default:
173-
return "", errors.Errorf("key not found for field in bid response: %s", field)
172+
return "", fmt.Errorf("key not found for field in bid response: %s", field)
174173
}
175174

176175
}

‎adservertargeting/utils.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package adservertargeting
22

33
import (
4+
"fmt"
45
"strings"
56

67
"github.com/buger/jsonparser"
7-
"github.com/pkg/errors"
88
"github.com/prebid/prebid-server/v3/errortypes"
99
"github.com/prebid/prebid-server/v3/openrtb_ext"
1010
)
@@ -40,12 +40,12 @@ func typedLookup(data []byte, path string, keys ...string) ([]byte, error) {
4040
if err != nil && err != jsonparser.KeyPathNotFoundError {
4141
return nil, err
4242
} else if err != nil && err == jsonparser.KeyPathNotFoundError {
43-
return nil, errors.Errorf("value not found for path: %s", path)
43+
return nil, fmt.Errorf("value not found for path: %s", path)
4444
}
4545
if verifyType(dataType) {
4646
return value, nil
4747
}
48-
return nil, errors.Errorf("incorrect value type for path: %s, value can only be string or number", path)
48+
return nil, fmt.Errorf("incorrect value type for path: %s, value can only be string or number", path)
4949
}
5050

5151
func verifyType(dataType jsonparser.ValueType) bool {

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ require (
2525
github.com/lib/pq v1.10.4
2626
github.com/mitchellh/copystructure v1.2.0
2727
github.com/modern-go/reflect2 v1.0.2
28-
github.com/pkg/errors v0.9.1
2928
github.com/prebid/go-gdpr v1.12.0
3029
github.com/prebid/go-gpp v0.2.0
3130
github.com/prebid/openrtb/v20 v20.3.0
@@ -63,6 +62,7 @@ require (
6362
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6463
github.com/pelletier/go-toml v1.9.5 // indirect
6564
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
65+
github.com/pkg/errors v0.9.1 // indirect
6666
github.com/pmezard/go-difflib v1.0.0 // indirect
6767
github.com/prometheus/common v0.32.1 // indirect
6868
github.com/prometheus/procfs v0.7.3 // indirect

‎modules/fiftyonedegrees/devicedetection/config.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ package devicedetection
22

33
import (
44
"encoding/json"
5+
"fmt"
56
"os"
67

78
"github.com/51Degrees/device-detection-go/v4/dd"
8-
"github.com/pkg/errors"
9-
109
"github.com/prebid/prebid-server/v3/util/jsonutil"
1110
)
1211

@@ -65,15 +64,15 @@ func (c *config) getPerformanceProfile() dd.PerformanceProfile {
6564
func parseConfig(data json.RawMessage) (config, error) {
6665
var cfg config
6766
if err := jsonutil.UnmarshalValid(data, &cfg); err != nil {
68-
return cfg, errors.Wrap(err, "failed to parse config")
67+
return cfg, fmt.Errorf("failed to parse config: %w", err)
6968
}
7069
return cfg, nil
7170
}
7271

7372
func validateConfig(cfg config) error {
7473
_, err := os.Stat(cfg.DataFile.Path)
7574
if err != nil {
76-
return errors.Wrap(err, "error opening hash file path")
75+
return fmt.Errorf("error opening hash file path: %w", err)
7776
}
7877

7978
return nil

‎modules/fiftyonedegrees/devicedetection/device_detector.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package devicedetection
22

33
import (
4+
"fmt"
5+
46
"github.com/51Degrees/device-detection-go/v4/dd"
57
"github.com/51Degrees/device-detection-go/v4/onpremise"
6-
"github.com/pkg/errors"
78
)
89

910
type engine interface {
@@ -28,7 +29,7 @@ func newDeviceDetector(cfg *dd.ConfigHash, moduleConfig *config) (*defaultDevice
2829
engineOptions...,
2930
)
3031
if err != nil {
31-
return nil, errors.Wrap(err, "Failed to create onpremise engine.")
32+
return nil, fmt.Errorf("failed to create onpremise engine: %w", err)
3233
}
3334

3435
deviceDetector := &defaultDeviceDetector{
@@ -147,7 +148,7 @@ func (x defaultDeviceDetector) getSupportedHeaders() []dd.EvidenceKey {
147148
func (x defaultDeviceDetector) getDeviceInfo(evidence []onpremise.Evidence, ua string) (*deviceInfo, error) {
148149
results, err := x.engine.Process(evidence)
149150
if err != nil {
150-
return nil, errors.Wrap(err, "Failed to process evidence")
151+
return nil, fmt.Errorf("failed to process evidence: %w", err)
151152
}
152153
defer results.Free()
153154

‎modules/fiftyonedegrees/devicedetection/device_info_extractor.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package devicedetection
22

33
import (
4+
"fmt"
45
"strconv"
56

67
"github.com/golang/glog"
7-
"github.com/pkg/errors"
88
)
99

1010
// deviceInfoExtractor is a struct that contains the methods to extract device information
@@ -61,7 +61,7 @@ func (x deviceInfoExtractor) extract(results Results, ua string) (*deviceInfo, e
6161
geoLocation, _ := strconv.ParseBool(x.getValue(results, deviceInfoGeoLocation))
6262
deviceId, err := results.DeviceId()
6363
if err != nil {
64-
return nil, errors.Wrap(err, "Failed to get device id.")
64+
return nil, fmt.Errorf("failed to get device id: %w", err)
6565
}
6666
hardwareModel := x.getValue(results, deviceInfoHardwareModel)
6767
hardwareFamily := x.getValue(results, deviceInfoHardwareFamily)

‎modules/fiftyonedegrees/devicedetection/evidence_extractor.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package devicedetection
22

33
import (
4+
"errors"
5+
"fmt"
46
"net/http"
57

6-
"github.com/51Degrees/device-detection-go/v4/onpremise"
7-
"github.com/pkg/errors"
8-
98
"github.com/51Degrees/device-detection-go/v4/dd"
9+
"github.com/51Degrees/device-detection-go/v4/onpremise"
1010
"github.com/prebid/prebid-server/v3/hooks/hookstage"
1111
)
1212

@@ -62,11 +62,11 @@ func (x *defaultEvidenceExtractor) extract(ctx hookstage.ModuleContext) ([]onpre
6262

6363
suaStrings, err := x.getEvidenceStrings(ctx[evidenceFromSuaCtxKey])
6464
if err != nil {
65-
return nil, "", errors.Wrap(err, "error extracting sua evidence")
65+
return nil, "", fmt.Errorf("error extracting sua evidence: %w", err)
6666
}
6767
headerString, err := x.getEvidenceStrings(ctx[evidenceFromHeadersCtxKey])
6868
if err != nil {
69-
return nil, "", errors.Wrap(err, "error extracting header evidence")
69+
return nil, "", fmt.Errorf("error extracting header evidence: %w", err)
7070
}
7171

7272
// Merge evidence from headers and SUA, sua has higher priority

‎modules/fiftyonedegrees/devicedetection/module.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package devicedetection
33
import (
44
"context"
55
"encoding/json"
6+
"fmt"
67
"net/http"
78

89
"github.com/51Degrees/device-detection-go/v4/dd"
910
"github.com/51Degrees/device-detection-go/v4/onpremise"
10-
"github.com/pkg/errors"
1111
"github.com/prebid/prebid-server/v3/hooks/hookstage"
1212
"github.com/prebid/prebid-server/v3/modules/moduledeps"
1313
)
@@ -35,12 +35,12 @@ func configHashFromConfig(cfg *config) *dd.ConfigHash {
3535
func Builder(rawConfig json.RawMessage, _ moduledeps.ModuleDeps) (interface{}, error) {
3636
cfg, err := parseConfig(rawConfig)
3737
if err != nil {
38-
return Module{}, errors.Wrap(err, "failed to parse config")
38+
return Module{}, fmt.Errorf("failed to parse config: %w", err)
3939
}
4040

4141
err = validateConfig(cfg)
4242
if err != nil {
43-
return nil, errors.Wrap(err, "invalid config")
43+
return nil, fmt.Errorf("invalid config: %w", err)
4444
}
4545

4646
configHash := configHashFromConfig(&cfg)
@@ -50,7 +50,7 @@ func Builder(rawConfig json.RawMessage, _ moduledeps.ModuleDeps) (interface{}, e
5050
&cfg,
5151
)
5252
if err != nil {
53-
return nil, errors.Wrap(err, "failed to create device detector")
53+
return nil, fmt.Errorf("failed to create device detector: %w", err)
5454
}
5555

5656
return Module{

0 commit comments

Comments
 (0)