A mistake that reset the builder when id exchanged by the to builder method.

apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceDecorator.java

@@ -181,8 +181,10 @@ public class ReferenceDecorator implements StandardBuilder {
     }
 
     @Override public void toBuilder() {
-        this.isOrigin = false;
-        referenceBuilder = referenceObject.toBuilder();
-        standardBuilder.toBuilder();
+        if (this.isOrigin) {
+            this.isOrigin = false;
+            referenceBuilder = referenceObject.toBuilder();
+            standardBuilder.toBuilder();
+        }
     }
 }

apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentDecorator.java

@@ -78,7 +78,7 @@ public class SegmentDecorator implements StandardBuilder {
     }
 
     @Override public void toBuilder() {
-        if (!isOrigin) {
+        if (isOrigin) {
             this.isOrigin = false;
             this.segmentBuilder = segmentObject.toBuilder();
         }

apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanDecorator.java

@@ -191,8 +191,10 @@ public class SpanDecorator implements StandardBuilder {
     }
 
     @Override public void toBuilder() {
-        this.isOrigin = false;
-        spanBuilder = spanObject.toBuilder();
-        standardBuilder.toBuilder();
+        if (this.isOrigin) {
+            this.isOrigin = false;
+            spanBuilder = spanObject.toBuilder();
+            standardBuilder.toBuilder();
+        }
     }
 }

apm-collector/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java

@@ -77,14 +77,14 @@ public class SegmentPost {
 
         IServiceNameDAO serviceNameDAO = (IServiceNameDAO)DAOContainer.INSTANCE.get(IServiceNameDAO.class.getName());
 
-        ServiceNameDataDefine.ServiceName serviceName1 = new ServiceNameDataDefine.ServiceName("1", "", 0, 1);
-        serviceNameDAO.save(serviceName1);
-        ServiceNameDataDefine.ServiceName serviceName2 = new ServiceNameDataDefine.ServiceName("2", "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 2, 2);
-        serviceNameDAO.save(serviceName2);
-        ServiceNameDataDefine.ServiceName serviceName3 = new ServiceNameDataDefine.ServiceName("3", "/dubbox-case/case/dubbox-rest", 2, 3);
-        serviceNameDAO.save(serviceName3);
-        ServiceNameDataDefine.ServiceName serviceName4 = new ServiceNameDataDefine.ServiceName("4", "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 3, 4);
-        serviceNameDAO.save(serviceName4);
+//        ServiceNameDataDefine.ServiceName serviceName1 = new ServiceNameDataDefine.ServiceName("1", "", 0, 1);
+//        serviceNameDAO.save(serviceName1);
+//        ServiceNameDataDefine.ServiceName serviceName2 = new ServiceNameDataDefine.ServiceName("2", "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 2, 2);
+//        serviceNameDAO.save(serviceName2);
+//        ServiceNameDataDefine.ServiceName serviceName3 = new ServiceNameDataDefine.ServiceName("3", "/dubbox-case/case/dubbox-rest", 2, 3);
+//        serviceNameDAO.save(serviceName3);
+//        ServiceNameDataDefine.ServiceName serviceName4 = new ServiceNameDataDefine.ServiceName("4", "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()", 3, 4);
+//        serviceNameDAO.save(serviceName4);
 
         while (true) {
             JsonElement consumer = JsonFileReader.INSTANCE.read("json/segment/normal/dubbox-consumer.json");

apm-collector/apm-collector-boot/src/main/resources/application.yml

@@ -34,7 +34,7 @@ collector_inside:
 #    cluster_nodes: localhost:9300
 #    index_shards_number: 2
 #    index_replicas_number: 0
-#storage:
-#  h2:
-#    url: jdbc:h2:tcp://localhost/~/test
-#    user_name: sa
\ No newline at end of file
+storage:
+  h2:
+    url: jdbc:h2:tcp://localhost/~/test
+    user_name: sa
\ No newline at end of file

apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java

@@ -18,18 +18,17 @@
 
 package org.skywalking.apm.collector.storage.h2.dao;
 
-import org.skywalking.apm.collector.client.h2.H2ClientException;
-import org.skywalking.apm.collector.storage.dao.IBatchDAO;
-import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.skywalking.apm.collector.client.h2.H2ClientException;
+import org.skywalking.apm.collector.storage.dao.IBatchDAO;
+import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author peng-yongsheng
@@ -41,7 +40,7 @@ public class BatchH2DAO extends H2DAO implements IBatchDAO {
     public void batchPersistence(List<?> batchCollection) {
         if (batchCollection != null && batchCollection.size() > 0) {
             logger.debug("the batch collection size is {}", batchCollection.size());
-            Connection conn = null;
+            Connection conn;
             final Map<String, PreparedStatement> batchSqls = new HashMap<>();
             try {
                 conn = getClient().getConnection();
@@ -59,7 +58,7 @@ public class BatchH2DAO extends H2DAO implements IBatchDAO {
 
                     Object[] params = e.getParams();
                     if (params != null) {
-                        logger.debug("the sql is {}, params size is {}", e.getSql(), params.length);
+                        logger.debug("the sql is {}, params size is {}, params: {}", e.getSql(), params.length, params);
                         for (int i = 0; i < params.length; i++) {
                             ps.setObject(i + 1, params[i]);
                         }
@@ -79,7 +78,7 @@ public class BatchH2DAO extends H2DAO implements IBatchDAO {
 
     private H2SqlEntity getH2SqlEntity(Object entity) {
         if (entity instanceof H2SqlEntity) {
-            return (H2SqlEntity) entity;
+            return (H2SqlEntity)entity;
         }
         return null;
     }

apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java

@@ -60,7 +60,7 @@ public class ServiceReferenceH2DAO extends H2DAO implements IServiceReferenceDAO
         Map<String, JsonObject> serviceReferenceMap = new LinkedHashMap<>();
 
         try (ResultSet rs = client.executeQuery(sql, params)) {
-            if (rs.next()) {
+            while (rs.next()) {
                 int frontServiceId = rs.getInt(ServiceReferenceTable.COLUMN_FRONT_SERVICE_ID);
                 parseSubAggregate(serviceReferenceMap, rs, frontServiceId);
             }