Remove use of github.com/elastic/elastic-agent-client from OSS Beats by cmacknz · Pull Request #48353 · elastic/beats

cmacknz · 2026-01-08T21:06:39Z

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.

elasticmachine · 2026-01-08T21:06:43Z

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

elasticmachine · 2026-01-08T21:06:43Z

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

github-actions · 2026-01-08T21:06:50Z

🤖 GitHub comments

Just comment with:

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

michel-laterman

lgtm

github-actions · 2026-01-15T16:01:49Z

@Mergifyio backport 8.19 9.1 9.2 9.3

mergify · 2026-01-15T16:02:03Z

backport 8.19 9.1 9.2 9.3

✅ Backports have been created

Details

#48433 [8.19](backport #48353) Remove use of github.com/elastic/elastic-agent-client from OSS Beats has been created for branch 8.19 but encountered conflicts
#48434 [9.1](backport #48353) Remove use of github.com/elastic/elastic-agent-client from OSS Beats has been created for branch 9.1 but encountered conflicts
#48435 [9.2](backport #48353) Remove use of github.com/elastic/elastic-agent-client from OSS Beats has been created for branch 9.2 but encountered conflicts
#48436 [9.3](backport #48353) Remove use of github.com/elastic/elastic-agent-client from OSS Beats has been created for branch 9.3

…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) # Conflicts: # libbeat/beat/beat.go # libbeat/beat/beat_test.go # x-pack/osquerybeat/beater/osquerybeat_status_test.go

…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) # Conflicts: # x-pack/osquerybeat/beater/osquerybeat_status_test.go

…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)

…t-client from OSS Beats (#48433) * Remove use of github.com/elastic/elastic-agent-client from OSS Beats (#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) # Conflicts: # libbeat/beat/beat.go # libbeat/beat/beat_test.go # x-pack/osquerybeat/beater/osquerybeat_status_test.go * Resolve conflicts * Remove file added by merge conflict --------- Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>

…-client from OSS Beats (#48434) * Remove use of github.com/elastic/elastic-agent-client from OSS Beats (#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) # Conflicts: # x-pack/osquerybeat/beater/osquerybeat_status_test.go * Resolve conflicts --------- Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>

…48353) (#48436) * 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) Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>

…-client from OSS Beats (#48435) * Remove use of github.com/elastic/elastic-agent-client from OSS Beats (#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) # Conflicts: # x-pack/osquerybeat/beater/osquerybeat_status_test.go * Fix conflict --------- Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>

cmacknz added 4 commits January 8, 2026 15:32

Remove elastic-agent-client import for useragent.

cda6701

Remove elastic-agent-client from manager interface.

48426c0

Remove use of elastic-agent-client in features.

4bf8746

Move cloned types to separate file.

b860e31

cmacknz self-assigned this Jan 8, 2026

cmacknz added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Jan 8, 2026

cmacknz requested a review from a team as a code owner January 8, 2026 21:06

cmacknz added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jan 8, 2026

cmacknz requested a review from a team as a code owner January 8, 2026 21:06

cmacknz added the backport-active-8 Automated backport with mergify to all the active 8.[0-9]+ branches label Jan 8, 2026

cmacknz requested a review from ycombinator January 8, 2026 21:06

cmacknz added the backport-active-9 Automated backport with mergify to all the active 9.[0-9]+ branches label Jan 8, 2026

cmacknz requested review from VihasMakwana, blakerouse and orestisfl January 8, 2026 21:06

botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 8, 2026

botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 8, 2026

Add changelog.

dc76fcd

cmacknz changed the title ~~Break dependency on ElasticV2 licensed code from OSS Beats~~ Remove use of github.com/elastic/elastic-agent-client from OSS Beats Jan 8, 2026

cmacknz added 3 commits January 8, 2026 16:18

Add depguard rule to forbid future use.

49e59e1

Fix OtelManager

4a05043

Fix osquerybeat tests

c48c856

cmacknz requested a review from a team as a code owner January 8, 2026 21:50

cmacknz added 2 commits January 8, 2026 17:01

Run mage fmt

a3eb3c2

Fix lint warning: remove unnecessary cast

0061bde

cmacknz force-pushed the cmacknz/remove-elastic-agent-client-oss branch from 1c64e1f to 0061bde Compare January 8, 2026 22:08

cmacknz requested a review from michel-laterman January 9, 2026 16:04

kruskall approved these changes Jan 9, 2026

View reviewed changes

mauri870 approved these changes Jan 12, 2026

View reviewed changes

michel-laterman approved these changes Jan 12, 2026

View reviewed changes

cmacknz requested a review from andrewkroh January 14, 2026 15:50

andrewkroh approved these changes Jan 15, 2026

View reviewed changes

cmacknz merged commit adc57ca into elastic:main Jan 15, 2026
202 of 205 checks passed

cmacknz deleted the cmacknz/remove-elastic-agent-client-oss branch January 15, 2026 16:01

mergify Bot mentioned this pull request Jan 15, 2026

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

Merged

This was referenced Jan 15, 2026

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

Merged

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

Merged

mergify Bot mentioned this pull request Jan 15, 2026

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

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Remove use of github.com/elastic/elastic-agent-client from OSS Beats#48353

Remove use of github.com/elastic/elastic-agent-client from OSS Beats#48353
cmacknz merged 10 commits into
elastic:mainfrom
cmacknz:cmacknz/remove-elastic-agent-client-oss

cmacknz commented Jan 8, 2026 •

edited

Loading

Uh oh!

elasticmachine commented Jan 8, 2026

Uh oh!

elasticmachine commented Jan 8, 2026

Uh oh!

github-actions Bot commented Jan 8, 2026

Uh oh!

michel-laterman left a comment

Uh oh!

Uh oh!

github-actions Bot commented Jan 15, 2026

Uh oh!

mergify Bot commented Jan 15, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

cmacknz commented Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

elasticmachine commented Jan 8, 2026

Uh oh!

elasticmachine commented Jan 8, 2026

Uh oh!

github-actions Bot commented Jan 8, 2026

🤖 GitHub comments

Uh oh!

michel-laterman left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Jan 15, 2026

Uh oh!

mergify Bot commented Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

cmacknz commented Jan 8, 2026 •

edited

Loading

mergify Bot commented Jan 15, 2026 •

edited

Loading