Replace LogRequest layer with TraceLayer

Keeping this simple for now by default, but it's fully customizable.
kube-rs · Jun 1, 2021 · 79f4844 · 79f4844
1 parent 88a2a0c
commit 79f4844
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 52 deletions.
diff --git a/examples/pod_api.rs b/examples/pod_api.rs
@@ -10,7 +10,7 @@ use kube::{
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    std::env::set_var("RUST_LOG", "info,kube=debug");
+    std::env::set_var("RUST_LOG", "info,kube=debug,tower_http=debug");
     env_logger::init();
     let client = Client::try_default().await?;
     let namespace = std::env::var("NAMESPACE").unwrap_or("default".into());

diff --git a/kube/Cargo.toml b/kube/Cargo.toml
@@ -65,7 +65,7 @@ hyper-tls = { version = "0.5.0", optional = true }
 hyper-rustls = { version = "0.22.1", optional = true }
 tokio-tungstenite = { version = "0.14.0", optional = true }
 tower = { version = "0.4.6", optional = true, features = ["buffer", "util"] }
-tower-http = { version = "0.1.0", optional = true, features = ["map-response-body"] }
+tower-http = { version = "0.1.0", optional = true, features = ["map-response-body", "trace"] }
 hyper-timeout = {version = "0.4.1", optional = true }
 tame-oauth = { version = "0.4.7", features = ["gcp"], optional = true }
 pin-project = { version = "1.0.4", optional = true }

diff --git a/kube/src/client/mod.rs b/kube/src/client/mod.rs
@@ -27,12 +27,17 @@ use tokio_util::{
     io::StreamReader,
 };
 use tower::{buffer::Buffer, util::BoxService, BoxError, Layer, Service, ServiceBuilder, ServiceExt};
-use tower_http::map_response_body::MapResponseBodyLayer;
+use tower_http::{
+    map_response_body::MapResponseBodyLayer,
+    trace::{DefaultOnRequest, DefaultOnResponse, TraceLayer},
+    LatencyUnit,
+};
+use tracing::Level;
 
 use crate::{
     api::WatchEvent,
     error::{ConfigError, ErrorResponse},
-    service::{set_default_headers, AuthLayer, Authentication, LogRequest, SetBaseUriLayer},
+    service::{set_default_headers, AuthLayer, Authentication, SetBaseUriLayer},
     Config, Error, Result,
 };
 
@@ -464,7 +469,15 @@ impl TryFrom<Config> for Client {
         let inner = ServiceBuilder::new()
             .layer(common)
             .option_layer(maybe_auth)
-            .layer(tower::layer::layer_fn(LogRequest::new))
+            .layer(
+                TraceLayer::new_for_http()
+                    .on_request(DefaultOnRequest::new().level(Level::DEBUG))
+                    .on_response(
+                        DefaultOnResponse::new()
+                            .level(Level::DEBUG)
+                            .latency_unit(LatencyUnit::Millis),
+                    ),
+            )
             .service(client);
         Ok(Self::new_with_default_ns(inner, default_ns))
     }

diff --git a/kube/src/service/log.rs b/kube/src/service/log.rs
diff --git a/kube/src/service/mod.rs b/kube/src/service/mod.rs
@@ -3,11 +3,9 @@
 mod auth;
 mod base_uri;
 mod headers;
-mod log;
 
 pub(crate) use self::{
     auth::{AuthLayer, Authentication},
     headers::set_default_headers,
-    log::LogRequest,
 };
 pub use base_uri::{SetBaseUri, SetBaseUriLayer};