Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
0a4ac940
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
0a4ac940
编写于
4月 21, 2017
作者:
wu-sheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
As collector is using jdk8, no need of long list “if…else”. Remove some “e.printstaktrace”.
上级
2e6d2589
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
183 addition
and
162 deletion
+183
-162
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java
...e/skywalking/collector/worker/httpserver/AbstractGet.java
+2
-2
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/LogData.java
...e/skywalking/collector/worker/segment/entity/LogData.java
+20
-18
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/Segment.java
...e/skywalking/collector/worker/segment/entity/Segment.java
+62
-55
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/Span.java
.../eye/skywalking/collector/worker/segment/entity/Span.java
+76
-67
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/TraceSegmentRef.java
...king/collector/worker/segment/entity/TraceSegmentRef.java
+23
-20
未找到文件。
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java
浏览文件 @
0a4ac940
...
...
@@ -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
());
}
...
...
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/LogData.java
浏览文件 @
0a4ac940
...
...
@@ -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
();
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
();
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
);
break
;
default
:
reader
.
skipValue
();
}
first
=
false
;
}
...
...
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/Segment.java
浏览文件 @
0a4ac940
...
...
@@ -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
();
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
();
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
();
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
();
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
);
}
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
);
}
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
);
reader
.
endArray
();
break
;
default
:
reader
.
skipValue
();
}
first
=
false
;
}
...
...
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/Span.java
浏览文件 @
0a4ac940
...
...
@@ -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
();
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
();
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
();
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
())
{
LogData
logData
=
new
LogData
();
logData
.
deserialize
(
reader
);
logs
.
add
(
logData
);
}
reader
.
endArray
();
JsonBuilder
.
INSTANCE
.
append
(
stringBuilder
,
"lo"
,
logs
,
first
);
}
else
{
reader
.
skipValue
();
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
);
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
);
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
);
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
);
break
;
default
:
reader
.
skipValue
();
}
first
=
false
;
}
...
...
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/entity/TraceSegmentRef.java
浏览文件 @
0a4ac940
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
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录