You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/03/04 03:38:47 UTC
[skywalking] branch name-field created (now b2d1cd0)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch name-field
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at b2d1cd0 Support activeExtraModelColumns as a default OFF option.
This branch includes the following new commits:
new 15d9b7d Support dynamic column in the source.
new b2d1cd0 Support activeExtraModelColumns as a default OFF option.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/02: Support dynamic column in the source.
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch name-field
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 15d9b7dd902850b8b05ceada80de6a0de75cb79d
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Mar 4 10:25:07 2020 +0800
Support dynamic column in the source.
---
.../oap/server/core/CoreModuleConfig.java | 11 +++++++++++
.../oap/server/core/CoreModuleProvider.java | 4 ++++
.../oap/server/core/source/DatabaseAccess.java | 1 +
.../oap/server/core/source/DefaultScopeDefine.java | 22 ++++++++++++++++------
.../oap/server/core/source/Endpoint.java | 2 ++
.../server/core/source/EnvoyInstanceMetric.java | 1 +
.../oap/server/core/source/ScopeDefaultColumn.java | 7 +++++++
.../skywalking/oap/server/core/source/Service.java | 1 +
.../oap/server/core/source/ServiceInstance.java | 2 ++
.../server/core/source/ServiceInstanceCLRCPU.java | 2 ++
.../server/core/source/ServiceInstanceCLRGC.java | 2 ++
.../core/source/ServiceInstanceCLRThread.java | 2 ++
.../server/core/source/ServiceInstanceJVMCPU.java | 2 ++
.../server/core/source/ServiceInstanceJVMGC.java | 2 ++
.../core/source/ServiceInstanceJVMMemory.java | 2 ++
.../core/source/ServiceInstanceJVMMemoryPool.java | 2 ++
16 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java
index c9ceccb..034650e 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import lombok.Getter;
import lombok.Setter;
+import org.apache.skywalking.oap.server.core.source.ScopeDefaultColumn;
import org.apache.skywalking.oap.server.library.module.ModuleConfig;
@Getter
@@ -103,6 +104,16 @@ public class CoreModuleConfig extends ModuleConfig {
*/
private int maxSizeOfAnalyzeProfileSnapshot = 12000;
+ /**
+ * Extra model column are the column defined by {@link ScopeDefaultColumn.DefinedByField#requireDynamicActive()} ==
+ * true. This model is not required logically in aggregation or further query, and it will cause more load for
+ * memory, network of OAP and storage.
+ *
+ * But, being activated, user could see the name in the storage entities, which make users easier to use 3rd party
+ * tool, such as Kibana->ES, to query the data by themselves.
+ */
+ private boolean activeExtraModelColumns = false;
+
CoreModuleConfig() {
this.downsampling = new ArrayList<>();
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
index 2034a72..4175877 100755
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
@@ -138,6 +138,10 @@ public class CoreModuleProvider extends ModuleProvider {
@Override
public void prepare() throws ServiceNotProvidedException, ModuleStartException {
+ if (moduleConfig.isActiveExtraModelColumns()) {
+ DefaultScopeDefine.activeExtraModelColumns();
+ }
+
StreamAnnotationListener streamAnnotationListener = new StreamAnnotationListener(getManager());
AnnotationScan scopeScan = new AnnotationScan();
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DatabaseAccess.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DatabaseAccess.java
index 4c10689..1a382e7a 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DatabaseAccess.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DatabaseAccess.java
@@ -42,6 +42,7 @@ public class DatabaseAccess extends Source {
private long id;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
private String name;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
index cab4cc6..f6314b2 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import lombok.Setter;
import org.apache.skywalking.oap.server.core.UnexpectedException;
import org.apache.skywalking.oap.server.core.annotation.AnnotationListener;
@@ -78,6 +79,13 @@ public class DefaultScopeDefine {
private static final Map<Integer, Boolean> SERVICE_INSTANCE_CATALOG = new HashMap<>();
private static final Map<Integer, Boolean> ENDPOINT_CATALOG = new HashMap<>();
+ @Setter
+ private static boolean ACTIVE_EXTRA_MODEL_COLUMNS = false;
+
+ public static void activeExtraModelColumns() {
+ ACTIVE_EXTRA_MODEL_COLUMNS = true;
+ }
+
/**
* Annotation scan listener
*/
@@ -99,7 +107,7 @@ public class DefaultScopeDefine {
/**
* Add a new scope based on the scan result
*
- * @param declaration includes the definition.
+ * @param declaration includes the definition.
* @param originalClass represents the class having the {@link ScopeDeclaration} annotation
*/
private static final void addNewScope(ScopeDeclaration declaration, Class originalClass) {
@@ -133,11 +141,13 @@ public class DefaultScopeDefine {
ScopeDefaultColumn.DefinedByField definedByField = field.getAnnotation(
ScopeDefaultColumn.DefinedByField.class);
if (definedByField != null) {
- scopeDefaultColumns.add(
- new ScopeDefaultColumn(field.getName(), definedByField.columnName(), field.getType(),
- definedByField
- .isID()
- ));
+ if (!definedByField.requireDynamicActive() || ACTIVE_EXTRA_MODEL_COLUMNS) {
+ scopeDefaultColumns.add(
+ new ScopeDefaultColumn(field.getName(), definedByField.columnName(), field.getType(),
+ definedByField
+ .isID()
+ ));
+ }
}
}
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Endpoint.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Endpoint.java
index e2611d7..370907b 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Endpoint.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Endpoint.java
@@ -42,6 +42,7 @@ public class Endpoint extends Source {
private int id;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
private String name;
@Getter
@Setter
@@ -49,6 +50,7 @@ public class Endpoint extends Source {
private int serviceId;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "service_name", requireDynamicActive = true)
private String serviceName;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EnvoyInstanceMetric.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EnvoyInstanceMetric.java
index f00f8e0..60269db 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EnvoyInstanceMetric.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EnvoyInstanceMetric.java
@@ -54,6 +54,7 @@ public class EnvoyInstanceMetric extends Source {
private int serviceId;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
private String name;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ScopeDefaultColumn.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ScopeDefaultColumn.java
index dfc770d..45d5d74 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ScopeDefaultColumn.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ScopeDefaultColumn.java
@@ -51,6 +51,13 @@ public class ScopeDefaultColumn {
String columnName();
boolean isID() default false;
+
+ /**
+ * Dynamic active means this column is only activated through core setting explicitly.
+ *
+ * @return
+ */
+ boolean requireDynamicActive() default false;
}
@Target({ElementType.TYPE})
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Service.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Service.java
index e997df6..5dc390e 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Service.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Service.java
@@ -42,6 +42,7 @@ public class Service extends Source {
private int id;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
private String name;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstance.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstance.java
index 8bb0c65..851d30c 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstance.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstance.java
@@ -46,9 +46,11 @@ public class ServiceInstance extends Source {
private int serviceId;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
private String name;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "service_name", requireDynamicActive = true)
private String serviceName;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRCPU.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRCPU.java
index c73c7c0..fe71000 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRCPU.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRCPU.java
@@ -45,9 +45,11 @@ public class ServiceInstanceCLRCPU extends Source {
private int id;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
private String name;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "service_name", requireDynamicActive = true)
private String serviceName;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRGC.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRGC.java
index 6ee0728..3038086 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRGC.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRGC.java
@@ -45,9 +45,11 @@ public class ServiceInstanceCLRGC extends Source {
private int id;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
private String name;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "service_name", requireDynamicActive = true)
private String serviceName;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRThread.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRThread.java
index fbe04ec..e3cdeaf 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRThread.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRThread.java
@@ -45,9 +45,11 @@ public class ServiceInstanceCLRThread extends Source {
private int id;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
private String name;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "service_name", requireDynamicActive = true)
private String serviceName;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMCPU.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMCPU.java
index 44fc411..2ca1dd9 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMCPU.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMCPU.java
@@ -42,9 +42,11 @@ public class ServiceInstanceJVMCPU extends Source {
private int id;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
private String name;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "service_name", requireDynamicActive = true)
private String serviceName;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMGC.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMGC.java
index 65e5136..3cacd86 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMGC.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMGC.java
@@ -42,9 +42,11 @@ public class ServiceInstanceJVMGC extends Source {
private int id;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
private String name;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "service_name", requireDynamicActive = true)
private String serviceName;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemory.java
index 80f8b79..4582629 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemory.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemory.java
@@ -42,9 +42,11 @@ public class ServiceInstanceJVMMemory extends Source {
private int id;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
private String name;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "service_name", requireDynamicActive = true)
private String serviceName;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemoryPool.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemoryPool.java
index b149871..dd20db9 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemoryPool.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemoryPool.java
@@ -42,9 +42,11 @@ public class ServiceInstanceJVMMemoryPool extends Source {
private int id;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "name", requireDynamicActive = true)
private String name;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "service_name", requireDynamicActive = true)
private String serviceName;
@Getter
@Setter
[skywalking] 02/02: Support activeExtraModelColumns as a default
OFF option.
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch name-field
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit b2d1cd0f5bc3d2ee2bfb25c221e781571881929c
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Mar 4 11:38:30 2020 +0800
Support activeExtraModelColumns as a default OFF option.
---
dist-material/application.yml | 4 ++++
docs/en/setup/backend/backend-setup.md | 12 ++++++++++++
.../server-bootstrap/src/main/resources/application.yml | 4 ++++
.../apache/skywalking/oap/server/core/CoreModuleConfig.java | 2 +-
.../skywalking/oap/server/core/source/EndpointRelation.java | 6 ++++--
.../oap/server/core/source/ServiceInstanceRelation.java | 4 ++++
.../skywalking/oap/server/core/source/ServiceRelation.java | 2 ++
7 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/dist-material/application.yml b/dist-material/application.yml
index 8012e41..4067fef 100644
--- a/dist-material/application.yml
+++ b/dist-material/application.yml
@@ -75,6 +75,10 @@ core:
# the metrics may not be accurate within that minute.
enableDatabaseSession: ${SW_CORE_ENABLE_DATABASE_SESSION:true}
topNReportPeriod: ${SW_CORE_TOPN_REPORT_PERIOD:10} # top_n record worker report cycle, unit is minute
+ # Extra model column are the column defined by in the codes, These columns of model are not required logically in aggregation or further query,
+ # and it will cause more load for memory, network of OAP and storage.
+ # But, being activated, user could see the name in the storage entities, which make users easier to use 3rd party tool, such as Kibana->ES, to query the data by themselves.
+ activeExtraModelColumns: ${SW_CORE_ACTIVE_EXTRA_MODEL_COLUMNS:false}
storage:
# elasticsearch:
# nameSpace: ${SW_NAMESPACE:""}
diff --git a/docs/en/setup/backend/backend-setup.md b/docs/en/setup/backend/backend-setup.md
index f006be2..223b886 100755
--- a/docs/en/setup/backend/backend-setup.md
+++ b/docs/en/setup/backend/backend-setup.md
@@ -115,3 +115,15 @@ which format process is timezone related.
In default, SkyWalking OAP backend choose the OS default timezone.
If you want to override it, please follow Java and OS documents to do so.
+
+#### How to query the storage directly from 3rd party tool?
+SkyWalking provides browser UI, CLI and GraphQL ways to support extensions. But some users may have the idea to query data
+directly from the storage. Such as in ElasticSearch case, Kibana is a great tool to do this.
+
+In default, due to save memory/network and storage space, SkyWalking saves id(s) only in the entity and metadata saved in the
+*_inventory entities only. But these tools usually don't support nested query, or don't work conveniently. In this special case,
+SkyWalking provide a config to add all necessary name column(s) into the final metrics entities with ID as a trade-off.
+
+Take a look at `core/default/activeExtraModelColumns` config in the `application.yaml`, and set it as `true` to open this feature.
+
+This feature wouldn't provide any new feature to the native SkyWalking scenarios, just for the 3rd party integration.
diff --git a/oap-server/server-bootstrap/src/main/resources/application.yml b/oap-server/server-bootstrap/src/main/resources/application.yml
index a97537b..3d87b3e 100755
--- a/oap-server/server-bootstrap/src/main/resources/application.yml
+++ b/oap-server/server-bootstrap/src/main/resources/application.yml
@@ -74,6 +74,10 @@ core:
# the metrics may not be accurate within that minute.
enableDatabaseSession: ${SW_CORE_ENABLE_DATABASE_SESSION:true}
topNReportPeriod: ${SW_CORE_TOPN_REPORT_PERIOD:10} # top_n record worker report cycle, unit is minute
+ # Extra model column are the column defined by in the codes, These columns of model are not required logically in aggregation or further query,
+ # and it will cause more load for memory, network of OAP and storage.
+ # But, being activated, user could see the name in the storage entities, which make users easier to use 3rd party tool, such as Kibana->ES, to query the data by themselves.
+ activeExtraModelColumns: ${SW_CORE_ACTIVE_EXTRA_MODEL_COLUMNS:false}
storage:
# elasticsearch:
# nameSpace: ${SW_NAMESPACE:""}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java
index 034650e..09cf78c 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java
@@ -106,7 +106,7 @@ public class CoreModuleConfig extends ModuleConfig {
/**
* Extra model column are the column defined by {@link ScopeDefaultColumn.DefinedByField#requireDynamicActive()} ==
- * true. This model is not required logically in aggregation or further query, and it will cause more load for
+ * true. These columns of model are not required logically in aggregation or further query, and it will cause more load for
* memory, network of OAP and storage.
*
* But, being activated, user could see the name in the storage entities, which make users easier to use 3rd party
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java
index 9731037..5a87d30 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java
@@ -43,6 +43,7 @@ public class EndpointRelation extends Source {
private int endpointId;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "source_endpoint_name", requireDynamicActive = true)
private String endpoint;
@Getter
@Setter
@@ -50,10 +51,10 @@ public class EndpointRelation extends Source {
private int serviceId;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "source_service_name", requireDynamicActive = true)
private String serviceName;
@Getter
@Setter
- @ScopeDefaultColumn.DefinedByField(columnName = "service_instance_id")
private int serviceInstanceId;
@Getter
@Setter
@@ -64,6 +65,7 @@ public class EndpointRelation extends Source {
private int childEndpointId;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "child_endpoint_name", requireDynamicActive = true)
private String childEndpoint;
@Getter
@Setter
@@ -71,10 +73,10 @@ public class EndpointRelation extends Source {
private int childServiceId;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "child_service_name", requireDynamicActive = true)
private String childServiceName;
@Getter
@Setter
- @ScopeDefaultColumn.DefinedByField(columnName = "child_service_instance_id")
private int childServiceInstanceId;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java
index 34b0906..9523c9a 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java
@@ -48,9 +48,11 @@ public class ServiceInstanceRelation extends Source {
private int sourceServiceId;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "source_service_name", requireDynamicActive = true)
private String sourceServiceName;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "source_service_instance_name", requireDynamicActive = true)
private String sourceServiceInstanceName;
@Getter
@Setter
@@ -62,9 +64,11 @@ public class ServiceInstanceRelation extends Source {
private int destServiceId;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "dest_service_name", requireDynamicActive = true)
private String destServiceName;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "dest_service_instance_name", requireDynamicActive = true)
private String destServiceInstanceName;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceRelation.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceRelation.java
index f2016ba..7a8172b 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceRelation.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceRelation.java
@@ -43,6 +43,7 @@ public class ServiceRelation extends Source {
private int sourceServiceId;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "source_name", requireDynamicActive = true)
private String sourceServiceName;
@Getter
@Setter
@@ -52,6 +53,7 @@ public class ServiceRelation extends Source {
private int destServiceId;
@Getter
@Setter
+ @ScopeDefaultColumn.DefinedByField(columnName = "dest_name", requireDynamicActive = true)
private String destServiceName;
@Getter
@Setter