Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
javalover123888
SkyWalking
提交
ff0ffb99
S
SkyWalking
项目概览
javalover123888
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
2
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,发现更多精彩内容 >>
未验证
提交
ff0ffb99
编写于
8月 02, 2019
作者:
wu-sheng
提交者:
GitHub
8月 02, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add agent version in gRPC connection establish stage (#3205)
上级
4db007ee
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
104 addition
and
5 deletion
+104
-5
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java
...he/skywalking/apm/agent/core/remote/AgentIDDecorator.java
+87
-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
+17
-5
未找到文件。
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java
0 → 100644
浏览文件 @
ff0ffb99
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package
org.apache.skywalking.apm.agent.core.remote
;
import
io.grpc.CallOptions
;
import
io.grpc.Channel
;
import
io.grpc.ClientCall
;
import
io.grpc.ClientInterceptor
;
import
io.grpc.ClientInterceptors
;
import
io.grpc.ForwardingClientCall
;
import
io.grpc.Metadata
;
import
io.grpc.MethodDescriptor
;
import
java.io.InputStream
;
import
java.net.URL
;
import
java.util.Enumeration
;
import
java.util.jar.Attributes
;
import
java.util.jar.JarFile
;
import
java.util.jar.Manifest
;
import
org.apache.skywalking.apm.agent.core.logging.api.ILog
;
import
org.apache.skywalking.apm.agent.core.logging.api.LogManager
;
/**
* Add agent version(Described in MANIFEST.MF) to the connection establish stage.
*
* @author wusheng
*/
public
class
AgentIDDecorator
implements
ChannelDecorator
{
private
static
final
ILog
logger
=
LogManager
.
getLogger
(
AgentIDDecorator
.
class
);
private
static
final
Metadata
.
Key
<
String
>
AGENT_VERSION_HEAD_HEADER_NAME
=
Metadata
.
Key
.
of
(
"Agent-Version"
,
Metadata
.
ASCII_STRING_MARSHALLER
);
private
String
version
=
"UNKNOWN"
;
public
AgentIDDecorator
()
{
try
{
Enumeration
<
URL
>
resources
=
AgentIDDecorator
.
class
.
getClassLoader
().
getResources
(
JarFile
.
MANIFEST_NAME
);
while
(
resources
.
hasMoreElements
())
{
URL
url
=
resources
.
nextElement
();
InputStream
is
=
url
.
openStream
();
if
(
is
!=
null
)
{
Manifest
manifest
=
new
Manifest
(
is
);
Attributes
mainAttribs
=
manifest
.
getMainAttributes
();
String
projectName
=
mainAttribs
.
getValue
(
"Implementation-Vendor-Id"
);
if
(
projectName
!=
null
)
{
if
(
projectName
.
equals
(
"org.apache.skywalking"
))
{
version
=
mainAttribs
.
getValue
(
"Implementation-Version"
);
}
}
}
}
}
catch
(
Exception
e
)
{
logger
.
warn
(
"Can't read version from MANIFEST.MF in the agent jar"
);
}
}
@Override
public
Channel
build
(
Channel
channel
)
{
return
ClientInterceptors
.
intercept
(
channel
,
new
ClientInterceptor
()
{
@Override
public
<
REQ
,
RESP
>
ClientCall
<
REQ
,
RESP
>
interceptCall
(
MethodDescriptor
<
REQ
,
RESP
>
method
,
CallOptions
options
,
Channel
channel
)
{
return
new
ForwardingClientCall
.
SimpleForwardingClientCall
<
REQ
,
RESP
>(
channel
.
newCall
(
method
,
options
))
{
@Override
public
void
start
(
Listener
<
RESP
>
responseListener
,
Metadata
headers
)
{
headers
.
put
(
AGENT_VERSION_HEAD_HEADER_NAME
,
version
);
super
.
start
(
responseListener
,
headers
);
}
};
}
});
}
}
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java
浏览文件 @
ff0ffb99
...
...
@@ -18,12 +18,23 @@
package
org.apache.skywalking.apm.agent.core.remote
;
import
io.grpc.*
;
import
java.util.*
;
import
java.util.concurrent.*
;
import
org.apache.skywalking.apm.agent.core.boot.*
;
import
io.grpc.Channel
;
import
io.grpc.Status
;
import
io.grpc.StatusRuntimeException
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.Random
;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.ScheduledFuture
;
import
java.util.concurrent.TimeUnit
;
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
;
import
org.apache.skywalking.apm.agent.core.conf.Config
;
import
org.apache.skywalking.apm.agent.core.logging.api.*
;
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
;
/**
...
...
@@ -101,6 +112,7 @@ public class GRPCChannelManager implements BootService, Runnable {
managedChannel
=
GRPCChannel
.
newBuilder
(
ipAndPort
[
0
],
Integer
.
parseInt
(
ipAndPort
[
1
]))
.
addManagedChannelBuilder
(
new
StandardChannelBuilder
())
.
addManagedChannelBuilder
(
new
TLSChannelBuilder
())
.
addChannelDecorator
(
new
AgentIDDecorator
())
.
addChannelDecorator
(
new
AuthenticationDecorator
())
.
build
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录