change the log which contains a stack

Signed-off-by: Ryan Leung <rleungx@gmail.com>

client/base_client.go

@@ -216,7 +216,7 @@ func (c *baseClient) getMembers(ctx context.Context, url string) (*pdpb.GetMembe
 	members, err := pdpb.NewPDClient(cc).GetMembers(ctx, &pdpb.GetMembersRequest{})
 	if err != nil {
 		attachErr := errors.Errorf("error:%s target:%s status:%s", err, cc.Target(), cc.GetState().String())
-		return nil, errs.ErrClientGetMember.GenWithStackByArgs(attachErr)
+		return nil, errs.ErrClientGetMember.Wrap(attachErr).GenWithStackByCause()
 	}
 	return members, nil
 }

pkg/errs/errs_test.go

@@ -16,6 +16,7 @@ package errs
 import (
 	"bytes"
 	"fmt"
+	"strconv"
 	"strings"
 	"testing"
 
@@ -89,6 +90,20 @@ func (s *testErrorSuite) TestError(c *C) {
 	err := errors.New("test error")
 	log.Error("test", ZapError(ErrInvalidTimestamp, err))
 	rfc = `[error="[PD:tso:ErrInvalidTimestamp] test error"]`
-	fmt.Println(lg.Message())
 	c.Assert(strings.Contains(lg.Message(), rfc), IsTrue)
 }
+
+func (s *testErrorSuite) TestErrorWithStack(c *C) {
+	conf := &log.Config{Level: "debug", File: log.FileLogConfig{}, DisableTimestamp: true}
+	lg := newZapTestLogger(conf)
+	log.ReplaceGlobals(lg.Logger, nil)
+
+	_, err := strconv.ParseUint("-42", 10, 64)
+	log.Error("test", ZapError(ErrStrconvParseInt.Wrap(err).GenWithStackByCause()))
+	m1 := lg.Message()
+	log.Error("test", zap.Error(errors.WithStack(err)))
+	m2 := lg.Message()
+	// This test is based on line number and the first log is in line 102, the second is in line 104.
+	// So they have the same length stack. Move this test to another place need to change the corresponding length.
+	c.Assert(len(m1[strings.Index(m1, "[stack="):]), Equals, len(m2[strings.Index(m2, "[stack="):]))
+}

pkg/etcdutil/etcdutil.go

@@ -110,7 +110,7 @@ func EtcdKVGet(c *clientv3.Client, key string, opts ...clientv3.OpOption) (*clie
 	}
 
 	if err != nil {
-		return resp, errs.ErrEtcdKVGet.GenWithStackByArgs(err)
+		return resp, errs.ErrEtcdKVGet.Wrap(err).GenWithStackByCause()
 	}
 	return resp, nil
 }

pkg/grpcutil/grpcutil.go

@@ -55,7 +55,7 @@ func (s SecurityConfig) ToTLSConfig() (*tls.Config, error) {
 
 	tlsConfig, err := tlsInfo.ClientConfig()
 	if err != nil {
-		return nil, errs.ErrEtcdTLSConfig.GenWithStackByArgs(err)
+		return nil, errs.ErrEtcdTLSConfig.Wrap(err).GenWithStackByCause()
 	}
 	return tlsConfig, nil
 }
@@ -93,11 +93,11 @@ func GetClientConn(ctx context.Context, addr string, tlsCfg *tls.Config, do ...g
 	}
 	u, err := url.Parse(addr)
 	if err != nil {
-		return nil, errs.ErrURLParse.GenWithStackByArgs(err)
+		return nil, errs.ErrURLParse.Wrap(err).GenWithStackByCause()
 	}
 	cc, err := grpc.DialContext(ctx, u.Host, append(do, opt)...)
 	if err != nil {
-		return nil, errs.ErrGRPCDial.GenWithStackByArgs(err)
+		return nil, errs.ErrGRPCDial.Wrap(err).GenWithStackByCause()
 	}
 	return cc, nil
 }

server/election/leadership.go

@@ -138,7 +138,7 @@ func (ls *Leadership) DeleteLeader() error {
 	// delete leader itself and let others start a new election again.
 	resp, err := ls.LeaderTxn().Then(clientv3.OpDelete(ls.leaderKey)).Commit()
 	if err != nil {
-		return errs.ErrEtcdKVDelete.GenWithStackByArgs(err)
+		return errs.ErrEtcdKVDelete.Wrap(err).GenWithStackByCause()
 	}
 	if !resp.Succeeded {
 		return errs.ErrEtcdTxn.FastGenByArgs("not leader already")

server/kv/etcd_kv.go

@@ -89,7 +89,7 @@ func (kv *etcdKVBase) Save(key, value string) error {
 	txn := NewSlowLogTxn(kv.client)
 	resp, err := txn.Then(clientv3.OpPut(key, value)).Commit()
 	if err != nil {
-		err = errs.ErrEtcdKVPut.GenWithStackByArgs(err)
+		err = errs.ErrEtcdKVPut.Wrap(err).GenWithStackByCause()
 		log.Error("save to etcd meet error", zap.String("key", key), zap.String("value", value), errs.ZapError(err))
 		return err
 	}
@@ -105,7 +105,7 @@ func (kv *etcdKVBase) Remove(key string) error {
 	txn := NewSlowLogTxn(kv.client)
 	resp, err := txn.Then(clientv3.OpDelete(key)).Commit()
 	if err != nil {
-		err = errs.ErrEtcdKVDelete.GenWithStackByArgs(err)
+		err = errs.ErrEtcdKVDelete.Wrap(err).GenWithStackByCause()
 		log.Error("remove from etcd meet error", zap.String("key", key), errs.ZapError(err))
 		return err
 	}

server/member/member.go

@@ -232,7 +232,7 @@ func (m *Member) MoveEtcdLeader(ctx context.Context, old, new uint64) error {
 	defer cancel()
 	err := m.etcd.Server.MoveLeader(moveCtx, old, new)
 	if err != nil {
-		return errs.ErrEtcdMoveLeader.GenWithStackByArgs(err)
+		return errs.ErrEtcdMoveLeader.Wrap(err).GenWithStackByCause()
 	}
 	return nil
 }
@@ -331,7 +331,7 @@ func (m *Member) GetMemberLeaderPriority(id uint64) (int, error) {
 	}
 	priority, err := strconv.ParseInt(string(res.Kvs[0].Value), 10, 32)
 	if err != nil {
-		return 0, errs.ErrStrconvParseInt.GenWithStackByArgs(err)
+		return 0, errs.ErrStrconvParseInt.Wrap(err).GenWithStackByCause()
 	}
 	return int(priority), nil
 }