Skip to content

Commit 86c8b84

Browse files
authored
chore(profiling): update libdatadog to v24.0.1 (#3492)
1 parent 12004d3 commit 86c8b84

File tree

10 files changed

+136
-111
lines changed

10 files changed

+136
-111
lines changed

Cargo.lock

Lines changed: 104 additions & 84 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

profiling/Cargo.toml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@ cfg-if = { version = "1.0" }
2222
cpu-time = { version = "1.0" }
2323
chrono = { version = "0.4" }
2424
crossbeam-channel = { version = "0.5", default-features = false, features = ["std"] }
25-
26-
# Use a libdatadog version after v23 to get a fix for cc_utils. Unfortunately,
27-
# it's also only halfway through the crate renaming migration.
28-
libdd-alloc = { git = "https://github.com/DataDog/libdatadog", rev = "aa2396efbb14b196e91de88a73bb4e1a7d06f74b" }
29-
datadog-profiling = { git = "https://github.com/DataDog/libdatadog", rev = "aa2396efbb14b196e91de88a73bb4e1a7d06f74b" }
30-
ddcommon = { git = "https://github.com/DataDog/libdatadog", rev = "aa2396efbb14b196e91de88a73bb4e1a7d06f74b" }
25+
libdd-alloc = { git = "https://github.com/DataDog/libdatadog", tag = "v24.0.1" }
26+
libdd-profiling = { git = "https://github.com/DataDog/libdatadog", rev = "v24.0.1" }
27+
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "v24.0.1" }
3128
libdd-library-config-ffi = { path = "../libdatadog/libdd-library-config-ffi" }
3229
env_logger = { version = "0.11", default-features = false }
3330
lazy_static = { version = "1.4" }

profiling/build.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,9 @@ fn cfg_zts() {
431431
// Create a temporary C file to probe ZTS
432432
let out_dir = env::var("OUT_DIR").unwrap();
433433
let probe_path = Path::new(&out_dir).join("zts_probe.c");
434-
fs::write(&probe_path, r#"
434+
fs::write(
435+
&probe_path,
436+
r#"
435437
#include "main/php_config.h"
436438
#include <stdio.h>
437439
int main() {
@@ -442,7 +444,9 @@ int main() {
442444
#endif
443445
return 0;
444446
}
445-
"#).expect("Failed to write ZTS probe file");
447+
"#,
448+
)
449+
.expect("Failed to write ZTS probe file");
446450

447451
// Get the C compiler from cc crate
448452
let compiler = cc::Build::new().get_compiler();

0 commit comments

Comments
 (0)