diff --git a/internal/indexnode/task.go b/internal/indexnode/task.go index 1027d4860d..9d36f2ab49 100644 --- a/internal/indexnode/task.go +++ b/internal/indexnode/task.go @@ -176,7 +176,7 @@ func (it *indexBuildTask) Prepare(ctx context.Context) error { } } log.Ctx(ctx).Info("Successfully prepare indexBuildTask", zap.Int64("buildID", it.BuildID), - zap.Int64("Collection", it.collectionID), zap.Int64("SegmentIf", it.segmentID)) + zap.Int64("Collection", it.collectionID), zap.Int64("SegmentID", it.segmentID)) return nil } @@ -230,10 +230,10 @@ func (it *indexBuildTask) LoadData(ctx context.Context) error { err = it.decodeBlobs(ctx, blobs) if err != nil { log.Ctx(ctx).Info("failed to decode blobs", zap.Int64("buildID", it.BuildID), - zap.Int64("Collection", it.collectionID), zap.Int64("SegmentIf", it.segmentID), zap.Error(err)) + zap.Int64("Collection", it.collectionID), zap.Int64("SegmentID", it.segmentID), zap.Error(err)) } else { log.Ctx(ctx).Info("Successfully load data", zap.Int64("buildID", it.BuildID), - zap.Int64("Collection", it.collectionID), zap.Int64("SegmentIf", it.segmentID)) + zap.Int64("Collection", it.collectionID), zap.Int64("SegmentID", it.segmentID)) } blobs = nil debug.FreeOSMemory() @@ -512,7 +512,7 @@ func (it *indexBuildTask) SaveDiskAnnIndexFiles(ctx context.Context) error { saveIndexFileDur := it.tr.RecordSpan() metrics.IndexNodeSaveIndexFileLatency.WithLabelValues(strconv.FormatInt(paramtable.GetNodeID(), 10)).Observe(float64(saveIndexFileDur.Milliseconds())) it.tr.Elapse("index building all done") - log.Ctx(ctx).Info("IndexNode CreateIndex successfully ", zap.Int64("collect", it.collectionID), + log.Ctx(ctx).Info("IndexNode CreateIndex successfully ", zap.Int64("collection", it.collectionID), zap.Int64("partition", it.partitionID), zap.Int64("segment", it.segmentID)) return nil } diff --git a/pkg/metrics/c_registry.go b/pkg/metrics/c_registry.go index 85b69bede1..86dab1e47b 100644 --- a/pkg/metrics/c_registry.go +++ b/pkg/metrics/c_registry.go @@ -22,14 +22,16 @@ package metrics */ import "C" import ( - "github.com/milvus-io/milvus/pkg/log" - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/common/expfmt" "sort" "strings" "sync" "unsafe" + "github.com/milvus-io/milvus/pkg/log" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/common/expfmt" + "go.uber.org/zap" + dto "github.com/prometheus/client_model/go" ) @@ -123,7 +125,7 @@ func (r *CRegistry) Gather() (res []*dto.MetricFamily, err error) { out, err := parser.TextToMetricFamilies(strings.NewReader(metricsStr)) if err != nil { - log.Error("fail to parse prometheus metrics") + log.Error("fail to parse prometheus metrics", zap.Error(err)) return } res = NormalizeMetricFamilies(out)