Switch from log facade to tracing

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 * Update `async-tungstenite` from `0.16` to `0.17`
 * Update `ws_stream_tungstenite` from `0.7` to `0.8`
+* Switching from `log` facade to `tracing`.
 
 ## [0.17.0] - 2022-04-15
 

Cargo.toml

@@ -27,7 +27,6 @@ bytes = "1.0"
 dashmap = "5.1"
 futures = { version = "0.3", default-features = false, features = ["std", "async-await"] }
 httparse = "1.3.5"
-log = "0.4"
 lsp-types = "0.93"
 memchr = "2.4.1"
 serde = { version = "1.0", features = ["derive"] }
@@ -36,10 +35,11 @@ tokio = { version = "1.17", optional = true }
 tokio-util = { version = "0.7", optional = true, features = ["codec"] }
 tower-lsp-macros = { version = "0.6", path = "./tower-lsp-macros" }
 tower = { version = "0.4.12", default-features = false, features = ["util"] }
+tracing = "0.1.34"
 
 [dev-dependencies]
 async-tungstenite = { version = "0.17", features = ["tokio-runtime"] }
-env_logger = "0.9"
+tracing-subscriber = "0.3.11"
 tokio = { version = "1.17", features = ["io-util", "io-std", "macros", "rt-multi-thread"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 ws_stream_tungstenite = { version = "0.8", features = ["tokio_io"] }

examples/custom_notification.rs

@@ -78,7 +78,7 @@ async fn main() {
     #[cfg(feature = "runtime-agnostic")]
     use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
 
-    env_logger::init();
+    tracing_subscriber::fmt().init();
 
     let (stdin, stdout) = (tokio::io::stdin(), tokio::io::stdout());
     #[cfg(feature = "runtime-agnostic")]

examples/stdio.rs

@@ -120,7 +120,7 @@ async fn main() {
     #[cfg(feature = "runtime-agnostic")]
     use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
 
-    env_logger::init();
+    tracing_subscriber::fmt().init();
 
     let (stdin, stdout) = (tokio::io::stdin(), tokio::io::stdout());
     #[cfg(feature = "runtime-agnostic")]

examples/tcp.rs

@@ -121,7 +121,7 @@ async fn main() {
     #[cfg(feature = "runtime-agnostic")]
     use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
 
-    env_logger::init();
+    tracing_subscriber::fmt().init();
 
     let mut args = std::env::args();
     let stream = match args.nth(1).as_deref() {

examples/websocket.rs

@@ -4,6 +4,7 @@ use tokio::net::TcpListener;
 use tower_lsp::jsonrpc::Result;
 use tower_lsp::lsp_types::*;
 use tower_lsp::{Client, LanguageServer, LspService, Server};
+use tracing::info;
 use ws_stream_tungstenite::*;
 
 #[derive(Debug)]
@@ -121,9 +122,10 @@ async fn main() {
     #[cfg(feature = "runtime-agnostic")]
     use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
 
-    env_logger::init();
+    tracing_subscriber::fmt().init();
 
     let listener = TcpListener::bind("127.0.0.1:9257").await.unwrap();
+    info!("Listening on {}", listener.local_addr().unwrap());
     let (stream, _) = listener.accept().await.unwrap();
     let (read, write) = tokio::io::split(WsStream::new(accept_async(stream).await.unwrap()));
     #[cfg(feature = "runtime-agnostic")]

src/codec.rs

@@ -9,9 +9,9 @@ use std::str::Utf8Error;
 
 use bytes::buf::BufMut;
 use bytes::{Buf, BytesMut};
-use log::{trace, warn};
 use memchr::memmem;
 use serde::{de::DeserializeOwned, Serialize};
+use tracing::{trace, warn};
 
 #[cfg(feature = "runtime-agnostic")]
 use async_codec_lite::{Decoder, Encoder};

src/lib.rs

@@ -84,14 +84,14 @@ pub use self::service::{Client, ClientSocket, ExitedError, LspService, LspServic
 pub use self::transport::{Loopback, Server};
 
 use auto_impl::auto_impl;
-use log::{error, warn};
 use lsp_types::request::{
     GotoDeclarationParams, GotoDeclarationResponse, GotoImplementationParams,
     GotoImplementationResponse, GotoTypeDefinitionParams, GotoTypeDefinitionResponse,
 };
 use lsp_types::*;
 use serde_json::Value;
 use tower_lsp_macros::rpc;
+use tracing::{error, warn};
 
 use self::jsonrpc::{Error, Result};
 

src/service/client.rs

@@ -10,13 +10,13 @@ use std::task::{Context, Poll};
 use futures::channel::mpsc::{self, Sender};
 use futures::future::BoxFuture;
 use futures::sink::SinkExt;
-use log::{error, trace};
 use lsp_types::notification::*;
 use lsp_types::request::*;
 use lsp_types::*;
 use serde::Serialize;
 use serde_json::Value;
 use tower::Service;
+use tracing::{error, trace};
 
 use self::pending::Pending;
 use super::state::{ServerState, State};

src/service/client/pending.rs

@@ -5,7 +5,7 @@ use std::future::Future;
 
 use dashmap::{mapref::entry::Entry, DashMap};
 use futures::channel::oneshot;
-use log::warn;
+use tracing::warn;
 
 use crate::jsonrpc::{Id, Response};
 

src/service/layers.rs

@@ -5,8 +5,8 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 
 use futures::future::{self, BoxFuture, FutureExt};
-use log::{info, warn};
 use tower::{Layer, Service};
+use tracing::{info, warn};
 
 use super::ExitedError;
 use crate::jsonrpc::{not_initialized_error, Error, Id, Request, Response};

src/service/pending.rs

@@ -6,7 +6,7 @@ use std::sync::Arc;
 
 use dashmap::{mapref::entry::Entry, DashMap};
 use futures::future::{self, Either};
-use log::{info, warn};
+use tracing::{info, warn};
 
 use super::ExitedError;
 use crate::jsonrpc::{Error, Id, Response};

src/transport.rs

@@ -12,8 +12,8 @@ use tokio_util::codec::{FramedRead, FramedWrite};
 
 use futures::channel::mpsc;
 use futures::{future, join, stream, FutureExt, Sink, SinkExt, Stream, StreamExt, TryFutureExt};
-use log::error;
 use tower::Service;
+use tracing::error;
 
 use crate::codec::{LanguageServerCodec, ParseError};
 use crate::jsonrpc::{Error, Id, Message, Request, Response};

tower-lsp-macros/src/lib.rs

@@ -146,7 +146,7 @@ fn gen_server_router(trait_name: &syn::Ident, methods: &[MethodCall]) -> proc_ma
             use std::sync::Arc;
             use std::future::{Future, Ready};
 
-            use log::info;
+            use tracing::info;
             use lsp_types::*;
             use lsp_types::notification::*;
             use lsp_types::request::*;