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

[ISSUE #1462]🔥Add macro for create client broker error🚀 #1465

Merged
merged 1 commit into from
Nov 30, 2024

Conversation

mxsm
Copy link
Owner

@mxsm mxsm commented Nov 30, 2024

Which Issue(s) This PR Fixes(Closes)

Fixes #1462

Brief Description

How Did You Test This Change?

Summary by CodeRabbit

  • New Features

    • Introduced a new macro, client_broker_err!, for easier error handling related to broker errors.
  • Tests

    • Added unit tests to validate the functionality of the new error handling macro.

Copy link
Contributor

coderabbitai bot commented Nov 30, 2024

Walkthrough

The changes introduce a new macro named client_broker_err! in the rocketmq-client/src/client_error.rs file. This macro facilitates the creation of MQClientError::MQClientBrokerError instances with two forms for different input parameters. Additionally, two unit tests are included to ensure the macro's functionality. The changes do not affect any existing error handling logic or control flow.

Changes

File Path Change Summary
rocketmq-client/src/client_error.rs Added a new macro client_broker_err! for creating MQClientError::MQClientBrokerError instances and included two unit tests to validate its functionality.

Assessment against linked issues

Objective Addressed Explanation
Add macro for create client broker error (#1462)

Possibly related PRs

Suggested labels

feature, auto merge, ready to review, waiting-review, AI review first

Suggested reviewers

  • TeslaRustor
  • SpaceXCN

🐰 In the code where errors dwell,
A macro springs forth, casting a spell.
With client_broker_err! now in sight,
Creating errors is a breeze, what a delight!
Two tests to ensure all's well,
In the land of RocketMQ, we bid farewell! 🌟


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@rocketmq-rust-robot rocketmq-rust-robot added the feature🚀 Suggest an idea for this project. label Nov 30, 2024
@rocketmq-rust-robot rocketmq-rust-robot added this to the v0.4.0 milestone Nov 30, 2024
@rocketmq-rust-bot
Copy link
Collaborator

🔊@mxsm 🚀Thanks for your contribution 🎉. CodeRabbit(AI) will review your code first 🔥

Copy link

codecov bot commented Nov 30, 2024

Codecov Report

Attention: Patch coverage is 90.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 22.33%. Comparing base (03b047f) to head (42759cf).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
rocketmq-client/src/client_error.rs 90.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1465      +/-   ##
==========================================
+ Coverage   22.30%   22.33%   +0.02%     
==========================================
  Files         450      450              
  Lines       58037    58057      +20     
==========================================
+ Hits        12948    12966      +18     
- Misses      45089    45091       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (1)
rocketmq-client/src/client_error.rs (1)

255-277: Improve test coverage and fix test data

The test at line 262 uses a raw format string "{}" as the error message, which seems unintentional. Additionally, the test coverage could be improved.

  1. Fix the test data:
-            client_broker_err!(404, "Error: {}", "127.0.0.1");
+            client_broker_err!(404, "Not Found", "127.0.0.1");
  1. Add tests for edge cases:
#[test]
fn client_broker_err_handles_empty_strings() {
    let result: Result<(), MQClientError> = client_broker_err!(404, "", "");
    if let Err(MQClientError::MQClientBrokerError(err)) = result {
        assert_eq!(err.error_message().unwrap(), "");
        assert_eq!(err.broker_addr().unwrap(), "");
    }
}

#[test]
fn client_broker_err_handles_special_characters() {
    let result: Result<(), MQClientError> = 
        client_broker_err!(404, "Error: \n\t\"quoted\"", "localhost:8080");
    if let Err(MQClientError::MQClientBrokerError(err)) = result {
        assert_eq!(err.error_message().unwrap(), "Error: \n\t\"quoted\"");
    }
}
  1. After implementing format string support, add this test:
#[test]
fn client_broker_err_with_format_args_formats_correctly() {
    let result: Result<(), MQClientError> = 
        client_broker_err!(404, "Error: {} on {}", "Not Found", "Service A", "broker1");
    if let Err(MQClientError::MQClientBrokerError(err)) = result {
        assert_eq!(err.error_message().unwrap(), "Error: Not Found on Service A");
        assert_eq!(err.broker_addr().unwrap(), "broker1");
    }
}
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 03b047f and 42759cf.

📒 Files selected for processing (1)
  • rocketmq-client/src/client_error.rs (2 hunks)
🔇 Additional comments (1)
rocketmq-client/src/client_error.rs (1)

104-122: Verify macro usage in the codebase

Let's verify how this macro will be used and ensure there are no breaking changes.

✅ Verification successful

Macro implementation aligns with existing error handling patterns

The verification shows that the macro implementation perfectly matches the existing error handling patterns in the codebase:

  • The macro's two variants (new_with_broker and new) align with actual usage patterns found in multiple files:
    • mq_client_api_impl.rs uses the three-argument pattern (code, message, broker_addr)
    • pull_callback.rs demonstrates error code checking from broker errors
    • Test cases in client_error.rs validate both variants

The macro is a type-safe wrapper that standardizes the existing error creation patterns without introducing breaking changes.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for potential usage patterns of broker errors in the codebase
# This will help understand how the macro should be implemented

# Look for existing broker error creation patterns
echo "Checking existing broker error patterns..."
rg -A 2 "MQClientError::MQClientBrokerError" --type rust

# Look for potential usage patterns in comments or TODOs
echo "Checking potential usage patterns..."
rg -A 2 "broker.*error" --type rust

Length of output: 10990

Comment on lines +104 to +122
#[macro_export]
macro_rules! client_broker_err {
// Handle errors with a custom ResponseCode and formatted string
($response_code:expr, $error_message:expr, $broker_addr:expr) => {{
std::result::Result::Err($crate::client_error::MQClientError::MQClientBrokerError(
$crate::client_error::MQBrokerErr::new_with_broker(
$response_code as i32,
$error_message,
$broker_addr,
),
))
}};
// Handle errors without a ResponseCode, using only the error message
($response_code:expr, $error_message:expr) => {{
std::result::Result::Err($crate::client_error::MQClientError::MQClientBrokerError(
$crate::client_error::MQBrokerErr::new($response_code as i32, $error_message),
))
}};
}
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Add documentation and support format strings

The macro implementation could be improved in several ways:

  1. Missing documentation comments explaining usage and examples
  2. Unlike mq_client_err! and request_timeout_err!, this macro doesn't support format strings with multiple arguments

Consider adding documentation and extending the macro like this:

 #[macro_export]
+/// Creates a broker-related error result
+/// 
+/// # Examples
+/// 
+/// ```
+/// let err = client_broker_err!(404, "Error: {} - {}", "Not Found", "broker1");
+/// let err = client_broker_err!(404, "Not Found");
+/// ```
 macro_rules! client_broker_err {
+    // Handle errors with formatted string and broker address
+    ($response_code:expr, $fmt:expr, $($arg:expr),*, $broker_addr:expr) => {{
+        let formatted_msg = format!($fmt, $($arg),*);
+        std::result::Result::Err($crate::client_error::MQClientError::MQClientBrokerError(
+            $crate::client_error::MQBrokerErr::new_with_broker(
+                $response_code as i32,
+                formatted_msg,
+                $broker_addr,
+            ),
+        ))
+    }};
     // Handle errors with a custom ResponseCode and formatted string
     ($response_code:expr, $error_message:expr, $broker_addr:expr) => {{

Committable suggestion skipped: line range outside the PR's diff.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AI review first Ai review pr first approved PR has approved auto merge feature🚀 Suggest an idea for this project.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature🚀] Add macro for create client broker error
4 participants