Skip to content

Fix ContextManager.activeSpan() API usage error #3057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-sheng merged 2 commits into from
Jul 12, 2019
Merged

Fix ContextManager.activeSpan() API usage error #3057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c85f00
fix
zhaoyuguang Jul 12, 2019
1f1c2ca
Merge branch 'master' into fix-error-use-api
wu-sheng Jul 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ public static AbstractTracerContext awaitFinishAsync(AbstractSpan span) {
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();
}
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void afterMethod(Method method) {
}

void handleMethodException(Throwable t) {
if (ContextManager.activeSpan() != null) {
if (ContextManager.isActive()) {
ContextManager.activeSpan().errorOccurred().log(t);
}
}
Expand Down
5 changes: 2 additions & 3 deletions .../apache/skywalking/apm/plugin/spring/cloud/gateway/v2/FilteringWebHandlerInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
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());
}
}

Expand Down