Skip to content

fix: do not try to create apm-serve registry if it exists#17872

Merged
kruskall merged 1 commit intoelastic:mainfrom
kruskall:fix/get-or-create-telemetry-registry
Jul 31, 2025
Merged

fix: do not try to create apm-serve registry if it exists#17872
kruskall merged 1 commit intoelastic:mainfrom
kruskall:fix/get-or-create-telemetry-registry

Conversation

@kruskall
Copy link
Member

@kruskall kruskall 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
@kruskall kruskall requested a review from a team as a code owner July 31, 2025 12:51
@github-actions
Copy link
Contributor

github-actions bot commented Jul 31, 2025

🤖 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 mentioned this pull request Jul 31, 2025
Closed
@mergify
Copy link
Contributor

mergify bot commented Jul 31, 2025

This pull request does not have a backport label. Could you fix it @kruskall? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.17 is the label to automatically backport to the 7.17 branch.
  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
  • backport-9./d is the label to automatically backport to the 9./d branch. /d is the digit.
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.
carsonip
carsonip reviewed Jul 31, 2025
View reviewed changes
Copy link
Member

@carsonip carsonip left a comment

Choose a reason for hiding this comment

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

backport 9.1 and 8.19?
@kruskall kruskall added backport-9.0 Automated backport to the 9.0 branch backport-8.19 Automated backport to the 8.19 branch backport-9.1 Automated backport to the 9.1 branch labels Jul 31, 2025
@kruskall kruskall added this pull request to the merge queue Jul 31, 2025
Merged via the queue into elastic:main with commit b17e61d Jul 31, 2025
21 checks passed
@kruskall kruskall deleted the fix/get-or-create-telemetry-registry branch July 31, 2025 13:31
mergify bot pushed a commit that referenced this pull request Jul 31, 2025
@kruskall @mergify
fix: do not try to create apm-serve registry if it exists (#17872)
0f675be 
(cherry picked from commit b17e61d)
@mergify mergify bot mentioned this pull request Jul 31, 2025
Merged
2 tasks
mergify bot pushed a commit that referenced this pull request Jul 31, 2025
@kruskall @mergify
fix: do not try to create apm-serve registry if it exists (#17872)
aac0f75 
(cherry picked from commit b17e61d)

# Conflicts:
#	internal/beater/telemetry.go
@mergify mergify bot mentioned this pull request Jul 31, 2025
Closed
2 tasks
mergify bot pushed a commit that referenced this pull request Jul 31, 2025
@kruskall @mergify
fix: do not try to create apm-serve registry if it exists (#17872)
68daa3d 
(cherry picked from commit b17e61d)
@mergify mergify bot mentioned this pull request Jul 31, 2025
Merged
2 tasks
mergify bot added a commit that referenced this pull request Jul 31, 2025
@mergify @kruskall
fix: do not try to create apm-serve registry if it exists (#17872) (#…
28cd59b 
…17875)

(cherry picked from commit b17e61d)

Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com>
mergify bot added a commit that referenced this pull request Jul 31, 2025
@mergify @kruskall
fix: do not try to create apm-serve registry if it exists (#17872) (#…
9f9a095 
…17873)

(cherry picked from commit b17e61d)

Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com>
@ericywl ericywl mentioned this pull request Aug 1, 2025
Closed
@marclop marclop mentioned this pull request Aug 4, 2025
Closed
@lahsivjar lahsivjar mentioned this pull request Aug 4, 2025
Closed
1 task
@carsonip carsonip mentioned this pull request Aug 5, 2025
Closed
@rubvs rubvs mentioned this pull request Aug 6, 2025
Closed
1 task
@rubvs
Copy link
Contributor

rubvs commented Aug 6, 2025

Manually tested with BC for:

  • 9.1.0-SNAPSHOT
Screenshot 2025-08-06 at 11 54 10 AM
  • 8.19.0-SNAPSHOT
Screenshot 2025-08-06 at 11 54 19 AM
  • 9.1.1
Screenshot 2025-08-06 at 11 54 46 AM
  • 8.19.1
Screenshot 2025-08-06 at 11 54 35 AM
@1pkg 1pkg mentioned this pull request Aug 7, 2025
Closed
1 task
This was referenced Aug 12, 2025
Merged
Merged
carsonip added a commit that referenced this pull request Aug 12, 2025
@carsonip
changelog: Update 8.19.1 entry (#18105)
f280958 
A more user friendly description of the change in #17872
@faec faec mentioned this pull request Aug 14, 2025
Merged
This was referenced Aug 14, 2025
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.19 Automated backport to the 8.19 branch backport-9.0 Automated backport to the 9.0 branch backport-9.1 Automated backport to the 9.1 branch

5 participants

@kruskall @rubvs @michalpristas @simitt @carsonip