[PROF-8074] Restore support for Ruby 3.3 #3167
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 9e812f0.
This reverts commit 06c2ac6.
**What does this PR do?** Back in #3053, a customer reported that profiling was not working on ruby-head (for Ruby 3.3). At the time, I tracked it down to two issues: 1. A bunch of headers had changed, and thus we needed a new release of `debase-ruby_core_source` to include them 2. We were getting errors when loading the profiler due to the `ruby_current_ec` VM symbol no longer being available. At the time, I chose to disable profiling on Ruby 3.3 (#3054) until we could tackle these two items. Item 1. was fixed in #3163, that pulls in a new release of `debase-ruby_core_source` that includes the 3.3-preview2 headers. This PR fixes item 2. and re-enables profiling on Ruby 3.3 (and thus reverts #3054). **Motivation:** Make sure we're in good shape for the Ruby 3.3 final release in December. **Additional Notes:** We didn't use the magic `ruby_current_ec` VM symbol directly. Instead, we were using `GET_RACTOR()` and `GET_EC()` which call a few methods that are defined as `inline` in `vm_core.h`. Those methods all relied on `ruby_current_ec`, and thus hiding that symbol made them break. As an alternative, we can get to the same objects by starting with the current thread, and navigating the object graph a bit. The `rb_thread_current()` also relies on `ruby_current_ec` but crucially **is not inline** and is actually a public API of the VM, so that one kept working. I hesitated on if we should use `rb_thread_current()` on all Rubies with Ractors, or if we should keep the fast path for 3.0 to 3.2. I ended up deciding to keep the fast path since it was quite easy to do, but in the future we could instead choose to simplify this whole thing. P.s.: This is one of those PRs where a lot of work went into a handful of unimpressive lines of code 😅 . **How to test the change?** Validate that CI is passing on Ruby 3.3! Fixes #3053
Base automatically changed from
ivoanjo/bump-debase-ruby-core-source-3_2_2
to
master
September 28, 2023 10:00
ekump
approved these changes
Sep 28, 2023
gdubicki
added a commit
to gdubicki/dd-trace-rb
that referenced
this pull request
Jan 8, 2024
as it has been added in DataDog#3167
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Back in #3053, a customer reported that profiling was not working on ruby-head (for Ruby 3.3).
At the time, I tracked it down to two issues:
debase-ruby_core_sourceto include themruby_current_ecVM symbol no longer being available.At the time, I chose to disable profiling on Ruby 3.3 (#3054) until we could tackle these two items.
Item 1. was fixed in #3163, that pulls in a new release of
debase-ruby_core_sourcethat includes the 3.3-preview2 headers.This PR fixes item 2. and re-enables profiling on Ruby 3.3 (and thus reverts #3054).
Motivation:
Make sure we're in good shape for the Ruby 3.3 final release in December.
Additional Notes:
We didn't use the magic
ruby_current_ecVM symbol directly. Instead, we were usingGET_RACTOR()andGET_EC()which call a few methods that are defined asinlineinvm_core.h.Those methods all relied on
ruby_current_ec, and thus hiding that symbol made them break.As an alternative, we can get to the same objects by starting with the current thread, and navigating the object graph a bit.
The
rb_thread_current()also relies onruby_current_ecbut crucially is not inline and is actually a public API of the VM, so that one kept working.I hesitated on if we should use
rb_thread_current()on all Rubies with Ractors, or if we should keep the fast path for 3.0 to 3.2. I ended up deciding to keep the fast path since it was quite easy to do, but in the future we could instead choose to simplify this whole thing.P.s.: This is one of those PRs where a lot of work went into a handful of unimpressive lines of code 😅 .
This PR is on top of #3163 because it requires the new version of
debase-ruby_core_sourcebut is otherwise independent from itHow to test the change?
Validate that CI is passing on Ruby 3.3!
For Datadog employees:
credentials of any kind, I've requested a review from
@DataDog/security-design-and-guidance.Fixes #3053