diff --git a/chain/beacon/drand/drand.go b/chain/beacon/drand/drand.go index 7ecf65adeaf..33b1d1ce506 100644 --- a/chain/beacon/drand/drand.go +++ b/chain/beacon/drand/drand.go @@ -70,18 +70,28 @@ type DrandHTTPClient interface { type logger struct { *zap.SugaredLogger + name string } func (l *logger) With(args ...interface{}) dlog.Logger { - return &logger{l.SugaredLogger.With(args...)} + return &logger{l.SugaredLogger.With(args...), l.name} } func (l *logger) Named(s string) dlog.Logger { - return &logger{l.SugaredLogger.Named(s)} + newName := l.name + if newName != "" { + newName += "." + } + newName += s + return &logger{l.SugaredLogger.Named(s), newName} } func (l *logger) AddCallerSkip(skip int) dlog.Logger { - return &logger{l.SugaredLogger.With(zap.AddCallerSkip(skip))} + return &logger{l.SugaredLogger.With(zap.AddCallerSkip(skip)), l.name} +} + +func (l *logger) Name() string { + return l.name } func NewDrandBeacon(genesisTs, interval uint64, ps *pubsub.PubSub, config dtypes.DrandConfig) (*DrandBeacon, error) { @@ -96,7 +106,7 @@ func NewDrandBeacon(genesisTs, interval uint64, ps *pubsub.PubSub, config dtypes var clients []drand.Client for _, url := range config.Servers { - hc, err := hclient.NewWithInfo(&logger{&log.SugaredLogger}, url, drandChain, nil) + hc, err := hclient.NewWithInfo(&logger{&log.SugaredLogger, "drand"}, url, drandChain, nil) if err != nil { return nil, xerrors.Errorf("could not create http drand client: %w", err) } @@ -107,7 +117,7 @@ func NewDrandBeacon(genesisTs, interval uint64, ps *pubsub.PubSub, config dtypes opts := []dclient.Option{ dclient.WithChainInfo(drandChain), dclient.WithCacheSize(1024), - dclient.WithLogger(&logger{&log.SugaredLogger}), + dclient.WithLogger(&logger{&log.SugaredLogger, "drand"}), } if ps != nil { diff --git a/chain/beacon/drand/drand_test.go b/chain/beacon/drand/drand_test.go index 10b7193a4f8..ec3fabe7141 100644 --- a/chain/beacon/drand/drand_test.go +++ b/chain/beacon/drand/drand_test.go @@ -22,7 +22,7 @@ func TestPrintGroupInfo(t *testing.T) { drandChain, err := dchain.InfoFromJSON(bytes.NewReader([]byte(chainInfo))) assert.NoError(t, err) - c, err := hclient.NewWithInfo(&logger{&log.SugaredLogger}, server, drandChain, nil) + c, err := hclient.NewWithInfo(&logger{&log.SugaredLogger, "drand"}, server, drandChain, nil) assert.NoError(t, err) chain, err := c.FetchChainInfo(context.Background(), nil) diff --git a/go.mod b/go.mod index 67300e626dd..4fee119b4d4 100644 --- a/go.mod +++ b/go.mod @@ -192,7 +192,7 @@ require ( github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/dgraph-io/ristretto v0.2.0 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect - github.com/drand/drand/v2 v2.0.6 + github.com/drand/drand/v2 v2.1.3 github.com/drand/kyber-bls12381 v0.3.3 // indirect github.com/elastic/go-windows v1.0.2 // indirect github.com/etclabscore/go-jsonschema-walk v0.0.6 // indirect diff --git a/go.sum b/go.sum index bf5e567ab3a..a1bec3b5e31 100644 --- a/go.sum +++ b/go.sum @@ -201,8 +201,8 @@ github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUn github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/drand/drand/v2 v2.0.6 h1:yUoHR9hbAF98nPcpaF3Pdk8xHKCrEhCtwvnBPmucPRI= -github.com/drand/drand/v2 v2.0.6/go.mod h1:4s65uiKkQezRUj4cIe0525y2xA3xPbh3BsRfVhNvYzY= +github.com/drand/drand/v2 v2.1.3 h1:/FDobNK5KW3onnXVOChUe8BFkGLkwIu7SNcPYrhEJH8= +github.com/drand/drand/v2 v2.1.3/go.mod h1:8TT+5oKwd+A3dJCFjE/qE0PC8VaF6xcgMpU3TxbRybg= github.com/drand/go-clients v0.2.2 h1:wnXk321iBjA2mrRM9oRSWb2hHYO/Oaexf1SlW093HYQ= github.com/drand/go-clients v0.2.2/go.mod h1:S9nhirDj6F8GaZDYNy7kI3AbuamhERQyDGLqkCZjaGs= github.com/drand/kyber v1.3.1 h1:E0p6M3II+loMVwTlAp5zu4+GGZFNiRfq02qZxzw2T+Y= @@ -1336,8 +1336,8 @@ go.dedis.ch/kyber/v4 v4.0.0-pre2.0.20240924132404-4de33740016e h1:BAGc1ommHzlhqH go.dedis.ch/kyber/v4 v4.0.0-pre2.0.20240924132404-4de33740016e/go.mod h1:tg6jwKTYEjm94VxkFwiQy+ec9hoQvccIU989wNjXWVI= go.dedis.ch/protobuf v1.0.11 h1:FTYVIEzY/bfl37lu3pR4lIj+F9Vp1jE8oh91VmxKgLo= go.dedis.ch/protobuf v1.0.11/go.mod h1:97QR256dnkimeNdfmURz0wAMNVbd1VmLXhG1CrTYrJ4= -go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= -go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= +go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk= +go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=