diff --git a/pkg/utils/getcd.go b/pkg/utils/getcd.go index 7e7897b82..9c6ddce7b 100644 --- a/pkg/utils/getcd.go +++ b/pkg/utils/getcd.go @@ -2,17 +2,23 @@ package utils import ( "Open_IM/pkg/common/config" + "Open_IM/pkg/common/constant" + "Open_IM/pkg/common/trace_log" + "context" "github.com/OpenIMSDK/getcdv3" - "github.com/OpenIMSDK/open_utils/constant" + "google.golang.org/grpc" "strings" ) -func GetConn(operationID, serviceName string) (*grpc.ClientConn, error) { - conn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), +func GetConn(ctx context.Context, operationID, serviceName string) (conn *grpc.ClientConn, err error) { + defer func() { + trace_log.SetContextInfo(ctx, "GetConn", err, "serviceName", serviceName) + }() + conn = getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), serviceName, operationID, config.Config.Etcd.UserName, config.Config.Etcd.Password) if conn == nil { - return nil, constant.ErrGetRpcConn + return nil, constant.ErrRpcConn } return conn, nil }