throttler error cleanup

Author: TheSafo

lading/src/generator/file_gen/logrotate.rs

@@ -382,7 +382,7 @@ impl Child {
                                     &self.labels).await?;
                         }
                         Err(err) => {
-                            error!("Throttle request of {} is larger than throttle capacity. Block will be discarded. Error: {}", total_bytes, err);
+                            error!("Discarding block due to throttle error: {err}");
                         }
                     }
                 }

lading/src/generator/file_gen/traditional.rs

@@ -351,7 +351,7 @@ impl Child {
                             }
                         }
                         Err(err) => {
-                            error!("Throttle request of {total_bytes} is larger than throttle capacity. Block will be discarded. Error: {err}");
+                            error!("Discarding block due to throttle error: {err}");
                         }
                     }
                 }

lading/src/generator/http.rs

@@ -285,7 +285,7 @@ impl Http {
 
                         }
                         Err(err) => {
-                            error!("Throttle request of {total_bytes} is larger than throttle capacity. Block will be discarded. Error: {err}");
+                            error!("Discarding block due to throttle error: {err}");
                         }
                     }
                 },

lading/src/generator/splunk_hec.rs

@@ -319,7 +319,7 @@ impl SplunkHec {
                             tokio::spawn(send_hec_request(permit, block_length, labels, channel, client, request, request_shutdown.clone(), uri_clone));
                         }
                         Err(err) => {
-                            error!("Throttle request of {total_bytes} is larger than throttle capacity. Block will be discarded. Error: {err}");
+                            error!("Discarding block due to throttle error: {err}");
                         }
                     }
                 }

lading/src/generator/tcp.rs

@@ -272,7 +272,7 @@ impl TcpWorker {
                             }
                         }
                         Err(err) => {
-                            error!("Throttle request of {total_bytes} is larger than throttle capacity. Block will be discarded. Error: {err}");
+                            error!("Discarding block due to throttle error: {err}");
                         }
                     }
                 }

lading/src/generator/trace_agent.rs

@@ -378,7 +378,7 @@ impl TraceAgent {
                             });
                         }
                         Err(err) => {
-                            error!("Throttle request of {total_bytes} is larger than throttle capacity. Block will be discarded. Error: {err}", total_bytes = total_bytes);
+                            error!("Discarding block due to throttle error: {err}");
                         }
                     }
                 },

lading/src/generator/udp.rs

@@ -275,7 +275,7 @@ impl UdpWorker {
                             }
                         }
                         Err(err) => {
-                            error!("Throttle request of {total_bytes} is larger than throttle capacity. Block will be discarded. Error: {err}");
+                            error!("Discarding block due to throttle error: {err}");
                         }
                     }
                 }

lading/src/generator/unix_datagram.rs

@@ -298,7 +298,7 @@ impl Child {
                             }
                         }
                         Err(err) => {
-                            error!("Throttle request of {total_bytes} is larger than throttle capacity. Block will be discarded. Error: {err}");
+                            error!("Discarding block due to throttle error: {err}");
                         }
                     }
                 }

lading/src/generator/unix_stream.rs

@@ -321,7 +321,7 @@ impl Child {
                             }
                         }
                         Err(err) => {
-                            error!("Throttle request of {total_bytes} is larger than throttle capacity. Block will be discarded. Error: {err}");
+                            error!("Discarding block due to throttle error: {err}");
                         }
                     }
                 }

lading_throttle/src/linear.rs

@@ -12,8 +12,13 @@ use super::{Clock, RealClock};
 #[derive(thiserror::Error, Debug, Clone, Copy)]
 pub enum Error {
     /// Requested capacity is greater than maximum allowed capacity.
-    #[error("Capacity")]
-    Capacity,
+    #[error("capacity request {requested} exceeds maximum {maximum}")]
+    Capacity {
+        /// The requested capacity that exceeded the maximum.
+        requested: u32,
+        /// The maximum capacity permitted by the throttle.
+        maximum: u32,
+    },
 }
 
 #[derive(Debug)]
@@ -133,7 +138,10 @@ impl Valve {
         // ticker if the caller makes a zero request. It's strange but it's a
         // valid thing to do.
         if capacity_request > self.maximum_capacity {
-            return Err(Error::Capacity);
+            return Err(Error::Capacity {
+                requested: capacity_request,
+                maximum: self.maximum_capacity,
+            });
         }
 
         let current_interval = ticks_elapsed / INTERVAL_TICKS;