Merge branch 'ver3' of github.com:OpenIMSDK/Open-IM-Server into ver3

pkg/discoveryregistry/zookeeper/discover.go

@@ -102,6 +102,7 @@ func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grp
 
 func (s *ZkClient) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (grpc.ClientConnInterface, error) {
 	newOpts := append(s.options, grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, s.balancerName)))
+	s.logger.Printf("get conn from client, serviceName: %s", serviceName)
 	return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(newOpts, opts...)...)
 }
 

pkg/discoveryregistry/zookeeper/resolver.go

@@ -18,7 +18,7 @@ type Resolver struct {
 }
 
 func (r *Resolver) ResolveNowZK(o resolver.ResolveNowOptions) {
-	log.ZDebug(context.Background(), "start resolve now", "target", r.target)
+	log.ZDebug(context.Background(), "start resolve now", "target", r.target, "cc", r.cc)
 	newConns, err := r.getConnsRemote(strings.TrimLeft(r.target.URL.Path, "/"))
 	if err != nil {
 		log.ZError(context.Background(), "resolve now error", err, "target", r.target)
@@ -37,7 +37,7 @@ func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) {}
 func (s *Resolver) Close() {}
 
 func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
-	s.logger.Printf("build resolver: %+v, cc: %+v", target, cc)
+	s.logger.Printf("build resolver: %+v, cc: %+v", "target", target, "cc", cc)
 	r := &Resolver{}
 	r.target = target
 	r.cc = cc