bugfix: 处理方法异常时无法记录方法执行日志

Author: fanzhongwei

agent/src/main/java/com/wenshuo/agent/log/ExecuteLogUtils.java

@@ -165,6 +165,7 @@ private static void logExecuteCounter(String className, String methodName, long
                 int compression = 150;
                 int factor = 5;
                 md = new MergingDigest(compression, (factor + 1) * compression, compression);
+                md.add(executeTime);
             }
             methodCounterMap.put(methodName, new Object[] {1L, executeTime, md});
         } else {

agent/src/main/java/com/wenshuo/agent/transformer/AgentLogClassFileTransformer.java

@@ -59,6 +59,7 @@ private byte[] aopLog(ClassLoader loader, String className, byte[] byteCode) {
             }
             byteCode = aopLog(cc, className, byteCode);
         } catch (Exception ex) {
+            ex.printStackTrace();
             log.error(ex.getMessage(), ex);
         }
         return byteCode;
@@ -100,10 +101,10 @@ private void aopLog(String className, CtMethod m) throws CannotCompileException
 
         // 避免变量名重复
         m.addLocalVariable("dingjsh_javaagent_elapsedTime", CtClass.longType);
+        m.insertAfter("dingjsh_javaagent_elapsedTime = " + timeMethodStr + " - dingjsh_javaagent_elapsedTime;"
+                + LOG_UTILS + ".log(" + aopClassName + ",\"" + m.getName()
+                + "\",(long)dingjsh_javaagent_elapsedTime" + ");", true);
         m.insertBefore("dingjsh_javaagent_elapsedTime = " + timeMethodStr + ";");
-        m.insertAfter("dingjsh_javaagent_elapsedTime = " + timeMethodStr + " - dingjsh_javaagent_elapsedTime;");
-        m.insertAfter(LOG_UTILS + ".log(" + aopClassName + ",\"" + m.getName()
-                + "\",(long)dingjsh_javaagent_elapsedTime" + ");");
     }
 
     /**

agent/src/test/java/com/wenshuo/agent/test/TestCtMethod.java

@@ -10,16 +10,12 @@
 import com.tdunning.math.stats.Dist;
 import com.tdunning.math.stats.MergingDigest;
 import com.tdunning.math.stats.ScaleFunction;
+import com.wenshuo.agent.ConfigUtils;
+import com.wenshuo.agent.javassist.*;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.wenshuo.agent.javassist.ClassPool;
-import com.wenshuo.agent.javassist.CtClass;
-import com.wenshuo.agent.javassist.CtMethod;
-import com.wenshuo.agent.javassist.Modifier;
-import com.wenshuo.agent.javassist.NotFoundException;
-
 public class TestCtMethod {
 
     private static List<String> staticMethodNames = Arrays.asList("privateStatic","protectedStatic","publicStatic","defaultStatic");
@@ -53,6 +49,47 @@ static void defaultStatic(){
         System.out.println("I'm default and static");
     }
 
+    public static Object publicStaticWithResult(){
+        String result = null;
+        System.out.println("I'm public and static");
+        Random random = new Random();
+        if(random.nextInt(100) < 50){
+            result = new String("hello world：random.nextInt(100) < 50");
+            return result;
+        }
+        result = new String("hello world：random.nextInt(100) >= 50");
+        return result;
+    }
+
+    @Test
+    @Ignore
+    public void asFinallyTest() throws Exception {
+        String className = "com.wenshuo.agent.test.TestCtMethod";
+        ClassPool pool = ClassPool.getDefault();
+        CtClass ctClass = pool.get(className);
+
+        transformerMethod(className, ctClass.getDeclaredMethod("publicStatic"));
+        transformerMethod(className, ctClass.getDeclaredMethod("publicStaticWithResult"));
+
+        ctClass.writeFile("/home/code/github/javaagent/agent/target");
+    }
+
+    private static void transformerMethod(String className, CtMethod m) throws CannotCompileException {
+        boolean isMethodStatic = Modifier.isStatic(m.getModifiers());
+        String aopClassName = isMethodStatic ? "\"" + className + "\"" : "this.getClass().getName()";
+        final String timeMethodStr
+                = ConfigUtils.isUsingNanoTime() ? "java.lang.System.nanoTime()" : "java.lang.System.currentTimeMillis"
+                + "()";
+        String LOG_UTILS = "com.wenshuo.agent.log.ExecuteLogUtils";
+
+        // 避免变量名重复
+        m.addLocalVariable("dingjsh_javaagent_elapsedTime", CtClass.longType);
+        m.insertAfter("dingjsh_javaagent_elapsedTime = " + timeMethodStr + " - dingjsh_javaagent_elapsedTime;"
+                + LOG_UTILS + ".log(" + aopClassName + ",\"" + m.getName()
+                + "\",(long)dingjsh_javaagent_elapsedTime" + ");", true);
+        m.insertBefore("dingjsh_javaagent_elapsedTime = " + timeMethodStr + ";");
+    }
+
 
     /**
      * 100个线程并发测试，每个线程往100个不同的Digest中添加5000000个随机数据[0, 100]，并计算耗时<br/>