Skip to content

Commit

Permalink
fix: thread crashes while querying pod
Browse files Browse the repository at this point in the history
  • Loading branch information
ElaBosak233 committed Feb 17, 2025
1 parent 5fd7d55 commit 689d4e7
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
5 changes: 2 additions & 3 deletions crates/telemetry/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ use opentelemetry_otlp::{ExportConfig, Protocol, WithExportConfig};
use opentelemetry_sdk::Resource;
use tracing::{info, warn};

pub(crate) static RESOURCE: Lazy<Resource> = Lazy::new(|| {
Resource::builder().with_service_name("cdsctf").build()
});
pub(crate) static RESOURCE: Lazy<Resource> =
Lazy::new(|| Resource::builder().with_service_name("cdsctf").build());

pub(crate) fn get_export_config() -> ExportConfig {
ExportConfig {
Expand Down
2 changes: 1 addition & 1 deletion crates/telemetry/src/meter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand Down
5 changes: 3 additions & 2 deletions crates/telemetry/src/tracer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<SdkTracerProvider> = OnceCell::new();

Expand Down Expand Up @@ -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(())
}
8 changes: 4 additions & 4 deletions crates/web/src/router/api/pod/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand Down

0 comments on commit 689d4e7

Please sign in to comment.