Follow up to tracing (#248)

* change feature name from h3-quinn-tracing to tracing * change feature h3-tracing to tracing * change level to trace * fmt * CI file
hyperium · Jun 23, 2024 · fc59c3d · fc59c3d
1 parent edada98
commit fc59c3d
Show file tree

Hide file tree

Showing 15 changed files with 101 additions and 101 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -111,7 +111,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         toolchain: [stable, beta]
-        features: [i-implement-a-third-party-backend-and-opt-into-breaking-changes, h3-tracing, 'h3-tracing,i-implement-a-third-party-backend-and-opt-into-breaking-changes']
+        features: [i-implement-a-third-party-backend-and-opt-into-breaking-changes, tracing, 'tracing,i-implement-a-third-party-backend-and-opt-into-breaking-changes']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -10,8 +10,8 @@ edition = "2021"
 anyhow = "1.0"
 bytes = "1"
 futures = "0.3"
-h3 = { path = "../h3", features = ["h3-tracing"] }
-h3-quinn = { path = "../h3-quinn", features = ["h3-quinn-tracing"] }
+h3 = { path = "../h3", features = ["tracing"] }
+h3-quinn = { path = "../h3-quinn", features = ["tracing"] }
 h3-webtransport = { path = "../h3-webtransport" }
 http = "1"
 quinn = { version = "0.11", default-features = false, features = [

diff --git a/h3-quinn/Cargo.toml b/h3-quinn/Cargo.toml
@@ -24,4 +24,4 @@ tokio = { version = "1", features = ["io-util"], default-features = false }
 tracing = { version = "0.1.40", optional = true }
 
 [features]
-h3-quinn-tracing = ["tracing"]
+tracing = ["dep:tracing"]
diff --git a/h3-quinn/src/lib.rs b/h3-quinn/src/lib.rs
@@ -28,7 +28,7 @@ use h3::{
 };
 use tokio_util::sync::ReusableBoxFuture;
 
-#[cfg(feature = "h3-quinn-tracing")]
+#[cfg(feature = "tracing")]
 use tracing::instrument;
 
 /// A QUIC connection backed by Quinn
@@ -158,7 +158,7 @@ where
     type OpenStreams = OpenStreams;
     type AcceptError = ConnectionError;
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn poll_accept_bidi(
         &mut self,
         cx: &mut task::Context<'_>,
@@ -173,7 +173,7 @@ where
         })))
     }
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn poll_accept_recv(
         &mut self,
         cx: &mut task::Context<'_>,
@@ -202,7 +202,7 @@ where
     type BidiStream = BidiStream<B>;
     type OpenError = ConnectionError;
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn poll_open_bidi(
         &mut self,
         cx: &mut task::Context<'_>,
@@ -221,7 +221,7 @@ where
         }))
     }
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn poll_open_send(
         &mut self,
         cx: &mut task::Context<'_>,
@@ -236,7 +236,7 @@ where
         Poll::Ready(Ok(Self::SendStream::new(send)))
     }
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn close(&mut self, code: h3::error::Code, reason: &[u8]) {
         self.conn.close(
             VarInt::from_u64(code.value()).expect("error code VarInt"),
@@ -251,7 +251,7 @@ where
 {
     type Error = SendDatagramError;
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn send_datagram(&mut self, data: Datagram<B>) -> Result<(), SendDatagramError> {
         // TODO investigate static buffer from known max datagram size
         let mut buf = BytesMut::new();
@@ -268,7 +268,7 @@ impl quic::RecvDatagramExt for Connection {
     type Error = ConnectionError;
 
     #[inline]
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn poll_accept_datagram(
         &mut self,
         cx: &mut task::Context<'_>,
@@ -299,7 +299,7 @@ where
     type BidiStream = BidiStream<B>;
     type OpenError = ConnectionError;
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn poll_open_bidi(
         &mut self,
         cx: &mut task::Context<'_>,
@@ -318,7 +318,7 @@ where
         }))
     }
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn poll_open_send(
         &mut self,
         cx: &mut task::Context<'_>,
@@ -333,7 +333,7 @@ where
         Poll::Ready(Ok(Self::SendStream::new(send)))
     }
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn close(&mut self, code: h3::error::Code, reason: &[u8]) {
         self.conn.close(
             VarInt::from_u64(code.value()).expect("error code VarInt"),
@@ -465,7 +465,7 @@ impl quic::RecvStream for RecvStream {
     type Buf = Bytes;
     type Error = ReadError;
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn poll_data(
         &mut self,
         cx: &mut task::Context<'_>,
@@ -482,7 +482,7 @@ impl quic::RecvStream for RecvStream {
         Poll::Ready(Ok(chunk?.map(|c| c.bytes)))
     }
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn stop_sending(&mut self, error_code: u64) {
         self.stream
             .as_mut()
@@ -491,7 +491,7 @@ impl quic::RecvStream for RecvStream {
             .ok();
     }
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn recv_id(&self) -> StreamId {
         self.stream
             .as_ref()
@@ -589,7 +589,7 @@ where
 {
     type Error = SendStreamError;
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn poll_ready(&mut self, cx: &mut task::Context<'_>) -> Poll<Result<(), Self::Error>> {
         if let Some(ref mut data) = self.writing {
             while data.has_remaining() {
@@ -615,12 +615,12 @@ where
         Poll::Ready(Ok(()))
     }
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn poll_finish(&mut self, _cx: &mut task::Context<'_>) -> Poll<Result<(), Self::Error>> {
         Poll::Ready(self.stream.as_mut().unwrap().finish().map_err(|e| e.into()))
     }
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn reset(&mut self, reset_code: u64) {
         let _ = self
             .stream
@@ -629,7 +629,7 @@ where
             .reset(VarInt::from_u64(reset_code).unwrap_or(VarInt::MAX));
     }
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn send_data<D: Into<WriteBuf<B>>>(&mut self, data: D) -> Result<(), Self::Error> {
         if self.writing.is_some() {
             return Err(Self::Error::NotReady);
@@ -638,7 +638,7 @@ where
         Ok(())
     }
 
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn send_id(&self) -> StreamId {
         self.stream
             .as_ref()
@@ -654,7 +654,7 @@ impl<B> quic::SendStreamUnframed<B> for SendStream<B>
 where
     B: Buf,
 {
-    #[cfg_attr(feature = "h3-quinn-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     fn poll_send<D: Buf>(
         &mut self,
         cx: &mut task::Context<'_>,

diff --git a/h3/Cargo.toml b/h3/Cargo.toml
@@ -21,7 +21,7 @@ categories = [
 
 [features]
 i-implement-a-third-party-backend-and-opt-into-breaking-changes = []
-h3-tracing = ["tracing"]
+tracing = ["dep:tracing"]
 
 [dependencies]
 bytes = "1"

diff --git a/h3/src/client/connection.rs b/h3/src/client/connection.rs
@@ -10,7 +10,7 @@ use bytes::{Buf, BytesMut};
 use futures_util::future;
 use http::request;
 
-#[cfg(feature = "h3-tracing")]
+#[cfg(feature = "tracing")]
 use tracing::{info, instrument, trace};
 
 use crate::{
@@ -123,7 +123,7 @@ where
     B: Buf,
 {
     /// Send an HTTP/3 request to the server
-    #[cfg_attr(feature = "h3-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     pub async fn send_request(
         &mut self,
         req: http::Request<()>,
@@ -349,20 +349,20 @@ where
     B: Buf,
 {
     /// Initiate a graceful shutdown, accepting `max_push` potentially in-flight server pushes
-    #[cfg_attr(feature = "h3-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     pub async fn shutdown(&mut self, _max_push: usize) -> Result<(), Error> {
         // TODO: Calculate remaining pushes once server push is implemented.
         self.inner.shutdown(&mut self.sent_closing, PushId(0)).await
     }
 
     /// Wait until the connection is closed
-    #[cfg_attr(feature = "h3-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     pub async fn wait_idle(&mut self) -> Result<(), Error> {
         future::poll_fn(|cx| self.poll_close(cx)).await
     }
 
     /// Maintain the connection state until it is closed
-    #[cfg_attr(feature = "h3-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     pub fn poll_close(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Error>> {
         while let Poll::Ready(result) = self.inner.poll_control(cx) {
             match result {
@@ -386,7 +386,7 @@ where
                 //# Once a server has provided new settings,
                 //# clients MUST comply with those values.
                 Ok(Frame::Settings(_)) => {
-                    #[cfg(feature = "h3-tracing")]
+                    #[cfg(feature = "tracing")]
                     trace!("Got settings");
                     ()
                 }
@@ -406,7 +406,7 @@ where
                     }
                     self.inner.process_goaway(&mut self.recv_closing, id)?;
 
-                    #[cfg(feature = "h3-tracing")]
+                    #[cfg(feature = "tracing")]
                     info!("Server initiated graceful shutdown, last: StreamId({})", id);
                 }
 

diff --git a/h3/src/client/stream.rs b/h3/src/client/stream.rs
@@ -1,7 +1,7 @@
 use bytes::Buf;
 use futures_util::future;
 use http::{HeaderMap, Response};
-#[cfg(feature = "h3-tracing")]
+#[cfg(feature = "tracing")]
 use tracing::instrument;
 
 use crate::{
@@ -84,7 +84,7 @@ where
     /// This should be called before trying to receive any data with [`recv_data()`].
     ///
     /// [`recv_data()`]: #method.recv_data
-    #[cfg_attr(feature = "h3-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     pub async fn recv_response(&mut self) -> Result<Response<()>, Error> {
         let mut frame = future::poll_fn(|cx| self.inner.stream.poll_next(cx))
             .await
@@ -144,13 +144,13 @@ where
 
     /// Receive some of the request body.
     // TODO what if called before recv_response ?
-    #[cfg_attr(feature = "h3-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     pub async fn recv_data(&mut self) -> Result<Option<impl Buf>, Error> {
         self.inner.recv_data().await
     }
 
     /// Receive an optional set of trailers for the response.
-    #[cfg_attr(feature = "h3-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     pub async fn recv_trailers(&mut self) -> Result<Option<HeaderMap>, Error> {
         let res = self.inner.recv_trailers().await;
         if let Err(ref e) = res {
@@ -162,7 +162,7 @@ where
     }
 
     /// Tell the peer to stop sending into the underlying QUIC stream
-    #[cfg_attr(feature = "h3-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     pub fn stop_sending(&mut self, error_code: crate::error::Code) {
         // TODO take by value to prevent any further call as this request is cancelled
         // rename `cancel()` ?
@@ -176,7 +176,7 @@ where
     B: Buf,
 {
     /// Send some data on the request body.
-    #[cfg_attr(feature = "h3-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     pub async fn send_data(&mut self, buf: B) -> Result<(), Error> {
         self.inner.send_data(buf).await
     }
@@ -186,7 +186,7 @@ where
     /// Either [`RequestStream::finish`] or
     /// [`RequestStream::send_trailers`] must be called to finalize a
     /// request.
-    #[cfg_attr(feature = "h3-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     pub async fn send_trailers(&mut self, trailers: HeaderMap) -> Result<(), Error> {
         self.inner.send_trailers(trailers).await
     }
@@ -196,7 +196,7 @@ where
     /// Either [`RequestStream::finish`] or
     /// [`RequestStream::send_trailers`] must be called to finalize a
     /// request.
-    #[cfg_attr(feature = "h3-tracing", instrument(skip_all))]
+    #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]
     pub async fn finish(&mut self) -> Result<(), Error> {
         self.inner.finish().await
     }

diff --git a/h3/src/config.rs b/h3/src/config.rs
@@ -106,7 +106,7 @@ impl TryFrom<Config> for frame::Settings {
             match settings.insert(frame::SettingId::grease(), 0) {
                 Ok(_) => (),
                 Err(_err) => {
-                    #[cfg(feature = "h3-tracing")]
+                    #[cfg(feature = "tracing")]
                     tracing::warn!("Error when adding the grease Setting. Reason {}", _err);
                 }
             }