Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ tokio = { version = "1.37.0", features = ["full"] }
toml = "0.8.13"
tonic = { version = "0.12.3", features = ["channel", "prost", "tls"] }
tonic-build = "0.12.3"
tower-http = { version = "0.6", features = ["trace"] }
tracing = "0.1.40"
tracing-appender = "0.2.3"
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
Expand Down
1 change: 1 addition & 0 deletions crates/pbs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ prometheus.workspace = true
reqwest.workspace = true
serde_json.workspace = true
tokio.workspace = true
tower-http.workspace = true
tracing.workspace = true
tree_hash.workspace = true
url.workspace = true
Expand Down
13 changes: 10 additions & 3 deletions crates/pbs/src/routes/router.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ use cb_common::pbs::{
BUILDER_V1_API_PATH, BUILDER_V2_API_PATH, GET_HEADER_PATH, GET_STATUS_PATH,
REGISTER_VALIDATOR_PATH, RELOAD_PATH, SUBMIT_BLOCK_PATH,
};
use tracing::{trace, warn};
use tower_http::trace::TraceLayer;
use tracing::{info, trace, warn};
use uuid::Uuid;

use super::{
Expand All @@ -27,7 +28,7 @@ use crate::{

pub fn create_app_router<S: BuilderApiState, A: BuilderApi<S>>(state: PbsStateGuard<S>) -> Router {
// DefaultBodyLimit is 2Mib by default, so we only increase it for a few routes
// thay may need more
// that may need more

let v1_builder_routes = Router::new()
.route(GET_HEADER_PATH, get(handle_get_header::<S, A>))
Expand All @@ -51,7 +52,13 @@ pub fn create_app_router<S: BuilderApiState, A: BuilderApi<S>>(state: PbsStateGu
let v2_builder_router = Router::new().nest(BUILDER_V2_API_PATH, v2_builder_routes);
let reload_router = Router::new().route(RELOAD_PATH, post(handle_reload::<S, A>));
let builder_api =
Router::new().merge(v1_builder_router).merge(v2_builder_router).merge(reload_router);
Router::new().merge(v1_builder_router).merge(v2_builder_router).merge(reload_router).layer(
TraceLayer::new_for_http().on_response(
|response: &Response, latency: std::time::Duration, _: &tracing::Span| {
info!("Responded with {} in {} ms", response.status(), latency.as_millis());
},
),
);

let app = if let Some(extra_routes) = A::extra_routes() {
builder_api.merge(extra_routes)
Expand Down
Loading