Fixing the handling of detach errors #1030
Merged
Conversation
This file contains hidden or 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
Co-authored-by: Artur Souza <[email protected]>
The pubsub/nats component was replaced by pubsub/natsstreaming as part of dapr/dapr#2003, but the corresponding code in dapr/components-contrib was not removed, so this change removes it.
pkedy
commented
Jul 23, 2021
| a.logger.Error(innerErr) | ||
| var detachError *amqp.DetachError | ||
| var ampqError *amqp.Error | ||
| if errors.Is(innerErr, detachError) || |
Member
Author
There was a problem hiding this comment.
*amqp.Error is the most likely terror received, but I'm also detecting *amqp.DetachError in case.
| } | ||
|
|
||
| return fmt.Errorf("%s error receiving message on topic %s, %s", errorMessagePrefix, s.topic, err) | ||
| return fmt.Errorf("%s error receiving message on topic %s, %w", errorMessagePrefix, s.topic, err) |
Member
Author
There was a problem hiding this comment.
Using %w is required to wrap the underlying AMQP error so it can be detected by errors.Is/errors.As.
artursouza
approved these changes
Jul 23, 2021
Contributor
|
Please, change it to the release branch. We merge release into master. |
Codecov Report
@@ Coverage Diff @@
## master #1030 +/- ##
==========================================
+ Coverage 34.03% 34.21% +0.18%
==========================================
Files 133 132 -1
Lines 10750 10769 +19
==========================================
+ Hits 3659 3685 +26
+ Misses 6710 6699 -11
- Partials 381 385 +4
Continue to review full report at Codecov.
|
wcs1only
approved these changes
Jul 23, 2021
pkedy
added a commit
that referenced
this pull request
Jul 23, 2021
dapr-bot
pushed a commit
that referenced
this pull request
Aug 6, 2021
* Fixing the handling of detach errors (#1030) * Improve error message in case of missing property (#1012) Co-authored-by: Artur Souza <[email protected]> * Remove vestigial pubsub/nats code (#1024) The pubsub/nats component was replaced by pubsub/natsstreaming as part of dapr/dapr#2003, but the corresponding code in dapr/components-contrib was not removed, so this change removes it. * Fixing the handling of detach errors Co-authored-by: Maarten Mulders <[email protected]> Co-authored-by: Artur Souza <[email protected]> Co-authored-by: Simon Leet <[email protected]> * Revert "Fixing the handling of detach errors (#1030)" (#1031) This reverts commit 54840c2. * Fixing the handling of detach errors (#1032) Co-authored-by: Maarten Mulders <[email protected]> Co-authored-by: Artur Souza <[email protected]> Co-authored-by: Simon Leet <[email protected]>
amimimor
pushed a commit
to amimimor/components-contrib
that referenced
this pull request
Dec 9, 2021
* Fixing the handling of detach errors (dapr#1030) * Improve error message in case of missing property (dapr#1012) Co-authored-by: Artur Souza <[email protected]> * Remove vestigial pubsub/nats code (dapr#1024) The pubsub/nats component was replaced by pubsub/natsstreaming as part of dapr/dapr#2003, but the corresponding code in dapr/components-contrib was not removed, so this change removes it. * Fixing the handling of detach errors Co-authored-by: Maarten Mulders <[email protected]> Co-authored-by: Artur Souza <[email protected]> Co-authored-by: Simon Leet <[email protected]> * Revert "Fixing the handling of detach errors (dapr#1030)" (dapr#1031) This reverts commit 54840c2. * Fixing the handling of detach errors (dapr#1032) Co-authored-by: Maarten Mulders <[email protected]> Co-authored-by: Artur Souza <[email protected]> Co-authored-by: Simon Leet <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Description
This fixes the handling of
amqp:link:detach-forcederrors from Azure Service Bus. While the log message can be suppressed, this type of error should not be ignored because it prevents the component from reconnecting. Reconnecting is the desired behavior when the link is force detached.Issue reference
Resolves dapr/dapr#3468
Checklist
Please make sure you've completed the relevant tasks for this PR, out of the following list: