Skip to content

Commit c7d75d6

Browse files
authored
Merge pull request #4065 from DataDog/ivoanjo/libdatadog14-upgrade
[NO-TICKET] Upgrade to libdatadog 14.0
2 parents 8f4472b + ddbbbcb commit c7d75d6

File tree

550 files changed

+1506
-1508
lines changed

Some content is hidden

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

550 files changed

+1506
-1508
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', '~> 13.1.0.1.0'
72+
spec.add_dependency 'libdatadog', '~> 14.0.0.1.0'
7373

7474
spec.extensions = [
7575
'ext/datadog_profiling_native_extension/extconf.rb',

ext/libdatadog_api/crashtracker.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,10 @@ static VALUE _native_start_or_update_on_fork(int argc, VALUE *argv, DDTRACE_UNUS
6767
// The Ruby crash handler also seems to get confused when this option is enabled and
6868
// "Process.kill('SEGV', Process.pid)" gets run.
6969
.create_alt_stack = false,
70+
.use_alt_stack = true, // NOTE: This is a no-op in libdatadog 14.0; should be fixed in a future version
7071
.endpoint = endpoint,
7172
.resolve_frames = DDOG_CRASHT_STACKTRACE_COLLECTION_ENABLED_WITH_SYMBOLS_IN_RECEIVER,
72-
.timeout_secs = FIX2INT(upload_timeout_seconds),
73-
// Waits for crash tracker to finish reporting the issue before letting the Ruby process die; see
74-
// https://github.com/DataDog/libdatadog/pull/477 for details
75-
.wait_for_receiver = true,
73+
.timeout_ms = FIX2INT(upload_timeout_seconds) * 1000,
7674
};
7775

7876
ddog_crasht_Metadata metadata = {
@@ -97,7 +95,7 @@ static VALUE _native_start_or_update_on_fork(int argc, VALUE *argv, DDTRACE_UNUS
9795

9896
ddog_crasht_Result result =
9997
action == start_action ?
100-
ddog_crasht_init_with_receiver(config, receiver_config, metadata) :
98+
ddog_crasht_init(config, receiver_config, metadata) :
10199
ddog_crasht_update_on_fork(config, receiver_config, metadata);
102100

103101
// Clean up before potentially raising any exceptions

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 = '~> 13.1.0.1.0'
11+
LIBDATADOG_VERSION = '~> 14.0.0.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.

0 commit comments

Comments
 (0)