Deuxfleurs/garage
44
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

web_server.rs: Added bucket domain to observability #608

Open
jpds wants to merge 1 commit from jpds/garage:domain-web-requests into main
pull from: jpds/garage:domain-web-requests
merge into: Deuxfleurs:main
Conversation 5 Commits 1 Files changed 1 +34 -6
1 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0501d722eb - Show all commits

40
src/web/web_server.rs
View file

@ -105,18 +105,34 @@ impl WebServer {
req: Request<Body>,
addr: SocketAddr,
) -> Result<Response<Body>, Infallible> {
let request_host_bucket = req
.headers()
.get(HOST)
.expect("No host header found")
.to_str()
.expect("Error converting host header to string")
.to_string();
if let Ok(forwarded_for_ip_addr) =
forwarded_headers::handle_forwarded_for_headers(req.headers())
{
// uri() below has a preceding '/', so no space with host
info!(
"{} (via {}) {} {}",
"{} (via {}) {} {}{}",
forwarded_for_ip_addr,
addr,
req.method(),
request_host_bucket,
req.uri()
);
} else {
info!("{} {} {}", addr, req.method(), req.uri());
info!(
"{} {} {}{}",
addr,
req.method(),
request_host_bucket,
req.uri()
);
}
// Lots of instrumentation
@ -125,12 +141,16 @@ impl WebServer {
.span_builder(format!("Web {} request", req.method()))
.with_trace_id(gen_trace_id())
.with_attributes(vec![
KeyValue::new("domain", format!("{}", request_host_bucket.to_string())),
KeyValue::new("method", format!("{}", req.method())),
KeyValue::new("uri", req.uri().to_string()),
])
.start(&tracer);
let metrics_tags = &[KeyValue::new("method", req.method().to_string())];
let metrics_tags = &[
KeyValue::new("domain", request_host_bucket.to_string()),
KeyValue::new("method", req.method().to_string()),
];
// The actual handler
let res = self
@ -145,21 +165,29 @@ impl WebServer {
// Returning the result
match res {
Ok(res) => {
debug!("{} {} {}", req.method(), res.status(), req.uri());
debug!(
"{} {} {}{}",
req.method(),
res.status(),
request_host_bucket,
req.uri()
);
Ok(res)
}
Err(error) => {
info!(
"{} {} {} {}",
"{} {} {}{} {}",
req.method(),
error.http_status_code(),
request_host_bucket,
req.uri(),
error
);
self.metrics.error_counter.add(
1,
&[
metrics_tags[0].clone(),
KeyValue::new("domain", request_host_bucket.to_string()),
KeyValue::new("method", req.method().to_string()),
KeyValue::new("status_code", error.http_status_code().to_string()),
],
);