spanconfig: capture context error in reconciliation job resumer (#167477)

trunk-io[bot] · web-flow · commit c697963913ea · 2026-04-10T15:24:33.000Z
spanconfig: capture context error in reconciliation job resumer
diff --git a/pkg/spanconfig/spanconfigjob/job.go b/pkg/spanconfig/spanconfigjob/job.go
@@ -195,8 +195,8 @@ func (r *resumer) Resume(ctx context.Context, execCtxI interface{}) (jobErr erro
 		return nil // we're done here (the stopper was stopped, Reconcile exited cleanly)
 	}
 
-	if lastErr != nil {
-		return errors.Wrap(lastErr, "reconciliation unsuccessful, failing job")
+	if err := errors.CombineErrors(lastErr, ctx.Err()); err != nil {
+		return errors.Wrap(err, "reconciliation unsuccessful, failing job")
 	}
 	return errors.Newf("reconciliation unsuccessful, failing job")
 }

Original file line number	Diff line number	Diff line change
`@@ -195,8 +195,8 @@ func (r *resumer) Resume(ctx context.Context, execCtxI interface{}) (jobErr erro`
`195`	`195`	`return nil // we're done here (the stopper was stopped, Reconcile exited cleanly)`
`196`	`196`	`}`
`197`	`197`
`198`		`- if lastErr != nil {`
`199`		`- return errors.Wrap(lastErr, "reconciliation unsuccessful, failing job")`
	`198`	`+ if err := errors.CombineErrors(lastErr, ctx.Err()); err != nil {`
	`199`	`+ return errors.Wrap(err, "reconciliation unsuccessful, failing job")`
`200`	`200`	`}`
`201`	`201`	`return errors.Newf("reconciliation unsuccessful, failing job")`
`202`	`202`	`}`