diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceId/DistributedTraceId.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceId/DistributedTraceId.java
index d1988a9cefd823248593bd3ee23c94c2b36a5994..b64cffaea3d88f1ac2813cad907acb5b5179f59c 100644
--- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceId/DistributedTraceId.java
+++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceId/DistributedTraceId.java
@@ -23,4 +23,21 @@ public abstract class DistributedTraceId {
     public String get() {
         return id;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+
+        DistributedTraceId id1 = (DistributedTraceId)o;
+
+        return id != null ? id.equals(id1.id) : id1.id == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return id != null ? id.hashCode() : 0;
+    }
 }
diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
index 45c3bc5d794c6776c2e34c9ff50217b24b623cca..6a926f6d5263122b0db767a54ae15e19d55c44c2 100644
--- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
+++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
@@ -104,21 +104,15 @@ public class TraceSegmentRef{
 
         TraceSegmentRef ref = (TraceSegmentRef)o;
 
-        if (spanId != ref.spanId)
-            return false;
         if (traceSegmentId != null ? !traceSegmentId.equals(ref.traceSegmentId) : ref.traceSegmentId != null)
             return false;
-        if (applicationCode != null ? !applicationCode.equals(ref.applicationCode) : ref.applicationCode != null)
-            return false;
-        return peerHost != null ? peerHost.equals(ref.peerHost) : ref.peerHost == null;
+        return applicationCode != null ? applicationCode.equals(ref.applicationCode) : ref.applicationCode == null;
     }
 
     @Override
     public int hashCode() {
         int result = traceSegmentId != null ? traceSegmentId.hashCode() : 0;
-        result = 31 * result + spanId;
         result = 31 * result + (applicationCode != null ? applicationCode.hashCode() : 0);
-        result = 31 * result + (peerHost != null ? peerHost.hashCode() : 0);
         return result;
     }
 }