diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionReportAnalyzer.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionReportAnalyzer.java index fbe14170052a604614222134acde2b1a7e5203e5..ff90f14718c8d87bb39a5fb925b1fff3ae13954d 100644 --- a/cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionReportAnalyzer.java +++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionReportAnalyzer.java @@ -59,9 +59,8 @@ public class TransactionReportAnalyzer extends AbstractMessageAnalyzer types = report.getTypes().values(); - for (TransactionType type : types) { + for (TransactionType type : report.getTypes().values()) { long typeCount = 0; long typeFailCount = 0; double typeSum = 0; @@ -119,10 +118,15 @@ public class TransactionReportAnalyzer extends AbstractMessageAnalyzer domains = new ArrayList(this.m_reports.keySet()); + if (domain == null) { + domain = domains.get(0); } - return computeMeanSquareDeviation(domain); + TransactionReport report = computeMeanSquareDeviation(domain); + for (String ele : domains) { + report.addDomain(ele); + } + return report; } private String getTransactionFileName(TransactionReport report) { diff --git a/cat-consumer/src/main/resources/META-INF/dal/model/transaction-report-codegen.xml b/cat-consumer/src/main/resources/META-INF/dal/model/transaction-report-codegen.xml index f0eee7027cb3f2c279d244c2cdb797bef329ca97..46440cfb287844b12897fd4c3579152cf18ea60c 100644 --- a/cat-consumer/src/main/resources/META-INF/dal/model/transaction-report-codegen.xml +++ b/cat-consumer/src/main/resources/META-INF/dal/model/transaction-report-codegen.xml @@ -2,6 +2,7 @@ + diff --git a/cat-home/src/main/webapp/js/transaction.js b/cat-home/src/main/webapp/js/transaction.js index fde911fa02ecc806a60bf76af013e7948def038c..78000be2792fa497e8e6ef98aaf55b4f744a9c48 100644 --- a/cat-home/src/main/webapp/js/transaction.js +++ b/cat-home/src/main/webapp/js/transaction.js @@ -11,7 +11,10 @@ $(function(){ ); $(function() - { + { + domainlinks = 'Domains '; + $.each(data.domainSet, function(i, t){domainlinks += "[ "+t+" ]"}); + $("#domainlist").html(domainlinks); $("#gridTable").jqGrid({ datatype: "local", colNames:['Type', 'Total Count', 'Fail Count', 'Failure%', 'Sample Link', 'Min/Max/Avg/Std(ms)'], diff --git a/cat-home/src/main/webapp/jsp/report/transaction.jsp b/cat-home/src/main/webapp/jsp/report/transaction.jsp index ad3ce4dbb8197119af38ee4ff87abc6933657735..f6d06a940df298f0f1b12ce6634f9c3238f9e7e4 100644 --- a/cat-home/src/main/webapp/jsp/report/transaction.jsp +++ b/cat-home/src/main/webapp/jsp/report/transaction.jsp @@ -1,28 +1,41 @@ -<%@ page contentType="text/html; charset=utf-8" %> +<%@ page contentType="text/html; charset=utf-8"%> <%@ taglib prefix="a" uri="/WEB-INF/app.tld"%> <%@ taglib prefix="res" uri="http://www.ebay.com/webres"%> - - - + + + - - - + + + - - - - + + + + - + + + + + + + + + + +
+
-
-
- - +
\ No newline at end of file