github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9372 from austinvazquez/enhance-unpack-logs

Browse Source 
Enhance container image unpack client logs
This commit is contained in:
Maksym Pavlenko 2023-11-15 23:20:23 +00:00 committed by GitHub
commit 860d525f3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/unpack/unpacker.go
View File

@ -235,6 +235,7 @@ func (u *Unpacker) unpack(
ctx := u.ctx ctx := u.ctx
ctx, layerSpan := tracing.StartSpan(ctx, tracing.Name(unpackSpanPrefix, "unpack")) ctx, layerSpan := tracing.StartSpan(ctx, tracing.Name(unpackSpanPrefix, "unpack"))
defer layerSpan.End() defer layerSpan.End()
unpackStart := time.Now()
p, err := content.ReadBlob(ctx, u.content, config) p, err := content.ReadBlob(ctx, u.content, config)
if err != nil { if err != nil {
return err return err
@ -411,6 +412,7 @@ func (u *Unpacker) unpack(
for i, desc := range layers { for i, desc := range layers {
_, layerSpan := tracing.StartSpan(ctx, tracing.Name(unpackSpanPrefix, "unpackLayer")) _, layerSpan := tracing.StartSpan(ctx, tracing.Name(unpackSpanPrefix, "unpackLayer"))
unpackLayerStart := time.Now()
layerSpan.SetAttributes( layerSpan.SetAttributes(
tracing.Attribute("layer.media.type", desc.MediaType), tracing.Attribute("layer.media.type", desc.MediaType),
tracing.Attribute("layer.media.size", desc.Size), tracing.Attribute("layer.media.size", desc.Size),
@ -422,6 +424,10 @@ func (u *Unpacker) unpack(
return err return err
} }
layerSpan.End() layerSpan.End()
log.G(ctx).WithFields(log.Fields{
"layer": desc.Digest,
"duration": time.Since(unpackLayerStart),
}).Debug("layer unpacked")
} }
chainID := identity.ChainID(chain).String() chainID := identity.ChainID(chain).String()
@ -436,8 +442,9 @@ func (u *Unpacker) unpack(
return err return err
} }
log.G(ctx).WithFields(log.Fields{ log.G(ctx).WithFields(log.Fields{
"config": config.Digest, "config": config.Digest,
"chainID": chainID, "chainID": chainID,
"duration": time.Since(unpackStart),
}).Debug("image unpacked") }).Debug("image unpacked")
return nil return nil