feat: harden community production foundation through story 1.5

crates/crank-observability/src/prometheus.rs

@@ -1,4 +1,4 @@
-use std::{env, net::SocketAddr};
+use std::net::SocketAddr;
 
 use axum::{
     Router,
@@ -19,8 +19,6 @@ use tokio::net::TcpListener;
 
 use crate::{DURATION_BUCKETS_SECONDS, ServiceIdentity};
 
-const METRICS_ENABLED_ENV: &str = "CRANK_METRICS_ENABLED";
-const METRICS_TOKEN_ENV: &str = "CRANK_METRICS_BEARER_TOKEN";
 const PROMETHEUS_CONTENT_TYPE: &str = "text/plain; version=0.0.4; charset=utf-8";
 
 #[derive(Clone)]
@@ -62,33 +60,6 @@ impl MetricsConfig {
         })
     }
 
-    pub fn from_env(
-        bind_env: &'static str,
-        default_bind: SocketAddr,
-    ) -> Result<Self, MetricsConfigError> {
-        let enabled = parse_enabled(env::var(METRICS_ENABLED_ENV))?;
-        let bind_addr = match env::var(bind_env) {
-            Ok(raw) => raw
-                .parse()
-                .map_err(|_| MetricsConfigError::InvalidBindAddress { field: bind_env })?,
-            Err(env::VarError::NotPresent) => default_bind,
-            Err(env::VarError::NotUnicode(_)) => {
-                return Err(MetricsConfigError::InvalidEnvironmentEncoding { field: bind_env });
-            }
-        };
-        let bearer_token = match env::var(METRICS_TOKEN_ENV) {
-            Ok(token) => Some(token),
-            Err(env::VarError::NotPresent) => None,
-            Err(env::VarError::NotUnicode(_)) => {
-                return Err(MetricsConfigError::InvalidEnvironmentEncoding {
-                    field: METRICS_TOKEN_ENV,
-                });
-            }
-        };
-
-        Self::new(enabled, bind_addr, bearer_token)
-    }
-
     pub fn enabled(&self) -> bool {
         self.enabled
     }
@@ -280,17 +251,3 @@ fn bearer_token(headers: &HeaderMap) -> Option<&[u8]> {
 fn token_digest(token: &[u8]) -> [u8; 32] {
     Sha256::digest(token).into()
 }
-
-fn parse_enabled(value: Result<String, env::VarError>) -> Result<bool, MetricsConfigError> {
-    match value {
-        Ok(raw) => match raw.to_ascii_lowercase().as_str() {
-            "true" | "1" => Ok(true),
-            "false" | "0" => Ok(false),
-            _ => Err(MetricsConfigError::InvalidEnabledFlag),
-        },
-        Err(env::VarError::NotPresent) => Ok(true),
-        Err(env::VarError::NotUnicode(_)) => Err(MetricsConfigError::InvalidEnvironmentEncoding {
-            field: METRICS_ENABLED_ENV,
-        }),
-    }
-}