mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-07-09 21:17:09 +08:00
vendor: update buildkit to v0.16.0-rc2
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
20
vendor/github.com/moby/buildkit/util/bklog/log.go
generated
vendored
20
vendor/github.com/moby/buildkit/util/bklog/log.go
generated
vendored
@ -20,14 +20,6 @@ var (
|
||||
L = logrus.NewEntry(logrus.StandardLogger())
|
||||
)
|
||||
|
||||
var (
|
||||
logWithTraceID = false
|
||||
)
|
||||
|
||||
func EnableLogWithTraceID(b bool) {
|
||||
logWithTraceID = b
|
||||
}
|
||||
|
||||
type (
|
||||
loggerKey struct{}
|
||||
)
|
||||
@ -51,13 +43,11 @@ func GetLogger(ctx context.Context) (l *logrus.Entry) {
|
||||
l = L
|
||||
}
|
||||
|
||||
if logWithTraceID {
|
||||
if spanContext := trace.SpanFromContext(ctx).SpanContext(); spanContext.IsValid() {
|
||||
return l.WithFields(logrus.Fields{
|
||||
"traceID": spanContext.TraceID(),
|
||||
"spanID": spanContext.SpanID(),
|
||||
})
|
||||
}
|
||||
if spanContext := trace.SpanFromContext(ctx).SpanContext(); spanContext.IsValid() {
|
||||
return l.WithFields(logrus.Fields{
|
||||
"traceID": spanContext.TraceID(),
|
||||
"spanID": spanContext.SpanID(),
|
||||
})
|
||||
}
|
||||
|
||||
return l
|
||||
|
Reference in New Issue
Block a user