[APMSP-1765] Extract retry logic from SendData

data-pipeline/src/agent_info/fetcher.rs

@@ -36,7 +36,7 @@ pub async fn fetch_info_with_state(
     current_state_hash: Option<&str>,
 ) -> Result<FetchInfoStatus> {
     let req = info_endpoint
-        .into_request_builder(concat!("Libdatadog/", env!("CARGO_PKG_VERSION")))?
+        .to_request_builder(concat!("Libdatadog/", env!("CARGO_PKG_VERSION")))?
         .method(hyper::Method::GET)
         .body(hyper::Body::empty());
     let client = hyper::Client::builder().build(Connector::default());

data-pipeline/src/stats_exporter.rs

@@ -86,7 +86,7 @@ impl StatsExporter {
 
         let mut req_builder = self
             .endpoint
-            .into_request_builder(concat!("Libdatadog/", env!("CARGO_PKG_VERSION")))?
+            .to_request_builder(concat!("Libdatadog/", env!("CARGO_PKG_VERSION")))?
             .header(
                 hyper::header::CONTENT_TYPE,
                 ddcommon::header::APPLICATION_MSGPACK,

ddcommon/src/lib.rs

@@ -159,7 +159,7 @@ impl Endpoint {
     /// - User agent
     /// - Api key
     /// - Container Id/Entity Id
-    pub fn into_request_builder(&self, user_agent: &str) -> anyhow::Result<HttpRequestBuilder> {
+    pub fn to_request_builder(&self, user_agent: &str) -> anyhow::Result<HttpRequestBuilder> {
         let mut builder = hyper::Request::builder()
             .uri(self.url.clone())
             .header(hyper::header::USER_AGENT, user_agent);

ddtelemetry/src/worker/http_client.rs

@@ -33,7 +33,7 @@ pub trait HttpClient {
 
 pub fn request_builder(c: &Config) -> anyhow::Result<HttpRequestBuilder> {
     match &c.endpoint {
-        Some(e) => e.into_request_builder(concat!("telemetry/", env!("CARGO_PKG_VERSION"))),
+        Some(e) => e.to_request_builder(concat!("telemetry/", env!("CARGO_PKG_VERSION"))),
         None => Err(anyhow::Error::msg(
             "no valid endpoint found, can't build the request".to_string(),
         )),

live-debugger/src/sender.rs

@@ -150,7 +150,7 @@ impl PayloadSender {
         url = Uri::from_parts(parts)?;
 
         let mut req = endpoint
-            .into_request_builder(concat!("Tracer/", env!("CARGO_PKG_VERSION")))?
+            .to_request_builder(concat!("Tracer/", env!("CARGO_PKG_VERSION")))?
             .method(Method::POST)
             .uri(url);
 

profiling/src/exporter/mod.rs

@@ -273,7 +273,7 @@ impl ProfileExporter {
 
         let builder = self
             .endpoint
-            .into_request_builder(concat!("DDProf/", env!("CARGO_PKG_VERSION")))?
+            .to_request_builder(concat!("DDProf/", env!("CARGO_PKG_VERSION")))?
             .method(http::Method::POST)
             .header("Connection", "close")
             .header("DD-EVP-ORIGIN", self.profiling_library_name.as_ref())

remote-config/src/fetch/fetcher.rs

@@ -304,7 +304,7 @@ impl<S: FileStorage> ConfigFetcher<S> {
         let req = self
             .state
             .endpoint
-            .into_request_builder(concat!("Sidecar/", env!("CARGO_PKG_VERSION")))?
+            .to_request_builder(concat!("Sidecar/", env!("CARGO_PKG_VERSION")))?
             .method(http::Method::POST)
             .header(
                 http::header::CONTENT_TYPE,

trace-utils/src/lib.rs

@@ -4,6 +4,7 @@
 pub mod config_utils;
 pub mod msgpack_decoder;
 pub mod send_data;
+pub mod send_with_retry;
 pub mod stats_utils;
 #[cfg(any(test, feature = "test-utils"))]
 pub mod test_utils;