Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
75e705e0
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 搜索 >>
提交
75e705e0
编写于
7月 14, 2017
作者:
A
ascrutae
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add configuration about multiple check interval and fix set peerID of exit span failed
上级
a381a6f7
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
27 addition
and
13 deletion
+27
-13
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java
.../main/java/org/skywalking/apm/agent/core/conf/Config.java
+13
-2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java
...org/skywalking/apm/agent/core/context/trace/ExitSpan.java
+4
-2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/AppAndServiceRegisterClient.java
...ng/apm/agent/core/remote/AppAndServiceRegisterClient.java
+1
-1
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/CollectorDiscoveryService.java
...king/apm/agent/core/remote/CollectorDiscoveryService.java
+1
-1
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/GRPCChannelManager.java
.../skywalking/apm/agent/core/remote/GRPCChannelManager.java
+4
-3
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/remote/GRPCChannelManagerTest.java
...walking/apm/agent/core/remote/GRPCChannelManagerTest.java
+2
-1
apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/define/MongoDBInstrumentation.java
.../apm/plugin/mongodb/v3/define/MongoDBInstrumentation.java
+2
-3
未找到文件。
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java
浏览文件 @
75e705e0
...
@@ -34,7 +34,18 @@ public class Config {
...
@@ -34,7 +34,18 @@ public class Config {
}
}
public
static
class
Collector
{
public
static
class
Collector
{
public
static
long
DISCOVERY_CHECK_INTERVAL
=
60
*
1000
;
/**
* grpc channel status check interval
*/
public
static
long
GRPC_CHANNEL_CHECK_INTERVAL
=
30
;
/**
* application and service registry check interval
*/
public
static
long
APP_AND_SERVICE_REGISTER_CHECK_INTERVAL
=
10
;
/**
* discovery rest check interval
*/
public
static
long
DISCOVERY_CHECK_INTERVAL
=
60
;
/**
/**
* Collector REST-Service address.
* Collector REST-Service address.
* e.g.
* e.g.
...
@@ -46,7 +57,7 @@ public class Config {
...
@@ -46,7 +57,7 @@ public class Config {
/**
/**
* Collector service discovery REST service name
* Collector service discovery REST service name
*/
*/
public
static
String
DISCOVERY_SERVICE_NAME
=
"grpc/addresses"
;
public
static
String
DISCOVERY_SERVICE_NAME
=
"
/
grpc/addresses"
;
}
}
public
static
class
Buffer
{
public
static
class
Buffer
{
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java
浏览文件 @
75e705e0
...
@@ -108,10 +108,12 @@ public class ExitSpan extends AbstractTracingSpan {
...
@@ -108,10 +108,12 @@ public class ExitSpan extends AbstractTracingSpan {
@Override
public
SpanObject
.
Builder
transform
()
{
@Override
public
SpanObject
.
Builder
transform
()
{
SpanObject
.
Builder
spanBuilder
=
super
.
transform
();
SpanObject
.
Builder
spanBuilder
=
super
.
transform
();
if
(
peerId
=
=
DictionaryUtil
.
nullValue
())
{
if
(
peerId
!
=
DictionaryUtil
.
nullValue
())
{
spanBuilder
.
setPeerId
(
peerId
);
spanBuilder
.
setPeerId
(
peerId
);
}
else
{
}
else
{
spanBuilder
.
setPeer
(
peer
);
if
(
peer
!=
null
)
{
spanBuilder
.
setPeer
(
peer
);
}
}
}
return
spanBuilder
;
return
spanBuilder
;
}
}
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/AppAndServiceRegisterClient.java
浏览文件 @
75e705e0
...
@@ -69,7 +69,7 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList
...
@@ -69,7 +69,7 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList
public
void
boot
()
throws
Throwable
{
public
void
boot
()
throws
Throwable
{
applicationRegisterFuture
=
Executors
applicationRegisterFuture
=
Executors
.
newSingleThreadScheduledExecutor
()
.
newSingleThreadScheduledExecutor
()
.
scheduleAtFixedRate
(
this
,
0
,
10
,
TimeUnit
.
SECONDS
);
.
scheduleAtFixedRate
(
this
,
0
,
Config
.
Collector
.
APP_AND_SERVICE_REGISTER_CHECK_INTERVAL
,
TimeUnit
.
SECONDS
);
}
}
@Override
@Override
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/CollectorDiscoveryService.java
浏览文件 @
75e705e0
...
@@ -20,7 +20,7 @@ public class CollectorDiscoveryService implements BootService {
...
@@ -20,7 +20,7 @@ public class CollectorDiscoveryService implements BootService {
public
void
boot
()
throws
Throwable
{
public
void
boot
()
throws
Throwable
{
Executors
.
newSingleThreadScheduledExecutor
()
Executors
.
newSingleThreadScheduledExecutor
()
.
scheduleAtFixedRate
(
new
DiscoveryRestServiceClient
(),
0
,
.
scheduleAtFixedRate
(
new
DiscoveryRestServiceClient
(),
0
,
Config
.
Collector
.
DISCOVERY_CHECK_INTERVAL
,
TimeUnit
.
MILLI
SECONDS
);
Config
.
Collector
.
DISCOVERY_CHECK_INTERVAL
,
TimeUnit
.
SECONDS
);
}
}
@Override
@Override
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/GRPCChannelManager.java
浏览文件 @
75e705e0
...
@@ -18,6 +18,8 @@ import org.skywalking.apm.agent.core.conf.RemoteDownstreamConfig;
...
@@ -18,6 +18,8 @@ import org.skywalking.apm.agent.core.conf.RemoteDownstreamConfig;
import
org.skywalking.apm.logging.ILog
;
import
org.skywalking.apm.logging.ILog
;
import
org.skywalking.apm.logging.LogManager
;
import
org.skywalking.apm.logging.LogManager
;
import
static
org
.
skywalking
.
apm
.
agent
.
core
.
conf
.
Config
.
Collector
.
GRPC_CHANNEL_CHECK_INTERVAL
;
/**
/**
* @author wusheng
* @author wusheng
*/
*/
...
@@ -29,7 +31,6 @@ public class GRPCChannelManager implements BootService, Runnable {
...
@@ -29,7 +31,6 @@ public class GRPCChannelManager implements BootService, Runnable {
private
volatile
boolean
reconnect
=
true
;
private
volatile
boolean
reconnect
=
true
;
private
Random
random
=
new
Random
();
private
Random
random
=
new
Random
();
private
List
<
GRPCChannelListener
>
listeners
=
Collections
.
synchronizedList
(
new
LinkedList
<
GRPCChannelListener
>());
private
List
<
GRPCChannelListener
>
listeners
=
Collections
.
synchronizedList
(
new
LinkedList
<
GRPCChannelListener
>());
private
final
int
retryCycle
=
30
;
@Override
@Override
public
void
beforeBoot
()
throws
Throwable
{
public
void
beforeBoot
()
throws
Throwable
{
...
@@ -40,7 +41,7 @@ public class GRPCChannelManager implements BootService, Runnable {
...
@@ -40,7 +41,7 @@ public class GRPCChannelManager implements BootService, Runnable {
public
void
boot
()
throws
Throwable
{
public
void
boot
()
throws
Throwable
{
connectCheckFuture
=
Executors
connectCheckFuture
=
Executors
.
newSingleThreadScheduledExecutor
()
.
newSingleThreadScheduledExecutor
()
.
scheduleAtFixedRate
(
this
,
0
,
retryCycle
,
TimeUnit
.
SECONDS
);
.
scheduleAtFixedRate
(
this
,
0
,
GRPC_CHANNEL_CHECK_INTERVAL
,
TimeUnit
.
SECONDS
);
}
}
@Override
@Override
...
@@ -75,7 +76,7 @@ public class GRPCChannelManager implements BootService, Runnable {
...
@@ -75,7 +76,7 @@ public class GRPCChannelManager implements BootService, Runnable {
}
}
}
}
logger
.
debug
(
"Selected collector grpc service is not available. Wait {} seconds to retry"
,
retryCycle
);
logger
.
debug
(
"Selected collector grpc service is not available. Wait {} seconds to retry"
,
GRPC_CHANNEL_CHECK_INTERVAL
);
}
}
}
}
...
...
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/remote/GRPCChannelManagerTest.java
浏览文件 @
75e705e0
...
@@ -17,6 +17,7 @@ import org.mockito.Spy;
...
@@ -17,6 +17,7 @@ import org.mockito.Spy;
import
org.powermock.core.classloader.annotations.PrepareForTest
;
import
org.powermock.core.classloader.annotations.PrepareForTest
;
import
org.powermock.modules.junit4.PowerMockRunner
;
import
org.powermock.modules.junit4.PowerMockRunner
;
import
org.powermock.reflect.Whitebox
;
import
org.powermock.reflect.Whitebox
;
import
org.skywalking.apm.agent.core.conf.Config
;
import
org.skywalking.apm.agent.core.conf.RemoteDownstreamConfig
;
import
org.skywalking.apm.agent.core.conf.RemoteDownstreamConfig
;
import
org.skywalking.apm.agent.core.test.tools.AgentServiceRule
;
import
org.skywalking.apm.agent.core.test.tools.AgentServiceRule
;
...
@@ -52,7 +53,7 @@ public class GRPCChannelManagerTest {
...
@@ -52,7 +53,7 @@ public class GRPCChannelManagerTest {
List
<
String
>
grpcServers
=
new
ArrayList
<
String
>();
List
<
String
>
grpcServers
=
new
ArrayList
<
String
>();
grpcServers
.
add
(
"127.0.0.1:2181"
);
grpcServers
.
add
(
"127.0.0.1:2181"
);
RemoteDownstreamConfig
.
Collector
.
GRPC_SERVERS
=
grpcServers
;
RemoteDownstreamConfig
.
Collector
.
GRPC_SERVERS
=
grpcServers
;
Whitebox
.
setInternalState
(
grpcChannelManager
,
"retryCycle"
,
1
)
;
Config
.
Collector
.
GRPC_CHANNEL_CHECK_INTERVAL
=
1
;
mockStatic
(
NettyChannelBuilder
.
class
);
mockStatic
(
NettyChannelBuilder
.
class
);
when
(
NettyChannelBuilder
.
forAddress
(
anyString
(),
anyInt
())).
thenReturn
(
mock
);
when
(
NettyChannelBuilder
.
forAddress
(
anyString
(),
anyInt
())).
thenReturn
(
mock
);
...
...
apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/skywalking/apm/plugin/mongodb/v3/define/MongoDBInstrumentation.java
浏览文件 @
75e705e0
package
org.skywalking.apm.plugin.mongodb.v3.define
;
package
org.skywalking.apm.plugin.mongodb.v3.define
;
import
com.mongodb.connection.Cluster
;
import
net.bytebuddy.description.method.MethodDescription
;
import
net.bytebuddy.description.method.MethodDescription
;
import
net.bytebuddy.matcher.ElementMatcher
;
import
net.bytebuddy.matcher.ElementMatcher
;
import
org.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint
;
import
org.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint
;
...
@@ -9,7 +8,7 @@ import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMet
...
@@ -9,7 +8,7 @@ import org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMet
import
org.skywalking.apm.agent.core.plugin.match.ClassMatch
;
import
org.skywalking.apm.agent.core.plugin.match.ClassMatch
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
named
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
named
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
takesArgument
;
import
static
org
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
bytebuddy
.
ArgumentTypeNameMatch
.
takesArgumentWithType
;
import
static
org
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
match
.
NameMatch
.
byName
;
import
static
org
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
match
.
NameMatch
.
byName
;
public
class
MongoDBInstrumentation
extends
ClassInstanceMethodsEnhancePluginDefine
{
public
class
MongoDBInstrumentation
extends
ClassInstanceMethodsEnhancePluginDefine
{
...
@@ -24,7 +23,7 @@ public class MongoDBInstrumentation extends ClassInstanceMethodsEnhancePluginDef
...
@@ -24,7 +23,7 @@ public class MongoDBInstrumentation extends ClassInstanceMethodsEnhancePluginDef
new
ConstructorInterceptPoint
()
{
new
ConstructorInterceptPoint
()
{
@Override
@Override
public
ElementMatcher
<
MethodDescription
>
getConstructorMatcher
()
{
public
ElementMatcher
<
MethodDescription
>
getConstructorMatcher
()
{
return
takesArgument
(
1
,
Cluster
.
class
);
return
takesArgument
WithType
(
0
,
"com.mongodb.connection.Cluster"
);
}
}
@Override
@Override
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录