[9.5](backport #8447) refactor: update autodiscover dependency - #8510
Merged
Merged
Conversation
### Summary of your changes Replaces the Go module `github.com/elastic/elastic-agent-autodiscover` with packages from `github.com/elastic/beats/v7/pkg/autodiscover`. This is following the move of the elastic-agent-autodiscover code to Beats (elastic/beats#51804). This is a dependency replacement without functional changes. ### Checklist - ~[ ] I have added tests that prove my fix is effective or that my feature works~ - ~[ ] I have added the necessary README/documentation (if appropriate)~ (cherry picked from commit 4e57a07) # Conflicts: # go.sum
Contributor
Author
|
Cherry-pick of 4e57a07 has failed: 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 |
The cherry-pick of the autodiscover dependency refactor onto 9.5 left raw conflict markers committed in go.sum, causing all CI checks to fail. Resolves the 4 conflict sections by keeping the cherry-pick side (newer module versions that match go.mod). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
The otel transitive dependency versions in go.sum were from main rather than the 9.5 module graph. Running go mod tidy brings them in line with what go.mod actually resolves to on this branch. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
gurevichdmitry
approved these changes
Sep 22, 2026
Contributor
Author
|
Tick the box to add this pull request to the merge queue (same as
|
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Sep 22, 2026
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
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.
Summary of your changes
Replaces the Go module
github.com/elastic/elastic-agent-autodiscoverwith packages fromgithub.com/elastic/beats/v7/pkg/autodiscover. This is following the move of the elastic-agent-autodiscover code to Beats (elastic/beats#51804).This is a dependency replacement without functional changes.
Checklist
[ ] I have added tests that prove my fix is effective or that my feature works[ ] I have added the necessary README/documentation (if appropriate)This is an automatic backport of pull request #8447 done by [Mergify](https://mergify.com).