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

fix compile failed and the url tag of motan plugin is not correct

This commit is contained in:
ascrutae 2017-07-11 18:03:15 +08:00
parent b5ff6aa131
commit ca56552215
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 @Override
public AbstractSpan setLayer(SpanLayer layer) { public AbstractTracingSpan setLayer(SpanLayer layer) {
if (stackDepth == currentMaxDepth) { if (stackDepth == currentMaxDepth) {
return super.setLayer(layer); return super.setLayer(layer);
} else { } else {
@ -62,7 +62,7 @@ public class EntrySpan extends AbstractTracingSpan {
} }
@Override @Override
public AbstractSpan setComponent(Component component) { public AbstractTracingSpan setComponent(Component component) {
if (stackDepth == currentMaxDepth) { if (stackDepth == currentMaxDepth) {
return super.setComponent(component); return super.setComponent(component);
} else { } else {
@ -71,7 +71,7 @@ public class EntrySpan extends AbstractTracingSpan {
} }
@Override @Override
public AbstractSpan setComponent(String componentName) { public AbstractTracingSpan setComponent(String componentName) {
if (stackDepth == currentMaxDepth) { if (stackDepth == currentMaxDepth) {
return super.setComponent(componentName); return super.setComponent(componentName);
} else { } 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 @Override
public AbstractSpan setLayer(SpanLayer layer) { public AbstractTracingSpan setLayer(SpanLayer layer) {
if (stackDepth == 1) { if (stackDepth == 1) {
return super.setLayer(layer); return super.setLayer(layer);
} else { } else {
@ -81,7 +81,7 @@ public class ExitSpan extends AbstractTracingSpan {
} }
@Override @Override
public AbstractSpan setComponent(Component component) { public AbstractTracingSpan setComponent(Component component) {
if (stackDepth == 1) { if (stackDepth == 1) {
return super.setComponent(component); return super.setComponent(component);
} else { } else {
@ -90,7 +90,7 @@ public class ExitSpan extends AbstractTracingSpan {
} }
@Override @Override
public AbstractSpan setComponent(String componentName) { public AbstractTracingSpan setComponent(String componentName) {
if (stackDepth == 1) { if (stackDepth == 1) {
return super.setComponent(componentName); return super.setComponent(componentName);
} else { } 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]; Request request = (Request)allArguments[0];
if (url != null) { if (url != null) {
ContextCarrier contextCarrier = new ContextCarrier(); 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); AbstractSpan span = ContextManager.createExitSpan(generateOperationName(url, request), contextCarrier, remotePeer);
span.setComponent(ComponentsDefine.MOTAN); span.setComponent(ComponentsDefine.MOTAN);
Tags.URL.set(span, url.getIdentity()); Tags.URL.set(span, url.getIdentity());