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 2019/09/18 15:00:12 UTC
[skywalking] 01/01: Language of instance could be NULL
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch fix-break
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit b2f819382af2a6050dc96b2febf23452c6a91ac3
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Sep 18 22:59:00 2019 +0800
Language of instance could be NULL
---
.../skywalking/oap/server/core/query/entity/ServiceInstance.java | 2 +-
.../server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java | 3 ---
.../oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 2 --
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstance.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstance.java
index 89bd6d7..96248fa 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstance.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstance.java
@@ -29,7 +29,7 @@ public class ServiceInstance {
@Setter private String id;
@Setter private String name;
private final List<Attribute> attributes;
- @Setter private Language language;
+ @Setter private Language language = Language.UNKNOWN;
public ServiceInstance() {
this.attributes = new ArrayList<>();
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
index 63b52fa..55388e1 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
@@ -29,7 +29,6 @@ import java.util.Map;
import org.apache.skywalking.oap.server.core.query.entity.Attribute;
import org.apache.skywalking.oap.server.core.query.entity.Database;
import org.apache.skywalking.oap.server.core.query.entity.Endpoint;
-import org.apache.skywalking.oap.server.core.query.entity.Language;
import org.apache.skywalking.oap.server.core.query.entity.LanguageTrans;
import org.apache.skywalking.oap.server.core.query.entity.Service;
import org.apache.skywalking.oap.server.core.query.entity.ServiceInstance;
@@ -275,8 +274,6 @@ public class MetadataQueryEsDAO extends EsDAO implements IMetadataQueryDAO {
serviceInstance.getAttributes().add(new Attribute(key, value));
}
- } else {
- serviceInstance.setLanguage(Language.UNKNOWN);
}
serviceInstances.add(serviceInstance);
diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
index 0fc0131..1cb2e2d 100644
--- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
+++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
@@ -307,8 +307,6 @@ public class H2MetadataQueryDAO implements IMetadataQueryDAO {
serviceInstance.getAttributes().add(new Attribute(key, value));
}
- } else {
- serviceInstance.setLanguage(Language.UNKNOWN);
}
serviceInstances.add(serviceInstance);