From dfda1aafca69b193e26333e653dd2dbad8bb1edb Mon Sep 17 00:00:00 2001 From: wuwen Date: Wed, 12 Jan 2022 19:36:15 +0800 Subject: [PATCH] Compatible with the versions after dubbo-2.7.14 (#88) The ```rpcContext.getAttachments()``` method returns is a copy Map --- CHANGES.md | 1 + .../skywalking/apm/plugin/asf/dubbo/DubboInterceptor.java | 2 +- .../plugin/scenarios/dubbo-2.7.x-scenario/support-version.list | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 79e593ca8..94a86e8bf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,6 +18,7 @@ Release Notes. * Fix TracePathMatcher should match pattern "**" with paths end by "/" * Add support `returnedObj` expression for apm-customize-enhance-plugin * Fix the bug that httpasyncclient-4.x-plugin puts the dirty tracing context in the connection context +* Compatible with the versions after dubbo-2.7.14 #### Documentation diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/DubboInterceptor.java b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/DubboInterceptor.java index 3ccffbe68..4aff0bf80 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/DubboInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/DubboInterceptor.java @@ -79,7 +79,7 @@ public class DubboInterceptor implements InstanceMethodsAroundInterceptor { CarrierItem next = contextCarrier.items(); while (next.hasNext()) { next = next.next(); - rpcContext.getAttachments().put(next.getHeadKey(), next.getHeadValue()); + rpcContext.setAttachment(next.getHeadKey(), next.getHeadValue()); if (invocation.getAttachments().containsKey(next.getHeadKey())) { invocation.getAttachments().remove(next.getHeadKey()); } diff --git a/test/plugin/scenarios/dubbo-2.7.x-scenario/support-version.list b/test/plugin/scenarios/dubbo-2.7.x-scenario/support-version.list index 0d2032f2a..cc8ec3829 100644 --- a/test/plugin/scenarios/dubbo-2.7.x-scenario/support-version.list +++ b/test/plugin/scenarios/dubbo-2.7.x-scenario/support-version.list @@ -14,4 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -2.7.3 \ No newline at end of file +2.7.3 +2.7.14 \ No newline at end of file