From 8077c336ca0936d41651461a89ff152f13e47d69 Mon Sep 17 00:00:00 2001 From: Sergey Petrov Date: Wed, 19 Jun 2024 03:09:29 +0400 Subject: [PATCH] bump linter to 1.59 --- .drone.yml | 2 +- .errcheck_excludes.txt | 1 - .golangci.yml | 17 +++++------------ breadcrumb_transport.go | 1 + breadcrumb_transport_test.go | 2 +- doc_test.go | 5 ++--- logger_test.go | 4 ++-- sentry_core_test.go | 4 ++-- 8 files changed, 14 insertions(+), 22 deletions(-) delete mode 100644 .errcheck_excludes.txt diff --git a/.drone.yml b/.drone.yml index eef1a56..675f777 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ steps: - go mod tidy -v - git diff --exit-code - name: lint - image: "golangci/golangci-lint:v1.55-alpine" + image: "golangci/golangci-lint:v1.59-alpine" commands: - go install github.com/golang/mock/mockgen@latest - go generate -x diff --git a/.errcheck_excludes.txt b/.errcheck_excludes.txt deleted file mode 100644 index 7e38638..0000000 --- a/.errcheck_excludes.txt +++ /dev/null @@ -1 +0,0 @@ -(net/http.ResponseWriter).Write diff --git a/.golangci.yml b/.golangci.yml index 4a4b789..5599839 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -18,6 +18,7 @@ linters: - gomoddirectives # style preset - asciicheck + - canonicalheader - containedctx - dogsled - dupl @@ -43,20 +44,14 @@ linters: - unconvert - whitespace - wastedassign - disable: - # bugs - - scopelint # deprecated and superseded by exportloopref - # performance - - maligned # deprecated and superseded by govet(fieldalignment) - # unused - - deadcode # deprecated and superseded by unused - - structcheck # deprecated and superseded by unused - - varcheck # deprecated and superseded by unused linters-settings: dogsled: max-blank-identifiers: 3 errcheck: - exclude: .errcheck_excludes.txt + exclude-functions: + - (net/http.ResponseWriter).Write + - github.com/go-chi/render.Render + - github.com/go-chi/render.RenderList errorlint: errorf: true funlen: @@ -76,8 +71,6 @@ linters-settings: retract-allow-no-explanation: false lll: tab-width: 4 - nolintlint: - allow-leading-space: false issues: max-issues-per-linter: 0 max-same-issues: 0 diff --git a/breadcrumb_transport.go b/breadcrumb_transport.go index 38d980c..a86c7eb 100644 --- a/breadcrumb_transport.go +++ b/breadcrumb_transport.go @@ -28,6 +28,7 @@ func (b breadcrumbTransport) RoundTrip(req *http.Request) (*http.Response, error span := sentry.StartSpan(req.Context(), req.URL.String(), sentry.ContinueFromRequest(req)) defer span.Finish() + //nolint:canonicalheader req.Header.Add("sentry-trace", span.ToSentryTrace()) breadcrumb := sentry.Breadcrumb{ diff --git a/breadcrumb_transport_test.go b/breadcrumb_transport_test.go index b6c39b4..f0e2de0 100644 --- a/breadcrumb_transport_test.go +++ b/breadcrumb_transport_test.go @@ -24,7 +24,7 @@ type BreadcrumbTransportSuite struct { } func (suite *BreadcrumbTransportSuite) SetupSuite() { - suite.ts = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + suite.ts = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.WriteHeader(http.StatusNoContent) })) } diff --git a/doc_test.go b/doc_test.go index 0e42710..86232ec 100644 --- a/doc_test.go +++ b/doc_test.go @@ -2,7 +2,6 @@ package logger import ( "context" - "fmt" "net/http" "github.com/getsentry/sentry-go" @@ -50,7 +49,7 @@ func Example_breadcrumbTransport() { defer resp.Body.Close() // Or just log response - sentry.CaptureMessage(fmt.Sprintf("Response status: %s", resp.Status)) + sentry.CaptureMessage("Response status: " + resp.Status) // Either way it will contain full info about request in breadcrumb } @@ -92,7 +91,7 @@ func Example_webServer() { if err != nil { log.Warn("request failed", zap.Error(err)) } else { - log.Info(fmt.Sprintf("Response status: %s", resp.Status)) + log.Info("Response status: " + resp.Status) resp.Body.Close() } diff --git a/logger_test.go b/logger_test.go index a4b3caa..3d585dc 100644 --- a/logger_test.go +++ b/logger_test.go @@ -63,7 +63,7 @@ func (s *TestLoggerSuite) TestLoggerShouldSendEventToSentryAndReturnEventID() { eventID = event.EventID }) - wrappedHandler := s.wrapHandler(func(w http.ResponseWriter, r *http.Request) { + wrappedHandler := s.wrapHandler(func(_ http.ResponseWriter, r *http.Request) { Ctx(r.Context()).Error("test error") }) @@ -77,7 +77,7 @@ func (s *TestLoggerSuite) TestLoggerShouldSendEventToSentryAndReturnEventID() { func (s *TestLoggerSuite) TestLoggerWithInjectedExtraFields() { s.logger = zap.New(NewSentryCoreWrapper(zapcore.NewNopCore(), sentry.CurrentHub())) - handlerFunc := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + handlerFunc := http.HandlerFunc(func(_ http.ResponseWriter, r *http.Request) { Ctx(r.Context()).Error("test error") }) diff --git a/sentry_core_test.go b/sentry_core_test.go index 81b1776..3e71355 100644 --- a/sentry_core_test.go +++ b/sentry_core_test.go @@ -255,7 +255,7 @@ func (suite *SentryCoreSuite) TestWriteChainedErrors() { suite.Nil(thread.Stacktrace) }) - err := stderrors.New("simple error") + err := stderrors.New("simple error") //nolint:err113 err = errors.WithStack(err) err = fmt.Errorf("wrap with fmt.Errorf: %w", err) @@ -265,7 +265,7 @@ func (suite *SentryCoreSuite) TestWriteChainedErrors() { func (suite *SentryCoreSuite) TestStrippingWrappedErrors() { core := NewSentryCore(suite.hub).(*SentryCore) - err := stderrors.New("simple error") + err := stderrors.New("simple error") //nolint:err113 err = fmt.Errorf("first wrap: %w", err) err = fmt.Errorf("second wrap: %w", err)