Zap levels added, and custom log levels added

Author: bharathi-tenneti

go.sum

@@ -319,8 +319,6 @@ go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qL
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=

pkg/log/zap/flags.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Kubernetes Authors.
+Copyright 2020 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,20 +16,18 @@ limitations under the License.
 
 // Package zap contains helpers for setting up a new logr.Logger instance
 // using the Zap logging framework.
-
 package zap
 
 import (
 	"fmt"
+	"strconv"
 	"strings"
 
 	"github.com/spf13/pflag"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
 
-type encoderConfigFunc func(*zapcore.EncoderConfig)
-
 type encoderFlag struct {
 	setFunc func(zapcore.Encoder)
 	value   string
@@ -59,19 +57,13 @@ func (ev *encoderFlag) Set(flagValue string) error {
 	return nil
 }
 
-func newJSONEncoder(ecfs ...encoderConfigFunc) zapcore.Encoder {
+func newJSONEncoder() zapcore.Encoder {
 	encoderConfig := zap.NewProductionEncoderConfig()
-	for _, f := range ecfs {
-		f(&encoderConfig)
-	}
 	return zapcore.NewJSONEncoder(encoderConfig)
 }
 
-func newConsoleEncoder(ecfs ...encoderConfigFunc) zapcore.Encoder {
+func newConsoleEncoder() zapcore.Encoder {
 	encoderConfig := zap.NewDevelopmentEncoderConfig()
-	for _, f := range ecfs {
-		f(&encoderConfig)
-	}
 	return zapcore.NewConsoleEncoder(encoderConfig)
 }
 
@@ -84,16 +76,31 @@ var _ pflag.Value = &levelFlag{}
 
 func (ev *levelFlag) Set(flagValue string) error {
 	lower := strings.ToLower(flagValue)
+	var lvl int
 	switch lower {
-	case "debug":
+	case "debug", "-1":
 		ev.setFunc(zap.NewAtomicLevelAt(zap.DebugLevel))
-	case "info":
+	case "info", "0":
 		ev.setFunc(zap.NewAtomicLevelAt(zap.InfoLevel))
+	case "error", "2":
+		ev.setFunc(zap.NewAtomicLevelAt(zap.ErrorLevel))
 	default:
-		return fmt.Errorf("invalid log level \"%s\"", flagValue)
+		i, err := strconv.Atoi(lower)
+		if err != nil {
+			return fmt.Errorf("invalid log level \"%s\"", flagValue)
+		}
+		if i > 0 {
+			fmt.Println("Iam here")
+			lvl = -1 * i
+			ev.setFunc(zap.NewAtomicLevelAt(zapcore.Level(int8(lvl))))
+		} else {
+			return fmt.Errorf("invalid log level \"%s\"", flagValue)
+		}
 	}
+
 	ev.value = flagValue
 	return nil
+
 }
 
 func (ev *levelFlag) String() string {
@@ -109,11 +116,23 @@ type stackTraceFlag struct {
 	value   string
 }
 
+var _ pflag.Value = &stackTraceFlag{}
+
 func (ev *stackTraceFlag) Set(flagValue string) error {
 	lower := strings.ToLower(flagValue)
 	switch lower {
+	case "debug":
+		ev.setFunc(zap.NewAtomicLevelAt(zap.DebugLevel))
+	case "info":
+		ev.setFunc(zap.NewAtomicLevelAt(zap.InfoLevel))
 	case "warn":
 		ev.setFunc(zap.NewAtomicLevelAt(zap.WarnLevel))
+	case "dpanic":
+		ev.setFunc(zap.NewAtomicLevelAt(zap.DPanicLevel))
+	case "panic":
+		ev.setFunc(zap.NewAtomicLevelAt(zap.PanicLevel))
+	case "fatal":
+		ev.setFunc(zap.NewAtomicLevelAt(zap.FatalLevel))
 	case "error":
 		ev.setFunc(zap.NewAtomicLevelAt(zap.ErrorLevel))
 	default:

pkg/log/zap/zap.go

@@ -19,13 +19,13 @@ limitations under the License.
 package zap
 
 import (
+	"flag"
 	"io"
 	"os"
 	"time"
 
 	"github.com/go-logr/logr"
 	"github.com/go-logr/zapr"
-	"github.com/spf13/pflag"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
@@ -210,9 +210,11 @@ func NewRaw(opts ...Opts) *zap.Logger {
 }
 
 // BindToFlagSet func allows CLI passed flags to be parsed.
-func (o *Options) BindFlags(fs *pflag.FlagSet) {
+func (o *Options) BindFlags(fs *flag.FlagSet) {
+
 	// Set Development mode value
-	fs.BoolVar(&o.Development, "zap-devel", false, "Enable zap development mode (changes defaults to console encoder, debug log level, and disables sampling)")
+	fs.BoolVar(&o.Development, "zap-devel", false, "Development Mode defaults(encoder=consoleEncoder,logLevel=Debug,stackTraceLevel=Warn)."+
+		"If Development Mode is not set, defaults apply(encoder=jsonEncoder,logLevel=Info,stackTraceLevel=Error)")
 
 	// Set Encoder value
 	var encVal encoderFlag
@@ -226,15 +228,15 @@ func (o *Options) BindFlags(fs *pflag.FlagSet) {
 	levelVal.setFunc = func(fromFlag zap.AtomicLevel) {
 		o.Level = &fromFlag
 	}
-	fs.Var(&levelVal, "zap-log-level", "Zap log level (one of 'debug', 'info', 'error' or any integer value > 0)")
+	fs.Var(&levelVal, "zap-log-level", "Zap Level to configure the verbosity of logging. Can be one of 'debug', 'info', 'error',"+
+		"or any integer value > 0 which corresponds to custom debug levels of increasing verbosity")
 
 	// Set the StrackTrace Level
 	var stackVal stackTraceFlag
 	stackVal.setFunc = func(fromFlag zap.AtomicLevel) {
 		o.StacktraceLevel = &fromFlag
 	}
-	fs.Var(&stackVal, "zap-stacktrace-level", "Zap log level (one of 'warn',  'error'")
-
+	fs.Var(&stackVal, "zap-stacktrace-level", "Zap Level at and above which stacktraces are captured (one of 'warn' or 'error'")
 }
 
 // UseFlagOptions to set logger with CLI passed flags.