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 #3779] Add hook to execute after consume for pop #3780

Merged
merged 1 commit into from
Feb 14, 2022

Conversation

cserwen
Copy link
Member

@cserwen cserwen commented Jan 21, 2022

Make sure set the target branch to develop

What is the purpose of the change

#3779

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily. Notice, it would be helpful if you could finish the following 5 checklist(the last one is not necessary)before request the community to review your PR.

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test(over 80% coverage) to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean apache-rat:check findbugs:findbugs checkstyle:checkstyle to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

@coveralls
Copy link

coveralls commented Jan 21, 2022

Coverage Status

Coverage decreased (-0.004%) to 52.644% when pulling de0255d on cserwen:pop-hook into 631405e on apache:5.0.0-alpha.

@MatrixHB
Copy link
Contributor

@cserwen please pay attention to the CI build error.

@cserwen cserwen force-pushed the pop-hook branch 2 times, most recently from 4144014 to 8891aaf Compare January 25, 2022 06:13
@codecov-commenter
Copy link

codecov-commenter commented Jan 25, 2022

Codecov Report

Merging #3780 (76c132c) into 5.0.0-alpha (631405e) will increase coverage by 0.40%.
The diff coverage is n/a.

❗ Current head 76c132c differs from pull request most recent head de0255d. Consider uploading reports for the commit de0255d to get more accurate results

Impacted file tree graph

@@                Coverage Diff                @@
##             5.0.0-alpha    #3780      +/-   ##
=================================================
+ Coverage          46.53%   46.94%   +0.40%     
+ Complexity          5333     3842    -1491     
=================================================
  Files                641      495     -146     
  Lines              44345    32705   -11640     
  Branches            6116     4534    -1582     
=================================================
- Hits               20637    15353    -5284     
+ Misses             20982    15317    -5665     
+ Partials            2726     2035     -691     
Impacted Files Coverage Δ
...mq/broker/topic/TopicQueueMappingCleanService.java 12.10% <0.00%> (-3.69%) ⬇️
...tmq/logappender/log4j2/RocketmqLog4j2Appender.java 35.00% <0.00%> (-1.67%) ⬇️
...a/org/apache/rocketmq/store/StoreStatsService.java 40.65% <0.00%> (-0.66%) ⬇️
...ava/org/apache/rocketmq/filter/util/BitsArray.java 59.82% <0.00%> (ø)
...consumer/ConsumeMessagePopConcurrentlyService.java
...r/rebalance/AllocateMessageQueueByMachineRoom.java
...rg/apache/rocketmq/test/util/MQAdminTestUtils.java
...ocketmq/client/impl/consumer/MessageQueueLock.java
...pache/rocketmq/client/trace/TraceTransferBean.java
...client/trace/hook/ConsumeMessageTraceHookImpl.java
... and 143 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 631405e...de0255d. Read the comment docs.

@@ -457,6 +457,12 @@ public void run() {
consumeMessageContext.getProps().put(MixAll.CONSUME_CONTEXT_TYPE, returnType.name());
}

if (ConsumeMessagePopConcurrentlyService.this.defaultMQPushConsumerImpl.hasHook()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

The condition is the same to previous branch, it would be better to combine them.

Copy link
Member Author

Choose a reason for hiding this comment

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

@caigy OK, I will combine them.

@lizhiboo
Copy link
Contributor

lizhiboo commented Feb 9, 2022

@cserwen this pr contains many already merged prs, u can rebase to ur branch firstly.

@cserwen
Copy link
Member Author

cserwen commented Feb 11, 2022

@lizhiboo Ok, I will rebase it.

@duhenglucky duhenglucky merged commit de76e06 into apache:5.0.0-alpha Feb 14, 2022
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.

None yet

8 participants