Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 12, 2025

What does this PR do?

This PR now points beatsauthextension component on beats repo.

Why is it important?

beatsauthextension is now moved from elastic/opentelemetry-collector-components to beats repo.

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

None

Related issues

(cherry picked from commit e284aff)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	internal/edot/go.mod
#	internal/edot/go.sum
#	internal/pkg/otel/README.md
@mergify mergify bot requested a review from a team as a code owner November 12, 2025 12:47
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 12, 2025
@mergify mergify bot requested review from blakerouse and michalpristas and removed request for a team November 12, 2025 12:47
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Nov 12, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 12, 2025

Cherry-pick of e284aff has failed:

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

You are currently cherry-picking commit e284aff84.
  (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:   go.sum
	modified:   internal/pkg/otel/components.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod
	deleted by us:   internal/edot/go.mod
	deleted by us:   internal/edot/go.sum
	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

@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Nov 12, 2025
@elasticmachine
Copy link
Collaborator

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

@khushijain21 khushijain21 enabled auto-merge (squash) November 13, 2025 06:31
@khushijain21 khushijain21 merged commit b6b47ce into 9.2 Nov 13, 2025
21 checks passed
@khushijain21 khushijain21 deleted the mergify/bp/9.2/pr-11120 branch November 13, 2025 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants