Skip to content

backends/s3: fix list metric #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Luit merged 2 commits into from
May 26, 2026
Merged

backends/s3: fix list metric #143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
660f02a
backends/s3: fix list metric
Luit May 26, 2026
38470b3
backends/s3: more consistent location for clientTimeoutContext in List
Luit May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions backends/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,9 @@ func (b *Backend) List(ctx context.Context, prefix string) (blobList simpleblob.
combinedPrefix := b.prependGlobalPrefix(prefix)

if !b.opt.UseUpdateMarker {
ctx, cancel := b.clientTimeoutContext(ctx)
defer cancel()

return b.doList(ctx, combinedPrefix)
}

Expand All @@ -227,6 +230,9 @@ func (b *Backend) List(ctx context.Context, prefix string) (blobList simpleblob.
return blobs.WithPrefix(prefix), nil
}

ctx, cancel := b.clientTimeoutContext(ctx)
defer cancel()

blobs, err = b.doList(ctx, b.opt.GlobalPrefix) // We want to cache all, so no prefix
if err != nil {
return nil, err
Expand All @@ -247,8 +253,8 @@ func recordMinioDurationMetric(method string, start time.Time) {
}

func (b *Backend) doList(ctx context.Context, prefix string) (blobs simpleblob.BlobList, err error) {
ctx, cancel := b.clientTimeoutContext(ctx)
defer cancel()
metricCalls.WithLabelValues("list").Inc()
metricLastCallTimestamp.WithLabelValues("list").SetToCurrentTime()
defer recordMinioDurationMetric("list", time.Now())

// Runes to strip from blob names for GlobalPrefix
Expand All @@ -266,8 +272,6 @@ func (b *Backend) doList(ctx context.Context, prefix string) (blobs simpleblob.B
return nil, err
}

metricCalls.WithLabelValues("list").Inc()
metricLastCallTimestamp.WithLabelValues("list").SetToCurrentTime()
if obj.Key == b.markerName {
continue
}
Expand Down Expand Up @@ -315,7 +319,6 @@ func (b *Backend) Load(ctx context.Context, name string) ([]byte, error) {
func (b *Backend) doLoadReader(ctx context.Context, name string) (*minio.Object, error) {
metricCalls.WithLabelValues("load").Inc()
metricLastCallTimestamp.WithLabelValues("load").SetToCurrentTime()

defer recordMinioDurationMetric("load", time.Now())

obj, err := b.client.GetObject(ctx, b.opt.Bucket, name, minio.GetObjectOptions{})
Expand Down