remove trace.ContextRetry and trace.WithRetry

Author: asmyasnikov

internal/table/retry_test.go

@@ -17,7 +17,6 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table/options"
 	"github.com/ydb-platform/ydb-go-sdk/v3/testutil"
-	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
 func TestRetryerBackoffRetryCancelation(t *testing.T) {
@@ -212,7 +211,6 @@ func TestRetryerImmediateReturn(t *testing.T) {
 // We are testing all suspentions of custom operation func against to all deadline
 // timeouts - all sub-tests must have latency less than timeouts (+tolerance)
 func TestRetryContextDeadline(t *testing.T) {
-	tolerance := 10 * time.Millisecond
 	timeouts := []time.Duration{
 		50 * time.Millisecond,
 		100 * time.Millisecond,
@@ -318,31 +316,8 @@ func TestRetryContextDeadline(t *testing.T) {
 			t.Run(fmt.Sprintf("Timeout=%v,Sleep=%v", timeout, sleep), func(t *testing.T) {
 				ctx, cancel := context.WithTimeout(context.Background(), timeout)
 				defer cancel()
-				start := time.Now()
 				_ = do(
-					trace.WithRetry(
-						ctx,
-						trace.Retry{
-							OnRetry: func(
-								info trace.RetryLoopStartInfo,
-							) func(
-								intermediateInfo trace.RetryLoopIntermediateInfo,
-							) func(
-								trace.RetryLoopDoneInfo,
-							) {
-								return func(
-									info trace.RetryLoopIntermediateInfo,
-								) func(trace.RetryLoopDoneInfo) {
-									return func(info trace.RetryLoopDoneInfo) {
-										latency := time.Since(start)
-										if latency-timeouts[i] > tolerance {
-											t.Errorf("unexpected latency: %v", latency)
-										}
-									}
-								}
-							},
-						},
-					),
+					ctx,
 					p,
 					func(ctx context.Context, _ table.Session) error {
 						select {

retry/retry.go

@@ -114,7 +114,6 @@ func WithSlowBackoff(b Backoff) retryOption {
 // If you need to retry your op func on some logic errors - you must return RetryableError() from retryOperation
 func Retry(ctx context.Context, op retryOperation, opts ...retryOption) (err error) {
 	h := &retryOptionsHolder{
-		trace:       trace.ContextRetry(ctx),
 		fastBackoff: FastBackoff,
 		slowBackoff: SlowBackoff,
 	}

trace/context.go

@@ -2,24 +2,6 @@ package trace
 
 import "context"
 
-type retryContextKey struct{}
-
-// WithRetry returns deadline which has associated Retry with it.
-func WithRetry(ctx context.Context, t Retry) context.Context {
-	return context.WithValue(ctx,
-		retryContextKey{},
-		ContextRetry(ctx).Compose(t),
-	)
-}
-
-// ContextRetry returns Retry associated with ctx.
-// If there is no Retry associated with ctx then zero value
-// of Retry is returned.
-func ContextRetry(ctx context.Context) Retry {
-	t, _ := ctx.Value(retryContextKey{}).(Retry)
-	return t
-}
-
 type tableContextKey struct{}
 
 // WithTable returns deadline which has associated Trace with it.