Skip to content

Commit d3b9f1e

Browse files
davidbarskydavidbarsky
authored
feat(lib): switch from log to tracing (#475)
1 parent d6fa838 commit d3b9f1e

29 files changed

+179
-176
lines changed

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ tokio-util = { version = "0.3.1", features = ["codec"] }
4747
tokio = { version = "0.2", features = ["io-util"] }
4848
bytes = "0.5.2"
4949
http = "0.2"
50-
log = "0.4.1"
50+
tracing = { version = "0.1.13", default-features = false, features = ["std", "log"] }
5151
fnv = "1.0.5"
5252
slab = "0.4.0"
5353
indexmap = "1.0"

‎src/client.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,12 +1129,12 @@ where
11291129
mut io: T,
11301130
builder: Builder,
11311131
) -> Result<(SendRequest<B>, Connection<T, B>), crate::Error> {
1132-
log::debug!("binding client connection");
1132+
tracing::debug!("binding client connection");
11331133

11341134
let msg: &'static [u8] = b"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n";
11351135
io.write_all(msg).await.map_err(crate::Error::from_io)?;
11361136

1137-
log::debug!("client connection bound");
1137+
tracing::debug!("client connection bound");
11381138

11391139
// Create the codec
11401140
let mut codec = Codec::new(io);

‎src/codec/framed_read.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl<T> FramedRead<T> {
6262
fn decode_frame(&mut self, mut bytes: BytesMut) -> Result<Option<Frame>, RecvError> {
6363
use self::RecvError::*;
6464

65-
log::trace!("decoding frame from {}B", bytes.len());
65+
tracing::trace!("decoding frame from {}B", bytes.len());
6666

6767
// Parse the head
6868
let head = frame::Head::parse(&bytes);
@@ -74,7 +74,7 @@ impl<T> FramedRead<T> {
7474

7575
let kind = head.kind();
7676

77-
log::trace!(" -> kind={:?}", kind);
77+
tracing::trace!(" -> kind={:?}", kind);
7878

7979
macro_rules! header_block {
8080
($frame:ident, $head:ident, $bytes:ident) => ({
@@ -124,7 +124,7 @@ impl<T> FramedRead<T> {
124124
if is_end_headers {
125125
frame.into()
126126
} else {
127-
log::trace!("loaded partial header block");
127+
tracing::trace!("loaded partial header block");
128128
// Defer returning the frame
129129
self.partial = Some(Partial {
130130
frame: Continuable::$frame(frame),
@@ -339,16 +339,16 @@ where
339339

340340
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
341341
loop {
342-
log::trace!("poll");
342+
tracing::trace!("poll");
343343
let bytes = match ready!(Pin::new(&mut self.inner).poll_next(cx)) {
344344
Some(Ok(bytes)) => bytes,
345345
Some(Err(e)) => return Poll::Ready(Some(Err(map_err(e)))),
346346
None => return Poll::Ready(None),
347347
};
348348

349-
log::trace!("poll; bytes={}B", bytes.len());
349+
tracing::trace!("poll; bytes={}B", bytes.len());
350350
if let Some(frame) = self.decode_frame(bytes)? {
351-
log::debug!("received; frame={:?}", frame);
351+
tracing::debug!("received; frame={:?}", frame);
352352
return Poll::Ready(Some(Ok(frame)));
353353
}
354354
}

‎src/codec/framed_write.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ where
106106
// Ensure that we have enough capacity to accept the write.
107107
assert!(self.has_capacity());
108108

109-
log::debug!("send; frame={:?}", item);
109+
tracing::debug!("send; frame={:?}", item);
110110

111111
match item {
112112
Frame::Data(mut v) => {
@@ -150,31 +150,31 @@ where
150150
}
151151
Frame::Settings(v) => {
152152
v.encode(self.buf.get_mut());
153-
log::trace!("encoded settings; rem={:?}", self.buf.remaining());
153+
tracing::trace!("encoded settings; rem={:?}", self.buf.remaining());
154154
}
155155
Frame::GoAway(v) => {
156156
v.encode(self.buf.get_mut());
157-
log::trace!("encoded go_away; rem={:?}", self.buf.remaining());
157+
tracing::trace!("encoded go_away; rem={:?}", self.buf.remaining());
158158
}
159159
Frame::Ping(v) => {
160160
v.encode(self.buf.get_mut());
161-
log::trace!("encoded ping; rem={:?}", self.buf.remaining());
161+
tracing::trace!("encoded ping; rem={:?}", self.buf.remaining());
162162
}
163163
Frame::WindowUpdate(v) => {
164164
v.encode(self.buf.get_mut());
165-
log::trace!("encoded window_update; rem={:?}", self.buf.remaining());
165+
tracing::trace!("encoded window_update; rem={:?}", self.buf.remaining());
166166
}
167167

168168
Frame::Priority(_) => {
169169
/*
170170
v.encode(self.buf.get_mut());
171-
log::trace!("encoded priority; rem={:?}", self.buf.remaining());
171+
tracing::trace!("encoded priority; rem={:?}", self.buf.remaining());
172172
*/
173173
unimplemented!();
174174
}
175175
Frame::Reset(v) => {
176176
v.encode(self.buf.get_mut());
177-
log::trace!("encoded reset; rem={:?}", self.buf.remaining());
177+
tracing::trace!("encoded reset; rem={:?}", self.buf.remaining());
178178
}
179179
}
180180

@@ -183,18 +183,18 @@ where
183183

184184
/// Flush buffered data to the wire
185185
pub fn flush(&mut self, cx: &mut Context) -> Poll<io::Result<()>> {
186-
log::trace!("flush");
186+
tracing::trace!("flush");
187187

188188
loop {
189189
while !self.is_empty() {
190190
match self.next {
191191
Some(Next::Data(ref mut frame)) => {
192-
log::trace!(" -> queued data frame");
192+
tracing::trace!(" -> queued data frame");
193193
let mut buf = (&mut self.buf).chain(frame.payload_mut());
194194
ready!(Pin::new(&mut self.inner).poll_write_buf(cx, &mut buf))?;
195195
}
196196
_ => {
197-
log::trace!(" -> not a queued data frame");
197+
tracing::trace!(" -> not a queued data frame");
198198
ready!(Pin::new(&mut self.inner).poll_write_buf(cx, &mut self.buf))?;
199199
}
200200
}
@@ -234,7 +234,7 @@ where
234234
}
235235
}
236236

237-
log::trace!("flushing buffer");
237+
tracing::trace!("flushing buffer");
238238
// Flush the upstream
239239
ready!(Pin::new(&mut self.inner).poll_flush(cx))?;
240240

‎src/frame/go_away.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ impl GoAway {
5151
}
5252

5353
pub fn encode<B: BufMut>(&self, dst: &mut B) {
54-
log::trace!("encoding GO_AWAY; code={:?}", self.error_code);
54+
tracing::trace!("encoding GO_AWAY; code={:?}", self.error_code);
5555
let head = Head::new(Kind::GoAway, 0, StreamId::zero());
5656
head.encode(8, dst);
5757
dst.put_u32(self.last_stream_id.into());

‎src/frame/headers.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ impl Headers {
153153
let flags = HeadersFlag(head.flag());
154154
let mut pad = 0;
155155

156-
log::trace!("loading headers; flags={:?}", flags);
156+
tracing::trace!("loading headers; flags={:?}", flags);
157157

158158
// Read the padding length
159159
if flags.is_padded() {
@@ -817,10 +817,10 @@ impl HeaderBlock {
817817
macro_rules! set_pseudo {
818818
($field:ident, $val:expr) => {{
819819
if reg {
820-
log::trace!("load_hpack; header malformed -- pseudo not at head of block");
820+
tracing::trace!("load_hpack; header malformed -- pseudo not at head of block");
821821
malformed = true;
822822
} else if self.pseudo.$field.is_some() {
823-
log::trace!("load_hpack; header malformed -- repeated pseudo");
823+
tracing::trace!("load_hpack; header malformed -- repeated pseudo");
824824
malformed = true;
825825
} else {
826826
let __val = $val;
@@ -829,7 +829,7 @@ impl HeaderBlock {
829829
if headers_size < max_header_list_size {
830830
self.pseudo.$field = Some(__val);
831831
} else if !self.is_over_size {
832-
log::trace!("load_hpack; header list size over max");
832+
tracing::trace!("load_hpack; header list size over max");
833833
self.is_over_size = true;
834834
}
835835
}
@@ -856,10 +856,13 @@ impl HeaderBlock {
856856
|| name == "keep-alive"
857857
|| name == "proxy-connection"
858858
{
859-
log::trace!("load_hpack; connection level header");
859+
tracing::trace!("load_hpack; connection level header");
860860
malformed = true;
861861
} else if name == header::TE && value != "trailers" {
862-
log::trace!("load_hpack; TE header not set to trailers; val={:?}", value);
862+
tracing::trace!(
863+
"load_hpack; TE header not set to trailers; val={:?}",
864+
value
865+
);
863866
malformed = true;
864867
} else {
865868
reg = true;
@@ -868,7 +871,7 @@ impl HeaderBlock {
868871
if headers_size < max_header_list_size {
869872
self.fields.append(name, value);
870873
} else if !self.is_over_size {
871-
log::trace!("load_hpack; header list size over max");
874+
tracing::trace!("load_hpack; header list size over max");
872875
self.is_over_size = true;
873876
}
874877
}
@@ -882,12 +885,12 @@ impl HeaderBlock {
882885
});
883886

884887
if let Err(e) = res {
885-
log::trace!("hpack decoding error; err={:?}", e);
888+
tracing::trace!("hpack decoding error; err={:?}", e);
886889
return Err(e.into());
887890
}
888891

889892
if malformed {
890-
log::trace!("malformed message");
893+
tracing::trace!("malformed message");
891894
return Err(Error::MalformedMessage);
892895
}
893896

‎src/frame/ping.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ impl Ping {
8585

8686
pub fn encode<B: BufMut>(&self, dst: &mut B) {
8787
let sz = self.payload.len();
88-
log::trace!("encoding PING; ack={} len={}", self.ack, sz);
88+
tracing::trace!("encoding PING; ack={} len={}", self.ack, sz);
8989

9090
let flags = if self.ack { ACK_FLAG } else { 0 };
9191
let head = Head::new(Kind::Ping, flags, StreamId::zero());

‎src/frame/reset.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl Reset {
3838
}
3939

4040
pub fn encode<B: BufMut>(&self, dst: &mut B) {
41-
log::trace!(
41+
tracing::trace!(
4242
"encoding RESET; id={:?} code={:?}",
4343
self.stream_id,
4444
self.error_code

‎src/frame/settings.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ impl Settings {
141141

142142
// Ensure the payload length is correct, each setting is 6 bytes long.
143143
if payload.len() % 6 != 0 {
144-
log::debug!("invalid settings payload length; len={:?}", payload.len());
144+
tracing::debug!("invalid settings payload length; len={:?}", payload.len());
145145
return Err(Error::InvalidPayloadAckSettings);
146146
}
147147

@@ -199,13 +199,13 @@ impl Settings {
199199
let head = Head::new(Kind::Settings, self.flags.into(), StreamId::zero());
200200
let payload_len = self.payload_len();
201201

202-
log::trace!("encoding SETTINGS; len={}", payload_len);
202+
tracing::trace!("encoding SETTINGS; len={}", payload_len);
203203

204204
head.encode(payload_len, dst);
205205

206206
// Encode the settings
207207
self.for_each(|setting| {
208-
log::trace!("encoding setting; val={:?}", setting);
208+
tracing::trace!("encoding setting; val={:?}", setting);
209209
setting.encode(dst)
210210
});
211211
}

‎src/frame/window_update.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl WindowUpdate {
4848
}
4949

5050
pub fn encode<B: BufMut>(&self, dst: &mut B) {
51-
log::trace!("encoding WINDOW_UPDATE; id={:?}", self.stream_id);
51+
tracing::trace!("encoding WINDOW_UPDATE; id={:?}", self.stream_id);
5252
let head = Head::new(Kind::WindowUpdate, 0, self.stream_id);
5353
head.encode(4, dst);
5454
dst.put_u32(self.size_increment);

‎src/hpack/decoder.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,22 +183,22 @@ impl Decoder {
183183
self.last_max_update = size;
184184
}
185185

186-
log::trace!("decode");
186+
tracing::trace!("decode");
187187

188188
while let Some(ty) = peek_u8(src) {
189189
// At this point we are always at the beginning of the next block
190190
// within the HPACK data. The type of the block can always be
191191
// determined from the first byte.
192192
match Representation::load(ty)? {
193193
Indexed => {
194-
log::trace!(" Indexed; rem={:?}", src.remaining());
194+
tracing::trace!(" Indexed; rem={:?}", src.remaining());
195195
can_resize = false;
196196
let entry = self.decode_indexed(src)?;
197197
consume(src);
198198
f(entry);
199199
}
200200
LiteralWithIndexing => {
201-
log::trace!(" LiteralWithIndexing; rem={:?}", src.remaining());
201+
tracing::trace!(" LiteralWithIndexing; rem={:?}", src.remaining());
202202
can_resize = false;
203203
let entry = self.decode_literal(src, true)?;
204204

@@ -209,14 +209,14 @@ impl Decoder {
209209
f(entry);
210210
}
211211
LiteralWithoutIndexing => {
212-
log::trace!(" LiteralWithoutIndexing; rem={:?}", src.remaining());
212+
tracing::trace!(" LiteralWithoutIndexing; rem={:?}", src.remaining());
213213
can_resize = false;
214214
let entry = self.decode_literal(src, false)?;
215215
consume(src);
216216
f(entry);
217217
}
218218
LiteralNeverIndexed => {
219-
log::trace!(" LiteralNeverIndexed; rem={:?}", src.remaining());
219+
tracing::trace!(" LiteralNeverIndexed; rem={:?}", src.remaining());
220220
can_resize = false;
221221
let entry = self.decode_literal(src, false)?;
222222
consume(src);
@@ -226,7 +226,7 @@ impl Decoder {
226226
f(entry);
227227
}
228228
SizeUpdate => {
229-
log::trace!(" SizeUpdate; rem={:?}", src.remaining());
229+
tracing::trace!(" SizeUpdate; rem={:?}", src.remaining());
230230
if !can_resize {
231231
return Err(DecoderError::InvalidMaxDynamicSize);
232232
}
@@ -248,7 +248,7 @@ impl Decoder {
248248
return Err(DecoderError::InvalidMaxDynamicSize);
249249
}
250250

251-
log::debug!(
251+
tracing::debug!(
252252
"Decoder changed max table size from {} to {}",
253253
self.table.size(),
254254
new_size
@@ -302,7 +302,7 @@ impl Decoder {
302302
let len = decode_int(buf, 7)?;
303303

304304
if len > buf.remaining() {
305-
log::trace!(
305+
tracing::trace!(
306306
"decode_string underflow; len={}; remaining={}",
307307
len,
308308
buf.remaining()

‎src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@
8484

8585
macro_rules! proto_err {
8686
(conn: $($msg:tt)+) => {
87-
log::debug!("connection error PROTOCOL_ERROR -- {};", format_args!($($msg)+))
87+
tracing::debug!("connection error PROTOCOL_ERROR -- {};", format_args!($($msg)+))
8888
};
8989
(stream: $($msg:tt)+) => {
90-
log::debug!("stream error PROTOCOL_ERROR -- {};", format_args!($($msg)+))
90+
tracing::debug!("stream error PROTOCOL_ERROR -- {};", format_args!($($msg)+))
9191
};
9292
}
9393

0 commit comments

Comments
 (0)