This is an automated email from the ASF dual-hosted git repository. dongeforever pushed a commit to branch msg_track in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit c50ada6ef1ffabae105efb234c9c98bf4c4c8c06 Merge: 7fd657f 47556d6 Author: Zhendong Liu <[email protected]> AuthorDate: Mon Dec 10 17:00:21 2018 +0800 Merge pull request #597 from zongtanghu/develop [ISSUE #525] Support the message track. Merge to branch msg_track .../broker/processor/AdminBrokerProcessor.java | 8 + .../rocketmq/broker/topic/TopicConfigManager.java | 14 + .../client/consumer/DefaultMQPushConsumer.java | 78 +++++ .../client/producer/DefaultMQProducer.java | 80 ++++- .../client/trace/core/common/TrackTraceBean.java | 144 +++++++++ .../trace/core/common/TrackTraceConstants.java | 34 ++ .../trace/core/common/TrackTraceContext.java | 136 ++++++++ .../trace/core/common/TrackTraceDataEncoder.java | 175 ++++++++++ .../core/common/TrackTraceDispatcherType.java | 22 ++ .../trace/core/common/TrackTraceTransferBean.java | 44 +++ .../client/trace/core/common/TrackTraceType.java | 23 ++ .../trace/core/dispatch/AsyncDispatcher.java | 51 +++ .../core/dispatch/impl/AsyncArrayDispatcher.java | 358 +++++++++++++++++++++ .../dispatch/impl/TrackTraceProducerFactory.java | 71 ++++ .../core/hook/ConsumeMessageTraceHookImpl.java | 113 +++++++ .../trace/core/hook/SendMessageTrackHookImpl.java | 99 ++++++ .../trace/DefaultMQConsumerWithTraceTest.java | 313 ++++++++++++++++++ .../trace/DefaultMQProducerWithTraceTest.java | 220 +++++++++++++ .../org/apache/rocketmq/common/BrokerConfig.java | 11 +- .../java/org/apache/rocketmq/common/MixAll.java | 4 +- distribution/conf/2m-noslave/broker-a.properties | 1 + distribution/conf/2m-noslave/broker-b.properties | 1 + ...broker-a.properties => broker-trace.properties} | 5 +- .../apache/rocketmq/example/simple/Producer.java | 1 - .../rocketmq/example/simple/PushConsumer.java | 4 +- .../TraceProducer.java} | 8 +- .../TracePushConsumer.java} | 12 +- .../logappender/common/ProducerInstance.java | 2 +- .../rocketmq/logappender/AbstractTestCase.java | 2 +- .../test/client/rmq/RMQNormalConsumer.java | 2 +- .../rocketmq/test/factory/ProducerFactory.java | 2 +- .../command/message/QueryMsgByIdSubCommand.java | 2 +- .../rocketmq/tools/monitor/MonitorService.java | 2 +- 33 files changed, 2018 insertions(+), 24 deletions(-)
