Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
0b418bf3
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 搜索 >>
未验证
提交
0b418bf3
编写于
8月 02, 2021
作者:
T
ThisSeanZhang
提交者:
GitHub
8月 02, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support Multiple DNS period resolving mechanism (#7398)
上级
81f7be13
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
15 deletion
+26
-15
CHANGES.md
CHANGES.md
+1
-0
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java
.../skywalking/apm/agent/core/remote/GRPCChannelManager.java
+24
-14
test/plugin/scenarios/rabbitmq-scenario/configuration.yml
test/plugin/scenarios/rabbitmq-scenario/configuration.yml
+1
-1
未找到文件。
CHANGES.md
浏览文件 @
0b418bf3
...
...
@@ -8,6 +8,7 @@ Release Notes.
#### Project
#### Java Agent
*
Support Multiple DNS period resolving mechanism
#### OAP-Backend
...
...
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java
浏览文件 @
0b418bf3
...
...
@@ -32,6 +32,7 @@ import java.util.concurrent.Executors;
import
java.util.concurrent.ScheduledFuture
;
import
java.util.concurrent.TimeUnit
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
import
org.apache.skywalking.apm.agent.core.boot.BootService
;
import
org.apache.skywalking.apm.agent.core.boot.DefaultImplementor
;
...
...
@@ -40,6 +41,7 @@ import org.apache.skywalking.apm.agent.core.conf.Config;
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
org.apache.skywalking.apm.util.StringUtil
;
import
static
org
.
apache
.
skywalking
.
apm
.
agent
.
core
.
conf
.
Config
.
Collector
.
IS_RESOLVE_DNS_PERIODICALLY
;
...
...
@@ -99,20 +101,28 @@ public class GRPCChannelManager implements BootService, Runnable {
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
);
}
grpcServers
=
Arrays
.
stream
(
Config
.
Collector
.
BACKEND_SERVICE
.
split
(
","
))
.
filter
(
StringUtil:
:
isNotBlank
)
.
map
(
eachBackendService
->
eachBackendService
.
split
(
":"
))
.
filter
(
domainPortPairs
->
{
if
(
domainPortPairs
.
length
<
2
)
{
LOGGER
.
debug
(
"Service address [{}] format error. The expected format is IP:port"
,
domainPortPairs
[
0
]);
return
false
;
}
return
true
;
})
.
flatMap
(
domainPortPairs
->
{
try
{
return
Arrays
.
stream
(
InetAddress
.
getAllByName
(
domainPortPairs
[
0
]))
.
map
(
InetAddress:
:
getHostAddress
)
.
map
(
ip
->
String
.
format
(
"%s:%s"
,
ip
,
domainPortPairs
[
1
]));
}
catch
(
Throwable
t
)
{
LOGGER
.
error
(
t
,
"Failed to resolve {} of backend service."
,
domainPortPairs
[
0
]);
}
return
Stream
.
empty
();
})
.
distinct
()
.
collect
(
Collectors
.
toList
());
}
if
(
reconnect
)
{
...
...
test/plugin/scenarios/rabbitmq-scenario/configuration.yml
浏览文件 @
0b418bf3
...
...
@@ -20,7 +20,7 @@ environment:
-
RABBITMQ_HOST=rabbitmq-server
dependencies
:
rabbitmq-server
:
image
:
rabbitmq:
latest
image
:
rabbitmq:
3.8.18
hostname
:
rabbitmq-server
expose
:
-
5672
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录