12865640761

Committed 20 Jan 2025 10:08AM UTC coverage: 43.992% (-0.04%) from 44.034%

Build # 12865640761

Build Type

Pull #1947

github

Committed by

web-flow

Commit Message

chore(deps): bump github.com/moby/term from 0.5.0 to 0.5.2

Bumps [github.com/moby/term](https://github.com/moby/term) from 0.5.0 to 0.5.2.
- [Commits](https://github.com/moby/term/compare/v0.5.0...v0.5.2)

---
updated-dependencies:
- dependency-name: github.com/moby/term
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Pull Request Pull Request #1947: chore(deps): bump github.com/moby/term from 0.5.0 to 0.5.2

Run Details

6308 of 14339 relevant lines covered (43.99%)

631.61 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

85.17

/pkg/progress/progressui/printer.go

// Copyright 2023 The envd Authors
// Copyright 2023 The buildkit Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//      http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package progressui

import (
        "container/ring"
        "context"
        "fmt"
        "io"
        "os"
        "sort"
        "strings"
        "time"

        "github.com/opencontainers/go-digest"
        "github.com/tonistiigi/units"
)

const antiFlicker = 5 * time.Second
const maxDelay = 10 * time.Second
const minTimeDelta = 5 * time.Second
const minProgressDelta = 0.05 // %

const logsBufferSize = 10

type lastStatus struct {
        Current   int64
        Timestamp time.Time
}

type textMux struct {
        w         io.Writer
        current   digest.Digest
        last      map[string]lastStatus
        notFirst  bool
        nextIndex int
}

func (p *textMux) printVtx(t *trace, dgst digest.Digest) {
        if p.last == nil {
                p.last = make(map[string]lastStatus)
        }

        v, ok := t.byDigest[dgst]
        if !ok {
                return
        }

        if v.index == 0 {
                p.nextIndex++
                v.index = p.nextIndex
        }

        if dgst != p.current {
                if p.current != "" {
                        old := t.byDigest[p.current]
                        if old.logsPartial {
                                fmt.Fprintln(p.w, "")
                        }
                        old.logsOffset = 0
                        old.count = 0
                        fmt.Fprintf(p.w, "#%d ...\n", old.index)
                }

                if p.notFirst {
                        fmt.Fprintln(p.w, "")
                } else {
                        p.notFirst = true
                }

                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)
                }
        }

        if len(v.events) != 0 {
                v.logsOffset = 0
        }
        for _, ev := range v.events {
                fmt.Fprintf(p.w, "#%d %s\n", v.index, ev)
        }
        v.events = v.events[:0]

        isOpenStatus := false // remote cache loading can currently produce status updates without active vertex
        for _, s := range v.statuses {
                if _, ok := v.statusUpdates[s.ID]; ok {
                        doPrint := true

                        if last, ok := p.last[s.ID]; ok && s.Completed == nil {
                                var progressDelta float64
                                if s.Total > 0 {
                                        progressDelta = float64(s.Current-last.Current) / float64(s.Total)
                                }
                                timeDelta := s.Timestamp.Sub(last.Timestamp)
                                if progressDelta < minProgressDelta && timeDelta < minTimeDelta {
                                        doPrint = false
                                }
                        }

                        if !doPrint {
                                continue
                        }

                        p.last[s.ID] = lastStatus{
                                Timestamp: s.Timestamp,
                                Current:   s.Current,
                        }

                        var bytes string
                        if s.Total != 0 {
                                bytes = fmt.Sprintf(" %.2f / %.2f", units.Bytes(s.Current), units.Bytes(s.Total))
                        } else if s.Current != 0 {
                                bytes = fmt.Sprintf(" %.2f", units.Bytes(s.Current))
                        }
                        var tm string
                        endTime := s.Timestamp
                        if s.Completed != nil {
                                endTime = *s.Completed
                        }
                        if s.Started != nil {
                                diff := endTime.Sub(*s.Started).Seconds()
                                if diff > 0.01 {
                                        tm = fmt.Sprintf(" %.1fs", diff)
                                }
                        }
                        if s.Completed != nil {
                                tm += " done"
                        } else {
                                isOpenStatus = true
                        }
                        fmt.Fprintf(p.w, "#%d %s%s%s\n", v.index, s.ID, bytes, tm)
                }
        }
        v.statusUpdates = map[string]struct{}{}

        for _, w := range v.warnings[v.warningIdx:] {
                fmt.Fprintf(p.w, "#%d WARN: %s\n", v.index, w.Short)
                v.warningIdx++
        }

        for i, l := range v.logs {
                if i == 0 {
                        l = l[v.logsOffset:]
                }
                fmt.Fprintf(p.w, "%s", l)
                if i != len(v.logs)-1 || !v.logsPartial {
                        fmt.Fprintln(p.w, "")
                }
                if v.logsBuffer == nil {
                        v.logsBuffer = ring.New(logsBufferSize)
                }
                v.logsBuffer.Value = l
                if !v.logsPartial {
                        v.logsBuffer = v.logsBuffer.Next()
                }
        }

        if len(v.logs) > 0 {
                if v.logsPartial {
                        v.logs = v.logs[len(v.logs)-1:]
                        v.logsOffset = len(v.logs[0])
                } else {
                        v.logs = nil
                        v.logsOffset = 0
                }
        }

        p.current = dgst
        if v.isCompleted() && !isOpenStatus {
                p.current = ""
                v.count = 0

                if v.Error != "" {
                        if v.logsPartial {
                                fmt.Fprintln(p.w, "")
                        }
                        if strings.HasSuffix(v.Error, context.Canceled.Error()) {
                                fmt.Fprintf(p.w, "#%d CANCELED\n", v.index)
                        } else {
                                fmt.Fprintf(p.w, "#%d ERROR: %s\n", v.index, v.Error)
                        }
                } else if v.Cached {
                        fmt.Fprintf(p.w, "#%d CACHED\n", v.index)
                } else {
                        tm := ""
                        var ivals []interval
                        for _, ival := range v.intervals {
                                ivals = append(ivals, ival)
                        }
                        ivals = mergeIntervals(ivals)
                        if len(ivals) > 0 {
                                var dt float64
                                for _, ival := range ivals {
                                        dt += ival.duration().Seconds()
                                }
                                tm = fmt.Sprintf(" %.1fs", dt)
                        }
                        fmt.Fprintf(p.w, "#%d DONE%s\n", v.index, tm)
                }
        }

        delete(t.updates, dgst)
}

func sortCompleted(t *trace, m map[digest.Digest]struct{}) []digest.Digest {
        out := make([]digest.Digest, 0, len(m))
        for k := range m {
                out = append(out, k)
        }
        sort.Slice(out, func(i, j int) bool {
                vtxi := t.byDigest[out[i]]
                vtxj := t.byDigest[out[j]]
                return vtxi.mostRecentInterval().stop.Before(*vtxj.mostRecentInterval().stop)
        })
        return out
}

func (p *textMux) print(t *trace) {
        completed := map[digest.Digest]struct{}{}
        rest := map[digest.Digest]struct{}{}

        for dgst := range t.updates {
                v, ok := t.byDigest[dgst]
                if !ok {
                        continue
                }
                if v.ProgressGroup != nil || v.hidden {
                        // skip vtxs in a group (they are merged into a single vtx) and hidden ones
                        continue
                }
                if v.isCompleted() {
                        completed[dgst] = struct{}{}
                } else {
                        rest[dgst] = struct{}{}
                }
        }

        current := p.current

        // items that have completed need to be printed first
        if _, ok := completed[current]; ok {
                p.printVtx(t, current)
        }

        for _, dgst := range sortCompleted(t, completed) {
                if dgst != current {
                        p.printVtx(t, dgst)
                }
        }

        if len(rest) == 0 {
                if current != "" {
                        if v := t.byDigest[current]; v.isStarted() && !v.isCompleted() {
                                return
                        }
                }
                // make any open vertex active
                for dgst, v := range t.byDigest {
                        if v.isStarted() && !v.isCompleted() && v.ProgressGroup == nil && !v.hidden {
                                p.printVtx(t, dgst)
                                return
                        }
                }
                return
        }

        // now print the active one
        if _, ok := rest[current]; ok {
                p.printVtx(t, current)
        }

        stats := map[digest.Digest]*vtxStat{}
        now := time.Now()
        sum := 0.0
        var max digest.Digest
        if current != "" {
                rest[current] = struct{}{}
        }
        for dgst := range rest {
                v, ok := t.byDigest[dgst]
                if !ok {
                        continue
                }
                if v.lastBlockTime == nil {
                        // shouldn't happen, but not worth crashing over
                        continue
                }
                tm := now.Sub(*v.lastBlockTime)
                speed := float64(v.count) / tm.Seconds()
                overLimit := tm > maxDelay && dgst != current
                stats[dgst] = &vtxStat{blockTime: tm, speed: speed, overLimit: overLimit}
                sum += speed
                if overLimit || max == "" || stats[max].speed < speed {
                        max = dgst
                }
        }
        for dgst := range stats {
                stats[dgst].share = stats[dgst].speed / sum
        }

        if _, ok := completed[current]; ok || current == "" {
                p.printVtx(t, max)
                return
        }

        // show items that were hidden
        for dgst := range rest {
                if stats[dgst].overLimit {
                        p.printVtx(t, dgst)
                        return
                }
        }

        // fair split between vertices
        if 1.0/(1.0-stats[current].share)*antiFlicker.Seconds() < stats[current].blockTime.Seconds() {
                p.printVtx(t, max)
                return
        }
}

type vtxStat struct {
        blockTime time.Duration
        speed     float64
        share     float64
        overLimit bool
}

func limitString(s string, l int) string {
        if len(s) > l {
                return s[:l] + "..."
        }
        return s
}

1	// Copyright 2023 The envd Authors
2	// Copyright 2023 The buildkit Authors
3	//
4	// Licensed under the Apache License, Version 2.0 (the "License");
5	// you may not use this file except in compliance with the License.
6	// You may obtain a copy of the License at
7	//
8	// http://www.apache.org/licenses/LICENSE-2.0
9	//
10	// Unless required by applicable law or agreed to in writing, software
11	// distributed under the License is distributed on an "AS IS" BASIS,
12	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13	// See the License for the specific language governing permissions and
14	// limitations under the License.
15
16	package progressui
17
18	import (
19	"container/ring"
20	"context"
21	"fmt"
22	"io"
23	"os"
24	"sort"
25	"strings"
26	"time"
27
28	"github.com/opencontainers/go-digest"
29	"github.com/tonistiigi/units"
30	)
31
32	const antiFlicker = 5 * time.Second
33	const maxDelay = 10 * time.Second
34	const minTimeDelta = 5 * time.Second
35	const minProgressDelta = 0.05 // %
36
37	const logsBufferSize = 10
38
39	type lastStatus struct {
40	Current int64
41	Timestamp time.Time
42	}
43
44	type textMux struct {
45	w io.Writer
46	current digest.Digest
47	last map[string]lastStatus
48	notFirst bool
49	nextIndex int
50	}
51
52	func (p textMux) printVtx(t trace, dgst digest.Digest) {	4,334✔
53	if p.last == nil {	4,379✔
54	p.last = make(map[string]lastStatus)	45✔
55	}	45✔
56
57	v, ok := t.byDigest[dgst]	4,334✔
58	if !ok {	4,334✔
59	return	×
60	}	×
61
62	if v.index == 0 {	6,245✔
63	p.nextIndex++	1,911✔
64	v.index = p.nextIndex	1,911✔
65	}	1,911✔
66
67	if dgst != p.current {	6,390✔
68	if p.current != "" {	2,119✔
69	old := t.byDigest[p.current]	63✔
70	if old.logsPartial {	64✔
71	fmt.Fprintln(p.w, "")	1✔
72	}	1✔
73	old.logsOffset = 0	63✔
74	old.count = 0	63✔
75	fmt.Fprintf(p.w, "#%d ...\n", old.index)	63✔
76	}
77
78	if p.notFirst {	4,067✔
79	fmt.Fprintln(p.w, "")	2,011✔
80	} else {	2,056✔
81	p.notFirst = true	45✔
82	}	45✔
83
84	if os.Getenv("PROGRESS_NO_TRUNC") == "0" {	2,056✔
85	fmt.Fprintf(p.w, "#%d %s\n", v.index, limitString(v.Name, 72))	×
86	} else {	2,056✔
87	fmt.Fprintf(p.w, "#%d %s\n", v.index, v.Name)	2,056✔
88	}	2,056✔
89	}
90
91	if len(v.events) != 0 {	4,334✔
92	v.logsOffset = 0	×
93	}	×
94	for _, ev := range v.events {	4,334✔
95	fmt.Fprintf(p.w, "#%d %s\n", v.index, ev)	×
96	}	×
97	v.events = v.events[:0]	4,334✔
98		4,334✔
99	isOpenStatus := false // remote cache loading can currently produce status updates without active vertex	4,334✔
100	for _, s := range v.statuses {	5,694✔
101	if _, ok := v.statusUpdates[s.ID]; ok {	2,191✔
102	doPrint := true	831✔
103		831✔
104	if last, ok := p.last[s.ID]; ok && s.Completed == nil {	926✔
105	var progressDelta float64	95✔
106	if s.Total > 0 {	99✔
107	progressDelta = float64(s.Current-last.Current) / float64(s.Total)	4✔
108	}	4✔
109	timeDelta := s.Timestamp.Sub(last.Timestamp)	95✔
110	if progressDelta < minProgressDelta && timeDelta < minTimeDelta {	186✔
111	doPrint = false	91✔
112	}	91✔
113	}
114
115	if !doPrint {	922✔
116	continue	91✔
117	}
118
119	p.last[s.ID] = lastStatus{	740✔
120	Timestamp: s.Timestamp,	740✔
121	Current: s.Current,	740✔
122	}	740✔
123		740✔
124	var bytes string	740✔
125	if s.Total != 0 {	820✔
126	bytes = fmt.Sprintf(" %.2f / %.2f", units.Bytes(s.Current), units.Bytes(s.Total))	80✔
127	} else if s.Current != 0 {	788✔
128	bytes = fmt.Sprintf(" %.2f", units.Bytes(s.Current))	48✔
129	}	48✔
130	var tm string	740✔
131	endTime := s.Timestamp	740✔
132	if s.Completed != nil {	1,303✔
133	endTime = *s.Completed	563✔
134	}	563✔
135	if s.Started != nil {	1,480✔
136	diff := endTime.Sub(*s.Started).Seconds()	740✔
137	if diff > 0.01 {	1,183✔
138	tm = fmt.Sprintf(" %.1fs", diff)	443✔
139	}	443✔
140	}
141	if s.Completed != nil {	1,303✔
142	tm += " done"	563✔
143	} else {	740✔
144	isOpenStatus = true	177✔
145	}	177✔
146	fmt.Fprintf(p.w, "#%d %s%s%s\n", v.index, s.ID, bytes, tm)	740✔
147	}
148	}
149	v.statusUpdates = map[string]struct{}{}	4,334✔
150		4,334✔
151	for _, w := range v.warnings[v.warningIdx:] {	4,334✔
152	fmt.Fprintf(p.w, "#%d WARN: %s\n", v.index, w.Short)	×
153	v.warningIdx++	×
154	}	×
155
156	for i, l := range v.logs {	42,381✔
157	if i == 0 {	40,009✔
158	l = l[v.logsOffset:]	1,962✔
159	}	1,962✔
160	fmt.Fprintf(p.w, "%s", l)	38,047✔
161	if i != len(v.logs)-1 \|\| !v.logsPartial {	75,261✔
162	fmt.Fprintln(p.w, "")	37,214✔
163	}	37,214✔
164	if v.logsBuffer == nil {	38,264✔
165	v.logsBuffer = ring.New(logsBufferSize)	217✔
166	}	217✔
167	v.logsBuffer.Value = l	38,047✔
168	if !v.logsPartial {	50,278✔
169	v.logsBuffer = v.logsBuffer.Next()	12,231✔
170	}	12,231✔
171	}
172
173	if len(v.logs) > 0 {	6,296✔
174	if v.logsPartial {	2,795✔
175	v.logs = v.logs[len(v.logs)-1:]	833✔
176	v.logsOffset = len(v.logs[0])	833✔
177	} else {	1,962✔
178	v.logs = nil	1,129✔
179	v.logsOffset = 0	1,129✔
180	}	1,129✔
181	}
182
183	p.current = dgst	4,334✔
184	if v.isCompleted() && !isOpenStatus {	6,327✔
185	p.current = ""	1,993✔
186	v.count = 0	1,993✔
187		1,993✔
188	if v.Error != "" {	1,993✔
189	if v.logsPartial {	×
190	fmt.Fprintln(p.w, "")	×
191	}	×
192	if strings.HasSuffix(v.Error, context.Canceled.Error()) {	×
193	fmt.Fprintf(p.w, "#%d CANCELED\n", v.index)	×
194	} else {	×
195	fmt.Fprintf(p.w, "#%d ERROR: %s\n", v.index, v.Error)	×
196	}	×
197	} else if v.Cached {	2,900✔
198	fmt.Fprintf(p.w, "#%d CACHED\n", v.index)	907✔
199	} else {	1,993✔
200	tm := ""	1,086✔
201	var ivals []interval	1,086✔
202	for _, ival := range v.intervals {	2,449✔
203	ivals = append(ivals, ival)	1,363✔
204	}	1,363✔
205	ivals = mergeIntervals(ivals)	1,086✔
206	if len(ivals) > 0 {	2,172✔
207	var dt float64	1,086✔
208	for _, ival := range ivals {	2,449✔
209	dt += ival.duration().Seconds()	1,363✔
210	}	1,363✔
211	tm = fmt.Sprintf(" %.1fs", dt)	1,086✔
212	}
213	fmt.Fprintf(p.w, "#%d DONE%s\n", v.index, tm)	1,086✔
214	}
215	}
216
217	delete(t.updates, dgst)	4,334✔
218	}
219
220	func sortCompleted(t *trace, m map[digest.Digest]struct{}) []digest.Digest {	12,930✔
221	out := make([]digest.Digest, 0, len(m))	12,930✔
222	for k := range m {	14,924✔
223	out = append(out, k)	1,994✔
224	}	1,994✔
225	sort.Slice(out, func(i, j int) bool {	16,015✔
226	vtxi := t.byDigest[out[i]]	3,085✔
227	vtxj := t.byDigest[out[j]]	3,085✔
228	return vtxi.mostRecentInterval().stop.Before(*vtxj.mostRecentInterval().stop)	3,085✔
229	})	3,085✔
230	return out	12,930✔
231	}
232
233	func (p textMux) print(t trace) {	12,930✔
234	completed := map[digest.Digest]struct{}{}	12,930✔
235	rest := map[digest.Digest]struct{}{}	12,930✔
236		12,930✔
237	for dgst := range t.updates {	17,815✔
238	v, ok := t.byDigest[dgst]	4,885✔
239	if !ok {	4,885✔
240	continue	×
241	}
242	if v.ProgressGroup != nil \|\| v.hidden {	4,885✔
243	// skip vtxs in a group (they are merged into a single vtx) and hidden ones	×
244	continue	×
245	}
246	if v.isCompleted() {	6,879✔
247	completed[dgst] = struct{}{}	1,994✔
248	} else {	4,885✔
249	rest[dgst] = struct{}{}	2,891✔
250	}	2,891✔
251	}
252
253	current := p.current	12,930✔
254		12,930✔
255	// items that have completed need to be printed first	12,930✔
256	if _, ok := completed[current]; ok {	13,268✔
257	p.printVtx(t, current)	338✔
258	}	338✔
259
260	for _, dgst := range sortCompleted(t, completed) {	14,924✔
261	if dgst != current {	3,650✔
262	p.printVtx(t, dgst)	1,656✔
263	}	1,656✔
264	}
265
266	if len(rest) == 0 {	23,345✔
267	if current != "" {	20,728✔
268	if v := t.byDigest[current]; v.isStarted() && !v.isCompleted() {	20,467✔
269	return	10,154✔
270	}	10,154✔
271	}
272	// make any open vertex active
273	for dgst, v := range t.byDigest {	10,718✔
274	if v.isStarted() && !v.isCompleted() && v.ProgressGroup == nil && !v.hidden {	10,466✔
275	p.printVtx(t, dgst)	9✔
276	return	9✔
277	}	9✔
278	}
279	return	252✔
280	}
281
282	// now print the active one
283	if _, ok := rest[current]; ok {	4,471✔
284	p.printVtx(t, current)	1,956✔
285	}	1,956✔
286
287	stats := map[digest.Digest]*vtxStat{}	2,515✔
288	now := time.Now()	2,515✔
289	sum := 0.0	2,515✔
290	var max digest.Digest	2,515✔
291	if current != "" {	4,834✔
292	rest[current] = struct{}{}	2,319✔
293	}	2,319✔
294	for dgst := range rest {	5,769✔
295	v, ok := t.byDigest[dgst]	3,254✔
296	if !ok {	3,254✔
297	continue	×
298	}
299	if v.lastBlockTime == nil {	3,254✔
300	// shouldn't happen, but not worth crashing over	×
301	continue	×
302	}
303	tm := now.Sub(*v.lastBlockTime)	3,254✔
304	speed := float64(v.count) / tm.Seconds()	3,254✔
305	overLimit := tm > maxDelay && dgst != current	3,254✔
306	stats[dgst] = &vtxStat{blockTime: tm, speed: speed, overLimit: overLimit}	3,254✔
307	sum += speed	3,254✔
308	if overLimit \|\| max == "" \|\| stats[max].speed < speed {	6,057✔
309	max = dgst	2,803✔
310	}	2,803✔
311	}
312	for dgst := range stats {	5,769✔
313	stats[dgst].share = stats[dgst].speed / sum	3,254✔
314	}	3,254✔
315
316	if _, ok := completed[current]; ok \|\| current == "" {	2,890✔
317	p.printVtx(t, max)	375✔
318	return	375✔
319	}	375✔
320
321	// show items that were hidden
322	for dgst := range rest {	4,727✔
323	if stats[dgst].overLimit {	2,587✔
324	p.printVtx(t, dgst)	×
325	return	×
326	}	×
327	}
328
329	// fair split between vertices
330	if 1.0/(1.0-stats[current].share)*antiFlicker.Seconds() < stats[current].blockTime.Seconds() {	2,140✔
331	p.printVtx(t, max)	×
332	return	×
333	}	×
334	}
335
336	type vtxStat struct {
337	blockTime time.Duration
338	speed float64
339	share float64
340	overLimit bool
341	}
342
343	func limitString(s string, l int) string {	×
344	if len(s) > l {	×
345	return s[:l] + "..."	×
346	}	×
347	return s	×
348	}

tensorchord / envd / 12865640761

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous