diff --git a/Cargo.lock b/Cargo.lock index 957276996..7bff2ecf5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5743,9 +5743,9 @@ dependencies = [ [[package]] name = "trillium" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c7180eac36666f14504c5a8606d027154a8e3a4704bd0acc69a13f56c202b6" +checksum = "b84b5b14b3b2dda42a660fd7476a00f25c7565c4f1dc63b4322a7855a1c5384f" dependencies = [ "async-trait", "log", @@ -5754,9 +5754,9 @@ dependencies = [ [[package]] name = "trillium-api" -version = "0.2.0-rc.11" +version = "0.2.0-rc.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9490fa41645e61efc5359bdea19686c71df855603361606a4afb501fec6038" +checksum = "87ac0b2a746f70736c3b1c78078d361d71a1705121f2b134a791d50de2a4f78d" dependencies = [ "log", "mime", @@ -5803,18 +5803,18 @@ dependencies = [ [[package]] name = "trillium-head" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c80f1a23ae5c65e8b6cd969fead20eb7d70c7ec9e6ac16f075cd60b77ca47a6b" +checksum = "bc125c6f329f4c7d26688ebb551f84ad6e03460094dd2f03f06f35b292aee474" dependencies = [ "trillium", ] [[package]] name = "trillium-http" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18d82a9418c6fc1a872bc163fffd49320229edf783cbbb1aa62ba49f517cfad" +checksum = "dd4c063660875422d9f85a334931963fc301a3ede9a5c39de7c968ab0801ce33" dependencies = [ "encoding_rs", "futures-lite 2.3.0", diff --git a/Cargo.toml b/Cargo.toml index 95ddc1952..0a529e904 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,10 +48,10 @@ rstest = "0.18.2" testcontainers = "0.16.7" thiserror = "1.0" tokio = { version = "1.38", features = ["full", "tracing"] } -trillium = "0.2.19" -trillium-api = { version = "0.2.0-rc.11", default-features = false } +trillium = "0.2.20" +trillium-api = { version = "0.2.0-rc.12", default-features = false } trillium-caching-headers = "0.2.3" -trillium-head = "0.2.2" +trillium-head = "0.2.3" trillium-opentelemetry = "0.8.0" trillium-router = "0.3.6" trillium-rustls = "0.7.0" diff --git a/aggregator/src/aggregator/http_handlers.rs b/aggregator/src/aggregator/http_handlers.rs index 32762aaf8..a4ec19454 100644 --- a/aggregator/src/aggregator/http_handlers.rs +++ b/aggregator/src/aggregator/http_handlers.rs @@ -41,7 +41,7 @@ struct ErrorCode(&'static str); impl Handler for Error { async fn run(&self, mut conn: Conn) -> Conn { let error_code = self.error_code(); - conn.set_state(ErrorCode(error_code)); + conn.insert_state(ErrorCode(error_code)); let conn = match self { Error::InvalidConfiguration(_) => conn.with_status(Status::InternalServerError), Error::MessageDecode(_) => conn diff --git a/aggregator_core/src/lib.rs b/aggregator_core/src/lib.rs index d39199d76..de586ba48 100644 --- a/aggregator_core/src/lib.rs +++ b/aggregator_core/src/lib.rs @@ -62,7 +62,7 @@ impl InstrumentedHandler { let route = conn.route().expect("no route in conn").to_string(); let method = conn.method(); let span = info_span!("endpoint", route, %method); - conn.set_state(InstrumentedHandlerSpan(span.clone())); + conn.insert_state(InstrumentedHandlerSpan(span.clone())); self.0.run(conn).instrument(span).await }