Merge branch 'master' into graal-substitute

apache · Sep 26, 2023 · 17ca887 · 17ca887
2 parents 66dd3f8 + 2b7e5ee
commit 17ca887
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
@@ -12,7 +12,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
 
@@ -21,6 +21,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/.../java/org/apache/skywalking/oap/server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java b/.../java/org/apache/skywalking/oap/server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java
@@ -101,7 +101,7 @@ HttpResponse doCollectSpans(final SpanBytesDecoder decoder,
             try (final HttpData httpData = request.content()) {
                 final List<Span> spanList = decoder.decodeList(httpData.byteBuf().nioBuffer());
                 spanForward.send(spanList);
-                return HttpResponse.of(HttpStatus.OK);
+                return HttpResponse.of(HttpStatus.ACCEPTED);
             }
         }));
         response.whenComplete().handle((unused, throwable) -> {