From f10ceaec5c1396094457186410376d16525d1397 Mon Sep 17 00:00:00 2001 From: Zheng Kai Date: Thu, 31 Aug 2023 18:04:44 +0800 Subject: [PATCH] feat: metrics skip cached token --- server/src/core/metrics.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/server/src/core/metrics.go b/server/src/core/metrics.go index 665664d..c7477c1 100644 --- a/server/src/core/metrics.go +++ b/server/src/core/metrics.go @@ -33,22 +33,20 @@ func doMetrics(ab []byte, cached bool, r *http.Request, req *pb.Req) { return } - metrics.RspToken(u.PromptTokens, u.TotalTokens, cached) - if !cached { - zj.J(`token`, u.PromptTokens, u.TotalTokens) - } - - metrics.RspTokenByModel(o.Model, u.TotalTokens) - - key := strings.TrimPrefix(r.Header.Get(`Authorization`), `Bearer `) - metrics.RspTokenByKey(key, u.TotalTokens) - ip, err := util.GetIP(r) sip := ip.String() if err != nil { sip = `unknown` } - metrics.RspTokenByIP(sip, u.TotalTokens) + + key := strings.TrimPrefix(r.Header.Get(`Authorization`), `Bearer `) + + metrics.RspToken(u.PromptTokens, u.TotalTokens, cached) + if !cached { + metrics.RspTokenByModel(o.Model, u.TotalTokens) + metrics.RspTokenByKey(key, u.TotalTokens) + metrics.RspTokenByIP(sip, u.TotalTokens) + } d := &pb.EsMetrics{ ID: o.Id,