Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
41e459df
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 搜索 >>
提交
41e459df
编写于
11月 14, 2017
作者:
wu-sheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change the hierarchy of noopspan. And add WithPeerInfo interface.
上级
ad547e00
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
22 addition
and
83 deletion
+22
-83
apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/test/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java
...pc/handler/ApplicationRegisterServiceHandlerTestCase.java
+1
-2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracingContext.java
...org/skywalking/apm/agent/core/context/TracingContext.java
+4
-11
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
+3
-1
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopExitSpan.java
...skywalking/apm/agent/core/context/trace/NoopExitSpan.java
+8
-64
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java
...org/skywalking/apm/agent/core/context/trace/NoopSpan.java
+1
-1
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/WithPeerInfo.java
...skywalking/apm/agent/core/context/trace/WithPeerInfo.java
+5
-4
未找到文件。
apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/test/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java
浏览文件 @
41e459df
...
...
@@ -20,7 +20,6 @@ package org.skywalking.apm.collector.agent.grpc.handler;
import
io.grpc.ManagedChannel
;
import
io.grpc.ManagedChannelBuilder
;
import
org.junit.Test
;
import
org.skywalking.apm.network.proto.Application
;
import
org.skywalking.apm.network.proto.ApplicationMapping
;
import
org.skywalking.apm.network.proto.ApplicationRegisterServiceGrpc
;
...
...
@@ -36,7 +35,7 @@ public class ApplicationRegisterServiceHandlerTestCase {
private
ApplicationRegisterServiceGrpc
.
ApplicationRegisterServiceBlockingStub
stub
;
@Test
//
@Test
public
void
testRegister
()
{
ManagedChannel
channel
=
ManagedChannelBuilder
.
forAddress
(
"localhost"
,
11800
).
usePlaintext
(
true
).
build
();
stub
=
ApplicationRegisterServiceGrpc
.
newBlockingStub
(
channel
);
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/TracingContext.java
浏览文件 @
41e459df
...
...
@@ -31,6 +31,7 @@ import org.skywalking.apm.agent.core.context.trace.NoopExitSpan;
import
org.skywalking.apm.agent.core.context.trace.NoopSpan
;
import
org.skywalking.apm.agent.core.context.trace.TraceSegment
;
import
org.skywalking.apm.agent.core.context.trace.TraceSegmentRef
;
import
org.skywalking.apm.agent.core.context.trace.WithPeerInfo
;
import
org.skywalking.apm.agent.core.dictionary.DictionaryManager
;
import
org.skywalking.apm.agent.core.dictionary.DictionaryUtil
;
import
org.skywalking.apm.agent.core.dictionary.PossibleFound
;
...
...
@@ -97,17 +98,9 @@ public class TracingContext implements AbstractTracerContext {
throw
new
IllegalStateException
(
"Inject can be done only in Exit Span"
);
}
String
peer
;
int
peerId
;
if
(
span
instanceof
NoopExitSpan
)
{
NoopExitSpan
exitSpan
=
(
NoopExitSpan
)
span
;
peerId
=
exitSpan
.
getPeerId
();
peer
=
exitSpan
.
getPeer
();
}
else
{
ExitSpan
exitSpan
=
(
ExitSpan
)
span
;
peerId
=
exitSpan
.
getPeerId
();
peer
=
exitSpan
.
getPeer
();
}
WithPeerInfo
spanWithPeer
=
(
WithPeerInfo
)
span
;
String
peer
=
spanWithPeer
.
getPeer
();
int
peerId
=
spanWithPeer
.
getPeerId
();
carrier
.
setTraceSegmentId
(
this
.
segment
.
getTraceSegmentId
());
carrier
.
setSpanId
(
span
.
getSpanId
());
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java
浏览文件 @
41e459df
...
...
@@ -35,7 +35,7 @@ import org.skywalking.apm.network.trace.component.Component;
*
* @author wusheng
*/
public
class
ExitSpan
extends
StackBasedTracingSpan
{
public
class
ExitSpan
extends
StackBasedTracingSpan
implements
WithPeerInfo
{
private
String
peer
;
private
int
peerId
;
...
...
@@ -147,10 +147,12 @@ public class ExitSpan extends StackBasedTracingSpan {
}
}
@Override
public
int
getPeerId
()
{
return
peerId
;
}
@Override
public
String
getPeer
()
{
return
peer
;
}
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopExitSpan.java
浏览文件 @
41e459df
...
...
@@ -18,10 +18,7 @@
package
org.skywalking.apm.agent.core.context.trace
;
import
java.util.Map
;
import
org.skywalking.apm.network.trace.component.Component
;
public
class
NoopExitSpan
implements
AbstractNoopSpan
{
public
class
NoopExitSpan
extends
NoopSpan
implements
WithPeerInfo
{
private
String
peer
;
private
int
peerId
;
...
...
@@ -34,71 +31,18 @@ public class NoopExitSpan implements AbstractNoopSpan {
this
.
peer
=
peer
;
}
@Override
public
AbstractSpan
setComponent
(
Component
component
)
{
return
this
;
}
@Override
public
AbstractSpan
setComponent
(
String
componentName
)
{
return
this
;
}
@Override
public
AbstractSpan
setLayer
(
SpanLayer
layer
)
{
return
this
;
}
@Override
public
AbstractSpan
tag
(
String
key
,
String
value
)
{
return
this
;
}
@Override
public
AbstractSpan
log
(
Throwable
t
)
{
return
this
;
}
@Override
public
AbstractSpan
errorOccurred
()
{
return
null
;
}
@Override
public
boolean
isEntry
()
{
return
false
;
}
@Override
public
boolean
isExit
()
{
return
true
;
}
@Override
public
AbstractSpan
log
(
long
timestamp
,
Map
<
String
,
?>
event
)
{
return
this
;
}
@Override
public
AbstractSpan
setOperationName
(
String
operationName
)
{
return
this
;
}
@Override
public
AbstractSpan
start
()
{
return
this
;
}
@Override
public
int
getSpanId
()
{
return
0
;
}
@Override
public
int
getOperationId
()
{
return
0
;
}
@Override
public
String
getOperationName
()
{
return
""
;
}
@Override
public
AbstractSpan
setOperationId
(
int
operationId
)
{
return
this
;
}
@Override
public
int
getPeerId
()
{
return
peerId
;
}
@Override
public
String
getPeer
()
{
return
peer
;
}
@Override
public
boolean
isExit
()
{
return
true
;
}
}
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java
浏览文件 @
41e459df
...
...
@@ -29,7 +29,7 @@ import org.skywalking.apm.network.trace.component.Component;
*
* @author wusheng
*/
public
class
NoopSpan
implements
Abstract
Noop
Span
{
public
class
NoopSpan
implements
AbstractSpan
{
public
NoopSpan
()
{
}
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/
AbstractNoopSpan
.java
→
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/
WithPeerInfo
.java
浏览文件 @
41e459df
...
...
@@ -19,9 +19,10 @@
package
org.skywalking.apm.agent.core.context.trace
;
/**
* The <code>AbstractNoopSpan</code> represents a span implementation without any actual operation.
*
* @author zhangxin
* @author wusheng
*/
public
interface
AbstractNoopSpan
extends
AbstractSpan
{
public
interface
WithPeerInfo
{
int
getPeerId
();
String
getPeer
();
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录