Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
killuaz丶x
SkyWalking
提交
100823cb
S
SkyWalking
项目概览
killuaz丶x
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / 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,发现更多精彩内容 >>
未验证
提交
100823cb
编写于
1月 22, 2021
作者:
L
Leon Yang
提交者:
GitHub
1月 22, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support DNS period resolving mechanism (#6240)
上级
43e2458e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
1 deletion
+29
-1
CHANGES.md
CHANGES.md
+1
-0
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
...ava/org/apache/skywalking/apm/agent/core/conf/Config.java
+4
-1
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java
.../skywalking/apm/agent/core/remote/GRPCChannelManager.java
+23
-0
docs/en/setup/service-agent/java-agent/README.md
docs/en/setup/service-agent/java-agent/README.md
+1
-0
未找到文件。
CHANGES.md
浏览文件 @
100823cb
...
...
@@ -37,6 +37,7 @@ Release Notes.
*
Fix RestTemplate plugin recording url tag with wrong port
*
Support collecting logs and forwarding through gRPC.
*
Support config
`agent.sample_n_per_3_secs`
can be changed in the runtime.
*
Support DNS periodic resolving mechanism to update backend service.
#### OAP-Backend
*
Make meter receiver support MAL.
...
...
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
浏览文件 @
100823cb
...
...
@@ -163,11 +163,14 @@ public class Config {
* Get profile task list interval
*/
public
static
int
GET_PROFILE_TASK_INTERVAL
=
20
;
/**
* Get agent dynamic config interval
*/
public
static
int
GET_AGENT_DYNAMIC_CONFIG_INTERVAL
=
20
;
/**
* If true, skywalking agent will enable periodically resolving DNS to update receiver service addresses.
*/
public
static
boolean
IS_RESOLVE_DNS_PERIODICALLY
=
false
;
}
public
static
class
Profile
{
...
...
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java
浏览文件 @
100823cb
...
...
@@ -21,6 +21,8 @@ package org.apache.skywalking.apm.agent.core.remote;
import
io.grpc.Channel
;
import
io.grpc.Status
;
import
io.grpc.StatusRuntimeException
;
import
java.net.InetAddress
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.LinkedList
;
...
...
@@ -29,6 +31,8 @@ import java.util.Random;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.ScheduledFuture
;
import
java.util.concurrent.TimeUnit
;
import
java.util.stream.Collectors
;
import
org.apache.skywalking.apm.agent.core.boot.BootService
;
import
org.apache.skywalking.apm.agent.core.boot.DefaultImplementor
;
import
org.apache.skywalking.apm.agent.core.boot.DefaultNamedThreadFactory
;
...
...
@@ -37,6 +41,8 @@ import org.apache.skywalking.apm.agent.core.logging.api.ILog;
import
org.apache.skywalking.apm.agent.core.logging.api.LogManager
;
import
org.apache.skywalking.apm.util.RunnableWithExceptionProtection
;
import
static
org
.
apache
.
skywalking
.
apm
.
agent
.
core
.
conf
.
Config
.
Collector
.
IS_RESOLVE_DNS_PERIODICALLY
;
@DefaultImplementor
public
class
GRPCChannelManager
implements
BootService
,
Runnable
{
private
static
final
ILog
LOGGER
=
LogManager
.
getLogger
(
GRPCChannelManager
.
class
);
...
...
@@ -92,6 +98,23 @@ public class GRPCChannelManager implements BootService, Runnable {
@Override
public
void
run
()
{
LOGGER
.
debug
(
"Selected collector grpc service running, reconnect:{}."
,
reconnect
);
if
(
IS_RESOLVE_DNS_PERIODICALLY
&&
reconnect
)
{
String
backendService
=
Config
.
Collector
.
BACKEND_SERVICE
.
split
(
","
)[
0
];
try
{
String
[]
domainAndPort
=
backendService
.
split
(
":"
);
List
<
String
>
newGrpcServers
=
Arrays
.
stream
(
InetAddress
.
getAllByName
(
domainAndPort
[
0
]))
.
map
(
InetAddress:
:
getHostAddress
)
.
map
(
ip
->
String
.
format
(
"%s:%s"
,
ip
,
domainAndPort
[
1
]))
.
collect
(
Collectors
.
toList
());
grpcServers
=
newGrpcServers
;
}
catch
(
Throwable
t
)
{
LOGGER
.
error
(
t
,
"Failed to resolve {} of backend service."
,
backendService
);
}
}
if
(
reconnect
)
{
if
(
grpcServers
.
size
()
>
0
)
{
String
server
=
""
;
...
...
docs/en/setup/service-agent/java-agent/README.md
浏览文件 @
100823cb
...
...
@@ -95,6 +95,7 @@ property key | Description | Default |
`collector.grpc_upstream_timeout`
|How long grpc client will timeout in sending data to upstream. Unit is second.|
`30`
seconds|
`collector.get_profile_task_interval`
|Sniffer get profile task list interval.|
`20`
|
`collector.get_agent_dynamic_config_interval`
|Sniffer get agent dynamic config interval|
`20`
|
`collector.dns_period_resolve_active`
|If true, skywalking agent will enable periodically resolving DNS to update receiver service addresses.|
`false`
|
`logging.level`
|Log level: TRACE, DEBUG, INFO, WARN, ERROR, OFF. Default is info.|
`INFO`
|
`logging.file_name`
|Log file name.|
`skywalking-api.log`
|
`logging.output`
| Log output. Default is FILE. Use CONSOLE means output to stdout. |
`FILE`
|
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录