Axum-0.7 compatibility, closes #3

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tower-request-id"
-version = "0.2.1"
+version = "0.3.0"
 edition = "2021"
 description = "A tower (hyper, axum, warp) service to add a unique id for every request"
 keywords = ["tower", "hyper", "axum", "warp"]
@@ -9,17 +9,17 @@ readme = "README.md"
 repository = "https://github.com/imbolc/tower-request-id"
 
 [dependencies]
-http = "0.2"
+http = "1"
 tower-layer = "0.3"
 tower-service = "0.3"
 ulid = "1"
 
 [dev-dependencies]
-axum = "0.6"
+axum = "0.7"
 tokio = { version = "1", features = ["full"] }
 tower = "0.4"
 tracing-subscriber = "0.3"
-tower-http = { version = "0.3", features = ["trace"] }
+tower-http = { version = "0.5", features = ["trace"] }
 rusty-hook = "0.11"
-hyper = "0.14"
+hyper = "1"
 tracing = "0.1"

examples/logging.rs

@@ -1,6 +1,5 @@
-use axum::{routing::get, Router};
+use axum::{body::Body, routing::get, Router};
 use http::Request;
-use hyper::Body;
 use tower_http::trace::TraceLayer;
 use tower_request_id::{RequestId, RequestIdLayer};
 use tracing::{error_span, info, Level};
@@ -33,10 +32,8 @@ async fn main() {
         // Note that it should be added after the Trace layer.
         .layer(RequestIdLayer);
 
-    axum::Server::bind(&"0.0.0.0:3000".parse().unwrap())
-        .serve(app.into_make_service())
-        .await
-        .unwrap();
+    let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
+    axum::serve(listener, app).await.unwrap();
 }
 
 async fn handler() -> &'static str {

src/lib.rs

@@ -23,7 +23,7 @@ use tower_service::Service;
 use ulid::Ulid;
 
 /// A newtype around [`ulid::Ulid`]
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct RequestId(pub Ulid);
 
 impl RequestId {