Merge and sync release version

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java

@@ -49,7 +49,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsServiceImplBase implements GRPCHandler {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/CpuMetricPersistenceWorker.java

@@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector;
 import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class CpuMetricPersistenceWorker extends PersistenceWorker {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricEsDAO.java

@@ -31,7 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class CpuMetricEsDAO extends EsDAO implements ICpuMetricDAO, IPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder> {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java

@@ -18,6 +18,8 @@
 
 package org.skywalking.apm.collector.agentjvm.worker.cpu.dao;
 
+import java.util.HashMap;
+import java.util.Map;
 import org.skywalking.apm.collector.core.stream.Data;
 import org.skywalking.apm.collector.storage.define.DataDefine;
 import org.skywalking.apm.collector.storage.define.jvm.CpuMetricTable;
@@ -28,14 +30,12 @@ import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
- * @author pengys5, clevertension
+ * @author peng-yongsheng, clevertension
  */
 public class CpuMetricH2DAO extends H2DAO implements ICpuMetricDAO, IPersistenceDAO<H2SqlEntity, H2SqlEntity> {
     private final Logger logger = LoggerFactory.getLogger(CpuMetricH2DAO.class);
+
     @Override public Data get(String id, DataDefine dataDefine) {
         return null;
     }
@@ -43,7 +43,7 @@ public class CpuMetricH2DAO extends H2DAO implements ICpuMetricDAO, IPersistence
     @Override public H2SqlEntity prepareBatchInsert(Data data) {
         H2SqlEntity entity = new H2SqlEntity();
         Map<String, Object> source = new HashMap<>();
-        source.put("id", data.getDataString(0));
+        source.put(CpuMetricTable.COLUMN_ID, data.getDataString(0));
         source.put(CpuMetricTable.COLUMN_INSTANCE_ID, data.getDataInteger(0));
         source.put(CpuMetricTable.COLUMN_USAGE_PERCENT, data.getDataDouble(0));
         source.put(CpuMetricTable.COLUMN_TIME_BUCKET, data.getDataLong(0));

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/ICpuMetricDAO.java

@@ -19,7 +19,7 @@
 package org.skywalking.apm.collector.agentjvm.worker.cpu.dao;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public interface ICpuMetricDAO {
 }

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricEsTableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo
 import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class CpuMetricEsTableDefine extends ElasticSearchTableDefine {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricH2TableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine;
 import org.skywalking.apm.collector.storage.h2.define.H2TableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class CpuMetricH2TableDefine extends H2TableDefine {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/GCMetricPersistenceWorker.java

@@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector;
 import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class GCMetricPersistenceWorker extends PersistenceWorker {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricEsDAO.java

@@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO;
 import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class GCMetricEsDAO extends EsDAO implements IGCMetricDAO, IPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder> {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java

@@ -20,7 +20,6 @@ package org.skywalking.apm.collector.agentjvm.worker.gc.dao;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.skywalking.apm.collector.core.stream.Data;
 import org.skywalking.apm.collector.storage.define.DataDefine;
 import org.skywalking.apm.collector.storage.define.jvm.GCMetricTable;
@@ -30,7 +29,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity;
 import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO;
 
 /**
- * @author pengys5, clevertension
+ * @author peng-yongsheng, clevertension
  */
 public class GCMetricH2DAO extends H2DAO implements IGCMetricDAO, IPersistenceDAO<H2SqlEntity, H2SqlEntity> {
     @Override public Data get(String id, DataDefine dataDefine) {
@@ -40,7 +39,7 @@ public class GCMetricH2DAO extends H2DAO implements IGCMetricDAO, IPersistenceDA
     @Override public H2SqlEntity prepareBatchInsert(Data data) {
         H2SqlEntity entity = new H2SqlEntity();
         Map<String, Object> source = new HashMap<>();
-        source.put("id", data.getDataString(0));
+        source.put(GCMetricTable.COLUMN_ID, data.getDataString(0));
         source.put(GCMetricTable.COLUMN_INSTANCE_ID, data.getDataInteger(0));
         source.put(GCMetricTable.COLUMN_PHRASE, data.getDataInteger(1));
         source.put(GCMetricTable.COLUMN_COUNT, data.getDataLong(0));

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/IGCMetricDAO.java

@@ -19,7 +19,7 @@
 package org.skywalking.apm.collector.agentjvm.worker.gc.dao;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public interface IGCMetricDAO {
 }

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricEsTableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo
 import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class GCMetricEsTableDefine extends ElasticSearchTableDefine {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricH2TableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine;
 import org.skywalking.apm.collector.storage.h2.define.H2TableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class GCMetricH2TableDefine extends H2TableDefine {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/InstHeartBeatPersistenceWorker.java

@@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector;
 import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class InstHeartBeatPersistenceWorker extends PersistenceWorker {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/IInstanceHeartBeatDAO.java

@@ -19,7 +19,7 @@
 package org.skywalking.apm.collector.agentjvm.worker.heartbeat.dao;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public interface IInstanceHeartBeatDAO {
 }
\ No newline at end of file

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatEsDAO.java

@@ -33,7 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class InstanceHeartBeatEsDAO extends EsDAO implements IInstanceHeartBeatDAO, IPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder> {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java

@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.skywalking.apm.collector.client.h2.H2Client;
 import org.skywalking.apm.collector.client.h2.H2ClientException;
 import org.skywalking.apm.collector.core.framework.UnexpectedException;
@@ -39,15 +38,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5, clevertension
+ * @author peng-yongsheng, clevertension
  */
 public class InstanceHeartBeatH2DAO extends H2DAO implements IInstanceHeartBeatDAO, IPersistenceDAO<H2SqlEntity, H2SqlEntity> {
     private final Logger logger = LoggerFactory.getLogger(InstanceHeartBeatEsDAO.class);
     private static final String GET_INSTANCE_HEARTBEAT_SQL = "select * from {0} where {1} = ?";
+
     @Override public Data get(String id, DataDefine dataDefine) {
         H2Client client = getClient();
         String sql = SqlBuilder.buildSql(GET_INSTANCE_HEARTBEAT_SQL, InstanceTable.TABLE, InstanceTable.COLUMN_INSTANCE_ID);
-        Object[] params = new Object[]{id};
+        Object[] params = new Object[] {id};
         try (ResultSet rs = client.executeQuery(sql, params)) {
             if (rs.next()) {
                 Data data = dataDefine.build(id);
@@ -69,7 +69,7 @@ public class InstanceHeartBeatH2DAO extends H2DAO implements IInstanceHeartBeatD
         H2SqlEntity entity = new H2SqlEntity();
         Map<String, Object> source = new HashMap<>();
         source.put(InstanceTable.COLUMN_HEARTBEAT_TIME, data.getDataLong(0));
-        String sql = SqlBuilder.buildBatchUpdateSql(InstanceTable.TABLE, source.keySet(), InstanceTable.COLUMN_APPLICATION_ID);
+        String sql = SqlBuilder.buildBatchUpdateSql(InstanceTable.TABLE, source.keySet(), InstanceTable.COLUMN_INSTANCE_ID);
         entity.setSql(sql);
         List<Object> params = new ArrayList<>(source.values());
         params.add(data.getDataString(0));

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/define/InstanceHeartBeatDataDefine.java

@@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.define.DataDefine;
 import org.skywalking.apm.collector.storage.define.register.InstanceTable;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class InstanceHeartBeatDataDefine extends DataDefine {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/MemoryMetricPersistenceWorker.java

@@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector;
 import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class MemoryMetricPersistenceWorker extends PersistenceWorker {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/IMemoryMetricDAO.java

@@ -19,7 +19,7 @@
 package org.skywalking.apm.collector.agentjvm.worker.memory.dao;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public interface IMemoryMetricDAO {
 }

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricEsDAO.java

@@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO;
 import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class MemoryMetricEsDAO extends EsDAO implements IMemoryMetricDAO, IPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder> {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java

@@ -20,7 +20,6 @@ package org.skywalking.apm.collector.agentjvm.worker.memory.dao;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.skywalking.apm.collector.core.stream.Data;
 import org.skywalking.apm.collector.storage.define.DataDefine;
 import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricTable;
@@ -30,7 +29,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity;
 import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO;
 
 /**
- * @author pengys5, clevertension
+ * @author peng-yongsheng, clevertension
  */
 public class MemoryMetricH2DAO extends H2DAO implements IMemoryMetricDAO, IPersistenceDAO<H2SqlEntity, H2SqlEntity> {
     @Override public Data get(String id, DataDefine dataDefine) {
@@ -40,7 +39,7 @@ public class MemoryMetricH2DAO extends H2DAO implements IMemoryMetricDAO, IPersi
     @Override public H2SqlEntity prepareBatchInsert(Data data) {
         H2SqlEntity entity = new H2SqlEntity();
         Map<String, Object> source = new HashMap<>();
-        source.put("id", data.getDataString(0));
+        source.put(MemoryMetricTable.COLUMN_ID, data.getDataString(0));
         source.put(MemoryMetricTable.COLUMN_APPLICATION_INSTANCE_ID, data.getDataInteger(0));
         source.put(MemoryMetricTable.COLUMN_IS_HEAP, data.getDataBoolean(0));
         source.put(MemoryMetricTable.COLUMN_INIT, data.getDataLong(0));

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricEsTableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo
 import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class MemoryMetricEsTableDefine extends ElasticSearchTableDefine {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricH2TableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine;
 import org.skywalking.apm.collector.storage.h2.define.H2TableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class MemoryMetricH2TableDefine extends H2TableDefine {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/MemoryPoolMetricPersistenceWorker.java

@@ -32,7 +32,7 @@ import org.skywalking.apm.collector.stream.worker.selector.RollingSelector;
 import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class MemoryPoolMetricPersistenceWorker extends PersistenceWorker {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/IMemoryPoolMetricDAO.java

@@ -19,7 +19,7 @@
 package org.skywalking.apm.collector.agentjvm.worker.memorypool.dao;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public interface IMemoryPoolMetricDAO {
 }

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricEsDAO.java

@@ -29,7 +29,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO;
 import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class MemoryPoolMetricEsDAO extends EsDAO implements IMemoryPoolMetricDAO, IPersistenceDAO<IndexRequestBuilder, UpdateRequestBuilder> {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java

@@ -20,7 +20,6 @@ package org.skywalking.apm.collector.agentjvm.worker.memorypool.dao;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.skywalking.apm.collector.core.stream.Data;
 import org.skywalking.apm.collector.storage.define.DataDefine;
 import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricTable;
@@ -30,7 +29,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity;
 import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO;
 
 /**
- * @author pengys5, clevertension
+ * @author peng-yongsheng, clevertension
  */
 public class MemoryPoolMetricH2DAO extends H2DAO implements IMemoryPoolMetricDAO, IPersistenceDAO<H2SqlEntity, H2SqlEntity> {
     @Override public Data get(String id, DataDefine dataDefine) {
@@ -40,7 +39,7 @@ public class MemoryPoolMetricH2DAO extends H2DAO implements IMemoryPoolMetricDAO
     @Override public H2SqlEntity prepareBatchInsert(Data data) {
         H2SqlEntity entity = new H2SqlEntity();
         Map<String, Object> source = new HashMap<>();
-        source.put("id", data.getDataString(0));
+        source.put(MemoryPoolMetricTable.COLUMN_ID, data.getDataString(0));
         source.put(MemoryPoolMetricTable.COLUMN_INSTANCE_ID, data.getDataInteger(0));
         source.put(MemoryPoolMetricTable.COLUMN_POOL_TYPE, data.getDataInteger(1));
         source.put(MemoryPoolMetricTable.COLUMN_INIT, data.getDataLong(0));

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricEsTableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo
 import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class MemoryPoolMetricEsTableDefine extends ElasticSearchTableDefine {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricH2TableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine;
 import org.skywalking.apm.collector.storage.h2.define.H2TableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class MemoryPoolMetricH2TableDefine extends H2TableDefine {
 

apm-collector-3.2.3/apm-collector-agentjvm/src/test/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandlerTestCase.java

@@ -35,7 +35,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class JVMMetricsServiceHandlerTestCase {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/application/ApplicationIDService.java

@@ -30,7 +30,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ApplicationIDService {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/ApplicationRegisterServiceHandler.java

@@ -30,7 +30,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ApplicationRegisterServiceHandler extends ApplicationRegisterServiceGrpc.ApplicationRegisterServiceImplBase implements GRPCHandler {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/InstanceDiscoveryServiceHandler.java

@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class InstanceDiscoveryServiceHandler extends InstanceDiscoveryServiceGrpc.InstanceDiscoveryServiceImplBase implements GRPCHandler {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/grpc/handler/ServiceNameDiscoveryServiceHandler.java

@@ -31,7 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ServiceNameDiscoveryServiceHandler extends ServiceNameDiscoveryServiceGrpc.ServiceNameDiscoveryServiceImplBase implements GRPCHandler {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/instance/InstanceIDService.java

@@ -31,7 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class InstanceIDService {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/ApplicationRegisterServletHandler.java

@@ -31,7 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ApplicationRegisterServletHandler extends JettyHandler {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/InstanceDiscoveryServletHandler.java

@@ -30,7 +30,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class InstanceDiscoveryServletHandler extends JettyHandler {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/jetty/handler/ServiceNameDiscoveryServiceHandler.java

@@ -31,7 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ServiceNameDiscoveryServiceHandler extends JettyHandler {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/servicename/ServiceNameService.java

@@ -31,7 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ServiceNameService {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/IdAutoIncrement.java

@@ -19,7 +19,7 @@
 package org.skywalking.apm.collector.agentregister.worker;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public enum IdAutoIncrement {
     INSTANCE;

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationEsTableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo
 import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ApplicationEsTableDefine extends ElasticSearchTableDefine {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java

@@ -18,12 +18,13 @@
 
 package org.skywalking.apm.collector.agentregister.worker.application;
 
+import org.skywalking.apm.collector.storage.define.global.GlobalTraceTable;
 import org.skywalking.apm.collector.storage.define.register.ApplicationTable;
 import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine;
 import org.skywalking.apm.collector.storage.h2.define.H2TableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ApplicationH2TableDefine extends H2TableDefine {
 
@@ -32,6 +33,7 @@ public class ApplicationH2TableDefine extends H2TableDefine {
     }
 
     @Override public void initialize() {
+        addColumn(new H2ColumnDefine(GlobalTraceTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name()));
         addColumn(new H2ColumnDefine(ApplicationTable.COLUMN_APPLICATION_CODE, H2ColumnDefine.Type.Varchar.name()));
         addColumn(new H2ColumnDefine(ApplicationTable.COLUMN_APPLICATION_ID, H2ColumnDefine.Type.Int.name()));
     }

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterRemoteWorker.java

@@ -32,7 +32,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ApplicationRegisterRemoteWorker extends AbstractRemoteWorker {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterSerialWorker.java

@@ -37,7 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ApplicationRegisterSerialWorker extends AbstractLocalAsyncWorker {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java

@@ -30,7 +30,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ApplicationEsDAO extends EsDAO implements IApplicationDAO {
 
@@ -47,7 +47,7 @@ public class ApplicationEsDAO extends EsDAO implements IApplicationDAO {
     @Override public void save(ApplicationDataDefine.Application application) {
         logger.debug("save application register info, application id: {}, application code: {}", application.getApplicationId(), application.getApplicationCode());
         ElasticSearchClient client = getClient();
-        Map<String, Object> source = new HashMap();
+        Map<String, Object> source = new HashMap<>();
         source.put(ApplicationTable.COLUMN_APPLICATION_CODE, application.getApplicationCode());
         source.put(ApplicationTable.COLUMN_APPLICATION_ID, application.getApplicationId());
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java

@@ -18,6 +18,8 @@
 
 package org.skywalking.apm.collector.agentregister.worker.application.dao;
 
+import java.util.HashMap;
+import java.util.Map;
 import org.skywalking.apm.collector.client.h2.H2Client;
 import org.skywalking.apm.collector.client.h2.H2ClientException;
 import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine;
@@ -28,11 +30,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5, clevertension
+ * @author peng-yongsheng, clevertension
  */
 public class ApplicationH2DAO extends H2DAO implements IApplicationDAO {
     private final Logger logger = LoggerFactory.getLogger(ApplicationH2DAO.class);
-    private static final String INSERT_APPLICATION_SQL = "insert into {0}({1}, {2}) values(?, ?)";
 
     @Override
     public int getMaxApplicationId() {
@@ -47,9 +48,14 @@ public class ApplicationH2DAO extends H2DAO implements IApplicationDAO {
     @Override
     public void save(ApplicationDataDefine.Application application) {
         H2Client client = getClient();
-        String sql = SqlBuilder.buildSql(INSERT_APPLICATION_SQL, ApplicationTable.TABLE, ApplicationTable.COLUMN_APPLICATION_ID,
-            ApplicationTable.COLUMN_APPLICATION_CODE);
-        Object[] params = new Object[] {application.getApplicationId(), application.getApplicationCode()};
+
+        Map<String, Object> source = new HashMap<>();
+        source.put(ApplicationTable.COLUMN_ID, application.getApplicationId());
+        source.put(ApplicationTable.COLUMN_APPLICATION_CODE, application.getApplicationCode());
+        source.put(ApplicationTable.COLUMN_APPLICATION_ID, application.getApplicationId());
+
+        String sql = SqlBuilder.buildBatchInsertSql(ApplicationTable.TABLE, source.keySet());
+        Object[] params = source.values().toArray(new Object[0]);
         try {
             client.execute(sql, params);
         } catch (H2ClientException e) {

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/IApplicationDAO.java

@@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentregister.worker.application.dao;
 import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public interface IApplicationDAO {
     int getMaxApplicationId();

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceEsTableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo
 import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class InstanceEsTableDefine extends ElasticSearchTableDefine {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine;
 import org.skywalking.apm.collector.storage.h2.define.H2TableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class InstanceH2TableDefine extends H2TableDefine {
 
@@ -32,6 +32,7 @@ public class InstanceH2TableDefine extends H2TableDefine {
     }
 
     @Override public void initialize() {
+        addColumn(new H2ColumnDefine(InstanceTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name()));
         addColumn(new H2ColumnDefine(InstanceTable.COLUMN_APPLICATION_ID, H2ColumnDefine.Type.Int.name()));
         addColumn(new H2ColumnDefine(InstanceTable.COLUMN_AGENT_UUID, H2ColumnDefine.Type.Varchar.name()));
         addColumn(new H2ColumnDefine(InstanceTable.COLUMN_REGISTER_TIME, H2ColumnDefine.Type.Bigint.name()));

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterRemoteWorker.java

@@ -32,7 +32,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class InstanceRegisterRemoteWorker extends AbstractRemoteWorker {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterSerialWorker.java

@@ -35,7 +35,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class InstanceRegisterSerialWorker extends AbstractLocalAsyncWorker {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/IInstanceDAO.java

@@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentregister.worker.instance.dao;
 import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public interface IInstanceDAO {
     int getInstanceId(int applicationId, String agentUUID);

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceEsDAO.java

@@ -37,7 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class InstanceEsDAO extends EsDAO implements IInstanceDAO {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java

@@ -32,13 +32,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5, clevertension
+ * @author peng-yongsheng, clevertension
  */
 public class InstanceH2DAO extends H2DAO implements IInstanceDAO {
     private final Logger logger = LoggerFactory.getLogger(InstanceH2DAO.class);
 
     private static final String GET_INSTANCE_ID_SQL = "select {0} from {1} where {2} = ? and {3} = ?";
-    private static final String UPDATE_HEARTBEAT_TIME_SQL = "updatte {0} set {1} = ? where {2} = ?";
+    private static final String UPDATE_HEARTBEAT_TIME_SQL = "update {0} set {1} = ? where {2} = ?";
 
     @Override public int getInstanceId(int applicationId, String agentUUID) {
         logger.info("get the application id with application id = {}, agentUUID = {}", applicationId, agentUUID);
@@ -67,6 +67,7 @@ public class InstanceH2DAO extends H2DAO implements IInstanceDAO {
     @Override public void save(InstanceDataDefine.Instance instance) {
         H2Client client = getClient();
         Map<String, Object> source = new HashMap<>();
+        source.put(InstanceTable.COLUMN_ID, instance.getId());
         source.put(InstanceTable.COLUMN_INSTANCE_ID, instance.getInstanceId());
         source.put(InstanceTable.COLUMN_APPLICATION_ID, instance.getApplicationId());
         source.put(InstanceTable.COLUMN_AGENT_UUID, instance.getAgentUUID());
@@ -85,7 +86,7 @@ public class InstanceH2DAO extends H2DAO implements IInstanceDAO {
     @Override public void updateHeartbeatTime(int instanceId, long heartbeatTime) {
         H2Client client = getClient();
         String sql = SqlBuilder.buildSql(UPDATE_HEARTBEAT_TIME_SQL, InstanceTable.TABLE, InstanceTable.COLUMN_HEARTBEAT_TIME,
-            InstanceTable.COLUMN_INSTANCE_ID);
+            InstanceTable.COLUMN_ID);
         Object[] params = new Object[] {heartbeatTime, instanceId};
         try {
             client.execute(sql, params);

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameEsTableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchCo
 import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ServiceNameEsTableDefine extends ElasticSearchTableDefine {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine;
 import org.skywalking.apm.collector.storage.h2.define.H2TableDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ServiceNameH2TableDefine extends H2TableDefine {
 
@@ -32,6 +32,7 @@ public class ServiceNameH2TableDefine extends H2TableDefine {
     }
 
     @Override public void initialize() {
+        addColumn(new H2ColumnDefine(ServiceNameTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name()));
         addColumn(new H2ColumnDefine(ServiceNameTable.COLUMN_APPLICATION_ID, H2ColumnDefine.Type.Int.name()));
         addColumn(new H2ColumnDefine(ServiceNameTable.COLUMN_SERVICE_NAME, H2ColumnDefine.Type.Varchar.name()));
         addColumn(new H2ColumnDefine(ServiceNameTable.COLUMN_SERVICE_ID, H2ColumnDefine.Type.Int.name()));

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterRemoteWorker.java

@@ -32,7 +32,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ServiceNameRegisterRemoteWorker extends AbstractRemoteWorker {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java

@@ -37,7 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ServiceNameRegisterSerialWorker extends AbstractLocalAsyncWorker {
 

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/IServiceNameDAO.java

@@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentregister.worker.servicename.dao;
 import org.skywalking.apm.collector.storage.define.register.ServiceNameDataDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public interface IServiceNameDAO {
     int getMaxServiceId();

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java

@@ -30,7 +30,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ServiceNameEsDAO extends EsDAO implements IServiceNameDAO {
 
@@ -47,7 +47,7 @@ public class ServiceNameEsDAO extends EsDAO implements IServiceNameDAO {
     @Override public void save(ServiceNameDataDefine.ServiceName serviceName) {
         logger.debug("save service name register info, application id: {}, service name: {}", serviceName.getApplicationId(), serviceName.getServiceName());
         ElasticSearchClient client = getClient();
-        Map<String, Object> source = new HashMap();
+        Map<String, Object> source = new HashMap<>();
         source.put(ServiceNameTable.COLUMN_SERVICE_ID, serviceName.getServiceId());
         source.put(ServiceNameTable.COLUMN_APPLICATION_ID, serviceName.getApplicationId());
         source.put(ServiceNameTable.COLUMN_SERVICE_NAME, serviceName.getServiceName());

apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java

@@ -30,7 +30,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5, clevertension
+ * @author peng-yongsheng, clevertension
  */
 public class ServiceNameH2DAO extends H2DAO implements IServiceNameDAO {
     private final Logger logger = LoggerFactory.getLogger(ServiceNameH2DAO.class);
@@ -50,6 +50,7 @@ public class ServiceNameH2DAO extends H2DAO implements IServiceNameDAO {
         logger.debug("save service name register info, application id: {}, service name: {}", serviceName.getApplicationId(), serviceName.getServiceName());
         H2Client client = getClient();
         Map<String, Object> source = new HashMap<>();
+        source.put(ServiceNameTable.COLUMN_ID, serviceName.getId());
         source.put(ServiceNameTable.COLUMN_SERVICE_ID, serviceName.getServiceId());
         source.put(ServiceNameTable.COLUMN_APPLICATION_ID, serviceName.getApplicationId());
         source.put(ServiceNameTable.COLUMN_SERVICE_NAME, serviceName.getServiceName());

apm-collector-3.2.3/apm-collector-agentregister/src/test/java/org/skywalking/apm/collector/agentregister/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java

@@ -27,7 +27,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ApplicationRegisterServiceHandlerTestCase {
 

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleContext.java

@@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentserver;
 import org.skywalking.apm.collector.core.framework.Context;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentServerModuleContext extends Context {
 

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.cluster.ClusterDataListenerDefine;
 import org.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public abstract class AgentServerModuleDefine extends ModuleDefine implements ClusterDataListenerDefine {
 

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleException.java

@@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentserver;
 import org.skywalking.apm.collector.core.module.ModuleException;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentServerModuleException extends ModuleException {
 

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleGroupDefine.java

@@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.module.ModuleGroupDefine;
 import org.skywalking.apm.collector.core.module.ModuleInstaller;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentServerModuleGroupDefine implements ModuleGroupDefine {
 

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/AgentServerModuleInstaller.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.framework.Context;
 import org.skywalking.apm.collector.core.module.MultipleModuleInstaller;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentServerModuleInstaller extends MultipleModuleInstaller {
 

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyConfig.java

@@ -19,7 +19,7 @@
 package org.skywalking.apm.collector.agentserver.jetty;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentServerJettyConfig {
     public static String HOST;

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyConfigParser.java

@@ -25,7 +25,7 @@ import org.skywalking.apm.collector.core.util.ObjectUtils;
 import org.skywalking.apm.collector.core.util.StringUtils;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentServerJettyConfigParser implements ModuleConfigParser {
 

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyDataListener.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.cluster.ClusterModuleDefine;
 import org.skywalking.apm.collector.core.cluster.ClusterDataListener;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentServerJettyDataListener extends ClusterDataListener {
 

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java

@@ -33,7 +33,7 @@ import org.skywalking.apm.collector.core.server.Server;
 import org.skywalking.apm.collector.server.jetty.JettyServer;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentServerJettyModuleDefine extends AgentServerModuleDefine {
 

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleRegistration.java

@@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentserver.jetty;
 import org.skywalking.apm.collector.core.module.ModuleRegistration;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentServerJettyModuleRegistration extends ModuleRegistration {
 

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/AgentStreamGRPCServerHandler.java

@@ -29,7 +29,7 @@ import org.skywalking.apm.collector.server.jetty.ArgumentsParseException;
 import org.skywalking.apm.collector.server.jetty.JettyHandler;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamGRPCServerHandler extends JettyHandler {
 

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/AgentStreamJettyServerHandler.java

@@ -29,7 +29,7 @@ import org.skywalking.apm.collector.server.jetty.ArgumentsParseException;
 import org.skywalking.apm.collector.server.jetty.JettyHandler;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamJettyServerHandler extends JettyHandler {
 

apm-collector-3.2.3/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/UIJettyServerHandler.java

@@ -29,7 +29,7 @@ import org.skywalking.apm.collector.server.jetty.JettyHandler;
 import org.skywalking.apm.collector.ui.jetty.UIJettyDataListener;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class UIJettyServerHandler extends JettyHandler {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleContext.java

@@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream;
 import org.skywalking.apm.collector.core.framework.Context;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamModuleContext extends Context {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleDefine.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.core.cluster.ClusterDataListenerDefine;
 import org.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public abstract class AgentStreamModuleDefine extends ModuleDefine implements ClusterDataListenerDefine {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleException.java

@@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream;
 import org.skywalking.apm.collector.core.module.ModuleException;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamModuleException extends ModuleException {
     public AgentStreamModuleException(String message) {

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleGroupConfigParser.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.agentstream.config.BufferFileConfig;
 import org.skywalking.apm.collector.core.config.GroupConfigParser;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamModuleGroupConfigParser implements GroupConfigParser {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleGroupDefine.java

@@ -24,7 +24,7 @@ import org.skywalking.apm.collector.core.module.ModuleGroupDefine;
 import org.skywalking.apm.collector.core.module.ModuleInstaller;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamModuleGroupDefine implements ModuleGroupDefine {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/AgentStreamModuleInstaller.java

@@ -28,7 +28,7 @@ import org.skywalking.apm.collector.core.module.MultipleModuleInstaller;
 import org.skywalking.apm.collector.core.server.ServerException;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamModuleInstaller extends MultipleModuleInstaller {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/config/BufferFileConfig.java

@@ -19,7 +19,7 @@
 package org.skywalking.apm.collector.agentstream.config;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class BufferFileConfig {
     public static int BUFFER_OFFSET_MAX_FILE_SIZE = 10 * 1024 * 1024;

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCConfig.java

@@ -19,7 +19,7 @@
 package org.skywalking.apm.collector.agentstream.grpc;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamGRPCConfig {
     public static String HOST;

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCConfigParser.java

@@ -25,7 +25,7 @@ import org.skywalking.apm.collector.core.util.ObjectUtils;
 import org.skywalking.apm.collector.core.util.StringUtils;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamGRPCConfigParser implements ModuleConfigParser {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCDataListener.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.cluster.ClusterModuleDefine;
 import org.skywalking.apm.collector.core.cluster.ClusterDataListener;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamGRPCDataListener extends ClusterDataListener {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCModuleDefine.java

@@ -35,7 +35,7 @@ import org.skywalking.apm.collector.core.server.Server;
 import org.skywalking.apm.collector.server.grpc.GRPCServer;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamGRPCModuleDefine extends AgentStreamModuleDefine {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/AgentStreamGRPCModuleRegistration.java

@@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream.grpc;
 import org.skywalking.apm.collector.core.module.ModuleRegistration;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamGRPCModuleRegistration extends ModuleRegistration {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/grpc/handler/TraceSegmentServiceHandler.java

@@ -28,7 +28,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class TraceSegmentServiceHandler extends TraceSegmentServiceGrpc.TraceSegmentServiceImplBase implements GRPCHandler {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyConfig.java

@@ -19,7 +19,7 @@
 package org.skywalking.apm.collector.agentstream.jetty;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamJettyConfig {
     public static String HOST;

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyConfigParser.java

@@ -25,7 +25,7 @@ import org.skywalking.apm.collector.core.util.ObjectUtils;
 import org.skywalking.apm.collector.core.util.StringUtils;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamJettyConfigParser implements ModuleConfigParser {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyDataListener.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.cluster.ClusterModuleDefine;
 import org.skywalking.apm.collector.core.cluster.ClusterDataListener;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamJettyDataListener extends ClusterDataListener {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyModuleDefine.java

@@ -34,7 +34,7 @@ import org.skywalking.apm.collector.core.server.Server;
 import org.skywalking.apm.collector.server.jetty.JettyServer;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamJettyModuleDefine extends AgentStreamModuleDefine {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/AgentStreamJettyModuleRegistration.java

@@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentstream.jetty;
 import org.skywalking.apm.collector.core.module.ModuleRegistration;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class AgentStreamJettyModuleRegistration extends ModuleRegistration {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/TraceSegmentServletHandler.java

@@ -32,7 +32,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class TraceSegmentServletHandler extends JettyHandler {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/KeyWithStringValueJsonReader.java

@@ -23,7 +23,7 @@ import java.io.IOException;
 import org.skywalking.apm.network.proto.KeyWithStringValue;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class KeyWithStringValueJsonReader implements StreamJsonReader<KeyWithStringValue> {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/LogJsonReader.java

@@ -23,7 +23,7 @@ import java.io.IOException;
 import org.skywalking.apm.network.proto.LogMessage;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class LogJsonReader implements StreamJsonReader<LogMessage> {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/ReferenceJsonReader.java

@@ -23,7 +23,7 @@ import java.io.IOException;
 import org.skywalking.apm.network.proto.TraceSegmentReference;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class ReferenceJsonReader implements StreamJsonReader<TraceSegmentReference> {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/SegmentJsonReader.java

@@ -25,7 +25,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class SegmentJsonReader implements StreamJsonReader<TraceSegmentObject.Builder> {
 

apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/jetty/handler/reader/SpanJsonReader.java

@@ -23,7 +23,7 @@ import java.io.IOException;
 import org.skywalking.apm.network.proto.SpanObject;
 
 /**
- * @author pengys5
+ * @author peng-yongsheng
  */
 public class SpanJsonReader implements StreamJsonReader<SpanObject> {