Merge pull request #543 from OpenSkywalking/fix/h2bug

Fix/h2bug

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

@@ -69,9 +69,8 @@ public class ReferenceDecorator implements StandardBuilder {
     public void setEntryServiceId(int value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            referenceBuilder.setEntryServiceId(value);
         }
+        referenceBuilder.setEntryServiceId(value);
     }
 
     public String getEntryServiceName() {
@@ -85,9 +84,8 @@ public class ReferenceDecorator implements StandardBuilder {
     public void setEntryServiceName(String value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            referenceBuilder.setEntryServiceName(value);
         }
+        referenceBuilder.setEntryServiceName(value);
     }
 
     public int getEntryApplicationInstanceId() {
@@ -117,9 +115,8 @@ public class ReferenceDecorator implements StandardBuilder {
     public void setParentServiceId(int value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            referenceBuilder.setParentServiceId(value);
         }
+        referenceBuilder.setParentServiceId(value);
     }
 
     public int getParentSpanId() {
@@ -141,9 +138,8 @@ public class ReferenceDecorator implements StandardBuilder {
     public void setParentServiceName(String value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            referenceBuilder.setParentServiceName(value);
         }
+        referenceBuilder.setParentServiceName(value);
     }
 
     public UniqueId getParentTraceSegmentId() {
@@ -165,9 +161,8 @@ public class ReferenceDecorator implements StandardBuilder {
     public void setNetworkAddressId(int value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            referenceBuilder.setNetworkAddressId(value);
         }
+        referenceBuilder.setNetworkAddressId(value);
     }
 
     public String getNetworkAddress() {
@@ -181,14 +176,15 @@ public class ReferenceDecorator implements StandardBuilder {
     public void setNetworkAddress(String value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            referenceBuilder.setNetworkAddress(value);
         }
+        referenceBuilder.setNetworkAddress(value);
     }
 
     @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

@@ -133,9 +133,8 @@ public class SpanDecorator implements StandardBuilder {
     public void setPeerId(int peerId) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            spanBuilder.setPeerId(peerId);
         }
+        spanBuilder.setPeerId(peerId);
     }
 
     public String getPeer() {
@@ -149,9 +148,8 @@ public class SpanDecorator implements StandardBuilder {
     public void setPeer(String peer) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            spanBuilder.setPeer(peer);
         }
+        spanBuilder.setPeer(peer);
     }
 
     public int getOperationNameId() {
@@ -165,9 +163,8 @@ public class SpanDecorator implements StandardBuilder {
     public void setOperationNameId(int value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            spanBuilder.setOperationNameId(value);
         }
+        spanBuilder.setOperationNameId(value);
     }
 
     public String getOperationName() {
@@ -181,9 +178,8 @@ public class SpanDecorator implements StandardBuilder {
     public void setOperationName(String value) {
         if (isOrigin) {
             toBuilder();
-        } else {
-            spanBuilder.setOperationName(value);
         }
+        spanBuilder.setOperationName(value);
     }
 
     public boolean getIsError() {
@@ -195,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-boot/src/main/resources/log4j2.xml

@@ -17,7 +17,7 @@
   ~ Project repository: https://github.com/OpenSkywalking/skywalking
   -->
 
-<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"/>
@@ -28,7 +28,7 @@
         <logger name="org.apache.zookeeper" level="INFO"/>
         <logger name="org.skywalking.apm.collector.agentstream.worker.storage.PersistenceTimer" level="INFO"/>
         <logger name="io.grpc.netty.NettyServerHandler" level="INFO"/>
-        <Root level="debug">
+        <Root level="info">
             <AppenderRef ref="Console"/>
         </Root>
     </Loggers>

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);
             }