Simplify default config and add default async sleep #3071
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
A new generated diff is ready to view.
A new doc preview is ready to view. |
rcoh
reviewed
Oct 16, 2023
Comment on lines
-22
to
-38
| pub struct ClientRateLimiterRuntimePlugin { | ||
| rate_limiter: ClientRateLimiter, | ||
| } | ||
|
|
||
| impl ClientRateLimiterRuntimePlugin { | ||
| /// Create a new [`ClientRateLimiterRuntimePlugin`]. | ||
| pub fn new(seconds_since_unix_epoch: f64) -> Self { | ||
| Self { | ||
| rate_limiter: ClientRateLimiter::new(seconds_since_unix_epoch), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl RuntimePlugin for ClientRateLimiterRuntimePlugin { | ||
| fn config(&self) -> Option<FrozenLayer> { | ||
| let mut cfg = Layer::new("client rate limiter"); | ||
| cfg.store_put(self.rate_limiter.clone()); |
There was a problem hiding this comment.
is this something a customer would want to use directly? Seems like it could be helpful.
There was a problem hiding this comment.
This is an implementation detail for adaptive retry, so I don't believe so.
|
A new generated diff is ready to view.
A new doc preview is ready to view. |
|
A new generated diff is ready to view.
A new doc preview is ready to view. |
rcoh
approved these changes
Oct 17, 2023
Comment on lines
+47
to
+56
| let _default: Option<SharedHttpClient> = None; | ||
| #[cfg(feature = "connector-hyper-0-14-x")] | ||
| let _default = crate::client::http::hyper_014::default_client(); | ||
|
|
||
| _default.map(|default| { | ||
| default_plugin("default_http_client_plugin", |components| { | ||
| components.with_http_client(Some(default)) | ||
| }) | ||
| .into_shared() | ||
| }) |
There was a problem hiding this comment.
Suggested change
| let _default: Option<SharedHttpClient> = None; | |
| #[cfg(feature = "connector-hyper-0-14-x")] | |
| let _default = crate::client::http::hyper_014::default_client(); | |
| _default.map(|default| { | |
| default_plugin("default_http_client_plugin", |components| { | |
| components.with_http_client(Some(default)) | |
| }) | |
| .into_shared() | |
| }) | |
| let default_client: Option<SharedHttpClient> = None; | |
| #[cfg(feature = "connector-hyper-0-14-x")] | |
| let default_client = crate::client::http::hyper_014::default_client(); | |
| default_client.map(|client| { | |
| default_plugin("default_http_client_plugin", |components| { | |
| components.with_http_client(Some(client)) | |
| }) | |
| .into_shared() | |
| }) |
There was a problem hiding this comment.
It definitely needs the underscore prefix to avoid compilation warnings.
Comment on lines
+71
to
+76
| Some( | ||
| default_plugin("default_time_source_plugin", |components| { | ||
| components.with_time_source(Some(SystemTimeSource::new())) | ||
| }) | ||
| .into_shared(), | ||
| ) |
There was a problem hiding this comment.
nonblocking—I wonder if we could figure out at compile time if SystemTimeSource was going to work or not 🤔
There was a problem hiding this comment.
Probably need to look at the compilation target to determine that.
ysaito1001
reviewed
Oct 17, 2023
| @@ -16,6 +17,8 @@ import software.amazon.smithy.rust.codegen.core.testutil.integrationTest | |||
|
|
|||
| class SensitiveOutputDecoratorTest { | |||
| private fun codegenScope(runtimeConfig: RuntimeConfig): Array<Pair<String, Any>> = arrayOf( | |||
| "capture_test_logs" to CargoDependency.smithyRuntimeTestUtil(runtimeConfig).toType() | |||
There was a problem hiding this comment.
Thanks for starting to use this, which I did not when adding this test.
ysaito1001
approved these changes
Oct 17, 2023
|
A new generated diff is ready to view.
A new doc preview is ready to view. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While implementing identity caching, I noticed we don't have a default async sleep impl wired up for generic clients, which was causing caching to panic in many tests since it needs a sleep impl for timeouts. I likely need to figure out what to do other than panic if there's no sleep impl, but that's a problem for a different PR.
This PR adds a default sleep impl to generic clients, and also simplifies how default config works. Previously, the generated config
Builder::buildmethod set all the defaults with a series of "if not set, then set default" statements. In this PR, defaults are registered via default ordered runtime plugins.Additionally, I cleaned up the standard retry strategy:
TokenBucketPartitiondidn't appear to be used at all, so I deleted it.StandardRetryStrategywas taking retry config at construction, which means it isn't possible to config override the retry config unless the strategy is recreated. It now doesn't take any config at all during construction.Checklist
CHANGELOG.next.tomlif I made changes to the smithy-rs codegen or runtime cratesCHANGELOG.next.tomlif I made changes to the AWS SDK, generated SDK code, or SDK runtime cratesBy submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.