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

fix(iast): avoid native module import if iast disabled [backport 2.6] #8598

Merged
merged 3 commits into from
Mar 5, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Mar 4, 2024

Backport b4a1d97 from #8564 to 2.6.

IAST: Forces an ImportError if the IAST _taint_tracking native module is imported when IAST is not enabled, to ensure there are no side_effects, like segmentation faults, if IAST is not enabled.

Fixes #8504

Checklist

  • Change(s) are motivated and described in the PR description
  • Testing strategy is described if automated tests are not included in the PR
  • Risks are described (performance impact, potential for breakage, maintainability)
  • Change is maintainable (easy to change, telemetry, documentation)
  • Library release note guidelines are followed or label changelog/no-changelog is set
  • Documentation is included (in-code, generated user docs, public corp docs)
  • Backport labels are set (if applicable)
  • If this PR changes the public interface, I've notified @DataDog/apm-tees.
  • If change 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.

Reviewer Checklist

  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Description motivates each change
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Change is maintainable (easy to change, telemetry, documentation)
  • Release note makes sense to a user of the library
  • 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

IAST: Forces an `ImportError` if the IAST `_taint_tracking` native
module is imported when IAST is not enabled, to ensure there are no
side_effects, like segmentation faults, if IAST is not enabled.

Fixes #8504

## Checklist

- [x] Change(s) are motivated and described in the PR description
- [x] Testing strategy is described if automated tests are not included
in the PR
- [x] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/))
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.
- [x] If change 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`.

## Reviewer Checklist

- [x] Title is accurate
- [x] All changes are related to the pull request's stated goal
- [x] Description motivates each change
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [x] Testing strategy adequately addresses listed risks
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] Release note makes sense to a user of the library
- [x] Author has acknowledged and discussed the performance implications
of this PR as reported in the benchmarks PR comment
- [x] 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)

(cherry picked from commit b4a1d97)
@github-actions github-actions bot requested a review from a team as a code owner March 4, 2024 21:45
@github-actions github-actions bot added bug ASM Application Security Monitoring labels Mar 4, 2024
@github-actions github-actions bot requested review from a team as code owners March 4, 2024 21:45
@datadog-dd-trace-py-rkomorn
Copy link

datadog-dd-trace-py-rkomorn bot commented Mar 4, 2024

Datadog Report

Branch report: backport-8564-to-2.6
Commit report: 5286c39
Test service: dd-trace-py

✅ 0 Failed, 339 Passed, 110784 Skipped, 16m 50.93s Total duration (1h 39m 2.61s time saved)

@pr-commenter
Copy link

pr-commenter bot commented Mar 4, 2024

Benchmarks

Benchmark execution time: 2024-03-05 19:15:41

Comparing candidate commit 88f3830 in PR branch backport-8564-to-2.6 with baseline commit cc5c42e in branch 2.6.

Found 0 performance improvements and 1 performance regressions! Performance is the same for 192 metrics, 9 unstable metrics.

scenario:otelspan-start

  • 🟥 max_rss_usage [+3.494MB; +3.642MB] or [+7.317%; +7.628%]

@emmettbutler emmettbutler enabled auto-merge (squash) March 5, 2024 18:11
@emmettbutler emmettbutler merged commit 9e19fb3 into 2.6 Mar 5, 2024
78 checks passed
@emmettbutler emmettbutler deleted the backport-8564-to-2.6 branch March 5, 2024 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ASM Application Security Monitoring bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants