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

[PROF-9257] Upgrade libdatadog to fix incorrect platform detection for x86_64-linux-gnu/aarch64-linux-gnu #3503

Merged
merged 2 commits into from
Mar 4, 2024

Conversation

ivoanjo
Copy link
Member

@ivoanjo ivoanjo commented Mar 4, 2024

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.

How to test the change?

This change includes test coverage on the libdatadog side.

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.

…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.
@ivoanjo ivoanjo requested review from a team as code owners March 4, 2024 11:43
@github-actions github-actions bot added the profiling Involves Datadog profiling label Mar 4, 2024
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.23%. Comparing base (f1f69d9) to head (4e84c08).
Report is 2 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3503      +/-   ##
==========================================
- Coverage   98.24%   98.23%   -0.01%     
==========================================
  Files        1275     1275              
  Lines       75182    75182              
  Branches     3551     3551              
==========================================
- Hits        73859    73857       -2     
- Misses       1323     1325       +2     

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

@ivoanjo ivoanjo merged commit a037394 into master Mar 4, 2024
220 checks passed
@ivoanjo ivoanjo deleted the ivoanjo/prof-9257-incorrect-platform-detection branch March 4, 2024 13:16
@github-actions github-actions bot added this to the 2.0 milestone Mar 4, 2024
@ivoanjo ivoanjo modified the milestones: 2.0, 1.21.0 Mar 14, 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.

None yet

3 participants