Merge pull request dianping#885 from sesamezhu/master

customize cat uri type

cat-client/src/main/java/com/dianping/cat/CatConstants.java

@@ -15,6 +15,8 @@ public class CatConstants {
 
 	public static final String CAT_PAGE_URI = "cat-page-uri";
 
+	public static final String CAT_PAGE_TYPE = "cat-page-type";
+
 	/**
 	 * Pigeon Transation Type
 	 */

cat-client/src/main/java/com/dianping/cat/servlet/CatFilter.java

@@ -268,10 +268,19 @@ private void customizeStatus(Transaction t, HttpServletRequest req) {
 			}
 
 			private void customizeUri(Transaction t, HttpServletRequest req) {
+				if(!(t instanceof DefaultTransaction)) {
+					return;
+				}
+
 				Object catPageUri = req.getAttribute(CatConstants.CAT_PAGE_URI);
+				DefaultTransaction transaction = (DefaultTransaction) t;
+				if (catPageUri != null) {
+					transaction.setName(catPageUri.toString());
+				}
 
-				if (t instanceof DefaultTransaction && catPageUri instanceof String) {
-					((DefaultTransaction) t).setName(catPageUri.toString());
+				Object catPageType = req.getAttribute(CatConstants.CAT_PAGE_TYPE);
+				if(catPageType != null) {
+					transaction.setType(catPageType.toString());
 				}
 			}