Skip to content

Commit 8077c33

Browse files
committed
bump linter to 1.59
1 parent df4ceef commit 8077c33

8 files changed

+14
-22
lines changed

.drone.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ steps:
99
- go mod tidy -v
1010
- git diff --exit-code
1111
- name: lint
12-
image: "golangci/golangci-lint:v1.55-alpine"
12+
image: "golangci/golangci-lint:v1.59-alpine"
1313
commands:
1414
- go install github.com/golang/mock/mockgen@latest
1515
- go generate -x

.errcheck_excludes.txt

-1
This file was deleted.

.golangci.yml

+5-12
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ linters:
1818
- gomoddirectives
1919
# style preset
2020
- asciicheck
21+
- canonicalheader
2122
- containedctx
2223
- dogsled
2324
- dupl
@@ -43,20 +44,14 @@ linters:
4344
- unconvert
4445
- whitespace
4546
- wastedassign
46-
disable:
47-
# bugs
48-
- scopelint # deprecated and superseded by exportloopref
49-
# performance
50-
- maligned # deprecated and superseded by govet(fieldalignment)
51-
# unused
52-
- deadcode # deprecated and superseded by unused
53-
- structcheck # deprecated and superseded by unused
54-
- varcheck # deprecated and superseded by unused
5547
linters-settings:
5648
dogsled:
5749
max-blank-identifiers: 3
5850
errcheck:
59-
exclude: .errcheck_excludes.txt
51+
exclude-functions:
52+
- (net/http.ResponseWriter).Write
53+
- github.com/go-chi/render.Render
54+
- github.com/go-chi/render.RenderList
6055
errorlint:
6156
errorf: true
6257
funlen:
@@ -76,8 +71,6 @@ linters-settings:
7671
retract-allow-no-explanation: false
7772
lll:
7873
tab-width: 4
79-
nolintlint:
80-
allow-leading-space: false
8174
issues:
8275
max-issues-per-linter: 0
8376
max-same-issues: 0

breadcrumb_transport.go

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ func (b breadcrumbTransport) RoundTrip(req *http.Request) (*http.Response, error
2828
span := sentry.StartSpan(req.Context(), req.URL.String(), sentry.ContinueFromRequest(req))
2929
defer span.Finish()
3030

31+
//nolint:canonicalheader
3132
req.Header.Add("sentry-trace", span.ToSentryTrace())
3233

3334
breadcrumb := sentry.Breadcrumb{

breadcrumb_transport_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type BreadcrumbTransportSuite struct {
2424
}
2525

2626
func (suite *BreadcrumbTransportSuite) SetupSuite() {
27-
suite.ts = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
27+
suite.ts = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
2828
w.WriteHeader(http.StatusNoContent)
2929
}))
3030
}

doc_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package logger
22

33
import (
44
"context"
5-
"fmt"
65
"net/http"
76

87
"github.com/getsentry/sentry-go"
@@ -50,7 +49,7 @@ func Example_breadcrumbTransport() {
5049
defer resp.Body.Close()
5150

5251
// Or just log response
53-
sentry.CaptureMessage(fmt.Sprintf("Response status: %s", resp.Status))
52+
sentry.CaptureMessage("Response status: " + resp.Status)
5453

5554
// Either way it will contain full info about request in breadcrumb
5655
}
@@ -92,7 +91,7 @@ func Example_webServer() {
9291
if err != nil {
9392
log.Warn("request failed", zap.Error(err))
9493
} else {
95-
log.Info(fmt.Sprintf("Response status: %s", resp.Status))
94+
log.Info("Response status: " + resp.Status)
9695
resp.Body.Close()
9796
}
9897

logger_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (s *TestLoggerSuite) TestLoggerShouldSendEventToSentryAndReturnEventID() {
6363
eventID = event.EventID
6464
})
6565

66-
wrappedHandler := s.wrapHandler(func(w http.ResponseWriter, r *http.Request) {
66+
wrappedHandler := s.wrapHandler(func(_ http.ResponseWriter, r *http.Request) {
6767
Ctx(r.Context()).Error("test error")
6868
})
6969

@@ -77,7 +77,7 @@ func (s *TestLoggerSuite) TestLoggerShouldSendEventToSentryAndReturnEventID() {
7777
func (s *TestLoggerSuite) TestLoggerWithInjectedExtraFields() {
7878
s.logger = zap.New(NewSentryCoreWrapper(zapcore.NewNopCore(), sentry.CurrentHub()))
7979

80-
handlerFunc := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
80+
handlerFunc := http.HandlerFunc(func(_ http.ResponseWriter, r *http.Request) {
8181
Ctx(r.Context()).Error("test error")
8282
})
8383

sentry_core_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ func (suite *SentryCoreSuite) TestWriteChainedErrors() {
255255
suite.Nil(thread.Stacktrace)
256256
})
257257

258-
err := stderrors.New("simple error")
258+
err := stderrors.New("simple error") //nolint:err113
259259
err = errors.WithStack(err)
260260
err = fmt.Errorf("wrap with fmt.Errorf: %w", err)
261261

@@ -265,7 +265,7 @@ func (suite *SentryCoreSuite) TestWriteChainedErrors() {
265265
func (suite *SentryCoreSuite) TestStrippingWrappedErrors() {
266266
core := NewSentryCore(suite.hub).(*SentryCore)
267267

268-
err := stderrors.New("simple error")
268+
err := stderrors.New("simple error") //nolint:err113
269269
err = fmt.Errorf("first wrap: %w", err)
270270
err = fmt.Errorf("second wrap: %w", err)
271271

0 commit comments

Comments
 (0)