checkpoint

blt · blt · commit 013011956066 · 2024-12-27T13:11:59.000-08:00
Signed-off-by: Brian L. Troutwine &lt;brian.troutwine@datadoghq.com&gt;
diff --git a/lading/src/blackhole/http.rs b/lading/src/blackhole/http.rs
@@ -156,7 +156,7 @@ async fn srv(
             let mut okay = Response::default();
             *okay.status_mut() = status;
             *okay.headers_mut() = headers;
-            *okay.body_mut() = crate::full(body);
+            *okay.body_mut() = crate::full(body_bytes);
             Ok(okay)
         }
     }
diff --git a/lading/src/generator/http.rs b/lading/src/generator/http.rs
@@ -14,11 +14,8 @@
 use std::{num::NonZeroU32, thread};
 
 use byte_unit::ByteError;
-use hyper::{
-    client::{Client, HttpConnector},
-    header::CONTENT_LENGTH,
-    Body, HeaderMap, Request, Uri,
-};
+use hyper::{header::CONTENT_LENGTH, HeaderMap, Request, Uri};
+use hyper_util::{client::legacy::Client, rt::TokioExecutor};
 use lading_throttle::Throttle;
 use metrics::{counter, gauge};
 use once_cell::sync::OnceCell;
@@ -193,7 +190,7 @@ impl Http {
     /// Function will panic if it is unable to create HTTP requests for the
     /// target.
     pub async fn spin(mut self) -> Result<(), Error> {
-        let client: Client<HttpConnector, Body> = Client::builder()
+        let client = Client::builder(TokioExecutor::new())
             .pool_max_idle_per_host(self.parallel_connections as usize)
             .retry_canceled_requests(false)
             .build_http();
@@ -214,10 +211,10 @@ impl Http {
             let blk = rcv.next().await.expect("block cache should never be empty");
             let total_bytes = blk.total_bytes;
 
-            let body = Body::from(blk.bytes.clone());
+            let body = crate::full(blk.bytes.clone());
             let block_length = blk.bytes.len();
 
-            let mut request: Request<Body> = Request::builder()
+            let mut request = Request::builder()
                 .method(method.clone())
                 .uri(&uri)
                 .header(CONTENT_LENGTH, block_length)

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ async fn srv(`
`156`	`156`	`let mut okay = Response::default();`
`157`	`157`	`*okay.status_mut() = status;`
`158`	`158`	`*okay.headers_mut() = headers;`
`159`		`- *okay.body_mut() = crate::full(body);`
	`159`	`+ *okay.body_mut() = crate::full(body_bytes);`
`160`	`160`	`Ok(okay)`
`161`	`161`	`}`
`162`	`162`	`}`