move metric analyzer to advanced consumer

cat-consumer-advanced/pom.xml

@@ -59,11 +59,12 @@
                   </goals>
                   <configuration>
                      <manifest>
-                     		${basedir}/src/main/resources/META-INF/dal/model/database-report-manifest.xml,
 							${basedir}/src/main/resources/META-INF/dal/model/sql-report-manifest.xml,
-							${basedir}/src/main/resources/META-INF/dal/model/health-report-manifest.xml,
+                     		${basedir}/src/main/resources/META-INF/dal/model/database-report-manifest.xml,
 							${basedir}/src/main/resources/META-INF/dal/model/cross-report-manifest.xml,
 							${basedir}/src/main/resources/META-INF/dal/model/matrix-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/metric-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/health-report-manifest.xml,
 					 </manifest>
                   </configuration>
                </execution>

cat-consumer/pom.xml

@@ -50,13 +50,12 @@
                   </goals>
                   <configuration>
                      <manifest>
-							${basedir}/src/main/resources/META-INF/dal/model/heartbeat-report-manifest.xml,
-							${basedir}/src/main/resources/META-INF/dal/model/problem-report-manifest.xml,
 							${basedir}/src/main/resources/META-INF/dal/model/transaction-report-manifest.xml,
 							${basedir}/src/main/resources/META-INF/dal/model/event-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/problem-report-manifest.xml,
+							${basedir}/src/main/resources/META-INF/dal/model/heartbeat-report-manifest.xml,
 							${basedir}/src/main/resources/META-INF/dal/model/state-report-manifest.xml,
 							${basedir}/src/main/resources/META-INF/dal/model/top-report-manifest.xml,
-							${basedir}/src/main/resources/META-INF/dal/model/metric-report-manifest.xml,
 					 </manifest>
                   </configuration>
                </execution>

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

@@ -24,12 +24,6 @@ public abstract class AbstractReportPayload<A extends Action> implements ActionP
 	@FieldMeta("date")
 	private long m_date;
 
-	private SimpleDateFormat m_dateFormat = new SimpleDateFormat("yyyyMMddHH");
-
-	private SimpleDateFormat m_dayFormat = new SimpleDateFormat("yyyyMMdd");
-
-	private ReportPage m_defaultPage;
-
 	@FieldMeta("domain")
 	private String m_domain;
 
@@ -47,6 +41,12 @@ public abstract class AbstractReportPayload<A extends Action> implements ActionP
 	@FieldMeta("today")
 	private boolean m_today;
 
+	private SimpleDateFormat m_dateFormat = new SimpleDateFormat("yyyyMMddHH");
+
+	private SimpleDateFormat m_dayFormat = new SimpleDateFormat("yyyyMMdd");
+
+	private ReportPage m_defaultPage;
+
 	public AbstractReportPayload(ReportPage defaultPage) {
 		m_defaultPage = defaultPage;
 	}

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

 package com.dianping.cat.report.page.metric;
 
 import java.io.IOException;
+import java.util.Date;
 
 import javax.servlet.ServletException;
 
@@ -63,7 +64,11 @@ public class Handler implements PageHandler<Context> {
 		String channel = payload.getChannel();
 
 		if (report != null) {
-			MetricDisplay display = new MetricDisplay(buildTuanGouMetricConfig(channel), channel, report.getStartTime());
+			Date startTime = report.getStartTime();
+			if (startTime == null) {
+				startTime = payload.getHistoryStartDate();
+			}
+			MetricDisplay display = new MetricDisplay(buildTuanGouMetricConfig(channel), channel, startTime);
 
 			display.visitMetricReport(report);
 			model.setDisplay(display);