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

Jump to bottom

fix NPE for Dubbo plugin #1260

Merged
merged 36 commits into from
Jun 30, 2020
Merged

fix NPE for Dubbo plugin #1260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
7f4b9de
add dubbo plugin
CoderLan0668 Mar 5, 2020
a43558f
add dubbo plugin(configuration and version merge)
CoderLan0668 Mar 5, 2020
f8a7a4a
use HelperClassManager to solve the ClassNotFoundException
CoderLan0668 Mar 7, 2020
74f80d8
deal with dubbo exception, for example timeout
CoderLan0668 Mar 9, 2020
758eb4f
ignore span end while not in a trace transaction
CoderLan0668 Mar 9, 2020
a5a384a
using transaction with scope to solve the concurrency problem
CoderLan0668 Mar 12, 2020
26af1e7
modify AbstractDubboInstrumentationTest to extends AbstractInstrument…
CoderLan0668 Mar 20, 2020
cbc6aa7
add support for alibaba async consumer
CoderLan0668 Mar 28, 2020
5e4d2d1
add support for apache dubbo async
CoderLan0668 Apr 1, 2020
9a5b8b0
don't support multi-valued headers via string concatenation.
CoderLan0668 Apr 1, 2020
d1c0a45
reduce object allocation for performance
CoderLan0668 Apr 1, 2020
197dc2a
capture all exception thrown by dubbo invoke
CoderLan0668 Apr 3, 2020
57a6adb
skip animal.sniffer because dubbo plugin needs java 8 api.
CoderLan0668 Apr 3, 2020
cb09c78
reduce apache dubbo version to 2.7.3 which is suggested to be used in…
CoderLan0668 Apr 6, 2020
08bd8b6
fix NoClassDefFoundError, as helper class missing
CoderLan0668 Apr 7, 2020
c68e079
change apache dubbo version describe, just 2.7.3 and upper version
CoderLan0668 Apr 7, 2020
1101351
use '#' to concat the class name and method name, as SpringMVC do
CoderLan0668 Apr 7, 2020
b676435
use '#' to concat the class name and method name, as SpringMVC do
CoderLan0668 Apr 14, 2020
0977372
adjust the span name as "${simpleClassName}#${methodName}" like other…
CoderLan0668 Apr 17, 2020
716c5f4
adjust the span name as "${simpleClassName}#${methodName}" like other…
CoderLan0668 Apr 17, 2020
fe1bc60
remove: capture parameters、return and exception and store into the cu…
CoderLan0668 May 13, 2020
182b5e2
Cleanup PR
felixbarny May 15, 2020
c35be2c
Fix Javadoc link
felixbarny May 16, 2020
66815f6
Merge pull request #1 from felixbarny/dubbo
CoderLan0668 May 18, 2020
e1c8d4d
Merge remote-tracking branch 'origin/master' into dubbo
felixbarny May 18, 2020
00c8db2
Another cleanup
felixbarny May 18, 2020
72dfe55
Update configuration.asciidoc
felixbarny May 19, 2020
bdb74f6
wait for transaction in async test case
CoderLan0668 May 19, 2020
e377d07
Merge remote-tracking branch 'origin/dubbo' into dubbo
CoderLan0668 May 19, 2020
7c84d38
Ensure unsupported versions are not instrumented
felixbarny May 19, 2020
5934df8
Merge remote-tracking branch 'origin/master' into dubbo
felixbarny Jun 9, 2020
5fb60a2
Remove legacy logging
felixbarny Jun 9, 2020
540365e
Merge remote-tracking branch 'remotes/upstream/master' into dubbo
CoderLan0668 Jun 28, 2020
bb11438
Merge remote-tracking branch 'remotes/upstream/master' into dubbo
CoderLan0668 Jun 30, 2020
eee2fea
fix NPE when the application is both provider and consumer.
CoderLan0668 Jun 30, 2020
391f779
Update CHANGELOG.asciidoc
felixbarny Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ endif::[]
* Fixes `NullPointerException` related to JAX-RS and Quartz instrumentation - {pull}1249[#1249]
* Expanding k8s pod ID discovery to some formerly non-supported environments
* When `recording` is set to `false`, the agent will not send captured errors anymore.
* Fixes NPE in Dubbo instrumentation that occurs when the application is acting both as a provider and as a consumer - {pull}1260[#1260]

[[release-notes-1.x]]
=== Java Agent version 1.x
Expand Down
2 changes: 1 addition & 1 deletion ...bbo-plugin/src/main/java/co/elastic/apm/agent/dubbo/advice/ApacheMonitorFilterAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public static void onExitFilterInvoke(@Advice.Argument(1) Invocation invocation,
@Nullable @Advice.Local("transaction") Transaction transaction) {

RpcContext context = RpcContext.getContext();
AbstractSpan<?> actualSpan = context.isConsumerSide() ? span : transaction;
AbstractSpan<?> actualSpan = span != null ? span : transaction;
if (actualSpan == null) {
return;
}
Expand Down