Skip to content

S
SkyWalking

月轩居士 / SkyWalking
与 Fork 源项目一致

Fork自 apache / SkyWalking

通知 4
Star 0
Fork 0
S
SkyWalking

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 f1f20b1c 编写于 作者: Z zhangxin10
浏览文件
操作

1. 新增setExceptionStack方法 

2. 修复只有在StatusCode为异常的时候，才对异常信息进行格式化
上级 fd2cbc43
隐藏空白更改
内联 并排
Showing with 159 addition and 158 deletion
skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java
浏览文件 @ f1f20b1c
......@@ -8,163 +8,160 @@ import java.util.logging.Logger;
public class Span extends SpanData {
private Logger logger = Logger.getLogger(Span.class.getName());
public Span() {
}
public Span(String traceId, String applicationID, String userId) {
this.traceId = traceId;
this.applicationId = applicationID;
this.userId = userId;
}
public Span(String traceId, String parentLevelId, int levelId,
String applicationID, String userId) {
this.traceId = traceId;
this.applicationId = applicationID;
this.parentLevel = parentLevelId;
this.userId = userId;
this.levelId = levelId;
}
public Span(String originData) {
String[] fieldValues = originData.split(SPAN_FIELD_SPILT_PATTERN);
traceId = fieldValues[0].trim();
parentLevel = fieldValues[1].trim();
levelId = Integer.valueOf(fieldValues[2]);
viewPointId = fieldValues[3].trim();
startDate = Long.valueOf(fieldValues[4]);
cost = Long.parseLong(fieldValues[5]);
address = fieldValues[6].trim();
statusCode = Byte.valueOf(fieldValues[7].trim());
// 异常情况才会存在exceptionStack
if (statusCode == 1) {
exceptionStack = fieldValues[8].trim().replaceAll(
SPAN_ATTR_SPILT_CHARACTER, NEW_LINE_CHARACTER_PATTERN);
}
spanType = fieldValues[9];
isReceiver = Boolean.valueOf(fieldValues[10]);
businessKey = fieldValues[11].trim().replaceAll(
SPAN_ATTR_SPILT_CHARACTER, NEW_LINE_CHARACTER_PATTERN);
processNo = fieldValues[12].trim();
applicationId = fieldValues[13].trim();
userId = fieldValues[14].trim();
this.originData = originData;
}
@Override
public String toString() {
StringBuilder toStringValue = new StringBuilder();
toStringValue.append(traceId + SPAN_FIELD_SPILT_PATTERN);
if (isNonBlank(parentLevel)) {
toStringValue.append(parentLevel + SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
toStringValue.append(levelId + SPAN_FIELD_SPILT_PATTERN);
if (isNonBlank(viewPointId)) {
toStringValue.append(viewPointId + SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
toStringValue.append(startDate + SPAN_FIELD_SPILT_PATTERN);
toStringValue.append(cost + SPAN_FIELD_SPILT_PATTERN);
if (isNonBlank(address)) {
toStringValue.append(address + SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
toStringValue.append(statusCode + SPAN_FIELD_SPILT_PATTERN);
if (isNonBlank(exceptionStack)) {
// 换行符在各个系统中表现不一致，
// windows平台的换行符为/r/n
// linux平台的换行符为/n
toStringValue.append(exceptionStack.replaceAll(
CARRIAGE_RETURN_CHARACTER_PATTERN, "").replaceAll(
NEW_LINE_CHARACTER_PATTERN, SPAN_ATTR_SPILT_CHARACTER)
+ SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
toStringValue.append(spanType + SPAN_FIELD_SPILT_PATTERN);
toStringValue.append(isReceiver + SPAN_FIELD_SPILT_PATTERN);
if (isNonBlank(businessKey)) {
// 换行符在各个系统中表现不一致，
// windows平台的换行符为/r/n
// linux平台的换行符为/n
toStringValue.append(businessKey.replaceAll(
CARRIAGE_RETURN_CHARACTER_PATTERN, "").replaceAll(
NEW_LINE_CHARACTER_PATTERN, SPAN_ATTR_SPILT_CHARACTER)
+ SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
if (isNonBlank(processNo)) {
toStringValue.append(processNo + SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
if (isNonBlank(applicationId)) {
toStringValue.append(applicationId + SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
if (isNonBlank(userId)) {
toStringValue.append(userId);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
return toStringValue.toString();
}
protected boolean isNonBlank(String str) {
return str != null && str.length() > 0;
}
public void handleException(Throwable e, Set<String> exclusiveExceptionSet,
int maxExceptionStackLength) {
ByteArrayOutputStream buf = null;
StringBuilder expMessage = new StringBuilder();
try {
buf = new ByteArrayOutputStream();
Throwable causeException = e;
while (causeException != null
&& (causeException.getCause() != null || expMessage
.length() < maxExceptionStackLength)) {
causeException.printStackTrace(new java.io.PrintWriter(buf,
true));
expMessage.append(buf.toString());
causeException = causeException.getCause();
}
} finally {
try {
buf.close();
} catch (IOException ioe) {
logger.log(Level.ALL,
"Close exception stack input stream failed", ioe);
}
}
this.exceptionStack = expMessage.toString();
if (!exclusiveExceptionSet.contains(e.getClass().getName())) {
this.statusCode = 1;
}
}
private Logger logger = Logger.getLogger(Span.class.getName());
public Span() {
}
public Span(String traceId, String applicationID, String userId) {
this.traceId = traceId;
this.applicationId = applicationID;
this.userId = userId;
}
public Span(String traceId, String parentLevelId, int levelId,
String applicationID, String userId) {
this.traceId = traceId;
this.applicationId = applicationID;
this.parentLevel = parentLevelId;
this.userId = userId;
this.levelId = levelId;
}
public Span(String originData) {
String[] fieldValues = originData.split(SPAN_FIELD_SPILT_PATTERN);
traceId = fieldValues[0].trim();
parentLevel = fieldValues[1].trim();
levelId = Integer.valueOf(fieldValues[2]);
viewPointId = fieldValues[3].trim();
startDate = Long.valueOf(fieldValues[4]);
cost = Long.parseLong(fieldValues[5]);
address = fieldValues[6].trim();
statusCode = Byte.valueOf(fieldValues[7].trim());
exceptionStack = fieldValues[8].trim().replaceAll(
SPAN_ATTR_SPILT_CHARACTER, NEW_LINE_CHARACTER_PATTERN);
spanType = fieldValues[9];
isReceiver = Boolean.valueOf(fieldValues[10]);
businessKey = fieldValues[11].trim().replaceAll(
SPAN_ATTR_SPILT_CHARACTER, NEW_LINE_CHARACTER_PATTERN);
processNo = fieldValues[12].trim();
applicationId = fieldValues[13].trim();
userId = fieldValues[14].trim();
this.originData = originData;
}
@Override
public String toString() {
StringBuilder toStringValue = new StringBuilder();
toStringValue.append(traceId + SPAN_FIELD_SPILT_PATTERN);
if (isNonBlank(parentLevel)) {
toStringValue.append(parentLevel + SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
toStringValue.append(levelId + SPAN_FIELD_SPILT_PATTERN);
if (isNonBlank(viewPointId)) {
toStringValue.append(viewPointId + SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
toStringValue.append(startDate + SPAN_FIELD_SPILT_PATTERN);
toStringValue.append(cost + SPAN_FIELD_SPILT_PATTERN);
if (isNonBlank(address)) {
toStringValue.append(address + SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
toStringValue.append(statusCode + SPAN_FIELD_SPILT_PATTERN);
if (isNonBlank(exceptionStack)) {
// 换行符在各个系统中表现不一致，
// windows平台的换行符为/r/n
// linux平台的换行符为/n
toStringValue.append(exceptionStack.replaceAll(
CARRIAGE_RETURN_CHARACTER_PATTERN, "").replaceAll(
NEW_LINE_CHARACTER_PATTERN, SPAN_ATTR_SPILT_CHARACTER)
+ SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
toStringValue.append(spanType + SPAN_FIELD_SPILT_PATTERN);
toStringValue.append(isReceiver + SPAN_FIELD_SPILT_PATTERN);
if (isNonBlank(businessKey)) {
// 换行符在各个系统中表现不一致，
// windows平台的换行符为/r/n
// linux平台的换行符为/n
toStringValue.append(businessKey.replaceAll(
CARRIAGE_RETURN_CHARACTER_PATTERN, "").replaceAll(
NEW_LINE_CHARACTER_PATTERN, SPAN_ATTR_SPILT_CHARACTER)
+ SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
if (isNonBlank(processNo)) {
toStringValue.append(processNo + SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
if (isNonBlank(applicationId)) {
toStringValue.append(applicationId + SPAN_FIELD_SPILT_PATTERN);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
if (isNonBlank(userId)) {
toStringValue.append(userId);
} else {
toStringValue.append(" " + SPAN_FIELD_SPILT_PATTERN);
}
return toStringValue.toString();
}
protected boolean isNonBlank(String str) {
return str != null && str.length() > 0;
}
public void handleException(Throwable e, Set<String> exclusiveExceptionSet,
int maxExceptionStackLength) {
ByteArrayOutputStream buf = null;
StringBuilder expMessage = new StringBuilder();
try {
buf = new ByteArrayOutputStream();
Throwable causeException = e;
while (causeException != null
&& (causeException.getCause() != null || expMessage
.length() < maxExceptionStackLength)) {
causeException.printStackTrace(new java.io.PrintWriter(buf,
true));
expMessage.append(buf.toString());
causeException = causeException.getCause();
}
} finally {
try {
buf.close();
} catch (IOException ioe) {
logger.log(Level.ALL,
"Close exception stack input stream failed", ioe);
}
}
this.exceptionStack = expMessage.toString();
if (!exclusiveExceptionSet.contains(e.getClass().getName())) {
this.statusCode = 1;
}
}
}
skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java
浏览文件 @ f1f20b1c
......@@ -113,6 +113,10 @@ public abstract class SpanData {
return exceptionStack;
}
public void setExceptionStack(String exceptionStack) {
this.exceptionStack = exceptionStack;
}
public String getBusinessKey() {
return businessKey;
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或