Merge pull request #7 from ledgerwatch/log_log15

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/holiman/uint256 v1.2.0
 	github.com/kr/pretty v0.2.1 // indirect
+	github.com/ledgerwatch/log/v3 v3.1.2
 	github.com/ledgerwatch/secp256k1 v0.0.0-20210626115225-cd5cd00ed72d
 	github.com/matryer/moq v0.2.3
 	github.com/pkg/errors v0.9.1 // indirect

go.sum

@@ -21,6 +21,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -54,10 +56,19 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/ledgerwatch/log/v3 v3.0.0 h1:kz3UJBwYeLbJKm8zDa93KVwM3fN7lOFD31ndYtoM3aU=
+github.com/ledgerwatch/log/v3 v3.0.0/go.mod h1:J58eOHHrIYHxl7LKkRsb/0YibKwtLfauUryl5SLRGm0=
+github.com/ledgerwatch/log/v3 v3.1.2 h1:V0DDOh2+axKRRf21Yz52VzfJXDUuJiLMzHMxA1bG+eo=
+github.com/ledgerwatch/log/v3 v3.1.2/go.mod h1:J58eOHHrIYHxl7LKkRsb/0YibKwtLfauUryl5SLRGm0=
 github.com/ledgerwatch/secp256k1 v0.0.0-20210626115225-cd5cd00ed72d h1:/IKMrJdfRsoYNc36PXqP4xMH3vhW/8IQyBKGQbKZUno=
 github.com/ledgerwatch/secp256k1 v0.0.0-20210626115225-cd5cd00ed72d/go.mod h1:SPmqJFciiF/Q0mPt2jVs2dTr/1TZBTIA+kPMmKgBAak=
 github.com/matryer/moq v0.2.3 h1:Q06vEqnBYjjfx5KKgHfYRKE/lvlRu+Nj+xodG4YdHnU=
 github.com/matryer/moq v0.2.3/go.mod h1:9RtPYjTnH1bSBIkpvtHkFN7nbWAnO7oRpdJkEIn6UtE=
+github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
+github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA=
+github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -124,12 +135,15 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=

kv/mdbx/kv_abstract_test.go

@@ -19,6 +19,7 @@ package mdbx_test
 import (
 	"context"
 	"fmt"
+	"runtime"
 	"testing"
 
 	"github.com/ledgerwatch/erigon-lib/gointerfaces"
@@ -27,14 +28,18 @@ import (
 	"github.com/ledgerwatch/erigon-lib/kv/mdbx"
 	"github.com/ledgerwatch/erigon-lib/kv/remotedb"
 	"github.com/ledgerwatch/erigon-lib/kv/remotedbserver"
-	"github.com/ledgerwatch/erigon-lib/log"
+	"github.com/ledgerwatch/log/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/test/bufconn"
 )
 
 func TestSequence(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("fix me on win please")
+	}
+
 	writeDBs, _ := setupDatabases(t, log.New(), func(defaultBuckets kv.TableCfg) kv.TableCfg {
 		return defaultBuckets
 	})
@@ -76,7 +81,11 @@ func TestSequence(t *testing.T) {
 }
 
 func TestManagedTx(t *testing.T) {
-	logger := log.NewTest(t)
+	if runtime.GOOS == "windows" {
+		t.Skip("fix me on win please")
+	}
+
+	logger := log.New()
 	defaultConfig := kv.ChaindataTablesCfg
 	defer func() {
 		kv.ChaindataTablesCfg = defaultConfig
@@ -201,7 +210,7 @@ func setupDatabases(t *testing.T, logger log.Logger, f mdbx.TableCfgFunc) (write
 	f2 := func() {
 		remote.RegisterKVServer(grpcServer, remotedbserver.NewKvServer(writeDBs[1]))
 		if err := grpcServer.Serve(conn); err != nil {
-			logger.Errorf("private RPC server fail: %s", err)
+			logger.Error("private RPC server fail", "err", err)
 		}
 	}
 	go f2()

kv/mdbx/kv_mdbx.go

@@ -30,7 +30,7 @@ import (
 
 	"github.com/c2h5oh/datasize"
 	"github.com/ledgerwatch/erigon-lib/kv"
-	"github.com/ledgerwatch/erigon-lib/log"
+	"github.com/ledgerwatch/log/v3"
 	"github.com/torquem-ch/mdbx-go/mdbx"
 )
 
@@ -288,9 +288,9 @@ func (opts MdbxOpts) Open() (kv.RwDB, error) {
 
 	if !opts.inMem {
 		if staleReaders, err := db.env.ReaderCheck(); err != nil {
-			db.log.Errorf("ReaderCheck: %s", err)
+			db.log.Error("ReaderCheck", "err", err)
 		} else if staleReaders > 0 {
-			db.log.Infof("[db] cleared reader slots from dead processes: amount=%s", staleReaders)
+			db.log.Info("[db] cleared reader slots from dead processes", "amount", staleReaders)
 		}
 	}
 	return db, nil
@@ -326,10 +326,10 @@ func (db *MdbxKV) Close() {
 
 	if db.opts.inMem {
 		if err := os.RemoveAll(db.opts.path); err != nil {
-			db.log.Warnf("remove in-mem db file: %s", err)
+			db.log.Warn("remove in-mem db file", "err", err)
 		}
 	} else {
-		db.log.Infof("database closed (MDBX)")
+		db.log.Info("database closed (MDBX)")
 	}
 }
 

kv/mdbx/kv_migrator_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/ledgerwatch/erigon-lib/kv"
 	"github.com/ledgerwatch/erigon-lib/kv/mdbx"
 	"github.com/ledgerwatch/erigon-lib/kv/memdb"
-	"github.com/ledgerwatch/erigon-lib/log"
+	"github.com/ledgerwatch/log/v3"
 	"github.com/stretchr/testify/require"
 )
 

kv/mdbx/util.go

@@ -18,7 +18,7 @@ package mdbx
 
 import (
 	"github.com/ledgerwatch/erigon-lib/kv"
-	"github.com/ledgerwatch/erigon-lib/log"
+	"github.com/ledgerwatch/log/v3"
 	mdbxbind "github.com/torquem-ch/mdbx-go/mdbx"
 )
 

kv/memdb/memory_database.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/ledgerwatch/erigon-lib/kv"
 	"github.com/ledgerwatch/erigon-lib/kv/mdbx"
-	"github.com/ledgerwatch/erigon-lib/log"
+	"github.com/ledgerwatch/log/v3"
 )
 
 func New() kv.RwDB {

kv/remotedb/kv_remote.go

@@ -33,7 +33,7 @@ import (
 	"github.com/ledgerwatch/erigon-lib/gointerfaces/remote"
 	"github.com/ledgerwatch/erigon-lib/kv"
 	"github.com/ledgerwatch/erigon-lib/kv/mdbx"
-	"github.com/ledgerwatch/erigon-lib/log"
+	"github.com/ledgerwatch/log/v3"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/credentials"
@@ -127,12 +127,12 @@ func (opts remoteOpts) Open(certFile, keyFile, caCert string) (*RemoteKV, error)
 			// load peer cert/key, ca cert
 			peerCert, err := tls.LoadX509KeyPair(certFile, keyFile)
 			if err != nil {
-				opts.log.Errorf("load peer cert/key: %s", err)
+				opts.log.Error("load peer cert/key: %s", err)
 				return nil, err
 			}
 			caCert, err := ioutil.ReadFile(caCert)
 			if err != nil {
-				opts.log.Errorf("read ca cert: %s", err)
+				opts.log.Error("read ca cert: %s", err)
 				return nil, err
 			}
 			caCertPool := x509.NewCertPool()
@@ -205,25 +205,25 @@ func (db *RemoteKV) GrpcConn() *grpc.ClientConn {
 func (db *RemoteKV) EnsureVersionCompatibility() bool {
 	versionReply, err := db.remoteKV.Version(context.Background(), &emptypb.Empty{}, grpc.WaitForReady(true))
 	if err != nil {
-		db.log.Errorf("getting Version", "error", err)
+		db.log.Error("getting Version", "err", err)
 		return false
 	}
 	if !gointerfaces.EnsureVersion(db.opts.version, versionReply) {
-		db.log.Errorf("incompatible interface versions: client=%s", db.opts.version.String(),
+		db.log.Error("incompatible interface versions", "client", db.opts.version.String(),
 			"server", fmt.Sprintf("%d.%d.%d", versionReply.Major, versionReply.Minor, versionReply.Patch))
 		return false
 	}
-	db.log.Infof("interfaces compatible: client=%s", db.opts.version.String(),
+	db.log.Info("interfaces compatible", "client", db.opts.version.String(),
 		"server", fmt.Sprintf("%d.%d.%d", versionReply.Major, versionReply.Minor, versionReply.Patch))
 	return true
 }
 
 func (db *RemoteKV) Close() {
 	if db.conn != nil {
 		if err := db.conn.Close(); err != nil {
-			db.log.Warnf("close remote DB: %s", err)
+			db.log.Warn("close remote DB", "err", err)
 		} else {
-			db.log.Infof("remote database closed")
+			db.log.Info("remote database closed")
 		}
 		db.conn = nil
 	}
@@ -598,12 +598,12 @@ func (tx *remoteTx) closeGrpcStream() {
 		err := tx.stream.CloseSend()
 		if err != nil {
 			if !errors.Is(err, io.EOF) && !errors.Is(err, context.Canceled) {
-				tx.db.log.Warnf("couldn't send msg CloseSend to server: %s", err)
+				tx.db.log.Warn("couldn't send msg CloseSend to server", "err", err)
 			}
 		} else {
 			_, err = tx.stream.Recv()
 			if err != nil && !errors.Is(err, io.EOF) && !errors.Is(err, context.Canceled) {
-				tx.db.log.Warnf("received unexpected error from server after CloseSend: %s", err)
+				tx.db.log.Warn("received unexpected error from server after CloseSend", "err", err)
 			}
 		}
 	}

log/logger.go → log2/logger.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package log
+package log2
 
 import (
 	"testing"

txpool/fetch.go

@@ -27,7 +27,7 @@ import (
 	"github.com/holiman/uint256"
 	"github.com/ledgerwatch/erigon-lib/gointerfaces"
 	"github.com/ledgerwatch/erigon-lib/gointerfaces/sentry"
-	"github.com/ledgerwatch/erigon-lib/log"
+	"github.com/ledgerwatch/log/v3"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -84,7 +84,7 @@ func NewFetch(ctx context.Context,
 		sentryClients: sentryClients,
 		statusData:    statusData,
 		pool:          pool,
-		logger:        logger.Named("[TxPool.Fetch]"),
+		logger:        logger,
 	}
 }
 
@@ -105,7 +105,7 @@ func (f *Fetch) Start() {
 }
 
 func (f *Fetch) receiveMessageLoop(sentryClient sentry.SentryClient) {
-	logger := f.logger.Named("receiveMessageLoop")
+	logger := f.logger
 	for {
 		select {
 		case <-f.ctx.Done():
@@ -118,7 +118,7 @@ func (f *Fetch) receiveMessageLoop(sentryClient sentry.SentryClient) {
 				return
 			}
 			// Report error and wait more
-			logger.Warnf("sentry not ready yet: %s", err)
+			logger.Warn("sentry not ready yet", "err", err)
 			time.Sleep(time.Second)
 			continue
 		}
@@ -147,7 +147,7 @@ func (f *Fetch) receiveMessageLoop(sentryClient sentry.SentryClient) {
 			if errors.Is(err, io.EOF) {
 				return
 			}
-			logger.Warnf("messages: %s", err)
+			logger.Warn("messages", "err", err)
 			return
 		}
 
@@ -165,14 +165,14 @@ func (f *Fetch) receiveMessageLoop(sentryClient sentry.SentryClient) {
 				if errors.Is(err, io.EOF) {
 					return
 				}
-				logger.Warnf("stream.Recv: %s", err)
+				logger.Warn("stream.Recv", "err", err)
 				return
 			}
 			if req == nil {
 				return
 			}
 			if err = f.handleInboundMessage(req, sentryClient); err != nil {
-				logger.Warnf("Handling incoming message: %s", err)
+				logger.Warn("Handling incoming message: %s", "err", err)
 			}
 			if f.wg != nil {
 				f.wg.Done()
@@ -223,7 +223,7 @@ func (f *Fetch) handleInboundMessage(req *sentry.InboundMessage, sentryClient se
 }
 
 func (f *Fetch) receivePeerLoop(sentryClient sentry.SentryClient) {
-	logger := f.logger.Named("receivePeerLoop")
+	logger := f.logger
 	for {
 		select {
 		case <-f.ctx.Done():
@@ -236,7 +236,7 @@ func (f *Fetch) receivePeerLoop(sentryClient sentry.SentryClient) {
 				return
 			}
 			// Report error and wait more
-			logger.Warnf("sentry not ready yet: %s", err)
+			logger.Warn("sentry not ready yet", "err", err)
 			time.Sleep(time.Second)
 			continue
 		}
@@ -256,7 +256,7 @@ func (f *Fetch) receivePeerLoop(sentryClient sentry.SentryClient) {
 			if errors.Is(err, io.EOF) {
 				return
 			}
-			logger.Warnf("peers: %s", err)
+			logger.Warn("peers", "err", err)
 			return
 		}
 
@@ -274,14 +274,14 @@ func (f *Fetch) receivePeerLoop(sentryClient sentry.SentryClient) {
 				if errors.Is(err, io.EOF) {
 					return
 				}
-				logger.Warnf("stream.Recv: %s", err)
+				logger.Warn("stream.Recv", "err", err)
 				return
 			}
 			if req == nil {
 				return
 			}
 			if err = f.handleNewPeer(req); err != nil {
-				logger.Warnf("Handling new peer: %s", err)
+				logger.Warn("Handling new peer", "err", err)
 			}
 			if f.wg != nil {
 				f.wg.Done()

txpool/fetch_test.go

@@ -26,13 +26,13 @@ import (
 	"github.com/ledgerwatch/erigon-lib/direct"
 	"github.com/ledgerwatch/erigon-lib/gointerfaces/sentry"
 	"github.com/ledgerwatch/erigon-lib/gointerfaces/types"
-	"github.com/ledgerwatch/erigon-lib/log"
+	"github.com/ledgerwatch/log/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestFetch(t *testing.T) {
-	logger := log.NewTest(t)
+	logger := log.New()
 	ctx, cancelFn := context.WithCancel(context.Background())
 	defer cancelFn()
 
@@ -68,7 +68,7 @@ func TestFetch(t *testing.T) {
 }
 
 func TestSendTxPropagate(t *testing.T) {
-	logger := log.NewTest(t)
+	logger := log.New()
 
 	ctx, cancelFn := context.WithCancel(context.Background())
 	defer cancelFn()