From d5ec7dda801b1bcb017b83cc963131b6be7a487f Mon Sep 17 00:00:00 2001 From: wei liu Date: Thu, 6 Jul 2023 17:48:26 +0800 Subject: [PATCH] fix metric label in search/query count (#25377) Signed-off-by: Wei Liu --- internal/querynodev2/handlers.go | 2 +- internal/querynodev2/services.go | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/querynodev2/handlers.go b/internal/querynodev2/handlers.go index 4044dc994d..d3b24eb541 100644 --- a/internal/querynodev2/handlers.go +++ b/internal/querynodev2/handlers.go @@ -119,7 +119,7 @@ func (node *QueryNode) queryChannel(ctx context.Context, req *querypb.QueryReque metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.QueryLabel, metrics.TotalLabel, metrics.Leader).Inc() defer func() { if failRet.Status.ErrorCode != commonpb.ErrorCode_Success { - metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.SearchLabel, metrics.FailLabel, metrics.Leader).Inc() + metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.QueryLabel, metrics.FailLabel, metrics.Leader).Inc() } }() diff --git a/internal/querynodev2/services.go b/internal/querynodev2/services.go index a7af824ffa..103fc94e51 100644 --- a/internal/querynodev2/services.go +++ b/internal/querynodev2/services.go @@ -906,7 +906,7 @@ func (node *QueryNode) QuerySegments(ctx context.Context, req *querypb.QueryRequ metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.QueryLabel, metrics.TotalLabel, metrics.FromLeader).Inc() defer func() { if failRet.Status.ErrorCode != commonpb.ErrorCode_Success { - metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.SearchLabel, metrics.FailLabel, metrics.FromLeader).Inc() + metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.QueryLabel, metrics.FailLabel, metrics.FromLeader).Inc() } }() @@ -1015,12 +1015,14 @@ func (node *QueryNode) Query(ctx context.Context, req *querypb.QueryRequest) (*i return WrapRetrieveResult(commonpb.ErrorCode_UnexpectedError, "failed to query channel", err), nil } + tr := timerecord.NewTimeRecorderWithTrace(ctx, "queryRequestReduce") reducer := segments.CreateInternalReducer(req, node.manager.Collection.Get(req.GetReq().GetCollectionID()).Schema()) - ret, err := reducer.Reduce(ctx, toMergeResults) if err != nil { return WrapRetrieveResult(commonpb.ErrorCode_UnexpectedError, "failed to query channel", err), nil } + metrics.QueryNodeReduceLatency.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.QueryLabel). + Observe(float64(tr.ElapseSpan().Milliseconds())) if !req.FromShardLeader { collector.Rate.Add(metricsinfo.NQPerSecond, 1)