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

chore(go.mod): update beats dependency #6837

Merged
merged 9 commits into from
Feb 19, 2025

Conversation

mauri870
Copy link
Member

@mauri870 mauri870 commented Feb 12, 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.

@mauri870 mauri870 added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team skip-changelog backport-8.x Automated backport to the 8.x branch with mergify backport-9.0 Automated backport to the 9.0 branch labels Feb 12, 2025
@mauri870 mauri870 self-assigned this Feb 12, 2025
@mauri870 mauri870 requested a review from a team as a code owner February 12, 2025 15:23
@mauri870 mauri870 requested review from swiatekm and pchila February 12, 2025 15:23
@elasticmachine
Copy link
Contributor

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

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Feb 12, 2025
@elasticmachine
Copy link
Contributor

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

@mauri870 mauri870 enabled auto-merge (squash) February 13, 2025 14:10
@mauri870 mauri870 disabled auto-merge February 14, 2025 15:37
@mauri870
Copy link
Member Author

Decided to update to elastic/beats@d813311 instead, since it includes a fix for default processors in fbreceiver.

@mauri870 mauri870 enabled auto-merge (squash) February 14, 2025 16:18
@mauri870 mauri870 disabled auto-merge February 17, 2025 11:15
@mauri870
Copy link
Member Author

mauri870 commented Feb 17, 2025

Waiting on elastic/beats#42725 so I can include the fix to the batch of changes.

@mauri870 mauri870 enabled auto-merge (squash) February 18, 2025 13:21
@@ -887,6 +887,8 @@ func TestOtelFBReceiverE2E(t *testing.T) {
enabled: true
paths:
- {{.InputPath}}
prospector.scanner.fingerprint.enabled: false
Copy link
Contributor

Choose a reason for hiding this comment

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

just wondering is this a valid chore PR if we do changes of configuration in our integration tests? Is this change required to happen because the previous config is no longer valid with the prior version?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is a leftover, it is like this for other tests. Long story short filebeat now has fingerprint fiile identity by default, which causes issues in tests that ingest a small file that is not big enough to produce a valid fingerprint. These options are used in most tests because of this.

@khushijain21
Copy link
Contributor

/test

Copy link

@mauri870 mauri870 merged commit e274a84 into elastic:main Feb 19, 2025
14 checks passed
mergify bot pushed a commit that referenced this pull request Feb 19, 2025
* chore(go.mod): update beats dependency

* update beats to d813311

* update beats to ef79280, fix tests

(cherry picked from commit e274a84)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	testing/integration/otel_test.go
mergify bot pushed a commit that referenced this pull request Feb 19, 2025
* chore(go.mod): update beats dependency

* update beats to d813311

* update beats to ef79280, fix tests

(cherry picked from commit e274a84)

# Conflicts:
#	go.sum
mauri870 added a commit that referenced this pull request Feb 20, 2025
* chore(go.mod): update beats dependency (#6837)

* chore(go.mod): update beats dependency

* update beats to d813311

* update beats to ef79280, fix tests

(cherry picked from commit e274a84)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	testing/integration/otel_test.go

* resolve conflicts

---------

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
mauri870 added a commit that referenced this pull request Feb 20, 2025
* chore(go.mod): update beats dependency (#6837)

* chore(go.mod): update beats dependency

* update beats to d813311

* update beats to ef79280, fix tests

(cherry picked from commit e274a84)

# Conflicts:
#	go.sum

* resolve conflicts

---------

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify backport-9.0 Automated backport to the 9.0 branch 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.

6 participants