enable log by default to not break existing users

Signed-off-by: Eliza Weisman <eliza@buoyant.io>

Cargo.toml

@@ -24,9 +24,11 @@ exclude       = [
 publish = false
 
 [features]
+default = ["log"]
+log = ["tracing/log"]
 
 [dependencies]
-log = "0.4.6"
+tracing = "0.1.6"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.58"
@@ -42,6 +44,7 @@ lazy_static = "1.3.0"
 # for testing we'll use the git version.
 bytes      = { version = "0.5.0", git = "https://github.com/tokio-rs/bytes", rev = "79e4b2847f27137faaf149d116a352cbeae47fd1" }
 env_logger = { version = "0.6.1", default-features = false }
+tracing    = { version = "0.1.6", features = ["log"] }
 slab       = "0.4.2"
 tempdir    = "0.3.7"
 net2       = "0.2.33"

src/poll.rs

@@ -5,7 +5,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::time::Duration;
 use std::{fmt, io};
 
-use log::trace;
+use tracing::trace;
 
 use crate::{event, sys, Events, Interests, Token};
 
@@ -492,9 +492,9 @@ impl Registry {
         S: event::Source + ?Sized,
     {
         trace!(
-            "registering event source with poller: token={:?}, interests={:?}",
-            token,
-            interests
+            message = "registering event source with poller",
+            ?token,
+            ?interests
         );
         source.register(self, token, interests)
     }
@@ -558,9 +558,9 @@ impl Registry {
         S: event::Source + ?Sized,
     {
         trace!(
-            "reregistering event source with poller: token={:?}, interests={:?}",
-            token,
-            interests
+            message = "reregistering event source with poller",
+            ?token,
+            ?interests
         );
         source.reregister(self, token, interests)
     }

src/sys/unix/epoll.rs

@@ -5,7 +5,7 @@ use std::time::Duration;
 use std::{cmp, i32, io, ptr};
 
 use libc::{EPOLLET, EPOLLIN, EPOLLOUT};
-use log::error;
+use tracing::error;
 
 use crate::sys::Events;
 use crate::{Interests, Token};
@@ -111,8 +111,8 @@ impl AsRawFd for Selector {
 
 impl Drop for Selector {
     fn drop(&mut self) {
-        if let Err(err) = syscall!(close(self.ep)) {
-            error!("error closing epoll: {}", err);
+        if let Err(error) = syscall!(close(self.ep)) {
+            error!(message = "error closing epoll", %error);
         }
     }
 }

src/sys/unix/kqueue.rs

@@ -5,7 +5,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::time::Duration;
 use std::{cmp, io, ptr, slice};
 
-use log::error;
+use tracing::error;
 
 use crate::sys::Events;
 use crate::{Interests, Token};
@@ -309,8 +309,8 @@ impl AsRawFd for Selector {
 
 impl Drop for Selector {
     fn drop(&mut self) {
-        if let Err(err) = syscall!(close(self.kq)) {
-            error!("error closing kqueue: {}", err);
+        if let Err(error) = syscall!(close(self.kq)) {
+            error!(message = "error closing kqueue", %error);
         }
     }
 }

tests/close_on_drop.rs

@@ -1,5 +1,5 @@
 use bytes::BytesMut;
-use log::debug;
+use tracing::debug;
 
 use mio::net::{TcpListener, TcpStream};
 use mio::{Events, Interests, Poll, Token};

tests/registering.rs

@@ -2,7 +2,7 @@ use std::io::{self, Write};
 use std::thread::sleep;
 use std::time::Duration;
 
-use log::{debug, info, trace};
+use tracing::{debug, info, trace};
 
 #[cfg(debug_assertions)]
 use mio::net::UdpSocket;

tests/tcp.rs

@@ -7,10 +7,10 @@ use std::time::Duration;
 use std::{net, thread};
 
 use bytes::{Buf, Bytes, BytesMut};
-use log::{debug, info};
 #[cfg(unix)]
 use net2::TcpStreamExt;
 use slab::Slab;
+use tracing::{debug, info};
 
 use mio::net::{TcpListener, TcpStream};
 use mio::{Events, Interests, Poll, Registry, Token};

tests/udp_socket.rs

@@ -4,7 +4,7 @@ use std::str;
 use std::time;
 
 use bytes::{Buf, BufMut, Bytes, BytesMut};
-use log::{debug, info};
+use tracing::{debug, info};
 
 use mio::net::UdpSocket;
 use mio::{Events, Interests, Poll, Registry, Token};