Skip to content

Commit 595581d

Browse files
authored
Merge pull request #4353 from DataDog/ivoanjo/prof-11306-libdatadog16_0_1-upgrade
[PROF-11306] Upgrade libdatadog dependency to 16.0.1
2 parents 9404631 + 78670f1 commit 595581d

File tree

565 files changed

+1550
-1550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

565 files changed

+1550
-1550
lines changed

datadog.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Gem::Specification.new do |spec|
6969

7070
# When updating the version here, please also update the version in `libdatadog_extconf_helpers.rb`
7171
# (and yes we have a test for it)
72-
spec.add_dependency 'libdatadog', '~> 14.3.1.1.0'
72+
spec.add_dependency 'libdatadog', '~> 16.0.1.1.0'
7373

7474
# Will no longer be a default gem on Ruby 3.5, see
7575
# https://github.com/ruby/ruby/commit/d7e558e3c48c213d0e8bedca4fb547db55613f7c and

ext/datadog_profiling_native_extension/collectors_stack.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ void sample_thread(
300300
}
301301

302302
buffer->locations[i] = (ddog_prof_Location) {
303-
.mapping = {.filename = DDOG_CHARSLICE_C(""), .build_id = DDOG_CHARSLICE_C("")},
303+
.mapping = {.filename = DDOG_CHARSLICE_C(""), .build_id = DDOG_CHARSLICE_C(""), .build_id_id = {}},
304304
.function = (ddog_prof_Function) {.name = name_slice, .filename = filename_slice},
305305
.line = line,
306306
};
@@ -379,7 +379,7 @@ static void maybe_add_placeholder_frames_omitted(VALUE thread, sampling_buffer*
379379
ddog_CharSlice function_name = DDOG_CHARSLICE_C("");
380380
ddog_CharSlice function_filename = {.ptr = frames_omitted_message, .len = strlen(frames_omitted_message)};
381381
buffer->locations[buffer->max_frames - 1] = (ddog_prof_Location) {
382-
.mapping = {.filename = DDOG_CHARSLICE_C(""), .build_id = DDOG_CHARSLICE_C("")},
382+
.mapping = {.filename = DDOG_CHARSLICE_C(""), .build_id = DDOG_CHARSLICE_C(""), .build_id_id = {}},
383383
.function = (ddog_prof_Function) {.name = function_name, .filename = function_filename},
384384
.line = 0,
385385
};
@@ -426,7 +426,7 @@ void record_placeholder_stack(
426426
ddog_CharSlice placeholder_stack
427427
) {
428428
ddog_prof_Location placeholder_location = {
429-
.mapping = {.filename = DDOG_CHARSLICE_C(""), .build_id = DDOG_CHARSLICE_C("")},
429+
.mapping = {.filename = DDOG_CHARSLICE_C(""), .build_id = DDOG_CHARSLICE_C(""), .build_id_id = {}},
430430
.function = {.name = DDOG_CHARSLICE_C(""), .filename = placeholder_stack},
431431
.line = 0,
432432
};

ext/datadog_profiling_native_extension/heap_recorder.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ static int st_object_records_iterate(DDTRACE_UNUSED st_data_t key, st_data_t val
678678
for (uint16_t i = 0; i < stack->frames_len; i++) {
679679
const heap_frame *frame = &stack->frames[i];
680680
locations[i] = (ddog_prof_Location) {
681-
.mapping = {.filename = DDOG_CHARSLICE_C(""), .build_id = DDOG_CHARSLICE_C("")},
681+
.mapping = {.filename = DDOG_CHARSLICE_C(""), .build_id = DDOG_CHARSLICE_C(""), .build_id_id = {}},
682682
.function = {
683683
.name = {.ptr = frame->name, .len = strlen(frame->name)},
684684
.filename = {.ptr = frame->filename, .len = strlen(frame->filename)},

ext/libdatadog_api/crashtracker.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static VALUE _native_start_or_update_on_fork(int argc, VALUE *argv, DDTRACE_UNUS
9898
.optional_stdout_filename = {},
9999
};
100100

101-
ddog_crasht_Result result =
101+
ddog_VoidResult result =
102102
action == start_action ?
103103
ddog_crasht_init(config, receiver_config, metadata) :
104104
ddog_crasht_update_on_fork(config, receiver_config, metadata);
@@ -108,17 +108,17 @@ static VALUE _native_start_or_update_on_fork(int argc, VALUE *argv, DDTRACE_UNUS
108108
ddog_endpoint_drop(endpoint);
109109
// }} End of exception-free zone to prevent leaks
110110

111-
if (result.tag == DDOG_CRASHT_RESULT_ERR) {
111+
if (result.tag == DDOG_VOID_RESULT_ERR) {
112112
rb_raise(rb_eRuntimeError, "Failed to start/update the crash tracker: %"PRIsVALUE, get_error_details_and_drop(&result.err));
113113
}
114114

115115
return Qtrue;
116116
}
117117

118118
static VALUE _native_stop(DDTRACE_UNUSED VALUE _self) {
119-
ddog_crasht_Result result = ddog_crasht_shutdown();
119+
ddog_VoidResult result = ddog_crasht_shutdown();
120120

121-
if (result.tag == DDOG_CRASHT_RESULT_ERR) {
121+
if (result.tag == DDOG_VOID_RESULT_ERR) {
122122
rb_raise(rb_eRuntimeError, "Failed to stop the crash tracker: %"PRIsVALUE, get_error_details_and_drop(&result.err));
123123
}
124124

ext/libdatadog_extconf_helpers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module Datadog
88
module LibdatadogExtconfHelpers
99
# Used to make sure the correct gem version gets loaded, as extconf.rb does not get run with "bundle exec" and thus
1010
# may see multiple libdatadog versions. See https://github.com/DataDog/dd-trace-rb/pull/2531 for the horror story.
11-
LIBDATADOG_VERSION = '~> 14.3.1.1.0'
11+
LIBDATADOG_VERSION = '~> 16.0.1.1.0'
1212

1313
# Used as an workaround for a limitation with how dynamic linking works in environments where the datadog gem and
1414
# libdatadog are moved after the extension gets compiled.

gemfiles/jruby_9.2_activesupport.gemfile.lock

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

gemfiles/jruby_9.2_aws.gemfile.lock

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

gemfiles/jruby_9.2_contrib.gemfile.lock

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

gemfiles/jruby_9.2_contrib_old.gemfile.lock

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

gemfiles/jruby_9.2_core_old.gemfile.lock

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

gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock

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

gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock

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

gemfiles/jruby_9.2_elasticsearch_latest.gemfile.lock

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

gemfiles/jruby_9.2_graphql_2.0.gemfile.lock

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

gemfiles/jruby_9.2_http.gemfile.lock

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

gemfiles/jruby_9.2_opensearch_2.gemfile.lock

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

gemfiles/jruby_9.2_opensearch_3.gemfile.lock

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

gemfiles/jruby_9.2_opensearch_latest.gemfile.lock

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

gemfiles/jruby_9.2_rack_1.gemfile.lock

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

gemfiles/jruby_9.2_rack_2.gemfile.lock

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

gemfiles/jruby_9.2_rack_3.gemfile.lock

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

gemfiles/jruby_9.2_rack_latest.gemfile.lock

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

0 commit comments

Comments
 (0)