Remove fields of parent entity in the relation sources. (#6471)

CHANGES.md

@@ -38,6 +38,7 @@ Release Notes.
 * Upgrade the Zipkin Elasticsearch storage from 6 to 7.
 * Require Zipkin receiver must work with `zipkin-elasticsearch7` storage option.
 * Fix `DatabaseSlowStatementBuilder` statement maybe null.
+* Remove fields of parent entity in the relation sources. 
 
 #### UI
 * Update selector scroller to show in all pages.

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java

@@ -44,11 +44,9 @@ public class EndpointRelation extends Source {
 
     @Getter
     @Setter
-    @ScopeDefaultColumn.DefinedByField(columnName = "source_endpoint_name")
+    @ScopeDefaultColumn.DefinedByField(columnName = "source_endpoint_name", requireDynamicActive = true)
     private String endpoint;
-
     @Getter
-    @ScopeDefaultColumn.DefinedByField(columnName = "service_id")
     private String serviceId;
     @Getter
     @Setter
@@ -61,10 +59,9 @@ public class EndpointRelation extends Source {
     private String serviceInstanceName;
     @Getter
     @Setter
-    @ScopeDefaultColumn.DefinedByField(columnName = "child_endpoint_name")
+    @ScopeDefaultColumn.DefinedByField(columnName = "child_endpoint_name", requireDynamicActive = true)
     private String childEndpoint;
     @Getter
-    @ScopeDefaultColumn.DefinedByField(columnName = "child_service_id")
     private String childServiceId;
     @Setter
     @Getter

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java

@@ -51,10 +51,8 @@ public class ServiceInstanceRelation extends Source {
     }
 
     @Getter
-    @ScopeDefaultColumn.DefinedByField(columnName = "source_service_instance_id")
     private String sourceServiceInstanceId;
     @Getter
-    @ScopeDefaultColumn.DefinedByField(columnName = "source_service_id")
     private String sourceServiceId;
     @Getter
     @Setter
@@ -67,10 +65,8 @@ public class ServiceInstanceRelation extends Source {
     @ScopeDefaultColumn.DefinedByField(columnName = "source_service_instance_name", requireDynamicActive = true)
     private String sourceServiceInstanceName;
     @Getter
-    @ScopeDefaultColumn.DefinedByField(columnName = "dest_service_instance_id")
     private String destServiceInstanceId;
     @Getter
-    @ScopeDefaultColumn.DefinedByField(columnName = "dest_service_id")
     private String destServiceId;
     @Setter
     private NodeType destServiceNodeType;