This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch kafka
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/kafka by this push:
     new 380412c912 Force UTF-8 encoding in `JsonLogHandler` of 
`kafka-fetcher-plugin`.
380412c912 is described below

commit 380412c912996cfc8f8837a0a007305a01930f14
Author: Wu Sheng <[email protected]>
AuthorDate: Wed Nov 9 11:27:27 2022 +0800

    Force UTF-8 encoding in `JsonLogHandler` of `kafka-fetcher-plugin`.
---
 docs/en/changes/changes.md                                             | 1 +
 .../server/analyzer/agent/kafka/provider/handler/JsonLogHandler.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 14f2ae395d..efc346e79c 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -101,6 +101,7 @@
 * Optimize MQ Topology analysis. Use entry span's peer from the consumer side 
as source service when no producer instrumentation(no cross-process reference).
 * Refactor JDBC storage implementations to reuse logics.
 * Fix `ClassCastException` in `LoggingConfigWatcher`.
+* Force UTF-8 encoding in `JsonLogHandler` of `kafka-fetcher-plugin`.
 
 #### UI
 
diff --git 
a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/JsonLogHandler.java
 
b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/JsonLogHandler.java
index d47ca5966d..089af47c23 100644
--- 
a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/JsonLogHandler.java
+++ 
b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/JsonLogHandler.java
@@ -19,6 +19,7 @@ package 
org.apache.skywalking.oap.server.analyzer.agent.kafka.provider.handler;
 
 import java.io.IOException;
 
+import java.nio.charset.StandardCharsets;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.common.utils.Bytes;
@@ -50,7 +51,7 @@ public class JsonLogHandler extends LogHandler {
     @Override
     protected LogData parseConsumerRecord(ConsumerRecord<String, Bytes> 
record) throws IOException {
         LogData.Builder logDataBuilder = LogData.newBuilder();
-        ProtoBufJsonUtils.fromJSON(record.value().toString(), logDataBuilder);
+        ProtoBufJsonUtils.fromJSON(new String(record.value().get(), 
StandardCharsets.UTF_8), logDataBuilder);
         return logDataBuilder.build();
     }
 }

Reply via email to