Merge pull request #23 from qunarcorp/dev

v2.0.2
qunarcorp · Aug 27, 2019 · 9c3bff3 · 9c3bff3
2 parents 7d3fd81 + b3bc8bf
commit 9c3bff3
Show file tree

Hide file tree

Showing 50 changed files with 368 additions and 274 deletions.
diff --git a/bistoury-agent-common/pom.xml b/bistoury-agent-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-agent-common/src/main/java/qunar/tc/bistoury/agent/common/kv/RocksDBStoreImpl.java b/bistoury-agent-common/src/main/java/qunar/tc/bistoury/agent/common/kv/RocksDBStoreImpl.java
@@ -64,27 +64,12 @@ public class RocksDBStoreImpl implements KvDb {
             this.rocksDB = TtlDB.open(options, path, ttl, false);
             LOG.info("open rocks db success, path:{}, ttl:{}", path, ttl);
 
-            startCompactRange();
         } catch (Exception e) {
             LOG.error("open rocks db error, path:{}, ttl:{}", path, ttl, e);
             throw new RuntimeException(e);
         }
     }
 
-    private void startCompactRange() {
-        executor.scheduleWithFixedDelay(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    LOG.debug("compact range rocks db");
-                    rocksDB.compactRange();
-                } catch (RocksDBException e) {
-                    LOG.error("rocks db compact range error", e);
-                }
-            }
-        }, 30, 30, TimeUnit.MINUTES);
-    }
-
     private void ensureDirectoryExists(final String path) {
         File file = new File(path);
         if (!file.exists() || !file.isDirectory()) {

diff --git a/bistoury-agent-task/pom.xml b/bistoury-agent-task/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-agent/pom.xml b/bistoury-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-application/bistoury-application-api/pom.xml b/bistoury-application/bistoury-application-api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>bistoury-application</artifactId>
 		<groupId>qunar.tc.bistoury</groupId>
-		<version>2.0.0</version>
+		<version>2.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-application/bistoury-application-mysql/pom.xml b/bistoury-application/bistoury-application-mysql/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>bistoury-application</artifactId>
 		<groupId>qunar.tc.bistoury</groupId>
-		<version>2.0.0</version>
+		<version>2.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-application/pom.xml b/bistoury-application/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>bistoury</artifactId>
 		<groupId>qunar.tc.bistoury</groupId>
-		<version>2.0.0</version>
+		<version>2.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-attach-arthas/pom.xml b/bistoury-attach-arthas/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-attach-common/pom.xml b/bistoury-attach-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-clientside-common/pom.xml b/bistoury-clientside-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-commands/pom.xml b/bistoury-commands/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-common/pom.xml b/bistoury-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-common/src/main/java/qunar/tc/bistoury/common/BistouryConstants.java b/bistoury-common/src/main/java/qunar/tc/bistoury/common/BistouryConstants.java
@@ -56,7 +56,7 @@ public class BistouryConstants {
     public static final String SPY_CLASSNAME = "qunar.tc.bistoury.instrument.spy.BistourySpys1";
 
     // todo: 先这么写吧
-    public static final String CURRENT_VERSION = "2.0.0";
+    public static final String CURRENT_VERSION = "2.0.2";
 
     public static final String BISTOURY_VERSION_LINE_PREFIX = "bistoury version:";
 

diff --git a/bistoury-decompiler-fernflower/pom.xml b/bistoury-decompiler-fernflower/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-dist/bin/bistoury-agent.sh b/bistoury-dist/bin/bistoury-agent.sh
@@ -10,14 +10,18 @@ BISTOURY_MAIN="qunar.tc.bistoury.indpendent.agent.Main"
 . "$BISTOURY_BIN_DIR/bistoury-agent-env.sh"
 
 for CMD in "$@";do true; done
+
 APP_PID=""
+LOCAL_IP=""
 
-while getopts p:j:c:h opt;do
+while getopts p:i:j:c:h opt;do
     case $opt in
         p) APP_PID=$OPTARG;;
+        i) LOCAL_IP=$OPTARG;;
         j) JAVA_HOME=$OPTARG;;
         c) BISTOURY_APP_LIB_CLASS=$OPTARG;;
         h|*) echo "-p    通过-p指定应用进程pid"
+           echo "-i    通过-i参数指定本机ip"
            echo "-j    通过-j指定java home"
            echo "-c    通过-c指定应用依赖的jar包中的一个类（推荐使用公司内部中间件的jar包或Spring相关包中的类，如org.springframework.web.servlet.DispatcherServlet），agent通过该类获取应用jar包路径"
            echo "-h    通过-h查看命令帮助"
@@ -36,6 +40,10 @@ if [[ ! -n $BISTOURY_APP_LIB_CLASS ]]; then
     exit 0
 fi
 
+if [[ -n $LOCAL_IP ]]; then
+    JAVA_OPTS="$JAVA_OPTS -Dbistoury.local.host=$LOCAL_IP"
+fi
+
 if [[ -n $APP_PID ]]; then
     JAVA_OPTS="$JAVA_OPTS -Dbistoury.user.pid=$APP_PID"
 fi

diff --git a/bistoury-dist/pom.xml b/bistoury-dist/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-independent-agent/pom.xml b/bistoury-independent-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-instrument-agent/pom.xml b/bistoury-instrument-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...ry-instrument-agent/src/main/java/qunar/tc/bistoury/instrument/agent/AgentBootstrap2.java b/...ry-instrument-agent/src/main/java/qunar/tc/bistoury/instrument/agent/AgentBootstrap2.java
@@ -130,8 +130,8 @@ private static ClassLoader findUserClassLoader(Instrumentation inst, final Strin
     // 这个方法和DefaultDebugger里面是一样的，但是这个地方不应该有依赖，所以两边都要写
     private static Class<?> findLibClass(Instrumentation inst, final String libClass) {
         if (libClass == null || "".equals(libClass)) {
-            ps.println("can not find lib class");
-            throw new IllegalStateException("can not find lib class");
+            ps.println("can not find lib class, [" + libClass + "]");
+            throw new IllegalStateException("can not find lib class, [" + libClass + "]");
         }
 
         Class[] allLoadedClasses = inst.getAllLoadedClasses();
@@ -140,8 +140,13 @@ private static Class<?> findLibClass(Instrumentation inst, final String libClass
                 return clazz;
             }
         }
-        ps.println("can not find lib class");
-        throw new IllegalStateException("can not find lib class");
+        ps.println("can not find lib class, [" + libClass + "]");
+        ps.println("begin print all loaded classes");
+        for (Class allLoadedClass : allLoadedClasses) {
+            ps.println("[" + allLoadedClass.getName() + "]");
+        }
+        ps.println("end print all loaded classes");
+        throw new IllegalStateException("can not find lib class, [" + libClass + "]");
     }
 
     private static File[] getNonSpyJarFiles(File dir, final List<File> spyJarFiles) {

diff --git a/bistoury-instrument-client/pom.xml b/bistoury-instrument-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...c/main/java/qunar/tc/bistoury/instrument/client/classpath/DefaultAppLibClassSupplier.java b/...c/main/java/qunar/tc/bistoury/instrument/client/classpath/DefaultAppLibClassSupplier.java
@@ -41,15 +41,15 @@ private static Class<?> findOneAppLibClass(Instrumentation instrumentation) {
         Class[] allLoadedClasses = instrumentation.getAllLoadedClasses();
         final String libClass = System.getProperty("bistoury.app.lib.class");
         if (Strings.isNullOrEmpty(libClass)) {
-            System.err.println("can not find lib class");
-            throw new IllegalStateException("can not find lib class");
+            System.err.println("can not find lib class, [" + libClass + "]");
+            throw new IllegalStateException("can not find lib class, [" + libClass + "]");
         }
         for (Class clazz : allLoadedClasses) {
             if (libClass.equals(clazz.getName())) {
                 return clazz;
             }
         }
-        System.err.println("can not find lib class");
-        throw new IllegalStateException("can not find lib class");
+        System.err.println("can not find lib class, [" + libClass + "]");
+        throw new IllegalStateException("can not find lib class, [" + libClass + "]");
     }
 }
diff --git a/bistoury-instrument-spy/pom.xml b/bistoury-instrument-spy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-magic-classes/pom.xml b/bistoury-magic-classes/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-magic-loader/pom.xml b/bistoury-magic-loader/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-metrics-prometheus/pom.xml b/bistoury-metrics-prometheus/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-proxy/pom.xml b/bistoury-proxy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bistoury-proxy/src/bin/bistoury-proxy.sh b/bistoury-proxy/src/bin/bistoury-proxy.sh
@@ -10,10 +10,13 @@ BISTOURY_MAIN="qunar.tc.bistoury.proxy.container.Bootstrap"
 
 for CMD in "$@";do true; done
 
-while getopts j: opt;do
+LOCAL_IP=""
+while getopts j:i:h opt;do
     case $opt in
         j) JAVA_HOME=$OPTARG;;
-        *) echo "-j    通过-j指定java home"
+        i) LOCAL_IP=$OPTARG;;
+        h|*) echo "-j    通过-j指定java home"
+           echo "-i    通过-i参数指定本机ip"
            echo "-h    通过-h查看命令帮助"
            exit 0
     esac
@@ -24,6 +27,11 @@ if [[ "$JAVA_HOME" != "" ]];then
 else
     JAVA=java;
 fi
+
+if [[ -n $LOCAL_IP ]]; then
+    JAVA_OPTS="$JAVA_OPTS -Dbistoury.local.host=$LOCAL_IP"
+fi
+
 CLASSPATH="$CLASSPATH:$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/sa-jdi.jar"
 JAVA_OPTS="$JAVA_OPTS -Xloggc:${BISTOURY_LOG_DIR}/bistoury-gc-${TIMESTAMP}.log -XX:+PrintGC -XX:+PrintGCDetails -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${BISTOURY_LOG_DIR}"
 BISTOURY_PID_FILE="$BISTOURY_PID_DIR/bistoury-proxy.pid"

diff --git a/bistoury-proxy/src/main/resources.local/spring/database.xml b/bistoury-proxy/src/main/resources.local/spring/database.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:tx="http://www.springframework.org/schema/tx" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+       xmlns:tx="http://www.springframework.org/schema/tx"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
+       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+
+    <bean id="h2DataBeseUtil" class="qunar.tc.bistoury.serverside.database.H2DataBeseUtil"></bean>
 
     <bean id="h2DataSource" class="org.apache.tomcat.jdbc.pool.DataSource">
         <property name="driverClassName" value="org.h2.Driver"/>
         <property name="url"
-                  value="jdbc:h2:tcp://localhost//tmp/bistoury/h2/bistoury;MODE=MYSQL;TRACE_LEVEL_SYSTEM_OUT=2;AUTO_SERVER=TRUE"/>
+                  value="#{h2DataBeseUtil.getUrl()}"/>
         <property name="username" value=""/>
         <property name="password" value=""/>
     </bean>

diff --git a/bistoury-proxy/src/main/webapp/proxy.html b/bistoury-proxy/src/main/webapp/proxy.html
@@ -4,9 +4,9 @@
     <meta charset="UTF-8">
     <title>Bistoury Proxy Version</title>
     <link rel="shortcut icon" href="/favicon.ico">
-    <link rel="stylesheet" href="css/bootstrap.min.css?version=2.0.0">
-    <script type="text/javascript" src="js/jquery-3.3.1.min.js?version=2.0.0"></script>
-    <script type="text/javascript" src="js/bootstrap.min.js?version=2.0.0"></script>
+    <link rel="stylesheet" href="css/bootstrap.min.css?version=2.0.2">
+    <script type="text/javascript" src="js/jquery-3.3.1.min.js?version=2.0.2"></script>
+    <script type="text/javascript" src="js/bootstrap.min.js?version=2.0.2"></script>
 </head>
 <style>
     li[role=presentation] > a {

diff --git a/bistoury-remoting/pom.xml b/bistoury-remoting/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>bistoury</artifactId>
         <groupId>qunar.tc.bistoury</groupId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>