Merge pull request #729 from tonistiigi/session-context

AkihiroSuda · web-flow · commit f2f4b534d482 · 2018-11-20T11:56:35.000+09:00
llbsolver: keep session for context calls
diff --git a/solver/jobs.go b/solver/jobs.go
@@ -171,6 +171,7 @@ func (sb *subBuilder) Build(ctx context.Context, e Edge) (CachedResult, error) {
 }
 
 func (sb *subBuilder) Context(ctx context.Context) context.Context {
+	ctx = session.NewContext(ctx, sb.state.getSessionID())
 	return opentracing.ContextWithSpan(progress.WithProgress(ctx, sb.mpw), sb.mspan)
 }
 
@@ -475,6 +476,7 @@ func (j *Job) Discard() error {
 }
 
 func (j *Job) Context(ctx context.Context) context.Context {
+	ctx = session.NewContext(ctx, j.SessionID)
 	return progress.WithProgress(ctx, j.pw)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ func (sb *subBuilder) Build(ctx context.Context, e Edge) (CachedResult, error) {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`func (sb *subBuilder) Context(ctx context.Context) context.Context {`
	`174`	`+ ctx = session.NewContext(ctx, sb.state.getSessionID())`
`174`	`175`	`return opentracing.ContextWithSpan(progress.WithProgress(ctx, sb.mpw), sb.mspan)`
`175`	`176`	`}`
`176`	`177`
`@@ -475,6 +476,7 @@ func (j *Job) Discard() error {`
`475`	`476`	`}`
`476`	`477`
`477`	`478`	`func (j *Job) Context(ctx context.Context) context.Context {`
	`479`	`+ ctx = session.NewContext(ctx, j.SessionID)`
`478`	`480`	`return progress.WithProgress(ctx, j.pw)`
`479`	`481`	`}`
`480`	`482`