Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 31, 2025

Motivation/summary

apm-server registry could already exist, causing a failure on agent reload when trying to be recreated

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues


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

(cherry picked from commit b17e61d)

# Conflicts:
#	internal/beater/telemetry.go
@mergify mergify bot added the backport label Jul 31, 2025
@mergify mergify bot requested a review from a team as a code owner July 31, 2025 13:32
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Jul 31, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jul 31, 2025

Cherry-pick of b17e61d has failed:

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

You are currently cherry-picking commit b17e61d6.
  (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/beater/telemetry.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

@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 31, 2025
@github-actions
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@kruskall kruskall closed this Jul 31, 2025
@kruskall kruskall deleted the mergify/bp/9.0/pr-17872 branch October 2, 2025 11: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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants