Skip to content

[pull] main from containerd:main #455

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
pull merged 2 commits into from
Aug 12, 2026
+17 −2
Merged

[pull] main from containerd:main #455

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d8883b
client: trace image pull stages
xinhuil-max Jul 31, 2026
01836f0
Merge pull request #12628 from Cindia-blue/tracing-minimal
estesp Aug 12, 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
19 changes: 17 additions & 2 deletions client/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (_ Ima
unpackSpan.End()
return nil, err
}
unpackSpan.SetAttributes(tracing.Attribute("unpack.count", ur.Unpacks))
unpackSpan.End()
}

Expand Down Expand Up @@ -197,6 +198,12 @@ func (c *Client) fetch(ctx context.Context, rCtx *RemoteContext, ref string, lim
if err != nil {
return images.Image{}, fmt.Errorf("failed to resolve reference %q: %w", ref, err)
}
span.SetAttributes(
tracing.Attribute("container.image.ref", ref),
tracing.Attribute("image.name", name),
tracing.Attribute("target.mediaType", desc.MediaType),
tracing.Attribute("image.digest", desc.Digest.String()),
)

fetcher, err := rCtx.Resolver.Fetcher(ctx, name)
if err != nil {
Expand Down Expand Up @@ -268,12 +275,20 @@ func (c *Client) fetch(ctx context.Context, rCtx *RemoteContext, ref string, lim
handler = rCtx.HandlerWrapper(handler)
}

if err := images.Dispatch(ctx, handler, limiter, desc); err != nil {
dispatchCtx, dispatchSpan := tracing.StartSpan(ctx, tracing.Name(pullSpanPrefix, "dispatch"))
err = images.Dispatch(dispatchCtx, handler, limiter, desc)
dispatchSpan.SetStatus(err)
dispatchSpan.End()
if err != nil {
return images.Image{}, err
}

if isConvertible {
if desc, err = converterFunc(ctx, desc); err != nil {
convertCtx, convertSpan := tracing.StartSpan(ctx, tracing.Name(pullSpanPrefix, "convert_manifest"))
desc, err = converterFunc(convertCtx, desc)
convertSpan.SetStatus(err)
convertSpan.End()
if err != nil {
return images.Image{}, err
}
}
Expand Down
Loading