Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Configure proper logging for grpc integration tests.

Browse Source
This commit is contained in:
Piotr Tabor 2021-04-14 12:31:37 +02:00
parent d72f7ef5cc
commit fad6391745
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/integration/cluster.go
View File

@ -777,11 +777,7 @@ func NewClientV3(m *member) (*clientv3.Client, error) {
if m.DialOptions != nil { if m.DialOptions != nil {
cfg.DialOptions = append(cfg.DialOptions, m.DialOptions...) cfg.DialOptions = append(cfg.DialOptions, m.DialOptions...)
} }
c, err := newClientV3(cfg) return newClientV3(cfg, m.Logger.Named("client"))
if err != nil {
return nil, err
}
return c.WithLogger(m.Logger.Named("client")), nil
} }
// Clone returns a member with the same server configuration. The returned // Clone returns a member with the same server configuration. The returned

9
tests/integration/cluster_direct.go
View File

@ -22,6 +22,7 @@ import (
"go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb" "go.etcd.io/etcd/server/v3/etcdserver/api/v3election/v3electionpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb" "go.etcd.io/etcd/server/v3/etcdserver/api/v3lock/v3lockpb"
"go.uber.org/zap"
) )
const ThroughProxy = false const ThroughProxy = false
@ -39,6 +40,10 @@ func toGRPC(c *clientv3.Client) grpcAPI {
} }
} }
func newClientV3(cfg clientv3.Config) (*clientv3.Client, error) { func newClientV3(cfg clientv3.Config, lg *zap.Logger) (*clientv3.Client, error) {
return clientv3.New(cfg) c, err := clientv3.New(cfg)
if err != nil {
return nil, err
}
return c.WithLogger(lg), nil
} }

6
tests/integration/cluster_proxy.go
View File

@ -25,7 +25,6 @@ import (
"go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/client/v3/namespace"
"go.etcd.io/etcd/server/v3/proxy/grpcproxy" "go.etcd.io/etcd/server/v3/proxy/grpcproxy"
"go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter" "go.etcd.io/etcd/server/v3/proxy/grpcproxy/adapter"
"go.uber.org/zap" "go.uber.org/zap"
) )
@ -56,7 +55,7 @@ func toGRPC(c *clientv3.Client) grpcAPI {
// TODO: Refactor to a separate clientv3.Client instance instead of the context alone. // TODO: Refactor to a separate clientv3.Client instance instead of the context alone.
ctx, ctxCancel := context.WithCancel(context.WithValue(context.TODO(), "_name", "grpcProxyContext")) ctx, ctxCancel := context.WithCancel(context.WithValue(context.TODO(), "_name", "grpcProxyContext"))
lg := zap.NewExample() lg := c.GetLogger()
if v, ok := proxies[c]; ok { if v, ok := proxies[c]; ok {
return v.grpc return v.grpc
@ -109,11 +108,12 @@ func (pc *proxyCloser) Close() error {
return err return err
} }
func newClientV3(cfg clientv3.Config) (*clientv3.Client, error) { func newClientV3(cfg clientv3.Config, lg *zap.Logger) (*clientv3.Client, error) {
c, err := clientv3.New(cfg) c, err := clientv3.New(cfg)
if err != nil { if err != nil {
return nil, err return nil, err
} }
c = c.WithLogger(lg)
rpc := toGRPC(c) rpc := toGRPC(c)
c.KV = clientv3.NewKVFromKVClient(rpc.KV, c) c.KV = clientv3.NewKVFromKVClient(rpc.KV, c)
pmu.Lock() pmu.Lock()