diff --git a/samples/skywalking-auth/src/main/resources/sky-walking.auth b/samples/skywalking-auth/src/main/resources/sky-walking.auth index 34dcdc2d8edf2dfed7631674e928dc06a6a71a8b..5ff5360490afa9027008aa2e6329e9791ed8bf13 100644 --- a/samples/skywalking-auth/src/main/resources/sky-walking.auth +++ b/samples/skywalking-auth/src/main/resources/sky-walking.auth @@ -4,6 +4,8 @@ skywalking.user_id=123 skywalking.application_code=test #skywalking auth的环境变量名字 skywalking.auth_system_env_name=SKYWALKING_RUN +#skywalking数据编码 +skywalking.charset=UTF-8 #是否打印数据 buriedpoint.printf=false diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java index 199b35d3a1f916d581b6d4a5493c187712f43969..58bf7ca8edf6373f124cb214b865dcedd9b7c711 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java @@ -10,6 +10,8 @@ public class Config { public static String AUTH_SYSTEM_ENV_NAME = "SKYWALKING_RUN"; public static boolean AUTH_OVERRIDE = false; + + public static String CHARSET = "UTF-8"; } public static class BuriedPoint { diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/protocol/ProtocolBuilder.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/protocol/ProtocolBuilder.java index c944810a9a01a3925b48206817411e2179465088..35ecb78cc50ca36f9cc3b002d908a29878989df7 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/protocol/ProtocolBuilder.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/protocol/ProtocolBuilder.java @@ -1,12 +1,16 @@ package com.ai.cloud.skywalking.sender.protocol; +import com.ai.cloud.skywalking.conf.Config; + +import java.nio.charset.Charset; + public class ProtocolBuilder { //协议格式: // xx xx xx xx | xx xx xx xx xxx xxx xxx // header(4) | content public static byte[] builder(String data) { - byte[] content = data.getBytes(); + byte[] content = data.getBytes(Charset.forName(Config.SkyWalking.CHARSET)); byte[] header = intToByteArray(content.length); byte[] des = new byte[header.length + content.length]; System.arraycopy(header, 0, des, 0, header.length);