You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/06/15 06:30:33 UTC
[incubator-skywalking] branch zipkin/receiver-v1 updated: Save,
analysis, aggregate segment without error, now.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch zipkin/receiver-v1
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/zipkin/receiver-v1 by this push:
new 9f6956d Save, analysis, aggregate segment without error, now.
9f6956d is described below
commit 9f6956d9ba87a1876995f1c2c5b6bd5431c6eeba
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Jun 15 14:30:22 2018 +0800
Save, analysis, aggregate segment without error, now.
---
.../zipkin/provider/cache/caffeine/CaffeineSpanCache.java | 1 +
.../collector/receiver/zipkin/provider/data/ZipkinTrace.java | 11 ++++++++++-
.../receiver/zipkin/provider/transform/SegmentBuilder.java | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/cache/caffeine/CaffeineSpanCache.java b/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/cache/caffeine/CaffeineSpanCache.java
index 1899824..730d656 100644
--- a/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/cache/caffeine/CaffeineSpanCache.java
+++ b/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/cache/caffeine/CaffeineSpanCache.java
@@ -77,6 +77,7 @@ public class CaffeineSpanCache implements ISpanCache, RemovalListener<String, Zi
Zipkin2SkyWalkingTransfer.INSTANCE.transfer(trace);
} catch (Exception e) {
logger.error(e.getMessage(), e);
+ logger.warn("Zipkin trace:" + trace);
}
}
diff --git a/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/data/ZipkinTrace.java b/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/data/ZipkinTrace.java
index 42ffadf..7708453 100644
--- a/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/data/ZipkinTrace.java
+++ b/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/data/ZipkinTrace.java
@@ -18,10 +18,11 @@
package org.apache.skywalking.apm.collector.receiver.zipkin.provider.data;
+import zipkin2.Span;
+
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
-import zipkin2.Span;
/**
* @author wusheng
@@ -48,7 +49,15 @@ public class ZipkinTrace {
return spans;
}
+ @Override
+ public String toString() {
+ return "ZipkinTrace{" +
+ "spans=" + spans +
+ '}';
+ }
+
public static class TriggerTrace extends ZipkinTrace {
+
}
}
diff --git a/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SegmentBuilder.java b/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SegmentBuilder.java
index f43e67b..6db28d4 100644
--- a/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SegmentBuilder.java
+++ b/apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/src/main/java/org/apache/skywalking/apm/collector/receiver/zipkin/provider/transform/SegmentBuilder.java
@@ -424,7 +424,7 @@ public class SegmentBuilder {
this.applicationCode = applicationCode;
this.appId = appId;
this.instanceId = instanceId;
- this.spanIdSeq = 1;
+ this.spanIdSeq = 0;
}
private int nextSpanId() {
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.