1.将Context修改成List实现

2. 将RPC Client的序号作为 RPC Server的父级序号
3. 如果存在RPC调用包含其他调用，其他调用的埋点信息将不发送

skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ApplicationExceptionHandler.java

-package com.ai.cloud.skywalking.buriedpoint;
-
-import static com.ai.cloud.skywalking.conf.Config.BuriedPoint.EXCLUSIVE_EXCEPTIONS;
-
-import java.util.HashSet;
-import java.util.Set;
-
-
-import com.ai.cloud.skywalking.api.IExceptionHandler;
-import com.ai.cloud.skywalking.conf.Config;
-import com.ai.cloud.skywalking.context.Context;
-import com.ai.cloud.skywalking.logging.LogManager;
-import com.ai.cloud.skywalking.logging.Logger;
-import com.ai.cloud.skywalking.protocol.Span;
-
-public class ApplicationExceptionHandler implements IExceptionHandler {
-	private static Logger logger = LogManager
-			.getLogger(ApplicationExceptionHandler.class);
-
-	private static String EXCEPTION_SPLIT = ",";
-
-	private static Set<String> exclusiveExceptionSet = null;
-
-	@Override
-	public void handleException(Throwable th) {
-		try {
-			if (exclusiveExceptionSet == null) {
-				Set<String> exclusiveExceptions = new HashSet<String>();
-
-				String[] exceptions = EXCLUSIVE_EXCEPTIONS
-						.split(EXCEPTION_SPLIT);
-				for (String exception : exceptions) {
-					exclusiveExceptions.add(exception);
-				}
-				exclusiveExceptionSet = exclusiveExceptions;
-			}
-
-			Span span = Context.getLastSpan();
-			span.handleException(th, exclusiveExceptionSet,
-					Config.BuriedPoint.MAX_EXCEPTION_STACK_LENGTH);
-		} catch (Throwable t) {
-			logger.error(t.getMessage(), t);
-		}
-	}
-
-}

skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/BuriedPointInvoker.java

+package com.ai.cloud.skywalking.buriedpoint;
+
+import com.ai.cloud.skywalking.buffer.ContextBuffer;
+import com.ai.cloud.skywalking.conf.AuthDesc;
+import com.ai.cloud.skywalking.conf.Config;
+import com.ai.cloud.skywalking.context.Context;
+import com.ai.cloud.skywalking.logging.LogManager;
+import com.ai.cloud.skywalking.logging.Logger;
+import com.ai.cloud.skywalking.model.ContextData;
+import com.ai.cloud.skywalking.protocol.Span;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static com.ai.cloud.skywalking.conf.Config.BuriedPoint.EXCLUSIVE_EXCEPTIONS;
+
+public class BuriedPointInvoker {
+
+    private static Logger logger = LogManager
+            .getLogger(BuriedPointInvoker.class);
+
+    private static String EXCEPTION_SPLIT = ",";
+
+    private static Set<String> exclusiveExceptionSet = null;
+
+
+    public ContextData beforeInvoker(Span spanData) {
+        if (Config.BuriedPoint.PRINTF) {
+            logger.debug("TraceId:" + spanData.getTraceId()
+                    + "\tviewpointId:" + spanData.getViewPointId()
+                    + "\tParentLevelId:" + spanData.getParentLevel()
+                    + "\tLevelId:" + spanData.getLevelId());
+        }
+
+        // 将新创建的Context存放到ThreadLocal栈中。
+        Context.append(spanData);
+        // 并将当前的Context返回回去
+        return new ContextData(spanData);
+    }
+
+    public void afterInvoker() {
+        try {
+            if (!AuthDesc.isAuth())
+                return;
+
+            // 弹出上下文的栈顶中的元素
+            Span spanData = Context.removeLastSpan();
+            if (spanData == null || spanData.isInvalidate()) {
+                return;
+            }
+
+            // 加上花费时间
+            spanData.setCost(System.currentTimeMillis()
+                    - spanData.getStartDate());
+
+            if (Config.BuriedPoint.PRINTF) {
+                logger.debug("TraceId:" + spanData.getTraceId()
+                        + "\tviewpointId:" + spanData.getViewPointId()
+                        + "\tParentLevelId:" + spanData.getParentLevel()
+                        + "\tLevelId:" + spanData.getLevelId()
+                        + "\tbusinessKey:" + spanData.getBusinessKey());
+            }
+
+            ContextBuffer.save(spanData);
+        } catch (Throwable t) {
+            logger.error(t.getMessage(), t);
+        }
+    }
+
+    public void handleException(Throwable th) {
+        try {
+            if (exclusiveExceptionSet == null) {
+                Set<String> exclusiveExceptions = new HashSet<String>();
+
+                String[] exceptions = EXCLUSIVE_EXCEPTIONS
+                        .split(EXCEPTION_SPLIT);
+                for (String exception : exceptions) {
+                    exclusiveExceptions.add(exception);
+                }
+                exclusiveExceptionSet = exclusiveExceptions;
+            }
+
+            Span span = Context.getLastSpan();
+            span.handleException(th, exclusiveExceptionSet,
+                    Config.BuriedPoint.MAX_EXCEPTION_STACK_LENGTH);
+        } catch (Throwable t) {
+            logger.error(t.getMessage(), t);
+        }
+    }
+}

skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java

 package com.ai.cloud.skywalking.buriedpoint;
 
 import com.ai.cloud.skywalking.api.IBuriedPointSender;
-import com.ai.cloud.skywalking.buffer.ContextBuffer;
 import com.ai.cloud.skywalking.conf.AuthDesc;
-import com.ai.cloud.skywalking.conf.Config;
-import com.ai.cloud.skywalking.context.Context;
 import com.ai.cloud.skywalking.logging.LogManager;
 import com.ai.cloud.skywalking.logging.Logger;
 import com.ai.cloud.skywalking.model.ContextData;
@@ -13,54 +10,27 @@ import com.ai.cloud.skywalking.model.Identification;
 import com.ai.cloud.skywalking.protocol.Span;
 import com.ai.cloud.skywalking.util.ContextGenerator;
 
-public class LocalBuriedPointSender extends ApplicationExceptionHandler
-		implements IBuriedPointSender {
+public class LocalBuriedPointSender extends BuriedPointInvoker
+        implements IBuriedPointSender {
 
-	private static Logger logger = LogManager
-			.getLogger(LocalBuriedPointSender.class);
+    private static Logger logger = LogManager
+            .getLogger(LocalBuriedPointSender.class);
 
-	public ContextData beforeSend(Identification id) {
-		try {
-			if (!AuthDesc.isAuth())
-				return new EmptyContextData();
+    public ContextData beforeSend(Identification id) {
+        try {
+            if (!AuthDesc.isAuth())
+                return new EmptyContextData();
 
-			Span spanData = ContextGenerator.generateSpanFromThreadLocal(id);
-			// 将新创建的Context存放到ThreadLocal栈中。
-			Context.append(spanData);
-			// 并将当前的Context返回回去
-			return new ContextData(spanData);
-		} catch (Throwable t) {
-			logger.error(t.getMessage(), t);
-			return new EmptyContextData();
-		}
-	}
+            Span spanData = ContextGenerator.generateSpanFromThreadLocal(id);
 
-	public void afterSend() {
-		try {
-			if (!AuthDesc.isAuth())
-				return;
+            return super.beforeInvoker(spanData);
+        } catch (Throwable t) {
+            logger.error(t.getMessage(), t);
+            return new EmptyContextData();
+        }
+    }
 
-			// 弹出上下文的栈顶中的元素
-			Span spanData = Context.removeLastSpan();
-			if (spanData == null) {
-				return;
-			}
-
-			// 加上花费时间
-			spanData.setCost(System.currentTimeMillis()
-					- spanData.getStartDate());
-
-			if (Config.BuriedPoint.PRINTF) {
-				logger.debug("TraceId:" + spanData.getTraceId()
-						+ "\tviewpointId:" + spanData.getViewPointId()
-						+ "\tParentLevelId:" + spanData.getParentLevel()
-						+ "\tLevelId:" + spanData.getLevelId()
-						+ "\tbusinessKey:" + spanData.getBusinessKey());
-			}
-
-			ContextBuffer.save(spanData);
-		} catch (Throwable t) {
-			logger.error(t.getMessage(), t);
-		}
-	}
+    public void afterSend() {
+        super.afterInvoker();
+    }
 }

skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointReceiver.java

 package com.ai.cloud.skywalking.buriedpoint;
 
 import com.ai.cloud.skywalking.api.IBuriedPointReceiver;
-import com.ai.cloud.skywalking.buffer.ContextBuffer;
 import com.ai.cloud.skywalking.conf.AuthDesc;
-import com.ai.cloud.skywalking.conf.Config;
 import com.ai.cloud.skywalking.context.Context;
 import com.ai.cloud.skywalking.logging.LogManager;
 import com.ai.cloud.skywalking.logging.Logger;
 import com.ai.cloud.skywalking.model.ContextData;
 import com.ai.cloud.skywalking.model.Identification;
 import com.ai.cloud.skywalking.protocol.Span;
+import com.ai.cloud.skywalking.protocol.SpanType;
 import com.ai.cloud.skywalking.util.ContextGenerator;
 
-public class RPCBuriedPointReceiver extends ApplicationExceptionHandler
-		implements IBuriedPointReceiver {
-
-	private static Logger logger = LogManager
-			.getLogger(RPCBuriedPointReceiver.class);
-
-	public void afterReceived() {
-		try {
-			if (!AuthDesc.isAuth())
-				return;
-
-			// 获取上下文的栈顶中的元素
-			Span spanData = Context.removeLastSpan();
-			// 填上必要信息
-			spanData.setCost(System.currentTimeMillis()
-					- spanData.getStartDate());
-			// 存放到本地发送进程中
-			ContextBuffer.save(spanData);
-		} catch (Throwable t) {
-			logger.error(t.getMessage(), t);
-		}
-	}
-
-	public void beforeReceived(ContextData context, Identification id) {
-		try {
-			if (!AuthDesc.isAuth())
-				return;
-
-			Span spanData = ContextGenerator.generateSpanFromContextData(
-					context, id);
-			// 设置是否为接收端
-			spanData.setReceiver(true);
-
-			if (Config.BuriedPoint.PRINTF) {
-				logger.debug("TraceId:" + spanData.getTraceId()
-						+ "\tviewpointId:" + spanData.getViewPointId()
-						+ "\tParentLevelId:" + spanData.getParentLevel()
-						+ "\tLevelId:" + spanData.getLevelId());
-			}
-
-			Context.append(spanData);
-		} catch (Throwable t) {
-			logger.error(t.getMessage(), t);
-		}
-	}
+public class RPCBuriedPointReceiver extends BuriedPointInvoker
+        implements IBuriedPointReceiver {
+
+    private static Logger logger = LogManager
+            .getLogger(RPCBuriedPointReceiver.class);
+
+    public void afterReceived() {
+        super.afterInvoker();
+    }
+
+    public void beforeReceived(ContextData context, Identification id) {
+        try {
+            if (!AuthDesc.isAuth())
+                return;
+
+            Span spanData = ContextGenerator.generateSpanFromContextData(
+                    context, id);
+            // 设置是否为接收端
+            spanData.setSpanType(SpanType.RPC_SERVER);
+
+            invalidateAllSpanIfIsNotFirstSpan(spanData);
+
+            super.beforeInvoker(spanData);
+        } catch (Throwable t) {
+            logger.error(t.getMessage(), t);
+        }
+    }
+
+    private void invalidateAllSpanIfIsNotFirstSpan(Span spanData) {
+        if (!Context.getLastSpan().getTraceId().equals(spanData.getTraceId())) {
+            Context.invalidateAllSpan();
+        }
+    }
 }

skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java

 package com.ai.cloud.skywalking.buriedpoint;
 
-public class RPCBuriedPointSender extends LocalBuriedPointSender {}
+import com.ai.cloud.skywalking.api.IBuriedPointSender;
+import com.ai.cloud.skywalking.conf.AuthDesc;
+import com.ai.cloud.skywalking.context.Context;
+import com.ai.cloud.skywalking.logging.LogManager;
+import com.ai.cloud.skywalking.logging.Logger;
+import com.ai.cloud.skywalking.model.ContextData;
+import com.ai.cloud.skywalking.model.EmptyContextData;
+import com.ai.cloud.skywalking.model.Identification;
+import com.ai.cloud.skywalking.protocol.Span;
+import com.ai.cloud.skywalking.protocol.SpanType;
+import com.ai.cloud.skywalking.util.ContextGenerator;
+
+public class RPCBuriedPointSender extends BuriedPointInvoker implements IBuriedPointSender {
+
+    private static Logger logger = LogManager
+            .getLogger(RPCBuriedPointSender.class);
+
+    @Override
+    public ContextData beforeSend(Identification id) {
+        try {
+            if (!AuthDesc.isAuth())
+                return new EmptyContextData();
+
+            Span spanData = ContextGenerator.generateSpanFromThreadLocal(id);
+            //设置SpanType的类型
+            spanData.setSpanType(SpanType.RPC_CLIENT);
+
+            Context.append(spanData);
+
+            return new ContextData(spanData.getTraceId(), generateSubParentLevelId(spanData), spanData.getCallType());
+        } catch (Throwable t) {
+            logger.error(t.getMessage(), t);
+            return new EmptyContextData();
+        }
+    }
+
+    private String generateSubParentLevelId(Span spanData) {
+        if (spanData.getParentLevel() == null) {
+            return spanData.getLevelId() + "";
+        }
+
+        return spanData.getParentLevel() + "." + spanData.getLevelId();
+    }
+
+    @Override
+    public void afterSend() {
+        super.afterInvoker();
+    }
+}

skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java

 package com.ai.cloud.skywalking.buriedpoint;
 
 import com.ai.cloud.skywalking.api.IBuriedPointSender;
-import com.ai.cloud.skywalking.buffer.ContextBuffer;
 import com.ai.cloud.skywalking.conf.AuthDesc;
 import com.ai.cloud.skywalking.conf.Config;
 import com.ai.cloud.skywalking.context.Context;
@@ -16,67 +15,55 @@ import com.ai.cloud.skywalking.util.TraceIdGenerator;
 
 /**
  * 暂不确定多线程的实现方式
- * 
- * @author wusheng
  *
+ * @author wusheng
  */
 @Deprecated
-public class ThreadBuriedPointSender extends ApplicationExceptionHandler
-		implements IBuriedPointSender {
-	private static Logger logger = LogManager
-			.getLogger(ThreadBuriedPointSender.class);
+public class ThreadBuriedPointSender extends BuriedPointInvoker
+        implements IBuriedPointSender {
+    private static Logger logger = LogManager
+            .getLogger(ThreadBuriedPointSender.class);
 
-	private Span span;
+    private Span span;
 
-	public ThreadBuriedPointSender(int threadSeqId) {
-		if (!AuthDesc.isAuth())
-			return;
-		Span spanData;
-		// 从ThreadLocal中取出上下文
-		final Span parentSpanData = Context.getLastSpan();
-		if (parentSpanData == null) {
-			spanData = new Span(TraceIdGenerator.generate(),
-					Config.SkyWalking.APPLICATION_CODE,
-					Config.SkyWalking.USER_ID);
-		} else {
-			// 如果不为空，则将当前的Context存放到上下文
-			spanData = new Span(parentSpanData.getTraceId(),
-					Config.SkyWalking.APPLICATION_CODE,
-					Config.SkyWalking.USER_ID);
-			spanData.setParentLevel(parentSpanData.getParentLevel() + "."
-					+ parentSpanData.getLevelId());
-			spanData.setLevelId(threadSeqId);
-		}
-		this.span = spanData;
-	}
+    public ThreadBuriedPointSender(int threadSeqId) {
+        if (!AuthDesc.isAuth())
+            return;
+        Span spanData;
+        // 从ThreadLocal中取出上下文
+        final Span parentSpanData = Context.getLastSpan();
+        if (parentSpanData == null) {
+            spanData = new Span(TraceIdGenerator.generate(),
+                    Config.SkyWalking.APPLICATION_CODE,
+                    Config.SkyWalking.USER_ID);
+        } else {
+            // 如果不为空，则将当前的Context存放到上下文
+            spanData = new Span(parentSpanData.getTraceId(),
+                    Config.SkyWalking.APPLICATION_CODE,
+                    Config.SkyWalking.USER_ID);
+            spanData.setParentLevel(parentSpanData.getParentLevel() + "."
+                    + parentSpanData.getLevelId());
+            spanData.setLevelId(threadSeqId);
+        }
+        this.span = spanData;
+    }
 
-	public ContextData beforeSend(Identification id) {
-		if (!AuthDesc.isAuth())
-			return new EmptyContextData();
+    public ContextData beforeSend(Identification id) {
+        if (!AuthDesc.isAuth())
+            return new EmptyContextData();
 
-		if (this.span == null) {
-			return null;
-		}
-		span.setStartDate(System.currentTimeMillis());
-		span.setViewPointId(id.getViewPoint());
-		span.setProcessNo(BuriedPointMachineUtil.getProcessNo());
-		Context.append(span);
-		return new ContextData(span);
-	}
+        if (this.span == null) {
+            return null;
+        }
+        span.setStartDate(System.currentTimeMillis());
+        span.setViewPointId(id.getViewPoint());
+        span.setProcessNo(BuriedPointMachineUtil.getProcessNo());
+        Context.append(span);
+        return new ContextData(span);
+    }
 
-	public void afterSend() {
-		Span span = Context.removeLastSpan();
-		if (span == null) {
-			return;
-		}
-		// 填上必要信息
-		span.setCost(System.currentTimeMillis() - span.getStartDate());
-		if (Config.BuriedPoint.PRINTF) {
-			logger.debug("viewpointId:" + span.getViewPointId()
-					+ "\tParentLevelId:" + span.getParentLevel() + "\tLevelId:"
-					+ span.getLevelId());
-		}
-		ContextBuffer.save(span);
-	}
+    public void afterSend() {
+        super.afterInvoker();
+    }
 
 }

skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadFactoryBuriedPointSender.java

 package com.ai.cloud.skywalking.buriedpoint;
 
 import com.ai.cloud.skywalking.api.IBuriedPointSender;
-import com.ai.cloud.skywalking.buffer.ContextBuffer;
 import com.ai.cloud.skywalking.conf.AuthDesc;
-import com.ai.cloud.skywalking.conf.Config;
 import com.ai.cloud.skywalking.context.Context;
 import com.ai.cloud.skywalking.logging.LogManager;
 import com.ai.cloud.skywalking.logging.Logger;
@@ -15,43 +13,27 @@ import com.ai.cloud.skywalking.util.ContextGenerator;
 
 /**
  * 暂不确定多线程的实现方式
- * 
- * @author wusheng
  *
+ * @author wusheng
  */
 @Deprecated
-public class ThreadFactoryBuriedPointSender extends ApplicationExceptionHandler
-		implements IBuriedPointSender {
-	private static Logger logger = LogManager
-			.getLogger(ThreadBuriedPointSender.class);
-
-	public ContextData beforeSend(Identification id) {
-		if (!AuthDesc.isAuth())
-			return new EmptyContextData();
+public class ThreadFactoryBuriedPointSender extends BuriedPointInvoker
+        implements IBuriedPointSender {
+    private static Logger logger = LogManager
+            .getLogger(ThreadBuriedPointSender.class);
 
-		Span spanData = ContextGenerator.generateSpanFromThreadLocal(id);
-		// 将新创建的Context存放到ThreadLocal栈中。
-		Context.append(spanData);
-		// 并将当前的Context返回回去
-		return new ContextData(spanData);
-	}
+    public ContextData beforeSend(Identification id) {
+        if (!AuthDesc.isAuth())
+            return new EmptyContextData();
 
-	public void afterSend() {
-		if (!AuthDesc.isAuth())
-			return;
+        Span spanData = ContextGenerator.generateSpanFromThreadLocal(id);
+        // 将新创建的Context存放到ThreadLocal栈中。
+        Context.append(spanData);
+        // 并将当前的Context返回回去
+        return new ContextData(spanData);
+    }
 
-		// 获取上下文的栈顶中的元素
-		Span spanData = Context.removeLastSpan();
-		if (spanData == null) {
-			return;
-		}
-		// 填上必要信息
-		spanData.setCost(System.currentTimeMillis() - spanData.getStartDate());
-		if (Config.BuriedPoint.PRINTF) {
-			logger.debug("viewpointId:" + spanData.getViewPointId()
-					+ "\tParentLevelId:" + spanData.getParentLevel()
-					+ "\tLevelId:" + spanData.getLevelId());
-		}
-		ContextBuffer.save(spanData);
-	}
+    public void afterSend() {
+        super.afterInvoker();
+    }
 }

skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Context.java

@@ -2,7 +2,8 @@ package com.ai.cloud.skywalking.context;
 
 import com.ai.cloud.skywalking.protocol.Span;
 
-import java.util.Stack;
+import java.util.ArrayList;
+import java.util.List;
 
 public class Context {
     private static ThreadLocal<SpanNodeStack> nodes = new ThreadLocal<SpanNodeStack>();
@@ -32,22 +33,30 @@ public class Context {
         return nodes.get().pop();
     }
 
+    public static void invalidateAllSpan() {
+        if (nodes.get() == null) {
+            nodes.set(new SpanNodeStack());
+        }
+
+        nodes.get().invalidateAllCurrentSpan();
+    }
+
     static class SpanNodeStack {
-        private Stack<SpanNode> spans = new Stack<SpanNode>();
+        private List<SpanNode> spans = new ArrayList<SpanNode>();
 
         public Span pop() {
-            Span span = spans.pop().getData();
+            Span span = listPop();
             if (!isEmpty()) {
-                spans.peek().incrementNextSubSpanLevelId();
+                listPeek().incrementNextSubSpanLevelId();
             }
             return span;
         }
 
         public void push(Span span) {
             if (!isEmpty()) {
-                spans.push(new SpanNode(span, spans.peek().getNextSubSpanLevelId()));
+                listPush(new SpanNode(span, listPeek().getNextSubSpanLevelId()));
             } else {
-                spans.push(new SpanNode(span));
+                listPush(new SpanNode(span));
             }
 
         }
@@ -56,12 +65,30 @@ public class Context {
             if (spans.isEmpty()) {
                 return null;
             }
-            return spans.peek().getData();
+            return listPeek().getData();
         }
 
         public boolean isEmpty() {
             return spans.isEmpty();
         }
+
+        private Span listPop() {
+            return spans.remove(spans.size() - 1).getData();
+        }
+
+        private SpanNode listPeek() {
+            return spans.get(spans.size() - 1);
+        }
+
+        private void listPush(SpanNode spanNode) {
+            spans.add(spans.size(), spanNode);
+        }
+
+        public void invalidateAllCurrentSpan() {
+            for (SpanNode spanNode : spans) {
+                spanNode.getData().setIsInvalidate(true);
+            }
+        }
     }
 
     static class SpanNode {

skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/ContextData.java

@@ -13,11 +13,17 @@ public class ContextData {
 
     }
 
+    public ContextData(String traceId, String parentLevel, String spanType) {
+        this.traceId = traceId;
+        this.parentLevel = parentLevel;
+        this.spanType = spanType;
+    }
+
     public ContextData(Span span) {
         this.traceId = span.getTraceId();
         this.parentLevel = span.getParentLevel();
         this.levelId = span.getLevelId();
-        this.spanType = span.getSpanType();
+        this.spanType = span.getSpanTypeDesc();
     }
 
     public ContextData(String contextDataStr) {

skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java

@@ -6,7 +6,7 @@ import com.ai.cloud.skywalking.util.StringUtil;
 public class Identification {
     private String viewPoint;
     private String businessKey;
-    private String spanType;
+    private String spanTypeDesc;
     private String callType;
 
     public Identification() {
@@ -21,8 +21,8 @@ public class Identification {
         return businessKey;
     }
 
-    public String getSpanType() {
-        return spanType;
+    public String getSpanTypeDesc() {
+        return spanTypeDesc;
     }
 
     public String getCallType() {
@@ -58,7 +58,7 @@ public class Identification {
             if (StringUtil.isEmpty(spanType.getTypeName())) {
                 throw new IllegalArgumentException("Span Type name cannot be null");
             }
-            sendData.spanType = spanType.getTypeName();
+            sendData.spanTypeDesc = spanType.getTypeName();
             sendData.callType = spanType.getCallType().toString();
             return this;
         }

skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java

@@ -5,6 +5,7 @@ import com.ai.cloud.skywalking.context.Context;
 import com.ai.cloud.skywalking.model.ContextData;
 import com.ai.cloud.skywalking.model.Identification;
 import com.ai.cloud.skywalking.protocol.Span;
+import com.ai.cloud.skywalking.protocol.SpanType;
 
 public final class ContextGenerator {
     /**
@@ -42,7 +43,7 @@ public final class ContextGenerator {
     }
 
     private static void initNewSpanData(Span spanData, Identification id) {
-        spanData.setSpanType(id.getSpanType());
+        spanData.setSpanTypeDesc(id.getSpanTypeDesc());
         spanData.setViewPointId(id.getViewPoint());
         spanData.setBusinessKey(id.getBusinessKey());
         //FIX Add Call Type field
@@ -62,10 +63,20 @@ public final class ContextGenerator {
             // 不存在，新创建一个Context
             span = new Span(TraceIdGenerator.generate(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID);
         } else {
+
+
             // 根据ParentContextData的TraceId和RPCID
             // LevelId是由SpanNode类的nextSubSpanLevelId字段进行初始化的.
             // 所以在这里不需要初始化
             span = new Span(parentSpan.getTraceId(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID);
+
+            // check parent span is RPC span
+            // if true, current span is invalidate and current span also belong to RPC span
+            if (parentSpan.isRPCClientSpan()) {
+                span.setSpanType(SpanType.RPC_CLIENT);
+                span.setIsInvalidate(true);
+            }
+
             if (!StringUtil.isEmpty(parentSpan.getParentLevel())) {
                 span.setParentLevel(parentSpan.getParentLevel() + "." + parentSpan.getLevelId());
             } else {

skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/list/ArrayListTest.java

+package test.ai.cloud.list;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Created by xin on 16-7-2.
+ */
+public class ArrayListTest {
+    private List<String> data = new ArrayList<>();
+
+    @Before
+    public void initData() {
+        data.add("AAAA");
+        data.add("AAAAB");
+        data.add("AAAAB");
+        data.add("AAAAB");
+    }
+
+    @Test
+    public void testPop() {
+        data.remove(data.size() - 1);
+        assertEquals(data.size(), 3);
+    }
+
+    @Test
+    public void testPush() {
+        data.add(data.size(), "BBBBB");
+        assertEquals(data.get(data.size() - 1), "BBBBB");
+    }
+}

skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/exception/SpanTypeCannotConvertException.java

+package com.ai.cloud.skywalking.exception;
+
+public class SpanTypeCannotConvertException extends RuntimeException {
+    public SpanTypeCannotConvertException(String spanTypeValue) {
+        super("Can not convert SpanTypeValue[" + spanTypeValue + "]");
+    }
+}

skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java

@@ -8,216 +8,237 @@ import java.util.logging.Logger;
 
 public class Span extends SpanData {
 
-	private Logger logger = Logger.getLogger(Span.class.getName());
-
-	public Span() {
-	}
-
-	public Span(String traceId, String applicationID, String userId) {
-		this.traceId = traceId;
-		this.applicationId = applicationID;
-		this.userId = userId;
-	}
-
-	public Span(String traceId, String parentLevelId, int levelId,
-			String applicationID, String userId) {
-		this.traceId = traceId;
-		this.applicationId = applicationID;
-		this.parentLevel = parentLevelId;
-		this.userId = userId;
-		this.levelId = levelId;
-	}
-
-	public Span(String originData) {
-		String[] fieldValues = originData.split(SPAN_FIELD_SEPARATOR);
-
-		int index = 0;
-		while (this.setValueByIndex(fieldValues, index)) {
-			index++;
-		}
-		this.originData = originData;
-	}
-
-	private boolean setValueByIndex(String[] fieldValues, int index) {
-		if (fieldValues.length > index) {
-			switch (index) {
-			case 0:
-				traceId = fieldValues[0].trim();
-				break;
-			case 1:
-				parentLevel = fieldValues[1].trim();
-				break;
-			case 2:
-				levelId = Integer.valueOf(fieldValues[2]);
-				break;
-			case 3:
-				viewPointId = fieldValues[3].trim();
-				break;
-			case 4:
-				startDate = Long.valueOf(fieldValues[4]);
-				break;
-			case 5:
-				cost = Long.parseLong(fieldValues[5]);
-				break;
-			case 6:
-				address = fieldValues[6].trim();
-				break;
-			case 7:
-				statusCode = Byte.valueOf(fieldValues[7].trim());
-				break;
-			case 8:
-				exceptionStack = fieldValues[8].trim().replaceAll(
-						NEW_LINE_PLACEHOLDER, OS_NEW_LINE);
-				break;
-			case 9:
-				spanType = fieldValues[9];
-				break;
-			case 10:
-				isReceiver = Boolean.valueOf(fieldValues[10]);
-				break;
-			case 11:
-				businessKey = fieldValues[11].trim().replaceAll(
-						NEW_LINE_PLACEHOLDER, OS_NEW_LINE);
-				break;
-			case 12:
-				processNo = fieldValues[12].trim();
-				break;
-			case 13:
-				applicationId = fieldValues[13].trim();
-				break;
-			case 14:
-				userId = fieldValues[14].trim();
-				break;
-			case 15:
-				callType = fieldValues[15].trim();
-				break;
-			default:
-				return false;
-			}
-			return true;
-		} else {
-			return false;
-		}
-
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder toStringValue = new StringBuilder();
-		toStringValue.append(traceId + SPAN_FIELD_SEPARATOR);
-
-		if (isNonBlank(parentLevel)) {
-			toStringValue.append(parentLevel + SPAN_FIELD_SEPARATOR);
-		} else {
-			toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
-		}
-
-		toStringValue.append(levelId + SPAN_FIELD_SEPARATOR);
-
-		if (isNonBlank(viewPointId)) {
-			toStringValue.append(viewPointId + SPAN_FIELD_SEPARATOR);
-		} else {
-			toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
-		}
-
-		toStringValue.append(startDate + SPAN_FIELD_SEPARATOR);
-		toStringValue.append(cost + SPAN_FIELD_SEPARATOR);
-
-		if (isNonBlank(address)) {
-			toStringValue.append(address + SPAN_FIELD_SEPARATOR);
-		} else {
-			toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
-		}
-
-		toStringValue.append(statusCode + SPAN_FIELD_SEPARATOR);
-
-		if (isNonBlank(exceptionStack)) {
-			// 换行符在各个系统中表现不一致，
-			// windows平台的换行符为/r/n
-			// linux平台的换行符为/n
-			toStringValue.append(exceptionStack.replaceAll(
-					WINDOWS_OS_NEW_LINE_REDUNDANT_CHAR, "").replaceAll(
-					OS_NEW_LINE, NEW_LINE_PLACEHOLDER)
-					+ SPAN_FIELD_SEPARATOR);
-		} else {
-			toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
-		}
-
-		toStringValue.append(spanType + SPAN_FIELD_SEPARATOR);
-		toStringValue.append(isReceiver + SPAN_FIELD_SEPARATOR);
-
-		if (isNonBlank(businessKey)) {
-			// 换行符在各个系统中表现不一致，
-			// windows平台的换行符为/r/n
-			// linux平台的换行符为/n
-			toStringValue.append(businessKey.replaceAll(
-					WINDOWS_OS_NEW_LINE_REDUNDANT_CHAR, "").replaceAll(
-					OS_NEW_LINE, NEW_LINE_PLACEHOLDER)
-					+ SPAN_FIELD_SEPARATOR);
-		} else {
-			toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
-		}
-
-		if (isNonBlank(processNo)) {
-			toStringValue.append(processNo + SPAN_FIELD_SEPARATOR);
-		} else {
-			toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
-		}
-
-		if (isNonBlank(applicationId)) {
-			toStringValue.append(applicationId + SPAN_FIELD_SEPARATOR);
-		} else {
-			toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
-		}
-
-		if (isNonBlank(userId)) {
-			toStringValue.append(userId + SPAN_FIELD_SEPARATOR);
-		} else {
-			toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
-		}
-
-		toStringValue.append(callType);
-
-		return toStringValue.toString();
-	}
-
-	protected boolean isNonBlank(String str) {
-		return str != null && str.length() > 0;
-	}
-
-	public void handleException(Throwable e, Set<String> exclusiveExceptionSet,
-			int maxExceptionStackLength) {
-		ByteArrayOutputStream buf = null;
-		StringBuilder expMessage = new StringBuilder();
-		try {
-			buf = new ByteArrayOutputStream();
-			Throwable causeException = e;
-			while (expMessage.length() < maxExceptionStackLength && causeException != null) {
-				causeException.printStackTrace(new java.io.PrintWriter(buf,
-						true));
-				expMessage.append(buf.toString());
-				causeException = causeException.getCause();
-			}
-
-		} finally {
-			try {
-				buf.close();
-			} catch (IOException ioe) {
-				logger.log(Level.ALL,
-						"Close exception stack input stream failed", ioe);
-			}
-		}
-
-		int sublength = maxExceptionStackLength;
-		if (maxExceptionStackLength > expMessage.length()){
-			sublength = expMessage.length();
-		}
-
-		this.exceptionStack = expMessage.toString().substring(0, sublength);
-
-		if (!exclusiveExceptionSet.contains(e.getClass().getName())) {
-			this.statusCode = 1;
-		}
-	}
-
+    private Logger logger = Logger.getLogger(Span.class.getName());
+
+    public Span() {
+    }
+
+    public Span(String traceId, String applicationID, String userId) {
+        this.traceId = traceId;
+        this.applicationId = applicationID;
+        this.userId = userId;
+    }
+
+    public Span(String traceId, String parentLevelId, int levelId,
+                String applicationID, String userId) {
+        this.traceId = traceId;
+        this.applicationId = applicationID;
+        this.parentLevel = parentLevelId;
+        this.userId = userId;
+        this.levelId = levelId;
+    }
+
+    public Span(String originData) {
+        String[] fieldValues = originData.split(SPAN_FIELD_SEPARATOR);
+
+        int index = 0;
+        while (this.setValueByIndex(fieldValues, index)) {
+            index++;
+        }
+        this.originData = originData;
+    }
+
+    private boolean setValueByIndex(String[] fieldValues, int index) {
+        if (fieldValues.length > index) {
+            switch (index) {
+                case 0:
+                    traceId = fieldValues[0].trim();
+                    break;
+                case 1:
+                    parentLevel = fieldValues[1].trim();
+                    break;
+                case 2:
+                    levelId = Integer.valueOf(fieldValues[2]);
+                    break;
+                case 3:
+                    viewPointId = fieldValues[3].trim();
+                    break;
+                case 4:
+                    startDate = Long.valueOf(fieldValues[4]);
+                    break;
+                case 5:
+                    cost = Long.parseLong(fieldValues[5]);
+                    break;
+                case 6:
+                    address = fieldValues[6].trim();
+                    break;
+                case 7:
+                    statusCode = Byte.valueOf(fieldValues[7].trim());
+                    break;
+                case 8:
+                    exceptionStack = fieldValues[8].trim().replaceAll(
+                            NEW_LINE_PLACEHOLDER, OS_NEW_LINE);
+                    break;
+                case 9:
+                    spanTypeDesc = fieldValues[9];
+                    break;
+                case 10:
+                    spanType = SpanType.convert(fieldValues[10]);
+                    break;
+                case 11:
+                    businessKey = fieldValues[11].trim().replaceAll(
+                            NEW_LINE_PLACEHOLDER, OS_NEW_LINE);
+                    break;
+                case 12:
+                    processNo = fieldValues[12].trim();
+                    break;
+                case 13:
+                    applicationId = fieldValues[13].trim();
+                    break;
+                case 14:
+                    userId = fieldValues[14].trim();
+                    break;
+                case 15:
+                    callType = fieldValues[15].trim();
+                    break;
+                default:
+                    return false;
+            }
+            return true;
+        } else {
+            return false;
+        }
+
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder toStringValue = new StringBuilder();
+        toStringValue.append(traceId + SPAN_FIELD_SEPARATOR);
+
+        if (isNonBlank(parentLevel)) {
+            toStringValue.append(parentLevel + SPAN_FIELD_SEPARATOR);
+        } else {
+            toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
+        }
+
+        toStringValue.append(levelId + SPAN_FIELD_SEPARATOR);
+
+        if (isNonBlank(viewPointId)) {
+            toStringValue.append(generateViewPointBySpanType() + SPAN_FIELD_SEPARATOR);
+        } else {
+            toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
+        }
+
+        toStringValue.append(startDate + SPAN_FIELD_SEPARATOR);
+        toStringValue.append(cost + SPAN_FIELD_SEPARATOR);
+
+        if (isNonBlank(address)) {
+            toStringValue.append(address + SPAN_FIELD_SEPARATOR);
+        } else {
+            toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
+        }
+
+        toStringValue.append(statusCode + SPAN_FIELD_SEPARATOR);
+
+        if (isNonBlank(exceptionStack)) {
+            // 换行符在各个系统中表现不一致，
+            // windows平台的换行符为/r/n
+            // linux平台的换行符为/n
+            toStringValue.append(exceptionStack.replaceAll(
+                    WINDOWS_OS_NEW_LINE_REDUNDANT_CHAR, "").replaceAll(
+                    OS_NEW_LINE, NEW_LINE_PLACEHOLDER)
+                    + SPAN_FIELD_SEPARATOR);
+        } else {
+            toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
+        }
+
+        toStringValue.append(spanTypeDesc + SPAN_FIELD_SEPARATOR);
+        toStringValue.append(spanType.getValue() + SPAN_FIELD_SEPARATOR);
+
+        if (isNonBlank(businessKey)) {
+            // 换行符在各个系统中表现不一致，
+            // windows平台的换行符为/r/n
+            // linux平台的换行符为/n
+            toStringValue.append(businessKey.replaceAll(
+                    WINDOWS_OS_NEW_LINE_REDUNDANT_CHAR, "").replaceAll(
+                    OS_NEW_LINE, NEW_LINE_PLACEHOLDER)
+                    + SPAN_FIELD_SEPARATOR);
+        } else {
+            toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
+        }
+
+        if (isNonBlank(processNo)) {
+            toStringValue.append(processNo + SPAN_FIELD_SEPARATOR);
+        } else {
+            toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
+        }
+
+        if (isNonBlank(applicationId)) {
+            toStringValue.append(applicationId + SPAN_FIELD_SEPARATOR);
+        } else {
+            toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
+        }
+
+        if (isNonBlank(userId)) {
+            toStringValue.append(userId + SPAN_FIELD_SEPARATOR);
+        } else {
+            toStringValue.append(" " + SPAN_FIELD_SEPARATOR);
+        }
+
+        toStringValue.append(callType);
+
+        return toStringValue.toString();
+    }
+
+    private String generateViewPointBySpanType() {
+        if (spanType == SpanType.RPC_CLIENT) {
+            viewPointId = "RPC Client : " + viewPointId;
+        } else if (spanType == SpanType.RPC_SERVER) {
+            viewPointId = "RPC Server : " + viewPointId;
+        }
+
+        return viewPointId;
+    }
+
+    protected boolean isNonBlank(String str) {
+        return str != null && str.length() > 0;
+    }
+
+    public void handleException(Throwable e, Set<String> exclusiveExceptionSet,
+                                int maxExceptionStackLength) {
+        ByteArrayOutputStream buf = null;
+        StringBuilder expMessage = new StringBuilder();
+        try {
+            buf = new ByteArrayOutputStream();
+            Throwable causeException = e;
+            while (expMessage.length() < maxExceptionStackLength && causeException != null) {
+                causeException.printStackTrace(new java.io.PrintWriter(buf,
+                        true));
+                expMessage.append(buf.toString());
+                causeException = causeException.getCause();
+            }
+
+        } finally {
+            try {
+                buf.close();
+            } catch (IOException ioe) {
+                logger.log(Level.ALL,
+                        "Close exception stack input stream failed", ioe);
+            }
+        }
+
+        int sublength = maxExceptionStackLength;
+        if (maxExceptionStackLength > expMessage.length()) {
+            sublength = expMessage.length();
+        }
+
+        this.exceptionStack = expMessage.toString().substring(0, sublength);
+
+        if (!exclusiveExceptionSet.contains(e.getClass().getName())) {
+            this.statusCode = 1;
+        }
+    }
+
+    public boolean isRPCClientSpan() {
+        if (this.spanType == SpanType.RPC_CLIENT) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public void setIsInvalidate(boolean isInvalidate) {
+        this.isInvalidate = isInvalidate;
+    }
 }

skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java

@@ -67,17 +67,24 @@ public abstract class SpanData {
      * 已字符串的形式描述<br/>
      * 如：java,dubbo等
      */
-    protected String spanType = "";
+    protected String spanTypeDesc = "";
     /**
      * 节点调用类型描述<br/>
      * @see com.ai.cloud.skywalking.protocol.CallType
      */
     protected String callType = "";
+
+    /**
+     * 节点的状态<br/>
+     *  不参与序列化
+     */
+    protected boolean isInvalidate = false;
+
     /**
      * 节点分布式类型<br/>
-     * 服务端/客户端
+     * 本地调用 / RPC服务端 / RPC客户端
      */
-    protected boolean isReceiver = false;
+    protected SpanType spanType = SpanType.LOCAL;
     /**
      * 节点调用过程中的业务字段<br/>
      * 如：业务系统设置的订单号，SQL语句等
@@ -147,20 +154,24 @@ public abstract class SpanData {
         this.address = address;
     }
 
-    public String getSpanType() {
-        return spanType;
+    public String getSpanTypeDesc() {
+        return spanTypeDesc;
     }
 
-    public void setSpanType(String spanType) {
-        this.spanType = spanType;
+    public void setSpanTypeDesc(String spanTypeDesc) {
+        this.spanTypeDesc = spanTypeDesc;
     }
 
-    public boolean isReceiver() {
-        return isReceiver;
+    public SpanType getSpanType() {
+        return spanType;
+    }
+
+    public void setSpanType(SpanType spanType) {
+        this.spanType = spanType;
     }
 
-    public void setReceiver(boolean receiver) {
-        isReceiver = receiver;
+    public boolean isInvalidate() {
+        return isInvalidate;
     }
 
     public void setBusinessKey(String businessKey) {

skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanType.java

+package com.ai.cloud.skywalking.protocol;
+
+import com.ai.cloud.skywalking.exception.SpanTypeCannotConvertException;
+
+/**
+ * Created by xin on 16-7-2.
+ */
+public enum SpanType {
+
+    LOCAL((byte) 1), RPC_CLIENT((byte) 2), RPC_SERVER((byte) 4);
+
+    private byte value;
+
+    SpanType(byte value) {
+        this.value = value;
+    }
+
+    static SpanType convert(String spanTypeValue) {
+        switch (Byte.valueOf(spanTypeValue)){
+            case 1 : return LOCAL;
+            case 2 : return RPC_CLIENT;
+            case 3 : return RPC_SERVER;
+            default:
+                throw new SpanTypeCannotConvertException(spanTypeValue);
+        }
+    }
+
+
+    public byte getValue() {
+        return value;
+    }
+}