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 (profiling): update libdatadog to v16.0.1 #12262

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −7
Draft

chore (profiling): update libdatadog to v16.0.1 #12262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 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,18 @@ include(FetchContent)
# Set version if not already set
if(NOT DEFINED TAG_LIBDATADOG)
set(TAG_LIBDATADOG
"v15.0.0"
"v16.0.1"
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")
"54416e4078fa9d923869ecae1a7b32e0c9ae0a47ab8c999812bb3b69cffb85bd libdatadog-aarch64-alpine-linux-musl.tar.gz"
"8459c7713e32e352915e78528bec37ea900489b9c2d9eb297df7976234640d70 libdatadog-aarch64-apple-darwin.tar.gz"
"ad16283494d565a1877c76d4a8765f789ec2acb70b0597b4efe6e7a20e8b4f97 libdatadog-aarch64-unknown-linux-gnu.tar.gz"
"384a50bb5013f6098b37da650f0fe9aa7c11f44780da971f8a4a35d2e342f00b libdatadog-x86_64-alpine-linux-musl.tar.gz"
"a6f676d1491198bc768dcae279a0343dd1a192da1dc9d34aadf408eeadf20840 libdatadog-x86_64-apple-darwin.tar.gz"
"6cea4ef4ecd4f40c1c69118bc1bb842c20782b710b838df3917d02eea7575a4e 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
13 changes: 12 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,15 @@ 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 = {
.memory_start = 0,
.memory_limit = 0,
.file_offset = 0,
.filename = to_slice(""),
.filename_id = {},
.build_id = to_slice(""),
.build_id_id = {}
};
name = string_storage.insert(name);
filename = string_storage.insert(filename);

Expand All @@ -71,8 +79,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 = {},
.system_name = {}, // No support for system_name in Python
.system_name_id = {},
.filename = to_slice(filename),
.filename_id = {},
.start_line = 0, // We don't know the start_line for the function
},
.address = address,
Expand Down
Loading