use tracing for logs (#451)

Author: robjtede

actix-codec/CHANGES.md

@@ -1,8 +1,11 @@
 # Changes
 
 ## Unreleased - 2022-xx-xx
+- Logs emitted now use the `tracing` crate with `log` compatibility. [#451]
 - Minimum supported Rust version (MSRV) is now 1.49.
 
+[#451]: https://github.com/actix/actix-net/pull/451
+
 
 ## 0.5.0 - 2022-02-15
 - Updated `tokio-util` dependency to `0.7.0`. [#446]

actix-codec/Cargo.toml

@@ -21,11 +21,11 @@ bitflags = "1.2"
 bytes = "1"
 futures-core = { version = "0.3.7", default-features = false }
 futures-sink = { version = "0.3.7", default-features = false }
-log = "0.4"
 memchr = "2.3"
 pin-project-lite = "0.2"
 tokio = "1.13.1"
 tokio-util = { version = "0.7", features = ["codec", "io"] }
+tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
 [dev-dependencies]
 criterion = { version = "0.3", features = ["html_reports"] }

actix-codec/src/framed.rs

@@ -197,11 +197,11 @@ impl<T, U> Framed<T, U> {
                     }
                 }
 
-                log::trace!("attempting to decode a frame");
+                tracing::trace!("attempting to decode a frame");
 
                 match this.codec.decode(this.read_buf) {
                     Ok(Some(frame)) => {
-                        log::trace!("frame decoded from buffer");
+                        tracing::trace!("frame decoded from buffer");
                         return Poll::Ready(Some(Ok(frame)));
                     }
                     Err(err) => return Poll::Ready(Some(Err(err))),
@@ -242,10 +242,10 @@ impl<T, U> Framed<T, U> {
         U: Encoder<I>,
     {
         let mut this = self.as_mut().project();
-        log::trace!("flushing framed transport");
+        tracing::trace!("flushing framed transport");
 
         while !this.write_buf.is_empty() {
-            log::trace!("writing; remaining={}", this.write_buf.len());
+            tracing::trace!("writing; remaining={}", this.write_buf.len());
 
             let n = ready!(this.io.as_mut().poll_write(cx, this.write_buf))?;
 
@@ -264,7 +264,7 @@ impl<T, U> Framed<T, U> {
         // Try flushing the underlying IO
         ready!(this.io.poll_flush(cx))?;
 
-        log::trace!("framed transport flushed");
+        tracing::trace!("framed transport flushed");
         Poll::Ready(Ok(()))
     }
 

actix-tls/CHANGES.md

@@ -1,6 +1,9 @@
 # Changes
 
 ## Unreleased - 2022-xx-xx
+- Logs emitted now use the `tracing` crate with `log` compatibility. [#451]
+
+[#451]: https://github.com/actix/actix-net/pull/451
 
 
 ## 3.0.3 - 2022-02-15

actix-tls/Cargo.toml

@@ -48,9 +48,9 @@ actix-service = "2.0.0"
 actix-utils = "3.0.0"
 
 futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
-log = "0.4"
 pin-project-lite = "0.2.7"
 tokio-util = "0.7"
+tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
 # uri
 http = { version = "0.2.3", optional = true }

actix-tls/examples/accept-rustls.rs

@@ -34,9 +34,9 @@ use actix_server::Server;
 use actix_service::ServiceFactoryExt as _;
 use actix_tls::accept::rustls::{Acceptor as RustlsAcceptor, TlsStream};
 use futures_util::future::ok;
-use log::info;
 use rustls::{server::ServerConfig, Certificate, PrivateKey};
 use rustls_pemfile::{certs, rsa_private_keys};
+use tracing::info;
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {

actix-tls/src/connect/native_tls.rs

@@ -8,11 +8,11 @@ use actix_rt::net::ActixStream;
 use actix_service::{Service, ServiceFactory};
 use actix_utils::future::{ok, Ready};
 use futures_core::future::LocalBoxFuture;
-use log::trace;
 use tokio_native_tls::{
     native_tls::TlsConnector as NativeTlsConnector, TlsConnector as AsyncNativeTlsConnector,
     TlsStream as AsyncTlsStream,
 };
+use tracing::trace;
 
 use crate::connect::{Connection, Host};
 

actix-tls/src/connect/openssl.rs

@@ -13,9 +13,9 @@ use actix_rt::net::ActixStream;
 use actix_service::{Service, ServiceFactory};
 use actix_utils::future::{ok, Ready};
 use futures_core::ready;
-use log::trace;
 use openssl::ssl::SslConnector;
 use tokio_openssl::SslStream as AsyncSslStream;
+use tracing::trace;
 
 use crate::connect::{Connection, Host};
 

actix-tls/src/connect/resolver.rs

@@ -12,7 +12,7 @@ use actix_rt::task::{spawn_blocking, JoinHandle};
 use actix_service::{Service, ServiceFactory};
 use actix_utils::future::{ok, Ready};
 use futures_core::{future::LocalBoxFuture, ready};
-use log::trace;
+use tracing::trace;
 
 use super::{ConnectError, ConnectInfo, Host, Resolve};
 

actix-tls/src/connect/rustls.rs

@@ -15,10 +15,10 @@ use actix_rt::net::ActixStream;
 use actix_service::{Service, ServiceFactory};
 use actix_utils::future::{ok, Ready};
 use futures_core::ready;
-use log::trace;
 use tokio_rustls::rustls::{client::ServerName, OwnedTrustAnchor, RootCertStore};
 use tokio_rustls::{client::TlsStream as AsyncTlsStream, rustls::ClientConfig};
 use tokio_rustls::{Connect as RustlsConnect, TlsConnector as RustlsTlsConnector};
+use tracing::trace;
 use webpki_roots::TLS_SERVER_ROOTS;
 
 use crate::connect::{Connection, Host};