diff --git a/internal/distributed/indexcoord/service.go b/internal/distributed/indexcoord/service.go index 73dc8f44c2..c658244a09 100644 --- a/internal/distributed/indexcoord/service.go +++ b/internal/distributed/indexcoord/service.go @@ -69,7 +69,7 @@ func (s *Server) init() error { indexcoord.Params.Address = Params.ServiceAddress indexcoord.Params.Port = Params.ServicePort - closer := trace.InitTracing("index_coord") + closer := trace.InitTracing("IndexCoord") s.closer = closer if err := s.indexcoord.Register(); err != nil { diff --git a/internal/distributed/indexnode/service.go b/internal/distributed/indexnode/service.go index 0ca82d9c06..3a6268aaba 100644 --- a/internal/distributed/indexnode/service.go +++ b/internal/distributed/indexnode/service.go @@ -104,7 +104,7 @@ func (s *Server) init() error { indexnode.Params.IP = Params.IP indexnode.Params.Address = Params.Address - closer := trace.InitTracing(fmt.Sprintf("index_node ip: %s, port: %d", Params.IP, Params.Port)) + closer := trace.InitTracing(fmt.Sprintf("IndexNode-%d", indexnode.Params.NodeID)) s.closer = closer Params.Address = Params.IP + ":" + strconv.FormatInt(int64(Params.Port), 10) diff --git a/internal/indexcoord/index_coord.go b/internal/indexcoord/index_coord.go index e02489b0ba..489266ba12 100644 --- a/internal/indexcoord/index_coord.go +++ b/internal/indexcoord/index_coord.go @@ -342,14 +342,13 @@ func (i *IndexCoord) BuildIndex(ctx context.Context, req *indexpb.BuildIndexRequ return i.sched.IndexAddQueue.Enqueue(t) } } - err := fn() if err != nil { ret.Status.ErrorCode = commonpb.ErrorCode_UnexpectedError ret.Status.Reason = err.Error() return ret, nil } - log.Debug("IndexCoord BuildIndex Enqueue successfully", zap.Any("IndexBuildID", indexBuildID)) + log.Debug("IndexCoord BuildIndex Enqueue successfully", zap.Any("IndexBuildID", t.indexBuildID)) err = t.WaitToFinish() if err != nil { @@ -357,6 +356,7 @@ func (i *IndexCoord) BuildIndex(ctx context.Context, req *indexpb.BuildIndexRequ ret.Status.Reason = err.Error() return ret, nil } + sp.SetTag("IndexCoord-IndexBuildID", strconv.FormatInt(t.indexBuildID, 10)) ret.Status.ErrorCode = commonpb.ErrorCode_Success ret.IndexBuildID = t.indexBuildID return ret, nil diff --git a/internal/indexnode/indexnode.go b/internal/indexnode/indexnode.go index 191e10e29e..e307c53dd8 100644 --- a/internal/indexnode/indexnode.go +++ b/internal/indexnode/indexnode.go @@ -175,8 +175,9 @@ func (i *IndexNode) CreateIndex(ctx context.Context, request *indexpb.CreateInde zap.Any("TypeParams", request.TypeParams), zap.Any("IndexParams", request.IndexParams)) - sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "CreateIndex") + sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "IndexNode-CreateIndex") defer sp.Finish() + sp.SetTag("IndexBuildID", strconv.FormatInt(request.IndexBuildID, 10)) t := &IndexBuildTask{ BaseTask: BaseTask{