From 6b17a69123e689ce29233524a9edd7c8761147c6 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Tue, 18 Jun 2024 19:30:48 +0200 Subject: [PATCH] golangci-lint: Enable loggercheck linter Signed-off-by: Arve Knudsen --- .golangci.yml | 1 + grpcutil/dns_resolver.go | 2 +- log/buffered_test.go | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index db1b4d8dd..0374e61ae 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -7,6 +7,7 @@ linters: - gofmt - misspell - revive + - loggercheck linters-settings: errcheck: diff --git a/grpcutil/dns_resolver.go b/grpcutil/dns_resolver.go index ef9c63989..507028aa6 100644 --- a/grpcutil/dns_resolver.go +++ b/grpcutil/dns_resolver.go @@ -208,7 +208,7 @@ func (w *dnsWatcher) lookupSRV() map[string]*Update { for _, a := range addrs { a, ok := formatIP(a) if !ok { - level.Error(w.logger).Log("failed IP parsing", "err", err) + level.Error(w.logger).Log("msg", "failed IP parsing", "err", err) continue } addr := a + ":" + strconv.Itoa(int(s.Port)) diff --git a/log/buffered_test.go b/log/buffered_test.go index 3931352e0..ee0cc5b2b 100644 --- a/log/buffered_test.go +++ b/log/buffered_test.go @@ -111,9 +111,12 @@ func TestOnFlushCallback(t *testing.T) { ) l := log.NewLogfmtLogger(bufLog) + //nolint: loggercheck require.NoError(t, l.Log("line")) + //nolint: loggercheck require.NoError(t, l.Log("line")) // first flush + //nolint: loggercheck require.NoError(t, l.Log("line")) // pre-condition check: the last Log() call should have flushed previous entries.