datadog-ruby_core_source 3.4.3 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78aada62cc56a2d8bf03be22d66701dfd73cb2ac521de7968dbd59a90d2990a4
-  data.tar.gz: d9c8696a5d216fbd45a5f1f5e0e2a4d6026ff4ee428bb88395fde423f7fbf0d1
+  metadata.gz: 516e509afa1920fd3ed7cf382e06006d2ce680e00ba16ecd1a39f7f2dc417dbe
+  data.tar.gz: 87af7c48459a9d8d45d99ab063329352a529f5089cab54afff9c4dd34c03a182
 SHA512:
-  metadata.gz: 32c59556eb6ae3013799d29b24665178065bca89dc3037470b3138d0cadd3c4fd7b467cc574166c244116a20298091b96ac062255ea8040e35b671eb2ffe4f4b
-  data.tar.gz: 6a761e8c42d9e039d4413050c9c64f06fa6d3f3ce68e119082f79a2a2c7162750d92ba2406509916c66903628e9bd1834edc4855850273c977ed3184a8ad5546
+  metadata.gz: 3bf0c620ee078694ac52f390f7cd40e0408c19ce4b751c7383c74750152bd887baa461bf8df3ac837555150b67bf33b4466f06cb3718116a3c60063a389584a8
+  data.tar.gz: 810028e9bcdec7d9696acd62d16b1156e54ce68fd15e41f6461d46e30b47996067fd13d458ded3ad884b4880fb0bce480fb7f4805599bf6b6d3f3ed8e145efdc

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/lib/datadog/ruby_core_source/{ruby-3.5.0-preview1 → ruby-4.0.0-p0}/prism/extension.h

@@ -1,7 +1,7 @@
 #ifndef PRISM_EXT_NODE_H
 #define PRISM_EXT_NODE_H
 
-#define EXPECTED_PRISM_VERSION "1.4.0"
+#define EXPECTED_PRISM_VERSION "1.7.0"
 
 #include <ruby.h>
 #include <ruby/encoding.h>

data/lib/datadog/ruby_core_source/{ruby-4.0.0-preview3 → ruby-4.0.0-p0}/prism/options.h

@@ -97,8 +97,11 @@ typedef enum {
     /** The vendored version of prism in CRuby 4.0.x. */
     PM_OPTIONS_VERSION_CRUBY_4_0 = 3,
 
+    /** The vendored version of prism in CRuby 4.1.x. */
+    PM_OPTIONS_VERSION_CRUBY_4_1 = 4,
+
     /** The current version of prism. */
-    PM_OPTIONS_VERSION_LATEST = PM_OPTIONS_VERSION_CRUBY_4_0
+    PM_OPTIONS_VERSION_LATEST = PM_OPTIONS_VERSION_CRUBY_4_1
 } pm_options_version_t;
 
 /**

data/lib/datadog/ruby_core_source/{ruby-4.0.0-preview3 → ruby-4.0.0-p0}/prism/version.h

@@ -14,7 +14,7 @@
 /**
  * The minor version of the Prism library as an int.
  */
-#define PRISM_VERSION_MINOR 6
+#define PRISM_VERSION_MINOR 7
 
 /**
  * The patch version of the Prism library as an int.
@@ -24,6 +24,6 @@
 /**
  * The version of the Prism library as a constant string.
  */
-#define PRISM_VERSION "1.6.0"
+#define PRISM_VERSION "1.7.0"
 
 #endif

data/lib/datadog/ruby_core_source/{ruby-4.0.0-preview3 → ruby-4.0.0-p0}/vm_core.h

@@ -1048,6 +1048,7 @@ struct rb_execution_context_struct {
     rb_fiber_t *fiber_ptr;
     struct rb_thread_struct *thread_ptr;
     rb_serial_t serial;
+    rb_serial_t ractor_id;
 
     /* storage (ec (fiber) local) */
     struct rb_id_table *local_storage;
@@ -2070,6 +2071,14 @@ rb_ec_ractor_ptr(const rb_execution_context_t *ec)
     }
 }
 
+static inline rb_serial_t
+rb_ec_ractor_id(const rb_execution_context_t *ec)
+{
+    rb_serial_t ractor_id = ec->ractor_id;
+    RUBY_ASSERT(ractor_id);
+    return ractor_id;
+}
+
 static inline rb_vm_t *
 rb_ec_vm_ptr(const rb_execution_context_t *ec)
 {

data/lib/datadog/ruby_core_source/version.rb

@@ -1,5 +1,5 @@
 module Datadog
   module RubyCoreSource
-    VERSION = '3.4.3'
+    VERSION = '3.5.1'
   end
 end

data/lib/datadog/ruby_core_source.rb

@@ -70,7 +70,14 @@ module Datadog
 
     def self.ruby_source_dir_version(dir)
       match = /ruby-([0-9\.]+)-((p|rc|preview)[0-9]+)\z/.match(dir)
-      Gem::Version.new("#{match[1]}.#{match[2]}")
+
+      # Strip the `pN` suffix if it's a stable version; this ensures that it's treated correctly by the version sorting,
+      # otherwise for instance `4.0.0.preview2` > `4.0.0.p0` as far as `Gem::Version is concerned`
+      if match[2].match?(/p[0-9]+/)
+        Gem::Version.new("#{match[1]}")
+      else
+        Gem::Version.new("#{match[1]}.#{match[2]}")
+      end
     end
 
     def self.fallback_source_warning(ruby_version, fallback_version)

data/spec/datadog/ruby_core_source_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+require 'datadog/ruby_core_source'
+
+RSpec.describe Datadog::RubyCoreSource do
+  describe '.deduce_packaged_source_dir' do
+    before do
+      stub_const('RUBY_VERSION', ruby_version)
+    end
+
+    context 'when a stable exact match exists' do
+      let(:ruby_version) { '3.4.0' }
+      let(:ruby_dir) { 'ruby-3.4.0-p0' }
+
+      it 'returns the exact match directory' do
+        result = described_class.deduce_packaged_source_dir(ruby_dir)
+        expect(result).to end_with("/#{ruby_dir}")
+        expect(File.directory?(result)).to be true
+      end
+    end
+
+    context 'when a preview exact match exists' do
+      let(:ruby_version) { '4.0.0' } # Important: "preview" label doesn't show up on RUBY_VERSION
+      let(:ruby_dir) { 'ruby-4.0.0-preview2' }
+
+      it 'returns the exact match directory' do
+        result = described_class.deduce_packaged_source_dir(ruby_dir)
+        expect(result).to end_with('/ruby-4.0.0-preview2')
+        expect(File.directory?(result)).to be true
+      end
+    end
+
+    context 'when exact match does not exist' do
+      context 'with a patch version upgrade and there are no preview headers' do
+        let(:ruby_version) { '3.4.1' }
+        let(:ruby_dir) { 'ruby-3.4.1-p0' }
+
+        it 'falls back to the closest older version' do
+          expect(described_class).to receive(:fallback_source_warning).with(ruby_dir, 'ruby-3.4.0-p0')
+
+          result = described_class.deduce_packaged_source_dir(ruby_dir)
+          expect(result).to end_with('/ruby-3.4.0-p0')
+          expect(File.directory?(result)).to be true
+        end
+      end
+
+      context 'with a patch version upgrade and there are preview headers' do
+        let(:ruby_version) { '4.0.1' }
+        let(:ruby_dir) { 'ruby-4.0.1-p0' }
+
+        it 'falls back to the closest older version' do
+          expect(described_class).to receive(:fallback_source_warning).with(ruby_dir, 'ruby-4.0.0-p0')
+
+          result = described_class.deduce_packaged_source_dir(ruby_dir)
+          expect(result).to end_with('/ruby-4.0.0-p0')
+          expect(File.directory?(result)).to be true
+        end
+      end
+
+      context 'with a preview version' do
+        let(:ruby_version) { '4.0.0' } # Important: "preview" label doesn't show up on RUBY_VERSION
+        let(:ruby_dir) { 'ruby-4.0.0-preview3' }
+
+        it 'falls back to the stable version' do
+          expect(described_class).to receive(:fallback_source_warning).with(ruby_dir, 'ruby-4.0.0-p0')
+
+          result = described_class.deduce_packaged_source_dir(ruby_dir)
+          expect(result).to end_with('/ruby-4.0.0-p0')
+          expect(File.directory?(result)).to be true
+        end
+      end
+    end
+  end
+
+  describe '.ruby_source_dir_version' do
+     it 'parses stable versions correctly' do
+       expect(described_class.ruby_source_dir_version('ruby-2.7.0-p0')).to eq(Gem::Version.new('2.7.0'))
+       expect(described_class.ruby_source_dir_version('ruby-3.4.1-p0')).to eq(Gem::Version.new('3.4.1'))
+     end
+
+     it 'parses preview/rc versions correctly' do
+       expect(described_class.ruby_source_dir_version('ruby-3.4.0-preview1')).to eq(Gem::Version.new('3.4.0.preview1'))
+       expect(described_class.ruby_source_dir_version('ruby-4.0.0-rc2')).to eq(Gem::Version.new('4.0.0.rc2'))
+     end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,94 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  # https://rspec.info/features/3-12/rspec-core/configuration/zero-monkey-patching-mode/
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 1
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+end