Skip to content

test(relay): isolate telemetry callsite registry assertions (#7404) #7436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bounce12340 wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −0
Open

test(relay): isolate telemetry callsite registry assertions (#7404) #7436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions crates/buzz-relay/src/telemetry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,13 @@ mod tests {
// cross-test races when the suite runs with multiple threads.
static ENV_LOCK: Mutex<()> = Mutex::new(());

// tracing's callsite Interest registry is process-global and sticky: once a
// callsite has been enabled by any subscriber in the process, that
// registration persists across thread-local `with_default` scopes. Serialize
// tests that install subscribers / assert callsite enablement so parallel
// `cargo test` cannot race the registry against this module's fixtures.
static CALLSITE_LOCK: Mutex<()> = Mutex::new(());

// Helper: read service.name from the Resource's schema_url-independent KV list.
fn service_name_from(resource: &Resource) -> Option<String> {
resource
Expand All @@ -307,6 +314,7 @@ mod tests {

#[test]
fn trace_context_json_correlates_nested_span_logs() {
let _callsite_guard = CALLSITE_LOCK.lock().unwrap();
let output = Arc::new(Mutex::new(Vec::new()));
let output_writer = Arc::clone(&output);
let exporter = InMemorySpanExporter::default();
Expand Down Expand Up @@ -474,6 +482,7 @@ mod tests {

#[test]
fn trace_context_lookup_does_not_enable_callsites() {
let _callsite_guard = CALLSITE_LOCK.lock().unwrap();
let context_lookup = TraceContextLookup::default();
let subscriber = tracing_subscriber::registry().with(
context_lookup
Expand Down