upgrade zkclient to 0.10 fix log4j2 bug

Author: JThink

README.md

@@ -605,7 +605,7 @@ compile "skyeye:skyeye-client-log4j:1.0.0"
 使用自己打包的dubbox（[dubbox](https://github.com/JThink/dubbox/tree/skyeye-trace-1.1.0)），在soa中间件dubbox中封装了rpc的跟踪
 
 ``` shell
-compile "com.101tec:zkclient:0.9.1-up"
+compile "com.101tec:zkclient:0.10"
 compile ("com.alibaba:dubbo:2.8.4-skyeye-trace-1.1.0") {
   exclude group: 'org.springframework', module: 'spring'
 }

skyeye-benchmark/dubbo-service/build.gradle

@@ -40,7 +40,7 @@ subprojects {
     dataVersion = '1.1.0'
     clientVersion = '1.1.0'
     zookeeperVerison = '3.4.6'
-    zkClientVersion = '0.9.1-up'
+    zkClientVersion = '0.10'
   }
 
   [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

skyeye-benchmark/hi-log/hi-log-log4j2/src/main/java/com/jthink/skyeye/benchmark/hi/log/log4j2/launcher/Launcher.java

@@ -7,7 +7,6 @@
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.logging.LoggingApplicationListener;
 import org.springframework.context.ApplicationListener;
-import org.springframework.context.annotation.ComponentScan;
 
 import java.util.Iterator;
 import java.util.Set;
@@ -27,7 +26,7 @@ public class Launcher {
     private static volatile boolean RUNNING = true;
     private static final Logger LOGGER = LoggerFactory.getLogger(Launcher.class);
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws InterruptedException {
         SpringApplicationBuilder builder = new SpringApplicationBuilder(Launcher.class);
         Set<ApplicationListener<?>> listeners = builder.application().getListeners();
         for (Iterator<ApplicationListener<?>> it = listeners.iterator(); it.hasNext();) {
@@ -44,6 +43,7 @@ public static void main(String[] args) {
         String a = "哈哈";
         while (true) {
             LOGGER.info("i am test, {}", a);
+            Thread.sleep(1000);
         }
     }
 }

skyeye-benchmark/hi-log/hi-log-log4j2/src/main/resources/log4j2.xml

@@ -30,13 +30,12 @@
       </Policies>
     </RollingFile>
 
-
     <!-- kafka appender -->
-    <KafkaCustomize name="kafkaAppender" topic="app-log" zkServers="riot01.jthink.com:2181,riot02.jthink.com:2181,riot03.jthink.com:2181"
+    <KafkaCustomize name="KafkaCustomize" topic="app-log" zkServers="riot01.jthink.com:2181,riot02.jthink.com:2181,riot03.jthink.com:2181"
                     mail="qianjc@unionpaysmart.com" rpc="none" app="${APP_NAME}" host="${hostName}">
       <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
       <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS};${APP_NAME};${hostName};%t;%-5level;%logger{96};%line;%msg%n"/>
-      <Property name="bootstrap.servers">riot01.jthink.com:9092,riot02.jthink.com:9092,riot03.jthink.com:9092</Property>
+      <Property name="bootstrap.servers">riot01.jthink.com:909,riot02.jthink.com:909,riot03.jthink.com:909</Property>
       <Property name="acks">0</Property>
       <Property name="linger.ms">100</Property>
       <Property name="client.id">${APP_NAME}-${hostName}-log4j2</Property>
@@ -48,6 +47,7 @@
       <AppenderRef ref="Console"/>
       <AppenderRef ref="RollingInfoFile"/>
       <AppenderRef ref="RollingErrorFile"/>
+      <AppenderRef ref="KafkaCustomize"/>
     </Root>
   </Loggers>
 </Configuration>

skyeye-client/README.md

@@ -77,7 +77,7 @@ compile "skyeye:skyeye-client-log4j:1.0.0"
 使用自己打包的dubbox（[dubbox](https://github.com/JThink/dubbox/tree/skyeye-trace-1.0.0)），在soa中间件dubbox中封装了rpc的跟踪
 
 ``` shell
-compile "com.101tec:zkclient:0.9.1-up"
+compile "com.101tec:zkclient:0.10"
 compile ("com.alibaba:dubbo:2.8.4-skyeye-trace-1.0.0") {
   exclude group: 'org.springframework', module: 'spring'
 }

skyeye-client/build.gradle

@@ -56,7 +56,7 @@ subprojects {
   ext {
     kafkaVersion = '0.10.0.1'
     zookeeperVersion = '3.4.6'
-    zkclientVersion = '0.9.1-up'
+    zkclientVersion = '0.10'
     baseVersion = '1.1.0'
     traceVersion = '1.1.0'
   }

skyeye-client/skyeye-client-log4j2/build.gradle

@@ -15,3 +15,8 @@ dependencies {
   compile project(':skyeye-client-core')
   compile "org.apache.logging.log4j:log4j-core:$log4j2Version"
 }
+
+configurations {
+  compile.exclude group: "log4j", module: "log4j"
+  compile.exclude group: "org.slf4j", module: "slf4j-log4j12"
+}

skyeye-client/skyeye-client-log4j2/src/main/java/com/jthink/skyeye/client/log4j2/appender/KafkaAppender.java

@@ -121,6 +121,14 @@ public void onCompletion(RecordMetadata recordMetadata, Exception e) {
     public void start() {
         super.start();
 
+        // 添加hook
+        Runtime.getRuntime().addShutdownHook(new Thread() {
+            @Override
+            public void run() {
+                KafkaAppender.this.manager.closeResources();
+            }
+        });
+
         this.manager.startup();
     }
 

skyeye-client/skyeye-client-log4j2/src/main/java/com/jthink/skyeye/client/log4j2/appender/KafkaManager.java

@@ -107,7 +107,7 @@ public void run() {
     /**
      * 关闭zk和kafka
      */
-    private void closeResources() {
+    public void closeResources() {
         if (LazySingletonProducer.isInstanced()) {
             LazySingletonProducer.getInstance(KafkaManager.this.config).close();
         }

skyeye-collector/skyeye-collector-metrics/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'application'
 
 ext {
   dataVersion = '1.1.0'
-  zkclientVersion = '0.9.1-up'
+  zkclientVersion = '0.10'
 }
 
 dependencies {