Merge branch 'main' into digest-request

Author: samliok

fuzz.sh

@@ -12,6 +12,6 @@ grep -ore "Fuzz.*(f \*" * | cut -d\( -f1 | while read line; do
   testName=$( echo $line | cut -d: -f2  )
   dir=$( dirname $file )
   cd $dir
-  go test -fuzz="${testName}" -fuzztime 10s
+  LOG_LEVEL=info go test -fuzz="${testName}" -fuzztime 10s
   cd -
 done

testutil/logger.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"go.uber.org/zap"
+	"go.uber.org/zap/buffer"
 	"go.uber.org/zap/zapcore"
 )
 
@@ -55,6 +56,9 @@ func MakeLogger(t *testing.T, node ...int) *TestLogger {
 	config.EncodeTime = zapcore.TimeEncoderOfLayout("[01-02|15:04:05.000]")
 	config.ConsoleSeparator = " "
 	encoder := zapcore.NewConsoleEncoder(config)
+	if strings.ToLower(os.Getenv("LOG_LEVEL")) == "info" {
+		encoder = &DebugSwallowingEncoder{consoleEncoder: encoder, ObjectEncoder: encoder, pool: buffer.NewPool()}
+	}
 
 	atomicLevel := zap.NewAtomicLevelAt(zapcore.DebugLevel)
 
@@ -77,3 +81,24 @@ func MakeLogger(t *testing.T, node ...int) *TestLogger {
 
 	return l
 }
+
+type DebugSwallowingEncoder struct {
+	zapcore.ObjectEncoder
+	consoleEncoder zapcore.Encoder
+	pool           buffer.Pool
+}
+
+func (dse *DebugSwallowingEncoder) Clone() zapcore.Encoder {
+	return &DebugSwallowingEncoder{
+		pool:           dse.pool,
+		ObjectEncoder:  dse.ObjectEncoder,
+		consoleEncoder: dse.consoleEncoder.Clone(),
+	}
+}
+
+func (dse *DebugSwallowingEncoder) EncodeEntry(entry zapcore.Entry, fields []zapcore.Field) (*buffer.Buffer, error) {
+	if entry.Level == zapcore.DebugLevel {
+		return dse.pool.Get(), nil
+	}
+	return dse.consoleEncoder.EncodeEntry(entry, fields)
+}

unit-tests.sh

@@ -2,7 +2,7 @@
 
 set -o pipefail
 
-go test -v -race ./... &> out.log
+LOG_LEVEL=info go test -v -race ./... &> out.log
 
 if [[ $? -ne 0 ]];then
   echo "Tests failed"