Skip to content

Comments

[9.0](backport #6837) chore(go.mod): update beats dependency#6920

Merged
mauri870 merged 3 commits into9.0from
mergify/bp/9.0/pr-6837
Feb 20, 2025
Merged

[9.0](backport #6837) chore(go.mod): update beats dependency#6920
mauri870 merged 3 commits into9.0from
mergify/bp/9.0/pr-6837

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 19, 2025

This PR updates beats/v7 to point to elastic/beats@ef79280.

This is needed for the recent fixes and work on the beats receivers, for example elastic/beats#42412, elastic/beats#42658, elastic/beats#42707 and elastic/beats#42725.


This is an automatic backport of pull request #6837 done by Mergify.

* chore(go.mod): update beats dependency

* update beats to d813311

* update beats to ef79280, fix tests

(cherry picked from commit e274a84)

# Conflicts:
#	go.sum
@mergify mergify bot requested a review from a team as a code owner February 19, 2025 07:48
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 19, 2025
@mergify mergify bot requested review from michalpristas and pchila and removed request for a team February 19, 2025 07:48
@mergify
Copy link
Contributor Author

mergify bot commented Feb 19, 2025

Cherry-pick of e274a84 has failed:

On branch mergify/bp/9.0/pr-6837
Your branch is up to date with 'origin/9.0'.

You are currently cherry-picking commit e274a8411.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE.txt
	modified:   go.mod
	modified:   testing/integration/otel_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team skip-changelog labels Feb 19, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@mauri870 mauri870 requested review from mauri870 and removed request for michalpristas and pchila February 19, 2025 10:58
@mauri870 mauri870 removed the conflicts There is a conflict in the backported pull request label Feb 19, 2025
@mauri870
Copy link
Member

mauri870 commented Feb 19, 2025

Added you back as reviewers because according to the new policy backports with conflicts need at least a single reviewer other than the author.

@mauri870 mauri870 enabled auto-merge (squash) February 19, 2025 11:28
@mauri870
Copy link
Member

/test

@elastic-sonarqube
Copy link

@mauri870 mauri870 merged commit c488163 into 9.0 Feb 20, 2025
14 checks passed
@mauri870 mauri870 deleted the mergify/bp/9.0/pr-6837 branch February 20, 2025 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants