vendor: update buildkit with typed errors support

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

vendor/github.com/moby/buildkit/util/apicaps/pb/generate.go

@@ -1,3 +1,3 @@
-package moby_buildkit_v1_apicaps
+package moby_buildkit_v1_apicaps //nolint:golint
 
 //go:generate protoc -I=. -I=../../../vendor/ -I=../../../../../../ --gogo_out=plugins=grpc:. caps.proto

vendor/github.com/moby/buildkit/util/flightcontrol/flightcontrol.go

@@ -0,0 +1,341 @@
+package flightcontrol
+
+import (
+	"context"
+	"io"
+	"runtime"
+	"sort"
+	"sync"
+	"time"
+
+	"github.com/moby/buildkit/util/progress"
+	"github.com/pkg/errors"
+)
+
+// flightcontrol is like singleflight but with support for cancellation and
+// nested progress reporting
+
+var (
+	errRetry        = errors.Errorf("retry")
+	errRetryTimeout = errors.Errorf("exceeded retry timeout")
+)
+
+type contextKeyT string
+
+var contextKey = contextKeyT("buildkit/util/flightcontrol.progress")
+
+// Group is a flightcontrol synchronization group
+type Group struct {
+	mu sync.Mutex       // protects m
+	m  map[string]*call // lazily initialized
+}
+
+// Do executes a context function syncronized by the key
+func (g *Group) Do(ctx context.Context, key string, fn func(ctx context.Context) (interface{}, error)) (v interface{}, err error) {
+	var backoff time.Duration
+	for {
+		v, err = g.do(ctx, key, fn)
+		if err == nil || !errors.Is(err, errRetry) {
+			return v, err
+		}
+		// backoff logic
+		if backoff >= 3*time.Second {
+			err = errors.Wrapf(errRetryTimeout, "flightcontrol")
+			return v, err
+		}
+		runtime.Gosched()
+		if backoff > 0 {
+			time.Sleep(backoff)
+			backoff *= 2
+		} else {
+			backoff = time.Millisecond
+		}
+	}
+}
+
+func (g *Group) do(ctx context.Context, key string, fn func(ctx context.Context) (interface{}, error)) (interface{}, error) {
+	g.mu.Lock()
+	if g.m == nil {
+		g.m = make(map[string]*call)
+	}
+
+	if c, ok := g.m[key]; ok { // register 2nd waiter
+		g.mu.Unlock()
+		return c.wait(ctx)
+	}
+
+	c := newCall(fn)
+	g.m[key] = c
+	go func() {
+		// cleanup after a caller has returned
+		<-c.ready
+		g.mu.Lock()
+		delete(g.m, key)
+		g.mu.Unlock()
+		close(c.cleaned)
+	}()
+	g.mu.Unlock()
+	return c.wait(ctx)
+}
+
+type call struct {
+	mu      sync.Mutex
+	result  interface{}
+	err     error
+	ready   chan struct{}
+	cleaned chan struct{}
+
+	ctx  *sharedContext
+	ctxs []context.Context
+	fn   func(ctx context.Context) (interface{}, error)
+	once sync.Once
+
+	closeProgressWriter func()
+	progressState       *progressState
+	progressCtx         context.Context
+}
+
+func newCall(fn func(ctx context.Context) (interface{}, error)) *call {
+	c := &call{
+		fn:            fn,
+		ready:         make(chan struct{}),
+		cleaned:       make(chan struct{}),
+		progressState: newProgressState(),
+	}
+	ctx := newContext(c) // newSharedContext
+	pr, pctx, closeProgressWriter := progress.NewContext(context.Background())
+
+	c.progressCtx = pctx
+	c.ctx = ctx
+	c.closeProgressWriter = closeProgressWriter
+
+	go c.progressState.run(pr) // TODO: remove this, wrap writer instead
+
+	return c
+}
+
+func (c *call) run() {
+	defer c.closeProgressWriter()
+	ctx, cancel := context.WithCancel(c.ctx)
+	defer cancel()
+	v, err := c.fn(ctx)
+	c.mu.Lock()
+	c.result = v
+	c.err = err
+	c.mu.Unlock()
+	close(c.ready)
+}
+
+func (c *call) wait(ctx context.Context) (v interface{}, err error) {
+	c.mu.Lock()
+	// detect case where caller has just returned, let it clean up before
+	select {
+	case <-c.ready: // could return if no error
+		c.mu.Unlock()
+		<-c.cleaned
+		return nil, errRetry
+	default:
+	}
+
+	pw, ok, ctx := progress.FromContext(ctx)
+	if ok {
+		c.progressState.add(pw)
+	}
+	c.ctxs = append(c.ctxs, ctx)
+
+	c.mu.Unlock()
+
+	go c.once.Do(c.run)
+
+	select {
+	case <-ctx.Done():
+		select {
+		case <-c.ctx.Done():
+			// if this cancelled the last context, then wait for function to shut down
+			// and don't accept any more callers
+			<-c.ready
+			return c.result, c.err
+		default:
+			if ok {
+				c.progressState.close(pw)
+			}
+			return nil, ctx.Err()
+		}
+	case <-c.ready:
+		return c.result, c.err // shared not implemented yet
+	}
+}
+
+func (c *call) Deadline() (deadline time.Time, ok bool) {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	for _, ctx := range c.ctxs {
+		select {
+		case <-ctx.Done():
+		default:
+			dl, ok := ctx.Deadline()
+			if ok {
+				return dl, ok
+			}
+		}
+	}
+	return time.Time{}, false
+}
+
+func (c *call) Done() <-chan struct{} {
+	c.mu.Lock()
+	c.ctx.signal()
+	c.mu.Unlock()
+	return c.ctx.done
+}
+
+func (c *call) Err() error {
+	select {
+	case <-c.ctx.Done():
+		return c.ctx.err
+	default:
+		return nil
+	}
+}
+
+func (c *call) Value(key interface{}) interface{} {
+	if key == contextKey {
+		return c.progressState
+	}
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
+	ctx := c.progressCtx
+	select {
+	case <-ctx.Done():
+	default:
+		if v := ctx.Value(key); v != nil {
+			return v
+		}
+	}
+
+	if len(c.ctxs) > 0 {
+		ctx = c.ctxs[0]
+		select {
+		case <-ctx.Done():
+		default:
+			if v := ctx.Value(key); v != nil {
+				return v
+			}
+		}
+	}
+
+	return nil
+}
+
+type sharedContext struct {
+	*call
+	done chan struct{}
+	err  error
+}
+
+func newContext(c *call) *sharedContext {
+	return &sharedContext{call: c, done: make(chan struct{})}
+}
+
+// call with lock
+func (c *sharedContext) signal() {
+	select {
+	case <-c.done:
+	default:
+		var err error
+		for _, ctx := range c.ctxs {
+			select {
+			case <-ctx.Done():
+				err = ctx.Err()
+			default:
+				return
+			}
+		}
+		c.err = err
+		close(c.done)
+	}
+}
+
+type rawProgressWriter interface {
+	WriteRawProgress(*progress.Progress) error
+	Close() error
+}
+
+type progressState struct {
+	mu      sync.Mutex
+	items   map[string]*progress.Progress
+	writers []rawProgressWriter
+	done    bool
+}
+
+func newProgressState() *progressState {
+	return &progressState{
+		items: make(map[string]*progress.Progress),
+	}
+}
+
+func (ps *progressState) run(pr progress.Reader) {
+	for {
+		p, err := pr.Read(context.TODO())
+		if err != nil {
+			if err == io.EOF {
+				ps.mu.Lock()
+				ps.done = true
+				ps.mu.Unlock()
+				for _, w := range ps.writers {
+					w.Close()
+				}
+			}
+			return
+		}
+		ps.mu.Lock()
+		for _, p := range p {
+			for _, w := range ps.writers {
+				w.WriteRawProgress(p)
+			}
+			ps.items[p.ID] = p
+		}
+		ps.mu.Unlock()
+	}
+}
+
+func (ps *progressState) add(pw progress.Writer) {
+	rw, ok := pw.(rawProgressWriter)
+	if !ok {
+		return
+	}
+	ps.mu.Lock()
+	plist := make([]*progress.Progress, 0, len(ps.items))
+	for _, p := range ps.items {
+		plist = append(plist, p)
+	}
+	sort.Slice(plist, func(i, j int) bool {
+		return plist[i].Timestamp.Before(plist[j].Timestamp)
+	})
+	for _, p := range plist {
+		rw.WriteRawProgress(p)
+	}
+	if ps.done {
+		rw.Close()
+	} else {
+		ps.writers = append(ps.writers, rw)
+	}
+	ps.mu.Unlock()
+}
+
+func (ps *progressState) close(pw progress.Writer) {
+	rw, ok := pw.(rawProgressWriter)
+	if !ok {
+		return
+	}
+	ps.mu.Lock()
+	for i, w := range ps.writers {
+		if w == rw {
+			w.Close()
+			ps.writers = append(ps.writers[:i], ps.writers[i+1:]...)
+			break
+		}
+	}
+	ps.mu.Unlock()
+}

vendor/github.com/moby/buildkit/util/grpcerrors/grpcerrors.go

@@ -0,0 +1,203 @@
+package grpcerrors
+
+import (
+	"encoding/json"
+	"errors"
+
+	"github.com/containerd/typeurl"
+	gogotypes "github.com/gogo/protobuf/types"
+	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/ptypes/any"
+	"github.com/moby/buildkit/util/stack"
+	"github.com/sirupsen/logrus"
+	spb "google.golang.org/genproto/googleapis/rpc/status"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+type TypedError interface {
+	ToProto() TypedErrorProto
+}
+
+type TypedErrorProto interface {
+	proto.Message
+	WrapError(error) error
+}
+
+func ToGRPC(err error) error {
+	if err == nil {
+		return nil
+	}
+	st, ok := AsGRPCStatus(err)
+	if !ok || st == nil {
+		st = status.New(Code(err), err.Error())
+	}
+	if st.Code() != Code(err) {
+		pb := st.Proto()
+		pb.Code = int32(Code(err))
+		st = status.FromProto(pb)
+	}
+
+	var details []proto.Message
+
+	for _, st := range stack.Traces(err) {
+		details = append(details, st)
+	}
+
+	each(err, func(err error) {
+		if te, ok := err.(TypedError); ok {
+			details = append(details, te.ToProto())
+		}
+	})
+
+	if len(details) > 0 {
+		if st2, err := withDetails(st, details...); err == nil {
+			st = st2
+		}
+	}
+
+	return st.Err()
+}
+
+func withDetails(s *status.Status, details ...proto.Message) (*status.Status, error) {
+	if s.Code() == codes.OK {
+		return nil, errors.New("no error details for status with code OK")
+	}
+	p := s.Proto()
+	for _, detail := range details {
+		url, err := typeurl.TypeURL(detail)
+		if err != nil {
+			logrus.Warnf("ignoring typed error %T: not registered", detail)
+			continue
+		}
+		dt, err := json.Marshal(detail)
+		if err != nil {
+			return nil, err
+		}
+		p.Details = append(p.Details, &any.Any{TypeUrl: url, Value: dt})
+	}
+	return status.FromProto(p), nil
+}
+
+func Code(err error) codes.Code {
+	if se, ok := err.(interface {
+		Code() codes.Code
+	}); ok {
+		return se.Code()
+	}
+
+	if se, ok := err.(interface {
+		GRPCStatus() *status.Status
+	}); ok {
+		return se.GRPCStatus().Code()
+	}
+
+	wrapped, ok := err.(interface {
+		Unwrap() error
+	})
+	if ok {
+		return Code(wrapped.Unwrap())
+	}
+
+	return status.FromContextError(err).Code()
+}
+
+func WrapCode(err error, code codes.Code) error {
+	return &withCode{error: err, code: code}
+}
+
+func AsGRPCStatus(err error) (*status.Status, bool) {
+	if err == nil {
+		return nil, true
+	}
+	if se, ok := err.(interface {
+		GRPCStatus() *status.Status
+	}); ok {
+		return se.GRPCStatus(), true
+	}
+
+	wrapped, ok := err.(interface {
+		Unwrap() error
+	})
+	if ok {
+		return AsGRPCStatus(wrapped.Unwrap())
+	}
+
+	return nil, false
+}
+
+func FromGRPC(err error) error {
+	if err == nil {
+		return nil
+	}
+	st, ok := status.FromError(err)
+	if !ok {
+		return err
+	}
+
+	pb := st.Proto()
+
+	n := &spb.Status{
+		Code:    pb.Code,
+		Message: pb.Message,
+	}
+
+	details := make([]TypedErrorProto, 0, len(pb.Details))
+	stacks := make([]*stack.Stack, 0, len(pb.Details))
+
+	// details that we don't understand are copied as proto
+	for _, d := range pb.Details {
+		m, err := typeurl.UnmarshalAny(gogoAny(d))
+		if err != nil {
+			continue
+		}
+
+		switch v := m.(type) {
+		case *stack.Stack:
+			stacks = append(stacks, v)
+		case TypedErrorProto:
+			details = append(details, v)
+		default:
+			n.Details = append(n.Details, d)
+		}
+	}
+
+	err = status.FromProto(n).Err()
+
+	for _, s := range stacks {
+		if s != nil {
+			err = stack.Wrap(err, *s)
+		}
+	}
+
+	for _, d := range details {
+		err = d.WrapError(err)
+	}
+
+	return stack.Enable(err)
+}
+
+type withCode struct {
+	code codes.Code
+	error
+}
+
+func (e *withCode) Unwrap() error {
+	return e.error
+}
+
+func each(err error, fn func(error)) {
+	fn(err)
+	if wrapped, ok := err.(interface {
+		Unwrap() error
+	}); ok {
+		each(wrapped.Unwrap(), fn)
+	}
+}
+
+func gogoAny(in *any.Any) *gogotypes.Any {
+	return &gogotypes.Any{
+		TypeUrl: in.TypeUrl,
+		Value:   in.Value,
+	}
+}

vendor/github.com/moby/buildkit/util/grpcerrors/intercept.go

@@ -0,0 +1,28 @@
+package grpcerrors
+
+import (
+	"context"
+
+	"google.golang.org/grpc"
+)
+
+func UnaryServerInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp interface{}, err error) {
+	resp, err = handler(ctx, req)
+	if err != nil {
+		err = ToGRPC(err)
+	}
+	return resp, err
+}
+
+func StreamServerInterceptor(srv interface{}, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
+	return ToGRPC(handler(srv, ss))
+}
+
+func UnaryClientInterceptor(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
+	return FromGRPC(invoker(ctx, method, req, reply, cc, opts...))
+}
+
+func StreamClientInterceptor(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string, streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {
+	s, err := streamer(ctx, desc, cc, method, opts...)
+	return s, ToGRPC(err)
+}

vendor/github.com/moby/buildkit/util/progress/multireader.go

@@ -0,0 +1,77 @@
+package progress
+
+import (
+	"context"
+	"io"
+	"sync"
+)
+
+type MultiReader struct {
+	mu          sync.Mutex
+	main        Reader
+	initialized bool
+	done        chan struct{}
+	writers     map[*progressWriter]func()
+}
+
+func NewMultiReader(pr Reader) *MultiReader {
+	mr := &MultiReader{
+		main:    pr,
+		writers: make(map[*progressWriter]func()),
+		done:    make(chan struct{}),
+	}
+	return mr
+}
+
+func (mr *MultiReader) Reader(ctx context.Context) Reader {
+	mr.mu.Lock()
+	defer mr.mu.Unlock()
+
+	pr, ctx, closeWriter := NewContext(ctx)
+	pw, _, ctx := FromContext(ctx)
+
+	w := pw.(*progressWriter)
+	mr.writers[w] = closeWriter
+
+	go func() {
+		select {
+		case <-ctx.Done():
+		case <-mr.done:
+		}
+		mr.mu.Lock()
+		defer mr.mu.Unlock()
+		delete(mr.writers, w)
+	}()
+
+	if !mr.initialized {
+		go mr.handle()
+		mr.initialized = true
+	}
+
+	return pr
+}
+
+func (mr *MultiReader) handle() error {
+	for {
+		p, err := mr.main.Read(context.TODO())
+		if err != nil {
+			if err == io.EOF {
+				mr.mu.Lock()
+				for w, c := range mr.writers {
+					w.Close()
+					c()
+				}
+				mr.mu.Unlock()
+				return nil
+			}
+			return err
+		}
+		mr.mu.Lock()
+		for _, p := range p {
+			for w := range mr.writers {
+				w.writeRawProgress(p)
+			}
+		}
+		mr.mu.Unlock()
+	}
+}

vendor/github.com/moby/buildkit/util/progress/multiwriter.go

@@ -0,0 +1,104 @@
+package progress
+
+import (
+	"sort"
+	"sync"
+	"time"
+)
+
+type rawProgressWriter interface {
+	WriteRawProgress(*Progress) error
+	Close() error
+}
+
+type MultiWriter struct {
+	mu      sync.Mutex
+	items   []*Progress
+	writers map[rawProgressWriter]struct{}
+	meta    map[string]interface{}
+}
+
+func NewMultiWriter(opts ...WriterOption) *MultiWriter {
+	mw := &MultiWriter{
+		writers: map[rawProgressWriter]struct{}{},
+		meta:    map[string]interface{}{},
+	}
+	for _, o := range opts {
+		o(mw)
+	}
+	return mw
+}
+
+func (ps *MultiWriter) Add(pw Writer) {
+	rw, ok := pw.(rawProgressWriter)
+	if !ok {
+		return
+	}
+	ps.mu.Lock()
+	plist := make([]*Progress, 0, len(ps.items))
+	for _, p := range ps.items {
+		plist = append(plist, p)
+	}
+	sort.Slice(plist, func(i, j int) bool {
+		return plist[i].Timestamp.Before(plist[j].Timestamp)
+	})
+	for _, p := range plist {
+		rw.WriteRawProgress(p)
+	}
+	ps.writers[rw] = struct{}{}
+	ps.mu.Unlock()
+}
+
+func (ps *MultiWriter) Delete(pw Writer) {
+	rw, ok := pw.(rawProgressWriter)
+	if !ok {
+		return
+	}
+
+	ps.mu.Lock()
+	delete(ps.writers, rw)
+	ps.mu.Unlock()
+}
+
+func (ps *MultiWriter) Write(id string, v interface{}) error {
+	p := &Progress{
+		ID:        id,
+		Timestamp: time.Now(),
+		Sys:       v,
+		meta:      ps.meta,
+	}
+	return ps.WriteRawProgress(p)
+}
+
+func (ps *MultiWriter) WriteRawProgress(p *Progress) error {
+	meta := p.meta
+	if len(ps.meta) > 0 {
+		meta = map[string]interface{}{}
+		for k, v := range p.meta {
+			meta[k] = v
+		}
+		for k, v := range ps.meta {
+			if _, ok := meta[k]; !ok {
+				meta[k] = v
+			}
+		}
+	}
+	p.meta = meta
+	return ps.writeRawProgress(p)
+}
+
+func (ps *MultiWriter) writeRawProgress(p *Progress) error {
+	ps.mu.Lock()
+	defer ps.mu.Unlock()
+	ps.items = append(ps.items, p)
+	for w := range ps.writers {
+		if err := w.WriteRawProgress(p); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (ps *MultiWriter) Close() error {
+	return nil
+}

vendor/github.com/moby/buildkit/util/progress/progress.go

@@ -0,0 +1,261 @@
+package progress
+
+import (
+	"context"
+	"io"
+	"sort"
+	"sync"
+	"time"
+
+	"github.com/pkg/errors"
+)
+
+// Progress package provides utility functions for using the context to capture
+// progress of a running function. All progress items written contain an ID
+// that is used to collapse unread messages.
+
+type contextKeyT string
+
+var contextKey = contextKeyT("buildkit/util/progress")
+
+// FromContext returns a progress writer from a context.
+func FromContext(ctx context.Context, opts ...WriterOption) (Writer, bool, context.Context) {
+	v := ctx.Value(contextKey)
+	pw, ok := v.(*progressWriter)
+	if !ok {
+		if pw, ok := v.(*MultiWriter); ok {
+			return pw, true, ctx
+		}
+		return &noOpWriter{}, false, ctx
+	}
+	pw = newWriter(pw)
+	for _, o := range opts {
+		o(pw)
+	}
+	ctx = context.WithValue(ctx, contextKey, pw)
+	return pw, true, ctx
+}
+
+type WriterOption func(Writer)
+
+// NewContext returns a new context and a progress reader that captures all
+// progress items writtern to this context. Last returned parameter is a closer
+// function to signal that no new writes will happen to this context.
+func NewContext(ctx context.Context) (Reader, context.Context, func()) {
+	pr, pw, cancel := pipe()
+	ctx = WithProgress(ctx, pw)
+	return pr, ctx, cancel
+}
+
+func WithProgress(ctx context.Context, pw Writer) context.Context {
+	return context.WithValue(ctx, contextKey, pw)
+}
+
+func WithMetadata(key string, val interface{}) WriterOption {
+	return func(w Writer) {
+		if pw, ok := w.(*progressWriter); ok {
+			pw.meta[key] = val
+		}
+		if pw, ok := w.(*MultiWriter); ok {
+			pw.meta[key] = val
+		}
+	}
+}
+
+type Controller interface {
+	Start(context.Context) (context.Context, func(error))
+	Status(id string, action string) func()
+}
+
+type Writer interface {
+	Write(id string, value interface{}) error
+	Close() error
+}
+
+type Reader interface {
+	Read(context.Context) ([]*Progress, error)
+}
+
+type Progress struct {
+	ID        string
+	Timestamp time.Time
+	Sys       interface{}
+	meta      map[string]interface{}
+}
+
+type Status struct {
+	Action    string
+	Current   int
+	Total     int
+	Started   *time.Time
+	Completed *time.Time
+}
+
+type progressReader struct {
+	ctx     context.Context
+	cond    *sync.Cond
+	mu      sync.Mutex
+	writers map[*progressWriter]struct{}
+	dirty   map[string]*Progress
+}
+
+func (pr *progressReader) Read(ctx context.Context) ([]*Progress, error) {
+	done := make(chan struct{})
+	defer close(done)
+	go func() {
+		select {
+		case <-done:
+		case <-ctx.Done():
+			pr.mu.Lock()
+			pr.cond.Broadcast()
+			pr.mu.Unlock()
+		}
+	}()
+	pr.mu.Lock()
+	for {
+		select {
+		case <-ctx.Done():
+			pr.mu.Unlock()
+			return nil, ctx.Err()
+		default:
+		}
+		dmap := pr.dirty
+		if len(dmap) == 0 {
+			select {
+			case <-pr.ctx.Done():
+				if len(pr.writers) == 0 {
+					pr.mu.Unlock()
+					return nil, io.EOF
+				}
+			default:
+			}
+			pr.cond.Wait()
+			continue
+		}
+		pr.dirty = make(map[string]*Progress)
+		pr.mu.Unlock()
+
+		out := make([]*Progress, 0, len(dmap))
+		for _, p := range dmap {
+			out = append(out, p)
+		}
+
+		sort.Slice(out, func(i, j int) bool {
+			return out[i].Timestamp.Before(out[j].Timestamp)
+		})
+
+		return out, nil
+	}
+}
+
+func (pr *progressReader) append(pw *progressWriter) {
+	pr.mu.Lock()
+	defer pr.mu.Unlock()
+
+	select {
+	case <-pr.ctx.Done():
+		return
+	default:
+		pr.writers[pw] = struct{}{}
+	}
+}
+
+func pipe() (*progressReader, *progressWriter, func()) {
+	ctx, cancel := context.WithCancel(context.Background())
+	pr := &progressReader{
+		ctx:     ctx,
+		writers: make(map[*progressWriter]struct{}),
+		dirty:   make(map[string]*Progress),
+	}
+	pr.cond = sync.NewCond(&pr.mu)
+	go func() {
+		<-ctx.Done()
+		pr.mu.Lock()
+		pr.cond.Broadcast()
+		pr.mu.Unlock()
+	}()
+	pw := &progressWriter{
+		reader: pr,
+	}
+	return pr, pw, cancel
+}
+
+func newWriter(pw *progressWriter) *progressWriter {
+	meta := make(map[string]interface{})
+	for k, v := range pw.meta {
+		meta[k] = v
+	}
+	pw = &progressWriter{
+		reader: pw.reader,
+		meta:   meta,
+	}
+	pw.reader.append(pw)
+	return pw
+}
+
+type progressWriter struct {
+	done   bool
+	reader *progressReader
+	meta   map[string]interface{}
+}
+
+func (pw *progressWriter) Write(id string, v interface{}) error {
+	if pw.done {
+		return errors.Errorf("writing %s to closed progress writer", id)
+	}
+	return pw.writeRawProgress(&Progress{
+		ID:        id,
+		Timestamp: time.Now(),
+		Sys:       v,
+		meta:      pw.meta,
+	})
+}
+
+func (pw *progressWriter) WriteRawProgress(p *Progress) error {
+	meta := p.meta
+	if len(pw.meta) > 0 {
+		meta = map[string]interface{}{}
+		for k, v := range p.meta {
+			meta[k] = v
+		}
+		for k, v := range pw.meta {
+			if _, ok := meta[k]; !ok {
+				meta[k] = v
+			}
+		}
+	}
+	p.meta = meta
+	return pw.writeRawProgress(p)
+}
+
+func (pw *progressWriter) writeRawProgress(p *Progress) error {
+	pw.reader.mu.Lock()
+	pw.reader.dirty[p.ID] = p
+	pw.reader.cond.Broadcast()
+	pw.reader.mu.Unlock()
+	return nil
+}
+
+func (pw *progressWriter) Close() error {
+	pw.reader.mu.Lock()
+	delete(pw.reader.writers, pw)
+	pw.reader.mu.Unlock()
+	pw.reader.cond.Broadcast()
+	pw.done = true
+	return nil
+}
+
+func (p *Progress) Meta(key string) (interface{}, bool) {
+	v, ok := p.meta[key]
+	return v, ok
+}
+
+type noOpWriter struct{}
+
+func (pw *noOpWriter) Write(_ string, _ interface{}) error {
+	return nil
+}
+
+func (pw *noOpWriter) Close() error {
+	return nil
+}

vendor/github.com/moby/buildkit/util/progress/progressui/display.go

@@ -273,7 +273,14 @@ func (t *trace) update(s *client.SolveStatus, termWidth int) {
 				if v.Started != nil {
 					ts = l.Timestamp.Sub(*v.Started)
 				}
-				v.logs = append(v.logs, []byte(fmt.Sprintf("#%d %s %s", v.index, fmt.Sprintf("%#.4g", ts.Seconds())[:5], dt)))
+				prec := 1
+				sec := ts.Seconds()
+				if sec < 10 {
+					prec = 3
+				} else if sec < 100 {
+					prec = 2
+				}
+				v.logs = append(v.logs, []byte(fmt.Sprintf("#%d %s %s", v.index, fmt.Sprintf("%.[2]*[1]f", sec, prec), dt)))
 			}
 			i++
 		})
@@ -548,6 +555,9 @@ func align(l, r string, w int) string {
 }
 
 func wrapHeight(j []*job, limit int) []*job {
+	if limit < 0 {
+		return nil
+	}
 	var wrapped []*job
 	wrapped = append(wrapped, j...)
 	if len(j) > limit {

vendor/github.com/moby/buildkit/util/progress/progressui/printer.go

@@ -57,11 +57,11 @@ func (p *textMux) printVtx(t *trace, dgst digest.Digest) {
 			p.notFirst = true
 		}
 
-		if os.Getenv("PROGRESS_NO_TRUNC") == "1" {
+		if os.Getenv("PROGRESS_NO_TRUNC") == "0" {
+			fmt.Fprintf(p.w, "#%d %s\n", v.index, limitString(v.Name, 72))
+		} else {
 			fmt.Fprintf(p.w, "#%d %s\n", v.index, v.Name)
 			fmt.Fprintf(p.w, "#%d %s\n", v.index, v.Digest)
-		} else {
-			fmt.Fprintf(p.w, "#%d %s\n", v.index, limitString(v.Name, 72))
 		}
 
 	}

vendor/github.com/moby/buildkit/util/stack/generate.go

@@ -0,0 +1,3 @@
+package stack
+
+//go:generate protoc -I=. -I=../../vendor/ --go_out=. stack.proto

vendor/github.com/moby/buildkit/util/stack/stack.go

@@ -0,0 +1,156 @@
+package stack
+
+import (
+	"fmt"
+	io "io"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/containerd/typeurl"
+	"github.com/pkg/errors"
+)
+
+func init() {
+	typeurl.Register((*Stack)(nil), "github.com/moby/buildkit", "stack.Stack+json")
+}
+
+var version string
+var revision string
+
+func SetVersionInfo(v, r string) {
+	version = v
+	revision = r
+}
+
+func Traces(err error) []*Stack {
+	var st []*Stack
+
+	wrapped, ok := err.(interface {
+		Unwrap() error
+	})
+	if ok {
+		st = Traces(wrapped.Unwrap())
+	}
+
+	if ste, ok := err.(interface {
+		StackTrace() errors.StackTrace
+	}); ok {
+		st = append(st, convertStack(ste.StackTrace()))
+	}
+
+	if ste, ok := err.(interface {
+		StackTrace() *Stack
+	}); ok {
+		st = append(st, ste.StackTrace())
+	}
+
+	return st
+}
+
+func Enable(err error) error {
+	if err == nil {
+		return nil
+	}
+	if !hasLocalStackTrace(err) {
+		return errors.WithStack(err)
+	}
+	return err
+}
+
+func Wrap(err error, s Stack) error {
+	return &withStack{stack: s, error: err}
+}
+
+func hasLocalStackTrace(err error) bool {
+	wrapped, ok := err.(interface {
+		Unwrap() error
+	})
+	if ok && hasLocalStackTrace(wrapped.Unwrap()) {
+		return true
+	}
+
+	_, ok = err.(interface {
+		StackTrace() errors.StackTrace
+	})
+	return ok
+}
+
+func Formatter(err error) fmt.Formatter {
+	return &formatter{err}
+}
+
+type formatter struct {
+	error
+}
+
+func (w *formatter) Format(s fmt.State, verb rune) {
+	if w.error == nil {
+		fmt.Fprintf(s, "%v", w.error)
+		return
+	}
+	switch verb {
+	case 'v':
+		if s.Flag('+') {
+			fmt.Fprintf(s, "%s\n", w.Error())
+			for _, stack := range Traces(w.error) {
+				fmt.Fprintf(s, "%d %s %s\n", stack.Pid, stack.Version, strings.Join(stack.Cmdline, " "))
+				for _, f := range stack.Frames {
+					fmt.Fprintf(s, "%s\n\t%s:%d\n", f.Name, f.File, f.Line)
+				}
+				fmt.Fprintln(s)
+			}
+			return
+		}
+		fallthrough
+	case 's':
+		io.WriteString(s, w.Error())
+	case 'q':
+		fmt.Fprintf(s, "%q", w.Error())
+	}
+}
+
+func convertStack(s errors.StackTrace) *Stack {
+	var out Stack
+	for _, f := range s {
+		dt, err := f.MarshalText()
+		if err != nil {
+			continue
+		}
+		p := strings.SplitN(string(dt), " ", 2)
+		if len(p) != 2 {
+			continue
+		}
+		idx := strings.LastIndexByte(p[1], ':')
+		if idx == -1 {
+			continue
+		}
+		line, err := strconv.Atoi(p[1][idx+1:])
+		if err != nil {
+			continue
+		}
+		out.Frames = append(out.Frames, &Frame{
+			Name: p[0],
+			File: p[1][:idx],
+			Line: int32(line),
+		})
+	}
+	out.Cmdline = os.Args
+	out.Pid = int32(os.Getpid())
+	out.Version = version
+	out.Revision = revision
+	return &out
+}
+
+type withStack struct {
+	stack Stack
+	error
+}
+
+func (e *withStack) Unwrap() error {
+	return e.error
+}
+
+func (e *withStack) StackTrace() *Stack {
+	return &e.stack
+}

vendor/github.com/moby/buildkit/util/stack/stack.pb.go

@@ -0,0 +1,170 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: stack.proto
+
+package stack
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type Stack struct {
+	Frames               []*Frame `protobuf:"bytes,1,rep,name=frames,proto3" json:"frames,omitempty"`
+	Cmdline              []string `protobuf:"bytes,2,rep,name=cmdline,proto3" json:"cmdline,omitempty"`
+	Pid                  int32    `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"`
+	Version              string   `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"`
+	Revision             string   `protobuf:"bytes,5,opt,name=revision,proto3" json:"revision,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Stack) Reset()         { *m = Stack{} }
+func (m *Stack) String() string { return proto.CompactTextString(m) }
+func (*Stack) ProtoMessage()    {}
+func (*Stack) Descriptor() ([]byte, []int) {
+	return fileDescriptor_b44c07feb2ca0a5a, []int{0}
+}
+
+func (m *Stack) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Stack.Unmarshal(m, b)
+}
+func (m *Stack) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Stack.Marshal(b, m, deterministic)
+}
+func (m *Stack) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Stack.Merge(m, src)
+}
+func (m *Stack) XXX_Size() int {
+	return xxx_messageInfo_Stack.Size(m)
+}
+func (m *Stack) XXX_DiscardUnknown() {
+	xxx_messageInfo_Stack.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Stack proto.InternalMessageInfo
+
+func (m *Stack) GetFrames() []*Frame {
+	if m != nil {
+		return m.Frames
+	}
+	return nil
+}
+
+func (m *Stack) GetCmdline() []string {
+	if m != nil {
+		return m.Cmdline
+	}
+	return nil
+}
+
+func (m *Stack) GetPid() int32 {
+	if m != nil {
+		return m.Pid
+	}
+	return 0
+}
+
+func (m *Stack) GetVersion() string {
+	if m != nil {
+		return m.Version
+	}
+	return ""
+}
+
+func (m *Stack) GetRevision() string {
+	if m != nil {
+		return m.Revision
+	}
+	return ""
+}
+
+type Frame struct {
+	Name                 string   `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	File                 string   `protobuf:"bytes,2,opt,name=File,proto3" json:"File,omitempty"`
+	Line                 int32    `protobuf:"varint,3,opt,name=Line,proto3" json:"Line,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Frame) Reset()         { *m = Frame{} }
+func (m *Frame) String() string { return proto.CompactTextString(m) }
+func (*Frame) ProtoMessage()    {}
+func (*Frame) Descriptor() ([]byte, []int) {
+	return fileDescriptor_b44c07feb2ca0a5a, []int{1}
+}
+
+func (m *Frame) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Frame.Unmarshal(m, b)
+}
+func (m *Frame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Frame.Marshal(b, m, deterministic)
+}
+func (m *Frame) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Frame.Merge(m, src)
+}
+func (m *Frame) XXX_Size() int {
+	return xxx_messageInfo_Frame.Size(m)
+}
+func (m *Frame) XXX_DiscardUnknown() {
+	xxx_messageInfo_Frame.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Frame proto.InternalMessageInfo
+
+func (m *Frame) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Frame) GetFile() string {
+	if m != nil {
+		return m.File
+	}
+	return ""
+}
+
+func (m *Frame) GetLine() int32 {
+	if m != nil {
+		return m.Line
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*Stack)(nil), "stack.Stack")
+	proto.RegisterType((*Frame)(nil), "stack.Frame")
+}
+
+func init() { proto.RegisterFile("stack.proto", fileDescriptor_b44c07feb2ca0a5a) }
+
+var fileDescriptor_b44c07feb2ca0a5a = []byte{
+	// 185 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x3c, 0x8f, 0x3d, 0xce, 0x82, 0x40,
+	0x10, 0x86, 0xb3, 0xdf, 0xb2, 0x7c, 0x3a, 0x58, 0x98, 0xa9, 0x36, 0x56, 0x1b, 0x62, 0x41, 0x45,
+	0xa1, 0x47, 0x30, 0xa1, 0x32, 0x16, 0x78, 0x02, 0x84, 0x35, 0xd9, 0xc8, 0x5f, 0x76, 0x09, 0xd7,
+	0xf0, 0xca, 0x66, 0x06, 0xb4, 0x7b, 0xde, 0x9f, 0xe4, 0x9d, 0x81, 0x24, 0x4c, 0x55, 0xfd, 0xca,
+	0x47, 0x3f, 0x4c, 0x03, 0x2a, 0x16, 0xe9, 0x5b, 0x80, 0xba, 0x13, 0xe1, 0x11, 0xe2, 0xa7, 0xaf,
+	0x3a, 0x1b, 0xb4, 0x30, 0x32, 0x4b, 0x4e, 0xbb, 0x7c, 0xa9, 0x17, 0x64, 0x96, 0x6b, 0x86, 0x1a,
+	0xfe, 0xeb, 0xae, 0x69, 0x5d, 0x6f, 0xf5, 0x9f, 0x91, 0xd9, 0xb6, 0xfc, 0x4a, 0xdc, 0x83, 0x1c,
+	0x5d, 0xa3, 0xa5, 0x11, 0x99, 0x2a, 0x09, 0xa9, 0x3b, 0x5b, 0x1f, 0xdc, 0xd0, 0xeb, 0xc8, 0x08,
+	0xea, 0xae, 0x12, 0x0f, 0xb0, 0xf1, 0x76, 0x76, 0x1c, 0x29, 0x8e, 0x7e, 0x3a, 0xbd, 0x80, 0xe2,
+	0x49, 0x44, 0x88, 0x6e, 0x55, 0x67, 0xb5, 0xe0, 0x02, 0x33, 0x79, 0x85, 0x6b, 0x69, 0x9b, 0x3d,
+	0x62, 0xf2, 0xae, 0x74, 0xcf, 0xb2, 0xcc, 0xfc, 0x88, 0xf9, 0xc9, 0xf3, 0x27, 0x00, 0x00, 0xff,
+	0xff, 0xfd, 0x2c, 0xbb, 0xfb, 0xf3, 0x00, 0x00, 0x00,
+}

vendor/github.com/moby/buildkit/util/stack/stack.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package stack;
+
+message Stack {
+    repeated Frame frames = 1;
+    repeated string cmdline = 2;
+    int32 pid = 3;
+    string version = 4;
+    string revision = 5;
+}
+
+message Frame {
+    string Name = 1;
+    string File = 2;
+    int32 Line = 3;
+}