Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(libdatadog): upgrade to v16.0.3 #12529

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+23 −13
Open

chore(libdatadog): upgrade to v16.0.3 #12529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c9872a
chore(libdatadog): upgrade to v16.0.3
mabdinur Feb 26, 2025
cff144d
fix profiling and ddsketch
mabdinur Feb 26, 2025
7545491
fmt
mabdinur Feb 26, 2025
44b3fcd
update sample
mabdinur Feb 26, 2025
4c08612
fmt
mabdinur Feb 26, 2025
8021ece
Merge branch 'main' into munir/bump-lib-datadog
mabdinur Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions ddtrace/internal/datadog/profiling/cmake/FindLibdatadog.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,20 @@ include(FetchContent)
# Set version if not already set
if(NOT DEFINED TAG_LIBDATADOG)
set(TAG_LIBDATADOG
"v15.0.0"
"v16.0.3"
CACHE STRING "libdatadog github tag")
endif()

if(NOT DEFINED DD_CHECKSUMS)
set(DD_CHECKSUMS
"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")
"dd08d3a4dbbd765392121d27b790d7818e80dd28500b554db16e9186b1025ba9 libdatadog-aarch64-alpine-linux-musl.tar.gz"
"2d7933e09dc39706e9c99c7edcff5c60f7567ea2777157596de828f62f39035b libdatadog-aarch64-apple-darwin.tar.gz"
"decc01a2e0f732cabcc56594429a3dbc13678070e07f24891555dcc02df2e516 libdatadog-aarch64-unknown-linux-gnu.tar.gz"
"fdf4e188d0e92150ad2fbb22e65a645d86d8a4eb04bbd9754683ae1adaf48eb4 libdatadog-i686-alpine-linux-musl.tar.gz"
"63ace200493cd8e108be11cbf5ba19b5bd9a2e1cb730bdefd0a14ae217b716f5 libdatadog-i686-unknown-linux-gnu.tar.gz"
"8e09afd3cfb5ace85501f37b4bd6378299ebbf71189ccc2173169998b75b4b56 libdatadog-x86_64-alpine-linux-musl.tar.gz"
"ced5db61e0ca8e974b9d59b0b6833c28e19445a3e4ec3c548fda965806c17560 libdatadog-x86_64-apple-darwin.tar.gz"
"caaec84fc9afbcb3ec4618791b3c3f1ead65196009e9f07fd382e863dc3bdc66 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
5 changes: 4 additions & 1 deletion ddtrace/internal/datadog/profiling/dd_wrapper/src/sample.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Datadog::Sample::profile_clear_state()
void
Datadog::Sample::push_frame_impl(std::string_view name, std::string_view filename, uint64_t address, int64_t line)
{
static const ddog_prof_Mapping null_mapping = { 0, 0, 0, to_slice(""), to_slice("") };
static const ddog_prof_Mapping null_mapping = { 0, 0, 0, to_slice(""), { 0 }, to_slice(""), { 0 } };
name = string_storage.insert(name);
filename = string_storage.insert(filename);

Expand All @@ -71,8 +71,11 @@ Datadog::Sample::push_frame_impl(std::string_view name, std::string_view filenam
.mapping = null_mapping, // No support for mappings in Python
.function = {
.name = to_slice(name),
.name_id = { 0 },
.system_name = {}, // No support for system_name in Python
.system_name_id = { 0 },
.filename = to_slice(filename),
.filename_id = { 0 },
.start_line = 0, // We don't know the start_line for the function
},
.address = address,
Expand Down
2 changes: 1 addition & 1 deletion ddtrace/profiling/collector/_memalloc_reentrant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ atomic_add_clamped(uint64_t* target, uint64_t amount, uint64_t max)
// consumer CPU generally used by our customers.
int attempts = 96;
while (attempts--) {
uint64_t old_val = (volatile uint64_t)*target;
uint64_t old_val = (volatile uint64_t) * target;

// CAS loop + saturation check
uint64_t new_val = old_val + amount;
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/upgrade-libdatadog-v16-0-3-c47ce9b03c69cb63.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
upgrade:
- |
Bumps libdatadog dependency to v16.0.3.
6 changes: 3 additions & 3 deletions src/native/Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions src/native/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ opt-level = 3

[dependencies]
pyo3 = { version = "0.22.3", features = ["extension-module"] }
datadog-ddsketch = { git = "https://github.com/DataDog/libdatadog", rev = "v16.0.2" }
datadog-library-config = { git = "https://github.com/DataDog/libdatadog", rev = "v16.0.2" }
datadog-ddsketch = { git = "https://github.com/DataDog/libdatadog", rev = "v16.0.3" }
datadog-library-config = { git = "https://github.com/DataDog/libdatadog", rev = "v16.0.3" }

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