wu-sheng closed pull request #883: Fixed/855
URL: https://github.com/apache/incubator-skywalking/pull/883
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-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java
b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java
index eda62f9fd..15de2c77c 100644
---
a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java
+++
b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java
@@ -34,6 +34,7 @@
import org.apache.skywalking.apm.collector.core.util.Const;
import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils;
import
org.apache.skywalking.apm.collector.storage.table.application.ApplicationMapping;
+import org.apache.skywalking.apm.network.proto.SpanLayer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,18 +55,20 @@
@Override public void parseEntry(SpanDecorator spanDecorator, int
applicationId, int instanceId, String segmentId) {
logger.debug("application mapping listener parse reference");
- if (spanDecorator.getRefsCount() > 0) {
- for (int i = 0; i < spanDecorator.getRefsCount(); i++) {
- ApplicationMapping applicationMapping = new
ApplicationMapping();
- applicationMapping.setApplicationId(applicationId);
+ if (!spanDecorator.getSpanLayer().equals(SpanLayer.MQ)) {
+ if (spanDecorator.getRefsCount() > 0) {
+ for (int i = 0; i < spanDecorator.getRefsCount(); i++) {
+ ApplicationMapping applicationMapping = new
ApplicationMapping();
+ applicationMapping.setApplicationId(applicationId);
- int addressId = spanDecorator.getRefs(i).getNetworkAddressId();
- int mappingApplicationId =
applicationCacheService.getApplicationIdByAddressId(addressId);
-
applicationMapping.setMappingApplicationId(mappingApplicationId);
+ int addressId =
spanDecorator.getRefs(i).getNetworkAddressId();
+ int mappingApplicationId =
applicationCacheService.getApplicationIdByAddressId(addressId);
+
applicationMapping.setMappingApplicationId(mappingApplicationId);
- String metricId = String.valueOf(applicationId) +
Const.ID_SPLIT + String.valueOf(applicationMapping.getMappingApplicationId());
- applicationMapping.setMetricId(metricId);
- applicationMappings.add(applicationMapping);
+ String metricId = String.valueOf(applicationId) +
Const.ID_SPLIT + String.valueOf(applicationMapping.getMappingApplicationId());
+ applicationMapping.setMetricId(metricId);
+ applicationMappings.add(applicationMapping);
+ }
}
}
}
diff --git
a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java
b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java
index 8c7d04333..91f502ba7 100644
---
a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java
+++
b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java
@@ -20,7 +20,6 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.skywalking.apm.collector.storage.table.MetricSource;
import
org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricGraphIdDefine;
import
org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.ReferenceDecorator;
import
org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.SpanDecorator;
@@ -38,6 +37,7 @@
import org.apache.skywalking.apm.collector.core.util.Const;
import org.apache.skywalking.apm.collector.core.util.ObjectUtils;
import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils;
+import org.apache.skywalking.apm.collector.storage.table.MetricSource;
import
org.apache.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric;
import org.apache.skywalking.apm.network.proto.SpanLayer;
import org.slf4j.Logger;
@@ -78,8 +78,17 @@ public void parseEntry(SpanDecorator spanDecorator, int
applicationId, int insta
ReferenceDecorator reference = spanDecorator.getRefs(i);
ServiceReferenceMetric serviceReferenceMetric = new
ServiceReferenceMetric();
serviceReferenceMetric.setFrontServiceId(reference.getParentServiceId());
-
serviceReferenceMetric.setFrontInstanceId(reference.getParentApplicationInstanceId());
-
serviceReferenceMetric.setFrontApplicationId(instanceCacheService.getApplicationId(reference.getParentApplicationInstanceId()));
+
+ if (spanDecorator.getSpanLayer().equals(SpanLayer.MQ)) {
+ int peerId = spanDecorator.getPeerId();
+ int applicationIdByPeerId =
applicationCacheService.getApplicationIdByAddressId(peerId);
+ int instanceIdByPeerId =
instanceCacheService.getInstanceIdByAddressId(applicationIdByPeerId, peerId);
+
serviceReferenceMetric.setFrontInstanceId(instanceIdByPeerId);
+
serviceReferenceMetric.setFrontApplicationId(applicationIdByPeerId);
+ } else {
+
serviceReferenceMetric.setFrontInstanceId(reference.getParentApplicationInstanceId());
+
serviceReferenceMetric.setFrontApplicationId(instanceCacheService.getApplicationId(reference.getParentApplicationInstanceId()));
+ }
serviceReferenceMetric.setBehindServiceId(spanDecorator.getOperationNameId());
serviceReferenceMetric.setBehindInstanceId(instanceId);
serviceReferenceMetric.setBehindApplicationId(applicationId);
diff --git
a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/PaginationUtils.java
b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/PaginationUtils.java
index 9250b138a..3bf00a36a 100644
---
a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/PaginationUtils.java
+++
b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/PaginationUtils.java
@@ -28,7 +28,7 @@
public Page exchange(Pagination paging) {
int limit = paging.getPageSize();
- int from = paging.getPageSize() * (paging.getPageNum() - 1);
+ int from = paging.getPageSize() * ((paging.getPageNum() == 0 ? 1 :
paging.getPageNum()) - 1);
return new Page(from, limit);
}
diff --git
a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/utils/PaginationUtilsTestCase.java
b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/utils/PaginationUtilsTestCase.java
index 782d5ff1c..324e30f7f 100644
---
a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/utils/PaginationUtilsTestCase.java
+++
b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/utils/PaginationUtilsTestCase.java
@@ -37,6 +37,13 @@ public void test() {
Assert.assertEquals(0, page.getFrom());
Assert.assertEquals(10, page.getLimit());
+ pagination = new Pagination();
+ pagination.setPageSize(10);
+
+ page = PaginationUtils.INSTANCE.exchange(pagination);
+ Assert.assertEquals(0, page.getFrom());
+ Assert.assertEquals(10, page.getLimit());
+
pagination = new Pagination();
pagination.setPageSize(10);
pagination.setPageNum(2);
diff --git
a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls
b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls
index 808bc1a74..659297c0f 100644
--- a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls
+++ b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls
@@ -6,6 +6,7 @@ type TraceBrief {
# Trace basic info
type BasicTrace {
+ segmentId: String!
operationName: String!
duration: Int!
start: String!
----------------------------------------------------------------
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
