Skip to content

[9.4](backport #8447) refactor: update autodiscover dependency - #8511

Merged
gurevichdmitry merged 6 commits into
9.4from
mergify/bp/9.4/pr-8447
Sep 22, 2026
Merged

gurevichdmitry merged 6 commits into
9.4from
mergify/bp/9.4/pr-8447

Conversation

@mergify

@mergify mergify Bot commented Sep 21, 2026

Copy link
Copy Markdown
Contributor

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)

This is an automatic backport of pull request #8447 done by [Mergify](https://mergify.com).

### 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.mod
#	go.sum
@mergify

mergify Bot commented Sep 21, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 4e57a07 has failed:

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

You are currently cherry-picking commit 4e57a07.
  (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.txt
	modified:   internal/dataprovider/providers/k8s/client_provider.go
	modified:   internal/dataprovider/providers/k8s/client_provider_mock.go
	modified:   internal/dataprovider/providers/k8s/cluster_name_provider.go
	modified:   internal/flavors/benchmark/eks.go
	modified:   internal/flavors/benchmark/k8s.go
	modified:   internal/flavors/benchmark/k8s_helper.go
	modified:   internal/processor/add_cluster_id/add_cluster_id.go
	modified:   internal/resources/fetching/fetchers/aws/ecr_fetcher_test.go
	modified:   internal/resources/fetching/fetchers/k8s/kube_fetcher.go
	modified:   internal/resources/fetching/fetchers/k8s/kube_provider.go
	modified:   internal/uniqueness/leaderelection.go

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

gurevichdmitry and others added 2 commits September 22, 2026 13:08
The cherry-pick of the autodiscover dependency refactor onto 9.4
left raw conflict markers committed in go.mod and go.sum, causing
all CI checks to fail. Resolves both files by keeping the cherry-pick
side (newer module versions that match the intended dependency update).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
gurevichdmitry and others added 3 commits September 22, 2026 16:15
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
The upgraded beats version adds two new config sections: Docker provider
wait_for_metadata options and the http.debug.state_inspector debug tool.
Update cloudbeat.reference.yml to match what mage config generates.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Incorporates two Renovate updates that landed on 9.4: ebitengine/purego
v0.11.1 and bmatcuk/doublestar/v4 v4.10.1.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@gurevichdmitry
gurevichdmitry added this pull request to the merge queue Sep 22, 2026
@mergify

mergify Bot commented Sep 22, 2026 •

Copy link
Copy Markdown
Contributor Author

This pull request does not currently match the merge queue conditions, so it cannot be queued from here. The box comes back if it matches again.

Merged via the queue into 9.4 with commit ab97e0a Sep 22, 2026
11 checks passed
@gurevichdmitry
gurevichdmitry deleted the mergify/bp/9.4/pr-8447 branch September 22, 2026 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants