diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java
index 52e03a60ca2b35c25d28a535fa1382237f749f80..87ad1b42499c9e2d13179309e9284143c1a45a6d 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java
@@ -50,11 +50,6 @@ public interface AbstractSpan {
      */
     boolean isEntry();
 
-    /**
-     * @return true if the actual span is a local span.
-     */
-    boolean isLocal();
-
     /**
      * @return true if the actual span is an exit span.
      */
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java
index 28a32138140901d62340cdbdc490e52a94c675c5..04e9045410f6bfe3715ba191a683f047297a53ec 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java
@@ -219,7 +219,13 @@ public abstract class AbstractTracingSpan implements AbstractSpan {
         } else {
             spanBuilder.setOperationName(operationName);
         }
-        spanBuilder.setSpanType(SpanType.Entry);
+        if (isEntry()) {
+            spanBuilder.setSpanType(SpanType.Entry);
+        } else if (isExit()) {
+            spanBuilder.setSpanType(SpanType.Exit);
+        } else {
+            spanBuilder.setSpanType(SpanType.Local);
+        }
         spanBuilder.setSpanLayerValue(this.layer.getCode());
         if (componentId != DictionaryUtil.nullValue()) {
             spanBuilder.setComponentId(componentId);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/EntrySpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/EntrySpan.java
index 24ca06291419e07c7b6fae69dbdf0d74a3778bd3..04e42861b05b04bef30616d11c9ce4128a50bf04 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/EntrySpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/EntrySpan.java
@@ -98,10 +98,6 @@ public class EntrySpan extends AbstractTracingSpan {
         return true;
     }
 
-    @Override public boolean isLocal() {
-        return false;
-    }
-
     @Override public boolean isExit() {
         return false;
     }
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java
index a60486531fa78fafaf11d0828ff6ebae50bfa744..929872383ca89027c21afff458aca28f0460435e 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java
@@ -2,7 +2,6 @@ package org.skywalking.apm.agent.core.context.trace;
 
 import org.skywalking.apm.agent.core.dictionary.DictionaryUtil;
 import org.skywalking.apm.network.proto.SpanObject;
-import org.skywalking.apm.network.proto.SpanType;
 import org.skywalking.apm.network.trace.component.Component;
 
 /**
@@ -114,7 +113,6 @@ public class ExitSpan extends AbstractTracingSpan {
         } else {
             spanBuilder.setPeer(peer);
         }
-        spanBuilder = spanBuilder.setSpanType(SpanType.Exit);
         return spanBuilder;
     }
 
@@ -130,10 +128,6 @@ public class ExitSpan extends AbstractTracingSpan {
         return false;
     }
 
-    @Override public boolean isLocal() {
-        return false;
-    }
-
     @Override public boolean isExit() {
         return true;
     }
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/LocalSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/LocalSpan.java
index 6ef653f891dd5f7e4e01e3b487b68329e5408be1..e26fb31ca637a07a6edbd6ed6a11ee22dd0030ef 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/LocalSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/LocalSpan.java
@@ -37,10 +37,6 @@ public class LocalSpan extends AbstractTracingSpan {
         return false;
     }
 
-    @Override public boolean isLocal() {
-        return true;
-    }
-
     @Override public boolean isExit() {
         return false;
     }
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java
index 7274064a4902bf0cc546433de997f8be191c3315..01c97cf15f016fda1244c98a804ab4fe0881426f 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java
@@ -48,10 +48,6 @@ public class NoopSpan implements AbstractSpan {
         return false;
     }
 
-    @Override public boolean isLocal() {
-        return false;
-    }
-
     @Override public boolean isExit() {
         return false;
     }