From c28e4f0b37aaaaf2883e25c94ffedbac184b6617 Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Tue, 1 Dec 2015 18:04:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=9A=94=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ai/cloud/skywalking/protocol/Span.java | 5 +++-- .../java/com/ai/cloud/skywalking/protocol/SpanData.java | 9 ++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java b/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java index 4fd44a14f..bdfc2e070 100644 --- a/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java +++ b/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java @@ -26,7 +26,7 @@ public class Span extends SpanData { } public Span(String originData) { - String[] fieldValues = originData.split(SPILT_REGEX); + String[] fieldValues = originData.split(SPAN_FIELD_SPILT_PATTERN); traceId = fieldValues[0].trim(); parentLevel = fieldValues[1].trim(); levelId = Integer.valueOf(fieldValues[2]); @@ -42,7 +42,8 @@ public class Span extends SpanData { } spanType = fieldValues[9].charAt(0); isReceiver = Boolean.valueOf(fieldValues[10]); - businessKey = fieldValues[11].trim(); + businessKey = fieldValues[11].trim().replaceAll(BUSINESSKEY_SPILT_PATTERN, + NEW_LINE_CHARACTER_PATTERN); processNo = fieldValues[12].trim(); applicationId = fieldValues[13].trim(); this.originData = originData; diff --git a/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java b/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java index e2f87a754..f3ab72e96 100644 --- a/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java +++ b/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java @@ -2,11 +2,10 @@ package com.ai.cloud.skywalking.protocol; public abstract class SpanData { - protected static final String SPAN_FIELD_SPILT_PATTERN = "^~"; - protected static final String BUSINESSKEY_SPILT_PATTERN = "~^"; - protected static final String SPILT_REGEX = "\\^\\~"; - protected static final String NEW_LINE_CHARACTER_PATTERN = "[\\n\\r]"; - protected static final String EXCEPTION_SPILT_PATTERN = "^"; + protected static final String SPAN_FIELD_SPILT_PATTERN = ".\u007F"; + protected static final String BUSINESSKEY_SPILT_PATTERN = "'\u007F"; + protected static final String NEW_LINE_CHARACTER_PATTERN = "\r\n"; + protected static final String EXCEPTION_SPILT_PATTERN = ";\u007F"; protected String traceId; protected String parentLevel;