Enable retries by default #4454

vcjana · 2025-12-16T20:34:22Z

Fixes awslabs/aws-sdk-rust#1389
Fixes awslabs/aws-sdk-rust#1393

Problem

When users create a client with Config::builder().build(), retries are disabled by default. This is confusing because our docs say retries are enabled by default, and aws_config::load_from_env() does enable them. Users expect retries to just work.

Solution

Enable RetryConfig::standard() and a 3.1s connection timeout by default for BehaviorVersion::v2025_01_17() and later. Older behavior versions keep the current behavior for backward compatibility.

Changes

Modified default_retry_config_plugin() to enable retries for new behavior versions
Modified default_timeout_config_plugin() to add 3.1s connection timeout
Updated generated .send() docs to clarify when retries are enabled

Documentation Updates Needed

The AWS Developer Guide at https://docs.aws.amazon.com/sdk-for-rust/latest/dg/retries.html needs to be updated to reflect this change.

Checklist

Code changes implemented
Backward compatibility maintained via BehaviorVersion
Generated documentation updated
Tests pass
AWS Developer Guide documentation updated (external)

cc @rcoh @aajtodd

Fixes #1389 and #1393 - Enable RetryConfig::standard() for BehaviorVersion v2025_01_17+ - Add default 3.1s connection timeout for v2025_01_17+ - Update generated send() docs to clarify retry behavior

github-actions · 2025-12-16T20:57:18Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2025-12-17T06:27:17Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

rust-runtime/aws-smithy-runtime/src/client/defaults.rs

rcoh

Test failure is real, need to fix the test or pin the behavior version

I would also appreciate a few tests

github-actions · 2025-12-31T02:02:39Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-05T23:56:52Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-06T01:35:40Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-06T03:17:54Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-06T07:27:24Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-06T08:11:09Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-06T09:56:38Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-06T12:06:20Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-06T13:28:17Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

rust-runtime/aws-smithy-runtime/src/client/defaults.rs

rcoh · 2026-01-06T16:01:35Z

Thinking about this more, I wonder if we should enable retries for AWS SDK clients ONLY by default (and not for non-SDK smithy clients).

aws/sdk/integration-tests/s3/tests/client_construction.rs

github-actions · 2026-01-06T18:39:14Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

…ing test

aws/codegen-aws-sdk/src/main/kotlin/software/amazon/smithy/rustsdk/AwsFluentClientDecorator.kt

aws/sdk/integration-tests/s3/tests/retry_defaults.rs

github-actions · 2026-01-06T20:18:45Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-06T22:10:59Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-06T22:35:54Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-07T18:20:00Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

rcoh

Logic is backwards. This is important.

aws/codegen-aws-sdk/src/test/kotlin/software/amazon/smithy/rustsdk/TimeoutConfigMergingTest.kt

aws/sdk/integration-tests/s3/tests/client_construction.rs

rust-runtime/aws-smithy-runtime/src/client/defaults.rs

aws/sdk/integration-tests/s3/tests/timeouts.rs

…ests

github-actions · 2026-01-09T21:21:50Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-09T22:18:40Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

github-actions · 2026-01-09T23:29:33Z

A new generated diff is ready to view.

AWS SDK (ignoring whitespace)
Client Test (ignoring whitespace)
No codegen difference in the Server Test
No codegen difference in the Server Test Python
No codegen difference in the Server Test Typescript

A new doc preview is ready to view.

aajtodd · 2026-01-12T15:35:52Z

aws/sdk/integration-tests/s3/tests/client_construction.rs

    }
+
+    #[test]
+    fn test_client_with_new_behavior_version_builds_successfully() {


These test descriptions are too generic, we have multiple behavior versions and will add more in the future. This should be named according to what it is testing more specifically (e.g. test_default_retry_bmbv_2025_08_07 or similar)

aajtodd · 2026-01-12T15:52:11Z

aws/sdk/integration-tests/s3/tests/timeouts.rs

+
+#[tokio::test]
+#[expect(deprecated)]
+async fn test_connect_timeout_enabled_by_default_with_new_behavior_version() {


same comment on naming

rust-runtime/aws-smithy-runtime/src/client/defaults.rs

aajtodd · 2026-01-12T16:00:41Z

rust-runtime/aws-smithy-runtime/src/client/defaults.rs

+    let behavior_version = params
+        .behavior_version
+        .unwrap_or_else(BehaviorVersion::latest);
+    let retry_partition = RetryPartition::new(default_partition_name);


let retry_partition = RetryPartition::new(params.retry_partition.expect("retry partition name is required")

Enable retries and timeouts by default

7c77dc2

Fixes #1389 and #1393 - Enable RetryConfig::standard() for BehaviorVersion v2025_01_17+ - Add default 3.1s connection timeout for v2025_01_17+ - Update generated send() docs to clarify retry behavior

Merge branch 'main' into fix-retry-defaults-clean

57679d5

rcoh requested changes Dec 17, 2025

View reviewed changes

rust-runtime/aws-smithy-runtime/src/client/defaults.rs Outdated Show resolved Hide resolved

rust-runtime/aws-smithy-runtime/src/client/defaults.rs Outdated Show resolved Hide resolved

create v2 functions to avoid breaking changes

fc83a75

vcjana force-pushed the fix-retry-defaults-clean branch from f7a4014 to fc83a75 Compare December 23, 2025 22:58

rcoh reviewed Dec 27, 2025

View reviewed changes

vcjana force-pushed the fix-retry-defaults-clean branch 3 times, most recently from 8b3dcd0 to 8b014c8 Compare January 5, 2026 23:06

vcjana force-pushed the fix-retry-defaults-clean branch 3 times, most recently from ada4678 to 796622b Compare January 6, 2026 02:47

vcjana force-pushed the fix-retry-defaults-clean branch from c82874c to f02053c Compare January 6, 2026 07:46

Add tests for retry config behavior version gating

0f588c2

vcjana force-pushed the fix-retry-defaults-clean branch from f02053c to 0f588c2 Compare January 6, 2026 09:32

Merge branch 'main' into fix-retry-defaults-clean

efcaf60

Fix timeout test to use old behavior version

340d295

Add allow(deprecated) to tests using old behavior versions

a6a605b

aajtodd reviewed Jan 6, 2026

View reviewed changes

rust-runtime/aws-smithy-runtime/src/client/defaults.rs Outdated Show resolved Hide resolved

rust-runtime/aws-smithy-runtime/src/client/defaults.rs Show resolved Hide resolved

rcoh reviewed Jan 6, 2026

View reviewed changes

aws/sdk/integration-tests/s3/tests/client_construction.rs Outdated Show resolved Hide resolved

aws/sdk/integration-tests/s3/tests/client_construction.rs Show resolved Hide resolved

Add is_aws_sdk flag to enable retries for AWS SDK only

ea0221e

vcjana added 2 commits January 6, 2026 11:24

Explicitly disable operation timeouts for AWS SDK to fix timeout merg…

64203db

…ing test

Fix TimeoutConfigMergingTest to match runtime behavior

9cdf2a6

rcoh reviewed Jan 6, 2026

View reviewed changes

aws/codegen-aws-sdk/src/main/kotlin/software/amazon/smithy/rustsdk/AwsFluentClientDecorator.kt Show resolved Hide resolved

aws/sdk/integration-tests/s3/tests/retry_defaults.rs Outdated Show resolved Hide resolved

vcjana force-pushed the fix-retry-defaults-clean branch from 61a604b to c6c51da Compare January 6, 2026 21:48

Gate retry enablement by awsSdkBuild JSON setting

929a051

vcjana force-pushed the fix-retry-defaults-clean branch from c6c51da to 929a051 Compare January 6, 2026 22:11

vcjana force-pushed the fix-retry-defaults-clean branch from c2d8eca to e43bec8 Compare January 8, 2026 08:20

Fix formatting in defaults.rs

fb0de85

vcjana force-pushed the fix-retry-defaults-clean branch from e43bec8 to fb0de85 Compare January 8, 2026 20:01

vcjana marked this pull request as ready for review January 8, 2026 20:32

vcjana requested a review from a team as a code owner January 8, 2026 20:32

rcoh requested changes Jan 8, 2026

View reviewed changes

rcoh reviewed Jan 9, 2026

View reviewed changes

vcjana added 3 commits January 9, 2026 11:11

Remove is_aws_sdk check from timeout config and add BehaviorVersion t…

cb79e9d

…ests

Fix rustfmt formatting

64509b7

Merge branch 'main' into fix-retry-defaults-clean

952324e

fix rustfmt formatting in timeouts.rs

61347dc

vcjana force-pushed the fix-retry-defaults-clean branch from 771078c to 61347dc Compare January 9, 2026 23:08

aajtodd reviewed Jan 12, 2026

View reviewed changes

Enable retries by default #4454

Are you sure you want to change the base?

Enable retries by default #4454

Conversation

vcjana commented Dec 16, 2025

Problem

Solution

Changes

Documentation Updates Needed

Checklist

Uh oh!

github-actions bot commented Dec 16, 2025

Uh oh!

github-actions bot commented Dec 17, 2025

Uh oh!

Uh oh!

Uh oh!

rcoh left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Dec 31, 2025

Uh oh!

github-actions bot commented Jan 5, 2026

Uh oh!

github-actions bot commented Jan 6, 2026

Uh oh!

github-actions bot commented Jan 6, 2026

Uh oh!

github-actions bot commented Jan 6, 2026

Uh oh!

github-actions bot commented Jan 6, 2026

Uh oh!

github-actions bot commented Jan 6, 2026

Uh oh!

github-actions bot commented Jan 6, 2026

Uh oh!

github-actions bot commented Jan 6, 2026

Uh oh!

Uh oh!

Uh oh!

rcoh commented Jan 6, 2026

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 6, 2026

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 6, 2026

Uh oh!

github-actions bot commented Jan 6, 2026

Uh oh!

github-actions bot commented Jan 6, 2026

Uh oh!

github-actions bot commented Jan 7, 2026

Uh oh!

rcoh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 9, 2026

Uh oh!

github-actions bot commented Jan 9, 2026

Uh oh!

github-actions bot commented Jan 9, 2026

Uh oh!

aajtodd Jan 12, 2026

Choose a reason for hiding this comment

Uh oh!

aajtodd Jan 12, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!