From f390b14404ef0f5eb583d203d419510504bfd8eb Mon Sep 17 00:00:00 2001 From: Kai Date: Fri, 25 Feb 2022 18:58:13 +0800 Subject: [PATCH] Fix Zipkin receiver wrong condition for decoding `gzip` (#8592) --- CHANGES.md | 1 + .../oap/server/receiver/zipkin/handler/SpanProcessor.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index ff1d8f2e7d..1a84fabee4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -63,6 +63,7 @@ Release Notes. * Set default connection timeout of ElasticSearch to 3000 milliseconds. * Support ElasticSearch 8 and add it into E2E tests. * Disable indexing for field `alarm_record.tags_raw_data` of binary type in ElasticSearch storage. +* Fix Zipkin receiver wrong condition for decoding `gzip`. #### UI diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanProcessor.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanProcessor.java index f03589577e..a9c4dd513e 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanProcessor.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanProcessor.java @@ -58,7 +58,7 @@ public class SpanProcessor { private InputStream getInputStream(HttpServletRequest request) throws IOException { InputStream requestInStream; - String headEncoding = request.getHeader("accept-encoding"); + String headEncoding = request.getHeader("Content-Encoding"); if (headEncoding != null && (headEncoding.indexOf("gzip") != -1)) { requestInStream = new GZIPInputStream(request.getInputStream()); } else {