Merge remote-tracking branch 'origin/errcode' into errcode

# Conflicts:
#	pkg/common/db/controller/storage.go

internal/api/a2r/api2rpc.go

@@ -27,13 +27,13 @@ func Call[A, B, C any](
 	}
 	cli, err := client()
 	if err != nil {
+		log.ZError(c, "get rpc client conn failed", err)
 		apiresp.GinError(c, errs.ErrInternalServer.Wrap(err.Error())) // 获取RPC连接失败
-		log.Error("0", "get rpc client conn err:", err.Error())
 		return
 	}
 	data, err := rpc(cli, c, &req)
 	if err != nil {
-		log.Error("0", "rpc call err:", err.Error())
+		log.ZError(c, "rpc call failed", err)
 		apiresp.GinError(c, err) // RPC调用失败
 		return
 	}

internal/common/notification/c.go

@@ -4,11 +4,9 @@ import (
 	"OpenIM/internal/common/check"
 	"OpenIM/pkg/common/config"
 	"OpenIM/pkg/common/constant"
-	"OpenIM/pkg/common/tracelog"
 	discoveryRegistry "OpenIM/pkg/discoveryregistry"
 	"OpenIM/pkg/proto/msg"
 	"OpenIM/pkg/proto/sdkws"
-	utils2 "OpenIM/pkg/utils"
 	"context"
 	utils "github.com/OpenIMSDK/open_utils"
 )
@@ -44,10 +42,6 @@ type NotificationMsg struct {
 
 func (c *Check) Notification(ctx context.Context, notificationMsg *NotificationMsg) error {
 	var err error
-	defer func() {
-		tracelog.SetCtxDebug(ctx, utils2.GetFuncName(1), err, "notificationMsg", notificationMsg)
-	}()
-
 	var req msg.SendMsgReq
 	var msg sdkws.MsgData
 	var offlineInfo sdkws.OfflinePushInfo

internal/common/notification/extend_msg.go

@@ -53,12 +53,7 @@ func (c *Check) ExtendMessageDeleteNotification(ctx context.Context, sendID stri
 
 	c.messageReactionSender(ctx, sendID, sourceID, sessionType, constant.ReactionMessageDeleter, utils.StructToJsonString(m), isHistory, isReactionFromCache)
 }
-func (c *Check) messageReactionSender(ctx context.Context, sendID string, sourceID string, sessionType, contentType int32, content string, isHistory bool, isReactionFromCache bool) {
-	var err error
-	defer func() {
-		tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "sendID", sendID, "sourceID", sourceID, "sessionType", sessionType)
-	}()
-
+func (c *Check) messageReactionSender(ctx context.Context, sendID string, sourceID string, sessionType, contentType int32, content string, isHistory bool, isReactionFromCache bool) error {
 	options := make(map[string]bool, 5)
 	utils.SetSwitchFromOptions(options, constant.IsOfflinePush, false)
 	utils.SetSwitchFromOptions(options, constant.IsConversationUpdate, false)
@@ -87,5 +82,6 @@ func (c *Check) messageReactionSender(ctx context.Context, sendID string, source
 	case constant.GroupChatType, constant.SuperGroupChatType:
 		pbData.MsgData.GroupID = sourceID
 	}
-	_, err = c.Msg.SendMsg(ctx, &pbData)
+	_, err := c.Msg.SendMsg(ctx, &pbData)
+	return err
 }

internal/msgtransfer/online_history_msg_handler.go

@@ -88,7 +88,7 @@ func (och *OnlineHistoryRedisConsumerHandler) Run(channelID int) {
 				notStoragePushMsgList := make([]*pbMsg.MsgDataToMQ, 0, 80)
 				log.Debug(triggerID, "msg arrived channel", "channel id", channelID, msgList, msgChannelValue.aggregationID, len(msgList))
 				var modifyMsgList []*pbMsg.MsgDataToMQ
-				ctx := tracelog.NewCtx("redis consumer", triggerID)
+				ctx := tracelog.NewCtx("redis consumer")
 				tracelog.SetOperationID(ctx, triggerID)
 				for _, v := range msgList {
 					log.Debug(triggerID, "msg come to storage center", v.String())

internal/objstorage/controller.go

@@ -60,7 +60,7 @@ func (c *Controller) ApplyPut(ctx context.Context, args *FragmentPutArgs) (*PutA
 			Name:   args.Name,
 		}
 		// 直接拷贝一份
-		err := c.i.CopyObjetInfo(ctx, &src, dst)
+		err := c.i.CopyObjectInfo(ctx, &src, dst)
 		if err == nil {
 			info, err := c.i.GetObjectInfo(ctx, dst)
 			if err != nil {
@@ -195,7 +195,7 @@ func (c *Controller) ConfirmPut(ctx context.Context, putID string) (*ObjectInfo,
 			log.Println("del key:", err)
 		}
 		for _, b := range src {
-			err = c.i.DeleteObjetInfo(ctx, &b)
+			err = c.i.DeleteObjectInfo(ctx, &b)
 			if err != nil {
 				log.Println("del obj:", err)
 			}

internal/rpc/group/callback.go

@@ -19,9 +19,6 @@ func CallbackBeforeCreateGroup(ctx context.Context, req *group.CreateGroupReq) (
 	if !config.Config.Callback.CallbackBeforeCreateGroup.Enable {
 		return nil
 	}
-	defer func() {
-		tracelog.SetCtxInfo(ctx, utils.GetFuncName(1), err, "req", req)
-	}()
 	cbReq := &callbackstruct.CallbackBeforeCreateGroupReq{
 		CallbackCommand: constant.CallbackBeforeCreateGroupCommand,
 		OperationID:     tracelog.GetOperationID(ctx),
@@ -67,9 +64,6 @@ func CallbackBeforeMemberJoinGroup(ctx context.Context, groupMember *relation.Gr
 	if !config.Config.Callback.CallbackBeforeMemberJoinGroup.Enable {
 		return nil
 	}
-	defer func() {
-		tracelog.SetCtxInfo(ctx, utils.GetFuncName(1), err, "groupMember", *groupMember, "groupEx", groupEx)
-	}()
 	callbackReq := &callbackstruct.CallbackBeforeMemberJoinGroupReq{
 		CallbackCommand: constant.CallbackBeforeMemberJoinGroupCommand,
 		OperationID:     tracelog.GetOperationID(ctx),
@@ -97,9 +91,6 @@ func CallbackBeforeSetGroupMemberInfo(ctx context.Context, req *group.SetGroupMe
 	if !config.Config.Callback.CallbackBeforeSetGroupMemberInfo.Enable {
 		return nil
 	}
-	defer func() {
-		tracelog.SetCtxInfo(ctx, utils.GetFuncName(1), err, "req", *req)
-	}()
 	callbackReq := callbackstruct.CallbackBeforeSetGroupMemberInfoReq{
 		CallbackCommand: constant.CallbackBeforeSetGroupMemberInfoCommand,
 		OperationID:     tracelog.GetOperationID(ctx),

internal/rpc/group/group.go

@@ -9,6 +9,7 @@ import (
 	"OpenIM/pkg/common/db/relation"
 	relationTb "OpenIM/pkg/common/db/table/relation"
 	"OpenIM/pkg/common/db/unrelation"
+	"OpenIM/pkg/common/log"
 	"OpenIM/pkg/common/tokenverify"
 	"OpenIM/pkg/common/tracelog"
 	"OpenIM/pkg/discoveryregistry"
@@ -727,7 +728,7 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf
 			UserIDList: userIDs,
 		}
 		if err := s.ConversationChecker.ModifyConversationField(ctx, &args); err != nil {
-			tracelog.SetCtxWarn(ctx, "ModifyConversationField", err, args)
+			log.ZWarn(ctx, "modifyConversationField failed", err, "args", args)
 		}
 	}
 	return resp, nil

internal/tools/msg.go

@@ -59,7 +59,7 @@ func (c *MsgTool) getCronTaskOperationID() string {
 
 func (c *MsgTool) AllUserClearMsgAndFixSeq() {
 	operationID := "AllUserAndGroupClearMsgAndFixSeq"
-	ctx := tracelog.NewCtx(utils.GetSelfFuncName(), "")
+	ctx := tracelog.NewCtx(utils.GetSelfFuncName())
 	log.NewInfo(operationID, "============================ start del cron task ============================")
 	var err error
 	userIDList, err := c.userDatabase.GetAllUserID(ctx)