jiulinxiri/rocketmq-dashboard
1
0
Fork 0
mirror of https://github.com/apache/rocketmq-dashboard.git synced 2026-02-23 14:45:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ISSUE #768] Console message trace compatibility Optimization

Browse Source
This commit is contained in:
StyleTang
2021-08-03 20:13:16 +08:00
committed by GitHub
parent 399b61aee1
commit c9d7cb20e7
4 changed files with 109 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/resources/static/src/messageTrace.js
View File

@@ -129,12 +129,6 @@ module.controller('messageTraceDetailViewDialogController', ['$scope', '$timeout
if (messageTraceGraph.producerNode) {
startTime = +messageTraceGraph.producerNode.traceNode.beginTimestamp;
endTime = +messageTraceGraph.producerNode.traceNode.endTimestamp;
} else {
messageTraceGraph.subscriptionNodeList.forEach(subscriptionNode => {
subscriptionNode.consumeNodeList.forEach(consumeNode => {
startTime = Math.min(startTime, consumeNode.beginTimestamp);
})
})
}
function buildNodeColor(traceNode) {
@@ -203,17 +197,23 @@ module.controller('messageTraceDetailViewDialogController', ['$scope', '$timeout
}
return `costTime: ${formatCostTimeStr(costTime)}<br/>`
}
function buildTimeStamp(timestamp){
if(timestamp < 0){
return 'N/A';
}
return new moment(timestamp).format(TIME_FORMAT_PATTERN);
}
function formatNodeToolTip(params) {
let traceNode = params.data.traceData.traceNode;
return `
${buildCostTimeInfo(traceNode.costTime)}
status: ${traceNode.status}<br />
beginTimestamp: ${new moment(traceNode.beginTimestamp).format(TIME_FORMAT_PATTERN)}<br />
endTimestamp: ${new moment(traceNode.endTimestamp).format(TIME_FORMAT_PATTERN)}<br />
${buildTraceInfo('beginTimestamp', buildTimeStamp(traceNode.beginTimestamp))}
${buildTraceInfo('endTimestamp', buildTimeStamp(traceNode.endTimestamp))}
clientHost: ${traceNode.clientHost}<br />
storeHost: ${traceNode.storeHost}<br />
retryTimes: ${traceNode.retryTimes}<br />
retryTimes: ${traceNode.retryTimes < 0 ? 'N/A' : traceNode.retryTimes}<br />
${buildTraceInfo('msgType', traceNode.msgType)}
${buildTraceInfo('transactionId', traceNode.transactionId)}
${buildTraceInfo('transactionState', traceNode.transactionState)}
@@ -221,12 +221,31 @@ module.controller('messageTraceDetailViewDialogController', ['$scope', '$timeout
`;
}
function calcGraphTimestamp(timestamp, relativeTimeStamp, duration, addDuration) {
if (timestamp > 0) {
return timestamp;
}
if (duration < 0) {
return relativeTimeStamp;
}
return addDuration ? relativeTimeStamp + duration : relativeTimeStamp - duration;
}
function addTraceData(traceNode, index) {
if (traceNode.beginTimestamp < 0 && traceNode.endTimestamp < 0) {
return;
}
let beginTimestamp = calcGraphTimestamp(traceNode.beginTimestamp, traceNode.endTimestamp, traceNode.costTime, false);
let endTimestamp = calcGraphTimestamp(traceNode.endTimestamp, traceNode.beginTimestamp, traceNode.costTime, true);
if (endTimestamp === beginTimestamp) {
endTimestamp = beginTimestamp + 1;
}
console.log("beginTimestamp",beginTimestamp,'endTimestamp',endTimestamp);
data.push({
value: [
index,
traceNode.beginTimestamp,
traceNode.endTimestamp === traceNode.beginTimestamp ? traceNode.beginTimestamp + 1 : traceNode.endTimestamp,
beginTimestamp,
endTimestamp,
traceNode.costTime
],
itemStyle: {
@@ -239,7 +258,8 @@ module.controller('messageTraceDetailViewDialogController', ['$scope', '$timeout
traceNode: traceNode
}
});
endTime = Math.max(traceNode.endTimestamp, endTime);
startTime = Math.min(startTime, beginTimestamp);
endTime = Math.max(endTime, endTimestamp);
}
messageTraceGraph.subscriptionNodeList.forEach(item => {

12
src/main/resources/static/view/pages/messageTrace.html
View File

@@ -273,16 +273,20 @@
</tr>
<tr ng-repeat="consumeNode in subscriptionNode.consumeNodeList">
<td class="text-center">
{{consumeNode.beginTimestamp | date:'yyyy-MM-dd HH:mm:ss.sss'}}
{{consumeNode.beginTimestamp < 0 ? 'N/A' :
(consumeNode.beginTimestamp | date:'yyyy-MM-dd HH:mm:ss.sss')}}
</td>
<td class="text-center">
{{consumeNode.endTimestamp | date:'yyyy-MM-dd HH:mm:ss.sss'}}
{{consumeNode.endTimestamp < 0 ? 'N/A' :
(consumeNode.endTimestamp | date:'yyyy-MM-dd HH:mm:ss.sss')}}
</td>
<td class="text-center">{{consumeNode.costTime < 0 ? '--' :
<td class="text-center">{{consumeNode.costTime < 0 ? 'N/A' :
((consumeNode.costTime === 0 ? '<1' : consumeNode.costTime) + 'ms')}}
</td>
<td class="text-center">{{consumeNode.status}}</td>
<td class="text-center">{{consumeNode.retryTimes}}</td>
<td class="text-center">
{{consumeNode.retryTimes < 0 ? 'N/A' : consumeNode.retryTimes}}
</td>
<td class="text-center">{{consumeNode.clientHost}}</td>
<td class="text-center">{{consumeNode.storeHost}}</td>
</tr>