Trace segment metric aggregate and alarm metric aggregate tested.

apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TimeBuilder.java

@@ -38,7 +38,7 @@ public enum TimeBuilder {
         new Duration("2017-03-01T00:02:01.001", "2017-03-01T00:05:01.001", 2),
 
         new Duration("2017-04-01T00:02:01.001", "2017-04-01T00:05:01.001", 2),
-        new Duration("2017-04-02T00:03:01.001", "2017-04-02T00:05:01.001", 2),
+        new Duration("2017-04-02T00:02:01.001", "2017-04-02T00:05:01.001", 2),
         new Duration("2017-04-03T00:02:01.001", "2017-04-03T00:05:01.001", 2),
 
         new Duration("2017-05-01T08:02:01.001", "2017-05-01T08:05:01.001", 2),

apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlarmAssertWorker.java

@@ -18,7 +18,6 @@
 
 package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker;
 
-import org.apache.skywalking.apm.collector.storage.table.MetricSource;
 import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker;
 import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 import org.apache.skywalking.apm.collector.core.data.StreamData;
@@ -26,6 +25,7 @@ import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.core.util.Const;
 import org.apache.skywalking.apm.collector.core.util.NumberFormatUtils;
 import org.apache.skywalking.apm.collector.storage.table.Metric;
+import org.apache.skywalking.apm.collector.storage.table.MetricSource;
 import org.apache.skywalking.apm.collector.storage.table.alarm.Alarm;
 import org.apache.skywalking.apm.collector.storage.table.alarm.AlarmType;
 import org.slf4j.Logger;
@@ -80,7 +80,7 @@ public abstract class AlarmAssertWorker<INPUT extends StreamData & Metric, OUTPU
                 onNext(alarm);
             }
         } else {
-            logger.error("Please check the metric source, the value must be {} or {}", MetricSource.Caller.getValue(), MetricSource.Callee.getValue());
+            logger.error("Please check the metric source, the value must be {} or {}, but {}", MetricSource.Caller.getValue(), MetricSource.Callee.getValue(), inputMetric.getSourceValue());
         }
     }
 
@@ -94,7 +94,6 @@ public abstract class AlarmAssertWorker<INPUT extends StreamData & Metric, OUTPU
         Double averageResponseTime = Double.valueOf(transactionSuccessDurationSum) / Double.valueOf(transactionSuccessCalls);
 
         if (inputMetric.getSourceValue().equals(MetricSource.Callee.getValue())) {
-
             if (averageResponseTime >= calleeAverageResponseTimeThreshold()) {
                 String id = String.valueOf(MetricSource.Callee.getValue()) + Const.ID_SPLIT + AlarmType.SLOW_RTT.getValue();
                 OUTPUT alarm = newAlarmObject(id, inputMetric);
@@ -104,20 +103,20 @@ public abstract class AlarmAssertWorker<INPUT extends StreamData & Metric, OUTPU
                 alarm.setAlarmContent("");
 
                 onNext(alarm);
-            } else if (inputMetric.getSourceValue().equals(MetricSource.Caller.getValue())) {
-                if (averageResponseTime >= callerAverageResponseTimeThreshold()) {
-                    String id = String.valueOf(MetricSource.Caller.getValue()) + Const.ID_SPLIT + AlarmType.SLOW_RTT.getValue();
-                    OUTPUT alarm = newAlarmObject(id, inputMetric);
-                    alarm.setAlarmType(AlarmType.SLOW_RTT.getValue());
-                    alarm.setLastTimeBucket(inputMetric.getTimeBucket());
-                    alarm.setSourceValue(MetricSource.Caller.getValue());
-                    alarm.setAlarmContent("");
-
-                    onNext(alarm);
-                }
-            } else {
-                logger.error("Please check the metric source, the value must be {} or {}", MetricSource.Caller.getValue(), MetricSource.Callee.getValue());
             }
+        } else if (inputMetric.getSourceValue().equals(MetricSource.Caller.getValue())) {
+            if (averageResponseTime >= callerAverageResponseTimeThreshold()) {
+                String id = String.valueOf(MetricSource.Caller.getValue()) + Const.ID_SPLIT + AlarmType.SLOW_RTT.getValue();
+                OUTPUT alarm = newAlarmObject(id, inputMetric);
+                alarm.setAlarmType(AlarmType.SLOW_RTT.getValue());
+                alarm.setLastTimeBucket(inputMetric.getTimeBucket());
+                alarm.setSourceValue(MetricSource.Caller.getValue());
+                alarm.setAlarmContent("");
+
+                onNext(alarm);
+            }
+        } else {
+            logger.error("Please check the metric source, the value must be {} or {}, but {}", MetricSource.Caller.getValue(), MetricSource.Callee.getValue(), inputMetric.getSourceValue());
         }
     }
 }
\ No newline at end of file

apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListCopy.java

@@ -27,7 +27,6 @@ public class ApplicationMetricAlarmListCopy {
 
     public static ApplicationAlarmList copy(ApplicationAlarmList applicationAlarmList) {
         ApplicationAlarmList newApplicationAlarmList = new ApplicationAlarmList();
-        newApplicationAlarmList.setId(applicationAlarmList.getId());
         newApplicationAlarmList.setMetricId(applicationAlarmList.getMetricId());
 
         newApplicationAlarmList.setAlarmContent(applicationAlarmList.getAlarmContent());

apm-collector/apm-collector-boot/src/main/resources/log4j2.xml

@@ -17,7 +17,7 @@
   ~
   -->
 
-<Configuration status="debug">
+<Configuration status="info">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n"/>
@@ -30,7 +30,7 @@
         <logger name="org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler" level="INFO"/>
         <logger name="org.apache.skywalking.apm.collector.analysis.worker.timer.PersistenceTimer" level="INFO"/>
         <logger name="io.grpc.netty" level="INFO"/>
-        <Root level="debug">
+        <Root level="info">
             <AppenderRef ref="Console"/>
         </Root>
     </Loggers>

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/base/dao/AbstractPersistenceEsDAO.java

@@ -49,7 +49,9 @@ public abstract class AbstractPersistenceEsDAO<STREAM_DATA extends StreamData> e
     @Override public final STREAM_DATA get(String id) {
         GetResponse getResponse = getClient().prepareGet(tableName(), id).get();
         if (getResponse.isExists()) {
-            return esDataToStreamData(getResponse.getSource());
+            STREAM_DATA streamData = esDataToStreamData(getResponse.getSource());
+            streamData.setId(id);
+            return streamData;
         } else {
             return null;
         }

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/base/dao/BatchEsDAO.java

@@ -22,6 +22,7 @@ import java.util.List;
 import org.apache.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient;
 import org.apache.skywalking.apm.collector.core.util.CollectionUtils;
 import org.apache.skywalking.apm.collector.storage.base.dao.IBatchDAO;
+import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.index.IndexRequestBuilder;
@@ -57,6 +58,9 @@ public class BatchEsDAO extends EsDAO implements IBatchDAO {
             BulkResponse bulkResponse = bulkRequest.execute().actionGet();
             if (bulkResponse.hasFailures()) {
                 logger.error(bulkResponse.buildFailureMessage());
+                for (BulkItemResponse itemResponse : bulkResponse.getItems()) {
+                    logger.error("Bulk request failure, index: {}, id: {}", itemResponse.getIndex(), itemResponse.getId());
+                }
             }
         }
     }

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/acp/AbstractApplicationComponentEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractApplicationComponentEsPersistenceDAO extends Abstr
 
     @Override protected final ApplicationComponent esDataToStreamData(Map<String, Object> source) {
         ApplicationComponent applicationComponent = new ApplicationComponent();
-        applicationComponent.setId((String)source.get(ApplicationComponentTable.COLUMN_ID));
         applicationComponent.setMetricId((String)source.get(ApplicationComponentTable.COLUMN_METRIC_ID));
 
         applicationComponent.setComponentId(((Number)source.get(ApplicationComponentTable.COLUMN_COMPONENT_ID)).intValue());
@@ -51,7 +50,6 @@ public abstract class AbstractApplicationComponentEsPersistenceDAO extends Abstr
 
     @Override protected final Map<String, Object> esStreamDataToEsData(ApplicationComponent streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(ApplicationComponentTable.COLUMN_ID, streamData.getId());
         source.put(ApplicationComponentTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(ApplicationComponentTable.COLUMN_COMPONENT_ID, streamData.getComponentId());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/AbstractApplicationAlarmListEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractApplicationAlarmListEsPersistenceDAO extends Abstr
 
     @Override protected final ApplicationAlarmList esDataToStreamData(Map<String, Object> source) {
         ApplicationAlarmList applicationAlarmList = new ApplicationAlarmList();
-        applicationAlarmList.setId((String)source.get(ApplicationAlarmListTable.COLUMN_ID));
         applicationAlarmList.setMetricId((String)source.get(ApplicationAlarmListTable.COLUMN_METRIC_ID));
         applicationAlarmList.setApplicationId(((Number)source.get(ApplicationAlarmListTable.COLUMN_APPLICATION_ID)).intValue());
         applicationAlarmList.setSourceValue(((Number)source.get(ApplicationAlarmListTable.COLUMN_SOURCE_VALUE)).intValue());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/amp/AbstractApplicationMetricEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractApplicationMetricEsPersistenceDAO extends Abstract
 
     @Override protected final ApplicationMetric esDataToStreamData(Map<String, Object> source) {
         ApplicationMetric applicationMetric = new ApplicationMetric();
-        applicationMetric.setId((String)source.get(ApplicationMetricTable.COLUMN_ID));
         applicationMetric.setMetricId((String)source.get(ApplicationMetricTable.COLUMN_METRIC_ID));
 
         applicationMetric.setApplicationId(((Number)source.get(ApplicationMetricTable.COLUMN_APPLICATION_ID)).intValue());
@@ -71,7 +70,6 @@ public abstract class AbstractApplicationMetricEsPersistenceDAO extends Abstract
 
     @Override protected final Map<String, Object> esStreamDataToEsData(ApplicationMetric streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(ApplicationMetricTable.COLUMN_ID, streamData.getId());
         source.put(ApplicationMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(ApplicationMetricTable.COLUMN_APPLICATION_ID, streamData.getApplicationId());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ampp/AbstractApplicationMappingEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractApplicationMappingEsPersistenceDAO extends Abstrac
 
     @Override protected final ApplicationMapping esDataToStreamData(Map<String, Object> source) {
         ApplicationMapping applicationMapping = new ApplicationMapping();
-        applicationMapping.setId((String)source.get(ApplicationMappingTable.COLUMN_ID));
         applicationMapping.setMetricId((String)source.get(ApplicationMappingTable.COLUMN_METRIC_ID));
 
         applicationMapping.setApplicationId(((Number)source.get(ApplicationMappingTable.COLUMN_APPLICATION_ID)).intValue());
@@ -51,7 +50,6 @@ public abstract class AbstractApplicationMappingEsPersistenceDAO extends Abstrac
 
     @Override protected final Map<String, Object> esStreamDataToEsData(ApplicationMapping streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(ApplicationMappingTable.COLUMN_ID, streamData.getId());
         source.put(ApplicationMappingTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(ApplicationMappingTable.COLUMN_APPLICATION_ID, streamData.getApplicationId());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/armp/AbstractApplicationReferenceMetricEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractApplicationReferenceMetricEsPersistenceDAO extends
 
     @Override protected final ApplicationReferenceMetric esDataToStreamData(Map<String, Object> source) {
         ApplicationReferenceMetric applicationReferenceMetric = new ApplicationReferenceMetric();
-        applicationReferenceMetric.setId((String)source.get(ApplicationReferenceMetricTable.COLUMN_ID));
         applicationReferenceMetric.setMetricId((String)source.get(ApplicationReferenceMetricTable.COLUMN_METRIC_ID));
 
         applicationReferenceMetric.setFrontApplicationId(((Number)source.get(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID)).intValue());
@@ -72,7 +71,6 @@ public abstract class AbstractApplicationReferenceMetricEsPersistenceDAO extends
 
     @Override protected final Map<String, Object> esStreamDataToEsData(ApplicationReferenceMetric streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(ApplicationReferenceMetricTable.COLUMN_ID, streamData.getId());
         source.put(ApplicationReferenceMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, streamData.getFrontApplicationId());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cpump/AbstractCpuMetricEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractCpuMetricEsPersistenceDAO extends AbstractPersiste
 
     @Override protected final CpuMetric esDataToStreamData(Map<String, Object> source) {
         CpuMetric cpuMetric = new CpuMetric();
-        cpuMetric.setId((String)source.get(CpuMetricTable.COLUMN_ID));
         cpuMetric.setMetricId((String)source.get(CpuMetricTable.COLUMN_METRIC_ID));
 
         cpuMetric.setInstanceId(((Number)source.get(CpuMetricTable.COLUMN_INSTANCE_ID)).intValue());
@@ -54,7 +53,6 @@ public abstract class AbstractCpuMetricEsPersistenceDAO extends AbstractPersiste
 
     @Override protected final Map<String, Object> esStreamDataToEsData(CpuMetric streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(CpuMetricTable.COLUMN_ID, streamData.getId());
         source.put(CpuMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(CpuMetricTable.COLUMN_INSTANCE_ID, streamData.getInstanceId());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/gcmp/AbstractGCMetricEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractGCMetricEsPersistenceDAO extends AbstractPersisten
 
     @Override protected final GCMetric esDataToStreamData(Map<String, Object> source) {
         GCMetric gcMetric = new GCMetric();
-        gcMetric.setId((String)source.get(GCMetricTable.COLUMN_ID));
         gcMetric.setMetricId((String)source.get(GCMetricTable.COLUMN_METRIC_ID));
 
         gcMetric.setInstanceId(((Number)source.get(GCMetricTable.COLUMN_INSTANCE_ID)).intValue());
@@ -56,7 +55,6 @@ public abstract class AbstractGCMetricEsPersistenceDAO extends AbstractPersisten
 
     @Override protected final Map<String, Object> esStreamDataToEsData(GCMetric streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(GCMetricTable.COLUMN_ID, streamData.getId());
         source.put(GCMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(GCMetricTable.COLUMN_INSTANCE_ID, streamData.getInstanceId());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/imp/AbstractInstanceMetricEsPersistenceDAO.java

@@ -41,7 +41,6 @@ public abstract class AbstractInstanceMetricEsPersistenceDAO extends AbstractPer
     @Override protected final InstanceMetric esDataToStreamData(Map<String, Object> source) {
         InstanceMetric instanceMetric = new InstanceMetric();
 
-        instanceMetric.setId((String)source.get(InstanceMetricTable.COLUMN_ID));
         instanceMetric.setMetricId((String)source.get(InstanceMetricTable.COLUMN_METRIC_ID));
         instanceMetric.setApplicationId((Integer)source.get(InstanceMetricTable.COLUMN_APPLICATION_ID));
         instanceMetric.setInstanceId((Integer)source.get(InstanceMetricTable.COLUMN_INSTANCE_ID));
@@ -68,7 +67,6 @@ public abstract class AbstractInstanceMetricEsPersistenceDAO extends AbstractPer
 
     @Override protected final Map<String, Object> esStreamDataToEsData(InstanceMetric streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(InstanceMetricTable.COLUMN_ID, streamData.getId());
         source.put(InstanceMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(InstanceMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/impp/AbstractInstanceMappingEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractInstanceMappingEsPersistenceDAO extends AbstractPe
 
     @Override protected final InstanceMapping esDataToStreamData(Map<String, Object> source) {
         InstanceMapping instanceMapping = new InstanceMapping();
-        instanceMapping.setId((String)source.get(InstanceMappingTable.COLUMN_ID));
         instanceMapping.setMetricId((String)source.get(InstanceMappingTable.COLUMN_METRIC_ID));
 
         instanceMapping.setApplicationId(((Number)source.get(InstanceMappingTable.COLUMN_APPLICATION_ID)).intValue());
@@ -52,7 +51,6 @@ public abstract class AbstractInstanceMappingEsPersistenceDAO extends AbstractPe
 
     @Override protected final Map<String, Object> esStreamDataToEsData(InstanceMapping streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(InstanceMappingTable.COLUMN_ID, streamData.getId());
         source.put(InstanceMappingTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(InstanceMappingTable.COLUMN_APPLICATION_ID, streamData.getApplicationId());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/irmp/AbstractInstanceReferenceMetricEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractInstanceReferenceMetricEsPersistenceDAO extends Ab
 
     @Override protected final InstanceReferenceMetric esDataToStreamData(Map<String, Object> source) {
         InstanceReferenceMetric instanceReferenceMetric = new InstanceReferenceMetric();
-        instanceReferenceMetric.setId((String)source.get(InstanceReferenceMetricTable.COLUMN_ID));
         instanceReferenceMetric.setMetricId((String)source.get(InstanceReferenceMetricTable.COLUMN_METRIC_ID));
 
         instanceReferenceMetric.setFrontApplicationId((Integer)source.get(InstanceReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID));
@@ -70,7 +69,6 @@ public abstract class AbstractInstanceReferenceMetricEsPersistenceDAO extends Ab
 
     @Override protected final Map<String, Object> esStreamDataToEsData(InstanceReferenceMetric streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(InstanceReferenceMetricTable.COLUMN_ID, streamData.getId());
         source.put(InstanceReferenceMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(InstanceReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, streamData.getFrontApplicationId());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/memorymp/AbstractMemoryMetricEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractMemoryMetricEsPersistenceDAO extends AbstractPersi
 
     @Override protected final MemoryMetric esDataToStreamData(Map<String, Object> source) {
         MemoryMetric memoryMetric = new MemoryMetric();
-        memoryMetric.setId((String)source.get(MemoryMetricTable.COLUMN_ID));
         memoryMetric.setMetricId((String)source.get(MemoryMetricTable.COLUMN_METRIC_ID));
 
         memoryMetric.setInstanceId(((Number)source.get(MemoryMetricTable.COLUMN_INSTANCE_ID)).intValue());
@@ -58,7 +57,6 @@ public abstract class AbstractMemoryMetricEsPersistenceDAO extends AbstractPersi
 
     @Override protected final Map<String, Object> esStreamDataToEsData(MemoryMetric streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(MemoryMetricTable.COLUMN_ID, streamData.getId());
         source.put(MemoryMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(MemoryMetricTable.COLUMN_INSTANCE_ID, streamData.getInstanceId());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/mpoolmp/AbstractMemoryPoolMetricEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractMemoryPoolMetricEsPersistenceDAO extends AbstractP
 
     @Override protected final MemoryPoolMetric esDataToStreamData(Map<String, Object> source) {
         MemoryPoolMetric memoryPoolMetric = new MemoryPoolMetric();
-        memoryPoolMetric.setId((String)source.get(MemoryPoolMetricTable.COLUMN_ID));
         memoryPoolMetric.setMetricId((String)source.get(MemoryPoolMetricTable.COLUMN_METRIC_ID));
 
         memoryPoolMetric.setInstanceId(((Number)source.get(MemoryPoolMetricTable.COLUMN_INSTANCE_ID)).intValue());
@@ -58,7 +57,6 @@ public abstract class AbstractMemoryPoolMetricEsPersistenceDAO extends AbstractP
 
     @Override protected final Map<String, Object> esStreamDataToEsData(MemoryPoolMetric streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(MemoryPoolMetricTable.COLUMN_ID, streamData.getId());
         source.put(MemoryPoolMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(MemoryPoolMetricTable.COLUMN_INSTANCE_ID, streamData.getInstanceId());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/smp/AbstractServiceMetricEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractServiceMetricEsPersistenceDAO extends AbstractPers
 
     @Override protected final ServiceMetric esDataToStreamData(Map<String, Object> source) {
         ServiceMetric serviceMetric = new ServiceMetric();
-        serviceMetric.setId((String)source.get(ServiceMetricTable.COLUMN_ID));
         serviceMetric.setMetricId((String)source.get(ServiceMetricTable.COLUMN_METRIC_ID));
 
         serviceMetric.setApplicationId(((Number)source.get(ServiceMetricTable.COLUMN_APPLICATION_ID)).intValue());
@@ -69,7 +68,6 @@ public abstract class AbstractServiceMetricEsPersistenceDAO extends AbstractPers
 
     @Override protected final Map<String, Object> esStreamDataToEsData(ServiceMetric streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(ServiceMetricTable.COLUMN_ID, streamData.getId());
         source.put(ServiceMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(ServiceMetricTable.COLUMN_APPLICATION_ID, streamData.getApplicationId());

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/srmp/AbstractServiceReferenceMetricEsPersistenceDAO.java

@@ -40,7 +40,6 @@ public abstract class AbstractServiceReferenceMetricEsPersistenceDAO extends Abs
 
     @Override protected final ServiceReferenceMetric esDataToStreamData(Map<String, Object> source) {
         ServiceReferenceMetric serviceReferenceMetric = new ServiceReferenceMetric();
-        serviceReferenceMetric.setId((String)source.get(ServiceReferenceMetricTable.COLUMN_ID));
         serviceReferenceMetric.setMetricId((String)source.get(ServiceReferenceMetricTable.COLUMN_METRIC_ID));
 
         serviceReferenceMetric.setFrontApplicationId(((Number)source.get(ServiceReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID)).intValue());
@@ -72,7 +71,6 @@ public abstract class AbstractServiceReferenceMetricEsPersistenceDAO extends Abs
 
     @Override protected final Map<String, Object> esStreamDataToEsData(ServiceReferenceMetric streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(ServiceReferenceMetricTable.COLUMN_ID, streamData.getId());
         source.put(ServiceReferenceMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(ServiceReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, streamData.getFrontApplicationId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/acp/AbstractApplicationComponentH2PersistenceDAO.java

@@ -49,6 +49,7 @@ public abstract class AbstractApplicationComponentH2PersistenceDAO extends Abstr
 
     @Override protected final Map<String, Object> streamDataToH2Data(ApplicationComponent streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(ApplicationComponentTable.COLUMN_ID, streamData.getId());
         source.put(ApplicationComponentTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(ApplicationComponentTable.COLUMN_COMPONENT_ID, streamData.getComponentId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/AbstractApplicationAlarmListH2PersistenceDAO.java

@@ -54,6 +54,7 @@ public abstract class AbstractApplicationAlarmListH2PersistenceDAO extends Abstr
 
     @Override protected final Map<String, Object> streamDataToH2Data(ApplicationAlarmList streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(ApplicationAlarmListTable.COLUMN_ID, streamData.getId());
         source.put(ApplicationAlarmListTable.COLUMN_METRIC_ID, streamData.getMetricId());
         source.put(ApplicationAlarmListTable.COLUMN_SOURCE_VALUE, streamData.getSourceValue());
 

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/amp/AbstractApplicationMetricH2PersistenceDAO.java

@@ -69,6 +69,7 @@ public abstract class AbstractApplicationMetricH2PersistenceDAO extends Abstract
 
     @Override protected final Map<String, Object> streamDataToH2Data(ApplicationMetric streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(ApplicationMetricTable.COLUMN_ID, streamData.getId());
         source.put(ApplicationMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(ApplicationMetricTable.COLUMN_APPLICATION_ID, streamData.getApplicationId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ampp/AbstractApplicationMappingH2PersistenceDAO.java

@@ -49,6 +49,7 @@ public abstract class AbstractApplicationMappingH2PersistenceDAO extends Abstrac
 
     @Override protected final Map<String, Object> streamDataToH2Data(ApplicationMapping streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(ApplicationMappingTable.COLUMN_ID, streamData.getId());
         source.put(ApplicationMappingTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(ApplicationMappingTable.COLUMN_APPLICATION_ID, streamData.getApplicationId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/armp/AbstractApplicationReferenceMetricH2PersistenceDAO.java

@@ -70,6 +70,7 @@ public abstract class AbstractApplicationReferenceMetricH2PersistenceDAO extends
 
     @Override protected final Map<String, Object> streamDataToH2Data(ApplicationReferenceMetric streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(ApplicationReferenceMetricTable.COLUMN_ID, streamData.getId());
         source.put(ApplicationReferenceMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, streamData.getFrontApplicationId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cpump/AbstractCpuMetricH2PersistenceDAO.java

@@ -52,6 +52,7 @@ public abstract class AbstractCpuMetricH2PersistenceDAO extends AbstractPersiste
 
     @Override protected final Map<String, Object> streamDataToH2Data(CpuMetric streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(CpuMetricTable.COLUMN_ID, streamData.getId());
         source.put(CpuMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(CpuMetricTable.COLUMN_INSTANCE_ID, streamData.getInstanceId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/gcmp/AbstractGCMetricH2PersistenceDAO.java

@@ -54,6 +54,7 @@ public abstract class AbstractGCMetricH2PersistenceDAO extends AbstractPersisten
 
     @Override protected final Map<String, Object> streamDataToH2Data(GCMetric streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(GCMetricTable.COLUMN_ID, streamData.getId());
         source.put(GCMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(GCMetricTable.COLUMN_INSTANCE_ID, streamData.getInstanceId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/imp/AbstractInstanceMetricH2PersistenceDAO.java

@@ -66,8 +66,7 @@ public abstract class AbstractInstanceMetricH2PersistenceDAO extends AbstractPer
 
     @Override protected final Map<String, Object> streamDataToH2Data(InstanceMetric streamData) {
         Map<String, Object> source = new HashMap<>();
-        source.put(InstanceMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
-
+        source.put(InstanceMetricTable.COLUMN_ID, streamData.getId());
         source.put(InstanceMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(InstanceMetricTable.COLUMN_APPLICATION_ID, streamData.getApplicationId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/impp/AbstractInstanceMappingH2PersistenceDAO.java

@@ -50,6 +50,7 @@ public abstract class AbstractInstanceMappingH2PersistenceDAO extends AbstractPe
 
     @Override protected final Map<String, Object> streamDataToH2Data(InstanceMapping streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(InstanceMappingTable.COLUMN_ID, streamData.getId());
         source.put(InstanceMappingTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(InstanceMappingTable.COLUMN_APPLICATION_ID, streamData.getApplicationId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/irmp/AbstractInstanceReferenceMetricH2PersistenceDAO.java

@@ -68,6 +68,7 @@ public abstract class AbstractInstanceReferenceMetricH2PersistenceDAO extends Ab
 
     @Override protected final Map<String, Object> streamDataToH2Data(InstanceReferenceMetric streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(InstanceReferenceMetricTable.COLUMN_ID, streamData.getId());
         source.put(InstanceReferenceMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(InstanceReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, streamData.getFrontApplicationId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/memorymp/AbstractMemoryMetricH2PersistenceDAO.java

@@ -56,6 +56,7 @@ public abstract class AbstractMemoryMetricH2PersistenceDAO extends AbstractPersi
 
     @Override protected final Map<String, Object> streamDataToH2Data(MemoryMetric streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(MemoryMetricTable.COLUMN_ID, streamData.getId());
         source.put(MemoryMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(MemoryMetricTable.COLUMN_INSTANCE_ID, streamData.getInstanceId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/mpoolmp/AbstractMemoryPoolMetricH2PersistenceDAO.java

@@ -56,6 +56,7 @@ public abstract class AbstractMemoryPoolMetricH2PersistenceDAO extends AbstractP
 
     @Override protected final Map<String, Object> streamDataToH2Data(MemoryPoolMetric streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(MemoryPoolMetricTable.COLUMN_ID, streamData.getId());
         source.put(MemoryPoolMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(MemoryPoolMetricTable.COLUMN_INSTANCE_ID, streamData.getInstanceId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/smp/AbstractServiceMetricH2PersistenceDAO.java

@@ -67,6 +67,7 @@ public abstract class AbstractServiceMetricH2PersistenceDAO extends AbstractPers
 
     @Override protected final Map<String, Object> streamDataToH2Data(ServiceMetric streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(ServiceMetricTable.COLUMN_ID, streamData.getId());
         source.put(ServiceMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(ServiceMetricTable.COLUMN_APPLICATION_ID, streamData.getApplicationId());

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/srmp/AbstractServiceReferenceMetricH2PersistenceDAO.java

@@ -70,6 +70,7 @@ public abstract class AbstractServiceReferenceMetricH2PersistenceDAO extends Abs
 
     @Override protected final Map<String, Object> streamDataToH2Data(ServiceReferenceMetric streamData) {
         Map<String, Object> source = new HashMap<>();
+        source.put(ServiceReferenceMetricTable.COLUMN_ID, streamData.getId());
         source.put(ServiceReferenceMetricTable.COLUMN_METRIC_ID, streamData.getMetricId());
 
         source.put(ServiceReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, streamData.getFrontApplicationId());