Merge branch 'main' into nicholas.hulston/fix-span-link-optional-fields

Author: nhulston

Cargo.lock

@@ -58,7 +58,7 @@ resolver = "2"
 [workspace.package]
 rust-version = "1.78.0"
 edition = "2021"
-version = "15.0.0"
+version = "16.0.3"
 license = "Apache-2.0"
 
 [profile.dev]
@@ -73,6 +73,12 @@ opt-level = "s"            # optimize for size
 [profile.release.package.datadog-serverless-trace-mini-agent]
 strip = true
 
+[profile.bench]
+codegen-units = 1
+debug = false
+incremental = false
+opt-level = 3
+
 # https://camshaft.github.io/bolero/library-installation.html
 [profile.fuzz]
 inherits = "dev"

Cargo.toml

@@ -13,6 +13,10 @@ fn main() -> anyhow::Result<()> {
 mod unix {
     use anyhow::Context;
     use bin_tests::modes::behavior::get_behavior;
+    use nix::{
+        sys::signal::{kill, raise, Signal},
+        unistd::Pid,
+    };
     use std::env;
     use std::path::Path;
 
@@ -24,8 +28,9 @@ mod unix {
     const TEST_COLLECTOR_TIMEOUT_MS: u32 = 10_000;
 
     #[inline(never)]
-    unsafe fn deref_ptr(p: *mut u8) {
+    unsafe fn deref_ptr(p: *mut u8) -> u8 {
         *std::hint::black_box(p) = std::hint::black_box(1);
+        *std::hint::black_box(p)
     }
 
     pub fn main() -> anyhow::Result<()> {
@@ -34,6 +39,7 @@ mod unix {
         let receiver_binary = args.next().context("Unexpected number of arguments")?;
         let output_dir = args.next().context("Unexpected number of arguments")?;
         let mode_str = args.next().context("Unexpected number of arguments")?;
+        let crash_typ = args.next().context("Missing crash type")?;
         anyhow::ensure!(args.next().is_none(), "unexpected extra arguments");
 
         let stderr_filename = format!("{output_dir}/out.stderr");
@@ -54,6 +60,7 @@ mod unix {
             create_alt_stack: true,
             use_alt_stack: true,
             resolve_frames: crashtracker::StacktraceCollection::WithoutSymbols,
+            signals: crashtracker::default_signals(),
             endpoint,
             timeout_ms: TEST_COLLECTOR_TIMEOUT_MS,
             unix_socket_path: Some("".to_string()),
@@ -95,11 +102,22 @@ mod unix {
         behavior.post(output_dir)?;
 
         crashtracker::begin_op(crashtracker::OpTypes::ProfilerCollectingSample)?;
-        unsafe {
-            deref_ptr(std::ptr::null_mut::<u8>());
+        match crash_typ.as_str() {
+            "kill_sigabrt" => kill(Pid::this(), Signal::SIGABRT)?,
+            "kill_sigill" => kill(Pid::this(), Signal::SIGILL)?,
+            "kill_sigbus" => kill(Pid::this(), Signal::SIGBUS)?,
+            "kill_sigsegv" => kill(Pid::this(), Signal::SIGSEGV)?,
+            "null_deref" => {
+                let x = unsafe { deref_ptr(std::ptr::null_mut::<u8>()) };
+                println!("{x}");
+            }
+            "raise_sigabrt" => raise(Signal::SIGABRT)?,
+            "raise_sigill" => raise(Signal::SIGILL)?,
+            "raise_sigbus" => raise(Signal::SIGBUS)?,
+            "raise_sigsegv" => raise(Signal::SIGSEGV)?,
+            _ => anyhow::bail!("Unexpected crash_typ: {crash_typ}"),
         }
         crashtracker::end_op(crashtracker::OpTypes::ProfilerCollectingSample)?;
-
         Ok(())
     }
 }