fix: Return error on InstrumentedClient.MergePull
#3839
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
When the underlying GitHub Client returns an error it gets swallowed in this wrapper method. Not only that but also the emitted metrics are wrong, as it counts one error AND success at the same time. We've found this @grafana when using Atlantis in a massive repository with many changes per minute, and sometimes Atlantis leave a comment saying it's automatically merging but then nothing happens. But checking the logs, we've found the following error message: Unable to merge pull, error: merging pull request: PUT https://api.github.com/repos/grafana/redacted/pulls/666/merge: 405 Base branch was modified. Review and try the merge again. [] And because the error is swallowed and `InstrumentedClient.MergePull` returns `nil`, then `Automerger` fails to leave a comment saying merging failed.
inkel
changed the title
InstrumentedClient.MergePull
inkel
changed the title
InstrumentedClient.MergePullInstrumentedClient.MergePull
|
I've fixed the title but I'm on my phone and can't re-run the check. |
jamengual
changed the title
InstrumentedClient.MergePullInstrumentedClient.MergePull
jamengual
approved these changes
Oct 9, 2023
|
Thanks @inkel for the contribution |
|
Thank you @jamengual for the quick response! |
|
/cherry-pick release-0.26 |
gcp-cherry-pick-bot bot
pushed a commit
that referenced
this pull request
Nov 7, 2023
When the underlying GitHub Client returns an error it gets swallowed in this wrapper method. Not only that but also the emitted metrics are wrong, as it counts one error AND success at the same time. We've found this @grafana when using Atlantis in a massive repository with many changes per minute, and sometimes Atlantis leave a comment saying it's automatically merging but then nothing happens. But checking the logs, we've found the following error message: Unable to merge pull, error: merging pull request: PUT https://api.github.com/repos/grafana/redacted/pulls/666/merge: 405 Base branch was modified. Review and try the merge again. [] And because the error is swallowed and `InstrumentedClient.MergePull` returns `nil`, then `Automerger` fails to leave a comment saying merging failed.
GenPage
pushed a commit
that referenced
this pull request
Nov 7, 2023
When the underlying GitHub Client returns an error it gets swallowed in this wrapper method. Not only that but also the emitted metrics are wrong, as it counts one error AND success at the same time. We've found this @grafana when using Atlantis in a massive repository with many changes per minute, and sometimes Atlantis leave a comment saying it's automatically merging but then nothing happens. But checking the logs, we've found the following error message: Unable to merge pull, error: merging pull request: PUT https://api.github.com/repos/grafana/redacted/pulls/666/merge: 405 Base branch was modified. Review and try the merge again. [] And because the error is swallowed and `InstrumentedClient.MergePull` returns `nil`, then `Automerger` fails to leave a comment saying merging failed. Co-authored-by: Leandro López <[email protected]>
|
This is one of the best features of atlantis 0.27.0. FYI. Thank you. |
|
Aaaw, thanks for saying this! |
ijames-gc
pushed a commit
to gocardless/atlantis
that referenced
this pull request
Feb 13, 2024
When the underlying GitHub Client returns an error it gets swallowed in this wrapper method. Not only that but also the emitted metrics are wrong, as it counts one error AND success at the same time. We've found this @grafana when using Atlantis in a massive repository with many changes per minute, and sometimes Atlantis leave a comment saying it's automatically merging but then nothing happens. But checking the logs, we've found the following error message: Unable to merge pull, error: merging pull request: PUT https://api.github.com/repos/grafana/redacted/pulls/666/merge: 405 Base branch was modified. Review and try the merge again. [] And because the error is swallowed and `InstrumentedClient.MergePull` returns `nil`, then `Automerger` fails to leave a comment saying merging failed.
ijames-gc
pushed a commit
to gocardless/atlantis
that referenced
this pull request
Feb 13, 2024
When the underlying GitHub Client returns an error it gets swallowed in this wrapper method. Not only that but also the emitted metrics are wrong, as it counts one error AND success at the same time. We've found this @grafana when using Atlantis in a massive repository with many changes per minute, and sometimes Atlantis leave a comment saying it's automatically merging but then nothing happens. But checking the logs, we've found the following error message: Unable to merge pull, error: merging pull request: PUT https://api.github.com/repos/grafana/redacted/pulls/666/merge: 405 Base branch was modified. Review and try the merge again. [] And because the error is swallowed and `InstrumentedClient.MergePull` returns `nil`, then `Automerger` fails to leave a comment saying merging failed.
1 task
terakoya76
pushed a commit
to terakoya76/atlantis
that referenced
this pull request
Dec 31, 2024
When the underlying GitHub Client returns an error it gets swallowed in this wrapper method. Not only that but also the emitted metrics are wrong, as it counts one error AND success at the same time. We've found this @grafana when using Atlantis in a massive repository with many changes per minute, and sometimes Atlantis leave a comment saying it's automatically merging but then nothing happens. But checking the logs, we've found the following error message: Unable to merge pull, error: merging pull request: PUT https://api.github.com/repos/grafana/redacted/pulls/666/merge: 405 Base branch was modified. Review and try the merge again. [] And because the error is swallowed and `InstrumentedClient.MergePull` returns `nil`, then `Automerger` fails to leave a comment saying merging failed.
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.
When the underlying GitHub Client returns an error it gets swallowed in this wrapper method. Not only that but also the emitted metrics are wrong, as it counts one error AND success at the same time.
We've found this @grafana when using Atlantis in a massive repository with many changes per minute, and sometimes Atlantis leave a comment saying it's automatically merging but then nothing happens. But checking the logs, we've found the following error message:
And because the error is swallowed and
InstrumentedClient.MergePullreturnsnil, thenAutomergerfails to leave a comment saying merging failed.