Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

WIP: opentelemetry-0.18 bump #490

Closed
jpds wants to merge 12 commits from jpds/garage:opentelemetry-0.18 into main
pull from: jpds/garage:opentelemetry-0.18
merge into: Deuxfleurs:main
Conversation 7 Commits 12 Files changed 25 +7 -4
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0a3d332966 - Show all commits

11
src/rpc/rpc_helper.rs
View file

@ -136,7 +136,10 @@ impl RpcHelper {
KeyValue::new("to", format!("{:?}", to)), KeyValue::new("to", format!("{:?}", to)),
]; ];
self.0.metrics.rpc_counter.add(1, &metric_tags); self.0
.metrics
.rpc_counter
.add(&Context::current(), 1, &metric_tags);
let node_id = to.into(); let node_id = to.into();
let rpc_call = endpoint let rpc_call = endpoint
@ -154,18 +157,18 @@ impl RpcHelper {
select! { select! {
res = rpc_call => { res = rpc_call => {
if res.is_err() { if res.is_err() {
self.0.metrics.rpc_netapp_error_counter.add(1, &metric_tags); self.0.metrics.rpc_netapp_error_counter.add(&Context::current(), 1, &metric_tags);
} }
let res = res?.into_msg(); let res = res?.into_msg();
if res.is_err() { if res.is_err() {
self.0.metrics.rpc_garage_error_counter.add(1, &metric_tags); self.0.metrics.rpc_garage_error_counter.add(&Context::current(), 1, &metric_tags);
} }
Ok(res?) Ok(res?)
} }
() = timeout => { () = timeout => {
self.0.metrics.rpc_timeout_counter.add(1, &metric_tags); self.0.metrics.rpc_timeout_counter.add(&Context::current(), 1, &metric_tags);
Err(Error::Timeout) Err(Error::Timeout)
} }
} }