Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion reqwest-retry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async-trait = "0.1.51"
futures = "0.3.0"
http = "1.0"
reqwest = { version = "0.13.1", default-features = false }
retry-policies = "0.5"
retry-policies = { git = "https://github.com/andyolivares/retry-policies.git", branch = "retry_policy_with_extras" }
thiserror = "2.0"
tracing = { version = "0.1.26", optional = true }

Expand Down
41 changes: 40 additions & 1 deletion reqwest-retry/src/middleware.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
//! `RetryTransientMiddleware` implements retrying requests on transient errors.
use std::collections::HashMap;
use std::hash::Hash;
use std::time::{Duration, SystemTime};

use crate::retryable_strategy::RetryableStrategy;
Expand Down Expand Up @@ -161,7 +163,9 @@ where
if let Some(Retryable::Transient) = self.retryable_strategy.handle(&result) {
// If the response failed and the error type was transient
// we can safely try to retry the request.
let retry_decision = self.retry_policy.should_retry(start_time, n_past_retries);
let res = result.as_ref().ok();
let extras = get_extras(&req, res);
let retry_decision = self.retry_policy.should_retry(start_time, n_past_retries, Some(extras));
if let retry_policies::RetryDecision::Retry { execute_after } = retry_decision {
let duration = execute_after
.duration_since(SystemTime::now())
Expand Down Expand Up @@ -201,3 +205,38 @@ where
}
}
}

fn get_request_extras(request: &reqwest::Request) -> HashMap<String, String> {
let mut extras = HashMap::new();

extras.insert("request:method".to_string(), request.method().to_string());
extras.insert("request:url".to_string(), request.url().to_string());

for (name, value) in request.headers().iter() {
extras.insert(format!("request:headers:{}", name), value.to_str().unwrap_or("").to_string().to_lowercase());
}

extras
}

fn get_response_extras(response: &reqwest::Response) -> HashMap<String, String> {
let mut extras = HashMap::new();

extras.insert("response:status".to_string(), response.status().to_string());

for (name, value) in response.headers().iter() {
extras.insert(format!("response:headers:{}", name), value.to_str().unwrap_or("").to_string().to_lowercase());
}

extras
}

fn get_extras(request: &reqwest::Request, response: Option<&reqwest::Response>) -> HashMap<String, String> {
let mut extras = get_request_extras(request);

if let Some(resp) = response {
extras.extend(get_response_extras(resp));
}

extras
}
Loading