fix: ci lint error (#1391)

* fix lint check

* fix lll lint error

* fix build error

* fix gomnd

* fix shadow declaration

* add make test command

* update

log/filter.go

@@ -3,6 +3,8 @@ package log
 // FilterOption is filter option.
 type FilterOption func(*Filter)
 
+const fuzzyStr = "***"
+
 // FilterLevel with filter level.
 func FilterLevel(level Level) FilterOption {
 	return func(opts *Filter) {
@@ -72,10 +74,10 @@ func (f *Filter) Log(level Level, keyvals ...interface{}) error {
 				continue
 			}
 			if _, ok := f.key[keyvals[i]]; ok {
-				keyvals[v] = "***"
+				keyvals[v] = fuzzyStr
 			}
 			if _, ok := f.value[keyvals[v]]; ok {
-				keyvals[v] = "***"
+				keyvals[v] = fuzzyStr
 			}
 		}
 	}

log/filter_test.go

@@ -19,6 +19,7 @@ func TestFilterAll(t *testing.T) {
 	log.Infow("username", "kratos")
 	log.Warn("warn log")
 }
+
 func TestFilterLevel(t *testing.T) {
 	logger := With(DefaultLogger, "ts", DefaultTimestamp, "caller", DefaultCaller)
 	log := NewHelper(NewFilter(NewFilter(logger, FilterLevel(LevelWarn))))
@@ -32,7 +33,7 @@ func TestFilterLevel(t *testing.T) {
 func TestFilterCaller(t *testing.T) {
 	logger := With(DefaultLogger, "ts", DefaultTimestamp, "caller", DefaultCaller)
 	log := NewFilter(logger)
-	log.Log(LevelDebug, "msg1", "te1st debug")
+	_ = log.Log(LevelDebug, "msg1", "te1st debug")
 	logHelper := NewHelper(NewFilter(logger))
 	logHelper.Log(LevelDebug, "msg1", "te1st debug")
 }
@@ -83,7 +84,7 @@ func testFilterFunc(level Level, keyvals ...interface{}) bool {
 	}
 	for i := 0; i < len(keyvals); i++ {
 		if keyvals[i] == "password" {
-			keyvals[i+1] = "***"
+			keyvals[i+1] = fuzzyStr
 		}
 	}
 	return false

log/helper_test.go

@@ -46,18 +46,20 @@ func BenchmarkHelperPrintw(b *testing.B) {
 	}
 }
 
+type traceKey struct{}
+
 func TestContext(t *testing.T) {
 	logger := With(NewStdLogger(os.Stdout),
 		"trace", Trace(),
 	)
 	log := NewHelper(logger)
-	ctx := context.WithValue(context.Background(), "trace_id", "2233")
+	ctx := context.WithValue(context.Background(), traceKey{}, "2233")
 	log.WithContext(ctx).Info("got trace!")
 }
 
 func Trace() Valuer {
 	return func(ctx context.Context) interface{} {
-		s := ctx.Value("trace_id").(string)
+		s := ctx.Value(traceKey{}).(string)
 		return s
 	}
 }

log/log.go

@@ -5,10 +5,8 @@ import (
 	"log"
 )
 
-var (
-	// DefaultLogger is default logger.
-	DefaultLogger Logger = NewStdLogger(log.Writer())
-)
+// DefaultLogger is default logger.
+var DefaultLogger Logger = NewStdLogger(log.Writer())
 
 // Logger is a logger interface.
 type Logger interface {

log/log_test.go

@@ -8,7 +8,7 @@ import (
 func TestInfo(t *testing.T) {
 	logger := DefaultLogger
 	logger = With(logger, "ts", DefaultTimestamp, "caller", DefaultCaller)
-	logger.Log(LevelInfo, "key1", "value1")
+	_ = logger.Log(LevelInfo, "key1", "value1")
 }
 
 func TestWrapper(t *testing.T) {
@@ -16,5 +16,5 @@ func TestWrapper(t *testing.T) {
 	err := NewStdLogger(os.Stderr)
 
 	l := With(MultiLogger(out, err), "ts", DefaultTimestamp, "caller", DefaultCaller)
-	l.Log(LevelInfo, "msg", "test")
+	_ = l.Log(LevelInfo, "msg", "test")
 }

log/std.go

@@ -40,7 +40,7 @@ func (l *stdLogger) Log(level Level, keyvals ...interface{}) error {
 	for i := 0; i < len(keyvals); i += 2 {
 		_, _ = fmt.Fprintf(buf, " %s=%v", keyvals[i], keyvals[i+1])
 	}
-	_ = l.log.Output(4, buf.String())
+	_ = l.log.Output(4, buf.String()) //nolint:gomnd
 	buf.Reset()
 	l.pool.Put(buf)
 	return nil

log/std_test.go

@@ -6,8 +6,8 @@ func TestStdLogger(t *testing.T) {
 	logger := DefaultLogger
 	logger = With(logger, "caller", DefaultCaller, "ts", DefaultTimestamp)
 
-	logger.Log(LevelInfo, "msg", "test debug")
-	logger.Log(LevelInfo, "msg", "test info")
-	logger.Log(LevelInfo, "msg", "test warn")
-	logger.Log(LevelInfo, "msg", "test error")
+	_ = logger.Log(LevelInfo, "msg", "test debug")
+	_ = logger.Log(LevelInfo, "msg", "test info")
+	_ = logger.Log(LevelInfo, "msg", "test warn")
+	_ = logger.Log(LevelInfo, "msg", "test error")
 }

log/value.go

@@ -9,8 +9,9 @@ import (
 )
 
 var (
+	defaultDepth = 3
 	// DefaultCaller is a Valuer that returns the file and line.
-	DefaultCaller = Caller(3)
+	DefaultCaller = Caller(defaultDepth)
 
 	// DefaultTimestamp is a Valuer that returns the current wallclock time.
 	DefaultTimestamp = Timestamp(time.RFC3339)

log/value_test.go

@@ -5,5 +5,5 @@ import "testing"
 func TestValue(t *testing.T) {
 	logger := DefaultLogger
 	logger = With(logger, "ts", DefaultTimestamp, "caller", DefaultCaller)
-	logger.Log(LevelInfo, "msg", "helloworld")
+	_ = logger.Log(LevelInfo, "msg", "helloworld")
 }