From ca565522156d1a239e41eb23a39376e9b7882553 Mon Sep 17 00:00:00 2001
From: ascrutae <nzt48.xin@gmail.com>
Date: Tue, 11 Jul 2017 18:03:15 +0800
Subject: [PATCH] fix compile failed and the url  tag of motan plugin is not
 correct

---
 .../skywalking/apm/agent/core/context/trace/EntrySpan.java  | 6 +++---
 .../skywalking/apm/agent/core/context/trace/ExitSpan.java   | 6 +++---
 .../apm/plugin/motan/MotanConsumerInterceptor.java          | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

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 04e42861b..739e9bb0d 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
@@ -53,7 +53,7 @@ public class EntrySpan extends AbstractTracingSpan {
     }
 
     @Override
-    public AbstractSpan setLayer(SpanLayer layer) {
+    public AbstractTracingSpan setLayer(SpanLayer layer) {
         if (stackDepth == currentMaxDepth) {
             return super.setLayer(layer);
         } else {
@@ -62,7 +62,7 @@ public class EntrySpan extends AbstractTracingSpan {
     }
 
     @Override
-    public AbstractSpan setComponent(Component component) {
+    public AbstractTracingSpan setComponent(Component component) {
         if (stackDepth == currentMaxDepth) {
             return super.setComponent(component);
         } else {
@@ -71,7 +71,7 @@ public class EntrySpan extends AbstractTracingSpan {
     }
 
     @Override
-    public AbstractSpan setComponent(String componentName) {
+    public AbstractTracingSpan setComponent(String componentName) {
         if (stackDepth == currentMaxDepth) {
             return super.setComponent(componentName);
         } else {
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 929872383..88b69a6f6 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
@@ -72,7 +72,7 @@ public class ExitSpan extends AbstractTracingSpan {
     }
 
     @Override
-    public AbstractSpan setLayer(SpanLayer layer) {
+    public AbstractTracingSpan setLayer(SpanLayer layer) {
         if (stackDepth == 1) {
             return super.setLayer(layer);
         } else {
@@ -81,7 +81,7 @@ public class ExitSpan extends AbstractTracingSpan {
     }
 
     @Override
-    public AbstractSpan setComponent(Component component) {
+    public AbstractTracingSpan setComponent(Component component) {
         if (stackDepth == 1) {
             return super.setComponent(component);
         } else {
@@ -90,7 +90,7 @@ public class ExitSpan extends AbstractTracingSpan {
     }
 
     @Override
-    public AbstractSpan setComponent(String componentName) {
+    public AbstractTracingSpan setComponent(String componentName) {
         if (stackDepth == 1) {
             return super.setComponent(componentName);
         } else {
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java
index 0cbb94cdf..6111041fa 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java
@@ -36,7 +36,7 @@ public class MotanConsumerInterceptor implements InstanceConstructorInterceptor,
         Request request = (Request)allArguments[0];
         if (url != null) {
             ContextCarrier contextCarrier = new ContextCarrier();
-            String remotePeer = url.getHost() + " :" + url.getPort();
+            String remotePeer = url.getHost() + ":" + url.getPort();
             AbstractSpan span = ContextManager.createExitSpan(generateOperationName(url, request), contextCarrier, remotePeer);
             span.setComponent(ComponentsDefine.MOTAN);
             Tags.URL.set(span, url.getIdentity());