feat: remove dcu variable and configurations (#86)

Author: mduthey

bootstrap/feature/main.tf

@@ -28,16 +28,6 @@ variable "api_key_salt" {
   default = "ogmios-salt"
 }
 
-variable "dcu_per_frame" {
-  type = map(string)
-  default = {
-    "mainnet"        = "10"
-    "preprod"        = "5"
-    "preview"        = "5"
-    "vector-testnet" = "5"
-  }
-}
-
 variable "metrics_delay" {
   type    = number
   default = 30

bootstrap/feature/operator.tf

@@ -66,11 +66,6 @@ resource "kubernetes_deployment_v1" "ogmios_operator" {
             value = var.api_key_salt
           }
 
-          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"]}"
-          }
-
           env {
             name  = "METRICS_DELAY"
             value = var.metrics_delay

bootstrap/main.tf

@@ -21,7 +21,6 @@ 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
   dns_zone           = var.dns_zone
   resources          = var.operator_resources
 }

bootstrap/variables.tf

@@ -54,16 +54,6 @@ variable "api_key_salt" {
   default = "ogmios-salt"
 }
 
-variable "dcu_per_frame" {
-  type = map(string)
-  default = {
-    "mainnet"        = "10"
-    "preprod"        = "5"
-    "preview"        = "5"
-    "vector-testnet" = "5"
-  }
-}
-
 variable "metrics_delay" {
   type    = number
   default = 60

examples/manifest.yaml

@@ -311,8 +311,6 @@ spec:
           env:
             - name: ADDR
               value: "0.0.0.0:9187"
-            - name: DCU_PER_FRAME
-              value: "preview=5,preprod=5,mainnet=5"
             - name: METRICS_DELAY
               value: "40"
             - name: PROMETHEUS_URL

operator/src/config.rs

@@ -1,5 +1,5 @@
 use lazy_static::lazy_static;
-use std::{collections::HashMap, env, time::Duration};
+use std::{env, time::Duration};
 
 lazy_static! {
     static ref CONTROLLER_CONFIG: Config = Config::from_env();
@@ -14,7 +14,6 @@ pub struct Config {
     pub dns_zone: String,
     pub extension_name: String,
     pub api_key_salt: String,
-    pub dcu_per_second: HashMap<String, f64>,
     pub metrics_delay: Duration,
     pub prometheus_url: String,
 }
@@ -25,20 +24,6 @@ impl Config {
         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());
 
-        // This will be deprecated soon. Naming is like this for compatibility
-        let dcu_per_second = env::var("DCU_PER_FRAME")
-            .expect("DCU_PER_FRAME 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");
-
-                (parts[0].into(), dcu)
-            })
-            .collect();
-
         let metrics_delay = Duration::from_secs(
             env::var("METRICS_DELAY")
                 .expect("METRICS_DELAY must be set")
@@ -51,7 +36,6 @@ impl Config {
             dns_zone,
             extension_name,
             api_key_salt,
-            dcu_per_second,
             metrics_delay,
             prometheus_url,
         }

operator/src/metrics.rs

@@ -11,20 +11,13 @@ use crate::{get_config, Error, OgmiosPort, State};
 
 #[derive(Clone)]
 pub struct Metrics {
-    pub dcu: IntCounterVec,
     pub usage: IntCounterVec,
     pub reconcile_failures: IntCounterVec,
     pub metrics_failures: IntCounterVec,
 }
 
 impl Default for Metrics {
     fn default() -> Self {
-        let dcu = IntCounterVec::new(
-            opts!("dmtr_consumed_dcus", "quantity of dcu consumed",),
-            &["project", "service", "service_type", "tenancy"],
-        )
-        .unwrap();
-
         let usage = IntCounterVec::new(
             opts!("usage", "Feature usage",),
             &["feature", "project", "resource_name", "tier"],
@@ -52,15 +45,13 @@ impl Default for Metrics {
         Metrics {
             reconcile_failures,
             usage,
-            dcu,
             metrics_failures,
         }
     }
 }
 
 impl Metrics {
     pub fn register(self, registry: &Registry) -> Result<Self, prometheus::Error> {
-        registry.register(Box::new(self.dcu.clone()))?;
         registry.register(Box::new(self.metrics_failures.clone()))?;
         registry.register(Box::new(self.reconcile_failures.clone()))?;
         registry.register(Box::new(self.usage.clone()))?;
@@ -80,18 +71,6 @@ impl Metrics {
             .inc()
     }
 
-    pub fn count_dcu_consumed(&self, project: &str, network: &str, dcu: f64) {
-        let service = format!("{}-{}", OgmiosPort::kind(&()), network);
-        let service_type = format!("{}.{}", OgmiosPort::plural(&()), OgmiosPort::group(&()));
-        let tenancy = "proxy";
-
-        let dcu: u64 = dcu.ceil() as u64;
-
-        self.dcu
-            .with_label_values(&[project, &service, &service_type, tenancy])
-            .inc_by(dcu);
-    }
-
     pub fn count_usage(&self, project: &str, resource_name: &str, tier: &str, value: f64) {
         let feature = &OgmiosPort::kind(&());
         let value: u64 = value.ceil() as u64;
@@ -174,26 +153,9 @@ pub async fn run_metrics_collector(state: Arc<State>) {
                 if network_captures.is_none() {
                     continue;
                 }
-                let network_captures = network_captures.unwrap();
-                let network = network_captures.get(1).unwrap().as_str();
-
-                let dcu_per_second = config.dcu_per_second.get(network);
-                if dcu_per_second.is_none() {
-                    let error = Error::ConfigError(format!(
-                        "dcu_per_second not configured to {} network",
-                        network
-                    ));
-                    error!(error = error.to_string());
-                    state.metrics.metrics_failure(&error);
-                    continue;
-                }
 
-                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