Merge branch 'master' into master

wu-sheng · web-flow · commit 284a98764161 · 2018-06-15T12:21:11.000+08:00
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/apache/skywalking/apm/collector/client/shardingjdbc/ShardingjdbcClient.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/apache/skywalking/apm/collector/client/shardingjdbc/ShardingjdbcClient.java
@@ -43,7 +43,7 @@
  */
 public class ShardingjdbcClient implements Client {
 
-    private final Logger logger = LoggerFactory.getLogger(ShardingjdbcClient.class);
+    private static final Logger logger = LoggerFactory.getLogger(ShardingjdbcClient.class);
     
     private Map<String, ShardingjdbcClientConfig> shardingjdbcClientConfig;
     
diff --git a/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/base/define/ShardingjdbcStorageInstaller.java b/apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/src/main/java/org/apache/skywalking/apm/collector/storage/shardingjdbc/base/define/ShardingjdbcStorageInstaller.java
@@ -36,7 +36,7 @@
  */
 public class ShardingjdbcStorageInstaller extends StorageInstaller {
 
-    private final Logger logger = LoggerFactory.getLogger(ShardingjdbcStorageInstaller.class);
+    private static final Logger logger = LoggerFactory.getLogger(ShardingjdbcStorageInstaller.class);
 
     public ShardingjdbcStorageInstaller(boolean isHighPerformanceMode) {
         super(isHighPerformanceMode);
