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(appsec): update flaky test #12855

Merged
merged 2 commits into from
Mar 24, 2025
Merged

ci(appsec): update flaky test #12855

merged 2 commits into from
Mar 24, 2025

Conversation

avara1986
Copy link
Member

the test_load_testing_appsec_1click_and_ip_blocking_gunicorn_block_and_kill_child_worker test has this decorator:

@flaky(until=1742580778, reason="_request_403 is flaky, figure out the error")

and its failing today because time() > 1742580778

We need to investigate that error. Removing flaky, updating to skip and link this problem to task APPSEC-57052

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

@avara1986 avara1986 added changelog/no-changelog A changelog entry is not required for this PR. ASM Application Security Monitoring labels Mar 24, 2025
Copy link
Contributor

CODEOWNERS have been resolved as:

tests/appsec/integrations/flask_tests/test_flask_remoteconfig.py        @DataDog/asm-python

@avara1986 avara1986 marked this pull request as ready for review March 24, 2025 10:53
@avara1986 avara1986 requested a review from a team as a code owner March 24, 2025 10:53
@avara1986 avara1986 enabled auto-merge (squash) March 24, 2025 10:56
Copy link
Contributor

github-actions bot commented Mar 24, 2025

Bootstrap import analysis

Comparison of import times between this PR and main.

Summary

The average import time in this PR is: 243 ± 6 ms.

The average import time in main is: 246 ± 4 ms.

The import time difference between this PR and main is: -2.3 ± 0.2 ms.

Import time breakdown

The following import paths have shrunk:

ddtrace.auto 1.985 ms (0.82%)
ddtrace.bootstrap.sitecustomize 1.303 ms (0.54%)
ddtrace.bootstrap.preload 1.303 ms (0.54%)
ddtrace.internal.products 1.303 ms (0.54%)
ddtrace.internal.remoteconfig.client 0.640 ms (0.26%)
ddtrace 0.682 ms (0.28%)

@pr-commenter
Copy link

pr-commenter bot commented Mar 24, 2025

Benchmarks

Benchmark execution time: 2025-03-24 11:39:05

Comparing candidate commit 1d6afa8 in PR branch avara1986/appsec_rc_flaky_test with baseline commit 5c8fb46 in branch main.

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

scenario:iast_aspects-format_map_aspect

  • 🟥 execution_time [+439.519ns; +501.126ns] or [+8.728%; +9.951%]

scenario:iast_aspects-ospathbasename_aspect

  • 🟥 execution_time [+305.133ns; +361.947ns] or [+9.093%; +10.786%]

@avara1986 avara1986 merged commit 36dcd9f into main Mar 24, 2025
347 checks passed
@avara1986 avara1986 deleted the avara1986/appsec_rc_flaky_test branch March 24, 2025 11:40
github-actions bot pushed a commit that referenced this pull request Mar 24, 2025
the
`test_load_testing_appsec_1click_and_ip_blocking_gunicorn_block_and_kill_child_worker`
test has this decorator:
```
@flaky(until=1742580778, reason="_request_403 is flaky, figure out the error")
```

and its failing today because `time() > 1742580778`

We need to investigate that error. Removing `flaky`, updating to `skip`
and link this problem to task APPSEC-57052

## 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 36dcd9f)
erikayasuda pushed a commit that referenced this pull request Mar 24, 2025
Backport 36dcd9f from #12855 to 3.3.

the
`test_load_testing_appsec_1click_and_ip_blocking_gunicorn_block_and_kill_child_worker`
test has this decorator:
```
@flaky(until=1742580778, reason="_request_403 is flaky, figure out the error")
```

and its failing today because `time() > 1742580778`

We need to investigate that error. Removing `flaky`, updating to `skip`
and link this problem to task APPSEC-57052

## 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)

Co-authored-by: Alberto Vara <[email protected]>
Copy link
Contributor

The backport to 3.2 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-3.2 3.2
# Navigate to the new working tree
cd .worktrees/backport-3.2
# Create a new branch
git switch --create backport-12855-to-3.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 36dcd9fb8ef6d2bcdceb1396678483c416ce5396
# Push it to GitHub
git push --set-upstream origin backport-12855-to-3.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-3.2

Then, create a pull request where the base branch is 3.2 and the compare/head branch is backport-12855-to-3.2.

Copy link
Contributor

The backport to 3.1 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-3.1 3.1
# Navigate to the new working tree
cd .worktrees/backport-3.1
# Create a new branch
git switch --create backport-12855-to-3.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 36dcd9fb8ef6d2bcdceb1396678483c416ce5396
# Push it to GitHub
git push --set-upstream origin backport-12855-to-3.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-3.1

Then, create a pull request where the base branch is 3.1 and the compare/head branch is backport-12855-to-3.1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ASM Application Security Monitoring backport 3.1 backport 3.2 backport 3.3 changelog/no-changelog A changelog entry is not required for this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants