Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
阿信在这里
SkyWalking
提交
aed11d4a
S
SkyWalking
项目概览
阿信在这里
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
1
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,发现更多精彩内容 >>
提交
aed11d4a
编写于
6月 16, 2017
作者:
wu-sheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Finish codes about sampling, ignore. And related test cases.
上级
112547b5
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
125 addition
and
20 deletion
+125
-20
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContext.java
.../org/skywalking/apm/agent/core/context/TracerContext.java
+18
-2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/TraceSegment.java
...skywalking/apm/agent/core/context/trace/TraceSegment.java
+15
-1
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/queue/TraceSegmentProcessQueue.java
...alking/apm/agent/core/queue/TraceSegmentProcessQueue.java
+1
-1
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/sampling/IllegalSamplingRateException.java
...apm/agent/core/sampling/IllegalSamplingRateException.java
+0
-12
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/sampling/SamplingService.java
...g/skywalking/apm/agent/core/sampling/SamplingService.java
+13
-3
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/TracerContextTestCase.java
...walking/apm/agent/core/context/TracerContextTestCase.java
+0
-1
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/sampling/SamplingTracerContextTestCase.java
...pm/agent/core/sampling/SamplingTracerContextTestCase.java
+78
-0
未找到文件。
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracerContext.java
浏览文件 @
aed11d4a
...
@@ -18,6 +18,8 @@ import org.skywalking.apm.agent.core.sampling.SamplingService;
...
@@ -18,6 +18,8 @@ import org.skywalking.apm.agent.core.sampling.SamplingService;
* Created by wusheng on 2017/2/17.
* Created by wusheng on 2017/2/17.
*/
*/
public
final
class
TracerContext
implements
AbstractTracerContext
{
public
final
class
TracerContext
implements
AbstractTracerContext
{
private
SamplingService
samplingService
;
private
TraceSegment
segment
;
private
TraceSegment
segment
;
/**
/**
...
@@ -37,6 +39,9 @@ public final class TracerContext implements AbstractTracerContext {
...
@@ -37,6 +39,9 @@ public final class TracerContext implements AbstractTracerContext {
TracerContext
()
{
TracerContext
()
{
this
.
segment
=
new
TraceSegment
(
Config
.
Agent
.
APPLICATION_CODE
);
this
.
segment
=
new
TraceSegment
(
Config
.
Agent
.
APPLICATION_CODE
);
this
.
spanIdGenerator
=
0
;
this
.
spanIdGenerator
=
0
;
if
(
samplingService
==
null
)
{
samplingService
=
ServiceManager
.
INSTANCE
.
findService
(
SamplingService
.
class
);
}
}
}
/**
/**
...
@@ -83,7 +88,6 @@ public final class TracerContext implements AbstractTracerContext {
...
@@ -83,7 +88,6 @@ public final class TracerContext implements AbstractTracerContext {
* because the {@link #extract(ContextCarrier)} invoke before create the second span.
* because the {@link #extract(ContextCarrier)} invoke before create the second span.
*/
*/
if
(
spanIdGenerator
==
1
)
{
if
(
spanIdGenerator
==
1
)
{
SamplingService
samplingService
=
ServiceManager
.
INSTANCE
.
findService
(
SamplingService
.
class
);
if
(
segment
.
hasRef
())
{
if
(
segment
.
hasRef
())
{
samplingService
.
forceSampled
();
samplingService
.
forceSampled
();
}
else
{
}
else
{
...
@@ -172,7 +176,19 @@ public final class TracerContext implements AbstractTracerContext {
...
@@ -172,7 +176,19 @@ public final class TracerContext implements AbstractTracerContext {
* Finish this context, and notify all {@link TracerContextListener}s, managed by {@link ListenerManager}
* Finish this context, and notify all {@link TracerContextListener}s, managed by {@link ListenerManager}
*/
*/
private
void
finish
()
{
private
void
finish
()
{
ListenerManager
.
notifyFinish
(
segment
.
finish
());
TraceSegment
finishedSegment
=
segment
.
finish
();
/**
* Recheck the segment if the segment contains only one span.
* Because in the runtime, can't sure this segment is part of distributed trace.
*
* @see {@link #createSpan(String, long, boolean)}
*/
if
(!
segment
.
hasRef
()
&&
segment
.
isSingleSpanSegment
())
{
if
(!
samplingService
.
trySampling
())
{
finishedSegment
.
setIgnore
(
true
);
}
}
ListenerManager
.
notifyFinish
(
finishedSegment
);
}
}
/**
/**
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/TraceSegment.java
浏览文件 @
aed11d4a
...
@@ -5,9 +5,9 @@ import com.google.gson.annotations.SerializedName;
...
@@ -5,9 +5,9 @@ import com.google.gson.annotations.SerializedName;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.LinkedList
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.List
;
import
org.skywalking.apm.agent.core.context.ids.GlobalIdGenerator
;
import
org.skywalking.apm.agent.core.context.ids.DistributedTraceId
;
import
org.skywalking.apm.agent.core.context.ids.DistributedTraceId
;
import
org.skywalking.apm.agent.core.context.ids.DistributedTraceIds
;
import
org.skywalking.apm.agent.core.context.ids.DistributedTraceIds
;
import
org.skywalking.apm.agent.core.context.ids.GlobalIdGenerator
;
import
org.skywalking.apm.agent.core.context.ids.NewDistributedTraceId
;
import
org.skywalking.apm.agent.core.context.ids.NewDistributedTraceId
;
/**
/**
...
@@ -90,6 +90,8 @@ public class TraceSegment {
...
@@ -90,6 +90,8 @@ public class TraceSegment {
@SerializedName
(
value
=
"gt"
)
@SerializedName
(
value
=
"gt"
)
private
DistributedTraceIds
relatedGlobalTraces
;
private
DistributedTraceIds
relatedGlobalTraces
;
private
boolean
ignore
=
false
;
/**
/**
* Create a trace segment, by the given applicationCode.
* Create a trace segment, by the given applicationCode.
*/
*/
...
@@ -186,6 +188,10 @@ public class TraceSegment {
...
@@ -186,6 +188,10 @@ public class TraceSegment {
return
relatedGlobalTraces
.
getRelatedGlobalTraces
();
return
relatedGlobalTraces
.
getRelatedGlobalTraces
();
}
}
public
boolean
isSingleSpanSegment
()
{
return
this
.
spans
!=
null
&&
this
.
spans
.
size
()
==
1
;
}
public
List
<
Span
>
getSpans
()
{
public
List
<
Span
>
getSpans
()
{
return
Collections
.
unmodifiableList
(
spans
);
return
Collections
.
unmodifiableList
(
spans
);
}
}
...
@@ -194,6 +200,14 @@ public class TraceSegment {
...
@@ -194,6 +200,14 @@ public class TraceSegment {
return
applicationCode
;
return
applicationCode
;
}
}
public
boolean
isIgnore
()
{
return
ignore
;
}
public
void
setIgnore
(
boolean
ignore
)
{
this
.
ignore
=
ignore
;
}
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"TraceSegment{"
+
return
"TraceSegment{"
+
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/queue/TraceSegmentProcessQueue.java
浏览文件 @
aed11d4a
...
@@ -51,7 +51,7 @@ public class TraceSegmentProcessQueue extends StatusBootService implements Trace
...
@@ -51,7 +51,7 @@ public class TraceSegmentProcessQueue extends StatusBootService implements Trace
*/
*/
@Override
@Override
public
void
afterFinished
(
TraceSegment
traceSegment
)
{
public
void
afterFinished
(
TraceSegment
traceSegment
)
{
if
(
isStarted
())
{
if
(
isStarted
()
&&
!
traceSegment
.
isIgnore
()
)
{
long
sequence
=
this
.
buffer
.
next
();
// Grab the next sequence
long
sequence
=
this
.
buffer
.
next
();
// Grab the next sequence
try
{
try
{
TraceSegmentHolder
data
=
this
.
buffer
.
get
(
sequence
);
TraceSegmentHolder
data
=
this
.
buffer
.
get
(
sequence
);
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/sampling/IllegalSamplingRateException.java
已删除
100644 → 0
浏览文件 @
112547b5
package
org.skywalking.apm.agent.core.sampling
;
/**
* Use <code>IllegalSamplingRateException</code>, only if the rate can not be supported.
*
* @author wusheng
*/
public
class
IllegalSamplingRateException
extends
Exception
{
IllegalSamplingRateException
(
String
message
)
{
super
(
message
);
}
}
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/sampling/SamplingService.java
浏览文件 @
aed11d4a
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.agent.core.sampling;
...
@@ -2,6 +2,7 @@ package org.skywalking.apm.agent.core.sampling;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.ScheduledExecutorService
;
import
java.util.concurrent.ScheduledExecutorService
;
import
java.util.concurrent.ScheduledFuture
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
org.skywalking.apm.agent.core.boot.BootService
;
import
org.skywalking.apm.agent.core.boot.BootService
;
...
@@ -24,20 +25,28 @@ public class SamplingService implements BootService {
...
@@ -24,20 +25,28 @@ public class SamplingService implements BootService {
private
volatile
boolean
on
=
false
;
private
volatile
boolean
on
=
false
;
private
volatile
AtomicInteger
samplingFactorHolder
;
private
volatile
AtomicInteger
samplingFactorHolder
;
private
volatile
ScheduledFuture
<?>
scheduledFuture
;
@Override
@Override
public
void
bootUp
()
throws
Throwable
{
public
void
bootUp
()
throws
Throwable
{
if
(
scheduledFuture
!=
null
)
{
/**
* If {@link #bootUp()} invokes twice, mostly in test cases,
* cancel the old one.
*/
scheduledFuture
.
cancel
(
true
);
}
if
(
Config
.
Agent
.
SAMPLE_N_PER_10_SECS
>
0
)
{
if
(
Config
.
Agent
.
SAMPLE_N_PER_10_SECS
>
0
)
{
on
=
true
;
on
=
true
;
this
.
resetSamplingFactor
();
this
.
resetSamplingFactor
();
ScheduledExecutorService
service
=
Executors
ScheduledExecutorService
service
=
Executors
.
newSingleThreadScheduledExecutor
();
.
newSingleThreadScheduledExecutor
();
service
.
scheduleAtFixedRate
(
new
Runnable
()
{
s
cheduledFuture
=
s
ervice
.
scheduleAtFixedRate
(
new
Runnable
()
{
@Override
@Override
public
void
run
()
{
public
void
run
()
{
resetSamplingFactor
();
resetSamplingFactor
();
}
}
},
1
,
1
,
TimeUnit
.
SECONDS
);
},
0
,
10
,
TimeUnit
.
SECONDS
);
logger
.
debug
(
"Agent sampling mechanism started. Sample {} traces in 10 seconds."
,
Config
.
Agent
.
SAMPLE_N_PER_10_SECS
);
logger
.
debug
(
"Agent sampling mechanism started. Sample {} traces in 10 seconds."
,
Config
.
Agent
.
SAMPLE_N_PER_10_SECS
);
}
}
}
}
...
@@ -49,7 +58,8 @@ public class SamplingService implements BootService {
...
@@ -49,7 +58,8 @@ public class SamplingService implements BootService {
if
(
on
)
{
if
(
on
)
{
int
factor
=
samplingFactorHolder
.
get
();
int
factor
=
samplingFactorHolder
.
get
();
if
(
factor
<
Config
.
Agent
.
SAMPLE_N_PER_10_SECS
)
{
if
(
factor
<
Config
.
Agent
.
SAMPLE_N_PER_10_SECS
)
{
return
samplingFactorHolder
.
compareAndSet
(
factor
,
factor
+
1
);
boolean
success
=
samplingFactorHolder
.
compareAndSet
(
factor
,
factor
+
1
);
return
success
;
}
else
{
}
else
{
return
false
;
return
false
;
}
}
...
...
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/context/TracerContextTestCase.java
浏览文件 @
aed11d4a
...
@@ -8,7 +8,6 @@ import org.junit.Test;
...
@@ -8,7 +8,6 @@ import org.junit.Test;
import
org.skywalking.apm.agent.core.context.ids.DistributedTraceId
;
import
org.skywalking.apm.agent.core.context.ids.DistributedTraceId
;
import
org.skywalking.apm.agent.core.context.ids.PropagatedTraceId
;
import
org.skywalking.apm.agent.core.context.ids.PropagatedTraceId
;
import
org.skywalking.apm.agent.core.context.trace.AbstractSpan
;
import
org.skywalking.apm.agent.core.context.trace.AbstractSpan
;
import
org.skywalking.apm.agent.core.context.trace.Span
;
import
org.skywalking.apm.agent.core.context.trace.TraceSegment
;
import
org.skywalking.apm.agent.core.context.trace.TraceSegment
;
/**
/**
...
...
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/sampling/SamplingTracerContextTestCase.java
0 → 100644
浏览文件 @
aed11d4a
package
org.skywalking.apm.agent.core.sampling
;
import
org.junit.After
;
import
org.junit.Assert
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.skywalking.apm.agent.core.boot.ServiceManager
;
import
org.skywalking.apm.agent.core.conf.Config
;
import
org.skywalking.apm.agent.core.context.ContextManager
;
import
org.skywalking.apm.agent.core.context.TracerContext
;
import
org.skywalking.apm.agent.core.context.TracerContextListener
;
import
org.skywalking.apm.agent.core.context.tag.Tags
;
import
org.skywalking.apm.agent.core.context.trace.AbstractSpan
;
import
org.skywalking.apm.agent.core.context.trace.TraceSegment
;
/**
* @author wusheng
*/
public
class
SamplingTracerContextTestCase
{
private
int
finishedTracerCounter
=
0
;
private
TracerContextListener
listener
=
new
TracerContextListener
()
{
@Override
public
void
afterFinished
(
TraceSegment
traceSegment
)
{
if
(!
traceSegment
.
isIgnore
())
{
finishedTracerCounter
++;
}
}
};
@Before
public
void
setUp
()
throws
Exception
{
Config
.
Agent
.
SAMPLE_N_PER_10_SECS
=
5
;
ServiceManager
.
INSTANCE
.
boot
();
TracerContext
.
ListenerManager
.
add
(
listener
);
}
@Test
public
void
testSample5InALoop
()
throws
InterruptedException
{
for
(
int
i
=
0
;
i
<
11
;
i
++)
{
AbstractSpan
span
=
ContextManager
.
createSpan
(
"serviceA"
);
Tags
.
COMPONENT
.
set
(
span
,
"test"
);
ContextManager
.
stopSpan
();
}
/**
* Considering the reset cycle, in ci-env, may sample 5-7 trace through 1 or 2 cycle.
*/
Assert
.
assertTrue
(
finishedTracerCounter
>=
5
);
Assert
.
assertTrue
(
finishedTracerCounter
<=
7
);
Thread
.
sleep
(
10
*
1000L
);
}
@Test
public
void
testSample5InLoopWithMultiSpans
()
{
finishedTracerCounter
=
0
;
for
(
int
i
=
0
;
i
<
11
;
i
++)
{
AbstractSpan
span
=
ContextManager
.
createSpan
(
"serviceA"
);
Tags
.
COMPONENT
.
set
(
span
,
"test"
);
AbstractSpan
span2
=
ContextManager
.
createSpan
(
"serviceB"
);
Tags
.
COMPONENT
.
set
(
span2
,
"test2"
);
ContextManager
.
stopSpan
();
ContextManager
.
stopSpan
();
}
/**
* Considering the reset cycle, in ci-env, may sample 5-7 trace through 1 or 2 cycle.
*/
Assert
.
assertTrue
(
finishedTracerCounter
>=
5
);
Assert
.
assertTrue
(
finishedTracerCounter
<=
7
);
}
@After
public
void
tearDown
()
throws
Exception
{
Config
.
Agent
.
SAMPLE_N_PER_10_SECS
=
-
1
;
TracerContext
.
ListenerManager
.
remove
(
listener
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录