diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java index b49443144..a28649bcd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java @@ -40,11 +40,11 @@ public class EndpointInventory extends RegisterSource { private static final String SERVICE_ID = "service_id"; private static final String NAME = "name"; - private static final String SRC_SPAN_TYPE = "src_span_type"; + private static final String DETECT_POINT = "detect_point"; @Setter @Getter @Column(columnName = SERVICE_ID) private int serviceId; @Setter @Getter @Column(columnName = NAME, matchQuery = true) private String name = Const.EMPTY_STRING; - @Setter @Getter @Column(columnName = SRC_SPAN_TYPE) private int srcSpanType; + @Setter @Getter @Column(columnName = DETECT_POINT) private int detectPoint; public static String buildId(int serviceId, String endpointName) { return serviceId + Const.ID_SPLIT + endpointName; @@ -82,7 +82,7 @@ public class EndpointInventory extends RegisterSource { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); remoteBuilder.setDataIntegers(0, getSequence()); remoteBuilder.setDataIntegers(1, serviceId); - remoteBuilder.setDataIntegers(2, srcSpanType); + remoteBuilder.setDataIntegers(2, detectPoint); remoteBuilder.setDataLongs(0, getRegisterTime()); remoteBuilder.setDataLongs(1, getHeartbeatTime()); @@ -94,7 +94,7 @@ public class EndpointInventory extends RegisterSource { @Override public void deserialize(RemoteData remoteData) { setSequence(remoteData.getDataIntegers(0)); setServiceId(remoteData.getDataIntegers(1)); - setSrcSpanType(remoteData.getDataIntegers(2)); + setDetectPoint(remoteData.getDataIntegers(2)); setRegisterTime(remoteData.getDataLongs(0)); setHeartbeatTime(remoteData.getDataLongs(1)); @@ -109,7 +109,7 @@ public class EndpointInventory extends RegisterSource { inventory.setSequence((Integer)dbMap.get(SEQUENCE)); inventory.setServiceId((Integer)dbMap.get(SERVICE_ID)); inventory.setName((String)dbMap.get(NAME)); - inventory.setSrcSpanType((Integer)dbMap.get(SRC_SPAN_TYPE)); + inventory.setDetectPoint((Integer)dbMap.get(DETECT_POINT)); inventory.setRegisterTime((Long)dbMap.get(REGISTER_TIME)); inventory.setHeartbeatTime((Long)dbMap.get(HEARTBEAT_TIME)); return inventory; @@ -120,7 +120,7 @@ public class EndpointInventory extends RegisterSource { map.put(SEQUENCE, storageData.getSequence()); map.put(SERVICE_ID, storageData.getServiceId()); map.put(NAME, storageData.getName()); - map.put(SRC_SPAN_TYPE, storageData.getSrcSpanType()); + map.put(DETECT_POINT, storageData.getDetectPoint()); map.put(REGISTER_TIME, storageData.getRegisterTime()); map.put(HEARTBEAT_TIME, storageData.getHeartbeatTime()); return map; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java index b3cd3dc50..69e405d70 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java @@ -48,14 +48,14 @@ public class EndpointInventoryRegister implements IEndpointInventoryRegister { return cacheService; } - @Override public int getOrCreate(int serviceId, String endpointName, int srcSpanType) { + @Override public int getOrCreate(int serviceId, String endpointName, int detectPoint) { int endpointId = getCacheService().getEndpointId(serviceId, endpointName); if (endpointId == Const.NONE) { EndpointInventory endpointInventory = new EndpointInventory(); endpointInventory.setServiceId(serviceId); endpointInventory.setName(endpointName); - endpointInventory.setSrcSpanType(srcSpanType); + endpointInventory.setDetectPoint(detectPoint); long now = System.currentTimeMillis(); endpointInventory.setRegisterTime(now); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IEndpointInventoryRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IEndpointInventoryRegister.java index e86b48b5d..d5c06db3c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IEndpointInventoryRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IEndpointInventoryRegister.java @@ -25,7 +25,7 @@ import org.apache.skywalking.oap.server.library.module.Service; */ public interface IEndpointInventoryRegister extends Service { - int getOrCreate(int serviceId, String endpointName, int srcSpanType); + int getOrCreate(int serviceId, String endpointName, int detectPoint); int get(int serviceId, String endpointName); }