Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
月轩居士
SkyWalking
提交
662c8e61
S
SkyWalking
项目概览
月轩居士
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
4
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,发现更多精彩内容 >>
提交
662c8e61
编写于
4月 26, 2017
作者:
P
pengys5
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add log4j.xml into test package
上级
d4eed42a
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
57 addition
and
14 deletion
+57
-14
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java
...e/skywalking/collector/worker/httpserver/AbstractGet.java
+1
-0
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithTimeSlice.java
...er/segment/persistence/SegmentTopSearchWithTimeSlice.java
+16
-11
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithId.java
...g/collector/worker/span/persistence/SpanSearchWithId.java
+1
-0
skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml
...skywalking-collector-worker/src/main/resources/log4j2.xml
+8
-3
skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml
...skywalking-collector-worker/src/test/resources/log4j2.xml
+31
-0
未找到文件。
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java
浏览文件 @
662c8e61
...
...
@@ -26,6 +26,7 @@ public abstract class AbstractGet extends AbstractLocalSyncWorker {
}
catch
(
Exception
e
)
{
((
JsonObject
)
response
).
addProperty
(
"isSuccess"
,
false
);
((
JsonObject
)
response
).
addProperty
(
"reason"
,
e
.
getMessage
());
logger
().
error
(
e
);
}
}
...
...
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithTimeSlice.java
浏览文件 @
662c8e61
package
com.a.eye.skywalking.collector.worker.segment.persistence
;
import
com.a.eye.skywalking.collector.actor.*
;
import
com.a.eye.skywalking.collector.actor.AbstractLocalSyncWorker
;
import
com.a.eye.skywalking.collector.actor.AbstractLocalSyncWorkerProvider
;
import
com.a.eye.skywalking.collector.actor.ClusterWorkerContext
;
import
com.a.eye.skywalking.collector.actor.LocalWorkerContext
;
import
com.a.eye.skywalking.collector.actor.ProviderNotFoundException
;
import
com.a.eye.skywalking.collector.actor.Role
;
import
com.a.eye.skywalking.collector.actor.selector.RollingSelector
;
import
com.a.eye.skywalking.collector.actor.selector.WorkerSelector
;
import
com.a.eye.skywalking.collector.worker.segment.SegmentCostIndex
;
...
...
@@ -13,6 +18,7 @@ import com.a.eye.skywalking.collector.worker.storage.EsClient;
import
com.a.eye.skywalking.collector.worker.tools.CollectionTools
;
import
com.google.gson.JsonArray
;
import
com.google.gson.JsonObject
;
import
java.util.List
;
import
org.elasticsearch.action.search.SearchRequestBuilder
;
import
org.elasticsearch.action.search.SearchResponse
;
import
org.elasticsearch.action.search.SearchType
;
...
...
@@ -22,15 +28,13 @@ import org.elasticsearch.index.query.RangeQueryBuilder;
import
org.elasticsearch.search.SearchHit
;
import
org.elasticsearch.search.sort.SortOrder
;
import
java.util.List
;
/**
* @author pengys5
*/
public
class
SegmentTopSearchWithTimeSlice
extends
AbstractLocalSyncWorker
{
private
SegmentTopSearchWithTimeSlice
(
Role
role
,
ClusterWorkerContext
clusterContext
,
LocalWorkerContext
selfContext
)
{
LocalWorkerContext
selfContext
)
{
super
(
role
,
clusterContext
,
selfContext
);
}
...
...
@@ -42,7 +46,7 @@ public class SegmentTopSearchWithTimeSlice extends AbstractLocalSyncWorker {
@Override
protected
void
onWork
(
Object
request
,
Object
response
)
throws
Exception
{
if
(
request
instanceof
RequestEntity
)
{
RequestEntity
search
=
(
RequestEntity
)
request
;
RequestEntity
search
=
(
RequestEntity
)
request
;
SearchRequestBuilder
searchRequestBuilder
=
EsClient
.
INSTANCE
.
getClient
().
prepareSearch
(
SegmentCostIndex
.
INDEX
);
searchRequestBuilder
.
setTypes
(
SegmentCostIndex
.
TYPE_RECORD
);
...
...
@@ -77,17 +81,18 @@ public class SegmentTopSearchWithTimeSlice extends AbstractLocalSyncWorker {
for
(
SearchHit
searchHit
:
searchResponse
.
getHits
().
getHits
())
{
JsonObject
topSegmentJson
=
new
JsonObject
();
topSegmentJson
.
addProperty
(
"num"
,
num
);
String
segId
=
(
String
)
searchHit
.
getSource
().
get
(
SegmentCostIndex
.
SEG_ID
);
String
segId
=
(
String
)
searchHit
.
getSource
().
get
(
SegmentCostIndex
.
SEG_ID
);
topSegmentJson
.
addProperty
(
SegmentCostIndex
.
SEG_ID
,
segId
);
topSegmentJson
.
addProperty
(
SegmentCostIndex
.
START_TIME
,
(
Number
)
searchHit
.
getSource
().
get
(
SegmentCostIndex
.
START_TIME
));
topSegmentJson
.
addProperty
(
SegmentCostIndex
.
START_TIME
,
(
Number
)
searchHit
.
getSource
().
get
(
SegmentCostIndex
.
START_TIME
));
if
(
searchHit
.
getSource
().
containsKey
(
SegmentCostIndex
.
END_TIME
))
{
topSegmentJson
.
addProperty
(
SegmentCostIndex
.
END_TIME
,
(
Number
)
searchHit
.
getSource
().
get
(
SegmentCostIndex
.
END_TIME
));
topSegmentJson
.
addProperty
(
SegmentCostIndex
.
END_TIME
,
(
Number
)
searchHit
.
getSource
().
get
(
SegmentCostIndex
.
END_TIME
));
}
topSegmentJson
.
addProperty
(
SegmentCostIndex
.
OPERATION_NAME
,
(
String
)
searchHit
.
getSource
().
get
(
SegmentCostIndex
.
OPERATION_NAME
));
topSegmentJson
.
addProperty
(
SegmentCostIndex
.
COST
,
(
Number
)
searchHit
.
getSource
().
get
(
SegmentCostIndex
.
COST
));
topSegmentJson
.
addProperty
(
SegmentCostIndex
.
OPERATION_NAME
,
(
String
)
searchHit
.
getSource
().
get
(
SegmentCostIndex
.
OPERATION_NAME
));
topSegmentJson
.
addProperty
(
SegmentCostIndex
.
COST
,
(
Number
)
searchHit
.
getSource
().
get
(
SegmentCostIndex
.
COST
));
String
segmentSource
=
EsClient
.
INSTANCE
.
getClient
().
prepareGet
(
SegmentIndex
.
INDEX
,
SegmentIndex
.
TYPE_RECORD
,
segId
).
get
().
getSourceAsString
();
logger
().
debug
(
"segmentSource:"
+
segmentSource
);
Segment
segment
=
SegmentDeserialize
.
INSTANCE
.
deserializeSingle
(
segmentSource
);
List
<
GlobalTraceId
>
distributedTraceIdList
=
segment
.
getRelatedGlobalTraces
();
...
...
@@ -114,7 +119,7 @@ public class SegmentTopSearchWithTimeSlice extends AbstractLocalSyncWorker {
topSegArray
.
add
(
topSegmentJson
);
}
JsonObject
resJsonObj
=
(
JsonObject
)
response
;
JsonObject
resJsonObj
=
(
JsonObject
)
response
;
resJsonObj
.
add
(
"result"
,
topSegPaging
);
}
}
...
...
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithId.java
浏览文件 @
662c8e61
...
...
@@ -39,6 +39,7 @@ public class SpanSearchWithId extends AbstractLocalSyncWorker {
for
(
Span
span
:
spanList
)
{
if
(
String
.
valueOf
(
span
.
getSpanId
()).
equals
(
search
.
spanId
))
{
span
.
setJsonStr
(
""
);
String
spanJsonStr
=
gson
.
toJson
(
span
);
dataJson
=
gson
.
fromJson
(
spanJsonStr
,
JsonObject
.
class
);
}
...
...
skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml
浏览文件 @
662c8e61
<?xml version="1.0" encoding="UTF-8"?>
<Configuration
status=
"DEBUG"
>
<Configuration>
<Properties>
<Property
name=
"log-path"
>
../logs
</Property>
</Properties>
...
...
@@ -15,12 +15,17 @@
<DefaultRolloverStrategy
max=
"30"
/>
</RollingFile>
</Appenders>
<Appenders>
<Console
name=
"Console"
target=
"SYSTEM_OUT"
>
<PatternLayout
pattern=
"%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
/>
</Console>
</Appenders>
<Loggers>
<logger
name=
"com.a.eye.skywalking.collector"
level=
"debug"
>
<AppenderRef
ref=
"
RollingFi
le"
/>
<AppenderRef
ref=
"
Conso
le"
/>
</logger>
<Root
level=
"INFO"
>
<AppenderRef
ref=
"
RollingFi
le"
/>
<AppenderRef
ref=
"
Conso
le"
/>
</Root>
</Loggers>
</Configuration>
skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml
0 → 100644
浏览文件 @
662c8e61
<?xml version="1.0" encoding="UTF-8"?>
<Configuration>
<Properties>
<Property
name=
"log-path"
>
../logs
</Property>
</Properties>
<Appenders>
<RollingFile
name=
"RollingFile"
fileName=
"${log-path}/skywalking-server-log4j2.log"
filePattern=
"${log-path}/skywalking-server-log4j2-%d{yyyy-MM-dd}-%i.log"
>
<PatternLayout>
<pattern>
%d - %c -%-4r [%t] %-5p %x - %m%n
</pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy
size=
"102400KB"
/>
</Policies>
<DefaultRolloverStrategy
max=
"30"
/>
</RollingFile>
</Appenders>
<Appenders>
<Console
name=
"Console"
target=
"SYSTEM_OUT"
>
<PatternLayout
pattern=
"%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
/>
</Console>
</Appenders>
<Loggers>
<logger
name=
"com.a.eye.skywalking.collector"
level=
"ERROR"
>
<AppenderRef
ref=
"RollingFile"
/>
</logger>
<Root
level=
"ERROR"
>
<AppenderRef
ref=
"RollingFile"
/>
</Root>
</Loggers>
</Configuration>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录