You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by vo...@apache.org on 2021/05/19 04:42:50 UTC
[rocketmq] branch pop_consumer updated (7d32c02 -> ac9aaa4)
This is an automated email from the ASF dual-hosted git repository.
vongosling pushed a change to branch pop_consumer
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from 7d32c02 Merge pull request #2862 from hill007299/pop_consumer
add ac9aaa4 Fix conflict,merge develop (#2906)
No new revisions were added by this update.
Summary of changes:
.../broker/offset/ConsumerOffsetManager.java | 16 +++
.../broker/processor/AdminBrokerProcessor.java | 4 +
.../rocketmq/broker/topic/TopicConfigManager.java | 4 +-
.../queue/TransactionalMessageServiceImpl.java | 2 +-
client/pom.xml | 12 ++
.../org/apache/rocketmq/client/ClientConfig.java | 6 +-
.../client/hook/EndTransactionContext.java | 86 +++++++++++++
...terMessageHook.java => EndTransactionHook.java} | 4 +-
.../rocketmq/client/impl/MQClientAPIImpl.java | 3 +-
.../client/impl/consumer/AssignedMessageQueue.java | 5 +-
.../impl/consumer/DefaultLitePullConsumerImpl.java | 13 +-
.../impl/producer/DefaultMQProducerImpl.java | 43 ++++++-
.../client/producer/DefaultMQProducer.java | 13 +-
.../client/producer/TransactionMQProducer.java | 4 +
.../client/trace/AsyncTraceDispatcher.java | 4 +-
.../apache/rocketmq/client/trace/TraceBean.java | 29 ++++-
.../rocketmq/client/trace/TraceConstants.java | 16 +++
.../rocketmq/client/trace/TraceDataEncoder.java | 41 +++++-
.../apache/rocketmq/client/trace/TraceType.java | 1 +
.../hook/ConsumeMessageOpenTracingHookImpl.java | 95 ++++++++++++++
.../hook/EndTransactionOpenTracingHookImpl.java | 72 +++++++++++
...kImpl.java => EndTransactionTraceHookImpl.java} | 70 ++++------
.../trace/hook/SendMessageOpenTracingHookImpl.java | 88 +++++++++++++
.../consumer/DefaultLitePullConsumerTest.java | 41 +++++-
.../client/consumer/DefaultMQPushConsumerTest.java | 58 ++++++---
.../ConsumeMessageConcurrentlyServiceTest.java | 42 +++---
.../client/impl/factory/MQClientInstanceTest.java | 6 +-
.../client/producer/DefaultMQProducerTest.java | 2 +-
.../DefaultMQConsumerWithOpenTracingTest.java} | 143 +++++++++++++--------
.../trace/DefaultMQConsumerWithTraceTest.java | 44 ++++---
...a => DefaultMQProducerWithOpenTracingTest.java} | 98 ++++----------
.../trace/DefaultMQProducerWithTraceTest.java | 4 +-
.../client/trace/TraceDataEncoderTest.java | 45 ++++++-
... TransactionMQProducerWithOpenTracingTest.java} | 125 ++++++++----------
...ava => TransactionMQProducerWithTraceTest.java} | 111 ++++++++--------
client/src/test/resources/log4j2.xml | 29 +++++
.../rocketmq/common/message/MessageDecoder.java | 16 +--
.../DeleteSubscriptionGroupRequestHeader.java | 10 ++
.../rocketmq/common/protocol/route/QueueData.java | 16 +--
.../common/utils/NameServerAddressUtils.java | 12 +-
.../common/protocol/route/TopicRouteDataTest.java | 4 +-
.../common/utils/NameServerAddressUtilsTest.java | 59 +++++++++
distribution/bin/runserver.sh | 2 +-
docs/cn/README | 0
docs/cn/rpc_request.md | 2 +-
example/pom.xml | 10 ++
.../rocketmq/example/ordermessage/Producer.java | 8 +-
.../example/tracemessage/OpenTracingProducer.java | 68 ++++++++++
...hConsumer.java => OpenTracingPushConsumer.java} | 33 ++++-
.../OpenTracingTransactionProducer.java | 86 +++++++++++++
.../apache/rocketmq/logging/inner/SysLogger.java | 4 +-
.../namesrv/routeinfo/RouteInfoManager.java | 10 +-
pom.xml | 17 +--
.../apache/rocketmq/remoting/netty/TlsHelper.java | 2 +-
.../apache/rocketmq/store/DefaultMessageStore.java | 3 +-
.../org/apache/rocketmq/store/ha/HAService.java | 7 +
.../rocketmq/store/DefaultMessageStoreTest.java | 4 +-
test/src/test/resources/log4j.xml | 2 +-
.../rocketmq/tools/admin/DefaultMQAdminExt.java | 7 +
.../tools/admin/DefaultMQAdminExtImpl.java | 9 +-
.../apache/rocketmq/tools/admin/MQAdminExt.java | 3 +
.../consumer/DeleteSubscriptionGroupCommand.java | 13 +-
.../command/topic/UpdateTopicPermSubCommand.java | 2 +-
63 files changed, 1332 insertions(+), 456 deletions(-)
create mode 100644 client/src/main/java/org/apache/rocketmq/client/hook/EndTransactionContext.java
copy client/src/main/java/org/apache/rocketmq/client/hook/{FilterMessageHook.java => EndTransactionHook.java} (89%)
create mode 100644 client/src/main/java/org/apache/rocketmq/client/trace/hook/ConsumeMessageOpenTracingHookImpl.java
create mode 100644 client/src/main/java/org/apache/rocketmq/client/trace/hook/EndTransactionOpenTracingHookImpl.java
copy client/src/main/java/org/apache/rocketmq/client/trace/hook/{SendMessageTraceHookImpl.java => EndTransactionTraceHookImpl.java} (54%)
create mode 100644 client/src/main/java/org/apache/rocketmq/client/trace/hook/SendMessageOpenTracingHookImpl.java
copy client/src/test/java/org/apache/rocketmq/client/{impl/consumer/ConsumeMessageConcurrentlyServiceTest.java => trace/DefaultMQConsumerWithOpenTracingTest.java} (65%)
copy client/src/test/java/org/apache/rocketmq/client/trace/{DefaultMQProducerWithTraceTest.java => DefaultMQProducerWithOpenTracingTest.java} (64%)
copy client/src/test/java/org/apache/rocketmq/client/trace/{DefaultMQProducerWithTraceTest.java => TransactionMQProducerWithOpenTracingTest.java} (63%)
copy client/src/test/java/org/apache/rocketmq/client/trace/{DefaultMQProducerWithTraceTest.java => TransactionMQProducerWithTraceTest.java} (71%)
create mode 100644 client/src/test/resources/log4j2.xml
create mode 100644 common/src/test/java/org/apache/rocketmq/common/utils/NameServerAddressUtilsTest.java
delete mode 100644 docs/cn/README
create mode 100644 example/src/main/java/org/apache/rocketmq/example/tracemessage/OpenTracingProducer.java
copy example/src/main/java/org/apache/rocketmq/example/tracemessage/{TracePushConsumer.java => OpenTracingPushConsumer.java} (66%)
create mode 100644 example/src/main/java/org/apache/rocketmq/example/tracemessage/OpenTracingTransactionProducer.java