peng-yongsheng closed pull request #921: Fixed/920
URL: https://github.com/apache/incubator-skywalking/pull/921
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-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 a19acf4f8..e29077483 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
@@ -57,13 +57,14 @@ 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()),
SpanType.Entry_VALUE, standardBuilder.getEntryServiceName());
+ if (standardBuilder.getEntryServiceId() == 0) {
+ String entryServiceName =
StringUtils.isNotEmpty(standardBuilder.getEntryServiceName()) ?
standardBuilder.getEntryServiceName() : Const.DOMAIN_OPERATION_NAME;
+ int entryServiceId =
serviceNameService.getOrCreate(instanceCacheService.getApplicationId(standardBuilder.getEntryApplicationInstanceId()),
SpanType.Entry_VALUE, entryServiceName);
if (entryServiceId == 0) {
if (logger.isDebugEnabled()) {
int entryApplicationId =
instanceCacheService.getApplicationId(standardBuilder.getEntryApplicationInstanceId());
- logger.debug("entry service name: {} from application id:
{} exchange failed", standardBuilder.getEntryServiceName(), entryApplicationId);
+ logger.debug("entry service name: {} from application id:
{} exchange failed", entryServiceName, entryApplicationId);
}
return false;
} else {
@@ -73,13 +74,14 @@ private ReferenceIdExchanger(ModuleManager moduleManager) {
}
}
- if (standardBuilder.getParentServiceId() == 0 &&
StringUtils.isNotEmpty(standardBuilder.getParentServiceName())) {
- int parentServiceId =
serviceNameService.getOrCreate(instanceCacheService.getApplicationId(standardBuilder.getParentApplicationInstanceId()),
SpanType.Entry_VALUE, standardBuilder.getParentServiceName());
+ if (standardBuilder.getParentServiceId() == 0) {
+ String parentServiceName =
StringUtils.isNotEmpty(standardBuilder.getParentServiceName()) ?
standardBuilder.getParentServiceName() : Const.DOMAIN_OPERATION_NAME;
+ int parentServiceId =
serviceNameService.getOrCreate(instanceCacheService.getApplicationId(standardBuilder.getParentApplicationInstanceId()),
SpanType.Entry_VALUE, parentServiceName);
if (parentServiceId == 0) {
if (logger.isDebugEnabled()) {
int parentApplicationId =
instanceCacheService.getApplicationId(standardBuilder.getParentApplicationInstanceId());
- logger.debug("parent service name: {} from application id:
{} exchange failed", standardBuilder.getParentServiceName(),
parentApplicationId);
+ logger.debug("parent service name: {} from application id:
{} exchange failed", parentServiceName, parentApplicationId);
}
return false;
} else {
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 704d724f5..1b074f153 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
@@ -70,11 +70,12 @@ private SpanIdExchanger(ModuleManager moduleManager) {
}
}
- if (standardBuilder.getOperationNameId() == 0 &&
StringUtils.isNotEmpty(standardBuilder.getOperationName())) {
- int operationNameId =
serviceNameService.getOrCreate(applicationId,
standardBuilder.getSpanTypeValue(), standardBuilder.getOperationName());
+ if (standardBuilder.getOperationNameId() == 0) {
+ String operationName =
StringUtils.isNotEmpty(standardBuilder.getOperationName()) ?
standardBuilder.getOperationName() : Const.DOMAIN_OPERATION_NAME;
+ int operationNameId =
serviceNameService.getOrCreate(applicationId,
standardBuilder.getSpanTypeValue(), operationName);
if (operationNameId == 0) {
- logger.debug("service name: {} from application id: {}
exchange failed", standardBuilder.getOperationName(), applicationId);
+ logger.debug("service name: {} from application id: {}
exchange failed", operationName, applicationId);
return false;
} else {
standardBuilder.toBuilder();
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 739ddc9ad..860d8b8cf 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
@@ -35,4 +35,5 @@
public static final String EMPTY_STRING = "";
public static final String FILE_SUFFIX = "sw";
public static final int SPAN_TYPE_VIRTUAL = 9;
+ public static final String DOMAIN_OPERATION_NAME = "{domain}";
}
diff --git a/skywalking-ui b/skywalking-ui
index 839e39861..9c503a299 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 839e39861b12d0cd4ce11672ede459fe4dbb00c4
+Subproject commit 9c503a299aa3cba211e851e507d5625cc7cc0dd5
----------------------------------------------------------------
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
