Skip to content

[9.3](backport #48353) Remove use of github.com/elastic/elastic-agent-client from OSS Beats#48436

Merged
cmacknz merged 2 commits into
9.3from
mergify/bp/9.3/pr-48353
Jan 15, 2026
Merged

[9.3](backport #48353) Remove use of github.com/elastic/elastic-agent-client from OSS Beats#48436
cmacknz merged 2 commits into
9.3from
mergify/bp/9.3/pr-48353

Conversation

@mergify

@mergify mergify Bot commented Jan 15, 2026

Copy link
Copy Markdown
Contributor

A user reported that the OSS Beats had linked in elastic-agent-client which is ELv2 licensed, which was accurate as we were using types from it in a few places. Cloning a few trivial types (and Apache licensing them which is of no consequence) and minor moves of code fixes this and removes the elastic-agent-client dependency from the OSS code.

To verify:

cd filebeat
mage build
go version -m ./filebeat | grep elastic-agent-client

When the Beat receivers project concludes, we should be able to completely remove or majorly reduce use of elastic-agent-client since it would be necessary anymore.

In the meantime, a new lint rule to flag use of this import outside of x-pack has been added.


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

…48353)

* Remove elastic-agent-client import for useragent.

* Remove elastic-agent-client from manager interface.

* Remove use of elastic-agent-client in features.

* Move cloned types to separate file.

* Add changelog.

* Add depguard rule to forbid future use.

* Fix OtelManager

* Fix osquerybeat tests

* Run mage fmt

* Fix lint warning: remove unnecessary cast

(cherry picked from commit adc57ca)
@mergify mergify Bot added the backport label Jan 15, 2026
@mergify mergify Bot requested review from a team as code owners January 15, 2026 16:03
@mergify mergify Bot requested review from ycombinator and removed request for a team January 15, 2026 16:03
@mergify mergify Bot requested review from VihasMakwana, blakerouse and faec and removed request for a team January 15, 2026 16:03
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 15, 2026
@github-actions

Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@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 labels Jan 15, 2026
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 15, 2026
@elasticmachine

Copy link
Copy Markdown
Contributor

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

@elasticmachine

Copy link
Copy Markdown
Contributor

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

@cmacknz cmacknz merged commit 771131f into 9.3 Jan 15, 2026
202 of 205 checks passed
@cmacknz cmacknz deleted the mergify/bp/9.3/pr-48353 branch January 15, 2026 21:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 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