Skip to content

Revert "Bump psutil version to 5.9.7 (#16547)" #17112

Merged
FlorentClarret merged 1 commit into
7.52.xfrom
florentclarret/rollback_psutil_bump
Mar 8, 2024
Merged

Revert "Bump psutil version to 5.9.7 (#16547)" #17112
FlorentClarret merged 1 commit into
7.52.xfrom
florentclarret/rollback_psutil_bump

Conversation

@FlorentClarret

@FlorentClarret FlorentClarret commented Mar 8, 2024

Copy link
Copy Markdown
Member

What does this PR do?

Revert #16547

Motivation

We have a performance regression issue, see #incident-25881

Additional Notes

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Changelog entries must be created for modifications to shipped code
  • Add the qa/skip-qa label if the PR doesn't need to be tested during QA.

@github-actions

github-actions Bot commented Mar 8, 2024

Copy link
Copy Markdown
Contributor

The validations job has failed; please review the Files changed tab for possible suggestions to resolve.

@FlorentClarret
FlorentClarret force-pushed the florentclarret/rollback_psutil_bump branch from d3b50da to 72e6d2a Compare March 8, 2024 12:11
@github-actions

github-actions Bot commented Mar 8, 2024

Copy link
Copy Markdown
Contributor

The validations job has failed; please review the Files changed tab for possible suggestions to resolve.

@FlorentClarret
FlorentClarret force-pushed the florentclarret/rollback_psutil_bump branch from 72e6d2a to 2b16453 Compare March 8, 2024 12:13
@codecov

codecov Bot commented Mar 8, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (7.52.x@bbc78b5). Click here to learn what that means.

Additional details and impacted files
Flag Coverage Δ
btrfs 82.91% <ø> (?)
disk 91.47% <ø> (?)
gunicorn 92.85% <ø> (?)
ibm_mq 91.28% <ø> (?)
network 93.65% <ø> (?)
process 85.28% <ø> (?)
system_core 92.66% <ø> (?)
system_swap 98.30% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

@github-actions

github-actions Bot commented Mar 8, 2024

Copy link
Copy Markdown
Contributor

Test Results

 32 files   32 suites   3m 24s ⏱️
235 tests 235 ✅   0 💤 0 ❌
881 runs  760 ✅ 121 💤 0 ❌

Results for commit 2b16453.

Comment thread LICENSE-3rdparty.csv
@FlorentClarret
FlorentClarret merged commit ea412ad into 7.52.x Mar 8, 2024
@FlorentClarret
FlorentClarret deleted the florentclarret/rollback_psutil_bump branch March 8, 2024 13:59
@datadog-agent-integrations-bot

Copy link
Copy Markdown
Contributor

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

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

FlorentClarret added a commit that referenced this pull request Mar 8, 2024
FlorentClarret added a commit that referenced this pull request Mar 8, 2024
marlon-merida pushed a commit that referenced this pull request Mar 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants