Skip to content

refactor: update autodiscover dependency - #8447

Merged
gsarantid merged 2 commits into
elastic:mainfrom
andrzej-stencel:update-autodiscover-dependency
Sep 21, 2026
Merged

gsarantid merged 2 commits into
elastic:mainfrom
andrzej-stencel:update-autodiscover-dependency

Conversation

@andrzej-stencel

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)

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.

@jeniawhite jeniawhite left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rebase the PR and make sure that CI passes.

@mergify

mergify Bot commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@mergify

mergify Bot commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b update-autodiscover-dependency upstream/update-autodiscover-dependency
git merge upstream/main
git push upstream update-autodiscover-dependency

@andrzej-stencel

Copy link
Copy Markdown
Contributor Author

@jeniawhite can we merge this?

@gsarantid
gsarantid added this pull request to the merge queue Sep 21, 2026
Merged via the queue into elastic:main with commit 4e57a07 Sep 21, 2026
12 checks passed
@github-actions

Copy link
Copy Markdown

@Mergifyio backport 9.5 9.4 8.19

@mergify

mergify Bot commented Sep 21, 2026 •

Copy link
Copy Markdown
Contributor

backport 9.5 9.4 8.19

✅ Backports have been created

Details

Cherry-pick of 4e57a07 has failed:

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

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:   go.mod
	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.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

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

Cherry-pick of 4e57a07 has failed:

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

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:   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:   NOTICE.txt
	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

github-merge-queue Bot pushed a commit that referenced this pull request Sep 24, 2026
### 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)~
<hr>This is an automatic backport of pull request #8447 done by
[Mergify](https://mergify.com).

---------

Co-authored-by: Andrzej Stencel <andrzej.stencel@elastic.co>
Co-authored-by: Dmitry Gurevich <dmitry.gurevich@elastic.co>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants