diff --git a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/Span.java b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/Span.java
index e460ef7b77f9bf7450724448183f1b2a15284f0f..24622ea69c366cf5c66430ea300afaa3044b821c 100644
--- a/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/Span.java
+++ b/apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/Span.java
@@ -53,10 +53,10 @@ public class Span {
     private String operationName;
 
     /**
-     * {@link #peer_host}, {@link #port} and {@link #peers} were part of tags,
+     * {@link #peerHost}, {@link #port} and {@link #peers} were part of tags,
      * independence them from tags for better performance and gc.
      */
-    private String peer_host;
+    private String peerHost;
 
     private int port;
 
@@ -335,7 +335,7 @@ public class Span {
     }
 
     public String getPeerHost() {
-        return peer_host;
+        return peerHost;
     }
 
     public int getPort() {
@@ -346,8 +346,8 @@ public class Span {
         return peers;
     }
 
-    public void setPeer_host(String peer_host) {
-        this.peer_host = peer_host;
+    public void setPeerHost(String peerHost) {
+        this.peerHost = peerHost;
     }
 
     public void setPort(int port) {
@@ -391,9 +391,9 @@ public class Span {
             JsonObject tagWithStr = null;
             JsonObject tagWithInt = null;
             JsonObject tagWithBool = null;
-            if (!StringUtil.isEmpty(span.peer_host)) {
+            if (!StringUtil.isEmpty(span.peerHost)) {
                 tagWithStr = new JsonObject();
-                tagWithStr.addProperty("peer.host", span.peer_host);
+                tagWithStr.addProperty("peer.host", span.peerHost);
                 tagWithInt = new JsonObject();
                 tagWithInt.addProperty("peer.port", span.port);
             } else if (!StringUtil.isEmpty(span.peers)) {
diff --git a/apm-commons/apm-trace/src/test/java/org/skywalking/apm/trace/SpanTestCase.java b/apm-commons/apm-trace/src/test/java/org/skywalking/apm/trace/SpanTestCase.java
index e25b3429591432ba750b3d997b7b375402c428e0..4e256a30acbd95c1d8d8b639a8a85ff1f75150af 100644
--- a/apm-commons/apm-trace/src/test/java/org/skywalking/apm/trace/SpanTestCase.java
+++ b/apm-commons/apm-trace/src/test/java/org/skywalking/apm/trace/SpanTestCase.java
@@ -44,7 +44,7 @@ public class SpanTestCase {
         Span span1 = new Span(0, "serviceA");
         Tags.SPAN_LAYER.asHttp(span1);
         Tags.COMPONENT.set(span1, "Spring");
-        span1.setPeer_host("127.0.0.1");
+        span1.setPeerHost("127.0.0.1");
         Tags.ERROR.set(span1, true);
         Tags.STATUS_CODE.set(span1, 302);
         Tags.URL.set(span1, "http://127.0.0.1/serviceA");
diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInterceptor.java b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInterceptor.java
index 52831df6072237b10c4bfa581a823b168ca8b7a6..aac589c33f65825861662815dc5398dbabea23e0 100644
--- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbo/DubboInterceptor.java
@@ -54,8 +54,8 @@ public class DubboInterceptor implements InstanceMethodsAroundInterceptor {
         Tags.URL.set(span, generateRequestURL(requestURL, invocation));
         Tags.COMPONENT.set(span, DUBBO_COMPONENT);
         Tags.SPAN_LAYER.asRPCFramework(span);
-        Tags.PEER_HOST.set(span, requestURL.getHost());
-        Tags.PEER_PORT.set(span, requestURL.getPort());
+        span.setPeerHost(requestURL.getHost());
+        span.setPort(requestURL.getPort());
 
         if (isConsumer) {
             Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java
index ea65ecce24eb907d26d376ca44866d41c76d5c20..8a9bea7676d56518885ee407aac67e4f76f87bca 100644
--- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java
@@ -47,8 +47,8 @@ public class DefaultHttpClientInterceptor implements InstanceMethodsAroundInterc
 
         URL url = new URL(request.url());
         Span span = ContextManager.createSpan(request.url());
-        Tags.PEER_PORT.set(span, url.getPort());
-        Tags.PEER_HOST.set(span, url.getHost());
+        span.setPeerHost(url.getHost());
+        span.setPort(url.getPort());
         Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
         Tags.COMPONENT.set(span, COMPONENT_NAME);
         Tags.HTTP.METHOD.set(span, request.method());
diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java
index ac1464382a10a104448dc1bf187d39705085a53b..7a112c745ab4bc3ccf3a87e215b291d97c3e008a 100644
--- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java
@@ -34,8 +34,8 @@ public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterc
         HttpHost httpHost = (HttpHost) allArguments[0];
         HttpRequest httpRequest = (HttpRequest) allArguments[1];
         Span span = createSpan(httpRequest);
-        Tags.PEER_PORT.set(span, httpHost.getPort());
-        Tags.PEER_HOST.set(span, httpHost.getHostName());
+        span.setPeerHost(httpHost.getHostName());
+        span.setPort(httpHost.getPort());
         Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
         Tags.COMPONENT.set(span, COMPONENT_NAME);
         Tags.URL.set(span, generateURL(httpRequest));
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/CallableStatementTracing.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/CallableStatementTracing.java
index 81ef93d06362f9cbbad6c92aa08fa8df6947d8c5..c3f9f41a72cdd6dc509a45271b4a7f2c3909150c 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/CallableStatementTracing.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/CallableStatementTracing.java
@@ -11,7 +11,7 @@ import java.sql.SQLException;
  * {@link CallableStatementTracing} create span with the {@link Span#operationName} start with
  * "JDBC/CallableStatement/"and set {@link ConnectionInfo#dbType} to the {@link Tags#COMPONENT}.
  * <p>
- * Notice: {@link Tags#PEERS} may be is null if database connection url don't contain multiple hosts.
+ * Notice: {@link Span#peerHost} may be is null if database connection url don't contain multiple hosts.
  *
  * @author zhangxin
  */
@@ -29,10 +29,10 @@ public class CallableStatementTracing {
             Tags.SPAN_LAYER.asDB(span);
             Tags.COMPONENT.set(span, connectInfo.getDBType());
             if (!StringUtil.isEmpty(connectInfo.getHosts())) {
-                Tags.PEERS.set(span, connectInfo.getHosts());
+                span.setPeers(connectInfo.getHosts());
             } else {
-                Tags.PEER_PORT.set(span, connectInfo.getPort());
-                Tags.PEER_HOST.set(span, connectInfo.getHost());
+                span.setPeerHost(connectInfo.getHost());
+                span.setPort(connectInfo.getPort());
             }
             return exec.exe(realStatement, sql);
         } catch (SQLException e) {
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/ConnectionTracing.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/ConnectionTracing.java
index 950d64d73d406e79eb8d89461827584f14761b35..f83625f40ff800fbc2c8fc988cef5af2d509f007 100755
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/ConnectionTracing.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/ConnectionTracing.java
@@ -11,7 +11,7 @@ import java.sql.SQLException;
  * {@link ConnectionTracing} create span with the {@link Span#operationName} start with
  * "JDBC/Connection/"and set {@link ConnectionInfo#dbType} to the {@link Tags#COMPONENT}.
  * <p>
- * Notice: {@link Tags#PEERS} may be is null if database connection url don't contain multiple hosts.
+ * Notice: {@link Span#peerHost} may be is null if database connection url don't contain multiple hosts.
  *
  * @author zhangxin
  */
@@ -29,10 +29,10 @@ public class ConnectionTracing {
             Tags.COMPONENT.set(span, connectInfo.getDBType());
             Tags.SPAN_LAYER.asDB(span);
             if (!StringUtil.isEmpty(connectInfo.getHosts())) {
-                Tags.PEERS.set(span, connectInfo.getHosts());
+                span.setPeers(connectInfo.getHosts());
             } else {
-                Tags.PEER_PORT.set(span, connectInfo.getPort());
-                Tags.PEER_HOST.set(span, connectInfo.getHost());
+                span.setPeerHost(connectInfo.getHost());
+                span.setPort(connectInfo.getPort());
             }
             return exec.exe(realConnection, sql);
         } catch (SQLException e) {
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/PreparedStatementTracing.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/PreparedStatementTracing.java
index 053db5fefa44d0369107eb491081c3837edfa4fd..e3cac9f53114b929d0e96048a0e4de432aedae71 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/PreparedStatementTracing.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/PreparedStatementTracing.java
@@ -11,7 +11,7 @@ import java.sql.SQLException;
  * {@link PreparedStatementTracing} create span with the {@link Span#operationName} start with
  * "JDBC/PreparedStatement/"and set {@link ConnectionInfo#dbType} to the {@link Tags#COMPONENT}.
  * <p>
- * Notice: {@link Tags#PEERS} may be is null if database connection url don't contain multiple hosts.
+ * Notice: {@link Span#peerHost} may be is null if database connection url don't contain multiple hosts.
  *
  * @author zhangxin
  */
@@ -28,10 +28,10 @@ public class PreparedStatementTracing {
             Tags.DB_STATEMENT.set(span, sql);
             Tags.COMPONENT.set(span, connectInfo.getDBType());
             if (!StringUtil.isEmpty(connectInfo.getHosts())) {
-                Tags.PEERS.set(span, connectInfo.getHosts());
+                span.setPeers(connectInfo.getHosts());
             } else {
-                Tags.PEER_PORT.set(span, connectInfo.getPort());
-                Tags.PEER_HOST.set(span, connectInfo.getHost());
+                span.setPeerHost(connectInfo.getHost());
+                span.setPort(connectInfo.getPort());
             }
             Tags.SPAN_LAYER.asDB(span);
             return exec.exe(realStatement, sql);
diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/StatementTracing.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/StatementTracing.java
index 94f6b8f45d48381f819a54705152742a2a7c87b3..a427ca3faadc77a73ca159ceff4735b1698394db 100644
--- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/StatementTracing.java
+++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/StatementTracing.java
@@ -11,7 +11,7 @@ import java.sql.SQLException;
  * {@link StatementTracing} create span with the {@link Span#operationName} start with
  * "JDBC/Statement/"and set {@link ConnectionInfo#dbType} to the {@link Tags#COMPONENT}.
  * <p>
- * Notice: {@link Tags#PEERS} may be is null if database connection url don't contain multiple hosts.
+ * Notice: {@link Span#peerHost} may be is null if database connection url don't contain multiple hosts.
  *
  * @author zhangxin
  */
@@ -28,10 +28,10 @@ public class StatementTracing {
             Tags.COMPONENT.set(span, connectInfo.getDBType());
             Tags.SPAN_LAYER.asDB(span);
             if (!StringUtil.isEmpty(connectInfo.getHosts())) {
-                Tags.PEERS.set(span, connectInfo.getHosts());
+                span.setPeers(connectInfo.getHosts());
             } else {
-                Tags.PEER_PORT.set(span, connectInfo.getPort());
-                Tags.PEER_HOST.set(span, connectInfo.getHost());
+                span.setPeerHost(connectInfo.getHost());
+                span.setPort(connectInfo.getPort());
             }
             return exec.exe(realStatement, sql);
         } catch (SQLException e) {
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java
index ca225470c44c835cce5609b2fe692396ec30f820..089e576f1103380716dee4d93beaaba41b5b4298 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java
@@ -53,10 +53,10 @@ public class JedisMethodInterceptor extends NoConcurrencyAccessObject implements
     private void tagPeer(Span span, EnhancedClassInstanceContext context) {
         String redisHosts = (String) context.get(KEY_OF_REDIS_HOSTS);
         if (!StringUtil.isEmpty(redisHosts)) {
-            Tags.PEERS.set(span, (String) context.get(KEY_OF_REDIS_HOSTS));
+            span.setPeerHost(context.get(KEY_OF_REDIS_HOST, String.class));
         } else {
-            Tags.PEER_HOST.set(span, (String) context.get(KEY_OF_REDIS_HOST));
-            Tags.PEER_PORT.set(span, (Integer) context.get(KEY_OF_REDIS_PORT));
+            span.setPeerHost(context.get(KEY_OF_REDIS_HOST, String.class));
+            span.setPort(context.get(KEY_OF_REDIS_PORT, Integer.class));
         }
     }
 
@@ -82,10 +82,10 @@ public class JedisMethodInterceptor extends NoConcurrencyAccessObject implements
         tagPeer(span, context);
         Tags.SPAN_LAYER.asDB(span);
         if (StringUtil.isEmpty(context.get(KEY_OF_REDIS_HOST, String.class))) {
-            Tags.PEERS.set(span, String.valueOf(context.get(KEY_OF_REDIS_HOSTS)));
+            span.setPeerHost(context.get(KEY_OF_REDIS_HOST, String.class));
         } else {
-            Tags.PEER_HOST.set(span, context.get(KEY_OF_REDIS_HOST, String.class));
-            Tags.PEER_PORT.set(span, (Integer) context.get(KEY_OF_REDIS_PORT));
+            span.setPeerHost(context.get(KEY_OF_REDIS_HOST, String.class));
+            span.setPort(context.get(KEY_OF_REDIS_PORT, Integer.class));
         }
 
         if (interceptorContext.allArguments().length > 0
diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBMethodInterceptor.java
index 98d7b11a3a73491e3cfcdd0c61413a13aaf78a4c..3b882d633277e12d941bec689304caa7ff5804b5 100644
--- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBMethodInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/MongoDBMethodInterceptor.java
@@ -67,8 +67,8 @@ public class MongoDBMethodInterceptor implements InstanceMethodsAroundIntercepto
     public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext,
                               Object ret) {
         Span span = ContextManager.activeSpan();
-        Tags.PEER_HOST.set(span, context.get(MONGODB_HOST, String.class));
-        Tags.PEER_PORT.set(span, (Integer) context.get(MONGODB_PORT));
+        span.setPeerHost(context.get(MONGODB_HOST, String.class));
+        span.setPort(context.get(MONGODB_PORT, Integer.class));
         ContextManager.stopSpan();
         return ret;
     }
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 845f04ece436d0576c90e3ad87e217b4e671123d..4ced174bbdd5a9bb1a0f228d0de04697305b3ea5 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
@@ -49,8 +49,8 @@ public class MotanConsumerInterceptor implements InstanceConstructorInterceptor,
         Request request = (Request) interceptorContext.allArguments()[0];
         if (url != null) {
             Span span = ContextManager.createSpan(generateOperationName(url, request));
-            Tags.PEER_HOST.set(span, url.getHost());
-            Tags.PEER_PORT.set(span, url.getPort());
+            span.setPeerHost(url.getHost());
+            span.setPort(url.getPort());
             Tags.COMPONENT.set(span, MOTAN_COMPONENT);
             Tags.URL.set(span, url.getIdentity());
             Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java
index f5c16f6691178aacb3dfc5922d7a04e9fb764f22..5c301fd168bdcdade13da39956b93416bd26cce8 100644
--- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java
@@ -58,8 +58,8 @@ public class RealCallInterceptor implements InstanceMethodsAroundInterceptor, In
         Request request = (Request)context.get(REQUEST_CONTEXT_KEY);
 
         Span span = ContextManager.createSpan(request.url().uri().toString());
-        Tags.PEER_PORT.set(span, request.url().port());
-        Tags.PEER_HOST.set(span, request.url().host());
+        span.setPeerHost(request.url().host());
+        span.setPort(request.url().port());
         Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
         Tags.COMPONENT.set(span, COMPONENT_NAME);
         Tags.HTTP.METHOD.set(span, request.method());
diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java
index e5246864b05bb2521dabe54cc5ec2a378f97a9f9..936b24cf058c998e2b012d2be69d35388744c2a1 100644
--- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java
@@ -37,8 +37,8 @@ public class ResinV3Interceptor implements InstanceMethodsAroundInterceptor {
         CauchoRequest request = (CauchoRequest)args[0];
         Span span = ContextManager.createSpan(request.getPageURI());
         Tags.COMPONENT.set(span, RESIN_COMPONENT);
-        Tags.PEER_HOST.set(span, request.getServerName());
-        Tags.PEER_PORT.set(span, request.getServerPort());
+        span.setPeerHost(request.getServerName());
+        span.setPort(request.getServerPort());
         Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_SERVER);
         Tags.URL.set(span, appendRequestURL(request));
         Tags.SPAN_LAYER.asHttp(span);
diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java
index de04a3837751f44451180bc41a72d12329438f3f..58ade728ff0082035c44b39270fdca73230c4fb0 100644
--- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java
@@ -34,8 +34,8 @@ public class ResinV4Interceptor implements InstanceMethodsAroundInterceptor {
         CauchoRequest request = (CauchoRequest)args[0];
         Span span = ContextManager.createSpan(request.getPageURI());
         Tags.COMPONENT.set(span, RESIN_COMPONENT);
-        Tags.PEER_HOST.set(span, request.getServerName());
-        Tags.PEER_PORT.set(span, request.getServerPort());
+        span.setPeerHost(request.getServerName());
+        span.setPort(request.getServerPort());
         Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_SERVER);
         Tags.URL.set(span, appendRequestURL(request));
         Tags.SPAN_LAYER.asHttp(span);
diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/TomcatInterceptor.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/TomcatInterceptor.java
index ae394427f31fefd280172bd6b8fe26450779f657..44e5f82884cd0f885e690e17083f7185fd92d0dc 100644
--- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/TomcatInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/skywalking/apm/plugin/tomcat78x/TomcatInterceptor.java
@@ -45,8 +45,8 @@ public class TomcatInterceptor implements InstanceMethodsAroundInterceptor {
 
         Span span = ContextManager.createSpan(request.getRequestURI());
         Tags.COMPONENT.set(span, TOMCAT_COMPONENT);
-        Tags.PEER_HOST.set(span, fetchRequestPeerHost(request));
-        Tags.PEER_PORT.set(span, request.getRemotePort());
+        span.setPeerHost(fetchRequestPeerHost(request));
+        span.setPort(request.getRemotePort());
         Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_SERVER);
         Tags.URL.set(span, request.getRequestURL().toString());
         Tags.SPAN_LAYER.asHttp(span);
diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java
index e803c29babf013eb4a40d1151c7cca6e40f8ab25..43c2fec68c7679337ba05ecd32909aaf3a913849 100644
--- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java
+++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java
@@ -18,7 +18,7 @@ public class DubboSpanGenerator {
             Tags.COMPONENT.set(span, "Dubbo");
             Tags.URL.set(span, "rest://192.168.1.8:20880/default_rpc/org.skywalking.apm.test.persistence.PersistenceService.query(String)");
             Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_SERVER);
-            span.setPeer_host("192.168.1.8");
+            span.setPeerHost("192.168.1.8");
             span.setPort(20880);
             Tags.SPAN_LAYER.asHttp(span);
         }
@@ -36,7 +36,7 @@ public class DubboSpanGenerator {
             Tags.COMPONENT.set(span, "Dubbo");
             Tags.URL.set(span, "rest://192.168.1.8:20880/default_rpc/org.skywalking.apm.test.persistence.PersistenceService.query(String)");
             Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
-            span.setPeer_host("10.21.9.35");
+            span.setPeerHost("10.21.9.35");
             Tags.SPAN_LAYER.asHttp(span);
         }
 
diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java
index 52f518da43acad9d6e57f2948c94a228ba7ff29d..94eb8e4cd732509dc8a5f3f662417b052bd9ee62 100644
--- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java
+++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java
@@ -16,7 +16,7 @@ public class MySQLGenerator {
             Span span = ContextManager.createSpan("mysql/jdbi/statement/executeQuery");
             Tags.COMPONENT.set(span, "Mysql");
             Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
-            span.setPeer_host("10.5.34.18");
+            span.setPeerHost("10.5.34.18");
             span.setPort(30088);
             Tags.DB_INSTANCE.set(span, "mysql-instance");
             Tags.DB_STATEMENT.set(span, "select * from users where user_id = 1");
diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java
index 6e7adfc26bc879d5976ac67a3bcfe20b5ede7f2f..3d289c1986dd7c9b449141bc6e541d5d2d976943 100644
--- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java
+++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java
@@ -19,7 +19,7 @@ public class TomcatSpanGenerator {
             Tags.COMPONENT.set(webSpan, "Tomcat");
             Tags.URL.set(webSpan, "http://10.21.9.35/web/serviceA");
             Tags.SPAN_KIND.set(webSpan, Tags.SPAN_KIND_SERVER);
-            webSpan.setPeer_host("10.21.9.35");
+            webSpan.setPeerHost("10.21.9.35");
             webSpan.setPort(80);
             Tags.SPAN_LAYER.asHttp(webSpan);
         }
@@ -41,7 +41,7 @@ public class TomcatSpanGenerator {
             Tags.COMPONENT.set(webSpan, "Tomcat");
             Tags.URL.set(webSpan, "http://10.21.9.35/web/unknown");
             Tags.SPAN_KIND.set(webSpan, Tags.SPAN_KIND_SERVER);
-            webSpan.setPeer_host("10.21.9.35");
+            webSpan.setPeerHost("10.21.9.35");
             webSpan.setPort(80);
             Tags.SPAN_LAYER.asHttp(webSpan);
         }
@@ -64,7 +64,7 @@ public class TomcatSpanGenerator {
             Tags.COMPONENT.set(webSpan, "Tomcat");
             Tags.URL.set(webSpan, "http://10.21.9.35/web/error/service");
             Tags.SPAN_KIND.set(webSpan, Tags.SPAN_KIND_SERVER);
-            webSpan.setPeer_host("10.21.9.35");
+            webSpan.setPeerHost("10.21.9.35");
             webSpan.setPort(80);
             Tags.SPAN_LAYER.asHttp(webSpan);
         }