[crashtracking] Add sig_info and os_info as objects in errors payload (#1350)

first commit

Trigger CI

Co-authored-by: gyuheon.oh <[email protected]>

Author: gyuheon0h

Cargo.lock

@@ -22,6 +22,7 @@ strum = { version = "0.26.2", features = ["derive"] }
 libc = "0.2"
 nix = { version = "0.29", features = ["signal", "socket"] }
 hex = "0.4"
+os_info = "3.7.0"
 
 [lib]
 bench = false

bin_tests/Cargo.toml

@@ -1783,11 +1783,39 @@ fn assert_errors_intake_payload(errors_intake_content: &[u8], crash_typ: &str) {
     assert_eq!(payload["ddsource"], "crashtracker");
     assert!(payload["timestamp"].is_number());
     assert!(payload["ddtags"].is_string());
+    assert!(
+        payload["os_info"].is_object(),
+        "os_info missing: {:?}",
+        payload
+    );
 
     let ddtags = payload["ddtags"].as_str().unwrap();
     assert!(ddtags.contains("service:foo"));
     assert!(ddtags.contains("uuid:"));
 
+    let os_info_val = &payload["os_info"];
+    let expected_os_info = ::os_info::get();
+    assert_eq!(
+        os_info_val["architecture"].as_str().unwrap_or(""),
+        expected_os_info.architecture().unwrap_or("unknown"),
+        "mismatched architecture in os_info"
+    );
+    assert_eq!(
+        os_info_val["bitness"].as_str().unwrap_or(""),
+        expected_os_info.bitness().to_string(),
+        "mismatched bitness in os_info"
+    );
+    assert_eq!(
+        os_info_val["os_type"].as_str().unwrap_or(""),
+        expected_os_info.os_type().to_string(),
+        "mismatched os_type in os_info"
+    );
+    assert_eq!(
+        os_info_val["version"].as_str().unwrap_or(""),
+        expected_os_info.version().to_string(),
+        "mismatched version in os_info"
+    );
+
     let error = &payload["error"];
     assert_eq!(error["source_type"], "Crashtracking");
     assert!(error["type"].is_string()); // Note: "error_type" field is serialized as "type"
@@ -1801,6 +1829,26 @@ fn assert_errors_intake_payload(errors_intake_content: &[u8], crash_typ: &str) {
         assert_eq!(error["is_crash"], true);
     }
 
+    // Validate sig_info when present
+    if payload.get("sig_info").is_some() && payload["sig_info"].is_object() {
+        let sig = &payload["sig_info"];
+        let expected = match crash_typ {
+            "null_deref" | "kill_sigsegv" | "raise_sigsegv" => ("SIGSEGV", libc::SIGSEGV),
+            "kill_sigabrt" | "raise_sigabrt" => ("SIGABRT", libc::SIGABRT),
+            "kill_sigill" | "raise_sigill" => ("SIGILL", libc::SIGILL),
+            "kill_sigbus" | "raise_sigbus" => ("SIGBUS", libc::SIGBUS),
+            other => panic!("Unexpected crash_typ: {other}"),
+        };
+        assert_eq!(
+            sig["si_signo"].as_i64().unwrap_or_default(),
+            expected.1 as i64
+        );
+        assert_eq!(
+            sig["si_signo_human_readable"].as_str().unwrap_or(""),
+            expected.0
+        );
+    }
+
     // Check signal-specific values
     match crash_typ {
         "null_deref" => {

bin_tests/tests/crashtracker_bin_test.rs

@@ -608,7 +608,6 @@ mod tests {
     #[cfg_attr(miri, ignore)]
     #[cfg(target_os = "linux")]
     #[test]
-    #[ignore]
     fn test_waitall_nohang() {
         // This test checks whether the crashtracking implementation can cause malformed `waitall()`
         // idioms to hang.

libdd-crashtracker/src/collector/api.rs

@@ -3,7 +3,7 @@
 
 use std::time::SystemTime;
 
-use crate::SigInfo;
+use crate::{OsInfo, SigInfo};
 
 use super::{build_crash_ping_message, CrashInfo, Experimental, Metadata, StackTrace};
 use anyhow::Context;
@@ -259,6 +259,9 @@ pub struct ErrorsIntakePayload {
     pub error: ErrorObject,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub trace_id: Option<String>,
+    pub os_info: OsInfo,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sig_info: Option<SigInfo>,
 }
 
 #[derive(Debug, Default)]
@@ -404,6 +407,8 @@ impl ErrorsIntakePayload {
             None
         };
 
+        let sig_info = crash_info.sig_info.clone();
+
         Ok(Self {
             timestamp,
             ddsource: "crashtracker".to_string(),
@@ -418,6 +423,8 @@ impl ErrorsIntakePayload {
                 experimental: crash_info.experimental.clone(),
             },
             trace_id: None,
+            os_info: ::os_info::get().into(),
+            sig_info,
         })
     }
 
@@ -476,7 +483,11 @@ impl ErrorsIntakePayload {
                 source_type: Some("Crashtracking".to_string()),
                 experimental: None,
             },
+            sig_info: sig_info.cloned(),
             trace_id: None,
+            // Crash ping does not include os_info, but we can recalculate it here
+            // so that errors intake crash pings include this information
+            os_info: ::os_info::get().into(),
         })
     }
 }
@@ -598,6 +609,7 @@ mod tests {
         std::env::remove_var("_DD_ERRORS_INTAKE_ENABLED");
     }
 
+    #[cfg_attr(miri, ignore)]
     #[test]
     fn test_errors_payload_from_crash_info() {
         let crash_info = CrashInfo::test_instance(1);
@@ -628,6 +640,7 @@ mod tests {
         assert!(ddtags.contains("si_signo_human_readable:SIGSEGV"));
     }
 
+    #[cfg_attr(miri, ignore)]
     #[test]
     fn test_errors_payload_from_crash_ping() {
         let metadata = Metadata::test_instance(1);
@@ -657,6 +670,7 @@ mod tests {
         assert!(ddtags.contains("si_signo_human_readable:SIGSEGV"));
     }
 
+    #[cfg_attr(miri, ignore)]
     #[test]
     fn test_errors_intake_has_all_telemetry_tags() {
         let crash_info = CrashInfo::test_instance(1);
@@ -691,6 +705,7 @@ mod tests {
         }
     }
 
+    #[cfg_attr(miri, ignore)]
     #[test]
     fn test_crash_ping_has_all_telemetry_tags() {
         let metadata = Metadata::test_instance(1);