Skip to content

Commit 0b3352a

Browse files
azdletikue
andauthored
Move INFO level traces to DEBUG (#537)
INFO level traces/logs are usually reserved for the application. All of the existing INFO level traces were changed, except for those in examples. resolves #536 Co-authored-by: Tim <tikue@google.com>
1 parent 6a27dc4 commit 0b3352a

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

tarpc/src/client.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ where
419419
cx: &mut Context<'_>,
420420
) -> Poll<Option<Result<DispatchRequest<Req, Resp>, ChannelError<C::Error>>>> {
421421
if self.in_flight_requests().len() >= self.config.max_in_flight_requests {
422-
tracing::info!(
422+
tracing::debug!(
423423
"At in-flight request capacity ({}/{}).",
424424
self.in_flight_requests().len(),
425425
self.config.max_in_flight_requests
@@ -437,7 +437,7 @@ where
437437
Some(request) => {
438438
if request.response_completion.is_closed() {
439439
let _entered = request.span.enter();
440-
tracing::info!("AbortRequest");
440+
tracing::debug!("AbortRequest");
441441
continue;
442442
}
443443

@@ -522,7 +522,7 @@ where
522522
.insert_request(request_id, ctx, span.clone(), response_completion)
523523
.expect("Request IDs should be unique");
524524
match self.start_send(request) {
525-
Ok(()) => tracing::info!("SendRequest"),
525+
Ok(()) => tracing::debug!("SendRequest"),
526526
Err(e) => {
527527
self.in_flight_requests()
528528
.complete_request(request_id, Err(RpcError::Send(Box::new(e))));
@@ -553,7 +553,7 @@ where
553553
};
554554
self.start_send(cancel)
555555
.map_err(|e| ChannelError::Write(Arc::new(e)))?;
556-
tracing::info!("CancelRequest");
556+
tracing::debug!("CancelRequest");
557557
Poll::Ready(Some(Ok(())))
558558
}
559559

@@ -564,7 +564,7 @@ where
564564
response.message.map_err(RpcError::Server),
565565
) {
566566
let _entered = span.enter();
567-
tracing::info!("ReceiveResponse");
567+
tracing::debug!("ReceiveResponse");
568568
return true;
569569
}
570570
false
@@ -594,7 +594,7 @@ where
594594
}) => {
595595
let _entered = span.enter();
596596
if response_completion.is_closed() {
597-
tracing::info!("AbortRequest");
597+
tracing::debug!("AbortRequest");
598598
} else {
599599
tracing::warn!("RpcError::Channel");
600600
let _ = response_completion.send(Err(RpcError::Channel(e.clone())));
@@ -612,15 +612,15 @@ where
612612
loop {
613613
match (self.as_mut().pump_read(cx)?, self.as_mut().pump_write(cx)?) {
614614
(Poll::Ready(None), _) => {
615-
tracing::info!("Shutdown: read half closed, so shutting down.");
615+
tracing::debug!("Shutdown: read half closed, so shutting down.");
616616
return Poll::Ready(Ok(()));
617617
}
618618
(read, Poll::Ready(None)) => {
619619
if self.in_flight_requests.is_empty() {
620-
tracing::info!("Shutdown: write half closed, and no requests in flight.");
620+
tracing::debug!("Shutdown: write half closed, and no requests in flight.");
621621
return Poll::Ready(Ok(()));
622622
}
623-
tracing::info!(
623+
tracing::debug!(
624624
"Shutdown: write half closed, and {} requests in flight.",
625625
self.in_flight_requests().len()
626626
);
@@ -648,7 +648,7 @@ where
648648
) -> Poll<Result<(), ChannelError<C::Error>>> {
649649
loop {
650650
if let Some(e) = self.terminal_error_mut() {
651-
tracing::info!("RpcError::Channel");
651+
tracing::debug!("RpcError::Channel");
652652
let e: ChannelError<C::Error> = e
653653
.clone()
654654
.downcast()

tarpc/src/server.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ where
220220
request.context.trace_context.new_child()
221221
});
222222
let entered = span.enter();
223-
tracing::info!("ReceiveRequest");
223+
tracing::debug!("ReceiveRequest");
224224
let start = self.in_flight_requests_mut().start_request(
225225
request.id,
226226
request.context.deadline,
@@ -450,7 +450,7 @@ where
450450
Poll::Ready(Some(request_id)) => {
451451
if let Some(span) = self.in_flight_requests_mut().remove_request(request_id) {
452452
let _entered = span.enter();
453-
tracing::info!("ResponseCancelled");
453+
tracing::debug!("ResponseCancelled");
454454
}
455455
Ready
456456
}
@@ -545,7 +545,7 @@ where
545545
.remove_request(response.request_id)
546546
{
547547
let _entered = span.enter();
548-
tracing::info!("SendResponse");
548+
tracing::debug!("SendResponse");
549549
self.project()
550550
.transport
551551
.start_send(response)
@@ -650,7 +650,7 @@ where
650650
response_guard.cancel = true;
651651
{
652652
let _entered = span.enter();
653-
tracing::info!("BeginRequest");
653+
tracing::debug!("BeginRequest");
654654
}
655655
InFlightRequest {
656656
request,
@@ -884,13 +884,13 @@ impl<Req, Res> InFlightRequest<Req, Res> {
884884
let _ = Abortable::new(
885885
async move {
886886
let message = serve.serve(context, message).await;
887-
tracing::info!("CompleteRequest");
887+
tracing::debug!("CompleteRequest");
888888
let response = Response {
889889
request_id,
890890
message,
891891
};
892892
let _ = response_tx.send(response).await;
893-
tracing::info!("BufferResponse");
893+
tracing::debug!("BufferResponse");
894894
},
895895
abort_registration,
896896
)
@@ -1097,7 +1097,7 @@ mod tests {
10971097
}
10981098
impl<Resp> AfterRequest<Resp> for PrintLatency {
10991099
async fn after(&mut self, _: &mut context::Context, _: &mut Result<Resp, ServerError>) {
1100-
tracing::info!("Elapsed: {:?}", self.start.elapsed());
1100+
tracing::debug!("Elapsed: {:?}", self.start.elapsed());
11011101
}
11021102
}
11031103

tarpc/src/server/in_flight_requests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ impl InFlightRequests {
7474
self.request_data.compact(0.1);
7575
abort_handle.abort();
7676
self.deadlines.remove(&deadline_key);
77-
tracing::info!("ReceiveCancel");
77+
tracing::debug!("ReceiveCancel");
7878
true
7979
} else {
8080
false

tarpc/src/server/limits/channels_per_key.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use std::{
1616
collections::hash_map::Entry, convert::TryFrom, fmt, hash::Hash, marker::Unpin, pin::Pin,
1717
};
1818
use tokio::sync::mpsc;
19-
use tracing::{debug, info, trace};
19+
use tracing::{debug, trace};
2020

2121
/// An [`Incoming`](crate::server::incoming::Incoming) stream that drops new channels based on
2222
/// per-key limits.
@@ -198,7 +198,7 @@ where
198198
Entry::Occupied(mut o) => {
199199
let count = o.get().strong_count();
200200
if count >= usize::try_from(*self_.channels_per_key).unwrap() {
201-
info!(
201+
debug!(
202202
channel_filter_key = %key,
203203
open_channels = count,
204204
max_open_channels = *self_.channels_per_key,

tarpc/src/server/limits/requests_per_channel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ where
6060
match ready!(self.as_mut().project().inner.poll_next(cx)?) {
6161
Some(r) => {
6262
let _entered = r.span.enter();
63-
tracing::info!(
63+
tracing::debug!(
6464
in_flight_requests = self.as_mut().in_flight_requests(),
6565
"ThrottleRequest",
6666
);

0 commit comments

Comments
 (0)