Skip to content

Conversation

@levan-m
Copy link
Contributor

@levan-m levan-m commented Dec 5, 2025

What does this PR do?

Addressing vulnerability https://datadoghq.atlassian.net/browse/VULN-13483

Motivation

What inspired you to submit this pull request?

Additional Notes

Anything else we should know when reviewing?

Minimum Agent Versions

Are there minimum versions of the Datadog Agent and/or Cluster Agent required?

  • Agent: vX.Y.Z
  • Cluster Agent: vX.Y.Z

Describe your test plan

Write there any instructions and details you may have to test your PR.

Checklist

  • PR has at least one valid label: bug, enhancement, refactoring, documentation, tooling, and/or dependencies
  • PR has a milestone or the qa/skip-qa label

@levan-m levan-m added this to the v1.21.0 milestone Dec 5, 2025
@levan-m levan-m requested review from a team as code owners December 5, 2025 15:38
@codecov-commenter
Copy link

codecov-commenter commented Dec 5, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 36.90%. Comparing base (3a25d5d) to head (11c49f5).

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #2382   +/-   ##
=======================================
  Coverage   36.90%   36.90%           
=======================================
  Files         286      286           
  Lines       24116    24116           
=======================================
  Hits         8900     8900           
  Misses      14518    14518           
  Partials      698      698           
Flag Coverage Δ
unittests 36.90% <ø> (ø)

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


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3a25d5d...11c49f5. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@tbavelier tbavelier added the dependencies Pull requests that update a dependency file label Dec 8, 2025
Copy link
Member

@tbavelier tbavelier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, dev container tag dev-1.25 is not ready yet upstream (is 1.25.4) but non blocker

@levan-m levan-m merged commit 34cf6c8 into main Dec 10, 2025
34 of 35 checks passed
@levan-m levan-m deleted the levan-m/bump-golang branch December 10, 2025 16:38
@dd-octo-sts
Copy link

dd-octo-sts bot commented Dec 10, 2025

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

Then, create a pull request where the base branch is v1.21 and the compare/head branch is backport-2382-to-v1.21.

1 similar comment
@dd-octo-sts
Copy link

dd-octo-sts bot commented Dec 10, 2025

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

Then, create a pull request where the base branch is v1.21 and the compare/head branch is backport-2382-to-v1.21.

levan-m added a commit that referenced this pull request Dec 10, 2025
* Bump golang to 1.25.5

* revert devcontainer change

* fix missing go update

---------

Co-authored-by: Timothée Bavelier <[email protected]>
Co-authored-by: Timothée Bavelier <[email protected]>
levan-m added a commit that referenced this pull request Dec 10, 2025
* Bump golang to 1.25.5

* revert devcontainer change

* fix missing go update

---------

Co-authored-by: Timothée Bavelier <[email protected]>
Co-authored-by: Timothée Bavelier <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/v1.21 dependencies Pull requests that update a dependency file qa/skip-qa

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants