From 01812fc39e1806296d64fa0e92a8d355fea66980 Mon Sep 17 00:00:00 2001 From: metonymic-smokey Date: Wed, 1 Dec 2021 17:41:18 +0530 Subject: [PATCH] minor nits Signed-off-by: metonymic-smokey --- pkg/compact/compact.go | 5 ++--- pkg/tracing/tracing.go | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/compact/compact.go b/pkg/compact/compact.go index 3f8937185d..c8e9945ba7 100644 --- a/pkg/compact/compact.go +++ b/pkg/compact/compact.go @@ -767,7 +767,7 @@ func (cg *Group) Compact(ctx context.Context, dir string, planner Planner, comp } var err error - tracing.DoInSpanWithErr(ctx, "group_compaction", func(ctx context.Context) error { + tracing.DoInSpanWithErr(ctx, "compaction_group", func(ctx context.Context) error { shouldRerun, compID, err = cg.compact(ctx, subDir, planner, comp) return err }, opentracing.Tags{"group.key": cg.Key()}) @@ -1022,14 +1022,13 @@ func (cg *Group) compact(ctx context.Context, dir string, planner Planner, comp err = block.Download(ctx, cg.logger, cg.bkt, meta.ULID, bdir) return err }, opentracing.Tags{"block.id": meta.ULID}) - if err != nil { return false, ulid.ULID{}, retry(errors.Wrapf(err, "download block %s", meta.ULID)) } // Ensure all input blocks are valid. var stats block.HealthStats - tracing.DoInSpanWithErr(ctx, "compaction_block_healthstats", func(ctx context.Context) error { + tracing.DoInSpanWithErr(ctx, "compaction_block_health_stats", func(ctx context.Context) error { stats, err = block.GatherIndexHealthStats(cg.logger, filepath.Join(bdir, block.IndexFilename), meta.MinTime, meta.MaxTime) return err }, opentracing.Tags{"block.id": meta.ULID}) diff --git a/pkg/tracing/tracing.go b/pkg/tracing/tracing.go index 7760776d5e..1987382d58 100644 --- a/pkg/tracing/tracing.go +++ b/pkg/tracing/tracing.go @@ -8,7 +8,6 @@ import ( "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" - opentracing_log "github.com/opentracing/opentracing-go/log" ) const ( @@ -82,7 +81,7 @@ func DoInSpanWithErr(ctx context.Context, operationName string, doFn func(contex defer span.Finish() err := doFn(newCtx) if err != nil { - ext.LogError(span, err, opentracing_log.Error(err)) + ext.LogError(span, err) } }