Disable sampling for debug levels

Author: bharathi-tenneti

pkg/log/zap/flags.go

@@ -93,7 +93,7 @@ func (ev *levelFlag) Set(flagValue string) error {
 		if err != nil {
 			return fmt.Errorf("invalid log level \"%s\"", flagValue)
 		}
-		if logLevel >= 0 {
+		if logLevel > 0 {
 			intLevel := -1 * logLevel
 			ev.setFunc(zap.NewAtomicLevelAt(zapcore.Level(int8(intLevel))))
 		} else {

pkg/log/zap/zap.go

@@ -181,12 +181,16 @@ func (o *Options) addDefaults() {
 			lvl := zap.NewAtomicLevelAt(zap.ErrorLevel)
 			o.StacktraceLevel = &lvl
 		}
-		o.ZapOpts = append(o.ZapOpts,
-			zap.WrapCore(func(core zapcore.Core) zapcore.Core {
-				return zapcore.NewSampler(core, time.Second, 100, 100)
-			}))
+		// Turn off sampling for all debug levels.
+		if o.Level.Enabled(zapcore.DebugLevel) {
+			o.ZapOpts = append(o.ZapOpts, zap.Development())
+		} else {
+			o.ZapOpts = append(o.ZapOpts,
+				zap.WrapCore(func(core zapcore.Core) zapcore.Core {
+					return zapcore.NewSampler(core, time.Second, 100, 100)
+				}))
+		}
 	}
-
 	o.ZapOpts = append(o.ZapOpts, zap.AddStacktrace(o.StacktraceLevel))
 }
 

pkg/log/zap/zap_test.go

@@ -307,6 +307,7 @@ var _ = Describe("Zap log level flag options setup", func() {
 		info      = "info text"
 		debug1    = "debug 1 text"
 		debug2    = "debug 2 text"
+		debug3    = "debug 3 text"
 	)
 
 	BeforeEach(func() {
@@ -370,8 +371,25 @@ var _ = Describe("Zap log level flag options setup", func() {
 			Expect(string(outRaw)).Should(ContainSubstring(debug1))
 		})
 
+		It("Should set integer debug level 1 for zap-log-level flag.", func() {
+			args := []string{"--zap-log-level=1", "--zap-devel=true"}
+			fromFlags.BindFlags(&fs)
+			err := fs.Parse(args)
+			Expect(err).ToNot(HaveOccurred())
+			logOut := new(bytes.Buffer)
+
+			logger := New(UseFlagOptions(&fromFlags), WriteTo(logOut))
+			logger.V(0).Info(info)
+			logger.V(1).Info(debug1)
+
+			outRaw := logOut.Bytes()
+
+			Expect(string(outRaw)).Should(ContainSubstring(info))
+			Expect(string(outRaw)).Should(ContainSubstring(debug1))
+		})
+
 		It("Should set integer debug level 2 for zap-log-level flag.", func() {
-			args := []string{"--zap-log-level=2"}
+			args := []string{"--zap-log-level=2", "--zap-devel=true"}
 			fromFlags.BindFlags(&fs)
 			err := fs.Parse(args)
 			Expect(err).ToNot(HaveOccurred())
@@ -389,6 +407,25 @@ var _ = Describe("Zap log level flag options setup", func() {
 			Expect(string(outRaw)).Should(ContainSubstring(debug2))
 
 		})
+		It("Should set integer debug level 3 for zap-log-level flag.", func() {
+			args := []string{"--zap-log-level=3", "--zap-devel=false"}
+			fromFlags.BindFlags(&fs)
+			err := fs.Parse(args)
+			Expect(err).ToNot(HaveOccurred())
+			logOut := new(bytes.Buffer)
+
+			logger := New(UseFlagOptions(&fromFlags), WriteTo(logOut))
+			logger.V(0).Info(info)
+			logger.V(1).Info(debug1)
+			logger.V(3).Info(debug3)
+
+			outRaw := logOut.Bytes()
+
+			Expect(string(outRaw)).Should(ContainSubstring(info))
+			Expect(string(outRaw)).Should(ContainSubstring(debug1))
+			Expect(string(outRaw)).Should(ContainSubstring(debug3))
+
+		})
 
 	})