Merge branch 'biz' of github.com:dianping/cat into biz

abtest-sample/pom.xml

@@ -28,6 +28,11 @@
 			<version>2.0.4</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.9</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<finalName>abtest-sample</finalName>

abtest-sample/src/main/java/com/dianping/abtest/sample/ABTestSampleServlet.java

@@ -8,6 +8,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.log4j.Logger;
+
 import com.dianping.cat.Cat;
 import com.dianping.cat.abtest.ABTest;
 import com.dianping.cat.abtest.ABTestManager;
@@ -15,19 +17,23 @@ import com.dianping.cat.abtest.ABTestName;
 
 public class ABTestSampleServlet extends HttpServlet {
 	private static final long serialVersionUID = -6472784609174835547L;
-
+	
+	private Logger m_logger = Logger.getLogger("ABTest");
+	
 	private ABTest m_abtest = ABTestManager.getTest(MyABTestId.CASE1);
 
 	@Override
 	public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		Cat.logError(new Exception());
-		
 		if (m_abtest.isGroupA()) {
 			RequestDispatcher rd = getServletContext().getRequestDispatcher("/index1.jsp");
 			rd.forward(request, response);
+			
+			m_logger.info("A");
 		} else {
 			RequestDispatcher rd = getServletContext().getRequestDispatcher("/index2.jsp");
 			rd.forward(request, response);
+			
+			m_logger.info("B");
 		}
 		
 		Cat.logMetric("ABTest", "view", "index2", "group", "Control");

abtest-sample/src/test/resources/com/dianping/abtest/sample/log4j.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+	<appender name="myConsole" class="org.apache.log4j.ConsoleAppender">  
+        <layout class="org.apache.log4j.PatternLayout">  
+            <param name="ConversionPattern"    
+                value="[%d{dd HH:mm:ss,SSS\} %-5p] [%t] %c{2\} - %m%n" />  
+        </layout>  
+    </appender>
+    
+	<appender name="catAppender" class="com.dianping.cat.log4j.CatAppender">
+	</appender>
+
+	<root>
+		<level value="info" />
+		<appender-ref ref="myConsole"/> 
+		<appender-ref ref="catAppender" />
+	</root>
+</log4j:configuration>
\ No newline at end of file

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

@@ -70,7 +70,9 @@ public class CatConstants {
 
 	public static final String TYPE_ACTION = "Action";
 
-	public static final String TYPE_METRIC = "metricType";
+	public static final String TYPE_METRIC = "MetricType";
+	
+	public static final String TYPE_TRACE = "TraceMode";
 
 	public static final int ERROR_COUNT = 100;
 

cat-client/src/main/java/com/dianping/cat/message/internal/DefaultMessageManager.java

@@ -471,5 +471,4 @@ public class DefaultMessageManager extends ContainerHolder implements MessageMan
 			}
 		}
 	}
-
 }

cat-client/src/main/resources/com/dianping/cat/configuration/client/config.xsd

-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<?xml version="1.0" encoding="utf-8"?><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
    <xs:element name="config" type="ConfigType"/>
    <xs:complexType name="ConfigType">
       <xs:sequence>

cat-client/src/main/resources/com/dianping/cat/status/model/status.xsd

-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<?xml version="1.0" encoding="utf-8"?><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
    <xs:element name="status" type="StatusType"/>
    <xs:complexType name="StatusType">
       <xs:sequence>

cat-home/src/main/resources/chrome/cat/cat.js

@@ -77,7 +77,7 @@ function TabManager() {
 	};
 	
 	this.headersWillBeSent = function(tabId, headers) {
-		headers.push({name: "X-CAT-TRACING", value: "true"});
+		headers.push({name: "X-CAT-TRACE-MODE", value: "true"});
 		return {requestHeaders: headers};
 	};
 	
@@ -115,10 +115,12 @@ function TabManager() {
 
 var tabMgr = new TabManager();
 var responseCallback = function(details) {
-	var headers = details.responseHeaders;
-	var tabId = details.tabId;
-	var url = details.url;
-	tabMgr.headersReceived(tabId, headers, url);
+	if("main_frame" == details.type){
+		var headers = details.responseHeaders;
+		var tabId = details.tabId;
+		var url = details.url;
+		tabMgr.headersReceived(tabId, headers, url);
+	}
 };
 var requestCallback = function(details) {
 	var headers = details.requestHeaders;
@@ -128,7 +130,7 @@ var requestCallback = function(details) {
 var filter = {urls: ["*://*/*"]};
 
 chrome.webRequest.onHeadersReceived.addListener(responseCallback, filter, ["responseHeaders"]);
-//chrome.webRequest.onBeforeSendHeaders.addListener(requestCallback, filter, ["blocking", "requestHeaders"]);
+chrome.webRequest.onBeforeSendHeaders.addListener(requestCallback, filter, ["blocking", "requestHeaders"]);
 
 chrome.pageAction.onClicked.addListener(function(tab) {
 	//alert(localStorage["favorite_color"]);