Merge branch 'main' into vianney/inplace-trace-normalization

DataDog · Jul 5, 2024 · 899ff91 · 899ff91
2 parents 4ecddd0 + 3142b2d
commit 899ff91
Show file tree

Hide file tree

Showing 6 changed files with 1,185 additions and 746 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/LICENSE-3rdparty.yml b/LICENSE-3rdparty.yml
diff --git a/crashtracker/Cargo.toml b/crashtracker/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["lib"]
 
 [target.'cfg(unix)'.dependencies]
 # Should be kept in sync with the libdatadog symbolizer crate (also using blasesym)
-blazesym = {git = "https://github.com/libbpf/blazesym.git", rev = "v0.2.0-alpha.11"}
+blazesym = { git = "https://github.com/libbpf/blazesym.git", rev = "v0.2.0-rc.0" }
 
 [dependencies]
 anyhow = "1.0"

diff --git a/crashtracker/src/stacktrace.rs b/crashtracker/src/stacktrace.rs
@@ -69,13 +69,13 @@ mod unix {
         Pid,
     };
 
-    impl From<&UserMeta> for NormalizedAddressMeta {
-        fn from(value: &UserMeta) -> Self {
+    impl<'src> From<&UserMeta<'src>> for NormalizedAddressMeta {
+        fn from(value: &UserMeta<'src>) -> Self {
             match value {
                 UserMeta::Apk(a) => Self::Apk(a.path.clone()),
                 UserMeta::Elf(e) => Self::Elf {
                     path: e.path.clone(),
-                    build_id: e.build_id.clone(),
+                    build_id: e.build_id.as_ref().map(|cow| cow.clone().into_owned()),
                 },
                 UserMeta::Unknown(_) => Self::Unknown,
                 _ => Self::Unexpected(format!("{value:?}")),

diff --git a/symbolizer-ffi/Cargo.toml b/symbolizer-ffi/Cargo.toml
@@ -15,4 +15,4 @@ crate-type = ["lib"]
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
 # Should be kept in sync with the libdatadog crashtracker crate (also using blasesym)
-blazesym-c = { git = "https://github.com/libbpf/blazesym.git", rev = "v0.2.0-alpha.11" }
+blazesym-c = { git = "https://github.com/libbpf/blazesym.git", rev = "v0.2.0-rc.0" }