Merge pull request #1271 from gejun123456/master

框架埋点代码编译错误

.gitignore

@@ -2,6 +2,8 @@
 /target/*
 /bin/*
 /*/target/*
+/*/*/target/*
+/*/*/*/target/*
 /*/bin/*
 /*/.*
 .*

框架埋点方案集成/dubbo/pom.xml

@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.dianping.cat</groupId>
             <artifactId>cat-client</artifactId>
-            <version>1.3.6-SNAPSHOT</version>
+            <version>2.0.0</version>
         </dependency>
     </dependencies>
 

框架埋点方案集成/elasticsearch-jetty/pom.xml

@@ -62,7 +62,7 @@
     <dependency>
       <groupId>com.dianping.cat</groupId>
       <artifactId>cat-client</artifactId>
-      <version>1.3.6</version>
+      <version>2.0.0</version>
     </dependency>
   </dependencies>
 

框架埋点方案集成/javaagent-client-agent/cat-client-plugin/pom.xml

@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>com.dianping.cat</groupId>
 			<artifactId>cat-client</artifactId>
-			<version>1.3.6</version>
+			<version>2.0.0</version>
 		</dependency>
 		<!-- Redis -->
 		<dependency>

框架埋点方案集成/javaagent-client-agent/cat-client-plugin/src/com/qbao/cat/plugin/constants/MyCatConstants.java

+package com.qbao.cat.plugin.constants;
+
+public class MyCatConstants {
+    public static final String E_CALL_APP = "CALL_APP";
+
+    public static final String E_CALLEE_APP = "CALLEE_APP";
+
+
+    public static final String E_CALLEE_ADDR = "CALLEE_ADDR";
+
+
+    public static final String E_CLIENT_ADDR = "CLIENT_ADDR";
+
+    public static final String TYPE_SQL_DATABASE = "TYPE_SQL_DATABASE";
+
+
+}

框架埋点方案集成/javaagent-client-agent/cat-client-plugin/src/com/qbao/cat/plugin/db/sql/MySQLPreparedStatementPluginTemplate.java

@@ -5,6 +5,7 @@ package com.qbao.cat.plugin.db.sql;
 
 import java.lang.reflect.Field;
 
+import com.qbao.cat.plugin.constants.MyCatConstants;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -65,7 +66,7 @@ public abstract class MySQLPreparedStatementPluginTemplate extends DefaultPlugin
 				Transaction transaction = this.newTransaction(CatConstants.TYPE_SQL, (String)originalSqlField.get(pjp.getTarget()));
 				PreparedStatement ps = (PreparedStatement)pjp.getTarget();
 				if (ps.getConnection() instanceof ConnectionImpl){
-					Cat.logEvent(CatConstants.TYPE_SQL_DATABASE, ((ConnectionImpl)((PreparedStatement)pjp.getTarget()).getConnection()).getURL());
+					Cat.logEvent(MyCatConstants.TYPE_SQL_DATABASE, ((ConnectionImpl)((PreparedStatement)pjp.getTarget()).getConnection()).getURL());
 				}			
 				if ("true".equals(config.getProperty("plugin.mysql.ps.includefullsql"))){
 					transaction.addData("FullSQL", ps.toString().split(":")[1]);

框架埋点方案集成/javaagent-client-agent/cat-client-plugin/src/com/qbao/cat/plugin/remote/ClientPluginTemplate.java

@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.qbao.cat.plugin.constants.MyCatConstants;
 import org.aspectj.lang.ProceedingJoinPoint;
 
 import com.dianping.cat.Cat;
@@ -91,15 +92,15 @@ public abstract class ClientPluginTemplate<T> extends DefaultPluginTemplate {
 	}
 	
 	protected String getDomainKey(){
-		return CatConstants.E_CALL_APP;
+		return MyCatConstants.E_CALL_APP;
 	}
 	
 	protected void logServerDomain(String serverDomain){
-		Cat.logEvent(CatConstants.E_CALLEE_APP,serverDomain);
+		Cat.logEvent(MyCatConstants.E_CALLEE_APP,serverDomain);
 	}
 	
 	protected void logServerAddr(String serverAddr){
-		Cat.logEvent(CatConstants.E_CALLEE_ADDR,serverAddr);
+		Cat.logEvent(MyCatConstants.E_CALLEE_ADDR,serverAddr);
 	}
 	
 	protected void logRemoteTrace(T handler) {

框架埋点方案集成/javaagent-client-agent/cat-client-plugin/src/com/qbao/cat/plugin/remote/ServerPluginTemplate.java

@@ -10,6 +10,7 @@ import com.dianping.cat.Cat;
 import com.dianping.cat.CatConstants;
 import com.qbao.cat.plugin.CatPluginConstants;
 import com.qbao.cat.plugin.DefaultPluginTemplate;
+import com.qbao.cat.plugin.constants.MyCatConstants;
 
 /**
  * @author andersen
@@ -28,8 +29,8 @@ public abstract class ServerPluginTemplate<T> extends DefaultPluginTemplate{
 	}
 
 	protected void logClientInfo(String clientAddr, String clientDomain) {
-		Cat.logEvent(CatConstants.E_CLIENT_ADDR,clientAddr);
-		Cat.logEvent(CatConstants.E_CALL_APP,clientDomain);
+		Cat.logEvent(MyCatConstants.E_CLIENT_ADDR,clientAddr);
+		Cat.logEvent(MyCatConstants.E_CALL_APP,clientDomain);
 	}
 
 	public static class RemoteContext implements Cat.Context {

框架埋点方案集成/springMVC-AOP/CAT部署.txt

@@ -186,7 +186,7 @@ Cat监控机配置
    <dependency>
       <groupId>com.dianping.cat</groupId>
       <artifactId>cat-client</artifactId>
-      <version>1.3.6-SNAPSHOT</version>
+      <version>2.0.0</version>
    </dependency>
 目前针对业务已经实现的CAT埋点监控包括以下三种形式：