From 0a3d3329663f9aeeb4a30c5aa641c10dfd197c07 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Fri, 27 Jan 2023 16:45:52 +0000 Subject: [PATCH] rpc/rpc_helper.rs: Ported to opentelemetry 0.18. --- src/rpc/rpc_helper.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/rpc/rpc_helper.rs b/src/rpc/rpc_helper.rs index e59c372a..64c06da1 100644 --- a/src/rpc/rpc_helper.rs +++ b/src/rpc/rpc_helper.rs @@ -136,7 +136,10 @@ impl RpcHelper { 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 rpc_call = endpoint @@ -154,18 +157,18 @@ impl RpcHelper { select! { res = rpc_call => { 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(); 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?) } () = 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) } }