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

ci(asm): appsec_integrations suite improvments [backport 2.17] #11500

Merged
merged 1 commit into from
Nov 22, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Nov 22, 2024

Backport c60e52d from #11411 to 2.17.

  1. Increase parallelism to reduce the time to run the suite, there are 13 riot hashes. Each job takes about 30 minutes, where 10 minutes spent for building dd-trace-py and the rest spent for running 2 riot hashes.
  2. Mark a test flaky, it failed 3 times in a row for an unrelated change ci(profiling): explicitly set cpucount for uwsgi build, run 1, run 2, run 3.

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

1. Increase parallelism to reduce the time to run the suite, there are
13 riot hashes. Each job takes about 30 minutes, where 10 minutes spent
for building dd-trace-py and the rest spent for running 2 riot hashes.
3. Mark a test flaky, it failed 3 times in a row for an unrelated change
[ci(profiling): explicitly set cpucount for uwsgi
build](#11402), [run
1](https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/77339/workflows/b138b8df-bdb5-4cfc-a6ae-e8d8f204661b/jobs/4357608),
[run
2](https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/77339/workflows/8e33c607-89cb-4bab-89b1-acb6d0931856/jobs/4357577),
[run
3](https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/77339/workflows/b5609072-9b15-4c46-ae11-10c7c0039ada/jobs/4357516).

## Checklist
- [x] 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)

(cherry picked from commit c60e52d)
@github-actions github-actions bot requested a review from a team as a code owner November 22, 2024 12:39
@github-actions github-actions bot added changelog/no-changelog A changelog entry is not required for this PR. CI labels Nov 22, 2024
@github-actions github-actions bot requested review from a team as code owners November 22, 2024 12:39
@gnufede gnufede enabled auto-merge (squash) November 22, 2024 12:41
@datadog-dd-trace-py-rkomorn
Copy link

Datadog Report

Branch report: backport-11411-to-2.17
Commit report: de13930
Test service: dd-trace-py

✅ 0 Failed, 592 Passed, 694 Skipped, 19m 2.39s Total duration (17m 13.98s time saved)

@pr-commenter
Copy link

pr-commenter bot commented Nov 22, 2024

Benchmarks

Benchmark execution time: 2024-11-22 13:19:36

Comparing candidate commit de13930 in PR branch backport-11411-to-2.17 with baseline commit 6d9f48d in branch 2.17.

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

scenario:iast_aspects-ljust_aspect

  • 🟩 execution_time [-1.342µs; -1.261µs] or [-8.833%; -8.297%]

@christophe-papazian christophe-papazian added changelog/no-changelog A changelog entry is not required for this PR. and removed changelog/no-changelog A changelog entry is not required for this PR. labels Nov 22, 2024
auto-merge was automatically disabled November 22, 2024 13:52

Pull request was closed

Copy link
Contributor Author

CODEOWNERS have been resolved as:

.circleci/config.templ.yml                                              @DataDog/python-guild @DataDog/apm-core-python
tests/appsec/integrations/test_flask_entrypoint_iast_patches.py         @DataDog/asm-python

@christophe-papazian christophe-papazian enabled auto-merge (squash) November 22, 2024 14:11
@christophe-papazian christophe-papazian merged commit b4abd06 into 2.17 Nov 22, 2024
554 checks passed
@christophe-papazian christophe-papazian deleted the backport-11411-to-2.17 branch November 22, 2024 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog A changelog entry is not required for this PR. CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants