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

fix (#3057)

This commit is contained in:
于玉桔 2019-07-12 18:52:03 +08:00 committed by 吴晟 Wu Sheng
parent faec2b02b4
commit d996d7bf4a
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
View File

@ -157,6 +157,10 @@ public class ContextManager implements BootService {
return get().awaitFinishAsync();
}
/**
* If not sure has the active span, use this method, will be cause NPE when has no active span,
* use ContextManager::isActive method to determine whether there has the active span.
*/
public static AbstractSpan activeSpan() {
return get().activeSpan();
}

2
apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java
View File

@ -92,7 +92,7 @@ class BaseInterceptorMethods {
}
void handleMethodException(Throwable t) {
if (ContextManager.activeSpan() != null) {
if (ContextManager.isActive()) {
ContextManager.activeSpan().errorOccurred().log(t);
}
}

5
apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v2/FilteringWebHandlerInterceptor.java
View File

@ -42,9 +42,8 @@ public class FilteringWebHandlerInterceptor implements InstanceMethodsAroundInte
ServerWebExchange exchange = (ServerWebExchange) allArguments[0];
Route route = exchange.getRequiredAttribute(GATEWAY_ROUTE_ATTR);
AbstractSpan span = ContextManager.activeSpan();
if (span != null) {
span.tag("route", route.getId());
if (ContextManager.isActive()) {
ContextManager.activeSpan().tag("route", route.getId());
}
}