[PROF-9257] Fix incorrect platform detection for x86_64-linux-gnu/aarch64-linux-gnu #338
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
…ch64-linux-gnu **What does this PR do?** This PR fixes platform detection not working correctly when the user's platform is `x86_64-linux-gnu`/`aarch64-linux-gnu`. This manifested to a user as the following error: > Profiling was requested but is not supported, profiling disabled: Your > ddtrace installation is missing support for the Continuous Profiler > because the `libdatadog` gem installed on your system is missing > binaries for your platform variant. > (Your platform: `x86_64-linux-gnu`) > (Available binaries: `x86_64-linux`, `x86_64-linux-musl`) In the past, rubygems did this normalization for us (we even had a comment mentioning it in the code!) but this was removed in rubygems/rubygems#5852 for Rubygems 3.4+ I'm also bumping the `GEM_MAJOR_VERSION` in the `version.rb` file so I can release this fix as libdatadog 6.0.0.2.0 for Ruby as soon as this PR is merged. **Motivation:** Make sure our platform detection code is correct. **Additional Notes:** N/A **How to test the change?** This change includes test coverage.
AlexJF
approved these changes
Mar 4, 2024
ivoanjo
added a commit
to DataDog/dd-trace-rb
that referenced
this pull request
Mar 4, 2024
…r x86_64-linux-gnu/aarch64-linux-gnu **What does this PR do?** This PR pulls in the change from DataDog/libdatadog#338 that fixes platform detection not working correctly when the user's platform is `x86_64-linux-gnu`/`aarch64-linux-gnu`. This manifested to a user as the following error: > Profiling was requested but is not supported, profiling disabled: Your > ddtrace installation is missing support for the Continuous Profiler > because the `libdatadog` gem installed on your system is missing > binaries for your platform variant. > (Your platform: `x86_64-linux-gnu`) > (Available binaries: `x86_64-linux`, `x86_64-linux-musl`) The fix is entirely on the libdatadog side; on the dd-trace-rb side we only need to pick up that libdatadog version. **Motivation:** Make sure our platform detection code is correct. **Additional Notes:** I've also slightly tweaked the error message to output the platform as seen/normalized by libdatadog, as otherwise it could get confusing to debug. I'm opening this PR before the libdatadog PR is merged and released, so CI will obviously be red (since the release is not on rubygems.org). I'll re-trigger CI once the libdatadog release is out. (I've tested it locally and it works fine) **How to test the change?** This change includes test coverage on the libdatadog side.
2 tasks
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?
This PR fixes platform detection not working correctly when the user's platform is
x86_64-linux-gnu/aarch64-linux-gnu.This manifested to a user as the following error:
In the past, rubygems did this normalization for us (we even had a comment mentioning it in the code!) but this was removed in rubygems/rubygems#5852 for Rubygems 3.4+
I'm also bumping the
GEM_MAJOR_VERSIONin theversion.rbfile so I can release this fix as libdatadog 6.0.0.2.0 for Ruby as soon as this PR is merged.Motivation
Make sure our platform detection code is correct.
Additional Notes
N/A
How to test the change?
This change includes test coverage.
For Reviewers
@DataDog/security-design-and-guidance.