yuz10 commented on a change in pull request #744:
URL: https://github.com/apache/rocketmq-externals/pull/744#discussion_r663995671
##########
File path:
rocketmq-console/src/main/java/org/apache/rocketmq/console/service/impl/MessageTraceServiceImpl.java
##########
@@ -51,4 +83,94 @@
throw Throwables.propagate(err);
}
}
+
+ @Override
+ public MessageTraceGraph queryMessageTraceGraph(String key) {
+ List<MessageTraceView> messageTraceViews = queryMessageTraceKey(key);
+ return buildMessageTraceGraph(messageTraceViews);
+ }
+
+ private MessageTraceGraph buildMessageTraceGraph(List<MessageTraceView>
messageTraceViews) {
+ MessageTraceGraph messageTraceGraph = new MessageTraceGraph();
+ messageTraceGraph.setMessageTraceViews(messageTraceViews);
+ if (CollectionUtils.isEmpty(messageTraceViews)) {
+ return messageTraceGraph;
+ }
+ ProducerNode producerNode = null;
+ Map<String, Map<String, Pair<MessageTraceView, MessageTraceView>>>
messageTraceViewGroupMap = Maps.newHashMap();
+ for (MessageTraceView messageTraceView : messageTraceViews) {
+ switch (TraceType.valueOf(messageTraceView.getMsgType())) {
+ case Pub:
+ producerNode = buildMessageRoot(messageTraceView);
+ break;
+ case SubBefore:
+ case SubAfter:
+ putIntoMessageTraceViewGroupMap(messageTraceView,
messageTraceViewGroupMap);
+ break;
+ default:
+ break;
+ }
+ }
+ messageTraceGraph.setProducerNode(producerNode);
+
messageTraceGraph.setSubscriptionNodeList(buildSubscriptionNodeList(messageTraceViewGroupMap));
+ return messageTraceGraph;
+ }
+
+ private List<SubscriptionNode> buildSubscriptionNodeList(
+ Map<String, Map<String, Pair<MessageTraceView, MessageTraceView>>>
messageTraceViewGroupMap) {
+ List<SubscriptionNode> subscriptionNodeList = new
ArrayList<>(messageTraceViewGroupMap.size());
+ for (Map.Entry<String, Map<String, Pair<MessageTraceView,
MessageTraceView>>> groupTraceView : messageTraceViewGroupMap
+ .entrySet()) {
+ SubscriptionNode subscriptionNode = new SubscriptionNode();
+ subscriptionNode.setSubscriptionGroup(groupTraceView.getKey());
+ List<TraceNode> consumeNodeList = Lists.newArrayList();
+ subscriptionNode.setConsumeNodeList(consumeNodeList);
+ subscriptionNodeList.add(subscriptionNode);
+ for (Map.Entry<String, Pair<MessageTraceView, MessageTraceView>>
requestIdTracePair : groupTraceView
+ .getValue().entrySet()) {
+ MessageTraceView subBeforeTrace =
requestIdTracePair.getValue().getObject1();
+ MessageTraceView subAfterTrace =
requestIdTracePair.getValue().getObject2();
+ TraceNode consumeNode = new TraceNode();
+ consumeNode.setRequestId(requestIdTracePair.getKey());
+ consumeNode.setStoreHost(subBeforeTrace.getStoreHost());
+ consumeNode.setClientHost(subBeforeTrace.getClientHost());
+ consumeNode.setRetryTimes(subBeforeTrace.getRetryTimes());
+ consumeNode.setBeginTimeStamp(subBeforeTrace.getTimeStamp());
+ consumeNode.setCostTime(subAfterTrace.getCostTime());
+ consumeNode.setEndTimeStamp(subAfterTrace.getTimeStamp());
+ consumeNode.setStatus(subAfterTrace.getStatus());
+ consumeNodeList.add(consumeNode);
+ }
+ }
+ return subscriptionNodeList;
+ }
+
+ private void putIntoMessageTraceViewGroupMap(MessageTraceView
messageTraceView,
+ Map<String, Map<String, Pair<MessageTraceView, MessageTraceView>>>
messageTraceViewGroupMap) {
+ Map<String, Pair<MessageTraceView, MessageTraceView>>
requestIdTraceMap = messageTraceViewGroupMap
+ .computeIfAbsent(messageTraceView.getGroupName(), (o) -> new
HashMap<>(2));
Review comment:
the newest commit of rocketmq has removed groupname field of SubAfter
trace, so you will not be able to match the pair in later releases. see
https://github.com/apache/rocketmq/pull/3005/files
this will result null exception at:
org.apache.rocketmq.console.service.impl.MessageTraceServiceImpl.buildSubscriptionNodeList(MessageTraceServiceImpl.java:135)
##########
File path:
rocketmq-console/src/test/java/org/apache/rocketmq/console/service/impl/MessageTraceServiceImplTest.java
##########
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.rocketmq.console.service.impl;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import lombok.SneakyThrows;
+import org.apache.rocketmq.client.QueryResult;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.console.config.RMQConfigure;
+import org.apache.rocketmq.console.model.MessageTraceView;
+import org.apache.rocketmq.console.model.trace.MessageTraceGraph;
+import org.apache.rocketmq.console.util.JsonUtil;
+import org.apache.rocketmq.tools.admin.MQAdminExt;
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
Review comment:
run this test fails in my computer, MockitoJUnitRunner init fail, it.s
fine if remove @RunWith(MockitoJUnitRunner.class)

##########
File path:
rocketmq-console/src/main/java/org/apache/rocketmq/console/service/impl/MessageTraceServiceImpl.java
##########
@@ -51,4 +83,94 @@
throw Throwables.propagate(err);
}
}
+
+ @Override
+ public MessageTraceGraph queryMessageTraceGraph(String key) {
+ List<MessageTraceView> messageTraceViews = queryMessageTraceKey(key);
+ return buildMessageTraceGraph(messageTraceViews);
+ }
+
+ private MessageTraceGraph buildMessageTraceGraph(List<MessageTraceView>
messageTraceViews) {
+ MessageTraceGraph messageTraceGraph = new MessageTraceGraph();
+ messageTraceGraph.setMessageTraceViews(messageTraceViews);
+ if (CollectionUtils.isEmpty(messageTraceViews)) {
+ return messageTraceGraph;
+ }
+ ProducerNode producerNode = null;
+ Map<String, Map<String, Pair<MessageTraceView, MessageTraceView>>>
messageTraceViewGroupMap = Maps.newHashMap();
Review comment:
complicated definition could be defined as class
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]