kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #280 from ascrutae/zhangxin/fix/compile-failed 

fix compile failure and the url  tag of motan plugin is not correct
This commit is contained in:
吴晟 Wu Sheng 2017-07-11 22:31:11 -05:00 committed by GitHub
parent b5ff6aa131 ca56552215
commit 9455917f1e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/EntrySpan.java
View File

@ -53,7 +53,7 @@ public class EntrySpan extends AbstractTracingSpan {
}
@Override
public AbstractSpan setLayer(SpanLayer layer) {
public AbstractTracingSpan setLayer(SpanLayer layer) {
if (stackDepth == currentMaxDepth) {
return super.setLayer(layer);
} else {
@ -62,7 +62,7 @@ public class EntrySpan extends AbstractTracingSpan {
}
@Override
public AbstractSpan setComponent(Component component) {
public AbstractTracingSpan setComponent(Component component) {
if (stackDepth == currentMaxDepth) {
return super.setComponent(component);
} else {
@ -71,7 +71,7 @@ public class EntrySpan extends AbstractTracingSpan {
}
@Override
public AbstractSpan setComponent(String componentName) {
public AbstractTracingSpan setComponent(String componentName) {
if (stackDepth == currentMaxDepth) {
return super.setComponent(componentName);
} else {

6
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java
View File

@ -72,7 +72,7 @@ public class ExitSpan extends AbstractTracingSpan {
}
@Override
public AbstractSpan setLayer(SpanLayer layer) {
public AbstractTracingSpan setLayer(SpanLayer layer) {
if (stackDepth == 1) {
return super.setLayer(layer);
} else {
@ -81,7 +81,7 @@ public class ExitSpan extends AbstractTracingSpan {
}
@Override
public AbstractSpan setComponent(Component component) {
public AbstractTracingSpan setComponent(Component component) {
if (stackDepth == 1) {
return super.setComponent(component);
} else {
@ -90,7 +90,7 @@ public class ExitSpan extends AbstractTracingSpan {
}
@Override
public AbstractSpan setComponent(String componentName) {
public AbstractTracingSpan setComponent(String componentName) {
if (stackDepth == 1) {
return super.setComponent(componentName);
} else {

2
apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java
View File

@ -36,7 +36,7 @@ public class MotanConsumerInterceptor implements InstanceConstructorInterceptor,
Request request = (Request)allArguments[0];
if (url != null) {
ContextCarrier contextCarrier = new ContextCarrier();
String remotePeer = url.getHost() + " :" + url.getPort();
String remotePeer = url.getHost() + ":" + url.getPort();
AbstractSpan span = ContextManager.createExitSpan(generateOperationName(url, request), contextCarrier, remotePeer);
span.setComponent(ComponentsDefine.MOTAN);
Tags.URL.set(span, url.getIdentity());