rename payloadnormalize

cat-consumer/src/main/java/com/dianping/cat/consumer/DefaultMessageAnalyzerManager.java

@@ -26,7 +26,7 @@ public class DefaultMessageAnalyzerManager extends ContainerHolder implements Me
 	public MessageAnalyzer getAnalyzer(String name, long startTime) {
 		// remove last two hour analyzer
 		try {
-			Map<String, MessageAnalyzer> temp = m_map.remove(startTime - m_duration * 2);
+			Map<String, MessageAnalyzer> temp = m_map.remove(startTime - m_duration * 3);
 
 			if (temp != null) {
 				for (MessageAnalyzer anlyzer : temp.values()) {

cat-consumer/src/main/java/com/dianping/cat/consumer/core/StateAnalyzer.java

@@ -2,6 +2,7 @@ package com.dianping.cat.consumer.core;
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -57,6 +58,8 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
 	@Inject
 	private ProjectDao m_projectDao;
 
+	private Set<String> m_domains = new HashSet<String>();
+
 	private Map<String, StateReport> m_reports = new HashMap<String, StateReport>();
 
 	private void buildStateInfo(Machine machine) {
@@ -240,6 +243,10 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
 		Machine machine = report.findOrCreateMachine(NetworkInterfaceManager.INSTANCE.getLocalHostAddress());
 		ProcessDomain processDomains = machine.findOrCreateProcessDomain(domain);
 
+		if (!m_domains.contains(domain)) {
+			insertDomainInfo(domain);
+			m_domains.add(domain);
+		}
 		processDomains.addIp(ip);
 	}
 

cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java

@@ -30,7 +30,7 @@ import com.dianping.cat.report.graph.DefaultGraphBuilder;
 import com.dianping.cat.report.graph.DefaultValueTranslater;
 import com.dianping.cat.report.graph.GraphBuilder;
 import com.dianping.cat.report.graph.ValueTranslater;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.cross.DomainManager;
 import com.dianping.cat.report.page.health.HistoryGraphs;
 import com.dianping.cat.report.page.state.StateGraphs;
@@ -160,7 +160,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		            DatabaseReportBuilder.class, SqlReportBuilder.class, HealthReportBuilder.class,//
 		            StateReportBuilder.class));
 
-		all.add(C(NormalizePayload.class).req(ServerConfigManager.class));
+		all.add(C(PayloadNormalizer.class).req(ServerConfigManager.class));
 
 		all.add(C(DomainManager.class, DomainManager.class).req(ServerConfigManager.class, HostinfoDao.class));
 

cat-home/src/main/java/com/dianping/cat/report/page/NormalizePayload.java → cat-home/src/main/java/com/dianping/cat/report/page/PayloadNormalizer.java

 package com.dianping.cat.report.page;
 
+import org.unidal.lookup.annotation.Inject;
 import org.unidal.lookup.util.StringUtils;
 
 import com.dianping.cat.configuration.ServerConfigManager;
 import com.dianping.cat.helper.CatString;
 
-public class NormalizePayload {
+public class PayloadNormalizer {
 
+	@Inject
 	private ServerConfigManager m_manager;
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })

cat-home/src/main/java/com/dianping/cat/report/page/cache/Handler.java

@@ -25,7 +25,7 @@ import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
 import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.event.EventMergeManager;
 import com.dianping.cat.report.page.model.event.EventReportMerger;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
@@ -55,12 +55,12 @@ public class Handler implements PageHandler<Context> {
 	private EventMergeManager m_eventMergerMergeManager;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 
 	@Inject(type = ModelService.class, value = "transaction")
 	private ModelService<TransactionReport> m_transactionService;
 
-	private Set<String> m_cacheType = new HashSet<String>(Arrays.asList("Cache.web", "Cache.memcached", "Cache.kvdb",
+	private Set<String> m_cacheTypes = new HashSet<String>(Arrays.asList("Cache.web", "Cache.memcached", "Cache.kvdb",
 	      "Cache.memcached-tuangou"));
 
 	private CacheReport buildCacheReport(TransactionReport transactionReport, EventReport eventReport, String type,
@@ -176,8 +176,8 @@ public class Handler implements PageHandler<Context> {
 		if (StringUtils.isEmpty(type)) {
 			EventReportMerger merger = new EventReportMerger(new EventReport(domain));
 
-			for (String temp : m_cacheType) {
-				request.setProperty("type", temp);
+			for (String cacheType : m_cacheTypes) {
+				request.setProperty("type", cacheType);
 				ModelResponse<EventReport> response = m_eventService.invoke(request);
 				EventReport eventReport = response.getModel();
 
@@ -211,7 +211,7 @@ public class Handler implements PageHandler<Context> {
 		if (StringUtils.isEmpty(type)) {
 			TransactionReportMerger merger = new TransactionReportMerger(new TransactionReport(domain));
 
-			for (String temp : m_cacheType) {
+			for (String temp : m_cacheTypes) {
 				request.setProperty("type", temp);
 				ModelResponse<TransactionReport> response = m_transactionService.invoke(request);
 				TransactionReport transactionReport = response.getModel();

cat-home/src/main/java/com/dianping/cat/report/page/cross/Handler.java

@@ -18,7 +18,7 @@ import com.dianping.cat.consumer.cross.model.entity.CrossReport;
 import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.cross.display.HostInfo;
 import com.dianping.cat.report.page.cross.display.MethodInfo;
 import com.dianping.cat.report.page.cross.display.ProjectInfo;
@@ -37,7 +37,7 @@ public class Handler implements PageHandler<Context> {
 	private ReportService m_reportService;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 	
 	@Inject
 	private DomainManager m_domainManager;

cat-home/src/main/java/com/dianping/cat/report/page/database/Handler.java

@@ -17,7 +17,7 @@ import com.dianping.cat.consumer.database.model.entity.DatabaseReport;
 import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.model.spi.ModelPeriod;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
 import com.dianping.cat.report.page.model.spi.ModelResponse;
@@ -39,7 +39,7 @@ public class Handler implements PageHandler<Context> {
 	private ModelService<DatabaseReport> m_service;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 
 	private DatabaseReport getHourlyReport(Payload payload) {
 		String domain = payload.getDomain();

cat-home/src/main/java/com/dianping/cat/report/page/event/Handler.java

@@ -26,7 +26,7 @@ import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.GraphBuilder;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.PieChart;
 import com.dianping.cat.report.page.PieChart.Item;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
@@ -56,7 +56,7 @@ public class Handler implements PageHandler<Context> {
 	private ModelService<EventReport> m_service;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 
 	private EventStatisticsComputer m_computer = new EventStatisticsComputer();
 

cat-home/src/main/java/com/dianping/cat/report/page/health/Handler.java

@@ -17,7 +17,7 @@ import com.dianping.cat.consumer.health.model.entity.HealthReport;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.HistoryGraphItem;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.service.ReportService;
 import com.google.gson.Gson;
 
@@ -27,7 +27,7 @@ public class Handler implements PageHandler<Context> {
 	private JspViewer m_jspViewer;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 	
 	@Inject
 	private ReportService m_reportService;

cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/Handler.java

@@ -19,7 +19,7 @@ import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.GraphBuilder;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.model.spi.ModelPeriod;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
 import com.dianping.cat.report.page.model.spi.ModelResponse;
@@ -45,7 +45,7 @@ public class Handler implements PageHandler<Context> {
 	private ModelService<HeartbeatReport> m_service;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 
 	private void buildHeartbeatGraphInfo(Model model, DisplayHeartbeat displayHeartbeat) {
 		if (displayHeartbeat == null) {

cat-home/src/main/java/com/dianping/cat/report/page/matrix/Handler.java

@@ -15,7 +15,7 @@ import org.unidal.web.mvc.annotation.PayloadMeta;
 import com.dianping.cat.consumer.matrix.model.entity.MatrixReport;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
 import com.dianping.cat.report.page.model.spi.ModelResponse;
 import com.dianping.cat.report.page.model.spi.ModelService;
@@ -30,7 +30,7 @@ public class Handler implements PageHandler<Context> {
 	private JspViewer m_jspViewer;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 	
 	@Inject(type = ModelService.class, value = "matrix")
 	private ModelService<MatrixReport> m_service;

cat-home/src/main/java/com/dianping/cat/report/page/metric/Handler.java

@@ -13,7 +13,7 @@ import org.unidal.web.mvc.annotation.PayloadMeta;
 
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.metric.MetricConfig.MetricFlag;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
 import com.dianping.cat.report.page.model.spi.ModelResponse;
@@ -27,7 +27,7 @@ public class Handler implements PageHandler<Context> {
 	private ModelService<MetricReport> m_service;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 
 	private static final String TUAN = "TuanGou";
 

cat-home/src/main/java/com/dianping/cat/report/page/problem/Handler.java

@@ -25,7 +25,7 @@ import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
 import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.model.spi.ModelPeriod;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
 import com.dianping.cat.report.page.model.spi.ModelResponse;
@@ -55,7 +55,7 @@ public class Handler implements PageHandler<Context> {
 	private ModelService<ProblemReport> m_service;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 
 	private Gson m_gson = new Gson();
 

cat-home/src/main/java/com/dianping/cat/report/page/sql/Handler.java

@@ -17,7 +17,7 @@ import com.dianping.cat.consumer.sql.model.entity.SqlReport;
 import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.model.spi.ModelPeriod;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
 import com.dianping.cat.report.page.model.spi.ModelResponse;
@@ -36,7 +36,7 @@ public class Handler implements PageHandler<Context> {
 	private JspViewer m_jspViewer;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 
 	@Inject(type = ModelService.class, value = "sql")
 	private ModelService<SqlReport> m_service;

cat-home/src/main/java/com/dianping/cat/report/page/state/Handler.java

@@ -16,7 +16,7 @@ import com.dianping.cat.consumer.state.model.entity.StateReport;
 import com.dianping.cat.helper.CatString;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.HistoryGraphItem;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
 import com.dianping.cat.report.page.model.spi.ModelResponse;
 import com.dianping.cat.report.page.model.spi.ModelService;
@@ -37,7 +37,7 @@ public class Handler implements PageHandler<Context> {
 	private ModelService<StateReport> m_service;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 
 	private static final String CAT = "Cat";
 

cat-home/src/main/java/com/dianping/cat/report/page/top/Handler.java

@@ -14,7 +14,7 @@ import org.unidal.web.mvc.annotation.PayloadMeta;
 import com.dianping.cat.consumer.top.model.entity.TopReport;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.model.spi.ModelPeriod;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
 import com.dianping.cat.report.page.model.spi.ModelResponse;
@@ -32,7 +32,7 @@ public class Handler implements PageHandler<Context> {
 	private ModelService<TopReport> m_service;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 
 	private TopReport getReport(Payload payload) {
 		String domain = payload.getDomain();

cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java

@@ -25,7 +25,7 @@ import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.GraphBuilder;
-import com.dianping.cat.report.page.NormalizePayload;
+import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.PieChart;
 import com.dianping.cat.report.page.PieChart.Item;
 import com.dianping.cat.report.page.model.spi.ModelRequest;
@@ -60,7 +60,7 @@ public class Handler implements PageHandler<Context> {
 	private TransactionMergeManager m_mergeManager;
 
 	@Inject
-	private NormalizePayload m_normalizePayload;
+	private PayloadNormalizer m_normalizePayload;
 
 	@Inject(type = ModelService.class, value = "transaction")
 	private ModelService<TransactionReport> m_service;

cat-home/src/main/resources/META-INF/plexus/components.xml

@@ -418,8 +418,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.page.NormalizePayload</role>
-			<implementation>com.dianping.cat.report.page.NormalizePayload</implementation>
+			<role>com.dianping.cat.report.page.PayloadNormalizer</role>
+			<implementation>com.dianping.cat.report.page.PayloadNormalizer</implementation>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.configuration.ServerConfigManager</role>
@@ -1510,7 +1510,7 @@
 					<field-name>m_service</field-name>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -1558,8 +1558,13 @@
 			<implementation>com.dianping.cat.configuration.ServerConfigManager</implementation>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.page.NormalizePayload</role>
-			<implementation>com.dianping.cat.report.page.NormalizePayload</implementation>
+			<role>com.dianping.cat.report.page.PayloadNormalizer</role>
+			<implementation>com.dianping.cat.report.page.PayloadNormalizer</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.configuration.ServerConfigManager</role>
+				</requirement>
+			</requirements>
 		</component>
 		<component>
 			<role>com.dianping.cat.report.page.transaction.Handler</role>
@@ -1584,7 +1589,7 @@
 					<role>com.dianping.cat.report.page.transaction.TransactionMergeManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.model.spi.ModelService</role>
@@ -1647,7 +1652,7 @@
 					<field-name>m_service</field-name>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -1698,7 +1703,7 @@
 					<field-name>m_service</field-name>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -2008,7 +2013,7 @@
 					<role>com.dianping.cat.report.page.sql.JspViewer</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.model.spi.ModelService</role>
@@ -2076,7 +2081,7 @@
 					<role>com.dianping.cat.report.page.matrix.JspViewer</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.model.spi.ModelService</role>
@@ -2102,7 +2107,7 @@
 					<role>com.dianping.cat.report.page.health.JspViewer</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.service.ReportService</role>
@@ -2141,7 +2146,7 @@
 					<role>com.dianping.cat.report.service.ReportService</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.cross.DomainManager</role>
@@ -2205,7 +2210,7 @@
 					<role>com.dianping.cat.report.page.event.EventMergeManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.model.spi.ModelService</role>
@@ -2239,7 +2244,7 @@
 					<field-name>m_service</field-name>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -2271,7 +2276,7 @@
 					<field-name>m_service</field-name>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -2330,7 +2335,7 @@
 					<field-name>m_service</field-name>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -2356,7 +2361,7 @@
 					<field-name>m_service</field-name>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.NormalizePayload</role>
+					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 			</requirements>
 		</component>