Skip to content

Fix zipkin receiver compatibility with application/x protobuf content type #13773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-sheng merged 2 commits into from
Mar 31, 2026
+8 −0
Merged

Fix zipkin receiver compatibility with application/x protobuf content type #13773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
205c187
Fix Zipkin receiver compatibility with application/x-protobuf Content…
peachisai Mar 31, 2026
6014179
add changes
peachisai Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/en/changes/changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
* Update Istio E2E test versions: remove EOL 1.20.0, add 1.25.0–1.29.0 for ALS/Metrics/Ambient tests. Update Rover with Istio Process test from 1.15.0 to 1.28.0 with Kubernetes 1.28.
* Support Virtual-GenAI monitoring.
* Fix on-demand pod log parsing failure by replacing invalid `DateTimeFormatter` pattern with `ISO_OFFSET_DATE_TIME`.
* Fix Zipkin receiver compatibility with application/x-protobuf Content-Type.


#### UI
Expand Down
7 changes: 7 additions & 0 deletions .../java/org/apache/skywalking/oap/server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.linecorp.armeria.common.HttpRequest;
import com.linecorp.armeria.common.HttpResponse;
import com.linecorp.armeria.common.HttpStatus;
import com.linecorp.armeria.server.annotation.Consumes;
import com.linecorp.armeria.server.annotation.ConsumesJson;
import com.linecorp.armeria.server.annotation.ConsumesProtobuf;
import com.linecorp.armeria.server.annotation.Post;
Expand Down Expand Up @@ -82,6 +83,12 @@ public HttpResponse collectV2ProtobufSpans(HttpRequest req) {
return doCollectSpans(SpanBytesDecoder.PROTO3, req);
}

@Post("/api/v2/spans")
@Consumes("application/x-protobuf")
public HttpResponse collectV2XProtobufSpans(HttpRequest req) {
return doCollectSpans(SpanBytesDecoder.PROTO3, req);
}

@Post("/api/v1/spans")
public HttpResponse collectV1Spans(HttpRequest req) {
return doCollectSpans(SpanBytesDecoder.JSON_V1, req);
Expand Down
Loading