提交 b019d35f 编写于 作者: P pengys5

1. change the attributes name in StringValue class

2. change \t \b \n \r \f to \\t \\b \\n \\r \\f in nextQuotedValueForString method
上级 43eb0f42
......@@ -13,7 +13,7 @@ public class GlobalTraceId extends DeserializeObject {
}
public GlobalTraceId deserialize(SegmentJsonReader reader) throws IOException {
this.globalTraceId = reader.nextString().getNonQuoteValue();
this.globalTraceId = reader.nextString().getValue();
this.setJsonStr("\"" + globalTraceId + "\"");
return this;
}
......
......@@ -38,7 +38,7 @@ public class LogData extends DeserializeObject {
while (reader.hasNext()) {
String key = reader.nextName();
String value = reader.nextString().getQuoteValue();
String value = reader.nextString().getOriginValue();
fields.put(key, value);
}
reader.endObject();
......
......@@ -54,13 +54,13 @@ public class Segment extends DeserializeObject {
switch (reader.nextName()) {
case "ts":
SegmentJsonReader.StringValue ts = reader.nextString();
this.traceSegmentId = ts.getNonQuoteValue();
JsonBuilder.INSTANCE.append(stringBuilder, "ts", ts.getQuoteValue(), first);
this.traceSegmentId = ts.getValue();
JsonBuilder.INSTANCE.append(stringBuilder, "ts", ts.getOriginValue(), first);
break;
case "ac":
SegmentJsonReader.StringValue ac = reader.nextString();
this.applicationCode = ac.getNonQuoteValue();
JsonBuilder.INSTANCE.append(stringBuilder, "ac", ac.getQuoteValue(), first);
this.applicationCode = ac.getValue();
JsonBuilder.INSTANCE.append(stringBuilder, "ac", ac.getOriginValue(), first);
break;
case "st":
long st = reader.nextLong();
......
......@@ -633,23 +633,23 @@ public class SegmentJsonReader implements Closeable {
}
StringValue result = new StringValue();
if (p == PEEKED_UNQUOTED) {
result.setNonQuoteValue(nextUnquotedValue());
result.setQuoteValue(nextUnquotedValue());
result.setValue(nextUnquotedValue());
result.setOriginValue(nextUnquotedValue());
} else if (p == PEEKED_SINGLE_QUOTED) {
result.setNonQuoteValue(nextQuotedValue('\''));
result.setQuoteValue(nextQuotedValue('\''));
result.setValue(nextQuotedValue('\''));
result.setOriginValue(nextQuotedValue('\''));
} else if (p == PEEKED_DOUBLE_QUOTED) {
result = nextQuotedValueForString('"');
} else if (p == PEEKED_BUFFERED) {
result.setNonQuoteValue(peekedString);
result.setQuoteValue(peekedString);
result.setValue(peekedString);
result.setOriginValue(peekedString);
peekedString = null;
} else if (p == PEEKED_LONG) {
result.setNonQuoteValue(Long.toString(peekedLong));
result.setQuoteValue(Long.toString(peekedLong));
result.setValue(Long.toString(peekedLong));
result.setOriginValue(Long.toString(peekedLong));
} else if (p == PEEKED_NUMBER) {
result.setNonQuoteValue(new String(buffer, pos, peekedNumberLength));
result.setQuoteValue(new String(buffer, pos, peekedNumberLength));
result.setValue(new String(buffer, pos, peekedNumberLength));
result.setOriginValue(new String(buffer, pos, peekedNumberLength));
pos += peekedNumberLength;
} else {
throw new IllegalStateException("Expected a string but was " + peek() + locationString());
......@@ -864,8 +864,8 @@ public class SegmentJsonReader implements Closeable {
nonQuoteBuilder.append(buffer, start, p - start - 1);
quoteBuilder.append(buffer, start, p - start - 1);
result.setNonQuoteValue(nonQuoteBuilder.toString());
result.setQuoteValue(quoteBuilder.toString());
result.setValue(nonQuoteBuilder.toString());
result.setOriginValue(quoteBuilder.toString());
return result;
} else if (c == '\\') {
pos = p;
......@@ -876,6 +876,21 @@ public class SegmentJsonReader implements Closeable {
nonQuoteBuilder.append(character);
switch (character) {
case '\t':
quoteBuilder.append('\\').append('t');
break;
case '\b':
quoteBuilder.append('\\').append('b');
break;
case '\n':
quoteBuilder.append('\\').append('n');
break;
case '\r':
quoteBuilder.append('\\').append('r');
break;
case '\f':
quoteBuilder.append('\\').append('f');
break;
case '\'':
case '"':
case '\\':
......@@ -1468,23 +1483,23 @@ public class SegmentJsonReader implements Closeable {
}
public static class StringValue {
private String nonQuoteValue;
private String quoteValue;
private String value;
private String originValue;
public String getNonQuoteValue() {
return nonQuoteValue;
public String getValue() {
return value;
}
public void setNonQuoteValue(String nonQuoteValue) {
this.nonQuoteValue = nonQuoteValue;
public void setValue(String value) {
this.value = value;
}
public String getQuoteValue() {
return quoteValue;
public String getOriginValue() {
return originValue;
}
public void setQuoteValue(String quoteValue) {
this.quoteValue = quoteValue;
public void setOriginValue(String originValue) {
this.originValue = originValue;
}
}
}
\ No newline at end of file
......@@ -85,7 +85,7 @@ public class Span extends DeserializeObject {
JsonBuilder.INSTANCE.append(stringBuilder, "et", et, first);
break;
case "on":
String on = reader.nextString().getNonQuoteValue();
String on = reader.nextString().getValue();
this.operationName = on;
JsonBuilder.INSTANCE.append(stringBuilder, "on", on, first);
break;
......@@ -95,7 +95,7 @@ public class Span extends DeserializeObject {
while (reader.hasNext()) {
String key = reader.nextName();
String value = reader.nextString().getQuoteValue();
String value = reader.nextString().getOriginValue();
tagsWithStr.put(key, value);
}
reader.endObject();
......
......@@ -40,7 +40,7 @@ public class TraceSegmentRef extends DeserializeObject {
while (reader.hasNext()) {
switch (reader.nextName()) {
case "ts":
String ts = reader.nextString().getNonQuoteValue();
String ts = reader.nextString().getValue();
this.traceSegmentId = ts;
JsonBuilder.INSTANCE.append(stringBuilder, "ts", ts, first);
break;
......@@ -50,12 +50,12 @@ public class TraceSegmentRef extends DeserializeObject {
JsonBuilder.INSTANCE.append(stringBuilder, "si", si, first);
break;
case "ac":
String ac = reader.nextString().getNonQuoteValue();
String ac = reader.nextString().getValue();
this.applicationCode = ac;
JsonBuilder.INSTANCE.append(stringBuilder, "ac", ac, first);
break;
case "ph":
String ph = reader.nextString().getNonQuoteValue();
String ph = reader.nextString().getValue();
this.peerHost = ph;
JsonBuilder.INSTANCE.append(stringBuilder, "ph", ph, first);
break;
......
......@@ -120,7 +120,7 @@
"db.type": "sql",
"component": "H2",
"span.kind": "client",
"db.statement": "SELECT id,CACHE_VALUE, CACHE_KEY FROM CACHE_TABLE WHERE CACHE_KEY \u003d ?",
"db.statement": "SELECT id,CACHE_VALUE, CACHE_KEY FROM CACHE_TABLE WHERE CACHE_KEY ?",
"peer.host": "localhost"
},
"tb": {},
......@@ -366,6 +366,7 @@
{
"tm": 1490923010332,
"fi": {
"stack": "com.weibo.api.motan.exception.MotanBizException: error_message: provider call process error, status: 503, error_code: 30001,r\n\tat com.weibo.api.motan.rpc.DefaultProvider.invoke(DefaultProvider.java:62)\n\tat com.weibo.api.motan.rpc.AbstractProvider.call(AbstractProvider.java:47)\n\tat com.weibo.api.motan.filter.opentracing.OpenTracingFilter.process(OpenTracingFilter.java:94)\n\tat com.weibo.api.motan.filter.opentracing.OpenTracingFilter.processProviderTrace(OpenTracingFilter.java:148)\n\tat com.weibo.api.motan.filter.opentracing.OpenTracingFilter.filter(OpenTracingFilter.java:58)\n\tat com.weibo.api.motan.protocol.support.ProtocolFilterDecorator$2.call(ProtocolFilterDecorator.java:150)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.call$original$doBagGo8(ProviderMessageRouter.java:96)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.call$original$doBagGo8$accessor$PEWyOMYz(ProviderMessageRouter.java)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter$auxiliary$s7ixnKeK.call(Unknown Source)\n\tat com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassInstanceMethodsInterceptor.intercept(ClassInstanceMethodsInterceptor.java:66)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.call(ProviderMessageRouter.java)\n\tat com.weibo.api.motan.transport.ProviderProtectedMessageRouter.call(ProviderProtectedMessageRouter.java:79)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.handle(ProviderMessageRouter.java:91)\n\tat com.weibo.api.motan.transport.support.DefaultRpcHeartbeatFactory$HeartMessageHandleWrapper.handle(DefaultRpcHeartbeatFactory.java:82)\n\tat com.weibo.api.motan.transport.netty.NettyChannelHandler.processRequest(NettyChannelHandler.java:139)\n\tat com.weibo.api.motan.transport.netty.NettyChannelHandler.access$000(NettyChannelHandler.java:47)\n\tat com.weibo.api.motan.transport.netty.NettyChannelHandler$1.run(NettyChannelHandler.java:116)\n\tat java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)\n\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)\n\tat java.lang.Thread.run(Thread.java:745)\nCaused by: java.lang.NullPointerException\n\tat com.a.eye.skywalking.test.cache.jedis.JedisServiceManager.findWithException(JedisServiceManager.java:49)\n\tat com.a.eye.skywalking.test.cache.CacheServiceImpl.findCacheWithException(CacheServiceImpl.java:46)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat com.weibo.api.motan.rpc.DefaultProvider.invoke(DefaultProvider.java:57)\n\t... 19 more\ncom.weibo.api.motan.exception.MotanBizException: error_message: provider call process error, status: 503, error_code: 30001,r\n\tat com.weibo.api.motan.rpc.DefaultProvider.invoke(DefaultProvider.java:62)\n\tat com.weibo.api.motan.rpc.AbstractProvider.call(AbstractProvider.java:47)\n\tat com.weibo.api.motan.filter.opentracing.OpenTracingFilter.process(OpenTracingFilter.java:94)\n\tat com.weibo.api.motan.filter.opentracing.OpenTracingFilter.processProviderTrace(OpenTracingFilter.java:148)\n\tat com.weibo.api.motan.filter.opentracing.OpenTracingFilter.filter(OpenTracingFilter.java:58)\n\tat com.weibo.api.motan.protocol.support.ProtocolFilterDecorator$2.call(ProtocolFilterDecorator.java:150)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.call$original$doBagGo8(ProviderMessageRouter.java:96)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.call$original$doBagGo8$accessor$PEWyOMYz(ProviderMessageRouter.java)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter$auxiliary$s7ixnKeK.call(Unknown Source)\n\tat com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassInstanceMethodsInterceptor.intercept(ClassInstanceMethodsInterceptor.java:66)\n\tat com.weibo.api.motan.transport.ProviderMessageRouter.call(ProviderMessageRouter.java)\n\tat com.weibo.api.motan.",
"special.character": "\'\" \\ /"
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册