Deuxfleurs/garage
46
56
Fork 73
Code Issues 100 Pull requests 14 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 +8 -5
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5ec3bde885 - Show all commits

13
src/util/metrics.rs
View file

@ -3,17 +3,17 @@ use std::time::Instant;
use futures::{future::BoxFuture, Future, FutureExt}; use futures::{future::BoxFuture, Future, FutureExt};
use rand::Rng; use rand::Rng;
use opentelemetry::{metrics::*, trace::TraceId, KeyValue}; use opentelemetry::{metrics::*, trace::TraceId, Context, KeyValue};
pub trait RecordDuration<'a>: 'a { pub trait RecordDuration<'a>: 'a {
type Output; type Output;
fn record_duration( fn record_duration(
self, self,
r: &'a ValueRecorder<f64>, r: &'a Histogram<f64>,
attributes: &'a [KeyValue], attributes: &'a [KeyValue],
) -> BoxFuture<'a, Self::Output>; ) -> BoxFuture<'a, Self::Output>;
fn bound_record_duration(self, r: &'a BoundValueRecorder<f64>) -> BoxFuture<'a, Self::Output>; fn bound_record_duration(self, r: &'a Histogram<f64>) -> BoxFuture<'a, Self::Output>;
} }
impl<'a, T, O> RecordDuration<'a> for T impl<'a, T, O> RecordDuration<'a> for T
@ -24,13 +24,14 @@ where
fn record_duration( fn record_duration(
self, self,
r: &'a ValueRecorder<f64>, r: &'a Histogram<f64>,
attributes: &'a [KeyValue], attributes: &'a [KeyValue],
) -> BoxFuture<'a, Self::Output> { ) -> BoxFuture<'a, Self::Output> {
async move { async move {
let request_start = Instant::now(); let request_start = Instant::now();
let res = self.await; let res = self.await;
r.record( r.record(
&Context::current(),
Instant::now() Instant::now()
.saturating_duration_since(request_start) .saturating_duration_since(request_start)
.as_secs_f64(), .as_secs_f64(),
@ -41,14 +42,16 @@ where
.boxed() .boxed()
} }
fn bound_record_duration(self, r: &'a BoundValueRecorder<f64>) -> BoxFuture<'a, Self::Output> { fn bound_record_duration(self, r: &'a Histogram<f64>) -> BoxFuture<'a, Self::Output> {
async move { async move {
let request_start = Instant::now(); let request_start = Instant::now();
let res = self.await; let res = self.await;
r.record( r.record(
&Context::current(),
Instant::now() Instant::now()
.saturating_duration_since(request_start) .saturating_duration_since(request_start)
.as_secs_f64(), .as_secs_f64(),
&[],
); );
res res
} }