From 2b7e5ee6258cc8311f76608236a78a14cd72ff2d Mon Sep 17 00:00:00 2001 From: Wan Kai Date: Mon, 25 Sep 2023 16:52:59 +0800 Subject: [PATCH] Fix Zipkin trace receiver response: make the HTTP status code from `200` to `202`. (#11356) --- docs/en/changes/changes.md | 3 ++- .../server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 5e5916a3e7..ead1bff0e6 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -11,7 +11,7 @@ * [Breaking Change] Elasticsearch storage merge all management data indices into one index `management`, including `ui_template，ui_menu，continuous_profiling_policy`. * Add a release mechanism for alarm windows when it is expired in case of OOM. -* Apply MQE on K8s layer UI-templates +* Fix Zipkin trace receiver response: make the HTTP status code from `200` to `202`. #### UI @@ -20,6 +20,7 @@ * Fix the display height of the link tree structure. * Replace the name by shortName on service widget. * Refactor: update pagination style. No visualization style change. +* Apply MQE on K8s layer UI-templates #### Documentation 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 bf77bc4481..ea42404ade 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 @@ -101,7 +101,7 @@ public class ZipkinSpanHTTPHandler { try (final HttpData httpData = request.content()) { final List spanList = decoder.decodeList(httpData.byteBuf().nioBuffer()); spanForward.send(spanList); - return HttpResponse.of(HttpStatus.OK); + return HttpResponse.of(HttpStatus.ACCEPTED); } })); response.whenComplete().handle((unused, throwable) -> {