Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
润土的好友猹
SkyWalking
提交
646482de
S
SkyWalking
项目概览
润土的好友猹
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
9
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
646482de
编写于
6月 07, 2017
作者:
P
pengys5
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into feature/208-collectorside
上级
6284fcbf
d39cff6d
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
47 addition
and
64 deletion
+47
-64
apm-collector/apm-collector-worker/bin/collector-service.bat
apm-collector/apm-collector-worker/bin/collector-service.bat
+1
-1
apm-collector/apm-collector-worker/bin/collector-service.sh
apm-collector/apm-collector-worker/bin/collector-service.sh
+11
-7
apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/SegmentsMessage.java
...c/main/java/org/skywalking/apm/trace/SegmentsMessage.java
+17
-42
apm-commons/apm-trace/src/test/java/org/skywalking/apm/trace/TraceSegmentTestCase.java
...t/java/org/skywalking/apm/trace/TraceSegmentTestCase.java
+10
-7
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorClient.java
...org/skywalking/apm/agent/core/client/CollectorClient.java
+5
-4
docker-compose.yml
docker-compose.yml
+3
-3
未找到文件。
apm-collector/apm-collector-worker/bin/collector-service.bat
浏览文件 @
646482de
...
...
@@ -14,7 +14,7 @@ if ""%JAVA_HOME%"" == """" (
set
_EXECJAVA
=
"
%JAVA_HOME%
"
/bin/java
)
start
/MIN
"
%COLLECOTR_PROCESS_TITLE%
"
%_EXECJAVA%
"
%COLLECTOR_RUNTIME_OPTIONS%
"
-cp
"
%CLASSPATH%
"
CollectorBootStartUp
&
start
/MIN
"
%COLLECOTR_PROCESS_TITLE%
"
%_EXECJAVA%
"
%COLLECTOR_RUNTIME_OPTIONS%
"
-cp
"
%CLASSPATH%
"
org
.skywalking.apm.collector.worker.
CollectorBootStartUp
&
echo
Collector
started
successfully
!
endlocal
apm-collector/apm-collector-worker/bin/collector-service.sh
浏览文件 @
646482de
...
...
@@ -21,13 +21,17 @@ do
done
echo
"Starting collector...."
eval exec
"
\"
$_RUNJAVA
\"
${
JAVA_OPTS
}
-classpath
$CLASSPATH
CollectorBootStartUp
\
eval exec
"
\"
$_RUNJAVA
\"
${
JAVA_OPTS
}
-classpath
$CLASSPATH
org.skywalking.apm.collector.worker.
CollectorBootStartUp
\
2>
${
COLLECTOR_LOGS_DIR
}
/collector.log 1> /dev/null &"
if
[
$?
-eq
0
]
;
then
sleep
1
echo
"Collector started successfully!"
else
echo
"Collector started failure!"
retval
=
$?
pid
=
$!
FAIL_MSG
=
"Collector started failure!"
SUCCESS_MSG
=
"Collector started successfully!"
[
${
retval
}
-eq
0
]
||
(
echo
${
FAIL_MSG
}
;
exit
${
retval
}
)
sleep
1
if
!
ps
-p
${
pid
}
>
/dev/null
;
then
echo
${
FAIL_MSG
}
exit
1
fi
echo
${
SUCCESS_MSG
}
apm-commons/apm-trace/src/main/java/org/skywalking/apm/trace/SegmentsMessage.java
浏览文件 @
646482de
package
org.skywalking.apm.trace
;
import
com.google.gson.Gson
;
import
com.google.gson.GsonBuilder
;
import
com.google.gson.TypeAdapter
;
import
com.google.gson.annotations.JsonAdapter
;
import
com.google.gson.stream.JsonReader
;
import
com.google.gson.stream.JsonWriter
;
import
java.io.IOException
;
import
java.util.Collections
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
@@ -18,7 +11,6 @@ import java.util.List;
*
* @author wusheng
*/
@JsonAdapter
(
SegmentsMessage
.
Serializer
.
class
)
public
class
SegmentsMessage
{
private
List
<
TraceSegment
>
segments
;
...
...
@@ -34,40 +26,23 @@ public class SegmentsMessage {
return
Collections
.
unmodifiableList
(
segments
);
}
public
static
class
Serializer
extends
TypeAdapter
<
SegmentsMessage
>
{
@Override
public
void
write
(
JsonWriter
out
,
SegmentsMessage
value
)
throws
IOException
{
Gson
gson
=
new
GsonBuilder
()
.
excludeFieldsWithoutExposeAnnotation
()
.
create
();
out
.
beginArray
();
try
{
for
(
TraceSegment
segment
:
value
.
segments
)
{
out
.
jsonValue
(
gson
.
toJson
(
segment
));
}
}
finally
{
out
.
endArray
();
}
}
@Override
public
SegmentsMessage
read
(
JsonReader
in
)
throws
IOException
{
SegmentsMessage
message
=
new
SegmentsMessage
();
in
.
beginArray
();
Gson
gson
=
new
GsonBuilder
()
.
excludeFieldsWithoutExposeAnnotation
()
.
create
();
try
{
while
(
in
.
hasNext
())
{
TraceSegment
traceSegment
=
gson
.
fromJson
(
in
,
TraceSegment
.
class
);
message
.
append
(
traceSegment
);
}
}
finally
{
in
.
endArray
();
}
return
message
;
/**
* This serialization mechanism started from 3.1, it is similar to network package.
* The data protocol is
*
* segment1.json.length + ' '(one blank space) + segment1.json
* + segment2.json.length + ' '(one blank space) + segment2.json
* + etc.
*
* @param gson the serializer for {@link TraceSegment}
* @return the string represents the <code>SegmentMessage</code>
*/
public
String
serialize
(
Gson
gson
)
{
StringBuilder
buffer
=
new
StringBuilder
();
for
(
TraceSegment
segment
:
segments
)
{
String
segmentJson
=
gson
.
toJson
(
segment
);
buffer
.
append
(
segmentJson
.
length
()).
append
(
' '
).
append
(
segmentJson
);
}
return
buffer
.
toString
();
}
}
apm-commons/apm-trace/src/test/java/org/skywalking/apm/trace/TraceSegmentTestCase.java
浏览文件 @
646482de
...
...
@@ -108,15 +108,18 @@ public class TraceSegmentTestCase {
SegmentsMessage
message
=
new
SegmentsMessage
();
message
.
append
(
segment
);
String
json
=
gson
.
toJson
(
message
);
message
=
gson
.
fromJson
(
json
,
SegmentsMessage
.
class
);
String
jsonString
=
message
.
serialize
(
gson
);
int
length
=
Integer
.
parseInt
(
jsonString
.
substring
(
0
,
4
));
TraceSegment
newSegment
=
message
.
getSegments
().
get
(
0
);
String
segmentJson
=
jsonString
.
substring
(
5
);
Assert
.
assertEquals
(
segment
.
getSpans
().
size
(),
newSegment
.
getSpans
().
size
());
Assert
.
assertEquals
(
segment
.
getRefs
().
get
(
0
).
getTraceSegmentId
(),
newSegment
.
getRefs
().
get
(
0
).
getTraceSegmentId
());
Assert
.
assertEquals
(
Tags
.
SPAN_LAYER
.
get
(
segment
.
getSpans
().
get
(
1
)),
Tags
.
SPAN_LAYER
.
get
(
newSegment
.
getSpans
().
get
(
1
)));
Assert
.
assertEquals
(
segment
.
getSpans
().
get
(
1
).
getLogs
().
get
(
0
).
getTime
(),
newSegment
.
getSpans
().
get
(
1
).
getLogs
().
get
(
0
).
getTime
());
Assert
.
assertEquals
(
length
,
segmentJson
.
length
());
TraceSegment
recoverySegment
=
gson
.
fromJson
(
segmentJson
,
TraceSegment
.
class
);
Assert
.
assertEquals
(
segment
.
getSpans
().
size
(),
recoverySegment
.
getSpans
().
size
());
Assert
.
assertEquals
(
segment
.
getRefs
().
get
(
0
).
getTraceSegmentId
(),
recoverySegment
.
getRefs
().
get
(
0
).
getTraceSegmentId
());
Assert
.
assertEquals
(
Tags
.
SPAN_LAYER
.
get
(
segment
.
getSpans
().
get
(
1
)),
Tags
.
SPAN_LAYER
.
get
(
recoverySegment
.
getSpans
().
get
(
1
)));
Assert
.
assertEquals
(
segment
.
getSpans
().
get
(
1
).
getLogs
().
get
(
0
).
getTime
(),
recoverySegment
.
getSpans
().
get
(
1
).
getLogs
().
get
(
0
).
getTime
());
}
}
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorClient.java
浏览文件 @
646482de
...
...
@@ -32,6 +32,7 @@ public class CollectorClient implements Runnable {
private
static
long
SLEEP_TIME_MILLIS
=
500
;
private
String
[]
serverList
;
private
volatile
int
selectedServer
=
-
1
;
private
Gson
serializer
;
public
CollectorClient
()
{
serverList
=
Config
.
Collector
.
SERVERS
.
split
(
","
);
...
...
@@ -39,6 +40,9 @@ public class CollectorClient implements Runnable {
if
(
serverList
.
length
>
0
)
{
selectedServer
=
r
.
nextInt
(
serverList
.
length
);
}
serializer
=
new
GsonBuilder
()
.
excludeFieldsWithoutExposeAnnotation
()
.
create
();
}
@Override
...
...
@@ -84,10 +88,7 @@ public class CollectorClient implements Runnable {
if
(
message
==
null
)
{
return
;
}
Gson
gson
=
new
GsonBuilder
()
.
excludeFieldsWithoutExposeAnnotation
()
.
create
();
String
messageJson
=
gson
.
toJson
(
message
);
String
messageJson
=
message
.
serialize
(
serializer
);
CloseableHttpClient
httpClient
=
HttpClients
.
custom
().
build
();
try
{
HttpPost
httpPost
=
ready2Send
(
messageJson
);
...
...
docker-compose.yml
浏览文件 @
646482de
version
:
'
2.1'
services
:
skywalking-webui
:
image
:
sky-walking-ui:3.
0.
1-2017
image
:
sky-walking-ui:3.1-2017
expose
:
-
"
8080"
ports
:
...
...
@@ -9,10 +9,10 @@ services:
links
:
-
skywalking-collector
environment
:
-
COLLECTOR_SERVERS=skywalking-collector:
7001
-
COLLECTOR_SERVERS=skywalking-collector:
12800
skywalking-collector
:
image
:
skywalking-collector:3.
0.
1-2017
image
:
skywalking-collector:3.1-2017
expose
:
-
"
12800"
-
"
1000"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录