You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/11/18 12:52:12 UTC
[incubator-skywalking] branch zipkin-receiver updated: Fix transfer
bug for new backend core.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch zipkin-receiver
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/zipkin-receiver by this push:
new 6d4f1d0 Fix transfer bug for new backend core.
6d4f1d0 is described below
commit 6d4f1d0873e33ef6f54f4d91bac5f2822b12364b
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Nov 18 20:52:03 2018 +0800
Fix transfer bug for new backend core.
---
.../oap/server/receiver/zipkin/transform/SegmentBuilder.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/transform/SegmentBuilder.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/transform/SegmentBuilder.java
index 5201a04..3b06584 100644
--- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/transform/SegmentBuilder.java
+++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/transform/SegmentBuilder.java
@@ -89,7 +89,7 @@ public class SegmentBuilder {
// Wu Sheng.
if (StringUtils.isNotEmpty(applicationCode)) {
timestamp = rootSpan.timestampAsLong();
- builder.context.addApp(applicationCode, rootSpan.timestampAsLong());
+ builder.context.addApp(applicationCode, rootSpan.timestampAsLong() / 1000);
SpanObject.Builder rootSpanBuilder = builder.initSpan(null, null, rootSpan, true);
builder.context.currentSegment().addSpan(rootSpanBuilder);
@@ -100,7 +100,8 @@ public class SegmentBuilder {
}
List<TraceSegmentObject.Builder> segmentBuilders = new LinkedList<>();
- long finalTimestamp = timestamp;
+ // microseconds -> million seconds
+ long finalTimestamp = timestamp / 1000;
builder.segments.forEach(segment -> {
TraceSegmentObject.Builder traceSegmentBuilder = segment.freeze();
segmentBuilders.add(traceSegmentBuilder);
@@ -129,7 +130,7 @@ public class SegmentBuilder {
try {
if (isNewApp) {
- context.addApp(localServiceName, childSpan.timestampAsLong());
+ context.addApp(localServiceName, childSpan.timestampAsLong() / 1000);
}
SpanObject.Builder childSpanBuilder = initSpan(parentSegmentSpan, parent, childSpan, isNewApp);