Fix APM server not being available in cloud. #1781
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cmacknz
requested review from
michalpristas and
blakerouse
and removed request for
a team
axw
approved these changes
Nov 24, 2022
Cloud monitoring is hard coded to look for /processes/apm-server using the processes API. Force us to always use that name for reporting when APM server is running.
cmacknz
force-pushed
the
fix-apm-server-process-name
branch
from
7b23813 to
6cf409a
Compare
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
💚 Flaky test reportTests succeeded. 🤖 GitHub commentsExpand to view the GitHub comments
To re-run your PR in the CI, just comment with:
|
🌐 Coverage report
|
cmacknz
commented
Nov 24, 2022
| @@ -50,7 +50,15 @@ func processesHandler(coord *coordinator.Coordinator) func(http.ResponseWriter, | |||
|
|
|||
| for _, c := range state.Components { | |||
| if c.Component.InputSpec != nil { | |||
| procs = append(procs, process{c.Component.ID, c.Component.InputSpec.BinaryName, | |||
| displayID := c.Component.ID | |||
| if strings.Contains(displayID, "apm") { | |||
There was a problem hiding this comment.
I think this might do unexpected things if we ever have another APM related input. Going to switch to looking at the actual binary name.
Also fix the PID and binary fields being swapped when constructing a process to display.
mergify bot
pushed a commit
that referenced
this pull request
Nov 24, 2022
(cherry picked from commit b4002e9)
cmacknz
added a commit
that referenced
this pull request
Nov 24, 2022
(cherry picked from commit b4002e9) Co-authored-by: Craig MacKenzie <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cloud monitoring is hard coded to look for /processes/apm-server using the processes API. Force us to always use that name for reporting when APM server is running.
This is can certainly be considered a hack, but it's simple and it should work.