handle unconfigured spans without errors

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
moby · Jun 22, 2021 · 181c6b1 · 181c6b1
1 parent 14d606c
commit 181c6b1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/control/control.go b/control/control.go
@@ -29,6 +29,8 @@ import (
 	v1 "go.opentelemetry.io/proto/otlp/collector/trace/v1"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 type Opt struct {
@@ -193,6 +195,9 @@ func (c *Controller) Prune(req *controlapi.PruneRequest, stream controlapi.Contr
 }
 
 func (c *Controller) Export(ctx context.Context, req *tracev1.ExportTraceServiceRequest) (*tracev1.ExportTraceServiceResponse, error) {
+	if c.opt.TraceCollector == nil {
+		return nil, status.Errorf(codes.Unavailable, "trace collector not configured")
+	}
 	err := c.opt.TraceCollector.ExportSpans(ctx, transform.Spans(req.GetResourceSpans()))
 	if err != nil {
 		return nil, err

diff --git a/solver/jobs.go b/solver/jobs.go
@@ -47,10 +47,9 @@ type state struct {
 	parents  map[digest.Digest]struct{}
 	childVtx map[digest.Digest]struct{}
 
-	mpw     *progress.MultiWriter
-	allPw   map[progress.Writer]struct{}
-	mspan   *tracing.MultiSpan
-	allSpan map[trace.Span]struct{}
+	mpw   *progress.MultiWriter
+	allPw map[progress.Writer]struct{}
+	mspan *tracing.MultiSpan
 
 	vtx          Vertex
 	clientVertex client.Vertex
@@ -358,7 +357,6 @@ func (jl *Solver) loadUnlocked(v, parent Vertex, j *Job, cache map[Vertex]Vertex
 			parents:      map[digest.Digest]struct{}{},
 			childVtx:     map[digest.Digest]struct{}{},
 			allPw:        map[progress.Writer]struct{}{},
-			allSpan:      map[trace.Span]struct{}{},
 			mpw:          progress.NewMultiWriter(progress.WithMetadata("vertex", dgst)),
 			mspan:        tracing.NewMultiSpan(),
 			vtx:          v,
@@ -415,8 +413,9 @@ func (jl *Solver) connectProgressFromState(target, src *state) {
 			target.mpw.Add(j.pw)
 			target.allPw[j.pw] = struct{}{}
 			j.pw.Write(target.clientVertex.Digest.String(), target.clientVertex)
-			target.mspan.Add(j.span)
-			target.allSpan[j.span] = struct{}{}
+			if j.span != nil && j.span.SpanContext().IsValid() {
+				target.mspan.Add(j.span)
+			}
 		}
 	}
 	for p := range src.parents {
@@ -435,13 +434,11 @@ func (jl *Solver) NewJob(id string) (*Job, error) {
 	pr, ctx, progressCloser := progress.NewContext(context.Background())
 	pw, _, _ := progress.FromContext(ctx) // TODO: expose progress.Pipe()
 
-	_, span := trace.NewNoopTracerProvider().Tracer("").Start(ctx, "")
 	j := &Job{
 		list:           jl,
 		pr:             progress.NewMultiReader(pr),
 		pw:             pw,
 		progressCloser: progressCloser,
-		span:           span,
 		id:             id,
 	}
 	jl.jobs[id] = j
@@ -522,9 +519,6 @@ func (j *Job) Discard() error {
 		if _, ok := st.allPw[j.pw]; ok {
 			delete(st.allPw, j.pw)
 		}
-		if _, ok := st.allSpan[j.span]; ok {
-			delete(st.allSpan, j.span)
-		}
 		st.mu.Unlock()
 	}
 

diff --git a/util/tracing/tracing.go b/util/tracing/tracing.go
@@ -18,7 +18,7 @@ import (
 func StartSpan(ctx context.Context, operationName string, opts ...trace.SpanStartOption) (trace.Span, context.Context) {
 	parent := trace.SpanFromContext(ctx)
 	tracer := trace.NewNoopTracerProvider().Tracer("")
-	if parent.SpanContext().IsValid() {
+	if parent != nil && parent.SpanContext().IsValid() {
 		tracer = parent.TracerProvider().Tracer("")
 	}
 	ctx, span := tracer.Start(ctx, operationName, opts...)
@@ -47,7 +47,7 @@ func ContextWithSpanFromContext(ctx, ctx2 context.Context) context.Context {
 	if span := trace.SpanFromContext(ctx); span.SpanContext().IsValid() {
 		return ctx
 	}
-	if span := trace.SpanFromContext(ctx2); span != nil {
+	if span := trace.SpanFromContext(ctx2); span != nil && span.SpanContext().IsValid() {
 		return trace.ContextWithSpan(ctx, span)
 	}
 	return ctx