mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-07-09 21:17:09 +08:00
vendor: update buildkit to v0.11.0-rc4
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:

committed by
Tonis Tiigi

parent
a8be6b576b
commit
7394853ddf
22
vendor/github.com/moby/buildkit/util/tracing/detect/detect.go
generated
vendored
22
vendor/github.com/moby/buildkit/util/tracing/detect/detect.go
generated
vendored
@ -73,21 +73,31 @@ func detectExporter() (sdktrace.SpanExporter, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func detect() error {
|
||||
tp = trace.NewNoopTracerProvider()
|
||||
|
||||
func getExporter() (sdktrace.SpanExporter, error) {
|
||||
exp, err := detectExporter()
|
||||
if err != nil {
|
||||
return err
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if exp != nil {
|
||||
exp = &threadSafeExporterWrapper{
|
||||
exporter: exp,
|
||||
}
|
||||
}
|
||||
|
||||
if Recorder != nil {
|
||||
Recorder.SpanExporter = exp
|
||||
exp = Recorder
|
||||
}
|
||||
return exp, nil
|
||||
}
|
||||
|
||||
if exp == nil {
|
||||
return nil
|
||||
func detect() error {
|
||||
tp = trace.NewNoopTracerProvider()
|
||||
|
||||
exp, err := getExporter()
|
||||
if err != nil || exp == nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// enable log with traceID when valid exporter
|
||||
|
8
vendor/github.com/moby/buildkit/util/tracing/detect/recorder.go
generated
vendored
8
vendor/github.com/moby/buildkit/util/tracing/detect/recorder.go
generated
vendored
@ -43,10 +43,6 @@ func NewTraceRecorder() *TraceRecorder {
|
||||
}
|
||||
|
||||
func (r *TraceRecorder) Record(traceID trace.TraceID) func() []tracetest.SpanStub {
|
||||
if r.flush != nil {
|
||||
r.flush(context.TODO())
|
||||
}
|
||||
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
|
||||
@ -55,6 +51,10 @@ func (r *TraceRecorder) Record(traceID trace.TraceID) func() []tracetest.SpanStu
|
||||
var spans []tracetest.SpanStub
|
||||
return func() []tracetest.SpanStub {
|
||||
once.Do(func() {
|
||||
if r.flush != nil {
|
||||
r.flush(context.TODO())
|
||||
}
|
||||
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
|
||||
|
26
vendor/github.com/moby/buildkit/util/tracing/detect/threadsafe.go
generated
vendored
Normal file
26
vendor/github.com/moby/buildkit/util/tracing/detect/threadsafe.go
generated
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
package detect
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
|
||||
sdktrace "go.opentelemetry.io/otel/sdk/trace"
|
||||
)
|
||||
|
||||
// threadSafeExporterWrapper wraps an OpenTelemetry SpanExporter and makes it thread-safe.
|
||||
type threadSafeExporterWrapper struct {
|
||||
mu sync.Mutex
|
||||
exporter sdktrace.SpanExporter
|
||||
}
|
||||
|
||||
func (tse *threadSafeExporterWrapper) ExportSpans(ctx context.Context, spans []sdktrace.ReadOnlySpan) error {
|
||||
tse.mu.Lock()
|
||||
defer tse.mu.Unlock()
|
||||
return tse.exporter.ExportSpans(ctx, spans)
|
||||
}
|
||||
|
||||
func (tse *threadSafeExporterWrapper) Shutdown(ctx context.Context) error {
|
||||
tse.mu.Lock()
|
||||
defer tse.mu.Unlock()
|
||||
return tse.exporter.Shutdown(ctx)
|
||||
}
|
Reference in New Issue
Block a user