JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2255 from aaronlehmann/export-layers-span 

Add span for layer export
v0.9
Tõnis Tiigi 2021-07-14 15:11:08 -07:00 committed by GitHub
parent 699121c00a 87dcc7bbe2
commit d2d18d5b5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
exporter/containerimage/writer.go
View File

@ -9,6 +9,9 @@ import (
"time"
"github.com/moby/buildkit/util/bklog"
"github.com/moby/buildkit/util/tracing"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/diff"
@ -150,6 +153,11 @@ func (ic *ImageWriter) Commit(ctx context.Context, inp exporter.Source, oci bool
}
func (ic *ImageWriter) exportLayers(ctx context.Context, compressionType compression.Type, forceCompression bool, s session.Group, refs ...cache.ImmutableRef) ([]solver.Remote, error) {
span, ctx := tracing.StartSpan(ctx, "export layers", trace.WithAttributes(
attribute.String("exportLayers.compressionType", compressionType.String()),
attribute.Bool("exportLayers.forceCompression", forceCompression),
))
eg, ctx := errgroup.WithContext(ctx)
layersDone := oneOffProgress(ctx, "exporting layers")
@ -171,11 +179,9 @@ func (ic *ImageWriter) exportLayers(ctx context.Context, compressionType compres
}(i, ref)
}
if err := layersDone(eg.Wait()); err != nil {
return nil, err
}
return out, nil
err := layersDone(eg.Wait())
tracing.FinishWithError(span, err)
return out, err
}
func (ic *ImageWriter) commitDistributionManifest(ctx context.Context, ref cache.ImmutableRef, config []byte, remote *solver.Remote, oci bool, inlineCache []byte) (*ocispec.Descriptor, *ocispec.Descriptor, error) {