From 2564c2f06e3ab455e84f8efd047297fb804c505d Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Thu, 23 Mar 2023 10:39:03 +0800
Subject: [PATCH] ctx

---
 internal/msgtransfer/modify_msg_handler.go |  2 +-
 internal/tools/msg_test.go                 |  2 +-
 pkg/common/mcontext/ctx.go                 | 15 +++++++--------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/internal/msgtransfer/modify_msg_handler.go b/internal/msgtransfer/modify_msg_handler.go
index f9c0228c3..c50e83220 100644
--- a/internal/msgtransfer/modify_msg_handler.go
+++ b/internal/msgtransfer/modify_msg_handler.go
@@ -66,7 +66,7 @@ func (mmc *ModifyMsgConsumerHandler) ModifyMsg(ctx context.Context, cMsg *sarama
 		if !isReactionFromCache {
 			continue
 		}
-		mcontext.SetOperationID(ctx, operationID)
+		ctx = mcontext.SetOperationID(ctx, operationID)
 		if msgDataToMQ.MsgData.ContentType == constant.ReactionMessageModifier {
 			notification := &apistruct.ReactionMessageModifierNotification{}
 			if err := json.Unmarshal(msgDataToMQ.MsgData.Content, notification); err != nil {
diff --git a/internal/tools/msg_test.go b/internal/tools/msg_test.go
index d3a62b5f5..2a83937df 100644
--- a/internal/tools/msg_test.go
+++ b/internal/tools/msg_test.go
@@ -66,7 +66,7 @@ func TestDeleteMongoMsgAndResetRedisSeq(t *testing.T) {
 	mongoClient := mgo.GetDatabase().Collection(unRelationTb.MsgDocModel{}.TableName())
 
 	ctx := context.Background()
-	mcontext.SetOperationID(ctx, operationID)
+	ctx = mcontext.SetOperationID(ctx, operationID)
 	testUID1 := "test_del_id1"
 	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID1 + ":" + strconv.Itoa(0)})
 	if err != nil {
diff --git a/pkg/common/mcontext/ctx.go b/pkg/common/mcontext/ctx.go
index 898aacc53..c1191bdaa 100644
--- a/pkg/common/mcontext/ctx.go
+++ b/pkg/common/mcontext/ctx.go
@@ -20,20 +20,19 @@ func WithTriggerIDContext(ctx context.Context, triggerID string) context.Context
 func NewCtx(operationID string) context.Context {
 	c := context.Background()
 	ctx := context.WithValue(c, constant.OperationID, operationID)
-	SetOperationID(ctx, operationID)
-	return ctx
+	return SetOperationID(ctx, operationID)
 }
 
-func SetOperationID(ctx context.Context, operationID string) {
-	ctx = context.WithValue(ctx, constant.OperationID, operationID)
+func SetOperationID(ctx context.Context, operationID string) context.Context {
+	return context.WithValue(ctx, constant.OperationID, operationID)
 }
 
-func SetOpUserID(ctx context.Context, opUserID string) {
-	ctx = context.WithValue(ctx, constant.OpUserID, opUserID)
+func SetOpUserID(ctx context.Context, opUserID string) context.Context {
+	return context.WithValue(ctx, constant.OpUserID, opUserID)
 }
 
-func SetConnID(ctx context.Context, connID string) {
-	ctx = context.WithValue(ctx, constant.ConnID, connID)
+func SetConnID(ctx context.Context, connID string) context.Context {
+	return context.WithValue(ctx, constant.ConnID, connID)
 }
 
 func GetOperationID(ctx context.Context) string {