Skip to content

Commit 682e474

Browse files
committed
permanently enable the linters
Signed-off-by: Christoph Mewes <[email protected]>
1 parent d3603e0 commit 682e474

File tree

6 files changed

+30
-9
lines changed

6 files changed

+30
-9
lines changed

.golangci.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,26 @@ output:
88

99
linters:
1010
enable:
11+
- deadcode
12+
- depguard
13+
- durationcheck
14+
- errorlint
15+
- exportloopref
16+
- gofmt
1117
- gofumpt
1218
- goimports
13-
- revive
19+
- gosimple
20+
- ineffassign
1421
- misspell
22+
- nolintlint
23+
- predeclared
24+
- revive
25+
- staticcheck
26+
- structcheck
27+
- unconvert
28+
- unused
29+
- varcheck
30+
- wastedassign
1531

1632
issues:
1733
max-same-issues: 0

api/prometheus/v1/api_test.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,9 +1455,13 @@ func TestAPIClientDo(t *testing.T) {
14551455
}
14561456

14571457
if test.expectedErr.Detail != "" {
1458-
apiErr := err.(*Error)
1459-
if apiErr.Detail != test.expectedErr.Detail {
1460-
t.Fatalf("expected error detail :%v, but got:%v", apiErr.Detail, test.expectedErr.Detail)
1458+
apiErr := &Error{}
1459+
if errors.As(err, &apiErr) {
1460+
if apiErr.Detail != test.expectedErr.Detail {
1461+
t.Fatalf("expected error detail :%v, but got:%v", apiErr.Detail, test.expectedErr.Detail)
1462+
}
1463+
} else {
1464+
t.Fatalf("expected v1.Error instance, but got:%T", err)
14611465
}
14621466
}
14631467

prometheus/process_collector.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@ func NewPidFileFn(pidFilePath string) func() (int, error) {
154154
return func() (int, error) {
155155
content, err := ioutil.ReadFile(pidFilePath)
156156
if err != nil {
157-
return 0, fmt.Errorf("can't read pid file %q: %+v", pidFilePath, err)
157+
return 0, fmt.Errorf("can't read pid file %q: %w", pidFilePath, err)
158158
}
159159
pid, err := strconv.Atoi(strings.TrimSpace(string(content)))
160160
if err != nil {
161-
return 0, fmt.Errorf("can't parse pid file %q: %+v", pidFilePath, err)
161+
return 0, fmt.Errorf("can't parse pid file %q: %w", pidFilePath, err)
162162
}
163163

164164
return pid, nil

prometheus/promhttp/instrument_server_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ func TestLabelCheck(t *testing.T) {
145145
},
146146
append(sc.varLabels, sc.curriedLabels...),
147147
))
148-
//nolint:typecheck // Ignore declared but unused error.
149148
for _, l := range sc.curriedLabels {
150149
c = c.MustCurryWith(prometheus.Labels{l: "dummy"})
151150
o = o.MustCurryWith(prometheus.Labels{l: "dummy"})

prometheus/registry.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ package prometheus
1515

1616
import (
1717
"bytes"
18+
"errors"
1819
"fmt"
1920
"io/ioutil"
2021
"os"
@@ -725,7 +726,8 @@ func (gs Gatherers) Gather() ([]*dto.MetricFamily, error) {
725726
for i, g := range gs {
726727
mfs, err := g.Gather()
727728
if err != nil {
728-
if multiErr, ok := err.(MultiError); ok {
729+
multiErr := MultiError{}
730+
if errors.As(err, &multiErr) {
729731
for _, err := range multiErr {
730732
errs = append(errs, fmt.Errorf("[from Gatherer #%d] %w", i+1, err))
731733
}

prometheus/registry_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ func TestNewMultiTRegistry(t *testing.T) {
12421242
t.Run("two registries, one with error", func(t *testing.T) {
12431243
m := prometheus.NewMultiTRegistry(prometheus.ToTransactionalGatherer(reg), treg)
12441244
ret, done, err := m.Gather()
1245-
if err != treg.err {
1245+
if !errors.Is(err, treg.err) {
12461246
t.Error("unexpected error:", err)
12471247
}
12481248
done()

0 commit comments

Comments
 (0)