Add opampextension to EDOT Collector by ycombinator · Pull Request #12857 · elastic/elastic-agent

ycombinator · 2026-02-19T14:22:51Z

What does this PR do?

Adds opampextension as a Core component to the EDOT Collector (internal/edot).

Changes:

Added github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension v0.145.0 as a direct dependency in go.mod
Registered opampextension.NewFactory() in the EDOT Collector's extension factory list (otelcol/components.go)
Marked opampextension as a Core component in components.yml
Updated golden files (components-output.yml and components-output-fips.yml) to include the opamp extension entry (stability: Alpha)
Updated go.sum and NOTICE.txt/NOTICE-fips.txt via go mod tidy and mage notice

Why is it important?

The OpAMP (Open Agent Management Protocol) extension enables the EDOT Collector to communicate with an OpAMP server for remote management and configuration. This will allow Fleet Server to monitor and manage EDOT Collector via OpAMP.

Checklist

I have read and understood the pull request guidelines of this project.
My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
I have made corresponding change to the default configuration files
I have added tests that prove my fix is effective or that my feature works
I have added an entry in ./changelog/fragments using the changelog tool
I have added an integration test or an E2E test

Disruptive User Impact

No disruptive impact. This adds a new optional extension to the EDOT Collector; existing configurations are unaffected.

How to test this PR locally

Run the EDOT Collector and verify the opamp extension is listed:

elastic-agent otel components | grep opamp

Related issues

Questions to ask yourself

How are we going to support this in production? The opampextension is an upstream OTel Contrib component maintained by the OTel community.
How are we going to measure its adoption? Via configuration usage telemetry.
How are we going to debug this? Standard OTel Collector logging applies; the extension exposes its own status via the health check mechanism.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

elasticmachine · 2026-02-19T14:22:56Z

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

mergify · 2026-02-19T14:23:37Z

This pull request does not have a backport label. Could you fix it @ycombinator? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

backport-./d./d is the label that automatically backports to the 8./d branch. /d is the digit
backport-active-all is the label that automatically backports to all active branches.
backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

elasticmachine · 2026-02-19T17:25:24Z

💛 Build succeeded, but was flaky

Buildkite Build
Commit: ee743ff

Failed CI Steps

Win2025:non-sudo:default

History

💔 Build #34921 failed a36c4cf

cc @ycombinator

github-actions · 2026-02-20T00:52:52Z

@Mergifyio backport 9.2 9.3

mergify · 2026-02-20T00:53:01Z

backport 9.2 9.3

✅ Backports have been created

Details

#12874 [9.2] (backport #12857) Add opampextension to EDOT Collector has been created for branch 9.2 but encountered conflicts

Cherry-pick of e8076e4 has failed:

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

You are currently cherry-picking commit e8076e44e.
  (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:
	new file:   changelog/fragments/1771511114-add-opamp-extension-to-edot-collector.yaml
	modified:   internal/edot/cmd/testdata/otel/components-output-fips.yml
	modified:   internal/edot/cmd/testdata/otel/components-output.yml
	modified:   internal/pkg/otel/components.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   internal/edot/go.mod
	both modified:   internal/edot/go.sum
	both modified:   internal/edot/otelcol/components.go
	both modified:   internal/pkg/otel/README.md

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

#12875 [9.3] (backport #12857) Add opampextension to EDOT Collector has been created for branch 9.3 but encountered conflicts

Cherry-pick of e8076e4 has failed:

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

You are currently cherry-picking commit e8076e44e.
  (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-fips.txt
	modified:   NOTICE.txt
	new file:   changelog/fragments/1771511114-add-opamp-extension-to-edot-collector.yaml
	modified:   internal/edot/cmd/testdata/otel/components-output-fips.yml
	modified:   internal/edot/cmd/testdata/otel/components-output.yml
	modified:   internal/edot/components.yml
	modified:   internal/edot/otelcol/components.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/edot/README.md
	both modified:   internal/edot/go.mod
	both modified:   internal/edot/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

* Add opampextension to EDOT Collector go.mod Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Register opampextension factory in EDOT Collector Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Mark opampextension as a Core component in components.yml Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Update golden files to include opamp extension Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Run go mod tidy and mage notice for opampextension Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Add changelog fragment for opampextension Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Update README and fix import ordering for opampextension Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> (cherry picked from commit e8076e4) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # internal/edot/go.mod # internal/edot/go.sum # internal/edot/otelcol/components.go # internal/pkg/otel/README.md

* Add opampextension to EDOT Collector go.mod Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Register opampextension factory in EDOT Collector Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Mark opampextension as a Core component in components.yml Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Update golden files to include opamp extension Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Run go mod tidy and mage notice for opampextension Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Add changelog fragment for opampextension Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Update README and fix import ordering for opampextension Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> (cherry picked from commit e8076e4) # Conflicts: # internal/edot/README.md # internal/edot/go.mod # internal/edot/go.sum

* Add opampextension to EDOT Collector * Adding CHANGELOG

ycombinator and others added 5 commits February 19, 2026 05:58

Add opampextension to EDOT Collector go.mod

26401b5

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Register opampextension factory in EDOT Collector

b26928f

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Mark opampextension as a Core component in components.yml

e127824

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Update golden files to include opamp extension

0337df7

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Run go mod tidy and mage notice for opampextension

24f2528

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

ycombinator requested a review from a team as a code owner February 19, 2026 14:22

ycombinator added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Feb 19, 2026

ycombinator requested review from michel-laterman and swiatekm February 19, 2026 14:22

mergify bot assigned ycombinator Feb 19, 2026

Add changelog fragment for opampextension

a36c4cf

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

ycombinator added enhancement New feature or request backport-active-9 Automated backport with mergify to all the active 9.[0-9]+ branches labels Feb 19, 2026

cmacknz previously approved these changes Feb 19, 2026

View reviewed changes

Update README and fix import ordering for opampextension

ee743ff

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

ycombinator dismissed cmacknz’s stale review via ee743ff February 19, 2026 15:41

ycombinator requested a review from cmacknz February 19, 2026 15:58

ycombinator mentioned this pull request Feb 19, 2026

[OpAMP][E2E Test] Verify that EDOT Collectors can talk to Fleet over OpAMP elastic/fleet-server#6394

Closed

cmacknz approved these changes Feb 19, 2026

View reviewed changes

swiatekm approved these changes Feb 19, 2026

View reviewed changes

ycombinator merged commit e8076e4 into elastic:main Feb 20, 2026
23 checks passed

ycombinator deleted the edot-add-opamp-ext branch February 20, 2026 00:52

mergify bot mentioned this pull request Feb 20, 2026

[9.2] (backport #12857) Add opampextension to EDOT Collector #12874

Closed

8 tasks

mergify bot mentioned this pull request Feb 20, 2026

[9.3] (backport #12857) Add opampextension to EDOT Collector #12875

Closed

8 tasks

ycombinator added a commit that referenced this pull request Feb 20, 2026

[9.3] (backport #12857) Add opampextension to EDOT Collector (#12876)

bd4958a

* Add opampextension to EDOT Collector * Adding CHANGELOG

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add opampextension to EDOT Collector#12857

Add opampextension to EDOT Collector#12857
ycombinator merged 7 commits intoelastic:mainfrom
ycombinator:edot-add-opamp-ext

ycombinator commented Feb 19, 2026

Uh oh!

elasticmachine commented Feb 19, 2026

Uh oh!

mergify bot commented Feb 19, 2026

Uh oh!

elasticmachine commented Feb 19, 2026

Uh oh!

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

mergify bot commented Feb 20, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

ycombinator commented Feb 19, 2026

What does this PR do?

Why is it important?

Checklist

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

Uh oh!

elasticmachine commented Feb 19, 2026

Uh oh!

mergify bot commented Feb 19, 2026

Uh oh!

elasticmachine commented Feb 19, 2026

💛 Build succeeded, but was flaky

Failed CI Steps

History

Uh oh!

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

mergify bot commented Feb 20, 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!

4 participants

mergify bot commented Feb 20, 2026 •

edited

Loading