From 9c3a9560f44f74821784b7bc78442e442849960e Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Thu, 19 Nov 2015 19:17:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E9=AD=94=E6=B3=95=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E6=8C=AA=E6=88=90=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/skywalking/constants/Constants.java | 8 +++- .../com/ai/cloud/skywalking/context/Span.java | 37 ++++++++++--------- .../skywalking/util/ExceptionHandleUtil.java | 8 ++-- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/constants/Constants.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/constants/Constants.java index beea37d41..5418df294 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/constants/Constants.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/constants/Constants.java @@ -2,5 +2,11 @@ package com.ai.cloud.skywalking.constants; public class Constants { - public static final String spiltRegx = "^~"; + public static final String SPAN_FIELD_SPILT_PATTERN = "^~"; + + public static final String BUSINESSKEY_SPILT_PATTERN = "~^"; + + public static final String NEW_LINE_CHARACTER_PATTERN = "\\n"; + + public static final String EXCEPTION_SPILT_PATTERN = "^"; } diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Span.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Span.java index 04e01a435..3f81667a6 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Span.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Span.java @@ -134,53 +134,54 @@ public class Span { @Override public String toString() { StringBuilder toStringValue = new StringBuilder(); - toStringValue.append(traceId + Constants.spiltRegx); + toStringValue.append(traceId + Constants.SPAN_FIELD_SPILT_PATTERN); if (!StringUtil.isEmpty(parentLevel)) { - toStringValue.append(parentLevel + Constants.spiltRegx); + toStringValue.append(parentLevel + Constants.SPAN_FIELD_SPILT_PATTERN); } else { - toStringValue.append(" " + Constants.spiltRegx); + toStringValue.append(" " + Constants.SPAN_FIELD_SPILT_PATTERN); } - toStringValue.append(levelId + Constants.spiltRegx); + toStringValue.append(levelId + Constants.SPAN_FIELD_SPILT_PATTERN); if (!StringUtil.isEmpty(viewPointId)) { - toStringValue.append(viewPointId + Constants.spiltRegx); + toStringValue.append(viewPointId + Constants.SPAN_FIELD_SPILT_PATTERN); } else { - toStringValue.append(" " + Constants.spiltRegx); + toStringValue.append(" " + Constants.SPAN_FIELD_SPILT_PATTERN); } - toStringValue.append(startDate + Constants.spiltRegx); - toStringValue.append(cost + Constants.spiltRegx); + toStringValue.append(startDate + Constants.SPAN_FIELD_SPILT_PATTERN); + toStringValue.append(cost + Constants.SPAN_FIELD_SPILT_PATTERN); if (!StringUtil.isEmpty(address)) { - toStringValue.append(address + Constants.spiltRegx); + toStringValue.append(address + Constants.SPAN_FIELD_SPILT_PATTERN); } else { - toStringValue.append(" " + Constants.spiltRegx); + toStringValue.append(" " + Constants.SPAN_FIELD_SPILT_PATTERN); } - toStringValue.append(statusCode + Constants.spiltRegx); + toStringValue.append(statusCode + Constants.SPAN_FIELD_SPILT_PATTERN); if (!StringUtil.isEmpty(exceptionStack)) { - toStringValue.append(exceptionStack + Constants.spiltRegx); + toStringValue.append(exceptionStack + Constants.SPAN_FIELD_SPILT_PATTERN); } else { - toStringValue.append(" " + Constants.spiltRegx); + toStringValue.append(" " + Constants.SPAN_FIELD_SPILT_PATTERN); } - toStringValue.append(spanType + Constants.spiltRegx); - toStringValue.append(isReceiver + Constants.spiltRegx); + toStringValue.append(spanType + Constants.SPAN_FIELD_SPILT_PATTERN); + toStringValue.append(isReceiver + Constants.SPAN_FIELD_SPILT_PATTERN); if (!StringUtil.isEmpty(businessKey)) { - toStringValue.append(businessKey + Constants.spiltRegx); + toStringValue.append(businessKey.replaceAll(Constants.NEW_LINE_CHARACTER_PATTERN, + Constants.BUSINESSKEY_SPILT_PATTERN) + Constants.SPAN_FIELD_SPILT_PATTERN); } else { - toStringValue.append(" " + Constants.spiltRegx); + toStringValue.append(" " + Constants.SPAN_FIELD_SPILT_PATTERN); } if (!StringUtil.isEmpty(processNo)) { toStringValue.append(processNo); } else { - toStringValue.append(" " + Constants.spiltRegx); + toStringValue.append(" " + Constants.SPAN_FIELD_SPILT_PATTERN); } return toStringValue.toString(); diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ExceptionHandleUtil.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ExceptionHandleUtil.java index 024e12d67..21026ca0f 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ExceptionHandleUtil.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ExceptionHandleUtil.java @@ -1,5 +1,6 @@ package com.ai.cloud.skywalking.util; +import com.ai.cloud.skywalking.constants.Constants; import com.ai.cloud.skywalking.context.Context; import com.ai.cloud.skywalking.context.Span; @@ -21,13 +22,14 @@ public final class ExceptionHandleUtil { try { buf.close(); } catch (IOException e1) { - expMessage.append("\n本地发送埋点关闭异常读入流异常，异常信息:"); + expMessage.append("\nClose exception stack input stream failed:\n"); expMessage.append(e1.getCause().getMessage()); } if (expMessage.length() <= MAX_EXCEPTION_STACK_LENGTH) { - return expMessage.toString().replaceAll("\\n", "^"); + return expMessage.toString().replaceAll(Constants.NEW_LINE_CHARACTER_PATTERN, Constants.EXCEPTION_SPILT_PATTERN); } else { - return expMessage.toString().replaceAll("\\n", "^").substring(0, MAX_EXCEPTION_STACK_LENGTH); + return expMessage.toString().replaceAll(Constants.NEW_LINE_CHARACTER_PATTERN, Constants.EXCEPTION_SPILT_PATTERN) + .substring(0, MAX_EXCEPTION_STACK_LENGTH); } }