Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BB-473 Probe response logic should be handled in the handler #2479

Merged
merged 2 commits into from
Dec 4, 2023

Conversation

nicolas2bert
Copy link
Contributor

Currently, the probe response logic is distributed between Backbeat probe handlers and Arsenal's onRequest method.
This scattered approach causes confusion for developers and results in bugs.
The solution is to centralize the probe response logic exclusively within the Backbeat probe handlers.

@bert-e
Copy link
Contributor

bert-e commented Dec 1, 2023

Hello nicolas2bert,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Dec 1, 2023

Incorrect fix version

The Fix Version/s in issue BB-473 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.16

  • 7.70.11

  • 8.5.5

  • 8.6.31

  • 8.7.0

Please check the Fix Version/s of BB-473, or the target
branch of this pull request.

@bert-e
Copy link
Contributor

bert-e commented Dec 1, 2023

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

const errorCode = 500;
log.error('sending back error response', {
httpCode: errorCode,
error: messages,
Copy link
Contributor

Choose a reason for hiding this comment

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

It's not ideal to log JSON-serialized contents, as it will be serialized again so not very readable as is.

It's likely that for indexing purpose we want to keep the error field as a string.

Maybe we can separate this logic in two cases:

  • if there is a single error, just log its message in error
  • if there is more than one error, add errors: errorMessages to the log, and have error log something generic like multiple errors (see "errors" field for details). Alternatively we may also concatenate error messages in a "human-readable" string but we may end up with a long error message, not necessarily very readable either.

That would be my recommendation but I leave it up to you.

Currently, the probe response logic is distributed between Backbeat probe handlers and Arsenal's onRequest method.
This scattered approach causes confusion for developers and results in bugs.
The solution is to centralize the probe response logic exclusively within the Backbeat probe handlers.
@nicolas2bert
Copy link
Contributor Author

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Dec 4, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/bugfix/BB-473/probe with contents from bugfix/BB-473/probe
and development/7.70.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/7.70/bugfix/BB-473/probe origin/development/7.70
 $ git merge origin/bugfix/BB-473/probe
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/BB-473/probe

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Dec 4, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.5/bugfix/BB-473/probe with contents from w/7.70/bugfix/BB-473/probe
and development/8.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.5/bugfix/BB-473/probe origin/development/8.5
 $ git merge origin/w/7.70/bugfix/BB-473/probe
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/bugfix/BB-473/probe

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Dec 4, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Dec 4, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

The following options are set: create_integration_branches

@nicolas2bert
Copy link
Contributor Author

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Dec 4, 2023

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.5

  • ✔️ development/8.6

  • ✔️ development/8.7

The following branches will NOT be impacted:

  • development/7.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Dec 4, 2023

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.5

  • ✔️ development/8.6

  • ✔️ development/8.7

The following branches have NOT changed:

  • development/7.4

Please check the status of the associated issue BB-473.

Goodbye nicolas2bert.

@bert-e bert-e merged commit 962a128 into development/7.10 Dec 4, 2023
4 checks passed
@bert-e bert-e deleted the bugfix/BB-473/probe branch December 4, 2023 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants