Skip to content
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

Fix issue #5795 #5797

Merged
merged 6 commits into from
Nov 5, 2020
Merged

Fix issue #5795 #5797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
058cbdc
Fix issue #5795
simonlei Nov 5, 2020
9c5dbb7
Merge branch 'master' into patch-1
wu-sheng Nov 5, 2020
4ffd9eb
fix the style and modify the CHANGES.md
Nov 5, 2020
b63de18
Merge branch 'master' into patch-1
wu-sheng Nov 5, 2020
0414309
Merge branch 'master' into patch-1
wu-sheng Nov 5, 2020
4ea66c5
Merge branch 'master' into patch-1
kezhenxu94 Nov 5, 2020
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Release Notes.
* Make the okhttp3 plugin to support Java 14
* Polish tracing context related codes.
* Add the plugin for async-http-client 2.x
* Fix NPE in the nutz plugin.

#### OAP-Backend
* Add the `@SuperDataset` annotation for BrowserErrorLog.
Expand Down
7 changes: 4 additions & 3 deletions .../src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderSendInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,12 @@ public void beforeMethod(final EnhancedInstance objInst, final Method method, fi
public Object afterMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments,
final Class<?>[] argumentsTypes, Object ret) throws Throwable {
Response response = (Response) ret;
int statusCode = response.getStatus();
AbstractSpan span = ContextManager.activeSpan();
if (statusCode >= 400) {

if (response == null || response.getStatus() >= 400) {
span.errorOccurred();
Tags.STATUS_CODE.set(span, Integer.toString(statusCode));
if (response != null)
Tags.STATUS_CODE.set(span, Integer.toString(response.getStatus()));
}
ContextManager.stopSpan();
return ret;
Expand Down