Skip to content

Commit 03b8fd1

Browse files
committed
[ES-1365579] check if tracing is enabled for obj store lib
Signed-off-by: Yi Jin <[email protected]>
1 parent 51a5c33 commit 03b8fd1

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

cmd/thanos/compact.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ func runCompact(
326326

327327
ctx, cancel := context.WithCancel(context.Background())
328328
ctx = tracing.ContextWithTracer(ctx, tracer)
329+
ctx = objstoretracing.ContextWithTracer(ctx, tracer) // objstore tracing uses a different tracer key in context.
329330

330331
defer func() {
331332
if rerr != nil {

pkg/block/fetcher.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,16 @@ type RecursiveLister struct {
223223
}
224224

225225
func NewRecursiveLister(logger log.Logger, bkt objstore.InstrumentedBucketReader) *RecursiveLister {
226+
level.Info(logger).Log("msg", "Using recursive block lister")
226227
return &RecursiveLister{
227228
logger: logger,
228229
bkt: bkt,
229230
}
230231
}
231232

232233
func (f *RecursiveLister) GetActiveAndPartialBlockIDs(ctx context.Context, ch chan<- ulid.ULID) (partialBlocks map[ulid.ULID]bool, err error) {
234+
level.Info(f.logger).Log("msg", "recursive block lister started")
235+
start := time.Now()
233236
partialBlocks = make(map[ulid.ULID]bool)
234237
err = f.bkt.Iter(ctx, "", func(name string) error {
235238
parts := strings.Split(name, "/")
@@ -253,6 +256,7 @@ func (f *RecursiveLister) GetActiveAndPartialBlockIDs(ctx context.Context, ch ch
253256
}
254257
return nil
255258
}, objstore.WithRecursiveIter())
259+
level.Info(f.logger).Log("msg", "recursive block lister ended", "duration", time.Since(start))
256260
return partialBlocks, err
257261
}
258262

@@ -264,13 +268,17 @@ type ConcurrentLister struct {
264268
}
265269

266270
func NewConcurrentLister(logger log.Logger, bkt objstore.InstrumentedBucketReader) *ConcurrentLister {
271+
level.Info(logger).Log("msg", "Using concurrent block lister")
267272
return &ConcurrentLister{
268273
logger: logger,
269274
bkt: bkt,
270275
}
271276
}
272277

273278
func (f *ConcurrentLister) GetActiveAndPartialBlockIDs(ctx context.Context, ch chan<- ulid.ULID) (partialBlocks map[ulid.ULID]bool, err error) {
279+
level.Info(f.logger).Log("msg", "concurrent block lister started")
280+
start := time.Now()
281+
defer level.Info(f.logger).Log("msg", "concurrent block lister end", "duration", time.Since(start))
274282
const concurrency = 64
275283

276284
partialBlocks = make(map[ulid.ULID]bool)
@@ -519,7 +527,7 @@ func (f *BaseFetcher) fetchMetadata(ctx context.Context) (interface{}, error) {
519527
ch = make(chan ulid.ULID, f.concurrency)
520528
mtx sync.Mutex
521529
)
522-
level.Debug(f.logger).Log("msg", "fetching meta data", "concurrency", f.concurrency, "cache_dir", f.cacheDir)
530+
level.Info(f.logger).Log("msg", "fetching meta data", "concurrency", f.concurrency, "cache_dir", f.cacheDir)
523531
for i := 0; i < f.concurrency; i++ {
524532
eg.Go(func() error {
525533
numBlocks := 0

0 commit comments

Comments
 (0)