From 2647bd0356e18dbb124f1883c99865616c42a89a Mon Sep 17 00:00:00 2001
From: MatthieuCoder <matthieu@matthieu-dev.xyz>
Date: Sat, 21 Jan 2023 14:25:05 +0400
Subject: [PATCH] change bucket and metrics

---
 exes/rest/src/handler.rs | 19 ++++++++++---------
 libs/leash/src/lib.rs    |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/exes/rest/src/handler.rs b/exes/rest/src/handler.rs
index 259ac1a..77dd0d3 100644
--- a/exes/rest/src/handler.rs
+++ b/exes/rest/src/handler.rs
@@ -51,21 +51,21 @@ lazy_static! {
             .with_description("Amount of requests sent to the ratelimiter")
             .init()
     };
-    static ref UPSTREAM_TIMES: Histogram<f64> = {
+    static ref UPSTREAM_TIMES: Histogram<u64> = {
         global::meter(&METER_NAME)
-            .f64_histogram("rest.upstream_http_request_duration_seconds")
+            .u64_histogram("rest.upstream_http_request_duration_miliseconds")
             .with_description("Time took to request discord")
             .init()
     };
-    static ref TICKET_TIMES: Histogram<f64> = {
+    static ref TICKET_TIMES: Histogram<u64> = {
         global::meter(&METER_NAME)
-            .f64_histogram("rest.ticket_http_request_duration_seconds")
+            .u64_histogram("rest.ticket_http_request_duration_miliseconds")
             .with_description("Time took to get a ticket from the ratelimiter")
             .init()
     };
-    static ref HEADERS_SUBMIT_TIMES: Histogram<f64> = {
+    static ref HEADERS_SUBMIT_TIMES: Histogram<u64> = {
         global::meter(&METER_NAME)
-            .f64_histogram("rest.header_submit_http_request_duration_seconds")
+            .u64_histogram("rest.header_submit_http_request_duration_miliseconds")
             .with_description("Time took to get a ticket from the ratelimiter")
             .init()
     };
@@ -242,7 +242,7 @@ pub async fn handle_request(
         .then(|v| async {
             TICKET_TIMES.record(
                 &cx,
-                ticket_start.elapsed()?.as_secs_f64(),
+                ticket_start.elapsed()?.as_millis() as u64,
                 &[KeyValue::new("bucket", name)],
             );
             v
@@ -300,7 +300,7 @@ pub async fn handle_request(
         .then(|v| async {
             UPSTREAM_TIMES.record(
                 &cx,
-                upstream_start.elapsed()?.as_secs_f64(),
+                upstream_start.elapsed()?.as_millis() as u64,
                 &[KeyValue::new("bucket", name)],
             );
             v.context("")
@@ -327,6 +327,7 @@ pub async fn handle_request(
         .map(|f| (f.0, f.1.expect("errors should be filtered")))
         .collect();
 
+    let headers_start = SystemTime::now();
     HEADERS_SUBMIT_CALLS.add(&cx, 1, &[KeyValue::new("bucket", name)]);
     let _submit_headers = ratelimiter
         .submit_headers(bucket.clone(), headers)
@@ -334,7 +335,7 @@ pub async fn handle_request(
         .then(|v| async {
             HEADERS_SUBMIT_TIMES.record(
                 &cx,
-                upstream_start.elapsed()?.as_secs_f64(),
+                headers_start.elapsed()?.as_millis() as u64,
                 &[KeyValue::new("bucket", name)],
             );
             v
diff --git a/libs/leash/src/lib.rs b/libs/leash/src/lib.rs
index 29c8a63..b767e10 100644
--- a/libs/leash/src/lib.rs
+++ b/libs/leash/src/lib.rs
@@ -59,7 +59,7 @@ where
         {
             let meter = opentelemetry_otlp::new_pipeline()
                 .metrics(
-                    selectors::simple::histogram([1.0, 2.0, 5.0, 10.0, 20.0, 50.0]),
+                    selectors::simple::histogram([0.1, 1.0, 2.0, 5.0, 10.0, 20.0, 50.0]),
                     stateless_temporality_selector(),
                     opentelemetry::runtime::Tokio,
                 )
-- 
2.39.5