Skip to content

Commit d0cc16a

Browse files
authored
Fix zipkin receiver compatibility with application/x protobuf content type (#13773)
1 parent c6a07a2 commit d0cc16a

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

docs/en/changes/changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
* 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.
169169
* Support Virtual-GenAI monitoring.
170170
* Fix on-demand pod log parsing failure by replacing invalid `DateTimeFormatter` pattern with `ISO_OFFSET_DATE_TIME`.
171+
* Fix Zipkin receiver compatibility with application/x-protobuf Content-Type.
171172

172173

173174
#### UI

oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.linecorp.armeria.common.HttpRequest;
2323
import com.linecorp.armeria.common.HttpResponse;
2424
import com.linecorp.armeria.common.HttpStatus;
25+
import com.linecorp.armeria.server.annotation.Consumes;
2526
import com.linecorp.armeria.server.annotation.ConsumesJson;
2627
import com.linecorp.armeria.server.annotation.ConsumesProtobuf;
2728
import com.linecorp.armeria.server.annotation.Post;
@@ -82,6 +83,12 @@ public HttpResponse collectV2ProtobufSpans(HttpRequest req) {
8283
return doCollectSpans(SpanBytesDecoder.PROTO3, req);
8384
}
8485

86+
@Post("/api/v2/spans")
87+
@Consumes("application/x-protobuf")
88+
public HttpResponse collectV2XProtobufSpans(HttpRequest req) {
89+
return doCollectSpans(SpanBytesDecoder.PROTO3, req);
90+
}
91+
8592
@Post("/api/v1/spans")
8693
public HttpResponse collectV1Spans(HttpRequest req) {
8794
return doCollectSpans(SpanBytesDecoder.JSON_V1, req);

0 commit comments

Comments
 (0)