fix: Track connection time and reset connection metric

gonzalezzfelipe · gonzalezzfelipe · commit 091b8faf567b · 2024-07-03T16:23:58.000-03:00
diff --git a/bootstrap/feature/main.tf b/bootstrap/feature/main.tf
@@ -28,12 +28,13 @@ variable "api_key_salt" {
   default = "ogmios-salt"
 }
 
-variable "dcu_per_frame" {
+variable "dcu_per_second" {
   type = map(string)
   default = {
-    "mainnet" = "10"
-    "preprod" = "5"
-    "preview" = "5"
+    "mainnet"        = "1"
+    "preprod"        = "1"
+    "preview"        = "1"
+    "vector-testnet" = "1"
   }
 }
 
diff --git a/bootstrap/feature/operator.tf b/bootstrap/feature/operator.tf
@@ -67,8 +67,8 @@ resource "kubernetes_deployment_v1" "ogmios_operator" {
           }
 
           env {
-            name  = "DCU_PER_FRAME"
-            value = "mainnet=${var.dcu_per_frame["mainnet"]},preprod=${var.dcu_per_frame["preprod"]},preview=${var.dcu_per_frame["preview"]},vector-testnet=${var.dcu_per_frame["vector-testnet"]}"
+            name  = "DCU_PER_SECOND"
+            value = "mainnet=${var.dcu_per_second["mainnet"]},preprod=${var.dcu_per_second["preprod"]},preview=${var.dcu_per_second["preview"]},vector-testnet=${var.dcu_per_second["vector-testnet"]}"
           }
 
           env {
diff --git a/bootstrap/main.tf b/bootstrap/main.tf
@@ -21,7 +21,7 @@ module "ogmios_v1_feature" {
   metrics_delay      = var.metrics_delay
   extension_name     = var.extension_name
   api_key_salt       = var.api_key_salt
-  dcu_per_frame      = var.dcu_per_frame
+  dcu_per_second     = var.dcu_per_second
 }
 
 module "ogmios_v1_proxy" {
diff --git a/bootstrap/variables.tf b/bootstrap/variables.tf
@@ -34,12 +34,13 @@ variable "api_key_salt" {
   default = "ogmios-salt"
 }
 
-variable "dcu_per_frame" {
+variable "dcu_per_second" {
   type = map(string)
   default = {
-    "mainnet" = "10"
-    "preprod" = "5"
-    "preview" = "5"
+    "mainnet"        = "1"
+    "preprod"        = "1"
+    "preview"        = "1"
+    "vector-testnet" = "1"
   }
 }
 
diff --git a/operator/src/config.rs b/operator/src/config.rs
@@ -14,7 +14,7 @@ pub struct Config {
     pub dns_zone: String,
     pub extension_name: String,
     pub api_key_salt: String,
-    pub dcu_per_frame: HashMap<String, f64>,
+    pub dcu_per_second: HashMap<String, f64>,
     pub metrics_delay: Duration,
     pub prometheus_url: String,
 }
@@ -24,14 +24,14 @@ impl Config {
         let dns_zone = env::var("DNS_ZONE").unwrap_or("demeter.run".into());
         let extension_name = env::var("EXTENSION_NAME").unwrap_or("ogmios-m1".into());
         let api_key_salt = env::var("API_KEY_SALT").unwrap_or("ogmios-salt".into());
-        let dcu_per_frame = env::var("DCU_PER_FRAME")
-            .expect("DCU_PER_FRAME must be set")
+        let dcu_per_second = env::var("DCU_PER_SECOND")
+            .expect("DCU_PER_SECOND must be set")
             .split(',')
             .map(|pair| {
                 let parts: Vec<&str> = pair.split('=').collect();
                 let dcu = parts[1]
                     .parse::<f64>()
-                    .expect("DCU_PER_FRAME must be NETWORK=NUMBER");
+                    .expect("DCU_PER_SECOND must be NETWORK=NUMBER");
 
                 (parts[0].into(), dcu)
             })
@@ -49,7 +49,7 @@ impl Config {
             dns_zone,
             extension_name,
             api_key_salt,
-            dcu_per_frame,
+            dcu_per_second,
             metrics_delay,
             prometheus_url,
         }
diff --git a/operator/src/metrics.rs b/operator/src/metrics.rs
@@ -117,29 +117,30 @@ pub async fn run_metrics_collector(state: Arc<State>) {
             tokio::time::sleep(config.metrics_delay).await;
 
             let end = Utc::now();
-            let start = (end - last_execution).num_seconds();
+            let interval = (end - last_execution).num_seconds();
 
             last_execution = end;
 
             let query = format!(
-                "sum by (consumer, route, tier) (increase(ogmios_proxy_ws_total_frame[{start}s] @ {}))",
+                "sum by (consumer, route, tier) (avg_over_time(ogmios_proxy_total_frame[{interval}s] @ {}))",
                 end.timestamp_millis() / 1000
             );
 
-            let result = client
+            let response = match client
                 .get(format!("{}/query?query={query}", config.prometheus_url))
                 .send()
-                .await;
-
-            if let Err(err) = result {
-                error!(error = err.to_string(), "error to make prometheus request");
-                state
-                    .metrics
-                    .metrics_failure(&Error::HttpError(err.to_string()));
-                continue;
-            }
+                .await
+            {
+                Ok(response) => response,
+                Err(err) => {
+                    error!(error = err.to_string(), "error to make prometheus request");
+                    state
+                        .metrics
+                        .metrics_failure(&Error::HttpError(err.to_string()));
+                    continue;
+                }
+            };
 
-            let response = result.unwrap();
             let status = response.status();
             if status.is_client_error() || status.is_server_error() {
                 error!(status = status.to_string(), "request status code fail");
@@ -176,25 +177,27 @@ pub async fn run_metrics_collector(state: Arc<State>) {
                 let network_captures = network_captures.unwrap();
                 let network = network_captures.get(1).unwrap().as_str();
 
-                let dcu_per_frame = config.dcu_per_frame.get(network);
-                if dcu_per_frame.is_none() {
+                let dcu_per_second = config.dcu_per_second.get(network);
+                if dcu_per_second.is_none() {
                     let error = Error::ConfigError(format!(
-                        "dcu_per_frame not configured to {} network",
+                        "dcu_per_package not configured to {} network",
                         network
                     ));
                     error!(error = error.to_string());
                     state.metrics.metrics_failure(&error);
                     continue;
                 }
-                let dcu_per_frame = dcu_per_frame.unwrap();
 
-                let dcu = result.value * dcu_per_frame;
-                state.metrics.count_dcu_consumed(project, network, dcu);
+                let dcu_per_second = dcu_per_second.unwrap();
+                let total_exec_time = result.value * (interval as f64);
 
+                let dcu = total_exec_time * dcu_per_second;
+
+                state.metrics.count_dcu_consumed(project, network, dcu);
                 if let Some(tier) = result.metric.tier {
                     state
                         .metrics
-                        .count_usage(project, resource_name, &tier, result.value);
+                        .count_usage(project, resource_name, &tier, total_exec_time);
                 }
             }
         }
diff --git a/proxy/src/metrics.rs b/proxy/src/metrics.rs
@@ -31,7 +31,7 @@ impl Metrics {
 
         let ws_total_connection = IntGaugeVec::new(
             opts!(
-                "ogmios_proxy_ws_total_connection",
+                "ogmios_proxy_total_connection",
                 "total of websocket connection",
             ),
             &["namespace", "instance", "route", "consumer", "tier"],

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,13 @@ variable "api_key_salt" {`
`28`	`28`	`default = "ogmios-salt"`
`29`	`29`	`}`
`30`	`30`
`31`		`-variable "dcu_per_frame" {`
	`31`	`+variable "dcu_per_second" {`
`32`	`32`	`type = map(string)`
`33`	`33`	`default = {`
`34`		`- "mainnet" = "10"`
`35`		`- "preprod" = "5"`
`36`		`- "preview" = "5"`
	`34`	`+ "mainnet" = "1"`
	`35`	`+ "preprod" = "1"`
	`36`	`+ "preview" = "1"`
	`37`	`+ "vector-testnet" = "1"`
`37`	`38`	`}`
`38`	`39`	`}`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ resource "kubernetes_deployment_v1" "ogmios_operator" {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`env {`
`70`		`- name = "DCU_PER_FRAME"`
`71`		`- value = "mainnet=${var.dcu_per_frame["mainnet"]},preprod=${var.dcu_per_frame["preprod"]},preview=${var.dcu_per_frame["preview"]},vector-testnet=${var.dcu_per_frame["vector-testnet"]}"`
	`70`	`+ name = "DCU_PER_SECOND"`
	`71`	`+ value = "mainnet=${var.dcu_per_second["mainnet"]},preprod=${var.dcu_per_second["preprod"]},preview=${var.dcu_per_second["preview"]},vector-testnet=${var.dcu_per_second["vector-testnet"]}"`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`env {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ module "ogmios_v1_feature" {`
`21`	`21`	`metrics_delay = var.metrics_delay`
`22`	`22`	`extension_name = var.extension_name`
`23`	`23`	`api_key_salt = var.api_key_salt`
`24`		`- dcu_per_frame = var.dcu_per_frame`
	`24`	`+ dcu_per_second = var.dcu_per_second`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`module "ogmios_v1_proxy" {`
Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,13 @@ variable "api_key_salt" {`
`34`	`34`	`default = "ogmios-salt"`
`35`	`35`	`}`
`36`	`36`
`37`		`-variable "dcu_per_frame" {`
	`37`	`+variable "dcu_per_second" {`
`38`	`38`	`type = map(string)`
`39`	`39`	`default = {`
`40`		`- "mainnet" = "10"`
`41`		`- "preprod" = "5"`
`42`		`- "preview" = "5"`
	`40`	`+ "mainnet" = "1"`
	`41`	`+ "preprod" = "1"`
	`42`	`+ "preview" = "1"`
	`43`	`+ "vector-testnet" = "1"`
`43`	`44`	`}`
`44`	`45`	`}`
`45`	`46`