kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Language of instance could be NULL (#3485) 

* Language of instance could be NULL

* Fix style check.

* Fix duplicated test cases.
This commit is contained in:
吴晟 Wu Sheng 2019-09-19 00:23:11 +08:00 committed by GitHub
parent 72f07b812a
commit 6942ec8fcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstance.java
View File

@ -18,8 +18,10 @@
package org.apache.skywalking.oap.server.core.query.entity;
import java.util.*;
import lombok.*;
import java.util.ArrayList;
import java.util.List;
import lombok.Getter;
import lombok.Setter;
/**
* @author peng-yongsheng
@ -29,7 +31,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<>();

20
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
View File

@ -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;
@ -255,28 +254,21 @@ public class MetadataQueryEsDAO extends EsDAO implements IMetadataQueryDAO {
String value = property.getValue().getAsString();
if (key.equals(LANGUAGE)) {
serviceInstance.setLanguage(LanguageTrans.INSTANCE.value(value));
}
if (key.equals(OS_NAME)) {
} else if (key.equals(OS_NAME)) {
serviceInstance.getAttributes().add(new Attribute(OS_NAME, value));
}
if (key.equals(HOST_NAME)) {
} else if (key.equals(HOST_NAME)) {
serviceInstance.getAttributes().add(new Attribute(HOST_NAME, value));
}
if (key.equals(PROCESS_NO)) {
} else if (key.equals(PROCESS_NO)) {
serviceInstance.getAttributes().add(new Attribute(PROCESS_NO, value));
}
if (key.equals(IPV4S)) {
} else if (key.equals(IPV4S)) {
List<String> ipv4s = ServiceInstanceInventory.PropertyUtil.ipv4sDeserialize(properties.get(IPV4S).getAsString());
for (String ipv4 : ipv4s) {
serviceInstance.getAttributes().add(new Attribute(ServiceInstanceInventory.PropertyUtil.IPV4S, ipv4));
}
} else {
serviceInstance.getAttributes().add(new Attribute(key, value));
}
serviceInstance.getAttributes().add(new Attribute(key, value));
}
} else {
serviceInstance.setLanguage(Language.UNKNOWN);
}
serviceInstances.add(serviceInstance);

20
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
View File

@ -32,7 +32,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;
@ -287,28 +286,21 @@ public class H2MetadataQueryDAO implements IMetadataQueryDAO {
String value = property.getValue().getAsString();
if (key.equals(LANGUAGE)) {
serviceInstance.setLanguage(LanguageTrans.INSTANCE.value(value));
}
if (key.equals(OS_NAME)) {
} else if (key.equals(OS_NAME)) {
serviceInstance.getAttributes().add(new Attribute(OS_NAME, value));
}
if (key.equals(HOST_NAME)) {
} else if (key.equals(HOST_NAME)) {
serviceInstance.getAttributes().add(new Attribute(HOST_NAME, value));
}
if (key.equals(PROCESS_NO)) {
} else if (key.equals(PROCESS_NO)) {
serviceInstance.getAttributes().add(new Attribute(PROCESS_NO, value));
}
if (key.equals(IPV4S)) {
} else if (key.equals(IPV4S)) {
List<String> ipv4s = ServiceInstanceInventory.PropertyUtil.ipv4sDeserialize(properties.get(IPV4S).getAsString());
for (String ipv4 : ipv4s) {
serviceInstance.getAttributes().add(new Attribute(ServiceInstanceInventory.PropertyUtil.IPV4S, ipv4));
}
} else {
serviceInstance.getAttributes().add(new Attribute(key, value));
}
serviceInstance.getAttributes().add(new Attribute(key, value));
}
} else {
serviceInstance.setLanguage(Language.UNKNOWN);
}
serviceInstances.add(serviceInstance);