Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NO-TICKET] Import upstream rb_profile_frames fix #3352

Merged
merged 1 commit into from
Jan 4, 2024

Conversation

ivoanjo
Copy link
Member

@ivoanjo ivoanjo commented Jan 2, 2024

What does this PR do?

This PR imports an upstream fix to rb_profile_frames from ruby/ruby#9310 into our own custom copy of that function.

Motivation:

As explained in the comment, the situation being handled does not yet happen with dd-trace-rb in practice since we don't support profiling with MN threads enabled, but since we want to try supporting it at some point, I've gone ahead and imported the fix.

Additional Notes:

N/A

How to test the change?

This is a bit awkward to test, so didn't add any coverage.

For Datadog employees:

  • If this PR touches code that signs or publishes builds or packages, or handles
    credentials of any kind, I've requested a review from @DataDog/security-design-and-guidance.
  • This PR doesn't touch any of that.

**What does this PR do?**

This PR imports an upstream fix to `rb_profile_frames` from
ruby/ruby#9310 into our own custom copy of
that function.

**Motivation:**

As explained in the comment, the situation being handled does not yet
happen with dd-trace-rb in practice since we don't support profiling
with MN threads enabled, but since we want to try supporting it at
some point, I've gone ahead and imported the fix.

**Additional Notes:**

N/A

**How to test the change?**

This is a bit awkward to test, so didn't add any coverage.
@ivoanjo ivoanjo requested a review from a team as a code owner January 2, 2024 11:23
@github-actions github-actions bot added the profiling Involves Datadog profiling label Jan 2, 2024
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (d4b2b3e) 98.23% compared to head (17d01ca) 98.23%.
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3352      +/-   ##
==========================================
- Coverage   98.23%   98.23%   -0.01%     
==========================================
  Files        1253     1253              
  Lines       73035    73035              
  Branches     3429     3428       -1     
==========================================
- Hits        71749    71748       -1     
- Misses       1286     1287       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ivoanjo ivoanjo merged commit 187608d into master Jan 4, 2024
219 checks passed
@ivoanjo ivoanjo deleted the ivoanjo/import-upstream-rb-profile-frames-fix branch January 4, 2024 18:33
@github-actions github-actions bot added this to the 1.19.0 milestone Jan 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
profiling Involves Datadog profiling
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants