You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wa...@apache.org on 2022/04/11 13:34:17 UTC
[skywalking] branch master updated: Fix Zipkin receiver: Decode spans error, missing `Layer` for V9 and wrong time bucket for generate Service and Endpoint. (#8848)
This is an automated email from the ASF dual-hosted git repository.
wankai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new f3478b187d Fix Zipkin receiver: Decode spans error, missing `Layer` for V9 and wrong time bucket for generate Service and Endpoint. (#8848)
f3478b187d is described below
commit f3478b187d7fc48c44ecf9c3b93f3a70a8f3b021
Author: Wan Kai <wa...@foxmail.com>
AuthorDate: Mon Apr 11 21:34:03 2022 +0800
Fix Zipkin receiver: Decode spans error, missing `Layer` for V9 and wrong time bucket for generate Service and Endpoint. (#8848)
---
dist-material/release-docs/LICENSE | 2 +-
docs/en/changes/changes.md | 3 ++-
oap-server-bom/pom.xml | 2 +-
.../server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java | 2 +-
.../skywalking/oap/server/receiver/zipkin/trace/SpanForward.java | 9 ++++++---
tools/dependencies/known-oap-backend-dependencies.txt | 2 +-
6 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE
index 4535bb7417..ddea1b5f2a 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -287,7 +287,7 @@ The text of each license is the standard Apache 2.0 license.
servo 0.10.1: https://github.com/Netflix/servo, Apache 2.0
validation-api 1.1.0.Final: http://beanvalidation.org/licensing/, Apache 2.0
HikariCP 3.1.0: https://github.com/brettwooldridge/HikariCP, Apache 2.0
- zipkin 2.9.1: https://github.com/openzipkin/zipkin, Apache 2.0
+ zipkin 2.23.16: https://github.com/openzipkin/zipkin, Apache 2.0
sharding-jdbc-core 2.0.3: https://github.com/sharding-sphere/sharding-sphere, Apache 2.0
kubernetes-client 14.0.0: https://github.com/kubernetes-client/java, Apache 2.0
proto files from istio/istio: https://github.com/istio/istio Apache 2.0
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index ef829890c8..05812ca036 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -1,10 +1,11 @@
## 9.1.0
#### Project
-
+* Upgrade zipkin to 2.23.16.
#### OAP Server
* Add component definition(ID=127) for `Apache ShenYu (incubating)`.
+* Fix Zipkin receiver: Decode spans error, missing `Layer` for V9 and wrong time bucket for generate Service and Endpoint.
#### UI
* General service instance: move `Thread Pool` from JVM to Overview, fix `JVM GC Count` calculation.
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index 99b0fd5ac5..7624d4a5e2 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -49,7 +49,7 @@
<commons-io.version>2.7</commons-io.version>
<kubernetes.version>14.0.0</kubernetes.version>
<hikaricp.version>3.1.0</hikaricp.version>
- <zipkin.version>2.9.1</zipkin.version>
+ <zipkin.version>2.23.16</zipkin.version>
<jackson-core.version>2.13.2</jackson-core.version>
<jackson-annotations.version>2.13.2</jackson-annotations.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java
index deacc8b058..2eb2ea7b97 100644
--- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java
+++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java
@@ -109,7 +109,7 @@ public class ZipkinSpanHTTPHandler {
final HistogramMetrics.Timer timer = histogram.createTimer();
final HttpResponse response = HttpResponse.from(req.aggregate().thenApply(request -> {
final HttpData httpData = UnzippingBytesRequestConverter.convertRequest(ctx, request);
- final List<Span> spanList = decoder.decodeList(httpData.byteBuf().array());
+ final List<Span> spanList = decoder.decodeList(httpData.byteBuf().nioBuffer());
final SpanForward forward = new SpanForward(namingControl, sourceReceiver, config);
forward.send(spanList);
return HttpResponse.of(HttpStatus.OK);
diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/trace/SpanForward.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/trace/SpanForward.java
index 77b15d50b5..424652300c 100644
--- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/trace/SpanForward.java
+++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/trace/SpanForward.java
@@ -21,6 +21,7 @@ package org.apache.skywalking.oap.server.receiver.zipkin.trace;
import java.util.List;
import lombok.RequiredArgsConstructor;
+import org.apache.skywalking.oap.server.core.analysis.Layer;
import org.apache.skywalking.oap.server.library.util.StringUtil;
import org.apache.skywalking.oap.server.core.analysis.IDManager;
import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
@@ -62,7 +63,8 @@ public class SpanForward {
zipkinSpan.setStartTime(startTime);
long timeBucket = TimeBucket.getRecordTimeBucket(zipkinSpan.getStartTime());
zipkinSpan.setTimeBucket(timeBucket);
-
+ long minuteTimeBucket = TimeBucket.getMinuteTimeBucket(zipkinSpan.getStartTime());
+
String spanName = span.name();
if (!StringUtil.isEmpty(spanName)) {
final String endpointName = namingControl.formatEndpointName(serviceName, spanName);
@@ -73,7 +75,7 @@ public class SpanForward {
EndpointMeta endpointMeta = new EndpointMeta();
endpointMeta.setServiceName(serviceName);
endpointMeta.setEndpoint(endpointName);
- endpointMeta.setTimeBucket(timeBucket);
+ endpointMeta.setTimeBucket(minuteTimeBucket);
receiver.receive(endpointMeta);
}
long latency = span.durationAsLong() / 1000;
@@ -94,7 +96,8 @@ public class SpanForward {
// No instance name is required in the Zipkin model.
ServiceMeta serviceMeta = new ServiceMeta();
serviceMeta.setName(serviceName);
- serviceMeta.setTimeBucket(timeBucket);
+ serviceMeta.setTimeBucket(minuteTimeBucket);
+ serviceMeta.setLayer(Layer.GENERAL);
receiver.receive(serviceMeta);
});
}
diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt
index 5940193a8e..66c4cfcc88 100755
--- a/tools/dependencies/known-oap-backend-dependencies.txt
+++ b/tools/dependencies/known-oap-backend-dependencies.txt
@@ -150,7 +150,7 @@ swagger-annotations-1.6.3.jar
tsfile-0.12.5.jar
vavr-0.10.3.jar
vavr-match-0.10.3.jar
-zipkin-2.9.1.jar
+zipkin-2.23.16.jar
zookeeper-3.5.7.jar
zookeeper-jute-3.5.7.jar
zstd-jni-1.4.3-1.jar