[9.3](backport #6289) [OpAMP] Add E2E test#6430
Merged
ycombinator merged 1 commit into9.3from Feb 27, 2026
Merged
Conversation
* Implement API boilerplate for POST /v1/opamp endpoint
* Add OpAMP section to dev doc
* Flesh out dev doc
* Update dev doc to use Fleet enrollment token
* Check feature flag before handing OpAMP requests
* Allow running specific tests with TEST_RUN env var
* Removing irrelevant file
* WIP: Reimplement using opamp-go server package
* Update spec
* Move OpAMP documentation to separate file
* Remove error that's no longer needed
* Update OpAMP feature flag test to use Enabled() method
The test previously referenced ErrOpAMPDisabled and handleOpAMP which
no longer exist. The feature flag check now happens at route registration
time, so test the Enabled() method directly instead.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Disable HTTP keep-alive for OpAMP requests to fix EOF errors
The server's IdleTimeout (30s) matches the OTel Collector's polling
interval (~30s), causing a race where the server closes the idle
connection just as the client tries to reuse it. Setting Connection:
close on OpAMP responses forces a fresh connection per poll, eliminating
the race with negligible overhead given the 30s polling interval.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Adding configuration files to be used by OpAMP E2E test
* WIP: Adding OpAMP E2E test
* Fix otelcol template data to use nested OpAMP keys
The otelcol-opamp.tpl template accesses {{ .OpAMP.APIKey }} and
{{ .OpAMP.InstanceUID }}, so the template data must nest these under
an "OpAMP" key rather than passing them as flat top-level keys.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Use distinct filename for otelcol config in TestOpAMP
The otelcol config was being written to config.yml, overwriting the
fleet-server config in the same temp dir. Rename it to otelcol.yml.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Make otelcol-contrib download URL platform-aware in TestOpAMP
Use runtime.GOOS and runtime.GOARCH to build the download URL
dynamically instead of hardcoding darwin_arm64. Also chmod the
extracted binary since extractTarGz doesn't preserve permissions.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Fix resp.Body handling in TestOpAMP
Use explicit Close() instead of defer since resp is reassigned later
in the function, which would cause the deferred close to act on the
wrong response.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Increase TestOpAMP timeout and use defer for cleanup
Increase context timeout from 1 to 3 minutes to account for the
otelcol-contrib download. Use defer for cancel() and cmd.Wait() so
cleanup happens even on test failure.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Start OTel Collector in TestOpAMP
Extract instanceUID and apiKey into variables, remove the placeholder
time.Sleep, and start the otelcol-contrib binary with the OpAMP
extension config pointing at fleet-server.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Verify agent enrollment in TestOpAMP
Poll Kibana via AgentIsOnline to confirm the OTel Collector was
enrolled as an agent in Fleet Server after connecting via OpAMP.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Extract OTel Collector version into package-level constant
Move the hardcoded otelcol-contrib version into otelColContribVersion
in const.go so it can be easily updated in one place.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Continue writing TestOpAMP e2e test
- Configure fleet-server with a static policy token for dummy-policy so
that GetEnrollmentTokenForPolicyID can find the enrollment token
- Fetch enrollment token before the raw POST to /v1/opamp
- Add Authorization and Content-Type headers to the raw POST
- Assert HTTP 200 response from the raw POST
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* Fix TestOpAMP e2e test
- Enroll a dummy agent before starting the OTel Collector to initialize
the .fleet-agents index. Without this, findEnrolledAgent fails with
index_not_found_exception in a standalone fleet-server environment
(unlike agent-managed fleet-server which self-enrolls on startup).
- Add AgentHasStatus scaffold method that accepts multiple acceptable
statuses, and AgentIsUpdating that delegates to it.
- Use AgentIsUpdating in TestOpAMP: OpAMP agents communicate via the
OpAMP protocol rather than Fleet's normal checkin/ack protocol, so
they never acknowledge the initial policy change action and Kibana
shows them as "updating" rather than "online".
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* Fixing conflicts during rebase
* Download OTel Contrib source and build collector from it
* Running go fmt
* Fetch entire Agent doc from ES and make finer-grained assertions on its contents
* Check status from doc field
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
(cherry picked from commit 7aededf)
github-actions
bot
added
Team:Elastic-Agent-Control-Plane
ycombinator
approved these changes
Feb 26, 2026
Contributor
|
buildkite test this |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What is the problem this PR solves?
// Please do not just reference an issue. Explain WHAT the problem this PR solves here.
This PR ensures that an OTel Collector (from an upstream contrib release) is able to successfully connect to Fleet Server over OpAMP. Preliminary OpAMP support was added in Fleet Server in #6270 so this PR here is a follow up to that work.
Note: There will be a follow up PR that adds a test (or extends this one) to ensure that EDOT Collector is able to successfully connect to Fleet Server over OpAMP (#6394)
How does this PR solve the problem?
// Explain HOW you solved the problem in your code. It is possible that during PR reviews this changes and then this section should be updated.
By adding a new E2E test,
TestStandAloneRunningSuite/TestOpAMPthat downloads and extracts the OTel Collector binary from an upstream contrib release, configures it with theopampextension, configures Fleet Server to turn on thefeature_flags.enable_opampfeature flag, runs the Collector, and verifies that the Collector is connecting to Fleet Server over OpAMP.How to test this PR locally
Design Checklist
Checklist
./changelog/fragmentsusing the changelog toolRelated issues
This is an automatic backport of pull request [OpAMP] Add E2E test #6289 done by Mergify.