Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
d393e92e
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 搜索 >>
提交
d393e92e
编写于
6月 07, 2016
作者:
A
ascrutae
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/wu-sheng/sky-walking
上级
060afcb5
88fad3de
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
104 addition
and
107 deletion
+104
-107
samples/skywalking-auth/src/main/resources/sky-walking.auth
samples/skywalking-auth/src/main/resources/sky-walking.auth
+2
-2
samples/skywalking-example/account-application/account-impl/src/main/resources/sky-walking.auth
...lication/account-impl/src/main/resources/sky-walking.auth
+1
-1
samples/skywalking-example/mail-application/src/main/resources/sky-walking.auth
...mple/mail-application/src/main/resources/sky-walking.auth
+1
-1
samples/skywalking-example/order-application/order-impl/src/main/resources/sky-walking.auth
...pplication/order-impl/src/main/resources/sky-walking.auth
+1
-1
samples/skywalking-example/resources-application/resource-impl/src/main/resources/sky-walking.auth
...ication/resource-impl/src/main/resources/sky-walking.auth
+1
-1
samples/skywalking-example/web-application/src/main/resources/sky-walking.auth
...ample/web-application/src/main/resources/sky-walking.auth
+1
-1
skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java
.../cloud/skywalking/buriedpoint/LocalBuriedPointSender.java
+1
-4
skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java
...cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java
+52
-49
skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadFactoryBuriedPointSender.java
...kywalking/buriedpoint/ThreadFactoryBuriedPointSender.java
+30
-30
skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java
...pi/src/main/java/com/ai/cloud/skywalking/conf/Config.java
+0
-3
skywalking-api/src/test/resources/sky-walking.auth
skywalking-api/src/test/resources/sky-walking.auth
+2
-2
skywalking-sdk-plugin/dubbo-plugin/src/test/resources/sky-walking.auth
...k-plugin/dubbo-plugin/src/test/resources/sky-walking.auth
+2
-2
skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth
...ubbox-rest-attachment/src/test/resources/sky-walking.auth
+2
-2
skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/resources/sky-walking.auth
...httpClient-4.x-plugin/src/test/resources/sky-walking.auth
+2
-2
skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth
...ugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth
+2
-2
skywalking-sdk-plugin/mysql-plugin/src/test/resources/sky-walking.auth
...k-plugin/mysql-plugin/src/test/resources/sky-walking.auth
+2
-2
skywalking-sdk-plugin/spring-plugin/src/test/resources/sky-walking.auth
...-plugin/spring-plugin/src/test/resources/sky-walking.auth
+2
-2
未找到文件。
samples/skywalking-auth/src/main/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -26,8 +26,8 @@ sender.max_copy_num=2
sender.max_send_length=20000
#当没有Sender时,尝试获取sender的等待周期
sender.retry_get_sender_wait_interval=2000
#是否开启发送消息
sender.is_off=false
#最大消费线程数
...
...
samples/skywalking-example/account-application/account-impl/src/main/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -4,7 +4,7 @@ buriedpoint.businesskey_max_length=300
sender.retry_get_sender_wait_interval=2000
buffer.pool_size=5
senderchecker.check_polling_time=200
sender.is_off=false
sender.max_send_length=20000
consumer.max_consumer=2
consumer.max_wait_time=5
...
...
samples/skywalking-example/mail-application/src/main/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -4,7 +4,7 @@ buriedpoint.businesskey_max_length=300
sender.retry_get_sender_wait_interval=2000
buffer.pool_size=5
senderchecker.check_polling_time=200
sender.is_off=false
sender.max_send_length=20000
consumer.max_consumer=2
consumer.max_wait_time=5
...
...
samples/skywalking-example/order-application/order-impl/src/main/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -4,7 +4,7 @@ buriedpoint.businesskey_max_length=300
sender.retry_get_sender_wait_interval=2000
buffer.pool_size=5
senderchecker.check_polling_time=200
sender.is_off=false
sender.max_send_length=20000
consumer.max_consumer=2
consumer.max_wait_time=5
...
...
samples/skywalking-example/resources-application/resource-impl/src/main/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -4,7 +4,7 @@ buriedpoint.businesskey_max_length=300
sender.retry_get_sender_wait_interval=2000
buffer.pool_size=5
senderchecker.check_polling_time=200
sender.is_off=false
sender.max_send_length=20000
consumer.max_consumer=2
consumer.max_wait_time=5
...
...
samples/skywalking-example/web-application/src/main/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -4,7 +4,7 @@ buriedpoint.businesskey_max_length=300
sender.retry_get_sender_wait_interval=2000
buffer.pool_size=5
senderchecker.check_polling_time=200
sender.is_off=false
sender.max_send_length=20000
consumer.max_consumer=2
consumer.max_wait_time=5
...
...
skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java
浏览文件 @
d393e92e
...
...
@@ -59,10 +59,7 @@ public class LocalBuriedPointSender extends ApplicationExceptionHandler
+
"\tbusinessKey:"
+
spanData
.
getBusinessKey
());
}
// 存放到本地发送进程中
if
(!
Config
.
Sender
.
IS_OFF
)
{
ContextBuffer
.
save
(
spanData
);
}
ContextBuffer
.
save
(
spanData
);
}
catch
(
Throwable
t
)
{
logger
.
error
(
t
.
getMessage
(),
t
);
}
...
...
skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java
浏览文件 @
d393e92e
...
...
@@ -22,59 +22,62 @@ import com.ai.cloud.skywalking.util.TraceIdGenerator;
*
*/
@Deprecated
public
class
ThreadBuriedPointSender
extends
ApplicationExceptionHandler
implements
IBuriedPointSender
{
private
static
Logger
logger
=
LogManager
.
getLogger
(
ThreadBuriedPointSender
.
class
);
public
class
ThreadBuriedPointSender
extends
ApplicationExceptionHandler
implements
IBuriedPointSender
{
private
static
Logger
logger
=
LogManager
.
getLogger
(
ThreadBuriedPointSender
.
class
);
private
Span
span
;
private
Span
span
;
public
ThreadBuriedPointSender
(
int
threadSeqId
)
{
if
(!
AuthDesc
.
isAuth
())
return
;
Span
spanData
;
// 从ThreadLocal中取出上下文
final
Span
parentSpanData
=
Context
.
getLastSpan
();
if
(
parentSpanData
==
null
)
{
spanData
=
new
Span
(
TraceIdGenerator
.
generate
(),
Config
.
SkyWalking
.
APPLICATION_CODE
,
Config
.
SkyWalking
.
USER_ID
);
}
else
{
// 如果不为空,则将当前的Context存放到上下文
spanData
=
new
Span
(
parentSpanData
.
getTraceId
(),
Config
.
SkyWalking
.
APPLICATION_CODE
,
Config
.
SkyWalking
.
USER_ID
);
spanData
.
setParentLevel
(
parentSpanData
.
getParentLevel
()
+
"."
+
parentSpanData
.
getLevelId
());
spanData
.
setLevelId
(
threadSeqId
);
}
this
.
span
=
spanData
;
}
public
ThreadBuriedPointSender
(
int
threadSeqId
)
{
if
(!
AuthDesc
.
isAuth
())
return
;
Span
spanData
;
// 从ThreadLocal中取出上下文
final
Span
parentSpanData
=
Context
.
getLastSpan
();
if
(
parentSpanData
==
null
)
{
spanData
=
new
Span
(
TraceIdGenerator
.
generate
(),
Config
.
SkyWalking
.
APPLICATION_CODE
,
Config
.
SkyWalking
.
USER_ID
);
}
else
{
// 如果不为空,则将当前的Context存放到上下文
spanData
=
new
Span
(
parentSpanData
.
getTraceId
(),
Config
.
SkyWalking
.
APPLICATION_CODE
,
Config
.
SkyWalking
.
USER_ID
);
spanData
.
setParentLevel
(
parentSpanData
.
getParentLevel
()
+
"."
+
parentSpanData
.
getLevelId
());
spanData
.
setLevelId
(
threadSeqId
);
}
this
.
span
=
spanData
;
}
public
ContextData
beforeSend
(
Identification
id
)
{
if
(!
AuthDesc
.
isAuth
())
return
new
EmptyContextData
();
public
ContextData
beforeSend
(
Identification
id
)
{
if
(!
AuthDesc
.
isAuth
())
return
new
EmptyContextData
();
if
(
this
.
span
==
null
)
{
return
null
;
}
span
.
setStartDate
(
System
.
currentTimeMillis
());
span
.
setViewPointId
(
id
.
getViewPoint
());
span
.
setProcessNo
(
BuriedPointMachineUtil
.
getProcessNo
());
Context
.
append
(
span
);
return
new
ContextData
(
span
);
}
if
(
this
.
span
==
null
)
{
return
null
;
}
span
.
setStartDate
(
System
.
currentTimeMillis
());
span
.
setViewPointId
(
id
.
getViewPoint
());
span
.
setProcessNo
(
BuriedPointMachineUtil
.
getProcessNo
());
Context
.
append
(
span
);
return
new
ContextData
(
span
);
}
public
void
afterSend
()
{
Span
span
=
Context
.
removeLastSpan
();
if
(
span
==
null
)
{
return
;
}
// 填上必要信息
span
.
setCost
(
System
.
currentTimeMillis
()
-
span
.
getStartDate
());
if
(
Config
.
BuriedPoint
.
PRINTF
)
{
logger
.
debug
(
"viewpointId:"
+
span
.
getViewPointId
()
+
"\tParentLevelId:"
+
span
.
getParentLevel
()
+
"\tLevelId:"
+
span
.
getLevelId
());
}
// 存放到本地发送进程中
if
(!
Config
.
Sender
.
IS_OFF
)
{
ContextBuffer
.
save
(
span
);
}
}
public
void
afterSend
()
{
Span
span
=
Context
.
removeLastSpan
();
if
(
span
==
null
)
{
return
;
}
// 填上必要信息
span
.
setCost
(
System
.
currentTimeMillis
()
-
span
.
getStartDate
());
if
(
Config
.
BuriedPoint
.
PRINTF
)
{
logger
.
debug
(
"viewpointId:"
+
span
.
getViewPointId
()
+
"\tParentLevelId:"
+
span
.
getParentLevel
()
+
"\tLevelId:"
+
span
.
getLevelId
());
}
ContextBuffer
.
save
(
span
);
}
}
skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadFactoryBuriedPointSender.java
浏览文件 @
d393e92e
...
...
@@ -21,38 +21,38 @@ import com.ai.cloud.skywalking.util.ContextGenerator;
*
*/
@Deprecated
public
class
ThreadFactoryBuriedPointSender
extends
ApplicationExceptionHandler
implements
IBuriedPointSender
{
private
static
Logger
logger
=
LogManager
.
getLogger
(
ThreadBuriedPointSender
.
class
);
public
class
ThreadFactoryBuriedPointSender
extends
ApplicationExceptionHandler
implements
IBuriedPointSender
{
private
static
Logger
logger
=
LogManager
.
getLogger
(
ThreadBuriedPointSender
.
class
);
public
ContextData
beforeSend
(
Identification
id
)
{
if
(!
AuthDesc
.
isAuth
())
return
new
EmptyContextData
();
public
ContextData
beforeSend
(
Identification
id
)
{
if
(!
AuthDesc
.
isAuth
())
return
new
EmptyContextData
();
Span
spanData
=
ContextGenerator
.
generateSpanFromThreadLocal
(
id
);
// 将新创建的Context存放到ThreadLocal栈中。
Context
.
append
(
spanData
);
// 并将当前的Context返回回去
return
new
ContextData
(
spanData
);
}
Span
spanData
=
ContextGenerator
.
generateSpanFromThreadLocal
(
id
);
// 将新创建的Context存放到ThreadLocal栈中。
Context
.
append
(
spanData
);
// 并将当前的Context返回回去
return
new
ContextData
(
spanData
);
}
public
void
afterSend
()
{
if
(!
AuthDesc
.
isAuth
())
return
;
public
void
afterSend
()
{
if
(!
AuthDesc
.
isAuth
())
return
;
// 获取上下文的栈顶中的元素
Span
spanData
=
Context
.
removeLastSpan
();
if
(
spanData
==
null
)
{
return
;
}
// 填上必要信息
spanData
.
setCost
(
System
.
currentTimeMillis
()
-
spanData
.
getStartDate
());
if
(
Config
.
BuriedPoint
.
PRINTF
)
{
logger
.
debug
(
"viewpointId:"
+
spanData
.
getViewPointId
()
+
"\tParentLevelId:"
+
spanData
.
getParentLevel
()
+
"\tLevelId:"
+
spanData
.
getLevelId
());
}
// 存放到本地发送进程中
if
(!
Config
.
Sender
.
IS_OFF
)
{
ContextBuffer
.
save
(
spanData
);
}
}
// 获取上下文的栈顶中的元素
Span
spanData
=
Context
.
removeLastSpan
();
if
(
spanData
==
null
)
{
return
;
}
// 填上必要信息
spanData
.
setCost
(
System
.
currentTimeMillis
()
-
spanData
.
getStartDate
());
if
(
Config
.
BuriedPoint
.
PRINTF
)
{
logger
.
debug
(
"viewpointId:"
+
spanData
.
getViewPointId
()
+
"\tParentLevelId:"
+
spanData
.
getParentLevel
()
+
"\tLevelId:"
+
spanData
.
getLevelId
());
}
ContextBuffer
.
save
(
spanData
);
}
}
skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java
浏览文件 @
d393e92e
...
...
@@ -52,9 +52,6 @@ public class Config {
// 发送服务端配置
public
static
String
SERVERS_ADDR
=
"127.0.0.1:34000"
;
// 是否开启发送
public
static
boolean
IS_OFF
=
false
;
// 最大发送副本数量
public
static
int
MAX_COPY_NUM
=
2
;
...
...
skywalking-api/src/test/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -26,8 +26,8 @@ sender.max_copy_num=2
sender.max_send_length=20000
#当没有Sender时,尝试获取sender的等待周期
sender.retry_get_sender_wait_interval=2000
#是否开启发送消息
sender.is_off=false
#最大消费线程数
...
...
skywalking-sdk-plugin/dubbo-plugin/src/test/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -26,8 +26,8 @@ sender.max_copy_num=2
sender.max_send_length=20000
#当没有Sender时,尝试获取sender的等待周期
sender.retry_get_sender_wait_interval=2000
#是否开启发送消息
sender.is_off=false
#最大消费线程数
...
...
skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -26,8 +26,8 @@ sender.max_copy_num=2
sender.max_send_length=20000
#当没有Sender时,尝试获取sender的等待周期
sender.retry_get_sender_wait_interval=2000
#是否开启发送消息
sender.is_off=false
#最大消费线程数
...
...
skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -26,8 +26,8 @@ sender.max_copy_num=2
sender.max_send_length=20000
#当没有Sender时,尝试获取sender的等待周期
sender.retry_get_sender_wait_interval=2000
#是否开启发送消息
sender.is_off=false
#最大消费线程数
...
...
skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -26,8 +26,8 @@ sender.max_copy_num=2
sender.max_send_length=20000
#当没有Sender时,尝试获取sender的等待周期
sender.retry_get_sender_wait_interval=2000
#是否开启发送消息
sender.is_off=false
#最大消费线程数
...
...
skywalking-sdk-plugin/mysql-plugin/src/test/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -26,8 +26,8 @@ sender.max_copy_num=2
sender.max_send_length=20000
#当没有Sender时,尝试获取sender的等待周期
sender.retry_get_sender_wait_interval=2000
#是否开启发送消息
sender.is_off=false
#最大消费线程数
...
...
skywalking-sdk-plugin/spring-plugin/src/test/resources/sky-walking.auth
浏览文件 @
d393e92e
...
...
@@ -26,8 +26,8 @@ sender.max_copy_num=2
sender.max_send_length=20000
#当没有Sender时,尝试获取sender的等待周期
sender.retry_get_sender_wait_interval=2000
#是否开启发送消息
sender.is_off=false
#最大消费线程数
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录