nixevol/NixMsg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 合并 Prometheus 指标接线

Browse Source
This commit is contained in:
Nixevol
2026-09-30 12:10:44 +08:00
parent 60bc873ef6 b4789fc9e2
commit bb8ce5f178
12 changed files with 333 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/nixmsg/serve.go
+17 -6
View File
@@ -71,6 +71,10 @@ func runServe(ctx context.Context, cfg config.Config) error {
loginLocks := auth.NewLoginLocks()
memConns := message.NewMemoryConns()
msgLim := message.LimitsFromFullConfig(cfg)
metricsReg := metrics.New()
db.Queue.OnBatchCommit = func(d time.Duration) {
metricsReg.WriteCommitSeconds.Observe(d.Seconds())
}
login := broker.NewLogin(broker.LoginOptions{
DB: db,
@@ -84,11 +88,13 @@ func runServe(ctx context.Context, cfg config.Config) error {
msgApp := message.New(db, msgLim, hashPool,
message.WithLocks(loginLocks),
message.WithConnRegistry(memConns),
message.WithMetrics(metricsReg),
)
uplink := &appUplink{
msg: msgApp,
conns: memConns,
log: slog.Default(),
msg: msgApp,
conns: memConns,
log: slog.Default(),
metrics: metricsReg,
}
sess := broker.NewSession(broker.SessionOptions{
Login: login,
@@ -109,6 +115,7 @@ func runServe(ctx context.Context, cfg config.Config) error {
Authenticator: login,
Uplink: sess,
Logger: slog.Default(),
Metrics: metricsReg,
OnPublishDropped: func(dropCtx context.Context, endpointID string, connID port.ConnID, payload []byte) {
if dropErr := msgApp.OnPublishDropped(dropCtx, endpointID, connID, payload); dropErr != nil {
slog.Error("on publish dropped", "endpoint", endpointID, "err", dropErr)
@@ -125,6 +132,7 @@ func runServe(ctx context.Context, cfg config.Config) error {
message.WithLocks(loginLocks),
message.WithConnRegistry(memConns),
message.WithDownlink(brk),
message.WithMetrics(metricsReg),
)
uplink.msg = msgApp
uplink.down = brk
@@ -217,7 +225,6 @@ func runServe(ctx context.Context, cfg config.Config) error {
},
})
metricsReg := metrics.New()
buildHandlers := func(proxies *listener.ProxySet) listener.Handlers {
return listener.Handlers{
MQTT: brk.WSHandler(proxies),
@@ -299,7 +306,7 @@ func runServe(ctx context.Context, cfg config.Config) error {
loopCtx, loopCancel := context.WithCancel(ctx)
defer loopCancel()
go messageLoops(loopCtx, msgApp, memConns)
go messageLoops(loopCtx, msgApp, memConns, db, hashPool, metricsReg)
<-ctx.Done()
loopCancel()
@@ -312,7 +319,7 @@ func runServe(ctx context.Context, cfg config.Config) error {
return nil
}
func messageLoops(ctx context.Context, msgApp *message.App, conns *message.MemoryConns) {
func messageLoops(ctx context.Context, msgApp *message.App, conns *message.MemoryConns, db *store.DB, hashPool auth.HashPool, met *metrics.Registry) {
t := time.NewTicker(time.Second)
defer t.Stop()
for {
@@ -332,6 +339,10 @@ func messageLoops(ctx context.Context, msgApp *message.App, conns *message.Memor
if err := msgApp.CleanupOnce(ctx, nowMs); err != nil {
slog.Error("cleanup once", "err", err)
}
if err := metrics.SampleStoreGauges(ctx, met, db.Read); err != nil {
slog.Debug("sample store gauges", "err", err)
}
metrics.SampleQueues(met, db.Queue.Len(), hashPool.QueueLen())
}
}
}
cmd/nixmsg/uplink.go
+5
View File
@@ -11,6 +11,7 @@ import (
"git.asio.asia/nixevol/NixMsg/internal/app/message"
"git.asio.asia/nixevol/NixMsg/internal/app/port"
"git.asio.asia/nixevol/NixMsg/internal/app/presence"
"git.asio.asia/nixevol/NixMsg/internal/metrics"
"git.asio.asia/nixevol/NixMsg/internal/protocol"
)
@@ -23,6 +24,7 @@ type appUplink struct {
conns *message.MemoryConns
down port.Downlink
log *slog.Logger
metrics *metrics.Registry
}
func (u *appUplink) OnSessionEstablished(ctx context.Context, conn port.ConnInfo) error {
@@ -255,6 +257,9 @@ func (u *appUplink) replyErr(ctx context.Context, conn port.ConnInfo, rid, code,
if rid == "" {
rid = "0"
}
if u.metrics != nil && code != "" {
u.metrics.ErrorsTotal.WithLabelValues(code).Inc()
}
resp := protocol.Resp{
V: protocol.Version,
Type: protocol.TypeResp,