From 186b01b9d63809e028b753d82e4649f4ca11fa8b Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Fri, 4 Dec 2015 20:46:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=90=88=E5=B9=B6=E5=9F=8B=E7=82=B9=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E7=AB=AF=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buriedpoint/LocalBuriedPointSender.java   |  2 +-
 .../buriedpoint/RPCBuriedPointSender.java     | 58 +------------------
 .../resources/plugin-span-type-notice.txt     |  2 +-
 3 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java
index 5160a002a..472af2d44 100644
--- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java
+++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java
@@ -16,7 +16,7 @@ import java.util.logging.Logger;
 
 public class LocalBuriedPointSender implements IBuriedPointSender {
 
-    private static Logger logger = Logger.getLogger(LocalBuriedPointSender.class.getName());
+    private static Logger logger = Logger.getLogger(IBuriedPointSender.class.getName());
 
     public ContextData beforeSend(Identification id) {
         if (!AuthDesc.isAuth())
diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java
index 9036f3f10..661fed94d 100644
--- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java
+++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java
@@ -1,59 +1,3 @@
 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.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.util.ContextGenerator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class RPCBuriedPointSender implements IBuriedPointSender {
-
-    private static Logger logger = Logger.getLogger(RPCBuriedPointReceiver.class.getName());
-
-    public ContextData beforeSend(Identification id) {
-        if (!AuthDesc.isAuth())
-            return new EmptyContextData();
-
-        Span spanData = ContextGenerator.generateSpanFromThreadLocal(id);
-        // 将新创建的Context存放到ThreadLocal栈中。
-        Context.append(spanData);
-        // 并将当前的Context返回回去
-        return new ContextData(spanData);
-    }
-
-    public void afterSend() {
-
-        if (!AuthDesc.isAuth())
-            return;
-
-        // 获取上下文的栈顶中的元素
-        Span spanData = Context.removeLastSpan();
-        if (spanData == null) {
-            return;
-        }
-
-        spanData.setCost(System.currentTimeMillis() - spanData.getStartDate());
-
-        if (Config.BuriedPoint.PRINTF) {
-            logger.log(Level.ALL, "viewpointId:" + spanData.getViewPointId() + "\tParentLevelId:" + spanData.
-                    getParentLevel() + "\tLevelId:" + spanData.getLevelId());
-        }
-
-        if (!Config.Sender.IS_OFF) {
-            ContextBuffer.save(spanData);
-        }
-    }
-
-    public void handleException(Throwable e) {
-        Span span = Context.getLastSpan();
-        span.handleException(e, Config.BuriedPoint.MAX_EXCEPTION_STACK_LENGTH);
-    }
-}
+public class RPCBuriedPointSender extends LocalBuriedPointSender {}
diff --git a/skywalking-sdk-plugin/src/main/resources/plugin-span-type-notice.txt b/skywalking-sdk-plugin/src/main/resources/plugin-span-type-notice.txt
index c69b14f91..a674e8f30 100644
--- a/skywalking-sdk-plugin/src/main/resources/plugin-span-type-notice.txt
+++ b/skywalking-sdk-plugin/src/main/resources/plugin-span-type-notice.txt
@@ -1,5 +1,5 @@
 #默认埋点类型对照信息
 M:本地JAVA方法
 J:JDBC
-W:web servlet调用
+W:web调用
 D:dubbo/dubbox调用
\ No newline at end of file