Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 24, 2025

What does this PR do?

Fixes a bug where the Otel manager wouldn't report runtime errors to the coordinator.

Why is it important?

The coordinator needs to know about errors encountered by the otel manager.

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 added tests that prove my fix is effective or that my feature works

Related issues


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

(cherry picked from commit 371399c)

# Conflicts:
#	internal/pkg/otel/manager/manager.go
#	internal/pkg/otel/manager/manager_test.go
@mergify mergify bot requested a review from a team as a code owner April 24, 2025 13:17
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 24, 2025
@mergify mergify bot requested review from michalpristas and pchila and removed request for a team April 24, 2025 13:17
@mergify
Copy link
Contributor Author

mergify bot commented Apr 24, 2025

Cherry-pick of 371399c has failed:

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

You are currently cherry-picking commit 371399ccb.
  (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/manager/manager.go
	both modified:   internal/pkg/otel/manager/manager_test.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 bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Apr 24, 2025
@elasticmachine
Copy link
Contributor

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

@elastic-sonarqube
Copy link

@swiatekm
Copy link
Contributor

This was fixed in 8.18 by #6927, so this backport isn't necessary.

@swiatekm swiatekm closed this Apr 24, 2025
@mergify mergify bot deleted the mergify/bp/8.18/pr-6793 branch April 24, 2025 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport bug Something isn't working 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.

2 participants