[retry] Standardize package conventions

- Rename errors.go to error.go
- Pass context.Context to Operation signature
- Use structured logging in WithLogNotifier

Author: Pranav-d33

retry/errors.go retry/error.goretry/errors.go renamed to retry/error.go

@@ -120,6 +120,7 @@ func WithNotifier(n func(err error, wait time.Duration)) Option {
 //	err := retry.Do(ctx, op, retry.WithLogNotifier(l.Log))
 func WithLogNotifier(log logger.Handler) Option {
 	return WithNotifier(func(err error, wait time.Duration) {
-		log.Warnf("retry: transient error — retrying in %s: %v", wait.Round(time.Millisecond), err)
+		log.Infof("retry: transient error — retrying in %s", wait.Round(time.Millisecond))
+		log.Warn(err)
 	})
 }

retry/options.go

@@ -16,7 +16,7 @@
 //
 // # Basic usage
 //
-//	err := retry.Do(ctx, func() error {
+//	err := retry.Do(ctx, func(ctx context.Context) error {
 //	    req, _ := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 //	    resp, err := http.DefaultClient.Do(req)
 //	    if err != nil {
@@ -44,14 +44,9 @@ import (
 
 // Operation is the function signature for retryable work.
 //
-// TODO: The Operation signature currently lacks a context.Context, which prevents
-// operations from being interrupted immediately upon context cancellation.
-// A follow-up task should be created for the full implementation to avoid bloating
-// the current pull request.
-//
 // Return nil on success, [Permanent](err) to stop without further retries,
 // or any plain error to trigger the next backoff wait and retry.
-type Operation func() error
+type Operation func(ctx context.Context) error
 
 // Do executes op with exponential backoff until one of the following occurs:
 //   - op returns nil (success)
@@ -77,7 +72,7 @@ func Do(ctx context.Context, op Operation, opts ...Option) error {
 	b := buildBackOff(cfg)
 	bCtx := backoff.WithContext(b, ctx)
 
-	return backoff.RetryNotify(backoff.Operation(op), bCtx, cfg.Notifier)
+	return backoff.RetryNotify(func() error { return op(ctx) }, bCtx, cfg.Notifier)
 }
 
 // buildBackOff constructs a cenkalti/backoff policy from the supplied Config.

retry/retry.go

@@ -15,12 +15,12 @@ import (
 
 // alwaysFail returns an Operation that always returns the given error.
 func alwaysFail(err error) retry.Operation {
-	return func() error { return err }
+	return func(ctx context.Context) error { return err }
 }
 
 // countingOp returns an Operation that always fails and increments *count.
 func countingOp(count *atomic.Int64, err error) retry.Operation {
-	return func() error {
+	return func(ctx context.Context) error {
 		count.Add(1)
 		return err
 	}
@@ -32,7 +32,7 @@ func TestDo_SucceedsFirstAttempt(t *testing.T) {
 	t.Parallel()
 
 	calls := 0
-	err := retry.Do(context.Background(), func() error {
+	err := retry.Do(context.Background(), func(ctx context.Context) error {
 		calls++
 		return nil
 	}, retry.WithMaxAttempts(5))
@@ -52,7 +52,7 @@ func TestDo_SucceedsAfterTransientErrors(t *testing.T) {
 	var calls atomic.Int64
 
 	err := retry.Do(context.Background(),
-		func() error {
+		func(ctx context.Context) error {
 			n := calls.Add(1)
 			if n < 4 {
 				return transient
@@ -80,7 +80,7 @@ func TestDo_PermanentErrorStopsImmediately(t *testing.T) {
 	calls := 0
 
 	err := retry.Do(context.Background(),
-		func() error {
+		func(ctx context.Context) error {
 			calls++
 			return retry.Permanent(permanent)
 		},
@@ -143,7 +143,7 @@ func TestDo_ContextCancellationStopsLoop(t *testing.T) {
 	}()
 
 	err := retry.Do(ctx,
-		func() error {
+		func(ctx context.Context) error {
 			calls.Add(1)
 			return transient
 		},
@@ -167,7 +167,7 @@ func TestDo_ContextAlreadyCancelledBeforeFirstAttempt(t *testing.T) {
 
 	var calls atomic.Int64
 	err := retry.Do(ctx,
-		func() error {
+		func(ctx context.Context) error {
 			calls.Add(1)
 			return errors.New("should not reach")
 		},
@@ -247,7 +247,7 @@ func TestDo_NotifierCalledOnEachRetry(t *testing.T) {
 
 	var calls atomic.Int64
 	_ = retry.Do(context.Background(),
-		func() error {
+		func(ctx context.Context) error {
 			if calls.Add(1) <= failures {
 				return transient
 			}
@@ -269,7 +269,7 @@ func TestDo_NotifierNotCalledOnImmediateSuccess(t *testing.T) {
 
 	var notifyCount atomic.Int64
 	_ = retry.Do(context.Background(),
-		func() error { return nil },
+		func(ctx context.Context) error { return nil },
 		retry.WithNotifier(func(err error, wait time.Duration) {
 			notifyCount.Add(1)
 		}),
@@ -284,7 +284,7 @@ func TestDo_NotifierNotCalledOnPermanentError(t *testing.T) {
 
 	var notifyCount atomic.Int64
 	_ = retry.Do(context.Background(),
-		func() error { return retry.Permanent(errors.New("perm")) },
+		func(ctx context.Context) error { return retry.Permanent(errors.New("perm")) },
 		retry.WithMaxAttempts(5),
 		retry.WithInitialInterval(1*time.Millisecond),
 		retry.WithNotifier(func(err error, wait time.Duration) {
@@ -345,7 +345,7 @@ func TestDo_DefaultsAreApplied(t *testing.T) {
 	defer cancel()
 
 	_ = retry.Do(ctx,
-		func() error {
+		func(ctx context.Context) error {
 			if calls.Add(1) >= 2 {
 				return nil
 			}