wu-sheng closed pull request #837: Feature/get cluster brief
URL: https://github.com/apache/incubator-skywalking/pull/837
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java
b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java
index ee7cab7e6..bd644ebb3 100644
---
a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java
+++
b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java
@@ -53,7 +53,8 @@ public ServiceNameDiscoveryServiceHandler(ModuleManager
moduleManager) {
for (ServiceNameElement serviceNameElement : serviceNameElementList) {
int applicationId = serviceNameElement.getApplicationId();
String serviceName = serviceNameElement.getServiceName();
- int serviceId = serviceNameService.getOrCreate(applicationId,
serviceName);
+ int srcSpanType = serviceNameElement.getSrcSpanTypeValue();
+ int serviceId = serviceNameService.getOrCreate(applicationId,
srcSpanType, serviceName);
if (serviceId != 0) {
ServiceNameMappingElement.Builder mappingElement =
ServiceNameMappingElement.newBuilder();
diff --git
a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java
b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java
index 11c7f070a..0611d6e89 100644
---
a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java
+++
b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java
@@ -34,6 +34,7 @@
import org.apache.skywalking.apm.network.proto.ServiceNameDiscoveryServiceGrpc;
import org.apache.skywalking.apm.network.proto.ServiceNameElement;
import org.apache.skywalking.apm.network.proto.ServiceNameMappingCollection;
+import org.apache.skywalking.apm.network.proto.SpanType;
import org.apache.skywalking.apm.util.RunnableWithExceptionProtection;
import org.joda.time.DateTime;
import org.slf4j.Logger;
@@ -95,6 +96,7 @@ private void registerConsumer() throws InterruptedException {
ServiceNameElement.Builder serviceNameElement =
ServiceNameElement.newBuilder();
serviceNameElement.setApplicationId(applicationMapping.getApplication().getValue());
serviceNameElement.setServiceName("org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()");
+ serviceNameElement.setSrcSpanType(SpanType.Exit);
serviceNameCollection.addElements(serviceNameElement);
registerServiceName(serviceNameCollection);
@@ -139,6 +141,7 @@ private void registerProvider() throws InterruptedException
{
ServiceNameElement.Builder serviceNameElement =
ServiceNameElement.newBuilder();
serviceNameElement.setApplicationId(applicationMapping.getApplication().getValue());
serviceNameElement.setServiceName("org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()");
+ serviceNameElement.setSrcSpanType(SpanType.Entry);
serviceNameCollection.addElements(serviceNameElement);
registerServiceName(serviceNameCollection);
diff --git
a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java
b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java
index 15cc4c065..f89f6092f 100644
---
a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java
+++
b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java
@@ -44,6 +44,7 @@
private static final String APPLICATION_ID = "ai";
private static final String SERVICE_NAME = "sn";
+ private static final String SRC_SPAN_TYPE = "st";
private static final String SERVICE_ID = "si";
private static final String ELEMENT = "el";
@@ -66,8 +67,9 @@ public ServiceNameDiscoveryServiceHandler(ModuleManager
moduleManager) {
for (JsonElement service : services) {
int applicationId =
service.getAsJsonObject().get(APPLICATION_ID).getAsInt();
String serviceName =
service.getAsJsonObject().get(SERVICE_NAME).getAsString();
+ int srcSpanType =
service.getAsJsonObject().get(SRC_SPAN_TYPE).getAsInt();
- int serviceId = serviceNameService.getOrCreate(applicationId,
serviceName);
+ int serviceId = serviceNameService.getOrCreate(applicationId,
srcSpanType, serviceName);
if (serviceId != 0) {
JsonObject responseJson = new JsonObject();
responseJson.addProperty(SERVICE_ID, serviceId);
diff --git
a/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IServiceNameService.java
b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IServiceNameService.java
index a91f7dd2d..42656c397 100644
---
a/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IServiceNameService.java
+++
b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IServiceNameService.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.collector.analysis.register.define.service;
import org.apache.skywalking.apm.collector.core.module.Service;
@@ -25,5 +24,5 @@
* @author peng-yongsheng
*/
public interface IServiceNameService extends Service {
- int getOrCreate(int applicationId, String serviceName);
+ int getOrCreate(int applicationId, int srcSpanType, String serviceName);
}
diff --git
a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterSerialWorker.java
b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterSerialWorker.java
index 26869fa6b..77e396d2b 100644
---
a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterSerialWorker.java
+++
b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ServiceNameRegisterSerialWorker.java
@@ -42,7 +42,7 @@
private final IServiceNameRegisterDAO serviceNameRegisterDAO;
private final ServiceIdCacheService serviceIdCacheService;
- public ServiceNameRegisterSerialWorker(ModuleManager moduleManager) {
+ ServiceNameRegisterSerialWorker(ModuleManager moduleManager) {
super(moduleManager);
this.serviceNameRegisterDAO =
getModuleManager().find(StorageModule.NAME).getService(IServiceNameRegisterDAO.class);
this.serviceIdCacheService =
getModuleManager().find(CacheModule.NAME).getService(ServiceIdCacheService.class);
@@ -54,7 +54,7 @@ public ServiceNameRegisterSerialWorker(ModuleManager
moduleManager) {
@Override protected void onWork(ServiceName serviceName) throws
WorkerException {
logger.debug("register service name: {}, application id: {}",
serviceName.getServiceName(), serviceName.getApplicationId());
- int serviceId =
serviceIdCacheService.get(serviceName.getApplicationId(),
serviceName.getServiceName());
+ int serviceId =
serviceIdCacheService.get(serviceName.getApplicationId(),
serviceName.getSrcSpanType(), serviceName.getServiceName());
if (serviceId == 0) {
ServiceName newServiceName;
@@ -62,15 +62,17 @@ public ServiceNameRegisterSerialWorker(ModuleManager
moduleManager) {
if (min == 0) {
ServiceName noneServiceName = new ServiceName();
noneServiceName.setId("1");
- noneServiceName.setApplicationId(0);
+ noneServiceName.setApplicationId(Const.NONE_APPLICATION_ID);
noneServiceName.setServiceId(Const.NONE_SERVICE_ID);
noneServiceName.setServiceName(Const.NONE_SERVICE_NAME);
+ noneServiceName.setSrcSpanType(Const.SPAN_TYPE_VIRTUAL);
serviceNameRegisterDAO.save(noneServiceName);
newServiceName = new ServiceName();
newServiceName.setId("-1");
newServiceName.setApplicationId(serviceName.getApplicationId());
newServiceName.setServiceId(-1);
+ newServiceName.setSrcSpanType(serviceName.getSrcSpanType());
newServiceName.setServiceName(serviceName.getServiceName());
} else {
int max = serviceNameRegisterDAO.getMaxServiceId();
@@ -80,6 +82,7 @@ public ServiceNameRegisterSerialWorker(ModuleManager
moduleManager) {
newServiceName.setId(String.valueOf(serviceId));
newServiceName.setApplicationId(serviceName.getApplicationId());
newServiceName.setServiceId(serviceId);
+ newServiceName.setSrcSpanType(serviceName.getSrcSpanType());
newServiceName.setServiceName(serviceName.getServiceName());
}
serviceNameRegisterDAO.save(newServiceName);
diff --git
a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/ServiceNameService.java
b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/ServiceNameService.java
index 34f8d1f75..7e0579b2a 100644
---
a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/ServiceNameService.java
+++
b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/ServiceNameService.java
@@ -59,14 +59,15 @@ private ServiceIdCacheService getServiceIdCacheService() {
return serviceNameRegisterGraph;
}
- public int getOrCreate(int applicationId, String serviceName) {
- int serviceId = getServiceIdCacheService().get(applicationId,
serviceName);
+ @Override public int getOrCreate(int applicationId, int srcSpanType,
String serviceName) {
+ int serviceId = getServiceIdCacheService().get(applicationId,
srcSpanType, serviceName);
if (serviceId == 0) {
ServiceName service = new ServiceName();
service.setId("0");
service.setApplicationId(applicationId);
service.setServiceName(serviceName);
+ service.setSrcSpanType(srcSpanType);
service.setServiceId(0);
getServiceNameRegisterGraph().start(service);
diff --git
a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
index 1ce10b5af..a19acf4f8 100644
---
a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
+++
b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
@@ -27,6 +27,7 @@
import org.apache.skywalking.apm.collector.core.module.ModuleManager;
import org.apache.skywalking.apm.collector.core.util.Const;
import org.apache.skywalking.apm.collector.core.util.StringUtils;
+import org.apache.skywalking.apm.network.proto.SpanType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,7 +58,7 @@ private ReferenceIdExchanger(ModuleManager moduleManager) {
@Override public boolean exchange(ReferenceDecorator standardBuilder, int
applicationId) {
if (standardBuilder.getEntryServiceId() == 0 &&
StringUtils.isNotEmpty(standardBuilder.getEntryServiceName())) {
- int entryServiceId =
serviceNameService.getOrCreate(instanceCacheService.getApplicationId(standardBuilder.getEntryApplicationInstanceId()),
standardBuilder.getEntryServiceName());
+ int entryServiceId =
serviceNameService.getOrCreate(instanceCacheService.getApplicationId(standardBuilder.getEntryApplicationInstanceId()),
SpanType.Entry_VALUE, standardBuilder.getEntryServiceName());
if (entryServiceId == 0) {
if (logger.isDebugEnabled()) {
@@ -73,7 +74,7 @@ private ReferenceIdExchanger(ModuleManager moduleManager) {
}
if (standardBuilder.getParentServiceId() == 0 &&
StringUtils.isNotEmpty(standardBuilder.getParentServiceName())) {
- int parentServiceId =
serviceNameService.getOrCreate(instanceCacheService.getApplicationId(standardBuilder.getParentApplicationInstanceId()),
standardBuilder.getParentServiceName());
+ int parentServiceId =
serviceNameService.getOrCreate(instanceCacheService.getApplicationId(standardBuilder.getParentApplicationInstanceId()),
SpanType.Entry_VALUE, standardBuilder.getParentServiceName());
if (parentServiceId == 0) {
if (logger.isDebugEnabled()) {
diff --git
a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
index 9236c2d14..704d724f5 100644
---
a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
+++
b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
@@ -71,7 +71,7 @@ private SpanIdExchanger(ModuleManager moduleManager) {
}
if (standardBuilder.getOperationNameId() == 0 &&
StringUtils.isNotEmpty(standardBuilder.getOperationName())) {
- int operationNameId =
serviceNameService.getOrCreate(applicationId,
standardBuilder.getOperationName());
+ int operationNameId =
serviceNameService.getOrCreate(applicationId,
standardBuilder.getSpanTypeValue(), standardBuilder.getOperationName());
if (operationNameId == 0) {
logger.debug("service name: {} from application id: {}
exchange failed", standardBuilder.getOperationName(), applicationId);
diff --git
a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java
b/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java
index 06ddc0313..7aef5102c 100644
---
a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java
+++
b/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.collector.cache.service;
import org.apache.skywalking.apm.collector.core.module.Service;
@@ -25,5 +24,5 @@
* @author peng-yongsheng
*/
public interface ServiceIdCacheService extends Service {
- int get(int applicationId, String serviceName);
+ int get(int applicationId, int srcSpanType, String serviceName);
}
diff --git
a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/service/ServiceIdCacheGuavaService.java
b/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/service/ServiceIdCacheGuavaService.java
index 5c5a618b9..fdb9eba50 100644
---
a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/service/ServiceIdCacheGuavaService.java
+++
b/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/service/ServiceIdCacheGuavaService.java
@@ -16,15 +16,14 @@
*
*/
-
package org.apache.skywalking.apm.collector.cache.guava.service;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
-import org.apache.skywalking.apm.collector.core.util.Const;
-import org.apache.skywalking.apm.collector.core.util.ObjectUtils;
import org.apache.skywalking.apm.collector.cache.service.ServiceIdCacheService;
import org.apache.skywalking.apm.collector.core.module.ModuleManager;
+import org.apache.skywalking.apm.collector.core.util.Const;
+import org.apache.skywalking.apm.collector.core.util.ObjectUtils;
import org.apache.skywalking.apm.collector.storage.StorageModule;
import
org.apache.skywalking.apm.collector.storage.dao.cache.IServiceNameCacheDAO;
import org.slf4j.Logger;
@@ -53,18 +52,19 @@ private IServiceNameCacheDAO getServiceNameCacheDAO() {
return this.serviceNameCacheDAO;
}
- public int get(int applicationId, String serviceName) {
+ @Override public int get(int applicationId, int srcSpanType, String
serviceName) {
int serviceId = 0;
+ String id = applicationId + Const.ID_SPLIT + srcSpanType +
Const.ID_SPLIT + serviceName;
try {
- serviceId = serviceIdCache.get(applicationId + Const.ID_SPLIT +
serviceName, () -> getServiceNameCacheDAO().getServiceId(applicationId,
serviceName));
+ serviceId = serviceIdCache.get(id, () ->
getServiceNameCacheDAO().getServiceId(applicationId, srcSpanType, serviceName));
} catch (Throwable e) {
logger.error(e.getMessage(), e);
}
if (serviceId == 0) {
- serviceId = getServiceNameCacheDAO().getServiceId(applicationId,
serviceName);
+ serviceId = getServiceNameCacheDAO().getServiceId(applicationId,
srcSpanType, serviceName);
if (serviceId != 0) {
- serviceIdCache.put(applicationId + Const.ID_SPLIT +
serviceName, serviceId);
+ serviceIdCache.put(id, serviceId);
}
}
return serviceId;
diff --git
a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/Const.java
b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/Const.java
index 6030c2bb6..739ddc9ad 100644
---
a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/Const.java
+++
b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/Const.java
@@ -34,4 +34,5 @@
public static final String EXCEPTION = "Exception";
public static final String EMPTY_STRING = "";
public static final String FILE_SUFFIX = "sw";
+ public static final int SPAN_TYPE_VIRTUAL = 9;
}
diff --git
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/cache/IServiceNameCacheDAO.java
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/cache/IServiceNameCacheDAO.java
index d9b34d828..67e7b3bd0 100644
---
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/cache/IServiceNameCacheDAO.java
+++
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/cache/IServiceNameCacheDAO.java
@@ -27,5 +27,5 @@
public interface IServiceNameCacheDAO extends DAO {
ServiceName get(int serviceId);
- int getServiceId(int applicationId, String serviceName);
+ int getServiceId(int applicationId, int srcSpanType, String serviceName);
}
diff --git
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServiceName.java
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServiceName.java
index 8778e473a..1e377f1ce 100644
---
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServiceName.java
+++
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServiceName.java
@@ -36,10 +36,11 @@
private static final Column[] LONG_COLUMNS = {};
private static final Column[] DOUBLE_COLUMNS = {};
-
+
private static final Column[] INTEGER_COLUMNS = {
new Column(ServiceNameTable.COLUMN_APPLICATION_ID, new
CoverOperation()),
new Column(ServiceNameTable.COLUMN_SERVICE_ID, new CoverOperation()),
+ new Column(ServiceNameTable.COLUMN_SRC_SPAN_TYPE, new
CoverOperation()),
};
private static final Column[] BYTE_COLUMNS = {};
@@ -87,4 +88,12 @@ public int getServiceId() {
public void setServiceId(int serviceId) {
setDataInteger(1, serviceId);
}
+
+ public int getSrcSpanType() {
+ return getDataInteger(2);
+ }
+
+ public void setSrcSpanType(int srcSpanType) {
+ setDataInteger(2, srcSpanType);
+ }
}
diff --git
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServiceNameTable.java
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServiceNameTable.java
index 1030f802b..ae90e52c8 100644
---
a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServiceNameTable.java
+++
b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServiceNameTable.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.collector.storage.table.register;
import org.apache.skywalking.apm.collector.core.data.CommonTable;
@@ -27,6 +26,8 @@
public class ServiceNameTable extends CommonTable {
public static final String TABLE = "service_name";
public static final String COLUMN_SERVICE_NAME = "service_name";
+ public static final String COLUMN_SERVICE_NAME_KEYWORD =
"service_name_keyword";
+ public static final String COLUMN_SRC_SPAN_TYPE = "src_span_type";
public static final String COLUMN_APPLICATION_ID = "application_id";
public static final String COLUMN_SERVICE_ID = "service_id";
}
diff --git
a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/ServiceNameEsCacheDAO.java
b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/ServiceNameEsCacheDAO.java
index 1d157667b..6aaa62cdc 100644
---
a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/ServiceNameEsCacheDAO.java
+++
b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/ServiceNameEsCacheDAO.java
@@ -56,14 +56,15 @@ public ServiceNameEsCacheDAO(ElasticSearchClient client) {
return null;
}
- @Override public int getServiceId(int applicationId, String serviceName) {
+ @Override public int getServiceId(int applicationId, int srcSpanType,
String serviceName) {
SearchRequestBuilder searchRequestBuilder =
getClient().prepareSearch(ServiceNameTable.TABLE);
searchRequestBuilder.setTypes(ServiceNameTable.TABLE_TYPE);
searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
-
boolQuery.must().add(QueryBuilders.matchQuery(ServiceNameTable.COLUMN_APPLICATION_ID,
applicationId));
-
boolQuery.must().add(QueryBuilders.matchQuery(ServiceNameTable.COLUMN_SERVICE_NAME,
serviceName));
+
boolQuery.must().add(QueryBuilders.termQuery(ServiceNameTable.COLUMN_APPLICATION_ID,
applicationId));
+
boolQuery.must().add(QueryBuilders.termQuery(ServiceNameTable.COLUMN_SRC_SPAN_TYPE,
srcSpanType));
+
boolQuery.must().add(QueryBuilders.termQuery(ServiceNameTable.COLUMN_SERVICE_NAME_KEYWORD,
serviceName));
searchRequestBuilder.setQuery(boolQuery);
searchRequestBuilder.setSize(1);
diff --git
a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/register/ServiceNameRegisterEsDAO.java
b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/register/ServiceNameRegisterEsDAO.java
index 0d36f4af0..bb84be214 100644
---
a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/register/ServiceNameRegisterEsDAO.java
+++
b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/register/ServiceNameRegisterEsDAO.java
@@ -56,6 +56,8 @@ public ServiceNameRegisterEsDAO(ElasticSearchClient client) {
source.put(ServiceNameTable.COLUMN_SERVICE_ID,
serviceName.getServiceId());
source.put(ServiceNameTable.COLUMN_APPLICATION_ID,
serviceName.getApplicationId());
source.put(ServiceNameTable.COLUMN_SERVICE_NAME,
serviceName.getServiceName());
+ source.put(ServiceNameTable.COLUMN_SERVICE_NAME_KEYWORD,
serviceName.getServiceName());
+ source.put(ServiceNameTable.COLUMN_SRC_SPAN_TYPE,
serviceName.getSrcSpanType());
IndexResponse response = client.prepareIndex(ServiceNameTable.TABLE,
serviceName.getId()).setSource(source).setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
logger.debug("save service name register info, application
getApplicationId: {}, service name: {}, status: {}", serviceName.getId(),
serviceName.getServiceName(), response.status().name());
diff --git
a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceNameServiceEsUIDAO.java
b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceNameServiceEsUIDAO.java
index f050e0a16..3775bf281 100644
---
a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceNameServiceEsUIDAO.java
+++
b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceNameServiceEsUIDAO.java
@@ -25,6 +25,7 @@
import org.apache.skywalking.apm.collector.storage.es.base.dao.EsDAO;
import
org.apache.skywalking.apm.collector.storage.table.register.ServiceNameTable;
import org.apache.skywalking.apm.collector.storage.ui.service.ServiceInfo;
+import org.apache.skywalking.apm.network.proto.SpanType;
import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchType;
@@ -44,6 +45,7 @@ public ServiceNameServiceEsUIDAO(ElasticSearchClient client) {
SearchRequestBuilder searchRequestBuilder =
getClient().prepareSearch(ServiceNameTable.TABLE);
searchRequestBuilder.setTypes(ServiceNameTable.TABLE_TYPE);
searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
+
searchRequestBuilder.setQuery(QueryBuilders.termQuery(ServiceNameTable.COLUMN_SRC_SPAN_TYPE,
SpanType.Entry_VALUE));
searchRequestBuilder.setSize(0);
SearchResponse searchResponse =
searchRequestBuilder.execute().actionGet();
diff --git
a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/register/ServiceNameEsTableDefine.java
b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/register/ServiceNameEsTableDefine.java
index 2a5dc39c0..7a29d63e3 100644
---
a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/register/ServiceNameEsTableDefine.java
+++
b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/register/ServiceNameEsTableDefine.java
@@ -38,6 +38,8 @@ public ServiceNameEsTableDefine() {
@Override public void initialize() {
addColumn(new
ElasticSearchColumnDefine(ServiceNameTable.COLUMN_APPLICATION_ID,
ElasticSearchColumnDefine.Type.Integer.name()));
addColumn(new
ElasticSearchColumnDefine(ServiceNameTable.COLUMN_SERVICE_NAME,
ElasticSearchColumnDefine.Type.Text.name()));
+ addColumn(new
ElasticSearchColumnDefine(ServiceNameTable.COLUMN_SERVICE_NAME_KEYWORD,
ElasticSearchColumnDefine.Type.Keyword.name()));
addColumn(new
ElasticSearchColumnDefine(ServiceNameTable.COLUMN_SERVICE_ID,
ElasticSearchColumnDefine.Type.Integer.name()));
+ addColumn(new
ElasticSearchColumnDefine(ServiceNameTable.COLUMN_SRC_SPAN_TYPE,
ElasticSearchColumnDefine.Type.Integer.name()));
}
}
diff --git
a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/ServiceNameH2CacheDAO.java
b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/ServiceNameH2CacheDAO.java
index 88c085382..f406f77d3 100644
---
a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/ServiceNameH2CacheDAO.java
+++
b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/ServiceNameH2CacheDAO.java
@@ -38,7 +38,7 @@
private final Logger logger =
LoggerFactory.getLogger(ServiceNameH2CacheDAO.class);
private static final String GET_SERVICE_NAME_SQL = "select {0},{1} from
{2} where {3} = ?";
- private static final String GET_SERVICE_ID_SQL = "select {0} from {1}
where {2} = ? and {3} = ? limit 1";
+ private static final String GET_SERVICE_ID_SQL = "select {0} from {1}
where {2} = ? and {3} = ? and {4} = ? limit 1";
public ServiceNameH2CacheDAO(H2Client client) {
super(client);
@@ -63,11 +63,12 @@ public ServiceNameH2CacheDAO(H2Client client) {
return null;
}
- @Override public int getServiceId(int applicationId, String serviceName) {
+ @Override public int getServiceId(int applicationId, int srcSpanType,
String serviceName) {
H2Client client = getClient();
- String sql = SqlBuilder.buildSql(GET_SERVICE_ID_SQL,
ServiceNameTable.COLUMN_SERVICE_ID,
- ServiceNameTable.TABLE, ServiceNameTable.COLUMN_APPLICATION_ID,
ServiceNameTable.COLUMN_SERVICE_NAME);
- Object[] params = new Object[] {applicationId, serviceName};
+ String sql = SqlBuilder.buildSql(GET_SERVICE_ID_SQL,
ServiceNameTable.COLUMN_SERVICE_ID, ServiceNameTable.TABLE,
+ ServiceNameTable.COLUMN_APPLICATION_ID,
ServiceNameTable.COLUMN_SRC_SPAN_TYPE, ServiceNameTable.COLUMN_SERVICE_NAME);
+
+ Object[] params = new Object[] {applicationId, srcSpanType,
serviceName};
try (ResultSet rs = client.executeQuery(sql, params)) {
if (rs.next()) {
return rs.getInt(ServiceNameTable.COLUMN_SERVICE_ID);
diff --git
a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/ServiceNameRegisterH2DAO.java
b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/ServiceNameRegisterH2DAO.java
index adf01a1d4..f77487410 100644
---
a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/ServiceNameRegisterH2DAO.java
+++
b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/register/ServiceNameRegisterH2DAO.java
@@ -16,18 +16,17 @@
*
*/
-
package org.apache.skywalking.apm.collector.storage.h2.dao.register;
import java.util.HashMap;
import java.util.Map;
-import org.apache.skywalking.apm.collector.storage.base.sql.SqlBuilder;
-import
org.apache.skywalking.apm.collector.storage.dao.register.IServiceNameRegisterDAO;
-import
org.apache.skywalking.apm.collector.storage.table.register.ServiceNameTable;
import org.apache.skywalking.apm.collector.client.h2.H2Client;
import org.apache.skywalking.apm.collector.client.h2.H2ClientException;
+import org.apache.skywalking.apm.collector.storage.base.sql.SqlBuilder;
+import
org.apache.skywalking.apm.collector.storage.dao.register.IServiceNameRegisterDAO;
import org.apache.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
import org.apache.skywalking.apm.collector.storage.table.register.ServiceName;
+import
org.apache.skywalking.apm.collector.storage.table.register.ServiceNameTable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,6 +60,7 @@ public void save(ServiceName serviceName) {
source.put(ServiceNameTable.COLUMN_SERVICE_ID,
serviceName.getServiceId());
source.put(ServiceNameTable.COLUMN_APPLICATION_ID,
serviceName.getApplicationId());
source.put(ServiceNameTable.COLUMN_SERVICE_NAME,
serviceName.getServiceName());
+ source.put(ServiceNameTable.COLUMN_SRC_SPAN_TYPE,
serviceName.getSrcSpanType());
String sql = SqlBuilder.buildBatchInsertSql(ServiceNameTable.TABLE,
source.keySet());
Object[] params = source.values().toArray(new Object[0]);
diff --git
a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceNameServiceH2UIDAO.java
b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceNameServiceH2UIDAO.java
index 29470eefb..55c520b72 100644
---
a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceNameServiceH2UIDAO.java
+++
b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceNameServiceH2UIDAO.java
@@ -29,6 +29,7 @@
import org.apache.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
import
org.apache.skywalking.apm.collector.storage.table.register.ServiceNameTable;
import org.apache.skywalking.apm.collector.storage.ui.service.ServiceInfo;
+import org.apache.skywalking.apm.network.proto.SpanType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,9 +45,9 @@ public ServiceNameServiceH2UIDAO(H2Client client) {
}
@Override public int getCount() {
- String dynamicSql = "select count({0}) as cnt from {1}";
- String sql = SqlBuilder.buildSql(dynamicSql,
ServiceNameTable.COLUMN_SERVICE_ID, ServiceNameTable.TABLE);
- Object[] params = new Object[] {};
+ String dynamicSql = "select count({0}) as cnt from {1} where {2} = ?";
+ String sql = SqlBuilder.buildSql(dynamicSql,
ServiceNameTable.COLUMN_SERVICE_ID, ServiceNameTable.TABLE,
ServiceNameTable.COLUMN_SRC_SPAN_TYPE);
+ Object[] params = new Object[] {SpanType.Entry_VALUE};
try (ResultSet rs = getClient().executeQuery(sql, params)) {
if (rs.next()) {
diff --git
a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/register/ServiceNameH2TableDefine.java
b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/register/ServiceNameH2TableDefine.java
index 6d14e4ecc..743df3157 100644
---
a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/register/ServiceNameH2TableDefine.java
+++
b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/register/ServiceNameH2TableDefine.java
@@ -16,7 +16,6 @@
*
*/
-
package org.apache.skywalking.apm.collector.storage.h2.define.register;
import
org.apache.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine;
@@ -37,5 +36,6 @@ public ServiceNameH2TableDefine() {
addColumn(new H2ColumnDefine(ServiceNameTable.COLUMN_APPLICATION_ID,
H2ColumnDefine.Type.Int.name()));
addColumn(new H2ColumnDefine(ServiceNameTable.COLUMN_SERVICE_NAME,
H2ColumnDefine.Type.Varchar.name()));
addColumn(new H2ColumnDefine(ServiceNameTable.COLUMN_SERVICE_ID,
H2ColumnDefine.Type.Int.name()));
+ addColumn(new H2ColumnDefine(ServiceNameTable.COLUMN_SRC_SPAN_TYPE,
H2ColumnDefine.Type.Int.name()));
}
}
diff --git
a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/OverViewLayerQuery.java
b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/OverViewLayerQuery.java
index da65bc33a..0503e504b 100644
---
a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/OverViewLayerQuery.java
+++
b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/OverViewLayerQuery.java
@@ -21,7 +21,9 @@
import java.text.ParseException;
import java.util.List;
import org.apache.skywalking.apm.collector.core.module.ModuleManager;
+import org.apache.skywalking.apm.collector.core.util.Const;
import org.apache.skywalking.apm.collector.core.util.ObjectUtils;
+import org.apache.skywalking.apm.collector.storage.ui.application.Application;
import org.apache.skywalking.apm.collector.storage.ui.common.Duration;
import org.apache.skywalking.apm.collector.storage.ui.common.Topology;
import org.apache.skywalking.apm.collector.storage.ui.overview.AlarmTrend;
@@ -103,7 +105,22 @@ public ClusterBrief getClusterBrief(Duration duration)
throws ParseException {
long end =
DurationUtils.INSTANCE.durationToSecondTimeBucket(duration.getStep(),
duration.getEnd());
ClusterBrief clusterBrief = new ClusterBrief();
-
clusterBrief.setNumOfApplication(getApplicationService().getApplications(start,
end).size());
+
+ List<Application> applications =
getApplicationService().getApplications(start, end);
+
+ boolean containsUserApplication = false;
+ for (Application application : applications) {
+ if (application.getId() == Const.NONE_INSTANCE_ID) {
+ containsUserApplication = true;
+ break;
+ }
+ }
+
+ if (containsUserApplication) {
+ clusterBrief.setNumOfApplication(applications.size() - 1);
+ } else {
+ clusterBrief.setNumOfApplication(applications.size());
+ }
clusterBrief.setNumOfDatabase(getNetworkAddressService().getNumOfDatabase());
clusterBrief.setNumOfCache(getNetworkAddressService().getNumOfCache());
clusterBrief.setNumOfMQ(getNetworkAddressService().getNumOfMQ());
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
