Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 26, 2025

What does this PR do?

Removes the filebeatreceiver and metricbeatreceiver and associated tests from the 9.0 branch.

Why is it important?

We need to update our dependency on otel-collector-contrib to get fixes to the elasticsearchexporter that the EDOT collector needs to go GA in 9.0. This update cannot be done because the otel dependency versions in Beats conflicts with the one we need. We can't update the otel dependency versions in Beats without upgraded Beats' dependency on the Prometheus packages, which introduce breaking changes we need time to adapt to. For full details see elastic/beats#42748.

There is no fast fix to this on the Beats side, this is IMO the least bad option. The other quick alternative would be to have Elastic Agent's 9.0 branch point to a feature branch in Beats with the dependency update (so 9.0 here would not point to 9.0 in Beats). That is less disruptive in this repository, but creates another unofficial branch to maintain as long as this situation goes on, and does not prevent this problem happening again with another dependency later that would require more work in the unofficial Beats branch. If it turns out this was the wrong decision, we can switch to the other approach at any time in the future by reverting this commit.

The intent is we'll revert this and bring the beat receiver components back once Beats can safely be updated to the appropriate OTel dependencies.

Disruptive User Impact

None, beats receivers are experimental and unannounced. This change isolates any impact to functionality that isn't meant to be usable externally in 9.0.

Related / blocked issues

@mergify mergify bot requested a review from a team as a code owner February 26, 2025 14:41
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 26, 2025
@mergify mergify bot requested review from kaanyalti and pchila and removed request for a team February 26, 2025 14:41
@mergify
Copy link
Contributor Author

mergify bot commented Feb 26, 2025

Cherry-pick of 7f18476 has failed:

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

You are currently cherry-picking commit 7f1847629.
  (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:   internal/pkg/agent/cmd/testdata/otel/components-output.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/components.go
	both modified:   testing/integration/otel_test.go

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 skip-changelog labels Feb 26, 2025
@elasticmachine
Copy link
Contributor

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

@swiatekm swiatekm changed the title [8.18](backport #7023) [9.0] Remove filebeatreceiver and metricbeat receiver to remove dependency on Beats [8.18](backport #7023) Remove filebeatreceiver and metricbeat receiver to remove dependency on Beats Feb 26, 2025
@swiatekm swiatekm assigned swiatekm and unassigned cmacknz Feb 26, 2025
@swiatekm swiatekm force-pushed the mergify/bp/8.18/pr-7023 branch from 9a18623 to ed78b13 Compare February 26, 2025 15:38
@swiatekm swiatekm requested a review from cmacknz February 26, 2025 15:39
@swiatekm swiatekm force-pushed the mergify/bp/8.18/pr-7023 branch 2 times, most recently from fe90900 to c6bfadd Compare February 27, 2025 14:56
@cmacknz
Copy link
Member

cmacknz commented Feb 27, 2025

We are going to vendor the Prometheus dependency in Beats to hopefully prevent us from needing to do this in this branch elastic/beats#42890

@swiatekm swiatekm removed the conflicts There is a conflict in the backported pull request label Feb 28, 2025
@swiatekm swiatekm force-pushed the mergify/bp/8.18/pr-7023 branch from c6bfadd to 39a7ba4 Compare February 28, 2025 13:26
@mergify
Copy link
Contributor Author

mergify bot commented Mar 3, 2025

This pull request has not been merged yet. Could you please review and merge it @swiatekm? 🙏

@swiatekm swiatekm force-pushed the mergify/bp/8.18/pr-7023 branch from 39a7ba4 to 07b47d2 Compare March 3, 2025 12:04
@mergify
Copy link
Contributor Author

mergify bot commented Mar 10, 2025

This pull request has not been merged yet. Could you please review and merge it @swiatekm? 🙏

@swiatekm swiatekm force-pushed the mergify/bp/8.18/pr-7023 branch from 07b47d2 to 0cafafa Compare March 10, 2025 11:52
@pchila
Copy link
Member

pchila commented Mar 14, 2025

We are going to vendor the Prometheus dependency in Beats to hopefully prevent us from needing to do this in this branch elastic/beats#42890

@cmacknz PR elastic/beats#42890 has been closed. Should this be merged then or we are evaluating alternatives?

@mergify
Copy link
Contributor Author

mergify bot commented Mar 17, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.18/pr-7023 upstream/mergify/bp/8.18/pr-7023
git merge upstream/8.18
git push upstream mergify/bp/8.18/pr-7023

@mergify
Copy link
Contributor Author

mergify bot commented Mar 17, 2025

This pull request has not been merged yet. Could you please review and merge it @swiatekm? 🙏

@swiatekm swiatekm force-pushed the mergify/bp/8.18/pr-7023 branch from 0cafafa to a2d39e0 Compare March 17, 2025 12:45
(cherry picked from commit 7f18476)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/components.go
#	testing/integration/otel_test.go

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@swiatekm swiatekm force-pushed the mergify/bp/8.18/pr-7023 branch from a2d39e0 to b5858eb Compare March 17, 2025 12:46
@elastic-sonarqube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @swiatekm

@swiatekm
Copy link
Contributor

Closing in favor of #7443.

@swiatekm swiatekm closed this Mar 18, 2025
@mergify mergify bot deleted the mergify/bp/8.18/pr-7023 branch March 18, 2025 13:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants