diff --git a/crates/api-grub/src/export.rs b/crates/api-grub/src/export.rs index 1f53957..d348830 100644 --- a/crates/api-grub/src/export.rs +++ b/crates/api-grub/src/export.rs @@ -4,7 +4,7 @@ use reqwest::Client; use tokio_postgres::NoTls; use std::env; use anyhow::Result; -use tracing::{debug, error, info}; +use tracing::{debug, error, info, trace}; use std::ops::Drop; /// An entity which handles DB connections. @@ -113,9 +113,13 @@ impl Exporter { } /// Exports metrics in `PrometheusMetricsExtended` format to Exporter defined /// as env var $EXORPTER_URL + #[tracing::instrument(name = "Prometheus/Status System export")] pub async fn export_extended_metrics(metrics: PrometheusMetricsExtended) -> Result { // let url = env::var("EXPORTER_URL")?; - let url = env::var("STATUS_SYSTEM_URL").unwrap_or(env::var("EXPORTER_URL")?); + let url = env::var("STATUS_SYSTEM_URL").or_else(|err| { + trace!("cannot fetch $STATUS_SYSTEM_URL var due to {}. working only with Prometheus exporter link", err); + env::var("EXPORTER_URL") + })?; debug!("Exporting: {:?}", &metrics); diff --git a/crates/api-grub/src/monitoring.rs b/crates/api-grub/src/monitoring.rs index a2be58f..063e445 100644 --- a/crates/api-grub/src/monitoring.rs +++ b/crates/api-grub/src/monitoring.rs @@ -277,8 +277,8 @@ impl MonitoringImporter { match event.await { Ok(val) => { match crate::export::Exporter::export_extended_metrics(val?).await { - Ok(bytes) => {info!("Successfully transmitted {} bytes to the Prometehus exporter", bytes)}, - Err(er) => error!("Cannot export data to the Prometehus exporter due to : `{}`", er), + Ok(bytes) => {info!("Successfully transmitted {} bytes", bytes)}, + Err(er) => error!("Cannot export data due to : `{}`", er), } }, Err(er) => {