Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:jammy as base
FROM ubuntu:noble as base

RUN apt-get update \
&& apt-get upgrade -y \
Expand Down
4 changes: 2 additions & 2 deletions pulse-common/src/k8s/pods_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ impl PodsInfoSingleton {
k8s_config
.services_cache_interval
.as_ref()
.map_or(15.minutes(), bd_time::ProtoDurationExt::to_time_duration),
.map_or_else(|| 15.minutes(), bd_time::ProtoDurationExt::to_time_duration),
Box::new(RealServiceFetcher),
))
} else {
Expand Down Expand Up @@ -514,7 +514,7 @@ impl ResourceWatchCallbacks<Pod> for PodsInfoCache {
async fn init_apply(&mut self, pod: Pod) {
self
.initializing_state
.get_or_insert(PodsInfo::default())
.get_or_insert_with(PodsInfo::default)
.apply_pod(
&self.node_info,
&pod,
Expand Down
2 changes: 1 addition & 1 deletion pulse-metrics/src/pipeline/inflow/otlp/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ impl OtlpInflow {
config.bind.to_string(),
config
.path
.map_or("/v1/metrics".to_string(), |p| p.to_string()),
.map_or_else(|| "/v1/metrics".to_string(), |p| p.to_string()),
config.downstream_id_source.unwrap_or_default(),
context,
Box::new(move |_inflow, headers, body, downstream_id_provider| {
Expand Down
2 changes: 1 addition & 1 deletion pulse-metrics/src/pipeline/inflow/prom_scrape/scraper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ pub async fn make(
let interval = http_service_discovery
.fetch_interval
.as_ref()
.map_or(1.minutes(), bd_time::ProtoDurationExt::to_time_duration)
.map_or_else(|| 1.minutes(), bd_time::ProtoDurationExt::to_time_duration)
.interval(MissedTickBehavior::Delay);
let target = HttpServiceDiscoveryEndpointTarget::new(
http_service_discovery,
Expand Down
Loading
Loading