diff --git a/crates/telemetry/src/lib.rs b/crates/telemetry/src/lib.rs index cc3100f..caedce6 100644 --- a/crates/telemetry/src/lib.rs +++ b/crates/telemetry/src/lib.rs @@ -11,9 +11,8 @@ use opentelemetry_otlp::{ExportConfig, Protocol, WithExportConfig}; use opentelemetry_sdk::Resource; use tracing::{info, warn}; -pub(crate) static RESOURCE: Lazy = Lazy::new(|| { - Resource::builder().with_service_name("cdsctf").build() -}); +pub(crate) static RESOURCE: Lazy = + Lazy::new(|| Resource::builder().with_service_name("cdsctf").build()); pub(crate) fn get_export_config() -> ExportConfig { ExportConfig { diff --git a/crates/telemetry/src/meter/mod.rs b/crates/telemetry/src/meter/mod.rs index 3a99320..be4d853 100644 --- a/crates/telemetry/src/meter/mod.rs +++ b/crates/telemetry/src/meter/mod.rs @@ -4,7 +4,7 @@ use std::{borrow::Cow, time::Duration}; use anyhow::anyhow; use once_cell::sync::{Lazy, OnceCell}; -use opentelemetry::{global, metrics::Meter, InstrumentationScope}; +use opentelemetry::{InstrumentationScope, global, metrics::Meter}; use opentelemetry_otlp::{MetricExporter, WithExportConfig}; use opentelemetry_sdk::metrics::{PeriodicReader, SdkMeterProvider, Temporality}; diff --git a/crates/telemetry/src/tracer/mod.rs b/crates/telemetry/src/tracer/mod.rs index 09f4152..9a2e1a7 100644 --- a/crates/telemetry/src/tracer/mod.rs +++ b/crates/telemetry/src/tracer/mod.rs @@ -7,7 +7,7 @@ use opentelemetry::{ trace::TracerProvider as TracerProviderTraits, }; use opentelemetry_otlp::{SpanExporter, WithExportConfig}; -use opentelemetry_sdk::trace::{Tracer, SdkTracerProvider}; +use opentelemetry_sdk::trace::{SdkTracerProvider, Tracer}; static PROVIDER: OnceCell = OnceCell::new(); @@ -57,7 +57,8 @@ pub async fn shutdown() -> Result<(), anyhow::Error> { if let Err(e) = get_provider().unwrap().shutdown() { println!("unable to shutdown telemetry tracer provider: {:?}", e); } - }).await?; + }) + .await?; Ok(()) } diff --git a/crates/web/src/router/api/pod/mod.rs b/crates/web/src/router/api/pod/mod.rs index 7d304a2..1d372f3 100644 --- a/crates/web/src/router/api/pod/mod.rs +++ b/crates/web/src/router/api/pod/mod.rs @@ -156,12 +156,12 @@ pub async fn get_pod( let _ = pod .status - .unwrap() + .unwrap_or_default() .container_statuses - .unwrap() + .unwrap_or_default() .iter() .for_each(|s| { - let container_state = s.to_owned().state.unwrap(); + let container_state = s.to_owned().state.unwrap_or_default(); if let Some(waiting) = container_state.waiting { status = "waiting".to_owned(); if let Some(r) = waiting.reason { @@ -181,7 +181,7 @@ pub async fn get_pod( let started_at = pod.metadata.creation_timestamp.unwrap().0.timestamp(); - let node_name = pod.spec.unwrap().node_name.unwrap(); + let node_name = pod.spec.unwrap_or_default().node_name.unwrap_or_default(); let public_entry = cds_config::get_config() .cluster