diff --git a/apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/test/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java b/apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/test/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java
index f39e797a2..c599f01a6 100644
--- a/apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/test/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java
+++ b/apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/test/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java
@@ -20,7 +20,6 @@ package org.skywalking.apm.collector.agent.grpc.handler;
 
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
-import org.junit.Test;
 import org.skywalking.apm.network.proto.Application;
 import org.skywalking.apm.network.proto.ApplicationMapping;
 import org.skywalking.apm.network.proto.ApplicationRegisterServiceGrpc;
@@ -36,7 +35,7 @@ public class ApplicationRegisterServiceHandlerTestCase {
 
     private ApplicationRegisterServiceGrpc.ApplicationRegisterServiceBlockingStub stub;
 
-    @Test
+    //@Test
     public void testRegister() {
         ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();
         stub = ApplicationRegisterServiceGrpc.newBlockingStub(channel);
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracingContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracingContext.java
index 65679c6c1..39d06c449 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracingContext.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracingContext.java
@@ -31,6 +31,7 @@ import org.skywalking.apm.agent.core.context.trace.NoopExitSpan;
 import org.skywalking.apm.agent.core.context.trace.NoopSpan;
 import org.skywalking.apm.agent.core.context.trace.TraceSegment;
 import org.skywalking.apm.agent.core.context.trace.TraceSegmentRef;
+import org.skywalking.apm.agent.core.context.trace.WithPeerInfo;
 import org.skywalking.apm.agent.core.dictionary.DictionaryManager;
 import org.skywalking.apm.agent.core.dictionary.DictionaryUtil;
 import org.skywalking.apm.agent.core.dictionary.PossibleFound;
@@ -97,17 +98,9 @@ public class TracingContext implements AbstractTracerContext {
             throw new IllegalStateException("Inject can be done only in Exit Span");
         }
 
-        String peer;
-        int peerId;
-        if (span instanceof NoopExitSpan) {
-            NoopExitSpan exitSpan = (NoopExitSpan)span;
-            peerId = exitSpan.getPeerId();
-            peer = exitSpan.getPeer();
-        } else {
-            ExitSpan exitSpan = (ExitSpan)span;
-            peerId = exitSpan.getPeerId();
-            peer = exitSpan.getPeer();
-        }
+        WithPeerInfo spanWithPeer = (WithPeerInfo)span;
+        String peer = spanWithPeer.getPeer();
+        int peerId = spanWithPeer.getPeerId();
 
         carrier.setTraceSegmentId(this.segment.getTraceSegmentId());
         carrier.setSpanId(span.getSpanId());
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 07c054d44..329c019be 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
@@ -35,7 +35,7 @@ import org.skywalking.apm.network.trace.component.Component;
  *
  * @author wusheng
  */
-public class ExitSpan extends StackBasedTracingSpan {
+public class ExitSpan extends StackBasedTracingSpan implements WithPeerInfo {
     private String peer;
     private int peerId;
 
@@ -147,10 +147,12 @@ public class ExitSpan extends StackBasedTracingSpan {
         }
     }
 
+    @Override
     public int getPeerId() {
         return peerId;
     }
 
+    @Override
     public String getPeer() {
         return peer;
     }
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopExitSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopExitSpan.java
index 7b2aa256e..c8c1ec69b 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopExitSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopExitSpan.java
@@ -18,10 +18,7 @@
 
 package org.skywalking.apm.agent.core.context.trace;
 
-import java.util.Map;
-import org.skywalking.apm.network.trace.component.Component;
-
-public class NoopExitSpan implements AbstractNoopSpan {
+public class NoopExitSpan extends NoopSpan implements WithPeerInfo {
 
     private String peer;
     private int peerId;
@@ -34,71 +31,18 @@ public class NoopExitSpan implements AbstractNoopSpan {
         this.peer = peer;
     }
 
-    @Override public AbstractSpan setComponent(Component component) {
-        return this;
-    }
-
-    @Override public AbstractSpan setComponent(String componentName) {
-        return this;
-    }
-
-    @Override public AbstractSpan setLayer(SpanLayer layer) {
-        return this;
-    }
-
-    @Override public AbstractSpan tag(String key, String value) {
-        return this;
-    }
-
-    @Override public AbstractSpan log(Throwable t) {
-        return this;
-    }
-
-    @Override public AbstractSpan errorOccurred() {
-        return null;
-    }
-
-    @Override public boolean isEntry() {
-        return false;
-    }
-
-    @Override public boolean isExit() {
-        return true;
-    }
-
-    @Override public AbstractSpan log(long timestamp, Map<String, ?> event) {
-        return this;
-    }
-
-    @Override public AbstractSpan setOperationName(String operationName) {
-        return this;
-    }
-
-    @Override public AbstractSpan start() {
-        return this;
-    }
-
-    @Override public int getSpanId() {
-        return 0;
-    }
-
-    @Override public int getOperationId() {
-        return 0;
-    }
-
-    @Override public String getOperationName() {
-        return "";
-    }
-
-    @Override public AbstractSpan setOperationId(int operationId) {
-        return this;
-    }
-
+    @Override
     public int getPeerId() {
         return peerId;
     }
 
+    @Override
     public String getPeer() {
         return peer;
     }
+
+    @Override
+    public boolean isExit() {
+        return true;
+    }
 }
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 6e2072820..da4e735f2 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
@@ -29,7 +29,7 @@ import org.skywalking.apm.network.trace.component.Component;
  *
  * @author wusheng
  */
-public class NoopSpan implements AbstractNoopSpan {
+public class NoopSpan implements AbstractSpan {
     public NoopSpan() {
     }
 
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractNoopSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/WithPeerInfo.java
similarity index 81%
rename from apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractNoopSpan.java
rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/WithPeerInfo.java
index 270a80402..4c6a30f74 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractNoopSpan.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/WithPeerInfo.java
@@ -19,9 +19,10 @@
 package org.skywalking.apm.agent.core.context.trace;
 
 /**
- * The <code>AbstractNoopSpan</code> represents a span implementation without any actual operation.
- *
- * @author zhangxin
+ * @author wusheng
  */
-public interface AbstractNoopSpan extends AbstractSpan {
+public interface WithPeerInfo {
+    int getPeerId();
+
+    String getPeer();
 }