Skip to content

fix: handle missing span_name in logging test assertions #2665

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

Merged
merged 2 commits into from
Aug 22, 2025
Merged

fix: handle missing span_name in logging test assertions #2665

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2077a3a
fix: handle missing span_name in logging test assertions
WaelBKZ Aug 22, 2025
a0e0ff6
Merge branch 'main' into fix/issue-2586-logging-test-intermittent-fai…
WaelBKZ Aug 22, 2025
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
36 changes: 24 additions & 12 deletions lib/runtime/src/logging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,28 +1009,40 @@ pub mod tests {

// Parent span has no parent_id
for log_line in &lines {
if log_line.get("span_name").unwrap().as_str().unwrap() == "parent" {
assert!(log_line.get("parent_id").is_none());
if let Some(span_name) = log_line.get("span_name") {
if let Some(span_name_str) = span_name.as_str() {
if span_name_str == "parent" {
assert!(log_line.get("parent_id").is_none());
}
}
}
}

// Child span's parent_id is parent_span_id
for log_line in &lines {
if log_line.get("span_name").unwrap().as_str().unwrap() == "child" {
assert_eq!(
log_line.get("parent_id").unwrap().as_str().unwrap(),
&parent_span_id
);
if let Some(span_name) = log_line.get("span_name") {
if let Some(span_name_str) = span_name.as_str() {
if span_name_str == "child" {
assert_eq!(
log_line.get("parent_id").unwrap().as_str().unwrap(),
&parent_span_id
);
}
}
}
}

// Grandchild span's parent_id is child_span_id
for log_line in &lines {
if log_line.get("span_name").unwrap().as_str().unwrap() == "grandchild" {
assert_eq!(
log_line.get("parent_id").unwrap().as_str().unwrap(),
&child_span_id
);
if let Some(span_name) = log_line.get("span_name") {
if let Some(span_name_str) = span_name.as_str() {
if span_name_str == "grandchild" {
assert_eq!(
log_line.get("parent_id").unwrap().as_str().unwrap(),
&child_span_id
);
}
}
}
}

Expand Down
Loading