fix: process add errors wrap. (#1862)

* fix: process add errors wrap.

* fix: process add errors wrap.

pkg/common/kafka/consumer_group.go

@@ -16,6 +16,8 @@ package kafka
 
 import (
 	"context"
+	"github.com/OpenIMSDK/tools/errs"
+	"strings"
 
 	"github.com/OpenIMSDK/tools/log"
 
@@ -36,7 +38,7 @@ type MConsumerGroupConfig struct {
 	IsReturnErr    bool
 }
 
-func NewMConsumerGroup(consumerConfig *MConsumerGroupConfig, topics, addrs []string, groupID string) *MConsumerGroup {
+func NewMConsumerGroup(consumerConfig *MConsumerGroupConfig, topics, addrs []string, groupID string) (*MConsumerGroup, error) {
 	consumerGroupConfig := sarama.NewConfig()
 	consumerGroupConfig.Version = consumerConfig.KafkaVersion
 	consumerGroupConfig.Consumer.Offsets.Initial = consumerConfig.OffsetsInitial
@@ -49,26 +51,28 @@ func NewMConsumerGroup(consumerConfig *MConsumerGroupConfig, topics, addrs []str
 	SetupTLSConfig(consumerGroupConfig)
 	consumerGroup, err := sarama.NewConsumerGroup(addrs, groupID, consumerGroupConfig)
 	if err != nil {
-		panic(err.Error())
+		return nil, errs.Wrap(err, strings.Join(topics, ","), strings.Join(addrs, ","), groupID)
 	}
 	return &MConsumerGroup{
 		consumerGroup,
 		groupID,
 		topics,
-	}
+	}, nil
 }
 
 func (mc *MConsumerGroup) GetContextFromMsg(cMsg *sarama.ConsumerMessage) context.Context {
 	return GetContextWithMQHeader(cMsg.Headers)
 }
 
-func (mc *MConsumerGroup) RegisterHandleAndConsumer(handler sarama.ConsumerGroupHandler) {
+func (mc *MConsumerGroup) RegisterHandleAndConsumer(ctx context.Context, handler sarama.ConsumerGroupHandler) {
 	log.ZDebug(context.Background(), "register consumer group", "groupID", mc.groupID)
-	ctx := context.Background()
 	for {
 		err := mc.ConsumerGroup.Consume(ctx, mc.topics, handler)
 		if err != nil {
-			panic(err.Error())
+			log.ZWarn(ctx, "consume err", err, "topic", mc.topics, "groupID", mc.groupID)
+		}
+		if ctx.Err() != nil {
+			return
 		}
 	}
 }

pkg/common/kafka/producer.go

@@ -18,6 +18,7 @@ import (
 	"bytes"
 	"context"
 	"errors"
+	"github.com/OpenIMSDK/tools/errs"
 	"strings"
 	"time"
 
@@ -44,7 +45,7 @@ type Producer struct {
 }
 
 // NewKafkaProducer initializes a new Kafka producer.
-func NewKafkaProducer(addr []string, topic string) *Producer {
+func NewKafkaProducer(addr []string, topic string) (*Producer, error) {
 	p := Producer{
 		addr:   addr,
 		topic:  topic,
@@ -87,17 +88,17 @@ func NewKafkaProducer(addr []string, topic string) *Producer {
 	for i := 0; i <= maxRetry; i++ {
 		p.producer, err = sarama.NewSyncProducer(p.addr, p.config)
 		if err == nil {
-			return &p
+			return &p, nil
 		}
 		time.Sleep(1 * time.Second) // Wait before retrying
 	}
 
 	// Panic if unable to create producer after retries
 	if err != nil {
-		panic("Failed to create Kafka producer: " + err.Error())
+		return nil, errs.Wrap(errors.New("failed to create Kafka producer: " + err.Error()))
 	}
 
-	return &p
+	return &p, nil
 }
 
 // configureProducerAck configures the producer's acknowledgement level.