prome

internal/msg_transfer/logic/init.go

@@ -4,13 +4,10 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/kafka"
+	promePkg "Open_IM/pkg/common/prometheus"
 	"Open_IM/pkg/statistics"
 	"fmt"
-	"net/http"
-	"strconv"
 	"sync"
-
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 const OnlineTopicBusy = 1
@@ -60,10 +57,12 @@ func Run(promethuesPort int) {
 	go historyCH.historyConsumerGroup.RegisterHandleAndConsumer(&historyCH)
 	go historyMongoCH.historyConsumerGroup.RegisterHandleAndConsumer(&historyMongoCH)
 	//go offlineHistoryCH.historyConsumerGroup.RegisterHandleAndConsumer(&offlineHistoryCH)
-	if config.Config.Prometheus.Enable {
-		http.Handle("/metrics", promhttp.Handler())
-		http.ListenAndServe(":"+strconv.Itoa(promethuesPort), nil)
-	}
+	go func() {
+		err := promePkg.StartPromeSrv(promethuesPort)
+		if err != nil {
+			panic(err)
+		}
+	}()
 }
 func SetOnlineTopicStatus(status int) {
 	w.Lock()

internal/msg_transfer/logic/persistent_msg_handler.go

@@ -23,7 +23,8 @@ import (
 )
 
 var (
-	msgInsertMysqlProcessed prometheus.Counter
+	msgInsertMysqlCounter       prometheus.Counter
+	msgInsertFailedMysqlCounter prometheus.Counter
 )
 
 type PersistentConsumerHandler struct {
@@ -38,13 +39,21 @@ func (pc *PersistentConsumerHandler) Init() {
 		OffsetsInitial: sarama.OffsetNewest, IsReturnErr: false}, []string{config.Config.Kafka.Ws2mschat.Topic},
 		config.Config.Kafka.Ws2mschat.Addr, config.Config.Kafka.ConsumerGroupID.MsgToMySql)
 	if config.Config.Prometheus.Enable {
-		msgInsertMysqlProcessed = promauto.NewCounter(prometheus.CounterOpts{
-			Name: "insert_mysql_msg_total",
-			Help: "The total number of msg insert mysql events",
-		})
+		pc.initPrometheus()
 	}
 }
 
+func (pc *PersistentConsumerHandler) initPrometheus() {
+	msgInsertMysqlCounter = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "insert_mysql_msg_total",
+		Help: "The total number of msg insert mysql events",
+	})
+	msgInsertFailedMysqlCounter = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "insert_mysql_failed_msg_total",
+		Help: "The total number of msg insert mysql events",
+	})
+}
+
 func (pc *PersistentConsumerHandler) handleChatWs2Mysql(cMsg *sarama.ConsumerMessage, msgKey string, _ sarama.ConsumerGroupSession) {
 	msg := cMsg.Value
 	log.NewInfo("msg come here mysql!!!", "", "msg", string(msg), msgKey)
@@ -76,13 +85,11 @@ func (pc *PersistentConsumerHandler) handleChatWs2Mysql(cMsg *sarama.ConsumerMes
 			log.NewInfo(msgFromMQ.OperationID, "msg_transfer msg persisting", string(msg))
 			if err = im_mysql_msg_model.InsertMessageToChatLog(msgFromMQ); err != nil {
 				log.NewError(msgFromMQ.OperationID, "Message insert failed", "err", err.Error(), "msg", msgFromMQ.String())
+				msgInsertFailedMysqlCounter.Inc()
 				return
 			}
-			msgInsertMysqlProcessed.Inc()
-			msgInsertMysqlProcessed.Add(1)
 			if config.Config.Prometheus.Enable {
-				log.NewDebug(msgFromMQ.OperationID, utils.GetSelfFuncName(), "inc msgInsertMysqlProcessed", msgInsertMysqlProcessed.Desc())
-				msgInsertMysqlProcessed.Inc()
+				msgInsertMysqlCounter.Inc()
 			}
 		}