forked from neondatabase/neon
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Polish tracing helpers (neondatabase#4651)
Context: comments here: neondatabase#4645
- Loading branch information
1 parent
634be4f
commit 20137d9
Showing
2 changed files
with
22 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,20 @@ | ||
#[cfg(debug_assertions)] | ||
use utils::tracing_span_assert::{check_fields_present, MultiNameExtractor}; | ||
|
||
#[cfg(not(debug_assertions))] | ||
#[inline] | ||
pub(crate) fn debug_assert_current_span_has_tenant_id() {} | ||
|
||
#[cfg(debug_assertions)] | ||
pub static TENANT_ID_EXTRACTOR: once_cell::sync::Lazy< | ||
utils::tracing_span_assert::MultiNameExtractor<2>, | ||
> = once_cell::sync::Lazy::new(|| { | ||
utils::tracing_span_assert::MultiNameExtractor::new("TenantId", ["tenant_id", "tenant"]) | ||
}); | ||
pub(crate) static TENANT_ID_EXTRACTOR: once_cell::sync::Lazy<MultiNameExtractor<2>> = | ||
once_cell::sync::Lazy::new(|| MultiNameExtractor::new("TenantId", ["tenant_id", "tenant"])); | ||
|
||
#[cfg(debug_assertions)] | ||
#[inline] | ||
#[track_caller] | ||
pub(crate) fn debug_assert_current_span_has_tenant_id() { | ||
use utils::tracing_span_assert; | ||
|
||
match tracing_span_assert::check_fields_present([&*TENANT_ID_EXTRACTOR]) { | ||
Ok(()) => (), | ||
Err(missing) => panic!( | ||
if let Err(missing) = check_fields_present([&*TENANT_ID_EXTRACTOR]) { | ||
panic!( | ||
"missing extractors: {:?}", | ||
missing.into_iter().map(|e| e.name()).collect::<Vec<_>>() | ||
), | ||
) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,25 @@ | ||
#[cfg(debug_assertions)] | ||
use utils::tracing_span_assert::{check_fields_present, Extractor, MultiNameExtractor}; | ||
|
||
#[cfg(not(debug_assertions))] | ||
#[inline] | ||
pub(crate) fn debug_assert_current_span_has_tenant_and_timeline_id() {} | ||
|
||
#[cfg(debug_assertions)] | ||
#[inline] | ||
#[track_caller] | ||
pub(crate) fn debug_assert_current_span_has_tenant_and_timeline_id() { | ||
use utils::tracing_span_assert; | ||
|
||
pub static TIMELINE_ID_EXTRACTOR: once_cell::sync::Lazy< | ||
tracing_span_assert::MultiNameExtractor<2>, | ||
> = once_cell::sync::Lazy::new(|| { | ||
tracing_span_assert::MultiNameExtractor::new("TimelineId", ["timeline_id", "timeline"]) | ||
}); | ||
static TIMELINE_ID_EXTRACTOR: once_cell::sync::Lazy<MultiNameExtractor<2>> = | ||
once_cell::sync::Lazy::new(|| { | ||
MultiNameExtractor::new("TimelineId", ["timeline_id", "timeline"]) | ||
}); | ||
|
||
match tracing_span_assert::check_fields_present([ | ||
let fields: [&dyn Extractor; 2] = [ | ||
&*crate::tenant::span::TENANT_ID_EXTRACTOR, | ||
&*TIMELINE_ID_EXTRACTOR, | ||
]) { | ||
Ok(()) => (), | ||
Err(missing) => panic!( | ||
]; | ||
if let Err(missing) = check_fields_present(fields) { | ||
panic!( | ||
"missing extractors: {:?}", | ||
missing.into_iter().map(|e| e.name()).collect::<Vec<_>>() | ||
), | ||
) | ||
} | ||
} |