From 5ec3bde885e41827a610598d849c2c84559b663c Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 22 Jan 2023 23:45:51 +0000
Subject: [PATCH] util/metrics.rs: Ported to opentelemetry 0.18.

---
 src/util/metrics.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/util/metrics.rs b/src/util/metrics.rs
index b882a886..2ba1ed63 100644
--- a/src/util/metrics.rs
+++ b/src/util/metrics.rs
@@ -3,17 +3,17 @@ use std::time::Instant;
 use futures::{future::BoxFuture, Future, FutureExt};
 use rand::Rng;
 
-use opentelemetry::{metrics::*, trace::TraceId, KeyValue};
+use opentelemetry::{metrics::*, trace::TraceId, Context, KeyValue};
 
 pub trait RecordDuration<'a>: 'a {
 	type Output;
 
 	fn record_duration(
 		self,
-		r: &'a ValueRecorder<f64>,
+		r: &'a Histogram<f64>,
 		attributes: &'a [KeyValue],
 	) -> 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
@@ -24,13 +24,14 @@ where
 
 	fn record_duration(
 		self,
-		r: &'a ValueRecorder<f64>,
+		r: &'a Histogram<f64>,
 		attributes: &'a [KeyValue],
 	) -> BoxFuture<'a, Self::Output> {
 		async move {
 			let request_start = Instant::now();
 			let res = self.await;
 			r.record(
+				&Context::current(),
 				Instant::now()
 					.saturating_duration_since(request_start)
 					.as_secs_f64(),
@@ -41,14 +42,16 @@ where
 		.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 {
 			let request_start = Instant::now();
 			let res = self.await;
 			r.record(
+				&Context::current(),
 				Instant::now()
 					.saturating_duration_since(request_start)
 					.as_secs_f64(),
+				&[],
 			);
 			res
 		}