This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch inventory-extend in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/inventory-extend by this push: new 95229cd Fix code bugs 95229cd is described below commit 95229cd3f8bfbb632117a3ecc85d3d50b095fefa Author: Wu Sheng <wu.sh...@foxmail.com> AuthorDate: Fri Jan 11 19:57:50 2019 +0800 Fix code bugs --- .../oap/server/core/register/ServiceInventory.java | 2 +- .../provider/parser/standardization/SpanIdExchanger.java | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java index 0f11d4e..676ba52 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java @@ -55,7 +55,7 @@ public class ServiceInventory extends RegisterSource { @Setter(AccessLevel.PRIVATE) @Getter(AccessLevel.PRIVATE) @Column(columnName = NODE_TYPE) private int nodeType; @Setter @Getter @Column(columnName = MAPPING_SERVICE_ID) private int mappingServiceId; @Setter @Getter @Column(columnName = MAPPING_LAST_UPDATE_TIME) private long mappingLastUpdateTime; - @Getter(AccessLevel.PRIVATE) @Column(columnName = MAPPING_LAST_UPDATE_TIME) private String prop; + @Getter(AccessLevel.PRIVATE) @Column(columnName = PROPERTIES) private String prop; @Getter private JsonObject properties; public NodeType getServiceNodeType() { diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanIdExchanger.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanIdExchanger.java index 049aadf..f9bcf9c 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanIdExchanger.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanIdExchanger.java @@ -22,12 +22,13 @@ import com.google.common.base.Strings; import com.google.gson.JsonObject; import java.util.List; import org.apache.skywalking.apm.network.common.KeyStringValuePair; +import org.apache.skywalking.apm.network.language.agent.SpanLayer; import org.apache.skywalking.oap.server.core.*; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; import org.apache.skywalking.oap.server.core.config.IComponentLibraryCatalogService; import org.apache.skywalking.oap.server.core.register.*; import org.apache.skywalking.oap.server.core.register.service.*; -import org.apache.skywalking.oap.server.core.source.*; -import org.apache.skywalking.oap.server.core.storage.cache.IServiceInventoryCacheDAO; +import org.apache.skywalking.oap.server.core.source.DetectPoint; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.SpanDecorator; import org.slf4j.*; @@ -40,7 +41,7 @@ public class SpanIdExchanger implements IdExchanger<SpanDecorator> { private static final Logger logger = LoggerFactory.getLogger(SpanIdExchanger.class); private static SpanIdExchanger EXCHANGER; - private final IServiceInventoryCacheDAO serviceInventoryCacheDAO; + private final ServiceInventoryCache serviceInventoryCacheDAO; private final IServiceInventoryRegister serviceInventoryRegister; private final IEndpointInventoryRegister endpointInventoryRegister; private final INetworkAddressInventoryRegister networkAddressInventoryRegister; @@ -54,7 +55,7 @@ public class SpanIdExchanger implements IdExchanger<SpanDecorator> { } private SpanIdExchanger(ModuleManager moduleManager) { - this.serviceInventoryCacheDAO = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInventoryCacheDAO.class); + this.serviceInventoryCacheDAO = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); this.serviceInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInventoryRegister.class); this.endpointInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IEndpointInventoryRegister.class); this.networkAddressInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(INetworkAddressInventoryRegister.class); @@ -102,7 +103,7 @@ public class SpanIdExchanger implements IdExchanger<SpanDecorator> { * At here, if the target service properties need to be updated, * it will only be updated at the first time for now. */ - if (RequestType.DATABASE.equals(standardBuilder.getSpanLayer())) { + if (SpanLayer.Database.equals(standardBuilder.getSpanLayer())) { ServiceInventory newServiceInventory = serviceInventoryCacheDAO.get(serviceInventoryCacheDAO.getServiceId(peerId)); if (!newServiceInventory.hasProperties()) { serviceInventoryRegister.updateProperties(newServiceInventory.getSequence(), buildServiceProperties(standardBuilder)); @@ -130,7 +131,7 @@ public class SpanIdExchanger implements IdExchanger<SpanDecorator> { private JsonObject buildServiceProperties(SpanDecorator standardBuilder) { JsonObject properties = new JsonObject(); - if (RequestType.DATABASE.equals(standardBuilder.getSpanLayer())) { + if (SpanLayer.Database.equals(standardBuilder.getSpanLayer())) { List<KeyStringValuePair> tags = standardBuilder.getAllTags(); tags.forEach(tag -> { if ("db.type".equals(tag.getKey())) {