Commit 62b43cde authored by 吴晟's avatar 吴晟
Browse files

Merge branch 'master' of https://github.com/wu-sheng/sky-walking 

# By ascrutae
# Via ascrutae
* 'master' of https://github.com/wu-sheng/sky-walking:
  1.删除不需要序列化的对象
parents f2091ff1 a2a32a92

skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/entity/TraceSpanNode.java

+21 −4
Original line number Original line Diff line number Diff line
@@ -5,38 +5,50 @@ import com.ai.cloud.skywalking.analysis.chainbuild.util.StringUtil; 
import com.ai.cloud.skywalking.analysis.chainbuild.util.TokenGenerator;

import com.ai.cloud.skywalking.analysis.chainbuild.util.TokenGenerator;

import com.ai.cloud.skywalking.protocol.CallType;

import com.ai.cloud.skywalking.protocol.CallType;

import com.ai.cloud.skywalking.protocol.Span;

import com.ai.cloud.skywalking.protocol.Span;

import com.google.gson.annotations.Expose;





import java.util.List;

import java.util.List;





public class TraceSpanNode {

public class TraceSpanNode {



    protected TraceSpanNode prev = null;

    protected TraceSpanNode prev = null;







    protected TraceSpanNode next = null;

    protected TraceSpanNode next = null;







    protected TraceSpanNode parent = null;

    protected TraceSpanNode parent = null;





    protected TraceSpanNode sub = null;





    protected TraceSpanNode sub = null;

    @Expose

    protected String prevNodeRefToken = null;

    protected String prevNodeRefToken = null;



    @Expose

    protected String nextNodeRefToken = null;

    protected String nextNodeRefToken = null;



    @Expose

    protected String parentNodeRefToken = null;

    protected String parentNodeRefToken = null;



    @Expose

    protected String subNodeRefToken = null;

    protected String subNodeRefToken = null;





    @Expose

    protected String nodeRefToken = null;

    protected String nodeRefToken = null;





    @Expose

    protected boolean visualNode = true;

    protected boolean visualNode = true;





    @Expose

    protected String parentLevel;

    protected String parentLevel;





    @Expose

    protected int levelId;

    protected int levelId;





    @Expose

    protected String viewPointId = "";

    protected String viewPointId = "";





    @Expose

    protected long cost = 0;

    protected long cost = 0;





    @Expose

    protected long callTimes = 0;

    protected long callTimes = 0;





    /**

    /**
@@ -45,30 +57,35 @@ public class TraceSpanNode { 
     * 1：异常<br/>

     * 1：异常<br/>

     * 异常判断原则：代码产生exception，并且此exception不在忽略列表中

     * 异常判断原则：代码产生exception，并且此exception不在忽略列表中

     */

     */

    @Expose

    protected byte statusCode = 0;

    protected byte statusCode = 0;





    /**

    /**

     * 节点调用的错误堆栈<br/>

     * 节点调用的错误堆栈<br/>

     * 堆栈以JAVA的exception为主要判断依据

     * 堆栈以JAVA的exception为主要判断依据

     */

     */

    @Expose

    protected String exceptionStack;

    protected String exceptionStack;

    /**

    /**

     * 节点类型描述<br/>

     * 节点类型描述<br/>

     * 已字符串的形式描述<br/>

     * 已字符串的形式描述<br/>

     * 如：java,dubbo等

     * 如：java,dubbo等

     */

     */

    @Expose

    protected String spanType = "";

    protected String spanType = "";





    /**

    /**

     * 节点调用过程中的业务字段<br/>

     * 节点调用过程中的业务字段<br/>

     * 如：业务系统设置的订单号，SQL语句等

     * 如：业务系统设置的订单号，SQL语句等

     */

     */

    @Expose

    protected String businessKey = "";

    protected String businessKey = "";





    /**

    /**

     * 节点调用所在的系统逻辑名称<br/>

     * 节点调用所在的系统逻辑名称<br/>

     * 由授权文件指定

     * 由授权文件指定

     */

     */

    @Expose

    protected String applicationId = "";

    protected String applicationId = "";





    public TraceSpanNode(TraceSpanNode parent, TraceSpanNode sub, TraceSpanNode prev, TraceSpanNode next, Span span, List<TraceSpanNode> spanContainer) {

    public TraceSpanNode(TraceSpanNode parent, TraceSpanNode sub, TraceSpanNode prev, TraceSpanNode next, Span span, List<TraceSpanNode> spanContainer) {

skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/entity/TraceSpanTree.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ import com.ai.cloud.skywalking.analysis.chainbuild.util.StringUtil; 
import com.ai.cloud.skywalking.analysis.chainbuild.util.TokenGenerator;

import com.ai.cloud.skywalking.analysis.chainbuild.util.TokenGenerator;

import com.ai.cloud.skywalking.protocol.Span;

import com.ai.cloud.skywalking.protocol.Span;

import com.google.gson.Gson;

import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.JsonObject;

import com.google.gson.JsonObject;

import com.google.gson.JsonParser;

import com.google.gson.JsonParser;

import com.google.gson.reflect.TypeToken;

import com.google.gson.reflect.TypeToken;
@@ -150,7 +151,7 @@ public class TraceSpanTree implements Writable { 




    public String serialize() throws TraceSpanTreeSerializeException {

    public String serialize() throws TraceSpanTreeSerializeException {

        beforeSerialize();

        beforeSerialize();

        return new Gson().toJson(this);

        return new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create().toJson(this);

    }

    }





    @Override

    @Override