fixed the gson reader deserialization bug, use the method toJson in gson class...

fixed the gson reader deserialization bug, use the method toJson in gson class to get the character contains escape character

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPost.java

@@ -6,8 +6,8 @@ import com.a.eye.skywalking.collector.actor.LocalAsyncWorkerRef;
 import com.a.eye.skywalking.collector.actor.LocalWorkerContext;
 import com.a.eye.skywalking.collector.actor.Role;
 import com.a.eye.skywalking.collector.worker.segment.entity.Segment;
-import com.a.eye.skywalking.collector.worker.segment.entity.SegmentJsonReader;
 import com.google.gson.JsonObject;
+import com.google.gson.stream.JsonReader;
 import java.io.BufferedReader;
 import java.io.IOException;
 import javax.servlet.ServletException;
@@ -57,12 +57,12 @@ public abstract class AbstractPost extends AbstractLocalAsyncWorker {
         }
 
         private void streamReader(BufferedReader bufferedReader) throws Exception {
-            try (SegmentJsonReader reader = new SegmentJsonReader(bufferedReader)) {
+            try (JsonReader reader = new JsonReader(bufferedReader)) {
                 readSegmentArray(reader);
             }
         }
 
-        private void readSegmentArray(SegmentJsonReader reader) throws Exception {
+        private void readSegmentArray(JsonReader reader) throws Exception {
             reader.beginArray();
             while (reader.hasNext()) {
                 Segment segment = new Segment();

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/GlobalTraceId.java

 package com.a.eye.skywalking.collector.worker.segment.entity;
 
+import com.google.gson.stream.JsonReader;
 import java.io.IOException;
 
 /**
@@ -12,8 +13,8 @@ public class GlobalTraceId extends DeserializeObject {
         return globalTraceId;
     }
 
-    public GlobalTraceId deserialize(SegmentJsonReader reader) throws IOException {
-        this.globalTraceId = reader.nextString().getValue();
+    public GlobalTraceId deserialize(JsonReader reader) throws IOException {
+        this.globalTraceId = reader.nextString();
         this.setJsonStr("\"" + globalTraceId + "\"");
         return this;
     }

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/JsonBuilder.java

 package com.a.eye.skywalking.collector.worker.segment.entity;
 
+import com.google.gson.Gson;
 import java.util.List;
 import java.util.Map;
 
@@ -9,6 +10,8 @@ import java.util.Map;
 public enum JsonBuilder {
     INSTANCE;
 
+    private final Gson gson = new Gson();
+
     public void append(StringBuilder builder, String name, String value, boolean first) {
         if (!first) {
             builder.append(",");
@@ -58,7 +61,8 @@ public enum JsonBuilder {
                 builder.append(",");
             }
             if (value instanceof String) {
-                builder.append("\"").append(key).append("\":\"").append(value).append("\"");
+//                builder.append("\"").append(key).append("\":\"").append(value).append("\"");
+                builder.append("\"").append(key).append("\":").append(gson.toJson(value));
             } else {
                 builder.append("\"").append(key).append("\":").append(value);
             }

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/LogData.java

 package com.a.eye.skywalking.collector.worker.segment.entity;
 
+import com.google.gson.stream.JsonReader;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,7 +20,7 @@ public class LogData extends DeserializeObject {
         return fields;
     }
 
-    public LogData deserialize(SegmentJsonReader reader) throws IOException {
+    public LogData deserialize(JsonReader reader) throws IOException {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append("{");
 
@@ -38,7 +39,7 @@ public class LogData extends DeserializeObject {
 
                     while (reader.hasNext()) {
                         String key = reader.nextName();
-                        String value = reader.nextString().getOriginValue();
+                        String value = reader.nextString();
                         fields.put(key, value);
                     }
                     reader.endObject();

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/Segment.java

 package com.a.eye.skywalking.collector.worker.segment.entity;
 
+import com.google.gson.stream.JsonReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -44,7 +45,7 @@ public class Segment extends DeserializeObject {
         return relatedGlobalTraces;
     }
 
-    public Segment deserialize(SegmentJsonReader reader) throws IOException {
+    public Segment deserialize(JsonReader reader) throws IOException {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append("{");
 
@@ -53,14 +54,12 @@ public class Segment extends DeserializeObject {
         while (reader.hasNext()) {
             switch (reader.nextName()) {
                 case "ts":
-                    SegmentJsonReader.StringValue ts = reader.nextString();
-                    this.traceSegmentId = ts.getValue();
-                    JsonBuilder.INSTANCE.append(stringBuilder, "ts", ts.getOriginValue(), first);
+                    this.traceSegmentId = reader.nextString();
+                    JsonBuilder.INSTANCE.append(stringBuilder, "ts", this.traceSegmentId, first);
                     break;
                 case "ac":
-                    SegmentJsonReader.StringValue ac = reader.nextString();
-                    this.applicationCode = ac.getValue();
-                    JsonBuilder.INSTANCE.append(stringBuilder, "ac", ac.getOriginValue(), first);
+                    this.applicationCode = reader.nextString();
+                    JsonBuilder.INSTANCE.append(stringBuilder, "ac", this.applicationCode, first);
                     break;
                 case "st":
                     long st = reader.nextLong();

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/SegmentDeserialize.java

 package com.a.eye.skywalking.collector.worker.segment.entity;
 
+import com.google.gson.stream.JsonReader;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.StringReader;
@@ -13,7 +14,7 @@ public enum SegmentDeserialize {
     INSTANCE;
 
     public Segment deserializeSingle(String singleSegmentJsonStr) throws IOException {
-        SegmentJsonReader reader = new SegmentJsonReader(new StringReader(singleSegmentJsonStr));
+        JsonReader reader = new JsonReader(new StringReader(singleSegmentJsonStr));
         Segment segment = new Segment();
         segment.deserialize(reader);
         return segment;
@@ -26,12 +27,12 @@ public enum SegmentDeserialize {
     }
 
     private void streamReader(List<Segment> segmentList, FileReader fileReader) throws Exception {
-        try (SegmentJsonReader reader = new SegmentJsonReader(fileReader)) {
+        try (JsonReader reader = new JsonReader(fileReader)) {
             readSegmentArray(segmentList, reader);
         }
     }
 
-    private void readSegmentArray(List<Segment> segmentList, SegmentJsonReader reader) throws Exception {
+    private void readSegmentArray(List<Segment> segmentList, JsonReader reader) throws Exception {
         reader.beginArray();
         while (reader.hasNext()) {
             Segment segment = new Segment();

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/SegmentJsonScope.java

-package com.a.eye.skywalking.collector.worker.segment.entity;
-
-/**
- * Copy from {@link com.google.gson.stream.JsonScope}, this class is invisible, {@link SegmentJsonReader} can not use it
- * because of the package is different
- *
- * @author pengys5
- */
-public class SegmentJsonScope {
-
-    /**
-     * An array with no elements requires no separators or newlines before
-     * it is closed.
-     */
-    static final int EMPTY_ARRAY = 1;
-
-    /**
-     * A array with at least one value requires a comma and newline before
-     * the next element.
-     */
-    static final int NONEMPTY_ARRAY = 2;
-
-    /**
-     * An object with no name/value pairs requires no separators or newlines
-     * before it is closed.
-     */
-    static final int EMPTY_OBJECT = 3;
-
-    /**
-     * An object whose most recent element is a key. The next element must
-     * be a value.
-     */
-    static final int DANGLING_NAME = 4;
-
-    /**
-     * An object with at least one name/value pair requires a comma and
-     * newline before the next element.
-     */
-    static final int NONEMPTY_OBJECT = 5;
-
-    /**
-     * No object or array has been started.
-     */
-    static final int EMPTY_DOCUMENT = 6;
-
-    /**
-     * A document with at an array or object.
-     */
-    static final int NONEMPTY_DOCUMENT = 7;
-
-    /**
-     * A document that's been closed and cannot be accessed.
-     */
-    static final int CLOSED = 8;
-}

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/Span.java

 package com.a.eye.skywalking.collector.worker.segment.entity;
 
+import com.google.gson.stream.JsonReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -56,7 +57,7 @@ public class Span extends DeserializeObject {
         return logs;
     }
 
-    public Span deserialize(SegmentJsonReader reader) throws IOException {
+    public Span deserialize(JsonReader reader) throws IOException {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append("{");
 
@@ -85,7 +86,7 @@ public class Span extends DeserializeObject {
                     JsonBuilder.INSTANCE.append(stringBuilder, "et", et, first);
                     break;
                 case "on":
-                    String on = reader.nextString().getValue();
+                    String on = reader.nextString();
                     this.operationName = on;
                     JsonBuilder.INSTANCE.append(stringBuilder, "on", on, first);
                     break;
@@ -95,7 +96,7 @@ public class Span extends DeserializeObject {
 
                     while (reader.hasNext()) {
                         String key = reader.nextName();
-                        String value = reader.nextString().getOriginValue();
+                        String value = reader.nextString();
                         tagsWithStr.put(key, value);
                     }
                     reader.endObject();

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/TraceSegmentRef.java

 package com.a.eye.skywalking.collector.worker.segment.entity;
 
+import com.google.gson.stream.JsonReader;
 import java.io.IOException;
 
 /**
@@ -31,7 +32,7 @@ public class TraceSegmentRef extends DeserializeObject {
         return peerHost;
     }
 
-    public TraceSegmentRef deserialize(SegmentJsonReader reader) throws IOException {
+    public TraceSegmentRef deserialize(JsonReader reader) throws IOException {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append("{");
 
@@ -40,7 +41,7 @@ public class TraceSegmentRef extends DeserializeObject {
         while (reader.hasNext()) {
             switch (reader.nextName()) {
                 case "ts":
-                    String ts = reader.nextString().getValue();
+                    String ts = reader.nextString();
                     this.traceSegmentId = ts;
                     JsonBuilder.INSTANCE.append(stringBuilder, "ts", ts, first);
                     break;
@@ -50,12 +51,12 @@ public class TraceSegmentRef extends DeserializeObject {
                     JsonBuilder.INSTANCE.append(stringBuilder, "si", si, first);
                     break;
                 case "ac":
-                    String ac = reader.nextString().getValue();
+                    String ac = reader.nextString();
                     this.applicationCode = ac;
                     JsonBuilder.INSTANCE.append(stringBuilder, "ac", ac, first);
                     break;
                 case "ph":
-                    String ph = reader.nextString().getValue();
+                    String ph = reader.nextString();
                     this.peerHost = ph;
                     JsonBuilder.INSTANCE.append(stringBuilder, "ph", ph, first);
                     break;

skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/entity/LogDataTestCase.java

 package com.a.eye.skywalking.collector.worker.segment.entity;
 
+import com.google.gson.stream.JsonReader;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Map;
@@ -15,7 +16,7 @@ public class LogDataTestCase {
     public void deserialize() throws IOException {
         LogData logData = new LogData();
 
-        SegmentJsonReader reader = new SegmentJsonReader(new StringReader("{\"tm\":1, \"fi\": {\"test1\":\"test1\",\"test2\":\"test2\"}, \"skip\":\"skip\"}"));
+        JsonReader reader = new JsonReader(new StringReader("{\"tm\":1, \"fi\": {\"test1\":\"test1\",\"test2\":\"test2\"}, \"skip\":\"skip\"}"));
         logData.deserialize(reader);
 
         Assert.assertEquals(1L, logData.getTime());

skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/entity/TraceSegmentRefTestCase.java

 package com.a.eye.skywalking.collector.worker.segment.entity;
 
+import com.google.gson.stream.JsonReader;
 import java.io.IOException;
 import java.io.StringReader;
 import org.junit.Assert;
@@ -13,7 +14,7 @@ public class TraceSegmentRefTestCase {
     @Test
     public void deserialize() throws IOException {
         TraceSegmentRef traceSegmentRef = new TraceSegmentRef();
-        SegmentJsonReader reader = new SegmentJsonReader(new StringReader("{\"ts\" :\"ts\",\"si\":0,\"ac\":\"ac\",\"ph\":\"ph\", \"skip\":\"skip\"}"));
+        JsonReader reader = new JsonReader(new StringReader("{\"ts\" :\"ts\",\"si\":0,\"ac\":\"ac\",\"ph\":\"ph\", \"skip\":\"skip\"}"));
         traceSegmentRef.deserialize(reader);
 
         Assert.assertEquals("ts", traceSegmentRef.getTraceSegmentId());

skywalking-collector/skywalking-collector-worker/src/test/resources/json/segment/post/normal/cache-service.json

@@ -367,6 +367,7 @@
             "tm": 1490923010332,
             "fi": {
               "stack": "com.weibo.api.motan.exception.MotanBizException: error_message: provider call process error, status: 503, error_code: 30001,r\n\tat com.weibo.api.motan.rpc.DefaultProvider.invoke(DefaultProvider.java:62)\n\tat com.weibo.api.motan.rpc.AbstractProvider.call(AbstractProvider.java:47)\n\tat com.weibo.api.motan.filter.opentracing.OpenTracingFilter.process(OpenTracingFilter.java:94)\n\tat com.weibo.api.motan.filter.opentracing.OpenTracingFilter.processProviderTrace(OpenTracingFilter.java:148)\n\tat com.weibo.api.motan.filter.opentracing.OpenTracingFilter.filter(OpenTracingFilter.java:58)\n\tat com.weibo.api.motan.protocol.support.ProtocolFilterDecorator$2.call(ProtocolFilterDecorator.java:150)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.call$original$doBagGo8(ProviderMessageRouter.java:96)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.call$original$doBagGo8$accessor$PEWyOMYz(ProviderMessageRouter.java)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter$auxiliary$s7ixnKeK.call(Unknown Source)\n\tat com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassInstanceMethodsInterceptor.intercept(ClassInstanceMethodsInterceptor.java:66)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.call(ProviderMessageRouter.java)\n\tat com.weibo.api.motan.transport.ProviderProtectedMessageRouter.call(ProviderProtectedMessageRouter.java:79)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.handle(ProviderMessageRouter.java:91)\n\tat com.weibo.api.motan.transport.support.DefaultRpcHeartbeatFactory$HeartMessageHandleWrapper.handle(DefaultRpcHeartbeatFactory.java:82)\n\tat com.weibo.api.motan.transport.netty.NettyChannelHandler.processRequest(NettyChannelHandler.java:139)\n\tat com.weibo.api.motan.transport.netty.NettyChannelHandler.access$000(NettyChannelHandler.java:47)\n\tat com.weibo.api.motan.transport.netty.NettyChannelHandler$1.run(NettyChannelHandler.java:116)\n\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)\n\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)\n\tat java.lang.Thread.run(Thread.java:745)\nCaused by: java.lang.NullPointerException\n\tat com.a.eye.skywalking.test.cache.jedis.JedisServiceManager.findWithException(JedisServiceManager.java:49)\n\tat com.a.eye.skywalking.test.cache.CacheServiceImpl.findCacheWithException(CacheServiceImpl.java:46)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat com.weibo.api.motan.rpc.DefaultProvider.invoke(DefaultProvider.java:57)\n\t... 19 more\ncom.weibo.api.motan.exception.MotanBizException: error_message: provider call process error, status: 503, error_code: 30001,r\n\tat com.weibo.api.motan.rpc.DefaultProvider.invoke(DefaultProvider.java:62)\n\tat com.weibo.api.motan.rpc.AbstractProvider.call(AbstractProvider.java:47)\n\tat com.weibo.api.motan.filter.opentracing.OpenTracingFilter.process(OpenTracingFilter.java:94)\n\tat com.weibo.api.motan.filter.opentracing.OpenTracingFilter.processProviderTrace(OpenTracingFilter.java:148)\n\tat com.weibo.api.motan.filter.opentracing.OpenTracingFilter.filter(OpenTracingFilter.java:58)\n\tat com.weibo.api.motan.protocol.support.ProtocolFilterDecorator$2.call(ProtocolFilterDecorator.java:150)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.call$original$doBagGo8(ProviderMessageRouter.java:96)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.call$original$doBagGo8$accessor$PEWyOMYz(ProviderMessageRouter.java)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter$auxiliary$s7ixnKeK.call(Unknown Source)\n\tat com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassInstanceMethodsInterceptor.intercept(ClassInstanceMethodsInterceptor.java:66)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.call(ProviderMessageRouter.java)\n\tat com.weibo.api.motan.",
+              "message": "error_message: provider call process error, status: 503, error_code: 30001,r\u003d0",
               "special.character": "\'\" \\ /"
             }
           }