From b27c24029033bbfb41289458ca671507a01cb784 Mon Sep 17 00:00:00 2001 From: Taras Madan Date: Wed, 5 Feb 2025 16:36:32 +0100 Subject: pkg/coveragedb: fix context propagation --- pkg/coveragedb/coveragedb.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkg') diff --git a/pkg/coveragedb/coveragedb.go b/pkg/coveragedb/coveragedb.go index cb847339d..e0a139371 100644 --- a/pkg/coveragedb/coveragedb.go +++ b/pkg/coveragedb/coveragedb.go @@ -419,8 +419,8 @@ func FilesCoverageStream(ctx context.Context, client spannerclient.SpannerClient defer iter.Stop() defer close(resCh) defer close(errCh) - if err := readIterToChan(context.Background(), iter, resCh); err != nil { - errCh <- err + if err := readIterToChan(ctx, iter, resCh); err != nil { + errCh <- fmt.Errorf("readIterToChan: %w", err) } }() return resCh, errCh @@ -449,7 +449,7 @@ func FilesCoverageWithDetails( return nil, fmt.Errorf("uniqueFilesCoverageWithDetails: %w", err) } } else { - periodRes, err = readCoverage(iterManager) + periodRes, err = readCoverage(ctx, iterManager) if err != nil { return nil, fmt.Errorf("readCoverage: %w", err) } @@ -495,13 +495,13 @@ where return stmt } -func readCoverage(iterManager spannerclient.RowIterator) ([]*FileCoverageWithDetails, error) { +func readCoverage(ctx context.Context, iterManager spannerclient.RowIterator) ([]*FileCoverageWithDetails, error) { res := []*FileCoverageWithDetails{} ch := make(chan *FileCoverageWithDetails) var err error go func() { defer close(ch) - err = readIterToChan(context.Background(), iterManager, ch) + err = readIterToChan(ctx, iterManager, ch) }() for fc := range ch { res = append(res, fc) -- cgit mrf-deployment