Skip to content
New issue

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

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

Already on GitHub? # to your account

fix(uwsgi): add to ssi denylist [backport 2.21] #12941

Merged
merged 4 commits into from
Apr 3, 2025
Merged

Conversation

github-actions[bot]
Copy link
Contributor

Backport 327a1e6 from #12891 to 2.21.

According to our docs SSI does not support UWSGI.

To make SSI+ddtrace-py more resilient we should add /usr/bin/uwsgi to the denylist. This is not a perfect solution since the uwsgi command can be stored elsewhere on a host and this could make it more challenging to add uwsgi support in the future (SSI will fail and it will be hard to know this change is why).

Checklist

  • PR author has checked that all the criteria below are met
  • The PR description includes an overview of the change
  • The PR description articulates the motivation for the change
  • The change includes tests OR the PR description describes a testing strategy
  • The PR description notes risks associated with the change, if any
  • Newly-added code is easy to change
  • The change follows the library release note guidelines
  • The change includes or references documentation updates if necessary
  • Backport labels are set (if applicable)

Reviewer Checklist

  • Reviewer has checked that all the criteria below are met
  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Newly-added code is easy to change
  • Release note makes sense to a user of the library
  • If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy

According to our
[docs](https://docs.datadoghq.com/tracing/trace_collection/library_injection_local/?tab=kubernetes#requirements)
SSI does not support UWSGI.

To make SSI+ddtrace-py more resilient we should add `/usr/bin/uwsgi` to
the denylist. This is not a perfect solution since the uwsgi command can
be stored elsewhere on a host and this could make it more challenging to
add uwsgi support in the future (SSI will fail and it will be hard to
know this change is why).

## Checklist
- [ ] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

---------

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
(cherry picked from commit 327a1e6)
@github-actions github-actions bot requested review from a team as code owners March 28, 2025 13:53
Copy link
Contributor Author

CODEOWNERS have been resolved as:

releasenotes/notes/munir-avoid-ssi-for-uwsgi-ab6a6f783956002d.yaml      @DataDog/apm-python
lib-injection/sources/denied_executables.txt                            @DataDog/apm-core-python

@mabdinur mabdinur closed this Mar 28, 2025
@mabdinur mabdinur reopened this Mar 28, 2025
@mabdinur mabdinur enabled auto-merge (squash) April 2, 2025 15:25
@pr-commenter
Copy link

pr-commenter bot commented Apr 3, 2025

Benchmarks

Benchmark execution time: 2025-04-03 07:58:57

Comparing candidate commit 3c46c91 in PR branch backport-12891-to-2.21 with baseline commit 6b18fee in branch 2.21.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 418 metrics, 2 unstable metrics.

@mabdinur mabdinur merged commit 8015b10 into 2.21 Apr 3, 2025
307 of 308 checks passed
@mabdinur mabdinur deleted the backport-12891-to-2.21 branch April 3, 2025 08:02
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants