Merge pull request #2875 from DataDog/ivoanjo/debase-ruby_core_source…

…-3.2.1 Bump debase-ruby_core_source dependency to 3.2.1
DataDog · May 24, 2023 · 7b4e8e4 · 7b4e8e4
2 parents c38d420 + 9574a90
commit 7b4e8e4
Show file tree

Hide file tree

Showing 578 changed files with 4,085 additions and 6,883 deletions.
diff --git a/Gemfile b/Gemfile
@@ -121,8 +121,3 @@ end
 gem 'docile', '~> 1.3.5' if RUBY_VERSION < '2.5'
 gem 'ffi', '~> 1.12.2' if RUBY_VERSION < '2.3'
 gem 'msgpack', '~> 1.3.3' if RUBY_VERSION < '2.4'
-
-# Temporarily needed, to support Ruby 3.3; upstream PR is at https://github.com/ruby-debug/debase-ruby_core_source/pull/8
-gem 'debase-ruby_core_source',
-  git: 'https://github.com/datadog/debase-ruby_core_source.git',
-  ref: 'a1f7dd0fde213e2cbba18e60db49b7c64483048b'
diff --git a/ddtrace.gemspec b/ddtrace.gemspec
@@ -56,14 +56,10 @@ Gem::Specification.new do |spec|
   # rubies, see #1739 and #1336 for an extended discussion about this
   spec.add_dependency 'msgpack'
 
-  # Used by the profiler native extension to support older Rubies (see NativeExtensionDesign.md for notes)
+  # Used by the profiler native extension to support Ruby < 2.6 and > 3.2
   #
-  # Most versions of this gem work for us, but 0.10.16 includes an important fix for Ruby 2.5.4 to 2.5.9
-  # (https://github.com/ruby-debug/debase-ruby_core_source/pull/6) so we should keep that as a lower bound going
-  # forward.
-  #
-  # We're pinning it at the latest available version and will manually bump the dependency as needed.
-  spec.add_dependency 'debase-ruby_core_source', '>= 0.10.16', '<= 3.2.0'
+  # We decided to pin it at the latest available version and will manually bump the dependency as needed.
+  spec.add_dependency 'debase-ruby_core_source', '= 3.2.1'
 
   # Used by appsec
   spec.add_dependency 'libddwaf', '~> 1.9.0.0.0'

diff --git a/gemfiles/jruby_9.2.21.0_contrib.gemfile b/gemfiles/jruby_9.2.21.0_contrib.gemfile
diff --git a/gemfiles/jruby_9.2.21.0_contrib.gemfile.lock b/gemfiles/jruby_9.2.21.0_contrib.gemfile.lock
diff --git a/gemfiles/jruby_9.2.21.0_contrib_old.gemfile b/gemfiles/jruby_9.2.21.0_contrib_old.gemfile
diff --git a/gemfiles/jruby_9.2.21.0_contrib_old.gemfile.lock b/gemfiles/jruby_9.2.21.0_contrib_old.gemfile.lock
diff --git a/gemfiles/jruby_9.2.21.0_core_old.gemfile b/gemfiles/jruby_9.2.21.0_core_old.gemfile
diff --git a/gemfiles/jruby_9.2.21.0_core_old.gemfile.lock b/gemfiles/jruby_9.2.21.0_core_old.gemfile.lock
diff --git a/gemfiles/jruby_9.2.21.0_cucumber3.gemfile b/gemfiles/jruby_9.2.21.0_cucumber3.gemfile