Skip to content

[8.19] (backport #10079) internal/pkg/otel/components.go: put import of headersetterextension to the right section#10085

Closed
mergify[bot] wants to merge 1 commit into8.19from
mergify/bp/8.19/pr-10079
Closed

[8.19] (backport #10079) internal/pkg/otel/components.go: put import of headersetterextension to the right section#10085
mergify[bot] wants to merge 1 commit into8.19from
mergify/bp/8.19/pr-10079

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Sep 22, 2025

Follow-up PR for #9903 which added headersetterextension to EDOT, however, it put the import of it to the "receivers" section of imports


This is an automatic backport of pull request #10079 done by Mergify.

…to the right section (#10079)

* internal/pkg/otel/components.go: put import of headersetterextension to the right section

* add fragment

* Update summary 1758520325-fix-pr-9903.yaml

* remove changelog

(cherry picked from commit d79d422)

# Conflicts:
#	internal/pkg/otel/components.go
@mergify mergify Bot requested a review from a team as a code owner September 22, 2025 11:14
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Sep 22, 2025
@mergify mergify Bot requested review from michalpristas and pkoutsovasilis and removed request for a team September 22, 2025 11:14
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Sep 22, 2025

Cherry-pick of d79d422 has failed:

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

You are currently cherry-picking commit d79d422cd.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/otel/components.go

no changes added to commit (use "git add" and/or "git commit -a")

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 Sep 22, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

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

@swiatekm
Copy link
Copy Markdown
Member

This isn't necessary after all.

@swiatekm swiatekm closed this Sep 22, 2025
@mergify mergify Bot deleted the mergify/bp/8.19/pr-10079 branch September 22, 2025 11:23
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