skywalking-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pen...@apache.org
Subject [incubator-skywalking] branch master updated: Feature/1032 (#1043)
Date Sat, 07 Apr 2018 12:57:47 GMT
This is an automated email from the ASF dual-hosted git repository.

pengys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 4607128  Feature/1032 (#1043)
4607128 is described below

commit 4607128c4dbc094b35c468994ae93d33b78e9344
Author: 彭勇升 pengys <8082209@qq.com>
AuthorDate: Sat Apr 7 20:57:44 2018 +0800

    Feature/1032 (#1043)
    
    * 1. Add the performance collection point.
    2. Report formatter.
    
    #1032
    
    * Add a new cache implementation by caffeine.
    
    #1032
    
    * Performance optimization:
    Make all the loggers class variable to have the static modifier.
---
 .../handler/ApplicationRegisterServiceHandler.java |   2 +-
 .../handler/InstanceDiscoveryServiceHandler.java   |   2 +-
 .../provider/handler/JVMMetricsServiceHandler.java |   2 +-
 .../NetworkAddressRegisterServiceHandler.java      |   2 +-
 .../ServiceNameDiscoveryServiceHandler.java        |   2 +-
 .../handler/TraceSegmentServiceHandler.java        |   2 +-
 .../handler/ApplicationRegisterServletHandler.java |   2 +-
 .../handler/InstanceDiscoveryServletHandler.java   |   2 +-
 .../handler/InstanceHeartBeatServletHandler.java   |   2 +-
 .../NetworkAddressRegisterServletHandler.java      |   2 +-
 .../ServiceNameDiscoveryServiceHandler.java        |   2 +-
 .../handler/TraceSegmentServletHandler.java        |   2 +-
 .../provider/handler/reader/SegmentJsonReader.java |   3 +-
 .../handler/reader/TraceSegmentJsonReader.java     |   3 +-
 .../agent/jetty/provider/HttpClientTools.java      |   2 +-
 .../alarm/provider/worker/AlarmAssertWorker.java   |   2 +-
 .../provider/service/InstanceHeartBeatService.java |   2 +-
 .../ApplicationComponentSpanListener.java          |   7 +-
 .../mapping/ApplicationMappingSpanListener.java    |   5 +-
 .../worker/global/GlobalTraceSpanListener.java     |   9 +-
 .../mapping/InstanceMappingSpanListener.java       |   5 +-
 .../segment/SegmentDurationSpanListener.java       |  15 ++-
 .../ServiceReferenceMetricSpanListener.java        |   7 +-
 .../register/ApplicationRegisterRemoteWorker.java  |   4 +-
 .../register/ApplicationRegisterSerialWorker.java  |   4 +-
 .../register/InstanceRegisterRemoteWorker.java     |   4 +-
 .../register/InstanceRegisterSerialWorker.java     |   4 +-
 .../NetworkAddressRegisterRemoteWorker.java        |   4 +-
 .../NetworkAddressRegisterSerialWorker.java        |   4 +-
 .../register/ServiceNameRegisterRemoteWorker.java  |   4 +-
 .../register/ServiceNameRegisterSerialWorker.java  |   4 +-
 .../provider/service/InstanceIDService.java        |   2 +-
 .../parser/provider/buffer/OffsetManager.java      |   2 +-
 .../provider/buffer/SegmentBufferManager.java      |   3 +-
 .../provider/buffer/SegmentBufferReader.java       |   2 +-
 .../parser/provider/parser/SegmentParse.java       |   4 +-
 .../parser/SegmentParserListenerManager.java       |   6 +-
 .../standardization/ReferenceIdExchanger.java      |   2 +-
 .../SegmentStandardizationWorker.java              |   2 +-
 .../parser/standardization/SpanIdExchanger.java    |   2 +-
 .../boot/config/ApplicationConfigLoader.java       |   2 +-
 .../ClusterModuleStandaloneProvider.java           |  13 +-
 .../standalone/ClusterStandaloneDataMonitor.java   |   9 +-
 .../client/elasticsearch/ElasticSearchClient.java  |  10 +-
 .../client/zookeeper/ZookeeperClient.java          |   5 +-
 .../apm/collector/server/grpc/GRPCServer.java      |  35 +++--
 .../apm/collector/server/jetty/JettyHandler.java   |   2 +-
 .../apm/collector/server/jetty/JettyServer.java    |  18 +--
 .../collector/core/data/StorageDefineLoader.java   |   3 +-
 .../collector/core/define/DefinitionLoader.java    |   3 +-
 .../apm/collector/core/module/BootstrapFlow.java   |   2 +-
 .../apm/collector/core/util/FileUtils.java         |   3 +-
 .../grpc/manager/GRPCManagerProvider.java          |   7 +-
 .../manager/service/GRPCManagerServiceImpl.java    |  14 +-
 .../apm/collector/instrument/MetricTree.java       |   3 +-
 .../jetty/manager/JettyManagerProvider.java        |   5 +-
 .../manager/service/JettyManagerServiceImpl.java   |   6 +-
 .../service/NamingJettyHandlerRegisterService.java |   3 +-
 .../service/CommonRemoteDataRegisterService.java   |   2 +-
 .../grpc/handler/RemoteCommonServiceHandler.java   |   2 +-
 .../remote/grpc/service/GRPCRemoteClient.java      |   2 +-
 .../grpc/service/GRPCRemoteClientService.java      |   2 +-
 .../service/selector/ForeverFirstSelector.java     |   2 +-
 .../collector/storage/es/DataTTLKeeperTimer.java   |   2 +-
 .../storage/es/StorageModuleEsProvider.java        | 141 ++++++++++++++++++---
 .../es/dao/InstanceHeartBeatEsPersistenceDAO.java  |   2 +-
 .../storage/es/dao/SegmentEsPersistenceDAO.java    |   9 +-
 ...licationReferenceAlarmListEsPersistenceDAO.java |  21 ++-
 .../dao/alarm/InstanceAlarmEsPersistenceDAO.java   |  21 ++-
 .../alarm/InstanceAlarmListEsPersistenceDAO.java   |  21 ++-
 ...InstanceReferenceAlarmListEsPersistenceDAO.java |  25 ++--
 .../es/dao/alarm/ServiceAlarmEsPersistenceDAO.java |  23 ++--
 .../alarm/ServiceAlarmListEsPersistenceDAO.java    |  23 ++--
 ...nstanceReferenceHourMetricEsPersistenceDAO.java |   2 +-
 .../storage/h2/StorageModuleH2Provider.java        |   2 +-
 .../h2/dao/GlobalTraceH2PersistenceDAO.java        |   2 +-
 .../h2/dao/InstanceHeartBeatH2PersistenceDAO.java  |   2 +-
 .../h2/dao/SegmentDurationH2PersistenceDAO.java    |   3 +-
 .../storage/h2/dao/SegmentH2PersistenceDAO.java    |   3 +-
 .../h2/dao/cache/ApplicationH2CacheDAO.java        |   2 +-
 .../storage/h2/dao/cache/InstanceH2CacheDAO.java   |   2 +-
 .../h2/dao/cache/NetworkAddressH2CacheDAO.java     |   2 +-
 .../h2/dao/cache/ServiceNameH2CacheDAO.java        |   2 +-
 .../h2/dao/register/ApplicationRegisterH2DAO.java  |   4 +-
 .../h2/dao/register/InstanceRegisterH2DAO.java     |   2 +-
 .../dao/register/NetworkAddressRegisterH2DAO.java  |   2 +-
 .../storage/h2/dao/ui/InstanceH2UIDAO.java         |   2 +-
 .../storage/h2/dao/ui/MemoryMetricH2UIDAO.java     |   2 +-
 .../storage/h2/dao/ui/MemoryPoolMetricH2UIDAO.java |   2 +-
 .../collector/ui/jetty/handler/GraphQLHandler.java |   2 +-
 .../apm/collector/ui/service/AlarmService.java     |   2 +-
 .../collector/ui/service/ApplicationService.java   |   2 +-
 .../ui/service/ApplicationTopologyService.java     |   2 +-
 .../ui/service/ClusterTopologyService.java         |   2 +-
 .../collector/ui/service/SegmentTopService.java    |   2 +-
 .../collector/ui/service/ServiceNameService.java   |   2 +-
 .../ui/service/ServiceTopologyService.java         |   2 +-
 .../ui/service/TimeSynchronousService.java         |   3 +-
 .../apm/collector/ui/service/TopologyBuilder.java  |   2 +-
 99 files changed, 367 insertions(+), 272 deletions(-)

diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java
index 2a063b2..9ca2ca2 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ApplicationRegisterServiceHandler extends ApplicationRegisterServiceGrpc.ApplicationRegisterServiceImplBase implements GRPCHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterServiceHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationRegisterServiceHandler.class);
 
     private final IApplicationIDService applicationIDService;
 
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java
index 2b20ce3..7f1f9c9 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceDiscoveryServiceHandler extends InstanceDiscoveryServiceGrpc.InstanceDiscoveryServiceImplBase implements GRPCHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceDiscoveryServiceHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceDiscoveryServiceHandler.class);
 
     private final IInstanceIDService instanceIDService;
     private final IInstanceHeartBeatService instanceHeartBeatService;
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java
index 5558842..ab15b59 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
  */
 public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsServiceImplBase implements GRPCHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(JVMMetricsServiceHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(JVMMetricsServiceHandler.class);
 
     private final ICpuMetricService cpuMetricService;
     private final IGCMetricService gcMetricService;
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandler.java
index c7b5625..d925d3d 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/NetworkAddressRegisterServiceHandler.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class NetworkAddressRegisterServiceHandler extends NetworkAddressRegisterServiceGrpc.NetworkAddressRegisterServiceImplBase implements GRPCHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(NetworkAddressRegisterServiceHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(NetworkAddressRegisterServiceHandler.class);
 
     private final INetworkAddressIDService networkAddressIDService;
 
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java
index 35dedf3..61c1e17 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ServiceNameDiscoveryServiceHandler extends ServiceNameDiscoveryServiceGrpc.ServiceNameDiscoveryServiceImplBase implements GRPCHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(ServiceNameDiscoveryServiceHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(ServiceNameDiscoveryServiceHandler.class);
 
     private final IServiceNameService serviceNameService;
 
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java
index 809bd65..b657cf1 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
  */
 public class TraceSegmentServiceHandler extends TraceSegmentServiceGrpc.TraceSegmentServiceImplBase implements GRPCHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(TraceSegmentServiceHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(TraceSegmentServiceHandler.class);
 
     private final ISegmentParseService segmentParseService;
 
diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java
index 7cb6fbd..c60f4b6 100644
--- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ApplicationRegisterServletHandler extends JettyHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterServletHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationRegisterServletHandler.class);
 
     private final IApplicationIDService applicationIDService;
     private Gson gson = new Gson();
diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java
index 0fd473b..d88d86c 100644
--- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceDiscoveryServletHandler extends JettyHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceDiscoveryServletHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceDiscoveryServletHandler.class);
 
     private final IInstanceIDService instanceIDService;
     private final Gson gson = new Gson();
diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceHeartBeatServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceHeartBeatServletHandler.java
index 16eaa08..acc479a 100644
--- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceHeartBeatServletHandler.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceHeartBeatServletHandler.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceHeartBeatServletHandler extends JettyHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceHeartBeatServletHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceHeartBeatServletHandler.class);
 
     private final IInstanceHeartBeatService instanceHeartBeatService;
     private final Gson gson = new Gson();
diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/NetworkAddressRegisterServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/NetworkAddressRegisterServletHandler.java
index 14dc1ef..318c3fe 100644
--- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/NetworkAddressRegisterServletHandler.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/NetworkAddressRegisterServletHandler.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
  */
 public class NetworkAddressRegisterServletHandler extends JettyHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(NetworkAddressRegisterServletHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(NetworkAddressRegisterServletHandler.class);
 
     private final INetworkAddressIDService networkAddressIDService;
     private Gson gson = new Gson();
diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java
index f89f609..6ddce79 100644
--- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ServiceNameDiscoveryServiceHandler extends JettyHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(ServiceNameDiscoveryServiceHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(ServiceNameDiscoveryServiceHandler.class);
 
     private final IServiceNameService serviceNameService;
     private final Gson gson = new Gson();
diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java
index 11b1d23..fec68ef 100644
--- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  */
 public class TraceSegmentServletHandler extends JettyHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(TraceSegmentServletHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(TraceSegmentServletHandler.class);
 
     private final ISegmentParseService segmentParseService;
 
diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReader.java
index c6d8b98..4898864 100644
--- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReader.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReader.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
 
 import com.google.gson.stream.JsonReader;
@@ -30,7 +29,7 @@ import org.slf4j.LoggerFactory;
  */
 public class SegmentJsonReader implements StreamJsonReader<TraceSegmentObject.Builder> {
 
-    private final Logger logger = LoggerFactory.getLogger(SegmentJsonReader.class);
+    private static final Logger logger = LoggerFactory.getLogger(SegmentJsonReader.class);
 
     private UniqueIdJsonReader uniqueIdJsonReader = new UniqueIdJsonReader();
     private SpanJsonReader spanJsonReader = new SpanJsonReader();
diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReader.java
index b11125e..c2a64c1 100644
--- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReader.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReader.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
 
 import com.google.gson.stream.JsonReader;
@@ -29,7 +28,7 @@ import org.slf4j.LoggerFactory;
  */
 public class TraceSegmentJsonReader implements StreamJsonReader<TraceSegment> {
 
-    private final Logger logger = LoggerFactory.getLogger(TraceSegmentJsonReader.class);
+    private static final Logger logger = LoggerFactory.getLogger(TraceSegmentJsonReader.class);
 
     private UniqueIdJsonReader uniqueIdJsonReader = new UniqueIdJsonReader();
     private SegmentJsonReader segmentJsonReader = new SegmentJsonReader();
diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/HttpClientTools.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/HttpClientTools.java
index b4f3baa..5d96d57 100644
--- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/HttpClientTools.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider/HttpClientTools.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 public enum HttpClientTools {
     INSTANCE;
 
-    private final Logger logger = LoggerFactory.getLogger(HttpClientTools.class);
+    private static final Logger logger = LoggerFactory.getLogger(HttpClientTools.class);
 
     public String get(String url, List<NameValuePair> params) throws IOException {
         CloseableHttpClient httpClient = HttpClients.createDefault();
diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlarmAssertWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlarmAssertWorker.java
index 244d2ad..13a3bfd 100644
--- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlarmAssertWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlarmAssertWorker.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public abstract class AlarmAssertWorker<INPUT extends StreamData & Metric, OUTPUT extends StreamData & Alarm> extends AbstractLocalAsyncWorker<INPUT, OUTPUT> {
 
-    private final Logger logger = LoggerFactory.getLogger(AlarmAssertWorker.class);
+    private static final Logger logger = LoggerFactory.getLogger(AlarmAssertWorker.class);
 
     public AlarmAssertWorker(ModuleManager moduleManager) {
         super(moduleManager);
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/service/InstanceHeartBeatService.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/service/InstanceHeartBeatService.java
index 31db2f8..9235de5 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/service/InstanceHeartBeatService.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/service/InstanceHeartBeatService.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceHeartBeatService implements IInstanceHeartBeatService {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceHeartBeatService.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceHeartBeatService.class);
 
     private Graph<Instance> heartBeatGraph;
 
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentSpanListener.java
index 1ca67f5..d6743d7 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentSpanListener.java
@@ -18,7 +18,7 @@
 
 package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.component;
 
-import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricGraphIdDefine;
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.SpanDecorator;
@@ -29,6 +29,7 @@ import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listen
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.SpanListenerFactory;
 import org.apache.skywalking.apm.collector.cache.CacheModule;
 import org.apache.skywalking.apm.collector.cache.service.ApplicationCacheService;
+import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric;
 import org.apache.skywalking.apm.collector.core.graph.Graph;
 import org.apache.skywalking.apm.collector.core.graph.GraphManager;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
@@ -42,7 +43,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application
 public class ApplicationComponentSpanListener implements EntrySpanListener, ExitSpanListener, FirstSpanListener {
 
     private final ApplicationCacheService applicationCacheService;
-    private List<ApplicationComponent> applicationComponents = new ArrayList<>();
+    private List<ApplicationComponent> applicationComponents = new LinkedList<>();
     private long timeBucket;
 
     private ApplicationComponentSpanListener(ModuleManager moduleManager) {
@@ -90,6 +91,8 @@ public class ApplicationComponentSpanListener implements EntrySpanListener, Exit
     }
 
     public static class Factory implements SpanListenerFactory {
+
+        @GraphComputingMetric(name = "/segment/parse/createSpanListeners/applicationComponentSpanListener")
         @Override public SpanListener create(ModuleManager moduleManager) {
             return new ApplicationComponentSpanListener(moduleManager);
         }
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java
index 3f2d0ca..8f51fdb 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java
@@ -28,6 +28,7 @@ import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listen
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.SpanListenerFactory;
 import org.apache.skywalking.apm.collector.cache.CacheModule;
 import org.apache.skywalking.apm.collector.cache.service.ApplicationCacheService;
+import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric;
 import org.apache.skywalking.apm.collector.core.graph.Graph;
 import org.apache.skywalking.apm.collector.core.graph.GraphManager;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
@@ -43,7 +44,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ApplicationMappingSpanListener implements FirstSpanListener, EntrySpanListener {
 
-    private final Logger logger = LoggerFactory.getLogger(ApplicationMappingSpanListener.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationMappingSpanListener.class);
 
     private final ApplicationCacheService applicationCacheService;
     private List<ApplicationMapping> applicationMappings = new LinkedList<>();
@@ -91,6 +92,8 @@ public class ApplicationMappingSpanListener implements FirstSpanListener, EntryS
     }
 
     public static class Factory implements SpanListenerFactory {
+
+        @GraphComputingMetric(name = "/segment/parse/createSpanListeners/applicationMappingSpanListener")
         @Override public SpanListener create(ModuleManager moduleManager) {
             return new ApplicationMappingSpanListener(moduleManager);
         }
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java
index 23b2939..0bdd414 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java
@@ -18,7 +18,7 @@
 
 package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.global;
 
-import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricGraphIdDefine;
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.SpanDecorator;
@@ -26,6 +26,7 @@ import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listen
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.GlobalTraceIdsListener;
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.SpanListener;
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.SpanListenerFactory;
+import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric;
 import org.apache.skywalking.apm.collector.core.graph.Graph;
 import org.apache.skywalking.apm.collector.core.graph.GraphManager;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
@@ -41,9 +42,9 @@ import org.slf4j.LoggerFactory;
  */
 public class GlobalTraceSpanListener implements FirstSpanListener, GlobalTraceIdsListener {
 
-    private final Logger logger = LoggerFactory.getLogger(GlobalTraceSpanListener.class);
+    private static final Logger logger = LoggerFactory.getLogger(GlobalTraceSpanListener.class);
 
-    private List<String> globalTraceIds = new ArrayList<>();
+    private List<String> globalTraceIds = new LinkedList<>();
     private String segmentId;
     private long timeBucket;
 
@@ -81,6 +82,8 @@ public class GlobalTraceSpanListener implements FirstSpanListener, GlobalTraceId
     }
 
     public static class Factory implements SpanListenerFactory {
+
+        @GraphComputingMetric(name = "/segment/parse/createSpanListeners/globalTraceSpanListener")
         @Override public SpanListener create(ModuleManager moduleManager) {
             return new GlobalTraceSpanListener();
         }
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java
index 39034b3..3308b32 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java
@@ -26,6 +26,7 @@ import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listen
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.FirstSpanListener;
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.SpanListener;
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.SpanListenerFactory;
+import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric;
 import org.apache.skywalking.apm.collector.core.graph.Graph;
 import org.apache.skywalking.apm.collector.core.graph.GraphManager;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
@@ -40,7 +41,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceMappingSpanListener implements FirstSpanListener, EntrySpanListener {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceMappingSpanListener.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceMappingSpanListener.class);
 
     private List<InstanceMapping> instanceMappings = new LinkedList<>();
     private long timeBucket;
@@ -78,6 +79,8 @@ public class InstanceMappingSpanListener implements FirstSpanListener, EntrySpan
     }
 
     public static class Factory implements SpanListenerFactory {
+
+        @GraphComputingMetric(name = "/segment/parse/createSpanListeners/instanceMappingSpanListener")
         @Override public SpanListener create(ModuleManager moduleManager) {
             return new InstanceMappingSpanListener();
         }
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java
index 89e13ee..07082cf 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java
@@ -18,7 +18,7 @@
 
 package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.segment;
 
-import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricGraphIdDefine;
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.SpanDecorator;
@@ -30,6 +30,7 @@ import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listen
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.SpanListenerFactory;
 import org.apache.skywalking.apm.collector.cache.CacheModule;
 import org.apache.skywalking.apm.collector.cache.service.ServiceNameCacheService;
+import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric;
 import org.apache.skywalking.apm.collector.core.graph.Graph;
 import org.apache.skywalking.apm.collector.core.graph.GraphManager;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
@@ -44,15 +45,15 @@ import org.slf4j.LoggerFactory;
  */
 public class SegmentDurationSpanListener implements EntrySpanListener, ExitSpanListener, LocalSpanListener, FirstSpanListener {
 
-    private final Logger logger = LoggerFactory.getLogger(SegmentDurationSpanListener.class);
+    private static final Logger logger = LoggerFactory.getLogger(SegmentDurationSpanListener.class);
 
     private final List<SegmentDuration> segmentDurations;
     private final ServiceNameCacheService serviceNameCacheService;
     private boolean isError = false;
     private long timeBucket;
 
-    SegmentDurationSpanListener(ModuleManager moduleManager) {
-        this.segmentDurations = new ArrayList<>();
+    private SegmentDurationSpanListener(ModuleManager moduleManager) {
+        this.segmentDurations = new LinkedList<>();
         this.serviceNameCacheService = moduleManager.find(CacheModule.NAME).getService(ServiceNameCacheService.class);
     }
 
@@ -98,14 +99,16 @@ public class SegmentDurationSpanListener implements EntrySpanListener, ExitSpanL
     @Override public void build() {
         Graph<SegmentDuration> graph = GraphManager.INSTANCE.findGraph(MetricGraphIdDefine.SEGMENT_DURATION_GRAPH_ID, SegmentDuration.class);
         logger.debug("segment cost listener build");
-        for (SegmentDuration segmentDuration : segmentDurations) {
+        segmentDurations.forEach(segmentDuration -> {
             segmentDuration.setIsError(BooleanUtils.booleanToValue(isError));
             segmentDuration.setTimeBucket(timeBucket);
             graph.start(segmentDuration);
-        }
+        });
     }
 
     public static class Factory implements SpanListenerFactory {
+
+        @GraphComputingMetric(name = "/segment/parse/createSpanListeners/segmentDurationSpanListener")
         @Override public SpanListener create(ModuleManager moduleManager) {
             return new SegmentDurationSpanListener(moduleManager);
         }
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java
index dc47b0f..650e626 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java
@@ -31,6 +31,7 @@ import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listen
 import org.apache.skywalking.apm.collector.cache.CacheModule;
 import org.apache.skywalking.apm.collector.cache.service.ApplicationCacheService;
 import org.apache.skywalking.apm.collector.cache.service.InstanceCacheService;
+import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric;
 import org.apache.skywalking.apm.collector.core.graph.Graph;
 import org.apache.skywalking.apm.collector.core.graph.GraphManager;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
@@ -48,7 +49,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ServiceReferenceMetricSpanListener implements FirstSpanListener, EntrySpanListener, ExitSpanListener {
 
-    private final Logger logger = LoggerFactory.getLogger(ServiceReferenceMetricSpanListener.class);
+    private static final Logger logger = LoggerFactory.getLogger(ServiceReferenceMetricSpanListener.class);
 
     private final InstanceCacheService instanceCacheService;
     private final ApplicationCacheService applicationCacheService;
@@ -57,7 +58,7 @@ public class ServiceReferenceMetricSpanListener implements FirstSpanListener, En
     private SpanDecorator entrySpanDecorator;
     private long timeBucket;
 
-    ServiceReferenceMetricSpanListener(ModuleManager moduleManager) {
+    private ServiceReferenceMetricSpanListener(ModuleManager moduleManager) {
         this.entryReferenceMetric = new LinkedList<>();
         this.exitReferenceMetric = new LinkedList<>();
         this.instanceCacheService = moduleManager.find(CacheModule.NAME).getService(InstanceCacheService.class);
@@ -189,6 +190,8 @@ public class ServiceReferenceMetricSpanListener implements FirstSpanListener, En
     }
 
     public static class Factory implements SpanListenerFactory {
+
+        @GraphComputingMetric(name = "/segment/parse/createSpanListeners/serviceReferenceMetricSpanListener")
         @Override public SpanListener create(ModuleManager moduleManager) {
             return new ServiceReferenceMetricSpanListener(moduleManager);
         }
diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterRemoteWorker.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterRemoteWorker.java
index 4b8cba5..6ab9f48 100644
--- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterRemoteWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterRemoteWorker.java
@@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory;
  */
 public class ApplicationRegisterRemoteWorker extends AbstractRemoteWorker<Application, Application> {
 
-    private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterRemoteWorker.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationRegisterRemoteWorker.class);
 
-    public ApplicationRegisterRemoteWorker(ModuleManager moduleManager) {
+    private ApplicationRegisterRemoteWorker(ModuleManager moduleManager) {
         super(moduleManager);
     }
 
diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterSerialWorker.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterSerialWorker.java
index d2032a4..4b34ffc 100644
--- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterSerialWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterSerialWorker.java
@@ -38,12 +38,12 @@ import org.slf4j.LoggerFactory;
  */
 public class ApplicationRegisterSerialWorker extends AbstractLocalAsyncWorker<Application, Application> {
 
-    private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterSerialWorker.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationRegisterSerialWorker.class);
 
     private final IApplicationRegisterDAO applicationRegisterDAO;
     private final ApplicationCacheService applicationCacheService;
 
-    public ApplicationRegisterSerialWorker(ModuleManager moduleManager) {
+    private ApplicationRegisterSerialWorker(ModuleManager moduleManager) {
         super(moduleManager);
         this.applicationRegisterDAO = getModuleManager().find(StorageModule.NAME).getService(IApplicationRegisterDAO.class);
         this.applicationCacheService = getModuleManager().find(CacheModule.NAME).getService(ApplicationCacheService.class);
diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterRemoteWorker.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterRemoteWorker.java
index e372860..9d43322 100644
--- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterRemoteWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterRemoteWorker.java
@@ -34,13 +34,13 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceRegisterRemoteWorker extends AbstractRemoteWorker<Instance, Instance> {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceRegisterRemoteWorker.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceRegisterRemoteWorker.class);
 
     @Override public int id() {
         return WorkerIdDefine.INSTANCE_REGISTER_REMOTE_WORKER;
     }
 
-    InstanceRegisterRemoteWorker(ModuleManager moduleManager) {
+    private InstanceRegisterRemoteWorker(ModuleManager moduleManager) {
         super(moduleManager);
     }
 
diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterSerialWorker.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterSerialWorker.java
index 12f8fd7..1880b2b 100644
--- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterSerialWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterSerialWorker.java
@@ -38,12 +38,12 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceRegisterSerialWorker extends AbstractLocalAsyncWorker<Instance, Instance> {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceRegisterSerialWorker.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceRegisterSerialWorker.class);
 
     private final InstanceCacheService instanceCacheService;
     private final IInstanceRegisterDAO instanceRegisterDAO;
 
-    public InstanceRegisterSerialWorker(ModuleManager moduleManager) {
+    private InstanceRegisterSerialWorker(ModuleManager moduleManager) {
         super(moduleManager);
         this.instanceCacheService = getModuleManager().find(CacheModule.NAME).getService(InstanceCacheService.class);
         this.instanceRegisterDAO = getModuleManager().find(StorageModule.NAME).getService(IInstanceRegisterDAO.class);
diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/NetworkAddressRegisterRemoteWorker.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/NetworkAddressRegisterRemoteWorker.java
index 9dcd006..6c720fe 100644
--- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/NetworkAddressRegisterRemoteWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/NetworkAddressRegisterRemoteWorker.java
@@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory;
  */
 public class NetworkAddressRegisterRemoteWorker extends AbstractRemoteWorker<NetworkAddress, NetworkAddress> {
 
-    private final Logger logger = LoggerFactory.getLogger(NetworkAddressRegisterRemoteWorker.class);
+    private static final Logger logger = LoggerFactory.getLogger(NetworkAddressRegisterRemoteWorker.class);
 
-    public NetworkAddressRegisterRemoteWorker(ModuleManager moduleManager) {
+    private NetworkAddressRegisterRemoteWorker(ModuleManager moduleManager) {
         super(moduleManager);
     }
 
diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/NetworkAddressRegisterSerialWorker.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/NetworkAddressRegisterSerialWorker.java
index fd54dd3..73f4490 100644
--- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/NetworkAddressRegisterSerialWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/NetworkAddressRegisterSerialWorker.java
@@ -36,12 +36,12 @@ import org.slf4j.LoggerFactory;
  */
 public class NetworkAddressRegisterSerialWorker extends AbstractLocalAsyncWorker<NetworkAddress, NetworkAddress> {
 
-    private final Logger logger = LoggerFactory.getLogger(NetworkAddressRegisterSerialWorker.class);
+    private static final Logger logger = LoggerFactory.getLogger(NetworkAddressRegisterSerialWorker.class);
 
     private final INetworkAddressRegisterDAO networkAddressRegisterDAO;
     private final NetworkAddressCacheService networkAddressCacheService;
 
-    NetworkAddressRegisterSerialWorker(ModuleManager moduleManager) {
+    private NetworkAddressRegisterSerialWorker(ModuleManager moduleManager) {
         super(moduleManager);
         this.networkAddressRegisterDAO = getModuleManager().find(StorageModule.NAME).getService(INetworkAddressRegisterDAO.class);
         this.networkAddressCacheService = getModuleManager().find(CacheModule.NAME).getService(NetworkAddressCacheService.class);
diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterRemoteWorker.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterRemoteWorker.java
index ecb77da..1e155e6 100644
--- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterRemoteWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterRemoteWorker.java
@@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory;
  */
 public class ServiceNameRegisterRemoteWorker extends AbstractRemoteWorker<ServiceName, ServiceName> {
 
-    private final Logger logger = LoggerFactory.getLogger(ServiceNameRegisterRemoteWorker.class);
+    private static final Logger logger = LoggerFactory.getLogger(ServiceNameRegisterRemoteWorker.class);
 
-    public ServiceNameRegisterRemoteWorker(ModuleManager moduleManager) {
+    private ServiceNameRegisterRemoteWorker(ModuleManager moduleManager) {
         super(moduleManager);
     }
 
diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterSerialWorker.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterSerialWorker.java
index 77e396d..d1d911c 100644
--- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterSerialWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterSerialWorker.java
@@ -37,12 +37,12 @@ import org.slf4j.LoggerFactory;
  */
 public class ServiceNameRegisterSerialWorker extends AbstractLocalAsyncWorker<ServiceName, ServiceName> {
 
-    private final Logger logger = LoggerFactory.getLogger(ServiceNameRegisterSerialWorker.class);
+    private static final Logger logger = LoggerFactory.getLogger(ServiceNameRegisterSerialWorker.class);
 
     private final IServiceNameRegisterDAO serviceNameRegisterDAO;
     private final ServiceIdCacheService serviceIdCacheService;
 
-    ServiceNameRegisterSerialWorker(ModuleManager moduleManager) {
+    private ServiceNameRegisterSerialWorker(ModuleManager moduleManager) {
         super(moduleManager);
         this.serviceNameRegisterDAO = getModuleManager().find(StorageModule.NAME).getService(IServiceNameRegisterDAO.class);
         this.serviceIdCacheService = getModuleManager().find(CacheModule.NAME).getService(ServiceIdCacheService.class);
diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/InstanceIDService.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/InstanceIDService.java
index 803e8d9..04f2104 100644
--- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/InstanceIDService.java
+++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/InstanceIDService.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceIDService implements IInstanceIDService {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceIDService.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceIDService.class);
 
     private final ModuleManager moduleManager;
     private InstanceCacheService instanceCacheService;
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/OffsetManager.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/OffsetManager.java
index fbd3d02..67c162e 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/OffsetManager.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/OffsetManager.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
 public enum OffsetManager {
     INSTANCE;
 
-    private final Logger logger = LoggerFactory.getLogger(OffsetManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(OffsetManager.class);
 
     private static final String OFFSET_FILE_PREFIX = "offset";
     private File offsetFile;
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferManager.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferManager.java
index 6fac316..d4e0667 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferManager.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferManager.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.buffer;
 
 import java.io.File;
@@ -36,7 +35,7 @@ import org.slf4j.LoggerFactory;
 public enum SegmentBufferManager {
     INSTANCE;
 
-    private final Logger logger = LoggerFactory.getLogger(SegmentBufferManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(SegmentBufferManager.class);
 
     public static final String DATA_FILE_PREFIX = "data";
     private FileOutputStream outputStream;
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferReader.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferReader.java
index 11005ea..79cc25e 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferReader.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/buffer/SegmentBufferReader.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
 public enum SegmentBufferReader {
     INSTANCE;
 
-    private final Logger logger = LoggerFactory.getLogger(SegmentBufferReader.class);
+    private static final Logger logger = LoggerFactory.getLogger(SegmentBufferReader.class);
     private InputStream inputStream;
     private ModuleManager moduleManager;
     private SegmentParserListenerManager listenerManager;
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
index f251740..5a6736e 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
  */
 public class SegmentParse {
 
-    private final Logger logger = LoggerFactory.getLogger(SegmentParse.class);
+    private static final Logger logger = LoggerFactory.getLogger(SegmentParse.class);
 
     private final ModuleManager moduleManager;
     private List<SpanListener> spanListeners;
@@ -188,6 +188,7 @@ public class SegmentParse {
         graph.start(standardization);
     }
 
+    @GraphComputingMetric(name = "/segment/parse/notifyListenerToBuild")
     private void notifyListenerToBuild() {
         spanListeners.forEach(SpanListener::build);
     }
@@ -236,6 +237,7 @@ public class SegmentParse {
         }
     }
 
+    @GraphComputingMetric(name = "/segment/parse/createSpanListeners")
     private void createSpanListeners() {
         listenerManager.getSpanListenerFactories().forEach(spanListenerFactory -> spanListeners.add(spanListenerFactory.create(moduleManager)));
     }
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParserListenerManager.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParserListenerManager.java
index 65b2bc3..20f738b 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParserListenerManager.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParserListenerManager.java
@@ -18,7 +18,7 @@
 
 package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser;
 
-import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.SpanListenerFactory;
 
@@ -30,14 +30,14 @@ public class SegmentParserListenerManager {
     private List<SpanListenerFactory> spanListenerFactories;
 
     public SegmentParserListenerManager() {
-        this.spanListenerFactories = new ArrayList<>();
+        this.spanListenerFactories = new LinkedList<>();
     }
 
     public void add(SpanListenerFactory spanListenerFactory) {
         spanListenerFactories.add(spanListenerFactory);
     }
 
-    public List<SpanListenerFactory> getSpanListenerFactories() {
+    List<SpanListenerFactory> getSpanListenerFactories() {
         return spanListenerFactories;
     }
 }
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
index e290774..806c2a5 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
 
-    private final Logger logger = LoggerFactory.getLogger(ReferenceIdExchanger.class);
+    private static final Logger logger = LoggerFactory.getLogger(ReferenceIdExchanger.class);
 
     private static ReferenceIdExchanger EXCHANGER;
     private final IServiceNameService serviceNameService;
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SegmentStandardizationWorker.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SegmentStandardizationWorker.java
index 518a904..67b6d08 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SegmentStandardizationWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SegmentStandardizationWorker.java
@@ -37,7 +37,7 @@ public class SegmentStandardizationWorker extends AbstractLocalAsyncWorker<Segme
 
     private static final Logger logger = LoggerFactory.getLogger(SegmentStandardizationWorker.class);
 
-    public SegmentStandardizationWorker(ModuleManager moduleManager) {
+    private SegmentStandardizationWorker(ModuleManager moduleManager) {
         super(moduleManager);
         SegmentBufferManager.INSTANCE.initialize(moduleManager);
     }
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
index 1b074f1..85c15eb 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
  */
 public class SpanIdExchanger implements IdExchanger<SpanDecorator> {
 
-    private final Logger logger = LoggerFactory.getLogger(SpanIdExchanger.class);
+    private static final Logger logger = LoggerFactory.getLogger(SpanIdExchanger.class);
 
     private static SpanIdExchanger EXCHANGER;
     private final IServiceNameService serviceNameService;
diff --git a/apm-collector/apm-collector-boot/src/main/java/org/apache/skywalking/apm/collector/boot/config/ApplicationConfigLoader.java b/apm-collector/apm-collector-boot/src/main/java/org/apache/skywalking/apm/collector/boot/config/ApplicationConfigLoader.java
index a6d6a18..479b10a 100644
--- a/apm-collector/apm-collector-boot/src/main/java/org/apache/skywalking/apm/collector/boot/config/ApplicationConfigLoader.java
+++ b/apm-collector/apm-collector-boot/src/main/java/org/apache/skywalking/apm/collector/boot/config/ApplicationConfigLoader.java
@@ -40,7 +40,7 @@ import org.yaml.snakeyaml.Yaml;
  */
 public class ApplicationConfigLoader implements ConfigLoader<ApplicationConfiguration> {
 
-    private final Logger logger = LoggerFactory.getLogger(ApplicationConfigLoader.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationConfigLoader.class);
 
     private final Yaml yaml = new Yaml();
 
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/standalone/ClusterModuleStandaloneProvider.java b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/standalone/ClusterModuleStandaloneProvider.java
index bbd6513..3745054 100644
--- a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/standalone/ClusterModuleStandaloneProvider.java
+++ b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/standalone/ClusterModuleStandaloneProvider.java
@@ -16,23 +16,22 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.cluster.standalone;
 
 import java.util.Properties;
 import org.apache.skywalking.apm.collector.client.h2.H2Client;
+import org.apache.skywalking.apm.collector.client.h2.H2ClientException;
 import org.apache.skywalking.apm.collector.cluster.ClusterModule;
+import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleRegisterService;
+import org.apache.skywalking.apm.collector.cluster.standalone.service.StandaloneModuleListenerService;
+import org.apache.skywalking.apm.collector.cluster.standalone.service.StandaloneModuleRegisterService;
 import org.apache.skywalking.apm.collector.core.CollectorException;
 import org.apache.skywalking.apm.collector.core.UnexpectedException;
+import org.apache.skywalking.apm.collector.core.module.Module;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
 import org.apache.skywalking.apm.collector.core.util.Const;
-import org.apache.skywalking.apm.collector.client.h2.H2ClientException;
-import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
-import org.apache.skywalking.apm.collector.cluster.standalone.service.StandaloneModuleListenerService;
-import org.apache.skywalking.apm.collector.cluster.standalone.service.StandaloneModuleRegisterService;
-import org.apache.skywalking.apm.collector.core.module.Module;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,7 +40,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ClusterModuleStandaloneProvider extends ModuleProvider {
 
-    private final Logger logger = LoggerFactory.getLogger(ClusterModuleStandaloneProvider.class);
+    private static final Logger logger = LoggerFactory.getLogger(ClusterModuleStandaloneProvider.class);
 
     private static final String URL = "url";
     private static final String USER_NAME = "user_name";
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataMonitor.java b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataMonitor.java
index b32bf8b..ef12fea 100644
--- a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataMonitor.java
+++ b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataMonitor.java
@@ -16,19 +16,18 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.cluster.standalone;
 
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import org.apache.skywalking.apm.collector.client.Client;
 import org.apache.skywalking.apm.collector.client.ClientException;
 import org.apache.skywalking.apm.collector.client.h2.H2Client;
 import org.apache.skywalking.apm.collector.cluster.ClusterModuleListener;
 import org.apache.skywalking.apm.collector.cluster.DataMonitor;
-import org.apache.skywalking.apm.collector.core.CollectorException;
-import org.apache.skywalking.apm.collector.client.Client;
 import org.apache.skywalking.apm.collector.cluster.ModuleRegistration;
+import org.apache.skywalking.apm.collector.core.CollectorException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,14 +36,14 @@ import org.slf4j.LoggerFactory;
  */
 public class ClusterStandaloneDataMonitor implements DataMonitor {
 
-    private final Logger logger = LoggerFactory.getLogger(ClusterStandaloneDataMonitor.class);
+    private static final Logger logger = LoggerFactory.getLogger(ClusterStandaloneDataMonitor.class);
 
     private H2Client client;
 
     private Map<String, ClusterModuleListener> listeners;
     private Map<String, ModuleRegistration> registrations;
 
-    public ClusterStandaloneDataMonitor() {
+    ClusterStandaloneDataMonitor() {
         listeners = new LinkedHashMap<>();
         registrations = new LinkedHashMap<>();
     }
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/apache/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/apache/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java
index d3a3a97..9e7b68e 100644
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/apache/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java
+++ b/apm-collector/apm-collector-component/client-component/src/main/java/org/apache/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ElasticSearchClient implements Client {
 
-    private final Logger logger = LoggerFactory.getLogger(ElasticSearchClient.class);
+    private static final Logger logger = LoggerFactory.getLogger(ElasticSearchClient.class);
 
     private org.elasticsearch.client.Client client;
 
@@ -75,16 +75,16 @@ public class ElasticSearchClient implements Client {
     @Override
     public void initialize() throws ClientException {
         Settings settings = Settings.builder()
-                .put("cluster.name", clusterName)
-                .put("client.transport.sniff", clusterTransportSniffer)
-                .build();
+            .put("cluster.name", clusterName)
+            .put("client.transport.sniff", clusterTransportSniffer)
+            .build();
 
         client = new PreBuiltTransportClient(settings);
 
         List<AddressPairs> pairsList = parseClusterNodes(clusterNodes);
         for (AddressPairs pairs : pairsList) {
             try {
-                ((PreBuiltTransportClient) client).addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(pairs.host), pairs.port));
+                ((PreBuiltTransportClient)client).addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(pairs.host), pairs.port));
             } catch (UnknownHostException e) {
                 throw new ElasticSearchClientException(e.getMessage(), e);
             }
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/apache/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/apache/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java
index 8db706d..b25aafb 100644
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/apache/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java
+++ b/apm-collector/apm-collector-component/client-component/src/main/java/org/apache/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java
@@ -16,18 +16,17 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.client.zookeeper;
 
 import java.io.IOException;
 import java.util.List;
+import org.apache.skywalking.apm.collector.client.Client;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
-import org.apache.skywalking.apm.collector.client.Client;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,7 +35,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ZookeeperClient implements Client {
 
-    private final Logger logger = LoggerFactory.getLogger(ZookeeperClient.class);
+    private static final Logger logger = LoggerFactory.getLogger(ZookeeperClient.class);
 
     private ZooKeeper zk;
 
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/grpc/GRPCServer.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/grpc/GRPCServer.java
index bc1958a..7d6cc2e 100644
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/grpc/GRPCServer.java
+++ b/apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/grpc/GRPCServer.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.server.grpc;
 
 import io.grpc.BindableService;
@@ -25,22 +24,21 @@ import io.grpc.netty.GrpcSslContexts;
 import io.grpc.netty.NettyServerBuilder;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.SslProvider;
-import org.apache.skywalking.apm.collector.server.Server;
-import org.apache.skywalking.apm.collector.server.ServerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.Objects;
+import org.apache.skywalking.apm.collector.server.Server;
+import org.apache.skywalking.apm.collector.server.ServerException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author peng-yongsheng, wusheng
  */
 public class GRPCServer implements Server {
 
-    private final Logger logger = LoggerFactory.getLogger(GRPCServer.class);
+    private static final Logger logger = LoggerFactory.getLogger(GRPCServer.class);
 
     private final String host;
     private final int port;
@@ -60,7 +58,7 @@ public class GRPCServer implements Server {
      *
      * @param host
      * @param port
-     * @param certChainFile  `server.crt` file
+     * @param certChainFile `server.crt` file
      * @param privateKeyFile `server.pem` file
      */
     public GRPCServer(String host, int port, File certChainFile, File privateKeyFile) {
@@ -69,7 +67,7 @@ public class GRPCServer implements Server {
         this.certChainFile = certChainFile;
         this.privateKeyFile = privateKeyFile;
         this.sslContextBuilder = SslContextBuilder.forServer(certChainFile,
-                privateKeyFile);
+            privateKeyFile);
     }
 
     @Override
@@ -94,8 +92,8 @@ public class GRPCServer implements Server {
         try {
             if (sslContextBuilder != null) {
                 nettyServerBuilder = nettyServerBuilder.sslContext(
-                        GrpcSslContexts.configure(sslContextBuilder,
-                                SslProvider.OPENSSL).build());
+                    GrpcSslContexts.configure(sslContextBuilder,
+                        SslProvider.OPENSSL).build());
             }
             server = nettyServerBuilder.build();
             server.start();
@@ -112,7 +110,6 @@ public class GRPCServer implements Server {
         nettyServerBuilder.addService(definition);
     }
 
-
     @Override
     public boolean isSSLOpen() {
         return sslContextBuilder == null;
@@ -120,12 +117,14 @@ public class GRPCServer implements Server {
 
     @Override
     public boolean isStatusEqual(Server target) {
-        if (this == target) return true;
-        if (target == null || getClass() != target.getClass()) return false;
-        GRPCServer that = (GRPCServer) target;
+        if (this == target)
+            return true;
+        if (target == null || getClass() != target.getClass())
+            return false;
+        GRPCServer that = (GRPCServer)target;
         return port == that.port &&
-                Objects.equals(host, that.host) &&
-                Objects.equals(certChainFile, that.certChainFile) &&
-                Objects.equals(privateKeyFile, that.privateKeyFile);
+            Objects.equals(host, that.host) &&
+            Objects.equals(certChainFile, that.certChainFile) &&
+            Objects.equals(privateKeyFile, that.privateKeyFile);
     }
 }
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/jetty/JettyHandler.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/jetty/JettyHandler.java
index 15520fc..cfef010 100644
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/jetty/JettyHandler.java
+++ b/apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/jetty/JettyHandler.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
  */
 public abstract class JettyHandler extends HttpServlet implements ServerHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(JettyHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(JettyHandler.class);
 
     public abstract String pathSpec();
 
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/jetty/JettyServer.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/jetty/JettyServer.java
index 5925264..dd9e596 100644
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/jetty/JettyServer.java
+++ b/apm-collector/apm-collector-component/server-component/src/main/java/org/apache/skywalking/apm/collector/server/jetty/JettyServer.java
@@ -16,9 +16,10 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.server.jetty;
 
+import java.net.InetSocketAddress;
+import java.util.Objects;
 import org.apache.skywalking.apm.collector.server.Server;
 import org.apache.skywalking.apm.collector.server.ServerException;
 import org.eclipse.jetty.servlet.ServletContextHandler;
@@ -27,15 +28,12 @@ import org.eclipse.jetty.servlet.ServletMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.InetSocketAddress;
-import java.util.Objects;
-
 /**
  * @author peng-yongsheng, wusheng
  */
 public class JettyServer implements Server {
 
-    private final Logger logger = LoggerFactory.getLogger(JettyServer.class);
+    private static final Logger logger = LoggerFactory.getLogger(JettyServer.class);
 
     private final String host;
     private final int port;
@@ -101,11 +99,13 @@ public class JettyServer implements Server {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        JettyServer that = (JettyServer) o;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        JettyServer that = (JettyServer)o;
         return port == that.port &&
-                Objects.equals(host, that.host);
+            Objects.equals(host, that.host);
     }
 
     @Override
diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/data/StorageDefineLoader.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/data/StorageDefineLoader.java
index 0fad3df..1d95620 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/data/StorageDefineLoader.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/data/StorageDefineLoader.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.core.data;
 
 import java.util.LinkedList;
@@ -32,7 +31,7 @@ import org.slf4j.LoggerFactory;
  */
 public class StorageDefineLoader implements Loader<List<TableDefine>> {
 
-    private final Logger logger = LoggerFactory.getLogger(StorageDefineLoader.class);
+    private static final Logger logger = LoggerFactory.getLogger(StorageDefineLoader.class);
 
     @Override public List<TableDefine> load() throws DefineException {
         List<TableDefine> tableDefines = new LinkedList<>();
diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/define/DefinitionLoader.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/define/DefinitionLoader.java
index 2ae5af5..bd3d0e2 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/define/DefinitionLoader.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/define/DefinitionLoader.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.core.define;
 
 import java.io.BufferedReader;
@@ -37,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class DefinitionLoader<D> implements Iterable<D> {
 
-    private final Logger logger = LoggerFactory.getLogger(DefinitionLoader.class);
+    private static final Logger logger = LoggerFactory.getLogger(DefinitionLoader.class);
 
     private final Class<D> definition;
     private final DefinitionFile definitionFile;
diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/BootstrapFlow.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/BootstrapFlow.java
index 1f5ce19..e4eaf24 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/BootstrapFlow.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/BootstrapFlow.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
  * @author wu-sheng
  */
 public class BootstrapFlow {
-    private final Logger logger = LoggerFactory.getLogger(BootstrapFlow.class);
+    private static final Logger logger = LoggerFactory.getLogger(BootstrapFlow.class);
 
     private Map<String, Module> loadedModules;
     private ApplicationConfiguration applicationConfiguration;
diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/FileUtils.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/FileUtils.java
index 6036b7f..3a75fd8 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/FileUtils.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/FileUtils.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.core.util;
 
 import java.io.File;
@@ -32,7 +31,7 @@ import org.slf4j.LoggerFactory;
 public enum FileUtils {
     INSTANCE;
 
-    private final Logger logger = LoggerFactory.getLogger(FileUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(FileUtils.class);
 
     public String readLastLine(File file) {
         RandomAccessFile randomAccessFile = null;
diff --git a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/GRPCManagerProvider.java b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/GRPCManagerProvider.java
index f7eba98..f9a857d 100644
--- a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/GRPCManagerProvider.java
+++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/GRPCManagerProvider.java
@@ -16,19 +16,18 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.grpc.manager;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
-import org.apache.skywalking.apm.collector.server.grpc.GRPCServer;
 import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
 import org.apache.skywalking.apm.collector.grpc.manager.service.GRPCManagerService;
 import org.apache.skywalking.apm.collector.grpc.manager.service.GRPCManagerServiceImpl;
 import org.apache.skywalking.apm.collector.server.ServerException;
+import org.apache.skywalking.apm.collector.server.grpc.GRPCServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class GRPCManagerProvider extends ModuleProvider {
 
-    private final Logger logger = LoggerFactory.getLogger(GRPCManagerProvider.class);
+    private static final Logger logger = LoggerFactory.getLogger(GRPCManagerProvider.class);
 
     private Map<String, GRPCServer> servers = new HashMap<>();
 
diff --git a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/service/GRPCManagerServiceImpl.java b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/service/GRPCManagerServiceImpl.java
index e65f4a1..9e53ef3 100644
--- a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/service/GRPCManagerServiceImpl.java
+++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/service/GRPCManagerServiceImpl.java
@@ -16,23 +16,21 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.grpc.manager.service;
 
+import java.io.File;
+import java.util.Map;
 import org.apache.skywalking.apm.collector.server.ServerException;
 import org.apache.skywalking.apm.collector.server.grpc.GRPCServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.util.Map;
-
 /**
  * @author peng-yongsheng
  */
 public class GRPCManagerServiceImpl implements GRPCManagerService {
 
-    private final Logger logger = LoggerFactory.getLogger(GRPCManagerServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(GRPCManagerServiceImpl.class);
 
     private final Map<String, GRPCServer> servers;
 
@@ -46,11 +44,13 @@ public class GRPCManagerServiceImpl implements GRPCManagerService {
     }
 
     @Override
-    public GRPCServer createIfAbsent(String host, int port, File certChainFile, File privateKeyFile) throws ServerCanNotBeCreatedException {
+    public GRPCServer createIfAbsent(String host, int port, File certChainFile,
+        File privateKeyFile) throws ServerCanNotBeCreatedException {
         return createOrChooseServer(host, port, new GRPCServer(host, port, certChainFile, privateKeyFile));
     }
 
-    private GRPCServer createOrChooseServer(String host, int port, GRPCServer newServer) throws ServerCanNotBeCreatedException {
+    private GRPCServer createOrChooseServer(String host, int port,
+        GRPCServer newServer) throws ServerCanNotBeCreatedException {
         String id = host + String.valueOf(port);
         GRPCServer existServer = servers.get(id);
         if (existServer != null) {
diff --git a/apm-collector/apm-collector-instrument/src/main/java/org/apache/skywalking/apm/collector/instrument/MetricTree.java b/apm-collector/apm-collector-instrument/src/main/java/org/apache/skywalking/apm/collector/instrument/MetricTree.java
index 7f03eab..63e2e6d 100644
--- a/apm-collector/apm-collector-instrument/src/main/java/org/apache/skywalking/apm/collector/instrument/MetricTree.java
+++ b/apm-collector/apm-collector-instrument/src/main/java/org/apache/skywalking/apm/collector/instrument/MetricTree.java
@@ -34,7 +34,8 @@ import org.slf4j.LoggerFactory;
  */
 public enum MetricTree implements Runnable {
     INSTANCE;
-    private final Logger logger = LoggerFactory.getLogger(MetricTree.class);
+
+    private static final Logger logger = LoggerFactory.getLogger(MetricTree.class);
 
     private List<MetricNode> metrics = new LinkedList<>();
     private String lineSeparator = System.getProperty("line.separator");
diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/JettyManagerProvider.java b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/JettyManagerProvider.java
index 7380aa2..ead3b4c 100644
--- a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/JettyManagerProvider.java
+++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/JettyManagerProvider.java
@@ -16,19 +16,18 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.jetty.manager;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-import org.apache.skywalking.apm.collector.server.jetty.JettyServer;
 import org.apache.skywalking.apm.collector.core.module.Module;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
 import org.apache.skywalking.apm.collector.jetty.manager.service.JettyManagerService;
 import org.apache.skywalking.apm.collector.jetty.manager.service.JettyManagerServiceImpl;
 import org.apache.skywalking.apm.collector.server.ServerException;
+import org.apache.skywalking.apm.collector.server.jetty.JettyServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class JettyManagerProvider extends ModuleProvider {
 
-    private final Logger logger = LoggerFactory.getLogger(JettyManagerProvider.class);
+    private static final Logger logger = LoggerFactory.getLogger(JettyManagerProvider.class);
 
     private Map<String, JettyServer> servers = new HashMap<>();
 
diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl.java b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl.java
index 8a0de70..454d51c 100644
--- a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl.java
+++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl.java
@@ -16,9 +16,9 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.jetty.manager.service;
 
+import java.util.Map;
 import org.apache.skywalking.apm.collector.core.UnexpectedException;
 import org.apache.skywalking.apm.collector.server.ServerException;
 import org.apache.skywalking.apm.collector.server.jetty.JettyHandler;
@@ -26,14 +26,12 @@ import org.apache.skywalking.apm.collector.server.jetty.JettyServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Map;
-
 /**
  * @author peng-yongsheng
  */
 public class JettyManagerServiceImpl implements JettyManagerService {
 
-    private final Logger logger = LoggerFactory.getLogger(JettyManagerServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(JettyManagerServiceImpl.class);
 
     private final Map<String, JettyServer> servers;
 
diff --git a/apm-collector/apm-collector-naming/collector-naming-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/naming/jetty/service/NamingJettyHandlerRegisterService.java b/apm-collector/apm-collector-naming/collector-naming-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/naming/jetty/service/NamingJettyHandlerRegisterService.java
index 0be9c60..0c7157c 100644
--- a/apm-collector/apm-collector-naming/collector-naming-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/naming/jetty/service/NamingJettyHandlerRegisterService.java
+++ b/apm-collector/apm-collector-naming/collector-naming-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/naming/jetty/service/NamingJettyHandlerRegisterService.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.naming.jetty.service;
 
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
@@ -33,7 +32,7 @@ import org.slf4j.LoggerFactory;
  */
 public class NamingJettyHandlerRegisterService implements NamingHandlerRegisterService {
 
-    private final Logger logger = LoggerFactory.getLogger(NamingJettyHandlerRegisterService.class);
+    private static final Logger logger = LoggerFactory.getLogger(NamingJettyHandlerRegisterService.class);
 
     private final ModuleManager moduleManager;
     private final String host;
diff --git a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/apache/skywalking/apm/collector/remote/service/CommonRemoteDataRegisterService.java b/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/apache/skywalking/apm/collector/remote/service/CommonRemoteDataRegisterService.java
index e1df664..8f60ffc 100644
--- a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/apache/skywalking/apm/collector/remote/service/CommonRemoteDataRegisterService.java
+++ b/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/apache/skywalking/apm/collector/remote/service/CommonRemoteDataRegisterService.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
  */
 public class CommonRemoteDataRegisterService implements RemoteDataRegisterService, RemoteDataIDGetter, RemoteDataInstanceCreatorGetter {
 
-    private final Logger logger = LoggerFactory.getLogger(CommonRemoteDataRegisterService.class);
+    private static final Logger logger = LoggerFactory.getLogger(CommonRemoteDataRegisterService.class);
 
     private Integer id;
     private final Map<Class<? extends RemoteData>, Integer> dataClassMapping;
diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/handler/RemoteCommonServiceHandler.java b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/handler/RemoteCommonServiceHandler.java
index a2de37d..876bb5f 100644
--- a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/handler/RemoteCommonServiceHandler.java
+++ b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/handler/RemoteCommonServiceHandler.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
  */
 public class RemoteCommonServiceHandler extends RemoteCommonServiceGrpc.RemoteCommonServiceImplBase implements GRPCHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(RemoteCommonServiceHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(RemoteCommonServiceHandler.class);
 
     private final RemoteDataInstanceCreatorGetter instanceCreatorGetter;
     private final GRPCRemoteDeserializeService service;
diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/service/GRPCRemoteClient.java b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/service/GRPCRemoteClient.java
index eda7078..dcb2a13 100644
--- a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/service/GRPCRemoteClient.java
+++ b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/service/GRPCRemoteClient.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  */
 public class GRPCRemoteClient implements RemoteClient {
 
-    private final Logger logger = LoggerFactory.getLogger(GRPCRemoteClient.class);
+    private static final Logger logger = LoggerFactory.getLogger(GRPCRemoteClient.class);
 
     private final GRPCRemoteSerializeService service;
     private final GRPCClient client;
diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/service/GRPCRemoteClientService.java b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/service/GRPCRemoteClientService.java
index 3e36a0e..577c301 100644
--- a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/service/GRPCRemoteClientService.java
+++ b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/service/GRPCRemoteClientService.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
  */
 public class GRPCRemoteClientService implements RemoteClientService {
 
-    private final Logger logger = LoggerFactory.getLogger(GRPCRemoteClientService.class);
+    private static final Logger logger = LoggerFactory.getLogger(GRPCRemoteClientService.class);
 
     private final RemoteDataIDGetter remoteDataIDGetter;
 
diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/service/selector/ForeverFirstSelector.java b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/service/selector/ForeverFirstSelector.java
index 0820d5b..98460f9 100644
--- a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/service/selector/ForeverFirstSelector.java
+++ b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/service/selector/ForeverFirstSelector.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ForeverFirstSelector implements RemoteClientSelector {
 
-    private final Logger logger = LoggerFactory.getLogger(ForeverFirstSelector.class);
+    private static final Logger logger = LoggerFactory.getLogger(ForeverFirstSelector.class);
 
     @Override public RemoteClient select(List<RemoteClient> clients, RemoteData remoteData) {
         logger.debug("clients size: {}", clients.size());
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/DataTTLKeeperTimer.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/DataTTLKeeperTimer.java
index d95e25a..e31a1e7 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/DataTTLKeeperTimer.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/DataTTLKeeperTimer.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
  * @author peng-yongsheng
  */
 public class DataTTLKeeperTimer {
-    private final Logger logger = LoggerFactory.getLogger(StorageModuleEsProvider.class);
+    private static final Logger logger = LoggerFactory.getLogger(StorageModuleEsProvider.class);
 
     private final ModuleManager moduleManager;
     private final StorageModuleEsNamingListener namingListener;
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java
index fb371ae..e3528ea 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java
@@ -18,6 +18,8 @@
 
 package org.apache.skywalking.apm.collector.storage.es;
 
+import java.util.Properties;
+import java.util.UUID;
 import org.apache.skywalking.apm.collector.client.ClientException;
 import org.apache.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient;
 import org.apache.skywalking.apm.collector.cluster.ClusterModule;
@@ -39,7 +41,21 @@ import org.apache.skywalking.apm.collector.storage.dao.acp.IApplicationComponent
 import org.apache.skywalking.apm.collector.storage.dao.acp.IApplicationComponentHourPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.acp.IApplicationComponentMinutePersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.acp.IApplicationComponentMonthPersistenceDAO;
-import org.apache.skywalking.apm.collector.storage.dao.alarm.*;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IApplicationAlarmListDayPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IApplicationAlarmListHourPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IApplicationAlarmListMinutePersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IApplicationAlarmListMonthPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IApplicationAlarmPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IApplicationReferenceAlarmListPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IApplicationReferenceAlarmPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IInstanceAlarmListPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IInstanceAlarmPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IInstanceReferenceAlarmListPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IInstanceReferenceAlarmPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IServiceAlarmListPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IServiceAlarmPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IServiceReferenceAlarmListPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.alarm.IServiceReferenceAlarmPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.amp.IApplicationDayMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.amp.IApplicationHourMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.amp.IApplicationMinuteMetricPersistenceDAO;
@@ -56,8 +72,16 @@ import org.apache.skywalking.apm.collector.storage.dao.cache.IApplicationCacheDA
 import org.apache.skywalking.apm.collector.storage.dao.cache.IInstanceCacheDAO;
 import org.apache.skywalking.apm.collector.storage.dao.cache.INetworkAddressCacheDAO;
 import org.apache.skywalking.apm.collector.storage.dao.cache.IServiceNameCacheDAO;
-import org.apache.skywalking.apm.collector.storage.dao.cpu.*;
-import org.apache.skywalking.apm.collector.storage.dao.gc.*;
+import org.apache.skywalking.apm.collector.storage.dao.cpu.ICpuDayMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.cpu.ICpuHourMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.cpu.ICpuMinuteMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.cpu.ICpuMonthMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.cpu.ICpuSecondMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.gc.IGCDayMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.gc.IGCHourMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.gc.IGCMinuteMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.gc.IGCMonthMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.gc.IGCSecondMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.imp.IInstanceDayMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.imp.IInstanceHourMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.imp.IInstanceMinuteMetricPersistenceDAO;
@@ -70,8 +94,16 @@ import org.apache.skywalking.apm.collector.storage.dao.irmp.IInstanceReferenceDa
 import org.apache.skywalking.apm.collector.storage.dao.irmp.IInstanceReferenceHourMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.irmp.IInstanceReferenceMinuteMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.irmp.IInstanceReferenceMonthMetricPersistenceDAO;
-import org.apache.skywalking.apm.collector.storage.dao.memory.*;
-import org.apache.skywalking.apm.collector.storage.dao.mpool.*;
+import org.apache.skywalking.apm.collector.storage.dao.memory.IMemoryDayMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.memory.IMemoryHourMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.memory.IMemoryMinuteMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.memory.IMemoryMonthMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.memory.IMemorySecondMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.mpool.IMemoryPoolDayMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.mpool.IMemoryPoolHourMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.mpool.IMemoryPoolMinuteMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.mpool.IMemoryPoolMonthMetricPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.dao.mpool.IMemoryPoolSecondMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.register.IApplicationRegisterDAO;
 import org.apache.skywalking.apm.collector.storage.dao.register.IInstanceRegisterDAO;
 import org.apache.skywalking.apm.collector.storage.dao.register.INetworkAddressRegisterDAO;
@@ -84,7 +116,27 @@ import org.apache.skywalking.apm.collector.storage.dao.srmp.IServiceReferenceDay
 import org.apache.skywalking.apm.collector.storage.dao.srmp.IServiceReferenceHourMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.srmp.IServiceReferenceMinuteMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.srmp.IServiceReferenceMonthMetricPersistenceDAO;
-import org.apache.skywalking.apm.collector.storage.dao.ui.*;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationAlarmListUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationAlarmUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationComponentUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationMappingUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationMetricUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IApplicationReferenceMetricUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.ICpuMetricUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IGCMetricUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IGlobalTraceUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IInstanceAlarmUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IInstanceMetricUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IInstanceUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IMemoryMetricUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IMemoryPoolMetricUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.INetworkAddressUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.ISegmentDurationUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.ISegmentUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IServiceAlarmUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IServiceMetricUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IServiceNameServiceUIDAO;
+import org.apache.skywalking.apm.collector.storage.dao.ui.IServiceReferenceMetricUIDAO;
 import org.apache.skywalking.apm.collector.storage.es.base.dao.BatchEsDAO;
 import org.apache.skywalking.apm.collector.storage.es.base.define.ElasticSearchStorageInstaller;
 import org.apache.skywalking.apm.collector.storage.es.dao.GlobalTraceEsPersistenceDAO;
@@ -95,7 +147,21 @@ import org.apache.skywalking.apm.collector.storage.es.dao.acp.ApplicationCompone
 import org.apache.skywalking.apm.collector.storage.es.dao.acp.ApplicationComponentHourEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.acp.ApplicationComponentMinuteEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.acp.ApplicationComponentMonthEsPersistenceDAO;
-import org.apache.skywalking.apm.collector.storage.es.dao.alarm.*;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.ApplicationAlarmEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.ApplicationAlarmListEsDayPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.ApplicationAlarmListEsHourPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.ApplicationAlarmListEsMinutePersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.ApplicationAlarmListEsMonthPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.ApplicationReferenceAlarmEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.ApplicationReferenceAlarmListEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.InstanceAlarmEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.InstanceAlarmListEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.InstanceReferenceAlarmEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.InstanceReferenceAlarmListEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.ServiceAlarmEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.ServiceAlarmListEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.ServiceReferenceAlarmEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.alarm.ServiceReferenceAlarmListEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.amp.ApplicationDayMetricEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.amp.ApplicationHourMetricEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.amp.ApplicationMinuteMetricEsPersistenceDAO;
@@ -112,8 +178,16 @@ import org.apache.skywalking.apm.collector.storage.es.dao.cache.ApplicationEsCac
 import org.apache.skywalking.apm.collector.storage.es.dao.cache.InstanceEsCacheDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.cache.NetworkAddressEsCacheDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.cache.ServiceNameEsCacheDAO;
-import org.apache.skywalking.apm.collector.storage.es.dao.cpu.*;
-import org.apache.skywalking.apm.collector.storage.es.dao.gc.*;
+import org.apache.skywalking.apm.collector.storage.es.dao.cpu.CpuDayMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.cpu.CpuHourMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.cpu.CpuMinuteMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.cpu.CpuMonthMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.cpu.CpuSecondMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.gc.GCDayMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.gc.GCHourMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.gc.GCMinuteMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.gc.GCMonthMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.gc.GCSecondMetricEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.imp.InstanceDayMetricEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.imp.InstanceHourMetricEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.imp.InstanceMinuteMetricEsPersistenceDAO;
@@ -126,8 +200,16 @@ import org.apache.skywalking.apm.collector.storage.es.dao.irmp.InstanceReference
 import org.apache.skywalking.apm.collector.storage.es.dao.irmp.InstanceReferenceHourMetricEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.irmp.InstanceReferenceMinuteMetricEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.irmp.InstanceReferenceMonthMetricEsPersistenceDAO;
-import org.apache.skywalking.apm.collector.storage.es.dao.memory.*;
-import org.apache.skywalking.apm.collector.storage.es.dao.mpool.*;
+import org.apache.skywalking.apm.collector.storage.es.dao.memory.MemoryDayMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.memory.MemoryHourMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.memory.MemoryMinuteMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.memory.MemoryMonthMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.memory.MemorySecondMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.mpool.MemoryPoolDayMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.mpool.MemoryPoolHourMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.mpool.MemoryPoolMinuteMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.mpool.MemoryPoolMonthMetricEsPersistenceDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.mpool.MemoryPoolSecondMetricEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.register.ApplicationRegisterEsDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.register.InstanceRegisterEsDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.register.NetworkAddressRegisterEsDAO;
@@ -140,19 +222,36 @@ import org.apache.skywalking.apm.collector.storage.es.dao.srmp.ServiceReferenceD
 import org.apache.skywalking.apm.collector.storage.es.dao.srmp.ServiceReferenceHourMetricEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.srmp.ServiceReferenceMinuteMetricEsPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.es.dao.srmp.ServiceReferenceMonthMetricEsPersistenceDAO;
-import org.apache.skywalking.apm.collector.storage.es.dao.ui.*;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.ApplicationAlarmEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.ApplicationAlarmListEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.ApplicationComponentEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.ApplicationMappingEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.ApplicationMetricEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.ApplicationReferenceMetricEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.CpuMetricEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.GCMetricEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.GlobalTraceEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.InstanceAlarmEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.InstanceEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.InstanceMetricEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.MemoryMetricEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.MemoryPoolMetricEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.NetworkAddressEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.SegmentDurationEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.SegmentEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.ServiceAlarmEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.ServiceMetricEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.ServiceNameServiceEsUIDAO;
+import org.apache.skywalking.apm.collector.storage.es.dao.ui.ServiceReferenceEsMetricUIDAO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Properties;
-import java.util.UUID;
-
 /**
  * @author peng-yongsheng
  */
 public class StorageModuleEsProvider extends ModuleProvider {
 
-    private final Logger logger = LoggerFactory.getLogger(StorageModuleEsProvider.class);
+    private static final Logger logger = LoggerFactory.getLogger(StorageModuleEsProvider.class);
 
     static final String NAME = "elasticsearch";
     private static final String CLUSTER_NAME = "cluster_name";
@@ -178,7 +277,7 @@ public class StorageModuleEsProvider extends ModuleProvider {
     @Override
     public void prepare(Properties config) throws ServiceNotProvidedException {
         String clusterName = config.getProperty(CLUSTER_NAME);
-        Boolean clusterTransportSniffer = (Boolean) config.get(CLUSTER_TRANSPORT_SNIFFER);
+        Boolean clusterTransportSniffer = (Boolean)config.get(CLUSTER_TRANSPORT_SNIFFER);
         String clusterNodes = config.getProperty(CLUSTER_NODES);
         elasticSearchClient = new ElasticSearchClient(clusterName, clusterTransportSniffer, clusterNodes);
 
@@ -192,8 +291,8 @@ public class StorageModuleEsProvider extends ModuleProvider {
 
     @Override
     public void start(Properties config) throws ServiceNotProvidedException {
-        Integer indexShardsNumber = (Integer) config.get(INDEX_SHARDS_NUMBER);
-        Integer indexReplicasNumber = (Integer) config.get(INDEX_REPLICAS_NUMBER);
+        Integer indexShardsNumber = (Integer)config.get(INDEX_SHARDS_NUMBER);
+        Integer indexReplicasNumber = (Integer)config.get(INDEX_REPLICAS_NUMBER);
         try {
             String namespace = getManager().find(ConfigurationModule.NAME).getService(ICollectorConfig.class).getNamespace();
             elasticSearchClient.setNamespace(namespace);
@@ -214,7 +313,7 @@ public class StorageModuleEsProvider extends ModuleProvider {
         ModuleListenerService moduleListenerService = getManager().find(ClusterModule.NAME).getService(ModuleListenerService.class);
         moduleListenerService.addListener(namingListener);
 
-        Integer beforeDay = (Integer) config.getOrDefault(TIME_TO_LIVE_OF_DATA, 3);
+        Integer beforeDay = (Integer)config.getOrDefault(TIME_TO_LIVE_OF_DATA, 3);
         deleteTimer = new DataTTLKeeperTimer(getManager(), namingListener, uuId + 0, beforeDay);
     }
 
@@ -225,7 +324,7 @@ public class StorageModuleEsProvider extends ModuleProvider {
 
     @Override
     public String[] requiredModules() {
-        return new String[]{ClusterModule.NAME, ConfigurationModule.NAME};
+        return new String[] {ClusterModule.NAME, ConfigurationModule.NAME};
     }
 
     private void registerCacheDAO() throws ServiceNotProvidedException {
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/InstanceHeartBeatEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/InstanceHeartBeatEsPersistenceDAO.java
index 5aaf8c2..02bac7a 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/InstanceHeartBeatEsPersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/InstanceHeartBeatEsPersistenceDAO.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceHeartBeatEsPersistenceDAO extends EsDAO implements IInstanceHeartBeatPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder, Instance> {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceHeartBeatEsPersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceHeartBeatEsPersistenceDAO.class);
 
     public InstanceHeartBeatEsPersistenceDAO(ElasticSearchClient client) {
         super(client);
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/SegmentEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/SegmentEsPersistenceDAO.java
index 31cda7e..e17efac 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/SegmentEsPersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/SegmentEsPersistenceDAO.java
@@ -21,7 +21,6 @@ package org.apache.skywalking.apm.collector.storage.es.dao;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient;
 import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils;
 import org.apache.skywalking.apm.collector.storage.dao.ISegmentPersistenceDAO;
@@ -40,7 +39,7 @@ import org.slf4j.LoggerFactory;
  */
 public class SegmentEsPersistenceDAO extends EsDAO implements ISegmentPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder, Segment> {
 
-    private final Logger logger = LoggerFactory.getLogger(SegmentEsPersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(SegmentEsPersistenceDAO.class);
 
     public SegmentEsPersistenceDAO(ElasticSearchClient client) {
         super(client);
@@ -70,9 +69,9 @@ public class SegmentEsPersistenceDAO extends EsDAO implements ISegmentPersistenc
         long startTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(startTimestamp);
         long endTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(endTimestamp);
         BulkByScrollResponse response = getClient().prepareDelete(
-                QueryBuilders.rangeQuery(SegmentTable.COLUMN_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
-                SegmentTable.TABLE)
-                .get();
+            QueryBuilders.rangeQuery(SegmentTable.COLUMN_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
+            SegmentTable.TABLE)
+            .get();
 
         long deleted = response.getDeleted();
         logger.info("Delete {} rows history from {} index.", deleted, SegmentTable.TABLE);
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationReferenceAlarmListEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationReferenceAlarmListEsPersistenceDAO.java
index 062c794..ca28dfa 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationReferenceAlarmListEsPersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationReferenceAlarmListEsPersistenceDAO.java
@@ -20,7 +20,6 @@ package org.apache.skywalking.apm.collector.storage.es.dao.alarm;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient;
 import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils;
 import org.apache.skywalking.apm.collector.storage.dao.alarm.IApplicationReferenceAlarmListPersistenceDAO;
@@ -40,7 +39,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ApplicationReferenceAlarmListEsPersistenceDAO extends EsDAO implements IApplicationReferenceAlarmListPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder, ApplicationReferenceAlarmList> {
 
-    private final Logger logger = LoggerFactory.getLogger(ApplicationReferenceAlarmListEsPersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationReferenceAlarmListEsPersistenceDAO.class);
 
     public ApplicationReferenceAlarmListEsPersistenceDAO(ElasticSearchClient client) {
         super(client);
@@ -53,14 +52,14 @@ public class ApplicationReferenceAlarmListEsPersistenceDAO extends EsDAO impleme
             ApplicationReferenceAlarmList applicationReferenceAlarmList = new ApplicationReferenceAlarmList();
             applicationReferenceAlarmList.setId(id);
             Map<String, Object> source = getResponse.getSource();
-            applicationReferenceAlarmList.setFrontApplicationId(((Number) source.get(ApplicationReferenceAlarmListTable.COLUMN_FRONT_APPLICATION_ID)).intValue());
-            applicationReferenceAlarmList.setBehindApplicationId(((Number) source.get(ApplicationReferenceAlarmListTable.COLUMN_BEHIND_APPLICATION_ID)).intValue());
-            applicationReferenceAlarmList.setSourceValue(((Number) source.get(ApplicationReferenceAlarmListTable.COLUMN_SOURCE_VALUE)).intValue());
+            applicationReferenceAlarmList.setFrontApplicationId(((Number)source.get(ApplicationReferenceAlarmListTable.COLUMN_FRONT_APPLICATION_ID)).intValue());
+            applicationReferenceAlarmList.setBehindApplicationId(((Number)source.get(ApplicationReferenceAlarmListTable.COLUMN_BEHIND_APPLICATION_ID)).intValue());
+            applicationReferenceAlarmList.setSourceValue(((Number)source.get(ApplicationReferenceAlarmListTable.COLUMN_SOURCE_VALUE)).intValue());
 
-            applicationReferenceAlarmList.setAlarmType(((Number) source.get(ApplicationReferenceAlarmListTable.COLUMN_ALARM_TYPE)).intValue());
-            applicationReferenceAlarmList.setAlarmContent((String) source.get(ApplicationReferenceAlarmListTable.COLUMN_ALARM_CONTENT));
+            applicationReferenceAlarmList.setAlarmType(((Number)source.get(ApplicationReferenceAlarmListTable.COLUMN_ALARM_TYPE)).intValue());
+            applicationReferenceAlarmList.setAlarmContent((String)source.get(ApplicationReferenceAlarmListTable.COLUMN_ALARM_CONTENT));
 
-            applicationReferenceAlarmList.setTimeBucket(((Number) source.get(ApplicationReferenceAlarmListTable.COLUMN_TIME_BUCKET)).longValue());
+            applicationReferenceAlarmList.setTimeBucket(((Number)source.get(ApplicationReferenceAlarmListTable.COLUMN_TIME_BUCKET)).longValue());
             return applicationReferenceAlarmList;
         } else {
             return null;
@@ -102,9 +101,9 @@ public class ApplicationReferenceAlarmListEsPersistenceDAO extends EsDAO impleme
         long startTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(startTimestamp);
         long endTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(endTimestamp);
         BulkByScrollResponse response = getClient().prepareDelete(
-                QueryBuilders.rangeQuery(ApplicationReferenceAlarmListTable.COLUMN_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
-                ApplicationReferenceAlarmListTable.TABLE)
-                .get();
+            QueryBuilders.rangeQuery(ApplicationReferenceAlarmListTable.COLUMN_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
+            ApplicationReferenceAlarmListTable.TABLE)
+            .get();
 
         long deleted = response.getDeleted();
         logger.info("Delete {} rows history from {} index.", deleted, ApplicationReferenceAlarmListTable.TABLE);
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/InstanceAlarmEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/InstanceAlarmEsPersistenceDAO.java
index cec07f4..af5c056 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/InstanceAlarmEsPersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/InstanceAlarmEsPersistenceDAO.java
@@ -20,7 +20,6 @@ package org.apache.skywalking.apm.collector.storage.es.dao.alarm;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient;
 import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils;
 import org.apache.skywalking.apm.collector.storage.dao.alarm.IInstanceAlarmPersistenceDAO;
@@ -40,7 +39,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceAlarmEsPersistenceDAO extends EsDAO implements IInstanceAlarmPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder, InstanceAlarm> {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceAlarmEsPersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceAlarmEsPersistenceDAO.class);
 
     public InstanceAlarmEsPersistenceDAO(ElasticSearchClient client) {
         super(client);
@@ -53,14 +52,14 @@ public class InstanceAlarmEsPersistenceDAO extends EsDAO implements IInstanceAla
             InstanceAlarm instanceAlarm = new InstanceAlarm();
             instanceAlarm.setId(id);
             Map<String, Object> source = getResponse.getSource();
-            instanceAlarm.setApplicationId(((Number) source.get(InstanceAlarmTable.COLUMN_APPLICATION_ID)).intValue());
-            instanceAlarm.setInstanceId(((Number) source.get(InstanceAlarmTable.COLUMN_INSTANCE_ID)).intValue());
-            instanceAlarm.setSourceValue(((Number) source.get(InstanceAlarmTable.COLUMN_SOURCE_VALUE)).intValue());
+            instanceAlarm.setApplicationId(((Number)source.get(InstanceAlarmTable.COLUMN_APPLICATION_ID)).intValue());
+            instanceAlarm.setInstanceId(((Number)source.get(InstanceAlarmTable.COLUMN_INSTANCE_ID)).intValue());
+            instanceAlarm.setSourceValue(((Number)source.get(InstanceAlarmTable.COLUMN_SOURCE_VALUE)).intValue());
 
-            instanceAlarm.setAlarmType(((Number) source.get(InstanceAlarmTable.COLUMN_ALARM_TYPE)).intValue());
-            instanceAlarm.setAlarmContent((String) source.get(InstanceAlarmTable.COLUMN_ALARM_CONTENT));
+            instanceAlarm.setAlarmType(((Number)source.get(InstanceAlarmTable.COLUMN_ALARM_TYPE)).intValue());
+            instanceAlarm.setAlarmContent((String)source.get(InstanceAlarmTable.COLUMN_ALARM_CONTENT));
 
-            instanceAlarm.setLastTimeBucket(((Number) source.get(InstanceAlarmTable.COLUMN_LAST_TIME_BUCKET)).longValue());
+            instanceAlarm.setLastTimeBucket(((Number)source.get(InstanceAlarmTable.COLUMN_LAST_TIME_BUCKET)).longValue());
             return instanceAlarm;
         } else {
             return null;
@@ -102,9 +101,9 @@ public class InstanceAlarmEsPersistenceDAO extends EsDAO implements IInstanceAla
         long startTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(startTimestamp);
         long endTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(endTimestamp);
         BulkByScrollResponse response = getClient().prepareDelete(
-                QueryBuilders.rangeQuery(InstanceAlarmTable.COLUMN_LAST_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
-                InstanceAlarmTable.TABLE)
-                .get();
+            QueryBuilders.rangeQuery(InstanceAlarmTable.COLUMN_LAST_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
+            InstanceAlarmTable.TABLE)
+            .get();
 
         long deleted = response.getDeleted();
         logger.info("Delete {} rows history from {} index.", deleted, InstanceAlarmTable.TABLE);
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/InstanceAlarmListEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/InstanceAlarmListEsPersistenceDAO.java
index ac350bd..e446290 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/InstanceAlarmListEsPersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/InstanceAlarmListEsPersistenceDAO.java
@@ -20,7 +20,6 @@ package org.apache.skywalking.apm.collector.storage.es.dao.alarm;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient;
 import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils;
 import org.apache.skywalking.apm.collector.storage.dao.alarm.IInstanceAlarmListPersistenceDAO;
@@ -40,7 +39,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceAlarmListEsPersistenceDAO extends EsDAO implements IInstanceAlarmListPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder, InstanceAlarmList> {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceAlarmListEsPersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceAlarmListEsPersistenceDAO.class);
 
     public InstanceAlarmListEsPersistenceDAO(ElasticSearchClient client) {
         super(client);
@@ -53,14 +52,14 @@ public class InstanceAlarmListEsPersistenceDAO extends EsDAO implements IInstanc
             InstanceAlarmList instanceAlarmList = new InstanceAlarmList();
             instanceAlarmList.setId(id);
             Map<String, Object> source = getResponse.getSource();
-            instanceAlarmList.setApplicationId(((Number) source.get(InstanceAlarmListTable.COLUMN_APPLICATION_ID)).intValue());
-            instanceAlarmList.setInstanceId(((Number) source.get(InstanceAlarmListTable.COLUMN_INSTANCE_ID)).intValue());
-            instanceAlarmList.setSourceValue(((Number) source.get(InstanceAlarmListTable.COLUMN_SOURCE_VALUE)).intValue());
+            instanceAlarmList.setApplicationId(((Number)source.get(InstanceAlarmListTable.COLUMN_APPLICATION_ID)).intValue());
+            instanceAlarmList.setInstanceId(((Number)source.get(InstanceAlarmListTable.COLUMN_INSTANCE_ID)).intValue());
+            instanceAlarmList.setSourceValue(((Number)source.get(InstanceAlarmListTable.COLUMN_SOURCE_VALUE)).intValue());
 
-            instanceAlarmList.setAlarmType(((Number) source.get(InstanceAlarmListTable.COLUMN_ALARM_TYPE)).intValue());
-            instanceAlarmList.setAlarmContent((String) source.get(InstanceAlarmListTable.COLUMN_ALARM_CONTENT));
+            instanceAlarmList.setAlarmType(((Number)source.get(InstanceAlarmListTable.COLUMN_ALARM_TYPE)).intValue());
+            instanceAlarmList.setAlarmContent((String)source.get(InstanceAlarmListTable.COLUMN_ALARM_CONTENT));
 
-            instanceAlarmList.setTimeBucket(((Number) source.get(InstanceAlarmListTable.COLUMN_TIME_BUCKET)).longValue());
+            instanceAlarmList.setTimeBucket(((Number)source.get(InstanceAlarmListTable.COLUMN_TIME_BUCKET)).longValue());
             return instanceAlarmList;
         } else {
             return null;
@@ -102,9 +101,9 @@ public class InstanceAlarmListEsPersistenceDAO extends EsDAO implements IInstanc
         long startTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(startTimestamp);
         long endTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(endTimestamp);
         BulkByScrollResponse response = getClient().prepareDelete(
-                QueryBuilders.rangeQuery(InstanceAlarmListTable.COLUMN_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
-                InstanceAlarmListTable.TABLE)
-                .get();
+            QueryBuilders.rangeQuery(InstanceAlarmListTable.COLUMN_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
+            InstanceAlarmListTable.TABLE)
+            .get();
 
         long deleted = response.getDeleted();
         logger.info("Delete {} rows history from {} index.", deleted, InstanceAlarmListTable.TABLE);
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/InstanceReferenceAlarmListEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/InstanceReferenceAlarmListEsPersistenceDAO.java
index 2c93cbb..eb1a161 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/InstanceReferenceAlarmListEsPersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/InstanceReferenceAlarmListEsPersistenceDAO.java
@@ -20,7 +20,6 @@ package org.apache.skywalking.apm.collector.storage.es.dao.alarm;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient;
 import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils;
 import org.apache.skywalking.apm.collector.storage.dao.alarm.IInstanceReferenceAlarmListPersistenceDAO;
@@ -40,7 +39,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceReferenceAlarmListEsPersistenceDAO extends EsDAO implements IInstanceReferenceAlarmListPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder, InstanceReferenceAlarmList> {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceReferenceAlarmListEsPersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceReferenceAlarmListEsPersistenceDAO.class);
 
     public InstanceReferenceAlarmListEsPersistenceDAO(ElasticSearchClient client) {
         super(client);
@@ -53,16 +52,16 @@ public class InstanceReferenceAlarmListEsPersistenceDAO extends EsDAO implements
             InstanceReferenceAlarmList serviceReferenceAlarmList = new InstanceReferenceAlarmList();
             serviceReferenceAlarmList.setId(id);
             Map<String, Object> source = getResponse.getSource();
-            serviceReferenceAlarmList.setFrontApplicationId(((Number) source.get(InstanceReferenceAlarmListTable.COLUMN_FRONT_APPLICATION_ID)).intValue());
-            serviceReferenceAlarmList.setBehindApplicationId(((Number) source.get(InstanceReferenceAlarmListTable.COLUMN_BEHIND_APPLICATION_ID)).intValue());
-            serviceReferenceAlarmList.setFrontInstanceId(((Number) source.get(InstanceReferenceAlarmListTable.COLUMN_FRONT_INSTANCE_ID)).intValue());
-            serviceReferenceAlarmList.setBehindInstanceId(((Number) source.get(InstanceReferenceAlarmListTable.COLUMN_BEHIND_INSTANCE_ID)).intValue());
-            serviceReferenceAlarmList.setSourceValue(((Number) source.get(InstanceReferenceAlarmListTable.COLUMN_SOURCE_VALUE)).intValue());
+            serviceReferenceAlarmList.setFrontApplicationId(((Number)source.get(InstanceReferenceAlarmListTable.COLUMN_FRONT_APPLICATION_ID)).intValue());
+            serviceReferenceAlarmList.setBehindApplicationId(((Number)source.get(InstanceReferenceAlarmListTable.COLUMN_BEHIND_APPLICATION_ID)).intValue());
+            serviceReferenceAlarmList.setFrontInstanceId(((Number)source.get(InstanceReferenceAlarmListTable.COLUMN_FRONT_INSTANCE_ID)).intValue());
+            serviceReferenceAlarmList.setBehindInstanceId(((Number)source.get(InstanceReferenceAlarmListTable.COLUMN_BEHIND_INSTANCE_ID)).intValue());
+            serviceReferenceAlarmList.setSourceValue(((Number)source.get(InstanceReferenceAlarmListTable.COLUMN_SOURCE_VALUE)).intValue());
 
-            serviceReferenceAlarmList.setAlarmType(((Number) source.get(InstanceReferenceAlarmListTable.COLUMN_ALARM_TYPE)).intValue());
-            serviceReferenceAlarmList.setAlarmContent((String) source.get(InstanceReferenceAlarmListTable.COLUMN_ALARM_CONTENT));
+            serviceReferenceAlarmList.setAlarmType(((Number)source.get(InstanceReferenceAlarmListTable.COLUMN_ALARM_TYPE)).intValue());
+            serviceReferenceAlarmList.setAlarmContent((String)source.get(InstanceReferenceAlarmListTable.COLUMN_ALARM_CONTENT));
 
-            serviceReferenceAlarmList.setTimeBucket(((Number) source.get(InstanceReferenceAlarmListTable.COLUMN_TIME_BUCKET)).longValue());
+            serviceReferenceAlarmList.setTimeBucket(((Number)source.get(InstanceReferenceAlarmListTable.COLUMN_TIME_BUCKET)).longValue());
             return serviceReferenceAlarmList;
         } else {
             return null;
@@ -108,9 +107,9 @@ public class InstanceReferenceAlarmListEsPersistenceDAO extends EsDAO implements
         long startTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(startTimestamp);
         long endTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(endTimestamp);
         BulkByScrollResponse response = getClient().prepareDelete(
-                QueryBuilders.rangeQuery(InstanceReferenceAlarmListTable.COLUMN_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
-                InstanceReferenceAlarmListTable.TABLE)
-                .get();
+            QueryBuilders.rangeQuery(InstanceReferenceAlarmListTable.COLUMN_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
+            InstanceReferenceAlarmListTable.TABLE)
+            .get();
 
         long deleted = response.getDeleted();
         logger.info("Delete {} rows history from {} index.", deleted, InstanceReferenceAlarmListTable.TABLE);
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ServiceAlarmEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ServiceAlarmEsPersistenceDAO.java
index a48a79d..ea414e5 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ServiceAlarmEsPersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ServiceAlarmEsPersistenceDAO.java
@@ -20,7 +20,6 @@ package org.apache.skywalking.apm.collector.storage.es.dao.alarm;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient;
 import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils;
 import org.apache.skywalking.apm.collector.storage.dao.alarm.IServiceAlarmPersistenceDAO;
@@ -40,7 +39,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ServiceAlarmEsPersistenceDAO extends EsDAO implements IServiceAlarmPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder, ServiceAlarm> {
 
-    private final Logger logger = LoggerFactory.getLogger(ServiceAlarmEsPersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(ServiceAlarmEsPersistenceDAO.class);
 
     public ServiceAlarmEsPersistenceDAO(ElasticSearchClient client) {
         super(client);
@@ -53,15 +52,15 @@ public class ServiceAlarmEsPersistenceDAO extends EsDAO implements IServiceAlarm
             ServiceAlarm serviceAlarm = new ServiceAlarm();
             serviceAlarm.setId(id);
             Map<String, Object> source = getResponse.getSource();
-            serviceAlarm.setApplicationId(((Number) source.get(ServiceAlarmTable.COLUMN_APPLICATION_ID)).intValue());
-            serviceAlarm.setInstanceId(((Number) source.get(ServiceAlarmTable.COLUMN_INSTANCE_ID)).intValue());
-            serviceAlarm.setServiceId(((Number) source.get(ServiceAlarmTable.COLUMN_SERVICE_ID)).intValue());
-            serviceAlarm.setSourceValue(((Number) source.get(ServiceAlarmTable.COLUMN_SOURCE_VALUE)).intValue());
+            serviceAlarm.setApplicationId(((Number)source.get(ServiceAlarmTable.COLUMN_APPLICATION_ID)).intValue());
+            serviceAlarm.setInstanceId(((Number)source.get(ServiceAlarmTable.COLUMN_INSTANCE_ID)).intValue());
+            serviceAlarm.setServiceId(((Number)source.get(ServiceAlarmTable.COLUMN_SERVICE_ID)).intValue());
+            serviceAlarm.setSourceValue(((Number)source.get(ServiceAlarmTable.COLUMN_SOURCE_VALUE)).intValue());
 
-            serviceAlarm.setAlarmType(((Number) source.get(ServiceAlarmTable.COLUMN_ALARM_TYPE)).intValue());
-            serviceAlarm.setAlarmContent((String) source.get(ServiceAlarmTable.COLUMN_ALARM_CONTENT));
+            serviceAlarm.setAlarmType(((Number)source.get(ServiceAlarmTable.COLUMN_ALARM_TYPE)).intValue());
+            serviceAlarm.setAlarmContent((String)source.get(ServiceAlarmTable.COLUMN_ALARM_CONTENT));
 
-            serviceAlarm.setLastTimeBucket(((Number) source.get(ServiceAlarmTable.COLUMN_LAST_TIME_BUCKET)).longValue());
+            serviceAlarm.setLastTimeBucket(((Number)source.get(ServiceAlarmTable.COLUMN_LAST_TIME_BUCKET)).longValue());
             return serviceAlarm;
         } else {
             return null;
@@ -105,9 +104,9 @@ public class ServiceAlarmEsPersistenceDAO extends EsDAO implements IServiceAlarm
         long startTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(startTimestamp);
         long endTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(endTimestamp);
         BulkByScrollResponse response = getClient().prepareDelete(
-                QueryBuilders.rangeQuery(ServiceAlarmTable.COLUMN_LAST_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
-                ServiceAlarmTable.TABLE)
-                .get();
+            QueryBuilders.rangeQuery(ServiceAlarmTable.COLUMN_LAST_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
+            ServiceAlarmTable.TABLE)
+            .get();
 
         long deleted = response.getDeleted();
         logger.info("Delete {} rows history from {} index.", deleted, ServiceAlarmTable.TABLE);
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ServiceAlarmListEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ServiceAlarmListEsPersistenceDAO.java
index 6cb8175..e143fe6 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ServiceAlarmListEsPersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ServiceAlarmListEsPersistenceDAO.java
@@ -20,7 +20,6 @@ package org.apache.skywalking.apm.collector.storage.es.dao.alarm;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient;
 import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils;
 import org.apache.skywalking.apm.collector.storage.dao.alarm.IServiceAlarmListPersistenceDAO;
@@ -40,7 +39,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ServiceAlarmListEsPersistenceDAO extends EsDAO implements IServiceAlarmListPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder, ServiceAlarmList> {
 
-    private final Logger logger = LoggerFactory.getLogger(ServiceAlarmListEsPersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(ServiceAlarmListEsPersistenceDAO.class);
 
     public ServiceAlarmListEsPersistenceDAO(ElasticSearchClient client) {
         super(client);
@@ -53,15 +52,15 @@ public class ServiceAlarmListEsPersistenceDAO extends EsDAO implements IServiceA
             ServiceAlarmList serviceAlarmList = new ServiceAlarmList();
             serviceAlarmList.setId(id);
             Map<String, Object> source = getResponse.getSource();
-            serviceAlarmList.setApplicationId(((Number) source.get(ServiceAlarmListTable.COLUMN_APPLICATION_ID)).intValue());
-            serviceAlarmList.setInstanceId(((Number) source.get(ServiceAlarmListTable.COLUMN_INSTANCE_ID)).intValue());
-            serviceAlarmList.setServiceId(((Number) source.get(ServiceAlarmListTable.COLUMN_SERVICE_ID)).intValue());
-            serviceAlarmList.setSourceValue(((Number) source.get(ServiceAlarmListTable.COLUMN_SOURCE_VALUE)).intValue());
+            serviceAlarmList.setApplicationId(((Number)source.get(ServiceAlarmListTable.COLUMN_APPLICATION_ID)).intValue());
+            serviceAlarmList.setInstanceId(((Number)source.get(ServiceAlarmListTable.COLUMN_INSTANCE_ID)).intValue());
+            serviceAlarmList.setServiceId(((Number)source.get(ServiceAlarmListTable.COLUMN_SERVICE_ID)).intValue());
+            serviceAlarmList.setSourceValue(((Number)source.get(ServiceAlarmListTable.COLUMN_SOURCE_VALUE)).intValue());
 
-            serviceAlarmList.setAlarmType(((Number) source.get(ServiceAlarmListTable.COLUMN_ALARM_TYPE)).intValue());
-            serviceAlarmList.setAlarmContent((String) source.get(ServiceAlarmListTable.COLUMN_ALARM_CONTENT));
+            serviceAlarmList.setAlarmType(((Number)source.get(ServiceAlarmListTable.COLUMN_ALARM_TYPE)).intValue());
+            serviceAlarmList.setAlarmContent((String)source.get(ServiceAlarmListTable.COLUMN_ALARM_CONTENT));
 
-            serviceAlarmList.setTimeBucket(((Number) source.get(ServiceAlarmListTable.COLUMN_TIME_BUCKET)).longValue());
+            serviceAlarmList.setTimeBucket(((Number)source.get(ServiceAlarmListTable.COLUMN_TIME_BUCKET)).longValue());
             return serviceAlarmList;
         } else {
             return null;
@@ -105,9 +104,9 @@ public class ServiceAlarmListEsPersistenceDAO extends EsDAO implements IServiceA
         long startTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(startTimestamp);
         long endTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(endTimestamp);
         BulkByScrollResponse response = getClient().prepareDelete(
-                QueryBuilders.rangeQuery(ServiceAlarmListTable.COLUMN_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
-                ServiceAlarmListTable.TABLE)
-                .get();
+            QueryBuilders.rangeQuery(ServiceAlarmListTable.COLUMN_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket),
+            ServiceAlarmListTable.TABLE)
+            .get();
 
         long deleted = response.getDeleted();
         logger.info("Delete {} rows history from {} index.", deleted, ServiceAlarmListTable.TABLE);
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/irmp/InstanceReferenceHourMetricEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/irmp/InstanceReferenceHourMetricEsPersistenceDAO.java
index 898557d..8408c0b 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/irmp/InstanceReferenceHourMetricEsPersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/irmp/InstanceReferenceHourMetricEsPersistenceDAO.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceReferenceHourMetricEsPersistenceDAO extends AbstractInstanceReferenceMetricEsPersistenceDAO implements IInstanceReferenceHourMetricPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder, InstanceReferenceMetric> {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceReferenceHourMetricEsPersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceReferenceHourMetricEsPersistenceDAO.class);
 
     public InstanceReferenceHourMetricEsPersistenceDAO(ElasticSearchClient client) {
         super(client);
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java
index 687ad35..eb585ed 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java
@@ -245,7 +245,7 @@ import org.slf4j.LoggerFactory;
  */
 public class StorageModuleH2Provider extends ModuleProvider {
 
-    private final Logger logger = LoggerFactory.getLogger(StorageModuleH2Provider.class);
+    private static final Logger logger = LoggerFactory.getLogger(StorageModuleH2Provider.class);
 
     private static final String URL = "url";
     private static final String USER_NAME = "user_name";
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/GlobalTraceH2PersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/GlobalTraceH2PersistenceDAO.java
index 1d8b0f6..1d22777 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/GlobalTraceH2PersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/GlobalTraceH2PersistenceDAO.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class GlobalTraceH2PersistenceDAO extends H2DAO implements IGlobalTracePersistenceDAO<H2SqlEntity, H2SqlEntity, GlobalTrace> {
 
-    private final Logger logger = LoggerFactory.getLogger(GlobalTraceH2PersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(GlobalTraceH2PersistenceDAO.class);
 
     public GlobalTraceH2PersistenceDAO(H2Client client) {
         super(client);
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/InstanceHeartBeatH2PersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/InstanceHeartBeatH2PersistenceDAO.java
index 4034e89..6e3707d 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/InstanceHeartBeatH2PersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/InstanceHeartBeatH2PersistenceDAO.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceHeartBeatH2PersistenceDAO extends H2DAO implements IInstanceHeartBeatPersistenceDAO<H2SqlEntity, H2SqlEntity, Instance> {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceHeartBeatH2PersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceHeartBeatH2PersistenceDAO.class);
 
     public InstanceHeartBeatH2PersistenceDAO(H2Client client) {
         super(client);
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/SegmentDurationH2PersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/SegmentDurationH2PersistenceDAO.java
index 928ba87..e4a66c0 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/SegmentDurationH2PersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/SegmentDurationH2PersistenceDAO.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.storage.h2.dao;
 
 import java.util.HashMap;
@@ -36,7 +35,7 @@ import org.slf4j.LoggerFactory;
  */
 public class SegmentDurationH2PersistenceDAO extends H2DAO implements ISegmentDurationPersistenceDAO<H2SqlEntity, H2SqlEntity, SegmentDuration> {
 
-    private final Logger logger = LoggerFactory.getLogger(SegmentDurationH2PersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(SegmentDurationH2PersistenceDAO.class);
 
     public SegmentDurationH2PersistenceDAO(H2Client client) {
         super(client);
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/SegmentH2PersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/SegmentH2PersistenceDAO.java
index ff65f06..7014491 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/SegmentH2PersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/SegmentH2PersistenceDAO.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.storage.h2.dao;
 
 import java.util.HashMap;
@@ -36,7 +35,7 @@ import org.slf4j.LoggerFactory;
  */
 public class SegmentH2PersistenceDAO extends H2DAO implements ISegmentPersistenceDAO<H2SqlEntity, H2SqlEntity, Segment> {
 
-    private final Logger logger = LoggerFactory.getLogger(SegmentH2PersistenceDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(SegmentH2PersistenceDAO.class);
 
     public SegmentH2PersistenceDAO(H2Client client) {
         super(client);
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/ApplicationH2CacheDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/ApplicationH2CacheDAO.java
index 6d4f612..5c606d9 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/ApplicationH2CacheDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/ApplicationH2CacheDAO.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ApplicationH2CacheDAO extends H2DAO implements IApplicationCacheDAO {
 
-    private final Logger logger = LoggerFactory.getLogger(ApplicationH2CacheDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationH2CacheDAO.class);
 
     private static final String GET_APPLICATION_ID_SQL = "select {0} from {1} where {2} = ? and {3} = ?";
     private static final String GET_APPLICATION_SQL = "select {0},{1} from {2} where {3} = ?";
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/InstanceH2CacheDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/InstanceH2CacheDAO.java
index 2a0411f..67f25ca 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/InstanceH2CacheDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/InstanceH2CacheDAO.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceH2CacheDAO extends H2DAO implements IInstanceCacheDAO {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceH2CacheDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceH2CacheDAO.class);
 
     private static final String GET_APPLICATION_ID_SQL = "select {0} from {1} where {2} = ?";
     private static final String GET_INSTANCE_ID_SQL = "select {0} from {1} where {2} = ? and {3} = ? and {4} = ?";
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/NetworkAddressH2CacheDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/NetworkAddressH2CacheDAO.java
index 99ffd10..4602e54 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/NetworkAddressH2CacheDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/NetworkAddressH2CacheDAO.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class NetworkAddressH2CacheDAO extends H2DAO implements INetworkAddressCacheDAO {
 
-    private final Logger logger = LoggerFactory.getLogger(NetworkAddressH2CacheDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(NetworkAddressH2CacheDAO.class);
 
     private static final String GET_ADDRESS_ID_OR_CODE_SQL = "select {0} from {1} where {2} = ?";
 
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/ServiceNameH2CacheDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/ServiceNameH2CacheDAO.java
index f406f77..4065b33 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/ServiceNameH2CacheDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/ServiceNameH2CacheDAO.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ServiceNameH2CacheDAO extends H2DAO implements IServiceNameCacheDAO {
 
-    private final Logger logger = LoggerFactory.getLogger(ServiceNameH2CacheDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(ServiceNameH2CacheDAO.class);
 
     private static final String GET_SERVICE_NAME_SQL = "select {0},{1} from {2} where {3} = ?";
     private static final String GET_SERVICE_ID_SQL = "select {0} from {1} where {2} = ? and {3} = ? and {4} = ? limit 1";
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/ApplicationRegisterH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/ApplicationRegisterH2DAO.java
index d1f3b54..5e00f54 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/ApplicationRegisterH2DAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/ApplicationRegisterH2DAO.java
@@ -34,8 +34,8 @@ import org.slf4j.LoggerFactory;
  * @author peng-yongsheng, clevertension
  */
 public class ApplicationRegisterH2DAO extends H2DAO implements IApplicationRegisterDAO {
-    
-    private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterH2DAO.class);
+
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationRegisterH2DAO.class);
 
     public ApplicationRegisterH2DAO(H2Client client) {
         super(client);
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/InstanceRegisterH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/InstanceRegisterH2DAO.java
index 5f35369..fb5b33f 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/InstanceRegisterH2DAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/InstanceRegisterH2DAO.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceRegisterH2DAO extends H2DAO implements IInstanceRegisterDAO {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceRegisterH2DAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceRegisterH2DAO.class);
 
     public InstanceRegisterH2DAO(H2Client client) {
         super(client);
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/NetworkAddressRegisterH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/NetworkAddressRegisterH2DAO.java
index 8c0afcb..1722d06 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/NetworkAddressRegisterH2DAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/NetworkAddressRegisterH2DAO.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class NetworkAddressRegisterH2DAO extends H2DAO implements INetworkAddressRegisterDAO {
 
-    private final Logger logger = LoggerFactory.getLogger(NetworkAddressRegisterH2DAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(NetworkAddressRegisterH2DAO.class);
 
     public NetworkAddressRegisterH2DAO(H2Client client) {
         super(client);
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/InstanceH2UIDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/InstanceH2UIDAO.java
index f520734..cd283ad 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/InstanceH2UIDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/InstanceH2UIDAO.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
  */
 public class InstanceH2UIDAO extends H2DAO implements IInstanceUIDAO {
 
-    private final Logger logger = LoggerFactory.getLogger(InstanceH2UIDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(InstanceH2UIDAO.class);
 
     public InstanceH2UIDAO(H2Client client) {
         super(client);
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryMetricH2UIDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryMetricH2UIDAO.java
index 87c733d..9f5508b 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryMetricH2UIDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryMetricH2UIDAO.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
  */
 public class MemoryMetricH2UIDAO extends H2DAO implements IMemoryMetricUIDAO {
 
-    private final Logger logger = LoggerFactory.getLogger(MemoryMetricH2UIDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(MemoryMetricH2UIDAO.class);
     private static final String GET_MEMORY_METRIC_SQL = "select * from {0} where {1} =?";
 
     public MemoryMetricH2UIDAO(H2Client client) {
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryPoolMetricH2UIDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryPoolMetricH2UIDAO.java
index b60d492..a95ef0e 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryPoolMetricH2UIDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryPoolMetricH2UIDAO.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
  */
 public class MemoryPoolMetricH2UIDAO extends H2DAO implements IMemoryPoolMetricUIDAO {
 
-    private final Logger logger = LoggerFactory.getLogger(MemoryPoolMetricH2UIDAO.class);
+    private static final Logger logger = LoggerFactory.getLogger(MemoryPoolMetricH2UIDAO.class);
     private static final String GET_MEMORY_POOL_METRIC_SQL = "select * from {0} where {1} = ?";
 
     public MemoryPoolMetricH2UIDAO(H2Client client) {
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/GraphQLHandler.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/GraphQLHandler.java
index 9f29df2..ae49a8e 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/GraphQLHandler.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/GraphQLHandler.java
@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
  */
 public class GraphQLHandler extends JettyHandler {
 
-    private final Logger logger = LoggerFactory.getLogger(GraphQLHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(GraphQLHandler.class);
 
     private final Gson gson = new Gson();
     private final GraphQL graphQL;
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/AlarmService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/AlarmService.java
index f908079..aabd31c 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/AlarmService.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/AlarmService.java
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
  */
 public class AlarmService {
 
-    private final Logger logger = LoggerFactory.getLogger(AlarmService.class);
+    private static final Logger logger = LoggerFactory.getLogger(AlarmService.class);
 
     private final Gson gson = new Gson();
     private final IInstanceUIDAO instanceDAO;
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationService.java
index bb69d9b..8205a5c 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationService.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationService.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ApplicationService {
 
-    private final Logger logger = LoggerFactory.getLogger(ApplicationService.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationService.class);
 
     private final IInstanceUIDAO instanceDAO;
     private final IServiceMetricUIDAO serviceMetricUIDAO;
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationTopologyService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationTopologyService.java
index 5d310d2..86fc10e 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationTopologyService.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationTopologyService.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ApplicationTopologyService {
 
-    private final Logger logger = LoggerFactory.getLogger(ApplicationTopologyService.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationTopologyService.class);
 
     private final IApplicationComponentUIDAO applicationComponentUIDAO;
     private final IApplicationMappingUIDAO applicationMappingUIDAO;
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ClusterTopologyService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ClusterTopologyService.java
index fe9fa09..bb00355 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ClusterTopologyService.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ClusterTopologyService.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ClusterTopologyService {
 
-    private final Logger logger = LoggerFactory.getLogger(ClusterTopologyService.class);
+    private static final Logger logger = LoggerFactory.getLogger(ClusterTopologyService.class);
 
     private final IApplicationComponentUIDAO applicationComponentUIDAO;
     private final IApplicationMappingUIDAO applicationMappingUIDAO;
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/SegmentTopService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/SegmentTopService.java
index 3b547b1..b9f362f 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/SegmentTopService.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/SegmentTopService.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
  */
 public class SegmentTopService {
 
-    private final Logger logger = LoggerFactory.getLogger(SegmentTopService.class);
+    private static final Logger logger = LoggerFactory.getLogger(SegmentTopService.class);
 
     private final ISegmentDurationUIDAO segmentDurationUIDAO;
     private final IGlobalTraceUIDAO globalTraceUIDAO;
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceNameService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceNameService.java
index d416c08..36535ee 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceNameService.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceNameService.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ServiceNameService {
 
-    private final Logger logger = LoggerFactory.getLogger(ServiceNameService.class);
+    private static final Logger logger = LoggerFactory.getLogger(ServiceNameService.class);
 
     private final IServiceNameServiceUIDAO serviceNameServiceUIDAO;
     private final IServiceMetricUIDAO serviceMetricUIDAO;
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceTopologyService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceTopologyService.java
index 92e05d1..985e6bb 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceTopologyService.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceTopologyService.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ServiceTopologyService {
 
-    private final Logger logger = LoggerFactory.getLogger(ServiceTopologyService.class);
+    private static final Logger logger = LoggerFactory.getLogger(ServiceTopologyService.class);
 
     private final IApplicationComponentUIDAO applicationComponentUIDAO;
     private final IServiceMetricUIDAO serviceMetricUIDAO;
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TimeSynchronousService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TimeSynchronousService.java
index d83abe0..360e729 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TimeSynchronousService.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TimeSynchronousService.java
@@ -16,7 +16,6 @@
  *
  */
 
-
 package org.apache.skywalking.apm.collector.ui.service;
 
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
@@ -30,7 +29,7 @@ import org.slf4j.LoggerFactory;
  */
 public class TimeSynchronousService {
 
-    private final Logger logger = LoggerFactory.getLogger(TimeSynchronousService.class);
+    private static final Logger logger = LoggerFactory.getLogger(TimeSynchronousService.class);
 
     private final IInstanceUIDAO instanceDAO;
 
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TopologyBuilder.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TopologyBuilder.java
index c438f71..0a4ed18 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TopologyBuilder.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TopologyBuilder.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
  */
 class TopologyBuilder {
 
-    private final Logger logger = LoggerFactory.getLogger(TopologyBuilder.class);
+    private static final Logger logger = LoggerFactory.getLogger(TopologyBuilder.class);
 
     private final ApplicationCacheService applicationCacheService;
     private final ServerService serverService;

-- 
To stop receiving notification emails like this one, please contact
pengys@apache.org.

Mime
View raw message