kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

As collector is using jdk8, no need of long list “if…else”. Remove some “e.printstaktrace”.

This commit is contained in:
wusheng 2017-04-21 14:21:25 +08:00
parent 2e6d258948
commit 0a4ac940e4
5 changed files with 172 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java
View File

@ -18,12 +18,12 @@ public abstract class AbstractGet extends AbstractLocalSyncWorker {
super(role, clusterContext, selfContext);
}
@Override final public void onWork(Object request, Object response) throws Exception {
@Override
final public void onWork(Object request, Object response) throws Exception {
Map<String, String[]> parameterMap = (Map<String, String[]>)request;
try {
onSearch(parameterMap, (JsonObject)response);
} catch (Exception e) {
e.printStackTrace();
((JsonObject)response).addProperty("isSuccess", false);
((JsonObject)response).addProperty("reason", e.getMessage());
}

36
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/LogData.java
View File

@ -28,24 +28,26 @@ public class LogData extends DeserializeObject {
boolean first = true;
reader.beginObject();
while (reader.hasNext()) {
String name = reader.nextName();
if (name.equals("tm")) {
Long tm = reader.nextLong();
this.time = tm;
JsonBuilder.INSTANCE.append(stringBuilder, "tm", tm, first);
} else if (name.equals("fi")) {
fields = new HashMap<>();
reader.beginObject();
switch (reader.nextName()) {
case "tm":
Long tm = reader.nextLong();
this.time = tm;
JsonBuilder.INSTANCE.append(stringBuilder, "tm", tm, first);
break;
case "fi":
fields = new HashMap<>();
reader.beginObject();
while (reader.hasNext()) {
String key = reader.nextName();
String value = reader.nextString();
fields.put(key, value);
}
reader.endObject();
JsonBuilder.INSTANCE.append(stringBuilder, "fi", fields, first);
} else {
reader.skipValue();
while (reader.hasNext()) {
String key = reader.nextName();
String value = reader.nextString();
fields.put(key, value);
}
reader.endObject();
JsonBuilder.INSTANCE.append(stringBuilder, "fi", fields, first);
break;
default:
reader.skipValue();
}
first = false;
}

105
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/Segment.java
View File

@ -53,61 +53,68 @@ public class Segment extends DeserializeObject {
boolean first = true;
reader.beginObject();
while (reader.hasNext()) {
String name = reader.nextName();
if (name.equals("ts")) {
String ts = reader.nextString();
this.traceSegmentId = ts;
JsonBuilder.INSTANCE.append(stringBuilder, "ts", ts, first);
} else if (name.equals("ac")) {
String ac = reader.nextString();
this.applicationCode = ac;
JsonBuilder.INSTANCE.append(stringBuilder, "ac", ac, first);
} else if (name.equals("st")) {
long st = reader.nextLong();
this.startTime = st;
JsonBuilder.INSTANCE.append(stringBuilder, "st", st, first);
} else if (name.equals("et")) {
long et = reader.nextLong();
this.endTime = et;
JsonBuilder.INSTANCE.append(stringBuilder, "et", et, first);
} else if (name.equals("rs")) {
refs = new ArrayList<>();
reader.beginArray();
switch (reader.nextName()) {
case "ts":
String ts = reader.nextString();
this.traceSegmentId = ts;
JsonBuilder.INSTANCE.append(stringBuilder, "ts", ts, first);
break;
case "ac":
String ac = reader.nextString();
this.applicationCode = ac;
JsonBuilder.INSTANCE.append(stringBuilder, "ac", ac, first);
break;
case "st":
long st = reader.nextLong();
this.startTime = st;
JsonBuilder.INSTANCE.append(stringBuilder, "st", st, first);
break;
case "et":
long et = reader.nextLong();
this.endTime = et;
JsonBuilder.INSTANCE.append(stringBuilder, "et", et, first);
break;
case "rs":
refs = new ArrayList<>();
reader.beginArray();
while (reader.hasNext()) {
TraceSegmentRef ref = new TraceSegmentRef();
ref.deserialize(reader);
refs.add(ref);
}
while (reader.hasNext()) {
TraceSegmentRef ref = new TraceSegmentRef();
ref.deserialize(reader);
refs.add(ref);
}
reader.endArray();
JsonBuilder.INSTANCE.append(stringBuilder, "rs", refs, first);
} else if (name.equals("ss")) {
spans = new ArrayList<>();
reader.beginArray();
reader.endArray();
JsonBuilder.INSTANCE.append(stringBuilder, "rs", refs, first);
break;
case "ss":
spans = new ArrayList<>();
reader.beginArray();
while (reader.hasNext()) {
Span span = new Span();
span.deserialize(reader);
spans.add(span);
}
while (reader.hasNext()) {
Span span = new Span();
span.deserialize(reader);
spans.add(span);
}
reader.endArray();
JsonBuilder.INSTANCE.append(stringBuilder, "ss", spans, first);
} else if (name.equals("gt")) {
relatedGlobalTraces = new ArrayList<>();
reader.beginArray();
reader.endArray();
JsonBuilder.INSTANCE.append(stringBuilder, "ss", spans, first);
break;
case "gt":
relatedGlobalTraces = new ArrayList<>();
reader.beginArray();
while (reader.hasNext()) {
GlobalTraceId globalTraceId = new GlobalTraceId();
globalTraceId.deserialize(reader);
relatedGlobalTraces.add(globalTraceId);
}
JsonBuilder.INSTANCE.append(stringBuilder, "gt", relatedGlobalTraces, first);
while (reader.hasNext()) {
GlobalTraceId globalTraceId = new GlobalTraceId();
globalTraceId.deserialize(reader);
relatedGlobalTraces.add(globalTraceId);
}
JsonBuilder.INSTANCE.append(stringBuilder, "gt", relatedGlobalTraces, first);
reader.endArray();
} else {
reader.skipValue();
reader.endArray();
break;
default:
reader.skipValue();
}
first = false;
}

135
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/Span.java
View File

@ -65,73 +65,82 @@ public class Span extends DeserializeObject {
boolean first = true;
reader.beginObject();
while (reader.hasNext()) {
String name = reader.nextName();
if (name.equals("si")) {
Integer si = reader.nextInt();
this.spanId = si;
JsonBuilder.INSTANCE.append(stringBuilder, "si", si, first);
} else if (name.equals("ps")) {
Integer ps = reader.nextInt();
this.parentSpanId = ps;
JsonBuilder.INSTANCE.append(stringBuilder, "ps", ps, first);
} else if (name.equals("st")) {
Long st = reader.nextLong();
this.startTime = st;
JsonBuilder.INSTANCE.append(stringBuilder, "st", st, first);
} else if (name.equals("et")) {
Long et = reader.nextLong();
this.endTime = et;
JsonBuilder.INSTANCE.append(stringBuilder, "et", et, first);
} else if (name.equals("on")) {
String on = reader.nextString();
this.operationName = on;
JsonBuilder.INSTANCE.append(stringBuilder, "on", on, first);
} else if (name.equals("ts")) {
tagsWithStr = new HashMap<>();
reader.beginObject();
switch (reader.nextName()) {
case "si":
Integer si = reader.nextInt();
this.spanId = si;
JsonBuilder.INSTANCE.append(stringBuilder, "si", si, first);
break;
case "ps":
Integer ps = reader.nextInt();
this.parentSpanId = ps;
JsonBuilder.INSTANCE.append(stringBuilder, "ps", ps, first);
break;
case "st":
Long st = reader.nextLong();
this.startTime = st;
JsonBuilder.INSTANCE.append(stringBuilder, "st", st, first);
break;
case "et":
Long et = reader.nextLong();
this.endTime = et;
JsonBuilder.INSTANCE.append(stringBuilder, "et", et, first);
break;
case "on":
String on = reader.nextString();
this.operationName = on;
JsonBuilder.INSTANCE.append(stringBuilder, "on", on, first);
break;
case "ts":
tagsWithStr = new HashMap<>();
reader.beginObject();
while (reader.hasNext()) {
String key = reader.nextName();
String value = reader.nextString();
tagsWithStr.put(key, value);
}
reader.endObject();
JsonBuilder.INSTANCE.append(stringBuilder, "ts", tagsWithStr, first);
} else if (name.equals("tb")) {
tagsWithBool = new HashMap<>();
reader.beginObject();
while (reader.hasNext()) {
String key = reader.nextName();
String value = reader.nextString();
tagsWithStr.put(key, value);
}
reader.endObject();
JsonBuilder.INSTANCE.append(stringBuilder, "ts", tagsWithStr, first);
break;
case "tb":
tagsWithBool = new HashMap<>();
reader.beginObject();
while (reader.hasNext()) {
String key = reader.nextName();
boolean value = reader.nextBoolean();
tagsWithBool.put(key, value);
}
reader.endObject();
JsonBuilder.INSTANCE.append(stringBuilder, "tb", tagsWithBool, first);
} else if (name.equals("ti")) {
tagsWithInt = new HashMap<>();
reader.beginObject();
while (reader.hasNext()) {
String key = reader.nextName();
boolean value = reader.nextBoolean();
tagsWithBool.put(key, value);
}
reader.endObject();
JsonBuilder.INSTANCE.append(stringBuilder, "tb", tagsWithBool, first);
break;
case "ti":
tagsWithInt = new HashMap<>();
reader.beginObject();
while (reader.hasNext()) {
String key = reader.nextName();
Integer value = reader.nextInt();
tagsWithInt.put(key, value);
}
reader.endObject();
JsonBuilder.INSTANCE.append(stringBuilder, "ti", tagsWithInt, first);
} else if (name.equals("lo")) {
logs = new ArrayList<>();
reader.beginArray();
while (reader.hasNext()) {
String key = reader.nextName();
Integer value = reader.nextInt();
tagsWithInt.put(key, value);
}
reader.endObject();
JsonBuilder.INSTANCE.append(stringBuilder, "ti", tagsWithInt, first);
break;
case "lo":
logs = new ArrayList<>();
reader.beginArray();
while (reader.hasNext()) {
LogData logData = new LogData();
logData.deserialize(reader);
logs.add(logData);
}
reader.endArray();
JsonBuilder.INSTANCE.append(stringBuilder, "lo", logs, first);
} else {
reader.skipValue();
while (reader.hasNext()) {
LogData logData = new LogData();
logData.deserialize(reader);
logs.add(logData);
}
reader.endArray();
JsonBuilder.INSTANCE.append(stringBuilder, "lo", logs, first);
break;
default:
reader.skipValue();
}
first = false;
}

43
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/TraceSegmentRef.java
View File

@ -1,7 +1,6 @@
package com.a.eye.skywalking.collector.worker.segment.entity;
import com.google.gson.stream.JsonReader;
import java.io.IOException;
/**
@ -40,25 +39,29 @@ public class TraceSegmentRef extends DeserializeObject {
boolean first = true;
reader.beginObject();
while (reader.hasNext()) {
String name = reader.nextName();
if (name.equals("ts")) {
String ts = reader.nextString();
this.traceSegmentId = ts;
JsonBuilder.INSTANCE.append(stringBuilder, "ts", ts, first);
} else if (name.equals("si")) {
Integer si = reader.nextInt();
this.spanId = si;
JsonBuilder.INSTANCE.append(stringBuilder, "si", si, first);
} else if (name.equals("ac")) {
String ac = reader.nextString();
this.applicationCode = ac;
JsonBuilder.INSTANCE.append(stringBuilder, "ac", ac, first);
} else if (name.equals("ph")) {
String ph = reader.nextString();
this.peerHost = ph;
JsonBuilder.INSTANCE.append(stringBuilder, "ph", ph, first);
} else {
reader.skipValue();
switch (reader.nextName()) {
case "rs":
String ts = reader.nextString();
this.traceSegmentId = ts;
JsonBuilder.INSTANCE.append(stringBuilder, "ts", ts, first);
break;
case "si":
Integer si = reader.nextInt();
this.spanId = si;
JsonBuilder.INSTANCE.append(stringBuilder, "si", si, first);
break;
case "ac":
String ac = reader.nextString();
this.applicationCode = ac;
JsonBuilder.INSTANCE.append(stringBuilder, "ac", ac, first);
break;
case "ph":
String ph = reader.nextString();
this.peerHost = ph;
JsonBuilder.INSTANCE.append(stringBuilder, "ph", ph, first);
break;
default:
reader.skipValue();
}
first = false;
}