From 52dcc77ae7786bd8c02f3b4bf11ff78ea7f84a84 Mon Sep 17 00:00:00 2001
From: Matt Way <mway@uber.com>
Date: Thu, 30 May 2024 13:27:50 +0000
Subject: [PATCH] ci: Fix lint issues, makefile target

---
 Makefile                   |  2 +-
 http_handler.go            |  2 +-
 logger.go                  |  6 +++++-
 options.go                 |  6 +++++-
 zapcore/console_encoder.go |  2 +-
 zapcore/entry.go           | 14 ++++++++++++--
 6 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index eb1cee53b..f9db385b3 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ golangci-lint:
 	@$(foreach mod,$(MODULE_DIRS), \
 		(cd $(mod) && \
 		echo "[lint] golangci-lint: $(mod)" && \
-		golangci-lint run --path-prefix $(mod)) &&) true
+		golangci-lint run --path-prefix $(mod) ./...) &&) true
 
 .PHONY: tidy
 tidy:
diff --git a/http_handler.go b/http_handler.go
index 2be8f6515..1cae2c164 100644
--- a/http_handler.go
+++ b/http_handler.go
@@ -71,7 +71,7 @@ import (
 func (lvl AtomicLevel) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if err := lvl.serveHTTP(w, r); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
-		fmt.Fprintf(w, "internal error: %v", err)
+		_, _ = fmt.Fprintf(w, "internal error: %v", err)
 	}
 }
 
diff --git a/logger.go b/logger.go
index c4d300323..2d0ef141b 100644
--- a/logger.go
+++ b/logger.go
@@ -381,7 +381,11 @@ func (log *Logger) check(lvl zapcore.Level, msg string) *zapcore.CheckedEntry {
 
 	if stack.Count() == 0 {
 		if log.addCaller {
-			fmt.Fprintf(log.errorOutput, "%v Logger.check error: failed to get caller\n", ent.Time.UTC())
+			_, _ = fmt.Fprintf(
+				log.errorOutput,
+				"%v Logger.check error: failed to get caller\n",
+				ent.Time.UTC(),
+			)
 			_ = log.errorOutput.Sync()
 		}
 		return ce
diff --git a/options.go b/options.go
index 43d357ac9..04a3c1e63 100644
--- a/options.go
+++ b/options.go
@@ -125,7 +125,11 @@ func IncreaseLevel(lvl zapcore.LevelEnabler) Option {
 	return optionFunc(func(log *Logger) {
 		core, err := zapcore.NewIncreaseLevelCore(log.core, lvl)
 		if err != nil {
-			fmt.Fprintf(log.errorOutput, "failed to IncreaseLevel: %v\n", err)
+			_, _ = fmt.Fprintf(
+				log.errorOutput,
+				"failed to IncreaseLevel: %v\n",
+				err,
+			)
 		} else {
 			log.core = core
 		}
diff --git a/zapcore/console_encoder.go b/zapcore/console_encoder.go
index cc2b4e07b..98eea5154 100644
--- a/zapcore/console_encoder.go
+++ b/zapcore/console_encoder.go
@@ -105,7 +105,7 @@ func (c consoleEncoder) EncodeEntry(ent Entry, fields []Field) (*buffer.Buffer,
 		if i > 0 {
 			line.AppendString(c.ConsoleSeparator)
 		}
-		fmt.Fprint(line, arr.elems[i])
+		_, _ = fmt.Fprint(line, arr.elems[i])
 	}
 	putSliceEncoder(arr)
 
diff --git a/zapcore/entry.go b/zapcore/entry.go
index 459a5d7ce..841752f2e 100644
--- a/zapcore/entry.go
+++ b/zapcore/entry.go
@@ -241,7 +241,12 @@ func (ce *CheckedEntry) Write(fields ...Field) {
 			// If the entry is dirty, log an internal error; because the
 			// CheckedEntry is being used after it was returned to the pool,
 			// the message may be an amalgamation from multiple call sites.
-			fmt.Fprintf(ce.ErrorOutput, "%v Unsafe CheckedEntry re-use near Entry %+v.\n", ce.Time, ce.Entry)
+			_, _ = fmt.Fprintf(
+				ce.ErrorOutput,
+				"%v Unsafe CheckedEntry re-use near Entry %+v.\n",
+				ce.Time,
+				ce.Entry,
+			)
 			_ = ce.ErrorOutput.Sync() // ignore error
 		}
 		return
@@ -253,7 +258,12 @@ func (ce *CheckedEntry) Write(fields ...Field) {
 		err = multierr.Append(err, ce.cores[i].Write(ce.Entry, fields))
 	}
 	if err != nil && ce.ErrorOutput != nil {
-		fmt.Fprintf(ce.ErrorOutput, "%v write error: %v\n", ce.Time, err)
+		_, _ = fmt.Fprintf(
+			ce.ErrorOutput,
+			"%v write error: %v\n",
+			ce.Time,
+			err,
+		)
 		_ = ce.ErrorOutput.Sync() // ignore error
 	}