Skip to content

Commit

Permalink
chore(libdatadog): bump libdatadog to v15.0.0 (#12063)
Browse files Browse the repository at this point in the history
  • Loading branch information
BaptisteFoy authored Jan 24, 2025
1 parent a6d06c0 commit cf83444
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 15 deletions.
12 changes: 6 additions & 6 deletions ddtrace/internal/datadog/profiling/cmake/FindLibdatadog.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ include(FetchContent)
# Set version if not already set
if(NOT DEFINED TAG_LIBDATADOG)
set(TAG_LIBDATADOG
"v14.3.1"
"v15.0.0"
CACHE STRING "libdatadog github tag")
endif()

if(NOT DEFINED DD_CHECKSUMS)
set(DD_CHECKSUMS
"57f83aff275628bb1af89c22bb4bd696726daf2a9e09b6cd0d966b29e65a7ad6 libdatadog-aarch64-alpine-linux-musl.tar.gz"
"2be2efa98dfc32f109abdd79242a8e046a7a300c77634135eb293e000ecd4a4c libdatadog-aarch64-apple-darwin.tar.gz"
"36db8d50ccabb71571158ea13835c0f1d05d30b32135385f97c16343cfb6ddd4 libdatadog-aarch64-unknown-linux-gnu.tar.gz"
"2f61fd21cf2f8147743e414b4a8c77250a17be3aecc42a69ffe54f0a603d5c92 libdatadog-x86_64-alpine-linux-musl.tar.gz"
"f01f05600591063eba4faf388f54c155ab4e6302e5776c7855e3734955f7daf7 libdatadog-x86_64-unknown-linux-gnu.tar.gz")
"d5b969b293e5a9e5e36404a553bbafdd55ff6af0b089698bd989a878534df0c7 libdatadog-aarch64-alpine-linux-musl.tar.gz"
"4540ffb8ccb671550a39ba79226117086582c1eaf9714180a9e26bd6bb175860 libdatadog-aarch64-apple-darwin.tar.gz"
"31bceab4f56873b03b3728760d30e3abc493d32ca8fdc9e1f2ec2147ef4d5424 libdatadog-aarch64-unknown-linux-gnu.tar.gz"
"530348c4b02cc7096de2231476ec12db82e2cc6de12a87e5b28af47ea73d4e56 libdatadog-x86_64-alpine-linux-musl.tar.gz"
"5073ffc657bc4698f8bdd4935475734577bfb18c54dcbebc4f7d8c7595626e52 libdatadog-x86_64-unknown-linux-gnu.tar.gz")
endif()

# Determine platform-specific tarball name in a way that conforms to the libdatadog naming scheme in Github releases
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ Datadog::Crashtracker::start()

auto result = ddog_crasht_init(config, receiver_config, metadata);
ddog_Vec_Tag_drop(tags);
if (result.tag != DDOG_CRASHT_RESULT_OK) { // NOLINT (cppcoreguidelines-pro-type-union-access)
auto err = result.err; // NOLINT (cppcoreguidelines-pro-type-union-access)
if (result.tag != DDOG_VOID_RESULT_OK) { // NOLINT (cppcoreguidelines-pro-type-union-access)
auto err = result.err; // NOLINT (cppcoreguidelines-pro-type-union-access)
std::string errmsg = err_to_msg(&err, "Error initializing crash tracker");
std::cerr << errmsg << std::endl;
ddog_Error_drop(&err);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ crashtracker_receiver_entry() // cppcheck-suppress unusedFunction
{
// Assumes that this will be called only in the receiver binary, which is a
// fresh process
ddog_crasht_Result new_result = ddog_crasht_receiver_entry_point_stdin();
if (new_result.tag != DDOG_CRASHT_RESULT_OK) {
ddog_VoidResult new_result = ddog_crasht_receiver_entry_point_stdin();
if (new_result.tag != DDOG_VOID_RESULT_OK) {
ddog_CharSlice message = ddog_Error_message(&new_result.err);

//`write` may not write what we want it to write, but there's nothing we can do about it,
Expand Down
2 changes: 2 additions & 0 deletions releasenotes/notes/libdatadog-v15.0.0-1004e5bb7f452d9a.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
upgrade:
- Bumps libdatadog dependency to v15.0.0.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
LIBDDWAF_VERSION = "1.22.0"

# DEV: update this accordingly when src/core upgrades libdatadog dependency.
# libdatadog v14.1.0 requires rust 1.76.
RUST_MINIMUM_VERSION = "1.76"
# libdatadog v15.0.0 requires rust 1.78.
RUST_MINIMUM_VERSION = "1.78"

# Set macOS SDK default deployment target to 10.14 for C++17 support (if unset, may default to 10.9)
if CURRENT_OS == "Darwin":
Expand Down
4 changes: 2 additions & 2 deletions src/core/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ opt-level = 3

[dependencies]
pyo3 = { version = "0.22.3", features = ["extension-module"] }
datadog-ddsketch = { git = "https://github.com/DataDog/libdatadog", rev = "v14.3.1" }
datadog-ddsketch = { git = "https://github.com/DataDog/libdatadog", rev = "v15.0.0" }

[build-dependencies]
pyo3-build-config = "0.21.2"
Expand Down

0 comments on commit cf83444

Please sign in to comment.