Skip to content

chore(CI): move iast_tdd_propagation to riot #13634

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

Merged
merged 13 commits into from
Jun 13, 2025

Conversation

juanjux
Copy link
Collaborator

@juanjux juanjux commented Jun 10, 2025

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

Signed-off-by: Juanjo Alvarez <juanjo.alvarezmartinez@datadoghq.com>
@juanjux juanjux self-assigned this Jun 10, 2025
@juanjux juanjux added changelog/no-changelog A changelog entry is not required for this PR. CI labels Jun 10, 2025
@juanjux juanjux requested review from a team as code owners June 10, 2025 10:26
Copy link
Contributor

github-actions bot commented Jun 10, 2025

CODEOWNERS have been resolved as:

.riot/requirements/190cae7.txt                                          @DataDog/apm-python
.riot/requirements/25712c4.txt                                          @DataDog/apm-python
.riot/requirements/64169ed.txt                                          @DataDog/apm-python
.riot/requirements/77830bc.txt                                          @DataDog/apm-python
.riot/requirements/b1ef26d.txt                                          @DataDog/apm-python
hatch.toml                                                              @DataDog/python-guild
lib-injection/sources/min_compatible_versions.csv                       @DataDog/apm-core-python
min_compatible_versions.csv                                             @DataDog/apm-core-python
riotfile.py                                                             @DataDog/apm-python
tests/appsec/suitespec.yml                                              @DataDog/asm-python

Copy link
Contributor

github-actions bot commented Jun 10, 2025

Bootstrap import analysis

Comparison of import times between this PR and base.

Summary

The average import time from this PR is: 274 ± 3 ms.

The average import time from base is: 276 ± 2 ms.

The import time difference between this PR and base is: -1.7 ± 0.1 ms.

Import time breakdown

The following import paths have shrunk:

ddtrace.auto 1.989 ms (0.73%)
ddtrace.bootstrap.sitecustomize 1.312 ms (0.48%)
ddtrace.bootstrap.preload 1.312 ms (0.48%)
ddtrace.internal.remoteconfig.client 0.631 ms (0.23%)
ddtrace 0.678 ms (0.25%)
ddtrace.internal._unpatched 0.030 ms (0.01%)
json 0.030 ms (0.01%)
json.decoder 0.030 ms (0.01%)
re 0.030 ms (0.01%)
enum 0.030 ms (0.01%)
types 0.030 ms (0.01%)

@pr-commenter
Copy link

pr-commenter bot commented Jun 10, 2025

Benchmarks

Benchmark execution time: 2025-06-12 14:38:15

Comparing candidate commit 73f411a in PR branch juanjux/iast-tdd-propagation-to-riot with baseline commit fd2bcdf in branch main.

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

juanjux added 2 commits June 10, 2025 13:16
Signed-off-by: Juanjo Alvarez <juanjo.alvarezmartinez@datadoghq.com>
Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
@juanjux juanjux enabled auto-merge (squash) June 10, 2025 13:06
juanjux and others added 4 commits June 10, 2025 16:56
Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
Signed-off-by: Juanjo Alvarez <juanjo.alvarezmartinez@datadoghq.com>
juanjux added 2 commits June 12, 2025 15:12
Signed-off-by: Juanjo Alvarez <juanjo.alvarezmartinez@datadoghq.com>
@juanjux juanjux merged commit da7d0ee into main Jun 13, 2025
816 checks passed
@juanjux juanjux deleted the juanjux/iast-tdd-propagation-to-riot branch June 13, 2025 14:56
Copy link
Contributor

The backport to 2.21 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-2.21 2.21
# Navigate to the new working tree
cd .worktrees/backport-2.21
# Create a new branch
git switch --create backport-13634-to-2.21
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 da7d0ee61a951700e41c6abdd2e39d3b72456d77
# Push it to GitHub
git push --set-upstream origin backport-13634-to-2.21
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.21

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.21 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